Hello community, here is the log from the commit of package yast2-network checked in at Tue May 22 15:14:56 CEST 2007. -------- --- yast2-network/yast2-network.changes 2007-05-13 14:18:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-05-22 14:55:36.948071000 +0200 @@ -1,0 +2,19 @@ +Tue May 22 13:59:04 CEST 2007 - kmachalkova@suse.cz + +- Escape backslash characters in proxy auth credentials properly + (#256360) +- 2.15.33 + +------------------------------------------------------------------- +Mon May 21 13:57:47 CEST 2007 - kmachalkova@suse.cz + +- IsHostLocal test extended to include also hostname and/or IP set by + DHCP (#163170) + +------------------------------------------------------------------- +Mon May 14 10:52:43 CEST 2007 - kmachalkova@suse.cz + +- Correct comparison of installed and downloaded release notes + version (to prevent useless error messages) (#269985) + +------------------------------------------------------------------- Old: ---- yast2-network-2.15.32.tar.bz2 New: ---- yast2-network-2.15.33.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.Jh9135/_old 2007-05-22 15:14:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Jh9135/_new 2007-05-22 15:14:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.15.32) +# spec file for package yast2-network (Version 2.15.33) # # 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-network -Version: 2.15.32 +Version: 2.15.33 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.15.32.tar.bz2 +Source0: yast2-network-2.15.33.tar.bz2 prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig rpm @@ -51,7 +51,7 @@ Michal Svec <msvec@suse.cz> %prep -%setup -n yast2-network-2.15.32 +%setup -n yast2-network-2.15.33 %build %{prefix}/bin/y2tool y2autoconf @@ -107,6 +107,16 @@ /usr/share/YaST2/schema/autoyast/rnc/proxy.rnc %changelog +* Tue May 22 2007 - kmachalkova@suse.cz +- Escape backslash characters in proxy auth credentials properly + (#256360) +- 2.15.33 +* Mon May 21 2007 - kmachalkova@suse.cz +- IsHostLocal test extended to include also hostname and/or IP set by + DHCP (#163170) +* Mon May 14 2007 - kmachalkova@suse.cz +- Correct comparison of installed and downloaded release notes + version (to prevent useless error messages) (#269985) * Sun May 13 2007 - mzugec@suse.cz - fixed create BOND device (#274078) - 2.15.32 ++++++ yast2-network-2.15.32.tar.bz2 -> yast2-network-2.15.33.tar.bz2 ++++++ ++++ 5946 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.32/configure.in new/yast2-network-2.15.33/configure.in --- old/yast2-network-2.15.32/configure.in 2007-05-13 14:16:00.000000000 +0200 +++ new/yast2-network-2.15.33/configure.in 2007-05-21 12:42:36.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-network dnl -dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.15.31, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.15.32, http://bugs.opensuse.org/, yast2-network) 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.31" +VERSION="2.15.32" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.32/data/phone-codes.ycp new/yast2-network-2.15.33/data/phone-codes.ycp --- old/yast2-network-2.15.32/data/phone-codes.ycp 2006-12-11 13:20:58.000000000 +0100 +++ new/yast2-network-2.15.33/data/phone-codes.ycp 2007-05-18 11:00:56.000000000 +0200 @@ -1,7 +1,7 @@ /** - * International phone codes map + * International phone codes map * Author: Michal Svec <msvec@suse.cz> - * $Id: phone-codes.ycp 19004 2004-09-01 08:00:05Z msvec $ + * $Id: phone-codes.ycp 38036 2007-05-18 09:00:55Z kmachalkova $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.32/missing new/yast2-network-2.15.33/missing --- old/yast2-network-2.15.32/missing 2007-05-13 14:16:06.000000000 +0200 +++ new/yast2-network-2.15.33/missing 2007-05-21 12:42:51.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.32/src/installation/inst_do_net_test.ycp new/yast2-network-2.15.33/src/installation/inst_do_net_test.ycp --- old/yast2-network-2.15.32/src/installation/inst_do_net_test.ycp 2007-04-22 12:40:23.000000000 +0200 +++ new/yast2-network-2.15.33/src/installation/inst_do_net_test.ycp 2007-05-18 10:56:36.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Michal Svec <msvec@suse.cz> * Arvin Schnell <arvin@suse.de> * - * $Id: inst_do_net_test.ycp 37598 2007-04-19 14:44:58Z locilka $ + * $Id: inst_do_net_test.ycp 37961 2007-05-14 09:01:25Z kmachalkova $ */ { @@ -434,8 +434,8 @@ foreach (string i_item, installed_rpm_version_l, { installed_version_item = tointeger(i_item); downloaded_version_item = tointeger(downloaded_rpm_version_l[loop_counter]:"0"); - if (downloaded_version_item > installed_version_item) { - downloaded_version_is_newer = true; + if (downloaded_version_item != installed_version_item) { + downloaded_version_is_newer = (downloaded_version_item > installed_version_item); break; } loop_counter = loop_counter + 1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.32/src/modules/DNS.ycp new/yast2-network-2.15.33/src/modules/DNS.ycp --- old/yast2-network-2.15.32/src/modules/DNS.ycp 2007-04-22 12:40:23.000000000 +0200 +++ new/yast2-network-2.15.33/src/modules/DNS.ycp 2007-05-21 14:01:40.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Hostname and DNS data * Authors: Michal Svec <msvec@suse.cz> * - * $Id: DNS.ycp 37632 2007-04-20 13:40:48Z kmachalkova $ + * $Id: DNS.ycp 38063 2007-05-21 12:01:40Z kmachalkova $ * * Manages resolv.conf and (fully qualified) hostname, also * respecting DHCP. @@ -88,6 +88,26 @@ return true; } +/* + * Get current hostname and IP Address + * if these are set by DHCP + * @return map with ip, hostname_short and hostname_fq keys + */ +global define map <string, string> GetDHCPHostnameIP () { + map <string, string> ret = $[]; + + map output = (map) SCR::Execute(.target.bash_output, "hostname -i"); + ret["ip"] = deletechars(output["stdout"]:"", " \n"); + + output = (map) SCR::Execute(.target.bash_output, "hostname"); + ret["hostname_short"] = deletechars(output["stdout"]:"", " \n"); + + output = (map) SCR::Execute(.target.bash_output, "hostname -f"); + ret["hostname_fq"] = deletechars(output["stdout"]:"", " \n"); + + return ret; +} + /** * resolver config file location */ @@ -405,10 +425,17 @@ */ global define boolean IsHostLocal (string check_host) { Read (); + NetworkDevices::Read (); + map <string, string> dhcp_data = $[]; + + if ( (size( NetworkDevices::Locate("BOOTPROTO", "dhcp") ) > 0) || + NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false == true ) { + dhcp_data = GetDHCPHostnameIP(); + y2milestone("Got DHCP-configured data: %1", dhcp_data); + } /* FIXME: May not work properly in following situations: - multiple addresses per interface - aliases in /etc/hosts - - hostname or IP address is set through DHCP - IPADDR=IP/24 */ @@ -422,8 +449,9 @@ // IPv4 address if (IP::Check4 (check_host)) { - NetworkDevices::Read (); - return 0 != size (NetworkDevices::Locate ("IPADDR", check_host)); + if ( (size (NetworkDevices::Locate ("IPADDR", check_host)) > 0) + || dhcp_data["ip"]:"" == check_host) + return true; } // IPv6 address else if (IP::Check6 (check_host)) @@ -433,12 +461,16 @@ // short hostname else if (findfirstof (check_host, ".") == nil) { - return tolower (check_host) == tolower (hostname); + if ( (tolower (check_host) == tolower (hostname)) + || dhcp_data["hostname_short"]:"" == check_host) + return true; } // fully qualified hostname else { - return tolower (check_host) == tolower (hostname + "." + domain); + if ( (tolower (check_host) == tolower (hostname + "." + domain)) + || dhcp_data["hostname_fq"]:"" == check_host ) + return true; } return false; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.32/src/modules/Proxy.ycp new/yast2-network-2.15.33/src/modules/Proxy.ycp --- old/yast2-network-2.15.32/src/modules/Proxy.ycp 2007-05-02 18:31:41.000000000 +0200 +++ new/yast2-network-2.15.33/src/modules/Proxy.ycp 2007-05-22 14:45:36.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Proxy data * Authors: Michal Svec <msvec@suse.cz> * - * $Id: Proxy.ycp 37765 2007-04-27 15:19:14Z kmachalkova $ + * $Id: Proxy.ycp 38086 2007-05-22 12:45:35Z kmachalkova $ * * Configures FTP and HTTP proxies via sysconfig & SuSEconfig * and /root/.curlrc (for YOU) @@ -110,7 +110,7 @@ ]; string caption = _("Saving Proxy Configuration"); - integer sl = 100; //sleep for longer time, so that progress does not disappear right afterwards + integer sl = 500; //sleep for longer time, so that progress does not disappear right afterwards Progress::New(caption, " ", size(steps), steps, [], ""); @@ -215,11 +215,14 @@ https_proxy = mergestring (splitstring(https_proxy, "\""), "\\\""); ftp_proxy = mergestring (splitstring(ftp_proxy, "\""), "\\\""); proxy_user = mergestring (splitstring(proxy_user, "\""), "\\\""); + //escape also '\' character - usernames such as domain\user are causing pain to .target.bash_output + //and to curl - #256360 + proxy_user = mergestring (splitstring(proxy_user, "\\"), "\\\\"); proxy_password = mergestring (splitstring(proxy_password, "\""), "\\\""); string user_pass = (proxy_user != "" ? - " --proxy-user " + "'" + proxy_user + "'" + (proxy_password != "" ? - ":" + "'" + proxy_password + "'" + " --proxy-user " + proxy_user + (proxy_password != "" ? + ":" + proxy_password : "") : @@ -228,7 +231,7 @@ // timeout for the connection integer timeout_sec = 90; // %1 = http or ftp proxy, %2 = user:password if any, %3 = URL - string command = "curl --verbose --proxy '%1' %2 --connect-timeout %3 --url '%4'"; + string command = "curl --verbose --proxy %1 %2 --connect-timeout %3 --url %4"; string http_command = sformat(command, http_proxy, user_pass, timeout_sec, "http://www.novell.com"); // adding option --insecure to accept the certificate without asking string https_command = sformat(command, https_proxy, user_pass, timeout_sec, "https://secure-www.novell.com --insecure"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.32/testsuite/tests/Internet.out new/yast2-network-2.15.33/testsuite/tests/Internet.out --- old/yast2-network-2.15.32/testsuite/tests/Internet.out 2007-01-29 20:25:03.000000000 +0100 +++ new/yast2-network-2.15.33/testsuite/tests/Internet.out 2007-05-18 10:56:36.000000000 +0200 @@ -16,11 +16,6 @@ Dir .network.section: ["eth1", "tr0"] Dir .network.value."eth1": [] Dir .network.value."tr0": [] -Execute .target.bash_output "getcfg-interface eth1" $["exit":0, "stderr":"", "stdout":""] -Read .probe.architecture nil -Read .probe.architecture nil -Execute .target.bash "ethtool | grep \"Link detected: yes\"" 0 -Execute .target.bash "ifstatus | grep \" is up\"" 0 Return true Dump eth1 Dump netcard diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.32/VERSION new/yast2-network-2.15.33/VERSION --- old/yast2-network-2.15.32/VERSION 2007-05-13 14:17:06.000000000 +0200 +++ new/yast2-network-2.15.33/VERSION 2007-05-22 14:05:39.000000000 +0200 @@ -1 +1 @@ -2.15.32 +2.15.33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org