Hello community, here is the log from the commit of package yast2-installation checked in at Mon Sep 3 18:20:53 CEST 2007. -------- --- yast2-installation/yast2-installation.changes 2007-08-31 16:27:55.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2007-09-03 13:35:12.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Sep 3 12:45:41 CEST 2007 - locilka@suse.cz + +- Creating symlinks to .curlrc and .wgetrc files from the root. +- Adjusting RPM dependencies (yast2-core, new builtin 'setenv'). +- Adjusting ENV variables with proxy settings (all three #305163). +- Writing also proxy setting into Install.inf (#298001#c5). +- 2.15.46 + +------------------------------------------------------------------- Old: ---- yast2-installation-2.15.45.tar.bz2 New: ---- yast2-installation-2.15.46.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.G28253/_old 2007-09-03 18:20:41.000000000 +0200 +++ /var/tmp/diff_new_pack.G28253/_new 2007-09-03 18:20:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.15.45) +# spec file for package yast2-installation (Version 2.15.46) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-installation -Version: 2.15.45 +Version: 2.15.46 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.15.45.tar.bz2 +Source0: yast2-installation-2.15.46.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-country yast2-devtools yast2-testsuite # Mode::live_installation @@ -44,6 +44,9 @@ # 'Product' and 'Installation' moved to 'yast2' # needs NetworkService::isNetworkRunning() from yast2 Conflicts: yast2 < 2.15.35 +# New builtin setenv() +# Bugzilla #305163 +Conflicts: yast2-core <= 2.15.9 # tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) Requires: tar gzip # for the first/second stage of installation @@ -63,12 +66,12 @@ BuildArchitectures: noarch Summary: YaST2 - Installation Parts %package devel-doc -Version: 2.15.45 +Version: 2.15.46 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.15.45.tar.bz2 +Source0: yast2-installation-2.15.46.tar.bz2 prefix: /usr Requires: yast2-installation >= 2.15.34 PreReq: %fillup_prereq @@ -102,7 +105,7 @@ Lukas Ocilka <locilka@suse.cz> %prep -%setup -n yast2-installation-2.15.45 +%setup -n yast2-installation-2.15.46 %build %{prefix}/bin/y2tool y2autoconf @@ -176,6 +179,12 @@ %exclude %{prefix}/share/doc/packages/yast2-installation/README %changelog +* Mon Sep 03 2007 - locilka@suse.cz +- Creating symlinks to .curlrc and .wgetrc files from the root. +- Adjusting RPM dependencies (yast2-core, new builtin 'setenv'). +- Adjusting ENV variables with proxy settings (all three #305163). +- Writing also proxy setting into Install.inf (#298001#c5). +- 2.15.46 * Fri Aug 31 2007 - locilka@suse.cz - Calling ntp_client_finish client at the end of the installation (#299238#c9). ++++++ yast2-installation-2.15.45.tar.bz2 -> yast2-installation-2.15.46.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.45/configure new/yast2-installation-2.15.46/configure --- old/yast2-installation-2.15.45/configure 2007-08-23 17:39:01.000000000 +0200 +++ new/yast2-installation-2.15.46/configure 2007-09-03 17:13:21.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-installation 2.15.43. +# Generated by GNU Autoconf 2.60 for yast2-installation 2.15.46. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-installation' PACKAGE_TARNAME='yast2-installation' -PACKAGE_VERSION='2.15.43' -PACKAGE_STRING='yast2-installation 2.15.43' +PACKAGE_VERSION='2.15.46' +PACKAGE_STRING='yast2-installation 2.15.46' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1192,7 +1192,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-installation 2.15.43 to adapt to many kinds of systems. +\`configure' configures yast2-installation 2.15.46 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1263,7 +1263,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-installation 2.15.43:";; + short | recursive ) echo "Configuration of yast2-installation 2.15.46:";; esac cat <<\_ACEOF @@ -1341,7 +1341,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-installation configure 2.15.43 +yast2-installation configure 2.15.46 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1355,7 +1355,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-installation $as_me 2.15.43, which was +It was created by yast2-installation $as_me 2.15.46, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2156,7 +2156,7 @@ # Define the identity of the package. PACKAGE='yast2-installation' - VERSION='2.15.43' + VERSION='2.15.46' cat >>confdefs.h <<_ACEOF @@ -2383,7 +2383,7 @@ -VERSION="2.15.43" +VERSION="2.15.46" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka@suse.cz>" @@ -3513,7 +3513,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-installation $as_me 2.15.43, which was +This file was extended by yast2-installation $as_me 2.15.46, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3556,7 +3556,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-installation config.status 2.15.43 +yast2-installation config.status 2.15.46 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.45/configure.in new/yast2-installation-2.15.46/configure.in --- old/yast2-installation-2.15.45/configure.in 2007-08-23 17:38:56.000000000 +0200 +++ new/yast2-installation-2.15.46/configure.in 2007-09-03 17:13:16.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.15.43, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.15.46, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.43" +VERSION="2.15.46" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.45/src/clients/inst_network_setup.ycp new/yast2-installation-2.15.46/src/clients/inst_network_setup.ycp --- old/yast2-installation-2.15.45/src/clients/inst_network_setup.ycp 2007-08-21 09:20:06.000000000 +0200 +++ new/yast2-installation-2.15.46/src/clients/inst_network_setup.ycp 2007-09-03 13:26:42.000000000 +0200 @@ -865,6 +865,22 @@ return true; } + + // Adjusts environment variables via new builtin 'setenv' + void SetEnvironmentVariables (map <string, any> env_proxy_variables) { +// map <string, any> env_proxy_variables = $[ +// "http_proxy" : proxy_server, +// "https_proxy" : proxy_server, +// "ftp_proxy" : proxy_server, +// "proxy_user" : proxy_user, +// "proxy_password" : proxy_pass, +// ]; + + setenv ("http_proxy", env_proxy_variables["http_proxy"]:""); + setenv ("HTTPS_PROXY", env_proxy_variables["https_proxy"]:""); + setenv ("FTP_PROXY", env_proxy_variables["ftp_proxy"]:""); + setenv ("NO_PROXY", "localhost, 127.0.0.1"); + } boolean Action_ProxySetup () { string tmp_sysconfig_dir = "/tmp/first_stage_network_setup/sysconfig/"; @@ -877,6 +893,12 @@ curlrc_file, SCR::Execute (.target.bash, sformat ("touch '%1'", String::Quote (curlrc_file))) ); + // symlink the correct location of the conf-file + // $HOME directory might be '/' in inst-sys + y2milestone ( + "Creating .curlrc symlink returned: %1", + SCR::Execute (.target.bash, sformat ("ln --symbolic --force '%1' '/.curlrc'", String::Quote (curlrc_file))) + ); } string wgetrc_file = "/root/.wgetrc"; @@ -886,6 +908,12 @@ wgetrc_file, SCR::Execute (.target.bash, sformat ("touch '%1'", String::Quote (wgetrc_file))) ); + // symlink the correct location of the conf-file + // $HOME directory might be '/' in inst-sys + y2milestone ( + "Creating .wgetrc symlink returned: %1", + SCR::Execute (.target.bash, sformat ("ln --symbolic --force '%1' '/.wgetrc'", String::Quote (wgetrc_file))) + ); } if (Stage::initial()) { @@ -944,6 +972,9 @@ Proxy::Write(); Progress::set (progress_orig); + // Bugzilla #305163 + SetEnvironmentVariables (import_proxy); + return true; } @@ -957,9 +988,9 @@ // Value must be set if (value == "" || value == nil) { y2warning ("Value for '%1' is '%2'", inst_inf_entry, value); - // Can be removed later + // Can contain username/passowrd } else { - y2milestone ("Writing %1=%2", inst_inf_entry, value); + y2debug ("Writing %1=%2", inst_inf_entry, value); } return SCR::Write (add (.etc.install_inf, inst_inf_entry), value); @@ -1038,6 +1069,42 @@ WriteInstallInfEntry ("NetUniqueID", hardware_information[netdevice,"unique_key"]:""); WriteInstallInfEntry ("HWAddr", hardware_information[netdevice,"hward"]:""); + if (network_settings["use_proxy"]:nil == true) { + string proxy_auth = ""; + + if (network_settings["proxy_user"]:"" != "" && network_settings["proxy_password"]:"" != "") { + proxy_auth = sformat ("%1:%2", + // escaping ":"s in username + mergestring (splitstring (network_settings["proxy_user"]:"", ":"), "\\:"), + // escaping ":"s in password + mergestring (splitstring (network_settings["proxy_password"]:"", ":"), "\\:") + ); + } + + string proxy_server = nil; + + // no proxy auth + if (proxy_auth == "") { + proxy_server = sformat ( + "http://%1:%2/", + network_settings["proxy_server"]:"", + network_settings["proxy_port"]:"" + ); + // write proxy auth as well + } else { + proxy_server = sformat ( + "http://%1@%2:%3/", + proxy_auth, + network_settings["proxy_server"]:"", + network_settings["proxy_port"]:"" + ); + } + + WriteInstallInfEntry ("Proxy", proxy_server); + } else { + WriteInstallInfEntry ("Proxy", nil); + } + // Flush the SCR agent cache to the disk SCR::Write (.etc.install_inf, nil); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.45/VERSION new/yast2-installation-2.15.46/VERSION --- old/yast2-installation-2.15.45/VERSION 2007-08-31 16:26:00.000000000 +0200 +++ new/yast2-installation-2.15.46/VERSION 2007-09-03 13:34:26.000000000 +0200 @@ -1 +1 @@ -2.15.45 +2.15.46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org