Hello community, here is the log from the commit of package yast2 checked in at Thu May 17 18:23:52 CEST 2007. -------- --- yast2/yast2.changes 2007-05-04 16:46:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2007-05-17 18:02:02.598799000 +0200 @@ -1,0 +2,30 @@ +Thu May 17 17:57:17 CEST 2007 - lslezak@suse.cz + +- Fixed testsuite for String.ycp +- 2.15.33 + +------------------------------------------------------------------- +Thu May 17 17:08:57 CEST 2007 - kmachalkova@suse.cz + +- Do not request link state of network devices from ethtool (ask + sysfs instead) so that yast2 does not require ethtool (#256382) + +------------------------------------------------------------------- +Wed May 16 11:52:52 CEST 2007 - locilka@suse.cz + +- Added checking for allowed "ssh" TCP port into + SuSEFirewallProposal module additionaly to "service:sshd" + (related to #274761). + +------------------------------------------------------------------- +Wed May 9 13:47:10 CEST 2007 - lslezak@suse.cz + +- fixed units - use "kB" instead of "KB" in strings (#270935) + +------------------------------------------------------------------- +Mon May 7 14:47:41 CEST 2007 - mvidner@suse.cz + +- save_y2logs: do not query the RPM database if there is none, as + in the inst-sys (#270321). + +------------------------------------------------------------------- Old: ---- yast2-2.15.32.tar.bz2 New: ---- yast2-2.15.33.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.AV3055/_old 2007-05-17 18:23:39.000000000 +0200 +++ /var/tmp/diff_new_pack.AV3055/_new 2007-05-17 18:23:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.15.32) +# spec file for package yast2 (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 -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-2.15.32.tar.bz2 +Source0: yast2-2.15.33.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-pkg-bindings yast2-testsuite # SCR::RegisterNewAgents() @@ -101,7 +101,7 @@ Steffen Winterfeldt <snwint@suse.de> %prep -%setup -n yast2-2.15.32 +%setup -n yast2-2.15.33 %build %{prefix}/bin/y2tool y2autoconf @@ -209,6 +209,21 @@ %doc %{prefix}/share/doc/packages/yast2/wizard %changelog +* Thu May 17 2007 - lslezak@suse.cz +- Fixed testsuite for String.ycp +- 2.15.33 +* Thu May 17 2007 - kmachalkova@suse.cz +- Do not request link state of network devices from ethtool (ask + sysfs instead) so that yast2 does not require ethtool (#256382) +* Wed May 16 2007 - locilka@suse.cz +- Added checking for allowed "ssh" TCP port into + SuSEFirewallProposal module additionaly to "service:sshd" + (related to #274761). +* Wed May 09 2007 - lslezak@suse.cz +- fixed units - use "kB" instead of "KB" in strings (#270935) +* Mon May 07 2007 - mvidner@suse.cz +- save_y2logs: do not query the RPM database if there is none, as + in the inst-sys (#270321). * Fri May 04 2007 - locilka@suse.cz - Added new refresh-srv-def-by-pkgs-trans.sh script that creates a YCP file containing translations for services defined by ++++++ yast2-2.15.32.tar.bz2 -> yast2-2.15.33.tar.bz2 ++++++ ++++ 3734 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-2.15.32/configure.in new/yast2-2.15.33/configure.in --- old/yast2-2.15.32/configure.in 2007-05-04 16:35:23.000000000 +0200 +++ new/yast2-2.15.33/configure.in 2007-05-17 17:58:41.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.15.32, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.15.33, http://bugs.opensuse.org/, yast2) 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.32" +VERSION="2.15.33" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain@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-2.15.32/library/modules/Version.ycp new/yast2-2.15.33/library/modules/Version.ycp --- old/yast2-2.15.32/library/modules/Version.ycp 2007-05-04 16:35:40.000000000 +0200 +++ new/yast2-2.15.33/library/modules/Version.ycp 2007-05-17 17:59:05.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.15.32"; +global string yast2 = "2.15.33"; /* EOF */ } 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-2.15.32/library/network/src/NetworkDevices.ycp new/yast2-2.15.33/library/network/src/NetworkDevices.ycp --- old/yast2-2.15.32/library/network/src/NetworkDevices.ycp 2007-04-23 10:11:42.000000000 +0200 +++ new/yast2-2.15.33/library/network/src/NetworkDevices.ycp 2007-05-17 17:26:23.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Interface manipulation (/etc/sysconfig/network/ifcfg-*) * Authors: Michal Svec <msvec@suse.cz> * - * $Id: NetworkDevices.ycp 37596 2007-04-19 14:31:58Z mzugec $ + * $Id: NetworkDevices.ycp 38024 2007-05-17 15:25:43Z kmachalkova $ * * The new sysconfig naming is interface (eg. eth0) vs. device * (eg. NE2000 card), but historically yast has called them device @@ -18,6 +18,7 @@ import "Arch"; import "Map"; +import "Mode"; import "Netmask"; import "String"; @@ -286,6 +287,42 @@ } /** + * Return matching inteface for this hardware ID (uses getcfg-interface) + * @param dev unique device string + * return interface name + * @example MatchInterface("eth-id-00:01:DE:AD:BE:EF") -> "eth0" + */ +global string MatchInterface(string dev) { + string cmd = "getcfg-interface " + dev; + map dn =(map) SCR::Execute(.target.bash_output, cmd); + string devname = deletechars(dn["stdout"]:"", "\n"); + + return devname; +} + +/** + * Test whether device is connected (Link:up) + * The info is taken from sysfs + * @param dev unique device string + * @return true if connected + */ +global boolean IsConnected(string dev) { + if (!Mode::testsuite()) { + string iface = MatchInterface(dev); + string cmd = "cat /sys/class/net/" + iface + "/carrier"; + + map ret = (map) SCR::Execute(.target.bash_output, cmd); + y2milestone("Sysfs returned %1", ret); + + return ( deletechars( ret["stdout"]:"", "\n") == "1" ? true : false ); + } + else + //Assume all devices are connected in testsuite mode + return true; + +} + +/** * Return real type of the device (incl. PCMCIA, USB, ...) * @param type basic device type * @param hotplug hot plug type @@ -1263,32 +1300,12 @@ /* Find the fastest device */ foreach(integer num, string type, FastestTypes, { foreach(string dev, devices, { - if(ret == "" && regexpmatch(dev, "^" + DeviceRegex[type]:"" + "[0-9]*$")) { - //do some checking (whether the card is up and has cable connected) - if(type == "netcard") { - string cmd = "getcfg-interface " + dev; - map dn =(map) SCR::Execute(.target.bash_output, cmd); - string devname = deletechars(dn["stdout"]:"", "\n"); - - cmd = "ethtool " + devname + " | grep \"Link detected: yes\""; - string cmd2 = "ifstatus " + devname + " | grep \"" + devname + " is up\""; - - if( (Arch::s390() || SCR::Execute(.target.bash, cmd) == 0) && (SCR::Execute(.target.bash, cmd2) == 0)) { - y2milestone("%1 is up and connected", dev); - ret = dev; - } - else y2milestone("%1 is down or disconnected", dev); - } - else ret = dev; - } + if(ret == "" && regexpmatch(dev, "^" + DeviceRegex[type]:"" + "[0-9]*$") + && IsConnected(dev)) + ret = dev; }); }); - if (ret == "") { - y2milestone("No suitable device found, falling back to the first device on the detected list"); - ret = devices[0]:""; - } - y2milestone("ret=%1", ret); return ret; } 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-2.15.32/library/network/src/SuSEFirewallProposal.ycp new/yast2-2.15.33/library/network/src/SuSEFirewallProposal.ycp --- old/yast2-2.15.32/library/network/src/SuSEFirewallProposal.ycp 2007-05-04 16:08:04.000000000 +0200 +++ new/yast2-2.15.33/library/network/src/SuSEFirewallProposal.ycp 2007-05-17 17:22:55.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Functional interface for SuSEFirewall installation proposal * Authors: Lukas Ocilka <locilka@suse.cz> * - * $Id: SuSEFirewallProposal.ycp 37840 2007-05-04 14:08:03Z locilka $ + * $Id: SuSEFirewallProposal.ycp 37986 2007-05-16 10:05:24Z locilka $ * * This module provides a functional API for Installation proposal of SuSEfirewall2 */ @@ -412,7 +412,11 @@ y2milestone("Zones used by firewall: %1", used_zones); foreach (string zone, used_zones, { - if (SuSEFirewall::IsServiceSupportedInZone ("service:sshd", zone)) { + if ( + SuSEFirewall::IsServiceSupportedInZone ("service:sshd", zone) + || + SuSEFirewall::HaveService("ssh", "TCP", zone) + ) { is_ssh_enabled = true; } }); 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-2.15.32/library/types/src/String.ycp new/yast2-2.15.33/library/types/src/String.ycp --- old/yast2-2.15.32/library/types/src/String.ycp 2007-04-23 10:11:42.000000000 +0200 +++ new/yast2-2.15.33/library/types/src/String.ycp 2007-05-09 13:49:47.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: String manipulation routines * Authors: Michal Svec <msvec@suse.cz> * - * $Id: String.ycp 37626 2007-04-20 13:20:26Z arvin $ + * $Id: String.ycp 37872 2007-05-09 11:49:45Z lslezak $ */ { @@ -97,7 +97,7 @@ string unit = ""; list units = [ /* KiloByte abbreviated */ - _("KB"), + _("kB"), /* MegaByte abbreviated */ _("MB"), /* GigaByte abbreviated */ 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-2.15.32/library/types/testsuite/tests/String.out new/yast2-2.15.33/library/types/testsuite/tests/String.out --- old/yast2-2.15.32/library/types/testsuite/tests/String.out 2006-11-01 10:28:23.000000000 +0100 +++ new/yast2-2.15.33/library/types/testsuite/tests/String.out 2007-05-17 17:23:46.000000000 +0200 @@ -14,7 +14,7 @@ Return Return 0.00 Return 1.00 -Return 1.00 KB +Return 1.00 kB Return 1.00 MB Return 1.00 GB Return 1.00 TB @@ -23,14 +23,14 @@ Return Return 0 Return 1.00 -Return 1.001 KB +Return 1.001 kB Return 1.00 MB Return 1.000 GB Return 1.00 TB Return 1024.1 TB -Return 4 KB -Return 4.00 KB -Return 4.00 KB +Return 4 kB +Return 4.00 kB +Return 4.00 kB Return 8 GB Return 15.00000 Return 21.846 GB 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-2.15.32/scripts/save_y2logs new/yast2-2.15.33/scripts/save_y2logs --- old/yast2-2.15.32/scripts/save_y2logs 2006-11-01 10:28:28.000000000 +0100 +++ new/yast2-2.15.33/scripts/save_y2logs 2007-05-09 13:44:38.000000000 +0200 @@ -4,6 +4,7 @@ # to attach it to a Bugzilla bug report # # Author: Stefan Hundhammer <sh@suse.de> +# $Id: save_y2logs 37856 2007-05-07 12:48:23Z mvidner $ usage() { @@ -50,7 +51,10 @@ fi RPM_LIST="rpm-qa" -rpm -qa --qf '%{NAME}-%{VERSION}-%{RELEASE}\t\t\t(%{VENDOR})\t%{DISTRIBUTION}\n' | sort >/var/log/$RPM_LIST +# #270321, there is no rpmdb in inst-sys +if [ -f /var/lib/rpm/Packages ]; then + rpm -qa --qf '%{NAME}-%{VERSION}-%{RELEASE}\t\t\t(%{VENDOR})\t%{DISTRIBUTION}\n' | sort >/var/log/$RPM_LIST +fi if [ -f /var/log/$RPM_LIST ]; then LIST="$LIST $RPM_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-2.15.32/VERSION new/yast2-2.15.33/VERSION --- old/yast2-2.15.32/VERSION 2007-05-04 15:31:00.000000000 +0200 +++ new/yast2-2.15.33/VERSION 2007-05-17 17:57:50.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