May 2006 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-qt
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package yast2-qt checked in at Sun May 7 16:49:44 CEST 2006. -------- --- yast2-qt/yast2-qt.changes 2006-04-28 14:17:09.000000000 +0200 +++ STABLE/yast2-qt/yast2-qt.changes 2006-05-04 12:35:56.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 4 12:32:46 CEST 2006 - sh(a)suse.de + +- V 2.13.54 +- Messages back from proofreading + +------------------------------------------------------------------- Old: ---- yast2-qt-2.13.53.tar.bz2 New: ---- yast2-qt-2.13.54.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt.spec ++++++ --- /var/tmp/diff_new_pack.5rRayj/_old 2006-05-07 16:49:30.000000000 +0200 +++ /var/tmp/diff_new_pack.5rRayj/_new 2006-05-07 16:49:30.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-qt (Version 2.13.53) +# spec file for package yast2-qt (Version 2.13.54) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-qt -Version: 2.13.53 +Version: 2.13.54 Release: 2 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-qt-2.13.53.tar.bz2 +Source0: yast2-qt-2.13.54.tar.bz2 prefix: /usr BuildRequires: boost-devel curl-devel dbus-1-devel docbook-xsl-stylesheets doxygen hal-devel libdrm-devel libjpeg-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer qt3-devel rpm-devel sgml-skel update-desktop-files yast2-core-devel yast2-devtools Summary: YaST2 - Graphical User Interface @@ -42,7 +42,7 @@ Stefan Hundhammer <sh(a)suse.de> %prep -%setup -n yast2-qt-2.13.53 +%setup -n yast2-qt-2.13.54 %build %{prefix}/bin/y2tool y2autoconf @@ -80,6 +80,9 @@ %doc %{prefix}/share/doc/packages/yast2-qt %changelog -n yast2-qt +* Thu May 04 2006 - sh(a)suse.de +- V 2.13.54 +- Messages back from proofreading * Fri Apr 28 2006 - sh(a)suse.de - V 2.13.53 - Disabled patches view in package selector (non-YOU-mode) ++++++ yast2-qt-2.13.53.tar.bz2 -> yast2-qt-2.13.54.tar.bz2 ++++++ ++++ 1850 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-qt-2.13.53/VERSION new/yast2-qt-2.13.54/VERSION --- old/yast2-qt-2.13.53/VERSION 2006-04-28 12:20:49.000000000 +0200 +++ new/yast2-qt-2.13.54/VERSION 2006-05-04 12:32:34.000000000 +0200 @@ -1 +1 @@ -2.13.53 +2.13.54 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-qt-2.13.53/configure.in new/yast2-qt-2.13.54/configure.in --- old/yast2-qt-2.13.53/configure.in 2006-04-28 12:32:04.000000000 +0200 +++ new/yast2-qt-2.13.54/configure.in 2006-05-04 12:34:13.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-qt dnl -dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-qt, 2.13.53, http://bugs.opensuse.org/, yast2-qt) +AC_INIT(yast2-qt, 2.13.54, http://bugs.opensuse.org/, yast2-qt) 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.13.53" +VERSION="2.13.54" RPMNAME="yast2-qt" MAINTAINER="Stefan Hundhammer <sh(a)suse.de>" 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-qt-2.13.53/src/YQPackageSelectorHelp.cc new/yast2-qt-2.13.54/src/YQPackageSelectorHelp.cc --- old/yast2-qt-2.13.53/src/YQPackageSelectorHelp.cc 2006-03-09 14:48:34.000000000 +0100 +++ new/yast2-qt-2.13.54/src/YQPackageSelectorHelp.cc 2006-05-04 12:32:19.000000000 +0200 @@ -62,8 +62,8 @@ // affect the amount of visible packages in the package list and "details views" ( below the package list ) // that show details about the ( one ) currently selected package in the package list. - html += para( _( "In addition to \"patches\", you can also select one of the other filter views" - " from the Filter combo-box at the upper left:" ) ); + html += para( _( "In addition to Patches, you can also select one of the other filter views" + " from Filter at the upper left:" ) ); html += "<ul>"; } else // ! _youMode 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-qt-2.13.53/src/YQPkgChangeLogView.cc new/yast2-qt-2.13.54/src/YQPkgChangeLogView.cc --- old/yast2-qt-2.13.53/src/YQPkgChangeLogView.cc 2006-03-23 12:10:14.000000000 +0100 +++ new/yast2-qt-2.13.54/src/YQPkgChangeLogView.cc 2006-05-03 17:27:33.000000000 +0200 @@ -63,7 +63,7 @@ } else { - html += "" + _( "Information only available for installed packages" ) + ""; + html += "" + _( "Information only available for installed packages." ) + ""; } setTextFormat( Qt::RichText ); 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-qt-2.13.53/src/YQPkgFileListView.cc new/yast2-qt-2.13.54/src/YQPkgFileListView.cc --- old/yast2-qt-2.13.53/src/YQPkgFileListView.cc 2006-03-23 12:10:22.000000000 +0100 +++ new/yast2-qt-2.13.54/src/YQPkgFileListView.cc 2006-05-03 17:27:28.000000000 +0200 @@ -65,7 +65,7 @@ } else { - html += "" + _( "Information only available for installed packages" ) + ""; + html += "" + _( "Information only available for installed packages." ) + ""; } setTextFormat( Qt::RichText ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-printer
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package yast2-printer checked in at Sun May 7 16:49:24 CEST 2006. -------- --- yast2-printer/yast2-printer.changes 2006-04-29 12:28:55.000000000 +0200 +++ STABLE/yast2-printer/yast2-printer.changes 2006-05-04 13:44:12.000000000 +0200 @@ -2 +2 @@ -Sat Apr 29 12:28:44 CEST 2006 - aj(a)suse.de +Thu May 4 13:25:04 CEST 2006 - mzugec(a)suse.cz @@ -4 +4,2 @@ -- Fix testsuite to build again. +- merged texts from proofread +- 2.13.14 Old: ---- testsuite.diff yast2-printer-2.13.13.tar.bz2 New: ---- yast2-printer-2.13.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-printer.spec ++++++ --- /var/tmp/diff_new_pack.ajC6H5/_old 2006-05-07 16:49:09.000000000 +0200 +++ /var/tmp/diff_new_pack.ajC6H5/_new 2006-05-07 16:49:09.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-printer (Version 2.13.13) +# spec file for package yast2-printer (Version 2.13.14) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,13 +11,12 @@ # norootforbuild Name: yast2-printer -Version: 2.13.13 -Release: 3 +Version: 2.13.14 +Release: 2 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-printer-2.13.13.tar.bz2 -Patch: testsuite.diff +Source0: yast2-printer-2.13.14.tar.bz2 prefix: /usr BuildRequires: blocxx-devel cups-devel cups-drivers cups-drivers-stp docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 netcat zlib blocxx @@ -34,8 +33,7 @@ %prep -%setup -n yast2-printer-2.13.13 -%patch +%setup -n yast2-printer-2.13.14 %build %{prefix}/bin/y2tool y2autoconf @@ -102,8 +100,9 @@ %doc %{prefix}/share/doc/packages/yast2-printer %changelog -n yast2-printer -* Sat Apr 29 2006 - aj(a)suse.de -- Fix testsuite to build again. +* Thu May 04 2006 - mzugec(a)suse.cz +- merged texts from proofread +- 2.13.14 * Fri Apr 28 2006 - mzugec(a)suse.cz - fixed #169689 - warning for propose button * Fri Apr 28 2006 - mzugec(a)suse.cz ++++++ yast2-printer-2.13.13.tar.bz2 -> yast2-printer-2.13.14.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.13/VERSION new/yast2-printer-2.13.14/VERSION --- old/yast2-printer-2.13.13/VERSION 2006-04-28 13:17:42.000000000 +0200 +++ new/yast2-printer-2.13.14/VERSION 2006-05-04 13:28:04.000000000 +0200 @@ -1 +1 @@ -2.13.13 +2.13.14 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.13/configure new/yast2-printer-2.13.14/configure --- old/yast2-printer-2.13.13/configure 2006-04-28 12:56:12.000000000 +0200 +++ new/yast2-printer-2.13.14/configure 2006-05-04 13:29:48.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-printer 2.13.13. +# Generated by GNU Autoconf 2.59 for yast2-printer 2.13.14. # # Report bugs to <http://www.suse.de/feedback>. # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='yast2-printer' PACKAGE_TARNAME='yast2-printer' -PACKAGE_VERSION='2.13.13' -PACKAGE_STRING='yast2-printer 2.13.13' +PACKAGE_VERSION='2.13.14' +PACKAGE_STRING='yast2-printer 2.13.14' PACKAGE_BUGREPORT='http://www.suse.de/feedback' ac_unique_file="RPMNAME" @@ -959,7 +959,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-printer 2.13.13 to adapt to many kinds of systems. +\`configure' configures yast2-printer 2.13.14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1026,7 +1026,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-printer 2.13.13:";; + short | recursive ) echo "Configuration of yast2-printer 2.13.14:";; esac cat <<\_ACEOF @@ -1169,7 +1169,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-printer configure 2.13.13 +yast2-printer configure 2.13.14 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1183,7 +1183,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-printer $as_me 2.13.13, which was +It was created by yast2-printer $as_me 2.13.14, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1913,7 +1913,7 @@ # Define the identity of the package. PACKAGE='yast2-printer' - VERSION='2.13.13' + VERSION='2.13.14' cat >>confdefs.h <<_ACEOF @@ -2124,7 +2124,7 @@ -VERSION="2.13.13" +VERSION="2.13.14" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -22774,7 +22774,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-printer $as_me 2.13.13, which was +This file was extended by yast2-printer $as_me 2.13.14, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22837,7 +22837,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-printer config.status 2.13.13 +yast2-printer config.status 2.13.14 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.13/configure.in new/yast2-printer-2.13.14/configure.in --- old/yast2-printer-2.13.13/configure.in 2006-04-28 12:55:52.000000000 +0200 +++ new/yast2-printer-2.13.14/configure.in 2006-05-04 13:29:28.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-printer, 2.13.13, http://www.suse.de/feedback, yast2-printer) +AC_INIT(yast2-printer, 2.13.14, http://www.suse.de/feedback, yast2-printer) 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.13.13" +VERSION="2.13.14" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.13/src/common/helps.ycp new/yast2-printer-2.13.14/src/common/helps.ycp --- old/yast2-printer-2.13.13/src/common/helps.ycp 2006-03-21 08:59:06.000000000 +0100 +++ new/yast2-printer-2.13.14/src/common/helps.ycp 2006-05-04 13:28:03.000000000 +0200 @@ -9,7 +9,7 @@ * Petr Blahos <pblahos(a)suse.cz> * Jiri Srain <jsrain(a)suse.cz> * - * $Id: helps.ycp 28798 2006-03-10 07:26:26Z mzugec $ + * $Id: helps.ycp 30684 2006-05-04 11:26:07Z locilka $ * Help texts. */ { @@ -118,7 +118,7 @@ define string getHelpCupsExperts() ``{ string help = _("Expert CUPS Settings") - + _("Select the CUPS settings to configure"); + + _("Select the CUPS settings to configure."); return help; }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.13/src/cups/dialogs-cups.ycp new/yast2-printer-2.13.14/src/cups/dialogs-cups.ycp --- old/yast2-printer-2.13.13/src/cups/dialogs-cups.ycp 2006-04-28 13:16:12.000000000 +0200 +++ new/yast2-printer-2.13.14/src/cups/dialogs-cups.ycp 2006-05-04 13:28:03.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Petr Blahos <pblahos(a)suse.cz> * - * $Id: dialogs-cups.ycp 30573 2006-04-28 11:16:06Z mzugec $ + * $Id: dialogs-cups.ycp 30684 2006-05-04 11:26:07Z locilka $ * * Main dialogs. */ @@ -1045,7 +1045,7 @@ break; else if (`propose_server == ret) { - if ((size(addresses)>0 && Popup::ContinueCancel(_("Really replace with proposed value?")))||(size(addresses)==0)){ + if ((size(addresses)>0 && Popup::ContinueCancel(_("Really replace with the suggested value?")))||(size(addresses)==0)){ CUPS::ProposeServerSettings (); addresses = CUPS::cups_server_settings["BrowseAddress"]:[]; UI::ReplaceWidget (`id (`replace_addr), `SelectionBox (`id (`addr), _("Browse Addre&sses"), addresses)); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.13/src/modules/Printer.ycp new/yast2-printer-2.13.14/src/modules/Printer.ycp --- old/yast2-printer-2.13.13/src/modules/Printer.ycp 2006-04-28 11:11:25.000000000 +0200 +++ new/yast2-printer-2.13.14/src/modules/Printer.ycp 2006-05-04 13:28:03.000000000 +0200 @@ -12,7 +12,7 @@ * Petr Blahos <pblahos(a)suse.cz> * Jiri Srain <jsrain(a)suse.cz> * - * $Id: Printer.ycp 30564 2006-04-28 09:11:21Z mzugec $ + * $Id: Printer.ycp 30684 2006-05-04 11:26:07Z locilka $ * * Well we all know what modules are for. */ @@ -1602,7 +1602,7 @@ // to translators: error popup when cups daemon cannot execute backend for printer connection // or connection type is not in list of available connections - string to_translate2 = _("An appropriate back-end is not available"); + string to_translate2 = _("An appropriate back-end is not available."); if (Spooler::Get () == "cups" && CUPS::InstallationType () == `client) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.13/testsuite/tests/cupsWrite.out new/yast2-printer-2.13.14/testsuite/tests/cupsWrite.out --- old/yast2-printer-2.13.13/testsuite/tests/cupsWrite.out 2006-03-21 08:59:09.000000000 +0100 +++ new/yast2-printer-2.13.14/testsuite/tests/cupsWrite.out 2006-05-02 10:26:53.000000000 +0200 @@ -13,7 +13,6 @@ Write .cups.default_dest "" true Write .target.ycp "/var/lib/YaST2/printers" $["cups_usb_devices":`always, "drivers_were_installed":nil, "printers":[], "version":523] true Execute .target.bash "/bin/chmod 600 /var/lib/YaST2/printers" 0 -Log restarting spooler by restartServices() Execute .target.bash "test -f /etc/init.d/lpd && /etc/init.d/lpd stop" 0 Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups stop" 0 Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups start" 0 @@ -39,7 +38,6 @@ Write .cups.default_dest "lp" true Write .target.ycp "/var/lib/YaST2/printers" $["cups_usb_devices":`always, "drivers_were_installed":nil, "printers":[$["name":"lp", "uri":"parallel://dev/lp0"]], "version":523] true Execute .target.bash "/bin/chmod 600 /var/lib/YaST2/printers" 0 -Log restarting spooler by restartServices() Execute .target.bash "test -f /etc/init.d/lpd && /etc/init.d/lpd stop" 0 Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups stop" 0 Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups start" 0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-packager
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package yast2-packager checked in at Sun May 7 16:49:02 CEST 2006. -------- --- yast2-packager/yast2-packager.changes 2006-05-03 13:42:58.000000000 +0200 +++ STABLE/yast2-packager/yast2-packager.changes 2006-05-04 13:06:31.000000000 +0200 @@ -1,0 +2,28 @@ +Thu May 4 13:06:15 CEST 2006 - locilka(a)suse.cz + +- Merged text from proofreading +- 2.13.108 + +------------------------------------------------------------------- +Tue May 2 21:33:20 CEST 2006 - locilka(a)suse.cz + +- Allways install from all media when Packages::metadir_used is set + to true. This adds the missing functionality to the previous fix. +- 2.13.107 + +------------------------------------------------------------------- +Tue May 2 15:08:42 CEST 2006 - locilka(a)suse.cz + +- Splitting inst_rpmcopy source code into smaller functions +- Calling first stage installation packages commit limited to first + media, unlimited in other cases (such as second stage + installation) (#170079) +- 2.13.106 + +------------------------------------------------------------------- +Tue May 2 14:43:30 CEST 2006 - mvidner(a)suse.cz + +- Reverted the redirection, ag_background will be changed instead + (#169648#c39). + +------------------------------------------------------------------- Old: ---- yast2-packager-2.13.105.tar.bz2 New: ---- yast2-packager-2.13.108.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.lh5LQx/_old 2006-05-07 16:48:54.000000000 +0200 +++ /var/tmp/diff_new_pack.lh5LQx/_new 2006-05-07 16:48:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.13.105) +# spec file for package yast2-packager (Version 2.13.108) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-packager -Version: 2.13.105 -Release: 1 +Version: 2.13.108 +Release: 2 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.13.105.tar.bz2 +Source0: yast2-packager-2.13.108.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml Requires: yast2 yast2-installation checkmedia yast2-country @@ -41,7 +41,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.13.105 +%setup -n yast2-packager-2.13.108 %build %{prefix}/bin/y2tool y2autoconf @@ -78,6 +78,22 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog -n yast2-packager +* Thu May 04 2006 - locilka(a)suse.cz +- Merged text from proofreading +- 2.13.108 +* Tue May 02 2006 - locilka(a)suse.cz +- Allways install from all media when Packages::metadir_used is set + to true. This adds the missing functionality to the previous fix. +- 2.13.107 +* Tue May 02 2006 - locilka(a)suse.cz +- Splitting inst_rpmcopy source code into smaller functions +- Calling first stage installation packages commit limited to first + media, unlimited in other cases (such as second stage + installation) (#170079) +- 2.13.106 +* Tue May 02 2006 - mvidner(a)suse.cz +- Reverted the redirection, ag_background will be changed instead + (#169648#c39). * Tue May 02 2006 - mvidner(a)suse.cz - Redirect rug stdout to null because it can block (#169648). - Sometimes rug ping gives the exit code 0xff_ffff_ffff_ffff so ++++++ yast2-packager-2.13.105.tar.bz2 -> yast2-packager-2.13.108.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.105/VERSION new/yast2-packager-2.13.108/VERSION --- old/yast2-packager-2.13.105/VERSION 2006-05-03 13:51:58.000000000 +0200 +++ new/yast2-packager-2.13.108/VERSION 2006-05-04 13:06:02.000000000 +0200 @@ -1 +1 @@ -2.13.105 +2.13.108 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.105/configure new/yast2-packager-2.13.108/configure --- old/yast2-packager-2.13.105/configure 2006-05-03 13:53:43.000000000 +0200 +++ new/yast2-packager-2.13.108/configure 2006-05-04 15:24:01.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.105. +# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.108. # # Report bugs to <http://www.suse.de/feedback>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.13.105' -PACKAGE_STRING='yast2-packager 2.13.105' +PACKAGE_VERSION='2.13.108' +PACKAGE_STRING='yast2-packager 2.13.108' PACKAGE_BUGREPORT='http://www.suse.de/feedback' ac_unique_file="RPMNAME" @@ -728,7 +728,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-packager 2.13.105 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.13.108 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.13.105:";; + short | recursive ) echo "Configuration of yast2-packager 2.13.108:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.13.105 +yast2-packager configure 2.13.108 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,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-packager $as_me 2.13.105, which was +It was created by yast2-packager $as_me 2.13.108, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.13.105' + VERSION='2.13.108' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.105" +VERSION="2.13.108" RPMNAME="yast2-packager" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -2695,7 +2695,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-packager $as_me 2.13.105, which was +This file was extended by yast2-packager $as_me 2.13.108, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2750,7 +2750,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-packager config.status 2.13.105 +yast2-packager config.status 2.13.108 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.105/configure.in new/yast2-packager-2.13.108/configure.in --- old/yast2-packager-2.13.105/configure.in 2006-05-03 13:53:39.000000000 +0200 +++ new/yast2-packager-2.13.108/configure.in 2006-05-04 15:23:57.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.13.105, http://www.suse.de/feedback, yast2-packager) +AC_INIT(yast2-packager, 2.13.108, http://www.suse.de/feedback, yast2-packager) 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.13.105" +VERSION="2.13.108" RPMNAME="yast2-packager" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.105/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.13.108/src/clients/inst_rpmcopy.ycp --- old/yast2-packager-2.13.105/src/clients/inst_rpmcopy.ycp 2006-05-03 13:42:48.000000000 +0200 +++ new/yast2-packager-2.13.108/src/clients/inst_rpmcopy.ycp 2006-05-04 13:07:03.000000000 +0200 @@ -13,7 +13,7 @@ * Packages module : * "installed" * - * $Id: inst_rpmcopy.ycp 29756 2006-04-05 16:09:06Z mvidner $ + * $Id: inst_rpmcopy.ycp 30678 2006-05-04 11:06:58Z locilka $ */ { @@ -500,54 +500,50 @@ // end of installation source caching functions // ------------------------------------------------------------------------------------------------------ - Pkg::SetLocale (Language::language); - - SlideShow::SetLanguage (Language::language); - - // start target, create new rpmdb if none is existing - // FIXME error checking is missing all around here, initialization could actually fail! - //Pkg::TargetInit (Installation::destdir, true); - if(Pkg::TargetInit (Installation::destdir,true) != true) - { - // continue-cancel popup - if(Popup::ContinueCancel(_("Initializing the target directory failed")) == false) - { - return `abort; - } - } - + // ------------------------------------------------------------------------------------------------------ + // begin of commit installation functions + // ------------------------------------------------------------------------------------------------------ - if (Stage::cont ()) - { - // initialize the package agent in continue mode - Packages::Init( true ); - RestoreDiskCacheSettings (); - } + void InstallRemainingAndBinarySource () { + // second stage of package installation, re-read list of remaining binary and source + // packages - SlideShow::OpenSlideShowDialog (); + list<string> remaining = (list<string>) SCR::Read (.target.ycp, ["/var/lib/YaST2/remaining", []]); + if (remaining == nil) + remaining = []; - Pkg::TargetLogfile (Installation::destdir + Directory::logdir + "/y2logRPM"); + list<string> srcremaining = (list<string>) SCR::Read (.target.ycp, ["/var/lib/YaST2/srcremaining", []]); + if (srcremaining == nil) + srcremaining = []; + string backupPath = (string) SCR::Read(.target.string, [Installation::destdir + "/var/lib/YaST2/backup_path", ""]); + if ( backupPath != nil && backupPath != "") + { + y2milestone("create package backups in %1",backupPath); + Pkg::CreateBackups (true); + Pkg::SetBackupPath (backupPath); + } - if (Mode::autoinst () - && Stage::cont ()) - { - import "AutoinstSoftware"; + integer failed_packages = 0; + y2milestone ("%1 binary packages remaining", size (remaining)); + foreach (string pkg, remaining, ``{ + if (! Pkg::PkgInstall (pkg)) + failed_packages = failed_packages + 1; + }); - // post packages from autoinstall - map <string, any> res = Pkg::DoProvide (AutoinstSoftware::post_packages); - if (size (res) > 0) + y2milestone ("%1 source packages remaining", size (srcremaining)); + foreach (string pkg, srcremaining, ``{ + if (! Pkg::PkgSrcInstall (pkg)) + failed_packages = failed_packages + 1; + }); + if (failed_packages > 0) { - foreach (string s, any a, res, ``{ - y2warning ("Pkg::DoProvide failed for %1: %2", s, a); - }); + // error report, %1 is number + Report::Error (sformat(_("Failed to select %1 packages for installation."), failed_packages)); } - - Pkg::PkgSolve (false); } - if (Stage::initial ()) // initial mode, move download area, check for source caching - { + void InstInitAndInitialSourceCaching () { map spaces = Pkg::TargetGetDU (); list root_info = spaces["/tmp"]:spaces["/tmp/"]:spaces["/"]:[]; integer total = root_info[0]:0; @@ -620,83 +616,30 @@ } } } - else // continue mode, check for remaining packages - { - // second stage of package installation, re-read list of remaining binary and source - // packages - - list<string> remaining = (list<string>) SCR::Read (.target.ycp, ["/var/lib/YaST2/remaining", []]); - if (remaining == nil) - remaining = []; - - list<string> srcremaining = (list<string>) SCR::Read (.target.ycp, ["/var/lib/YaST2/srcremaining", []]); - if (srcremaining == nil) - srcremaining = []; - - string backupPath = (string) SCR::Read(.target.string, [Installation::destdir + "/var/lib/YaST2/backup_path", ""]); - if ( backupPath != nil && backupPath != "") - { - y2milestone("create package backups in %1",backupPath); - Pkg::CreateBackups (true); - Pkg::SetBackupPath (backupPath); - } - integer failed_packages = 0; - y2milestone ("%1 binary packages remaining", size (remaining)); - foreach (string pkg, remaining, ``{ - if (! Pkg::PkgInstall (pkg)) - failed_packages = failed_packages + 1; - }); + void AutoinstPostPackages () { + import "AutoinstSoftware"; - y2milestone ("%1 source packages remaining", size (srcremaining)); - foreach (string pkg, srcremaining, ``{ - if (! Pkg::PkgSrcInstall (pkg)) - failed_packages = failed_packages + 1; - }); - if (failed_packages > 0) + // post packages from autoinstall + map <string, any> res = Pkg::DoProvide (AutoinstSoftware::post_packages); + if (size (res) > 0) { - // error report, %1 is number - Report::Error (sformat(_("Failed to select %1 packages for installation"), failed_packages)); + foreach (string s, any a, res, ``{ + y2warning ("Pkg::DoProvide failed for %1: %2", s, a); + }); } - } - - // Install the software from Medium1 to Mediummax, but not the already - // installed base packages. - // This part is also used for installation in running system (Stage::cont ()) - - integer maxnumbercds = 10; - integer current_cd_no = 1; - if (Stage::initial ()) - { - maxnumbercds = 1; // only the first CD will be installed - } - else if (Mode::autoinst () && Stage::cont () && size( AutoinstSoftware::post_packages ) > 0) - { - // one more compatibility feature to old YaST, post-packages - // Simply install a list of package after initial installation (only - // makes sense with nfs installatons) - current_cd_no = 1; - } - else if (Stage::cont ()) - { - current_cd_no = 2; // continue with second CD but only in continue mode - } - else if (DirInstall::installing_into_dir) - { - current_cd_no = 1; + Pkg::PkgSolve (false); } - if (Packages::metadir_used) // all is in ramdisk - { - current_cd_no = 0; // we can install all sources now - maxnumbercds = 0; - } + symbol InstallPackagesFromMedia (integer current_cd_no, integer maxnumbercds) { + symbol result = `next; - symbol result = `next; + y2milestone("Installing packages from media %1 -> %2", current_cd_no, maxnumbercds); - while (current_cd_no <= maxnumbercds) - { + // 1->1 for default fist stage installation + // 0->0 for default second stage (or other) installation + while (current_cd_no <= maxnumbercds) { boolean go_on = true; list<map<string,any> > pkgs = Pkg::ResolvableProperties ("", `package, ""); pkgs = filter (map<string,any> p, pkgs, { @@ -758,8 +701,108 @@ break; current_cd_no = current_cd_no + 1; + } + return result; } + map <string, integer> CountStartingAndMaxMediaNumber () { + // Bugzilla #170079 + // Default - unrestricted + map <string, integer> ret = $["maxnumbercds" : 0, "current_cd_no" : 0]; + + + if (Packages::metadir_used) { + // all is in ramdisk, we can install all sources now, works in every stage + ret["current_cd_no"] = 0; + ret["maxnumbercds"] = 0; + y2milestone("StartingAndMaxMediaNumber: MetaDir used %1/%2", ret["current_cd_no"]:nil, ret["maxnumbercds"]:nil); + } else if (Stage::initial ()) { + // only the first CD will be installed + ret["current_cd_no"] = 1; + ret["maxnumbercds"] = 1; + y2milestone("StartingAndMaxMediaNumber: Stage initial %1/%2", ret["current_cd_no"]:nil, ret["maxnumbercds"]:nil); + + // Three following cases have the same solution, CDstart = 0, CDfinish = 0 + // ZYPP should solve what it needs and when. + // Leaving it here as the backward compatibility if someone decides to change it back. + + } else if (Mode::autoinst () && Stage::cont () && size( AutoinstSoftware::post_packages ) > 0) { + // one more compatibility feature to old YaST, post-packages + // Simply install a list of package after initial installation (only + // makes sense with nfs installatons) + ret["current_cd_no"] = 0; // was 1 + ret["maxnumbercds"] = 0; // was 10 + y2milestone("StartingAndMaxMediaNumber: Autoinst in cont %1/%2", ret["current_cd_no"]:nil, ret["maxnumbercds"]:nil); + } else if (Stage::cont ()) { + // continue with second CD but only in continue mode + // bug #170079, let zypp solve needed CDs + ret["current_cd_no"] = 0; + ret["maxnumbercds"] = 0; + y2milestone("StartingAndMaxMediaNumber: Stage cont %1/%2", ret["current_cd_no"]:nil, ret["maxnumbercds"]:nil); + } else if (DirInstall::installing_into_dir) { + // All in one + ret["current_cd_no"] = 0; // was 1 + ret["maxnumbercds"] = 0; // was 10 + y2milestone("StartingAndMaxMediaNumber: Dir install %1/%2", ret["current_cd_no"]:nil, ret["maxnumbercds"]:nil); + } + } + + // ------------------------------------------------------------------------------------------------------ + // end of commit installation functions + // ------------------------------------------------------------------------------------------------------ + + Pkg::SetLocale (Language::language); + + SlideShow::SetLanguage (Language::language); + + // start target, create new rpmdb if none is existing + // FIXME error checking is missing all around here, initialization could actually fail! + //Pkg::TargetInit (Installation::destdir, true); + if(Pkg::TargetInit (Installation::destdir,true) != true) + { + // continue-cancel popup + if(Popup::ContinueCancel(_("Initializing the target directory failed")) == false) + { + return `abort; + } + } + + + if (Stage::cont ()) + { + // initialize the package agent in continue mode + Packages::Init( true ); + RestoreDiskCacheSettings (); + } + + SlideShow::OpenSlideShowDialog (); + + Pkg::TargetLogfile (Installation::destdir + Directory::logdir + "/y2logRPM"); + + + if (Mode::autoinst () && Stage::cont ()) { + AutoinstPostPackages(); + } + + // initial mode, move download area, check for source caching + if (Stage::initial ()) { + InstInitAndInitialSourceCaching(); + // continue mode, check for remaining packages + } else { + InstallRemainingAndBinarySource(); + } + + // Install the software from Medium1 to Mediummax, but not the already + // installed base packages. + // This part is also used for installation in running system (Stage::cont ()) + + map <string, integer> cdnumbers = CountStartingAndMaxMediaNumber(); + integer maxnumbercds = cdnumbers["maxnumbercds"]:10; + integer current_cd_no = cdnumbers["current_cd_no"]:1; + + // install packages from CD current_cd_no to CD maxnumbercds + symbol result = InstallPackagesFromMedia (current_cd_no, maxnumbercds); + // sync package manager FIXME if (result != `abort) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.105/src/clients/inst_source.ycp new/yast2-packager-2.13.108/src/clients/inst_source.ycp --- old/yast2-packager-2.13.105/src/clients/inst_source.ycp 2006-05-03 13:42:48.000000000 +0200 +++ new/yast2-packager-2.13.108/src/clients/inst_source.ycp 2006-05-04 11:30:29.000000000 +0200 @@ -355,7 +355,7 @@ if( ! restore ) { Popup::Error(_("There were errors when restoring the source configuration. -Not all sources will be available for configuration. +Not all sources are available for configuration. ") + "\n" + Pkg::LastError() ); // delete the broken sources from the persistent store diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.105/src/clients/sw_single.ycp new/yast2-packager-2.13.108/src/clients/sw_single.ycp --- old/yast2-packager-2.13.105/src/clients/sw_single.ycp 2006-05-03 13:42:48.000000000 +0200 +++ new/yast2-packager-2.13.108/src/clients/sw_single.ycp 2006-05-04 13:07:03.000000000 +0200 @@ -7,7 +7,7 @@ * Purpose: contains dialog loop for workflows: * "Install/Remove software" * - * $Id: sw_single.ycp 30494 2006-04-26 12:31:48Z mvidner $ + * $Id: sw_single.ycp 30678 2006-05-04 11:06:58Z locilka $ */ { @@ -172,8 +172,8 @@ if (size(Pkg::SourceGetCurrent(enabled_only)) == 0) { - Report::Warning(_("No installation source is defined, -only installed packages will be displayed.")); + Report::Warning(_("No installation source is defined. +Only installed packages are displayed.")); } Pkg::TargetInit (Installation::destdir, false); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.105/src/modules/PackageInstallation.ycp new/yast2-packager-2.13.108/src/modules/PackageInstallation.ycp --- old/yast2-packager-2.13.105/src/modules/PackageInstallation.ycp 2006-05-03 13:42:51.000000000 +0200 +++ new/yast2-packager-2.13.108/src/modules/PackageInstallation.ycp 2006-05-02 13:34:43.000000000 +0200 @@ -81,6 +81,8 @@ global define list CommitPackages (integer media_number, integer packages_installed) { + y2milestone("CommitPackages called: media nr. %1, packages %2", media_number, packages_installed); + if ( Mode::test () ) { FakePackager( [], diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.105/src/modules/Packages.ycp new/yast2-packager-2.13.108/src/modules/Packages.ycp --- old/yast2-packager-2.13.105/src/modules/Packages.ycp 2006-05-03 13:42:51.000000000 +0200 +++ new/yast2-packager-2.13.108/src/modules/Packages.ycp 2006-05-04 13:07:03.000000000 +0200 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: Packages.ycp 30501 2006-04-26 14:58:51Z jsrain $ + * $Id: Packages.ycp 30678 2006-05-04 11:06:58Z locilka $ */ { @@ -625,7 +625,7 @@ string sp_url = "dir:" + spdir; integer sp_source = Pkg::SourceCreate (sp_url, ""); if (sp_source == -1) - Report::Error (_("Failed to integrate service pack source")); + Report::Error (_("Failed to integrate service pack source.")); else { theSources = add (theSources, sp_source); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.105/src/modules/SourceManager.ycp new/yast2-packager-2.13.108/src/modules/SourceManager.ycp --- old/yast2-packager-2.13.105/src/modules/SourceManager.ycp 2006-05-03 13:42:51.000000000 +0200 +++ new/yast2-packager-2.13.108/src/modules/SourceManager.ycp 2006-05-04 13:07:03.000000000 +0200 @@ -7,7 +7,7 @@ * Martin Vidner <mvidner(a)suse.cz> * Status: Work in Progress * - * $Id: SourceManager.ycp 30603 2006-05-02 11:12:10Z mvidner $ + * $Id: SourceManager.ycp 30678 2006-05-04 11:06:58Z locilka $ * * Representation of the configuration of source-manager. * Input and output routines. @@ -869,17 +869,14 @@ string owner = "zypp"; // not stype: #168739 string command = nil; - // Redirect rug stdout to null because (due to a bug in ag_background?) - // it can block: #169648 - // But we still need stderr, this is half-baked. if (adding) { command = sformat ( - "/usr/bin/rug service-add --type='%3' '%1' '%2' >/dev/null && /usr/bin/rug subscribe '%1' >/dev/null", + "/usr/bin/rug service-add --type='%3' '%1' '%2' && /usr/bin/rug subscribe '%1'", url, name, owner ); } else { - command = sformat ("/usr/bin/rug service-delete '%1' >/dev/null", url); + command = sformat ("/usr/bin/rug service-delete '%1'", url); } map ret = RunLong (command); // #165145 if (ret["exit"]:nil == 0) { @@ -887,8 +884,8 @@ } else { string message = adding? // rug is a command name - _("rug failed to add a ZYPP service"): - _("rug failed to delete a ZYPP service"); + _("Your service was added successfully in YaST, but could not be synchronized with ZenWorks."): + _("Your service was deleted successfully in YaST, but could not be synchronized with ZenWorks."); message = message + ":"; if (ret["stdout"]:[] != []) message = message + "\n" + mergestring (ret["stdout"]:[], "\n"); @@ -896,7 +893,7 @@ message = message + "\n" + mergestring (ret["stderr"]:[], "\n"); else if (haskey (ret, "timed_out")) // error message - message = message + "\n" + sformat (_("Command timed out after %1 msec."), ret["timed_out"]:1000); + message = message + "\n" + sformat (_("Command timed out after %1 milliseconds."), ret["timed_out"]:1000); Report::LongError (message); return false; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-ncurses
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package yast2-ncurses checked in at Sun May 7 16:48:48 CEST 2006. -------- --- yast2-ncurses/yast2-ncurses.changes 2006-05-03 11:13:41.000000000 +0200 +++ STABLE/yast2-ncurses/yast2-ncurses.changes 2006-05-04 14:21:49.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 4 14:21:09 CEST 2006 - gs(a)suse.de + +- messages from proofread merged back +- 2.13.28 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-2.13.27.tar.bz2 New: ---- yast2-ncurses-2.13.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.gXesAT/_old 2006-05-07 16:48:43.000000000 +0200 +++ /var/tmp/diff_new_pack.gXesAT/_new 2006-05-07 16:48:43.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.13.27) +# spec file for package yast2-ncurses (Version 2.13.28) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-ncurses -Version: 2.13.27 -Release: 1 +Version: 2.13.28 +Release: 2 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.13.27.tar.bz2 +Source0: yast2-ncurses-2.13.28.tar.bz2 prefix: /usr BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel @@ -40,7 +40,7 @@ %prep -%setup -n yast2-ncurses-2.13.27 +%setup -n yast2-ncurses-2.13.28 %build %{prefix}/bin/y2tool y2autoconf @@ -73,6 +73,9 @@ %doc %{prefix}/share/doc/packages/yast2-ncurses %changelog -n yast2-ncurses +* Thu May 04 2006 - gs(a)suse.de +- messages from proofread merged back +- 2.13.28 * Wed May 03 2006 - gs(a)suse.de - Online Update: show text "No patches available" if the patch list is empty - 2.13.27 ++++++ yast2-ncurses-2.13.27.tar.bz2 -> yast2-ncurses-2.13.28.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.27/Makefile.am new/yast2-ncurses-2.13.28/Makefile.am --- old/yast2-ncurses-2.13.27/Makefile.am 2006-04-24 12:25:08.000000000 +0200 +++ new/yast2-ncurses-2.13.28/Makefile.am 2006-05-04 14:23:44.000000000 +0200 @@ -8,6 +8,7 @@ #where devtools are PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -95,7 +96,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -116,7 +117,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -143,20 +144,20 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -200,12 +201,12 @@ fi check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + $(Y2TOOL) check-textdomain $(srcdir) stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.27/Makefile.in new/yast2-ncurses-2.13.28/Makefile.in --- old/yast2-ncurses-2.13.27/Makefile.in 2006-04-24 12:25:28.000000000 +0200 +++ new/yast2-ncurses-2.13.28/Makefile.in 2006-05-04 14:24:03.000000000 +0200 @@ -237,6 +237,7 @@ #where devtools are PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) @@ -266,7 +267,7 @@ $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) $(am__append_1) @CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc @CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion # test ! -d $(srcdir)/po \ # || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } # Contents of ./SUBDIRS @@ -792,7 +793,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -813,7 +814,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -840,15 +841,15 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local @@ -895,12 +896,12 @@ fi check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + $(Y2TOOL) check-textdomain $(srcdir) stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules checkpo: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.27/VERSION new/yast2-ncurses-2.13.28/VERSION --- old/yast2-ncurses-2.13.27/VERSION 2006-05-03 11:13:50.000000000 +0200 +++ new/yast2-ncurses-2.13.28/VERSION 2006-05-04 14:22:45.000000000 +0200 @@ -1 +1 @@ -2.13.27 +2.13.28 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.27/configure new/yast2-ncurses-2.13.28/configure --- old/yast2-ncurses-2.13.27/configure 2006-04-24 12:25:21.000000000 +0200 +++ new/yast2-ncurses-2.13.28/configure 2006-05-04 14:23:56.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-ncurses 2.13.24. +# Generated by GNU Autoconf 2.59 for yast2-ncurses 2.13.28. # # Report bugs to <http://www.suse.de/feedback>. # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ncurses' PACKAGE_TARNAME='yast2-ncurses' -PACKAGE_VERSION='2.13.24' -PACKAGE_STRING='yast2-ncurses 2.13.24' +PACKAGE_VERSION='2.13.28' +PACKAGE_STRING='yast2-ncurses 2.13.28' PACKAGE_BUGREPORT='http://www.suse.de/feedback' ac_unique_file="RPMNAME" @@ -971,7 +971,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-ncurses 2.13.24 to adapt to many kinds of systems. +\`configure' configures yast2-ncurses 2.13.28 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1038,7 +1038,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ncurses 2.13.24:";; + short | recursive ) echo "Configuration of yast2-ncurses 2.13.28:";; esac cat <<\_ACEOF @@ -1184,7 +1184,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-ncurses configure 2.13.24 +yast2-ncurses configure 2.13.28 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1198,7 +1198,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-ncurses $as_me 2.13.24, which was +It was created by yast2-ncurses $as_me 2.13.28, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1928,7 +1928,7 @@ # Define the identity of the package. PACKAGE='yast2-ncurses' - VERSION='2.13.24' + VERSION='2.13.28' cat >>confdefs.h <<_ACEOF @@ -2139,7 +2139,7 @@ -VERSION="2.13.24" +VERSION="2.13.28" RPMNAME="yast2-ncurses" MAINTAINER="Martin Lazar <mlazar(a)suse.cz>" @@ -20160,7 +20160,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-ncurses $as_me 2.13.24, which was +This file was extended by yast2-ncurses $as_me 2.13.28, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20223,7 +20223,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-ncurses config.status 2.13.24 +yast2-ncurses config.status 2.13.28 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.27/configure.in new/yast2-ncurses-2.13.28/configure.in --- old/yast2-ncurses-2.13.27/configure.in 2006-04-24 12:25:08.000000000 +0200 +++ new/yast2-ncurses-2.13.28/configure.in 2006-05-04 14:23:44.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-ncurses dnl -dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses, 2.13.24, http://www.suse.de/feedback, yast2-ncurses) +AC_INIT(yast2-ncurses, 2.13.28, http://www.suse.de/feedback, yast2-ncurses) 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.13.24" +VERSION="2.13.28" RPMNAME="yast2-ncurses" MAINTAINER="Martin Lazar <mlazar(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.27/src/you_layout.ycp new/yast2-ncurses-2.13.28/src/you_layout.ycp --- old/yast2-ncurses-2.13.27/src/you_layout.ycp 2006-05-03 09:16:58.000000000 +0200 +++ new/yast2-ncurses-2.13.28/src/you_layout.ycp 2006-05-04 14:23:10.000000000 +0200 @@ -7,7 +7,7 @@ * * ncurses layout for YOU * - * $Id: you_layout.ycp 30635 2006-05-03 07:16:32Z gs $ + * $Id: you_layout.ycp 30693 2006-05-04 12:23:02Z locilka $ */ { textdomain "packages"; @@ -19,7 +19,7 @@ `Left(`MenuButton( `opt(`key_F4), _( "&Filter" ), // menu items - keep them short and use unique hotkeys from begin: to end: // begin: - [ `item( `id("installablepatches"), _( "&YOU Patches" ) ), + [ `item( `id("installablepatches"), _( "&Patches" ) ), `item( `id("instpatches"), _( "Installed &Patches" ) ), `item( `id("allpatches"), _( "&All Patches" ) ), `item( `id("newpatches"), _( "&New Patches" ) ), ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-control-center
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package yast2-control-center checked in at Sun May 7 16:48:28 CEST 2006. -------- --- yast2-control-center/yast2-control-center.changes 2006-01-25 21:43:35.000000000 +0100 +++ STABLE/yast2-control-center/yast2-control-center.changes 2006-05-02 17:55:40.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 2 17:54:19 CEST 2006 - sreeves(a)suse.de + +- Fix for #170702 - add to Control Center. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-control-center.spec ++++++ --- /var/tmp/diff_new_pack.R3z0jT/_old 2006-05-07 16:48:16.000000000 +0200 +++ /var/tmp/diff_new_pack.R3z0jT/_new 2006-05-07 16:48:16.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package yast2-control-center (Version 2.13.2) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -13,7 +13,7 @@ Name: yast2-control-center BuildRequires: libdrm-devel libjpeg-devel pkgconfig qt3-devel update-desktop-files yast2-devtools Version: 2.13.2 -Release: 1 +Release: 14 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,7 +49,7 @@ d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done -%suse_update_desktop_file YaST SystemSetup Core-System +%suse_update_desktop_file -G "Administrator Settings" YaST SystemSetup Core-System X-SuSE-ControlCenter-System %clean rm -rf "$RPM_BUILD_ROOT" @@ -62,6 +62,8 @@ %doc %{prefix}/share/doc/packages/yast2-control-center %changelog -n yast2-control-center +* Tue May 02 2006 - sreeves(a)suse.de +- Fix for #170702 - add to Control Center. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Nov 21 2005 - sh(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-bootloader
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package yast2-bootloader checked in at Sun May 7 16:47:56 CEST 2006. -------- --- yast2-bootloader/yast2-bootloader.changes 2006-05-02 18:54:25.000000000 +0200 +++ STABLE/yast2-bootloader/yast2-bootloader.changes 2006-05-05 13:07:29.000000000 +0200 @@ -1,0 +2,12 @@ +Thu May 4 15:02:21 CEST 2006 - locilka(a)suse.cz + +- merged texts from proofread +- 2.13.57 + +------------------------------------------------------------------- +Thu May 4 11:02:00 CEST 2006 - jsrain(a)suse.cz + +- change the message before reboot if performing an SSH + installation (#160301) + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.13.56.tar.bz2 New: ---- yast2-bootloader-2.13.57.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.1tkHcX/_old 2006-05-07 16:47:43.000000000 +0200 +++ /var/tmp/diff_new_pack.1tkHcX/_new 2006-05-07 16:47:43.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.13.56) +# spec file for package yast2-bootloader (Version 2.13.57) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-bootloader -Version: 2.13.56 -Release: 1 +Version: 2.13.57 +Release: 2 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.13.56.tar.bz2 +Source0: yast2-bootloader-2.13.57.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite PreReq: /bin/sed %fillup_prereq @@ -60,7 +60,7 @@ Dan Meszaros %prep -%setup -n yast2-bootloader-2.13.56 +%setup -n yast2-bootloader-2.13.57 %build %{prefix}/bin/y2tool y2autoconf @@ -111,6 +111,12 @@ /usr/share/YaST2/clients/bootfloppy.ycp %changelog -n yast2-bootloader +* Thu May 04 2006 - locilka(a)suse.cz +- merged texts from proofread +- 2.13.57 +* Thu May 04 2006 - jsrain(a)suse.cz +- change the message before reboot if performing an SSH + installation (#160301) * Tue May 02 2006 - od(a)suse.de - on ppc, never create a "failsafe" section (#170565) - 2.13.56 ++++++ yast2-bootloader-2.13.56.tar.bz2 -> yast2-bootloader-2.13.57.tar.bz2 ++++++ ++++ 3080 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-bootloader-2.13.56/Makefile.am new/yast2-bootloader-2.13.57/Makefile.am --- old/yast2-bootloader-2.13.56/Makefile.am 2006-02-01 16:06:40.000000000 +0100 +++ new/yast2-bootloader-2.13.57/Makefile.am 2006-05-05 13:06:15.000000000 +0200 @@ -8,6 +8,7 @@ #where devtools are PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -95,7 +96,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -116,7 +117,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -143,20 +144,20 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages package-local +package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -199,10 +200,13 @@ false; \ fi +check-textdomain: + $(Y2TOOL) check-textdomain $(srcdir) + stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules 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-bootloader-2.13.56/VERSION new/yast2-bootloader-2.13.57/VERSION --- old/yast2-bootloader-2.13.56/VERSION 2006-05-02 18:52:43.000000000 +0200 +++ new/yast2-bootloader-2.13.57/VERSION 2006-05-05 13:03:45.000000000 +0200 @@ -1 +1 @@ -2.13.56 +2.13.57 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-bootloader-2.13.56/agents/cfg_bootloader.scr new/yast2-bootloader-2.13.57/agents/cfg_bootloader.scr --- old/yast2-bootloader-2.13.56/agents/cfg_bootloader.scr 2005-12-01 16:34:18.000000000 +0100 +++ new/yast2-bootloader-2.13.57/agents/cfg_bootloader.scr 2005-01-24 16:07:11.000000000 +0100 @@ -5,7 +5,7 @@ * SCR Agent for reading/writing /etc/sysconfig/bootloader * using the sysconfig-agent * - * $Id: cfg_bootloader.scr 12859 2003-11-28 10:17:50Z jsrain $ + * $Id: cfg_bootloader.scr,v 1.2 2003/11/28 10:17:50 jsrain Exp $ * * Read/Sets the values defined in <tt>/etc/sysconfig/bootloader</tt> * in an easy manner. 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-bootloader-2.13.56/configure.in new/yast2-bootloader-2.13.57/configure.in --- old/yast2-bootloader-2.13.56/configure.in 2006-02-01 16:06:39.000000000 +0100 +++ new/yast2-bootloader-2.13.57/configure.in 2006-05-05 13:06:14.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-bootloader dnl -dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-bootloader, 2.13.12, http://www.suse.de/feedback, yast2-bootloader) +AC_INIT(yast2-bootloader, 2.13.57, http://bugs.opensuse.org/, yast2-bootloader) 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.13.12" +VERSION="2.13.57" RPMNAME="yast2-bootloader" MAINTAINER="Olaf Dabrunz <od(a)suse.de>" 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-bootloader-2.13.56/src/clients/bootloader_finish.ycp new/yast2-bootloader-2.13.57/src/clients/bootloader_finish.ycp --- old/yast2-bootloader-2.13.56/src/clients/bootloader_finish.ycp 2006-03-29 18:16:14.000000000 +0200 +++ new/yast2-bootloader-2.13.57/src/clients/bootloader_finish.ycp 2006-05-05 13:02:23.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: bootloader_finish.ycp 29419 2006-03-27 13:37:34Z uli $ + * $Id: bootloader_finish.ycp 30703 2006-05-04 13:04:49Z locilka $ * */ @@ -19,6 +19,7 @@ import "Arch"; import "Bootloader"; import "Installation"; +import "Linuxrc"; import "Misc"; import "Mode"; import "Update"; @@ -89,25 +90,49 @@ if (Arch::s390 ()) { - // for s390: - // Message that will be displayed along with information - // how the boot loader was installed - Misc::boot_msg = _(" -Your system will now be shut down. + if (Linuxrc::usessh ()) + // for s390: + // Message that will be displayed along with information + // how the boot loader was installed + Misc::boot_msg = _(" +Your system will now shut down. After shutdown, reload the system with the load address of your root DASD or -the load address of your zFCP device. +the load adress of your zFCP device. +Then reconnect and run the following: +/usr/lib/YaST2/startup/YaST2.ssh For details, read the related chapter in the documentation. "); + else + // for s390: + // Message that will be displayed along with information + // how the boot loader was installed + Misc::boot_msg = _(" +Your system will shut down now. +After shutdown, reload the system +with the load address of your root DASD or +the load address of your zFCP device. +For details, read the relevant chapter +in the documentation. +"); } else { - // Final message after all packages from CD1 are installed - // and we're ready to start (boot into) the installed system - // Message that will be displayed along with information - // how the boot loader was installed - Misc::boot_msg = _("The system will reboot now..."); + if (Linuxrc::usessh ()) + // Final message after all packages from CD1 are installed + // and we're ready to start (boot into) the installed system + // Message that will be displayed along with information + // how the boot loader was installed + Misc::boot_msg = _("The system will reboot now. +After reboot, reconnect and run the following: +/usr/lib/YaST2/startup/YaST2.ssh"); + else + // Final message after all packages from CD1 are installed + // and we're ready to start (boot into) the installed system + // Message that will be displayed along with information + // how the boot loader was installed + Misc::boot_msg = _("The system will reboot now..."); } //-------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package yast2 checked in at Sun May 7 16:47:35 CEST 2006. -------- --- yast2/yast2.changes 2006-04-25 21:08:14.000000000 +0200 +++ STABLE/yast2/yast2.changes 2006-05-04 14:22:01.000000000 +0200 @@ -1,0 +2,14 @@ +Thu May 4 14:15:31 CEST 2006 - jsrain(a)suse.cz + +- read texts from control file (#170881) +- 2.13.56 + +------------------------------------------------------------------- +Wed May 3 17:45:59 CEST 2006 - locilka(a)suse.cz + +- Properly handle special string 'any' in 'EXT' zone in CWM for + firewall. Creating special functions in SuSEFirewall module for + that (#158520). +- 2.13.55 + +------------------------------------------------------------------- Old: ---- yast2-2.13.54.tar.bz2 New: ---- yast2-2.13.56.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.pls0Qs/_old 2006-05-07 16:47:05.000000000 +0200 +++ /var/tmp/diff_new_pack.pls0Qs/_new 2006-05-07 16:47:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.13.54) +# spec file for package yast2 (Version 2.13.56) # # Copyright (c) 2006 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.13.54 -Release: 1 +Version: 2.13.56 +Release: 2 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.13.54.tar.bz2 +Source0: yast2-2.13.56.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite # Need the new file popups @@ -93,7 +93,7 @@ Steffen Winterfeldt <snwint(a)suse.de> %prep -%setup -n yast2-2.13.54 +%setup -n yast2-2.13.56 %build %{prefix}/bin/y2tool y2autoconf @@ -192,6 +192,14 @@ %doc %{prefix}/share/doc/packages/yast2/wizard %changelog -n yast2 +* Thu May 04 2006 - jsrain(a)suse.cz +- read texts from control file (#170881) +- 2.13.56 +* Wed May 03 2006 - locilka(a)suse.cz +- Properly handle special string 'any' in 'EXT' zone in CWM for + firewall. Creating special functions in SuSEFirewall module for + that (#158520). +- 2.13.55 * Tue Apr 25 2006 - jsrain(a)suse.de - properly parse FTP URL (#166248, many others) - 2.13.54 ++++++ yast2-2.13.54.tar.bz2 -> yast2-2.13.56.tar.bz2 ++++++ ++++ 3951 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.13.54/Makefile.am new/yast2-2.13.56/Makefile.am --- old/yast2-2.13.54/Makefile.am 2006-04-25 20:48:37.000000000 +0200 +++ new/yast2-2.13.56/Makefile.am 2006-05-04 14:18:54.000000000 +0200 @@ -6,8 +6,7 @@ # (Edit ./SUBDIRS instead) # -#where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +PREFIX = /usr VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -31,10 +30,6 @@ extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) AUTOMAKE_OPTIONS = foreign dist-bzip2 -# where devtools instal m4 snippets -# argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ @@ -62,8 +57,12 @@ # info '(automake)Conditionals' if CREATE_PKGCONFIG +# pkg-config +# if a package does not have its own pc, copy the generic one +$(RPMNAME).pc.in: $(DEVTOOLS_DIR)/admin/generic.pc.in + test -f $@ || cp -p $< $@ # create the file here instead of by configure -# because the prerequisite is made here (not anymore!) +# because the prerequisite is made here # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' $(RPMNAME).pc: $(RPMNAME).pc.in @@ -154,7 +153,7 @@ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-all-packages package-local TAGVERSION = $(PREFIX)/bin/y2tool tagversion @@ -199,9 +198,6 @@ false; \ fi -check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) - stable: checkin-stable checkin-stable: package 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.13.54/Makefile.am.common new/yast2-2.13.56/Makefile.am.common --- old/yast2-2.13.54/Makefile.am.common 2006-04-25 20:48:37.000000000 +0200 +++ new/yast2-2.13.56/Makefile.am.common 2006-05-04 14:18:54.000000000 +0200 @@ -9,7 +9,7 @@ # suffix mapping: info '(make)Static Usage' # apply only to our modules, not external ones ${ybcfiles}: %.ybc: %.ycp $(ycpchook) - Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c -M. -I. -q $(YCPCFLAGS) $< + Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) $(bindir)/ycpc -c -M. -I. -q $(YCPCFLAGS) $< # files to clean CLEANFILES = ${ybcfiles} 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.13.54/VERSION new/yast2-2.13.56/VERSION --- old/yast2-2.13.54/VERSION 2006-04-25 20:41:59.000000000 +0200 +++ new/yast2-2.13.56/VERSION 2006-05-04 14:16:09.000000000 +0200 @@ -1 +1 @@ -2.13.54 +2.13.56 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.13.54/configure.in new/yast2-2.13.56/configure.in --- old/yast2-2.13.54/configure.in 2006-04-25 20:48:37.000000000 +0200 +++ new/yast2-2.13.56/configure.in 2006-05-04 14:18:54.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.13.54, http://www.suse.de/feedback, yast2) +AC_INIT(yast2, 2.13.56, http://www.suse.de/feedback, 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.13.54" +VERSION="2.13.56" RPMNAME="yast2" MAINTAINER="Stanislav Visnovsky <visnov(a)suse.cz>" @@ -120,8 +120,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --variable=ybindir yast2-devtools` +devtools_yast2dir=`pkg-config --variable=yast2dir yast2-devtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) @@ -148,10 +148,6 @@ if test "$YCPMAKEDEP" = "false"; then AC_MSG_ERROR([ycpmakedep is not installed]) fi -AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir) -if test "$YCPC" = "false"; then - AC_MSG_ERROR([ycpc is not installed]) -fi dnl Check packages expect and dejagnu AC_PATH_PROG(MYEXPECT, expect, 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-2.13.54/library/control/src/ProductControl.ycp new/yast2-2.13.56/library/control/src/ProductControl.ycp --- old/yast2-2.13.54/library/control/src/ProductControl.ycp 2006-04-20 22:47:52.000000000 +0200 +++ new/yast2-2.13.56/library/control/src/ProductControl.ycp 2006-05-04 14:16:03.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Product Control routines * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: ProductControl.ycp 30314 2006-04-20 20:45:52Z jsrain $ + * $Id: ProductControl.ycp 30689 2006-05-04 12:15:57Z jsrain $ */ { textdomain "base"; @@ -38,6 +38,9 @@ // modules to be offered to clone configuration at the end of installation global list<string> clone_modules = []; +// texts which are product specific +global map<string,string> texts = $[]; + // Location of a custom control file global string custom_control_file = ""; @@ -154,7 +157,12 @@ ProductFeatures::SetFeature ("partitioning", "FlexiblePartitioning", partitioning); } - + texts = mapmap (string key, map<string,string> text, + productControl["texts"]:$[], + { + string label = text["label"]:""; + return $[ key : label ]; + }); return 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.13.54/library/modules/Version.ycp new/yast2-2.13.56/library/modules/Version.ycp --- old/yast2-2.13.54/library/modules/Version.ycp 2006-04-25 20:48:58.000000000 +0200 +++ new/yast2-2.13.56/library/modules/Version.ycp 2006-05-04 14:19:23.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.13.54"; +global string yast2 = "2.13.56"; /* 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.13.54/library/network/src/CWMFirewallInterfaces.ycp new/yast2-2.13.56/library/network/src/CWMFirewallInterfaces.ycp --- old/yast2-2.13.54/library/network/src/CWMFirewallInterfaces.ycp 2006-04-07 22:40:52.000000000 +0200 +++ new/yast2-2.13.56/library/network/src/CWMFirewallInterfaces.ycp 2006-05-04 13:27:43.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Routines for selecting interfaces opened in firewall * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: CWMFirewallInterfaces.ycp 29707 2006-04-05 09:57:19Z locilka $ + * $Id: CWMFirewallInterfaces.ycp 30653 2006-05-03 15:49:14Z locilka $ * */ @@ -241,21 +241,45 @@ * @return a list of interfaces that will be opened */ list<string> Selected2Opened (list<string> ifaces, boolean nm_ifaces_have_to_be_selected) { + y2milestone("Selected ifaces: %1", ifaces); list<string> groups = maplist (string i, ifaces, { return SuSEFirewall::GetZoneOfInterface (i); }); - //if (nm_ifaces_have_to_be_selected) { - // groups = add (groups, SuSEFirewall::special_all_interface_zone); - //} + // string 'any' is in the EXT zone + // all interfaces without zone assigned are covered by this case + // so, check also the EXT zone + if (SuSEFirewall::IsAnyNetworkInterfaceSupported()) { + groups = add (groups, SuSEFirewall::special_all_interface_zone); + } groups = toset (groups); groups = filter (string g, groups, { return g != nil; }); list<list<string> > iface_groups = maplist (string g, groups, { - return SuSEFirewall::GetInterfacesInZone (g); + list <string> ifaces_also_supported_by_any = SuSEFirewall::GetInterfacesInZoneSupportingAnyFeature (g); + // If all interfaces in EXT zone are covered by the special 'any' string + // and none of these interfaces are selected to be open, we can remove all of them + // disable the service in whole EXT zone + if (g == SuSEFirewall::special_all_interface_zone) { + list <string> ifaces_left_explicitely = filter(string iface, ifaces_also_supported_by_any, { + return contains(ifaces, iface); + }); + y2milestone("Ifaces left in zone: %1", ifaces_left_explicitely); + // there are no interfaces left that would be explicitely mentioned in the EXT zone + if (ifaces_left_explicitely == []) { + return []; + // Hmm, some interfaces left + } else { + return ifaces_also_supported_by_any; + } + // Just report all interfaces mentioned in zone + } else { + return ifaces_also_supported_by_any; + } }); + y2milestone("Ifaces touched: %1", iface_groups); list<string> new_ifaces = toset (flatten (iface_groups)); new_ifaces = filter (string i, new_ifaces, { return i != nil; @@ -301,9 +325,29 @@ service_status = filter (string iface, boolean en, service_status, { return en; }); + y2milestone("Status: %1", service_status); allowed_interfaces = maplist (string iface, boolean en, service_status, { return iface; }); + + // Checking whether the string 'any' is in the 'EXT' zone + // If it is, checking the status of services for this zone + // If it is enabled, adding it these interfaces into the list of allowed interfaces + // and setting this zone to enabled + if (SuSEFirewall::IsAnyNetworkInterfaceSupported()) { + list <string> interfaces_supported_by_any = + SuSEFirewall::InterfacesSupportedByAnyFeature(SuSEFirewall::special_all_interface_zone); + if (size(interfaces_supported_by_any)>0) { + foreach (string service, services, { + service_status[SuSEFirewall::special_all_interface_zone] = + SuSEFirewall::IsServiceSupportedInZone(service, SuSEFirewall::special_all_interface_zone) + && service_status[SuSEFirewall::special_all_interface_zone]:true; + }); + if (service_status[SuSEFirewall::special_all_interface_zone]:false) { + allowed_interfaces = (list <string>) union (allowed_interfaces, interfaces_supported_by_any); + } + } + } //if (contains(all_interfaces, special_all_nm_interfaces)) { // boolean special_all_nm_enabled = size(services) > 0; @@ -347,6 +391,9 @@ // allowed_interfaces = filter(string i, allowed_interfaces, { return i != special_all_nm_interfaces; }); //} + list <string> interfaces_supported_by_any = + SuSEFirewall::InterfacesSupportedByAnyFeature(SuSEFirewall::special_all_interface_zone); + if (size (forbidden_interfaces) > 0) { SuSEFirewall::SetServices (services, forbidden_interfaces, false); @@ -474,12 +521,17 @@ // list<string> firewall_ifaces = toset (Selected2Opened (ifaces, nm_ifaces_have_to_be_supported)); list<string> firewall_ifaces = toset (Selected2Opened (ifaces, false)); + y2milestone("firewall_ifaces: %1", firewall_ifaces); + list<string> added_ifaces = filter (string i, firewall_ifaces, { return ! contains (ifaces, i); }); + y2milestone("added_ifaces: %1", added_ifaces); + list<string> removed_ifaces = filter (string i, ifaces, { return ! contains (firewall_ifaces, i); }); + y2milestone("removed_ifaces: %1", removed_ifaces); //// to hide that special string //added_ifaces = filter (string i, added_ifaces, { return i != special_all_nm_interfaces; }); 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.13.54/library/network/src/SuSEFirewall.ycp new/yast2-2.13.56/library/network/src/SuSEFirewall.ycp --- old/yast2-2.13.54/library/network/src/SuSEFirewall.ycp 2006-04-07 22:40:52.000000000 +0200 +++ new/yast2-2.13.56/library/network/src/SuSEFirewall.ycp 2006-05-04 13:27:43.000000000 +0200 @@ -1524,6 +1524,37 @@ return toset(zones); } + global define list<string> GetInterfacesInZoneSupportingAnyFeature (string zone); + + /** + * Function returns list of zones of requested interfaces. + * Special string 'any' in 'EXT' zone is supported. + * + * @param list<string> interfaces + * @param list<string> firewall zones + */ + global define list<string> GetZonesOfInterfacesWithAnyFeatureSupported (list<string> interfaces) { + list<string> zones = []; + string zone = ""; + + // 'any' in 'EXT' + list <string> interfaces_covered_by_any = + SuSEFirewall::GetInterfacesInZoneSupportingAnyFeature(special_all_interface_zone); + + foreach (string interface, interfaces, { + // interface is covered by 'any' in 'EXT' + if (contains(interfaces_covered_by_any, interface)) + zone = special_all_interface_zone; + // interface is explicitely mentioned in some zone + else + zone = GetZoneOfInterface(interface); + + if (zone != nil) zones = add(zones, zone); + }); + + return toset(zones); + } + /** * Function returns list of maps of known interfaces. * Interfaces handled by a NetworkManager are not returned at all. @@ -1683,6 +1714,52 @@ return toset(firewall_configured_devices); } + /** + * Returns list of interfaces not mentioned in any zone and covered by the + * special string 'any' in zone 'EXT' if such string exists there and the zone + * is EXT. + * + * @param string zone + * @return list <string> of interfaces covered by special string 'any' + */ + global define list<string> InterfacesSupportedByAnyFeature (string zone) { + list <string> result = []; + + if (zone == special_all_interface_zone && IsAnyNetworkInterfaceSupported()) { + list <string> known_interfaces_now = GetListOfKnownInterfaces(); + list <string> configured_interfaces = GetFirewallInterfaces(); + foreach (string one_interface, known_interfaces_now, { + if (! contains(configured_interfaces, one_interface)) { + y2milestone("Interface '%1' supported by special string '%2' in zone '%3'", + one_interface, special_all_interface_string, special_all_interface_zone); + result = add (result, one_interface); + } + }); + } + + return result; + } + + /** + * Function returns list of known interfaces in requested zone. + * Special string 'any' in EXT zone covers all interfaces without + * any zone assignment. + * + * @param string zone + * @return list <string> of interfaces + */ + global define list<string> GetInterfacesInZoneSupportingAnyFeature (string zone) { + list <string> interfaces_in_zone = GetInterfacesInZone(zone); + + // 'any' in EXT zone, add all interfaces without zone to this one + list <string> interfaces_covered_by_any = InterfacesSupportedByAnyFeature(zone); + if (size(interfaces_covered_by_any)>0) { + interfaces_in_zone = (list <string>) union (interfaces_in_zone, interfaces_covered_by_any); + } + + return interfaces_in_zone; + } + boolean ArePortsOrServicesAllowed (list <string> needed_ports, string protocol, string zone, boolean check_for_aliases); /** @@ -2075,7 +2152,7 @@ * @return boolean if successfull */ global define boolean SetServices (list<string> services_ids, list<string> interfaces, boolean new_status) { - list<string> firewall_zones = GetZonesOfInterfaces(interfaces); + list<string> firewall_zones = GetZonesOfInterfacesWithAnyFeatureSupported(interfaces); if (size(firewall_zones)==0) { y2error("Interfaces '%1' are not in any group if interfaces", interfaces); return false; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xorg-x11
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package xorg-x11 checked in at Sun May 7 16:46:49 CEST 2006. -------- --- xorg-x11/xorg-x11.changes 2006-04-24 15:18:06.000000000 +0200 +++ STABLE/xorg-x11/xorg-x11.changes 2006-04-28 18:44:46.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Apr 28 18:44:47 CEST 2006 - sndirsch(a)suse.de + +- /etc/X11/xdm/Xsetup: moved the sleep to the correct location + (Bug #149957) + +------------------------------------------------------------------- +Thu Apr 27 12:24:00 CEST 2006 - sndirsch(a)suse.de + +- p_xrender-mitri.diff: + * fixed buffer overflow in Xrender (CVE-2006-1526, Bug #168712) + +------------------------------------------------------------------- New: ---- p_xrender-mitri.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.1U1Oma/_old 2006-05-07 16:46:08.000000000 +0200 +++ /var/tmp/diff_new_pack.1U1Oma/_new 2006-05-07 16:46:08.000000000 +0200 @@ -40,7 +40,7 @@ %endif Autoreqprov: on Version: 6.9.0 -Release: 42 +Release: 48 Summary: The basic X Window System package Source: xorg-6.9.0.tar.bz2 Source1: xdm.tar.gz @@ -119,6 +119,7 @@ Patch360: p_x86_renderinit.diff Patch361: p_default-module-path.diff Patch362: p_mouse-wheel-multibit.diff +Patch363: p_xrender-mitri.diff Patch400: p_bug96328.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -1547,6 +1548,7 @@ pushd programs/Xserver/hw/xfree86/input/mouse/ %patch362 -p1 popd +%patch363 -p0 # UTS_RELEASE=`uname -r` UTS_MAJOR=${UTS_RELEASE%%%%.*} @@ -2701,6 +2703,12 @@ %clean %changelog -n xorg-x11 +* Fri Apr 28 2006 - sndirsch(a)suse.de +- /etc/X11/xdm/Xsetup: moved the sleep to the correct location + (Bug #149957) +* Thu Apr 27 2006 - sndirsch(a)suse.de +- p_xrender-mitri.diff: + * fixed buffer overflow in Xrender (CVE-2006-1526, Bug #168712) * Mon Apr 24 2006 - sndirsch(a)suse.de - fixed sys.xsession when ~/.xinitrc is not executable (Bug #168600) * Fri Apr 21 2006 - sndirsch(a)suse.de ++++++ p_xrender-mitri.diff ++++++ Index: programs/Xserver/render/mitri.c =================================================================== RCS file: /cvs/xorg/xserver/xorg/render/mitri.c,v retrieving revision 1.5 diff -u -r1.5 programs/Xserver/mitri.c --- programs/Xserver/render/mitri.c 3 Jul 2005 07:02:08 -0000 1.5 +++ programs/Xserver/render/mitri.c 18 Apr 2006 22:34:08 -0000 @@ -145,7 +145,7 @@ if (npoint < 3) return; ntri = npoint - 2; - tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle)); + tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle)); if (!tris) return; for (tri = tris; npoint >= 3; npoint--, points++, tri++) @@ -177,7 +177,7 @@ if (npoint < 3) return; ntri = npoint - 2; - tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle)); + tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle)); if (!tris) return; first = points++; ++++++ xdm.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Xsetup new/Xsetup --- old/Xsetup 2006-03-31 11:54:41.000000000 +0200 +++ new/Xsetup 2006-04-28 18:35:24.000000000 +0200 @@ -66,8 +66,7 @@ # $halporp --key system.formfactor.subtype --string tabletpc if test $? -eq 0 -a -x $xvkbd ; then - sleep 1 - ( HOME=/root exec $xvkbd -compact -geometry -0-0 ) & echo $! > /var/run/xvkbd.pid + ( sleep 1; HOME=/root exec $xvkbd -compact -geometry -0-0 ) & echo $! > /var/run/xvkbd.pid fi # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xen
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package xen checked in at Sun May 7 16:45:43 CEST 2006. -------- --- arch/i386/xen/xen.changes 2006-04-28 21:03:14.000000000 +0200 +++ STABLE/xen/xen.changes 2006-05-05 23:02:52.000000000 +0200 @@ -1,0 +2,47 @@ +Thu May 4 20:53:21 MDT 2006 - cgriffin(a)novell.com + +- Update xen-3.0-testing tree, changeset 9664: + + Changesets 9663 and 9664 fix AMD fully virtualized + guests causing the system to reboot when + first starting up. (#169855) + +------------------------------------------------------------------- +Thu May 4 20:16:06 MDT 2006 - cgriffin(a)novell.com + +- With a Xen domain set up with a loop-mountable file as rootfs, + the "xm start " invocation fails. The cause is a bug + domUloader.py (#172586) + +------------------------------------------------------------------- +Thu May 4 12:52:32 MDT 2006 - rmaxfiel(a)novell.com + +- Added the ability to 'attach' and 'detach' removable media + devices to hvm guests. Also made cdrom eject when the eject + request comes from the hvm guest. (#159907) + +- Fixed the loss of mouse when a SDL session ends with 'grab' + in effect. (#159001) + +------------------------------------------------------------------- +Thu May 4 10:42:32 MDT 2006 - cgriffin(a)novell.com + +- Update xen-3.0-testing tree, changeset 9661: + + Drop patches merged upstream + + Took Kier's official patches for dropped patches most + notably spurious interrupts (#152892) +- Took Intel's patch to fix screen corruption when + resizing the screen of windows hvm guests (#164573) + +------------------------------------------------------------------- +Wed May 03 11:14:40 MDT 2006 - kallan(a)novell.com + +- Added configuring network interfaces when using Xen bridging instructions + to the README.SuSE file as requested by bug #171533. + +------------------------------------------------------------------- +Mon May 01 09:42:25 MDT 2006 - tthomas(a)novell.com + +- Added message to xm save to indicate that save is not currently + supported for fully virtualized guests. (#161661) + +------------------------------------------------------------------- Old: ---- xen-spurious-interrupts.diff xen-x86-gpfn-range-check.diff New: ---- xen-balloon-drv-lru-hijack.diff xen-cirrus-corruption.diff xen-get-mfn-from-gpfn.diff xen-intr-ack-routine.diff xen-ioapic-ack-default.diff xen-lost-mouse.diff xen-perfc-array-range.diff xen-pirq-mask-into-bitmap.diff xen-removable-media.diff xen-svm-init-intercept-handler.diff xen-svm-reset-host-selectors.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.MylqaQ/_old 2006-05-07 16:43:53.000000000 +0200 +++ /var/tmp/diff_new_pack.MylqaQ/_new 2006-05-07 16:43:53.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xen (Version 3.0.2_09656) +# spec file for package xen (Version 3.0.2_09664) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,12 +14,12 @@ BuildRequires: LibVNCServer SDL-devel autoconf automake bin86 dev86 glibc-devel-32bit latex2html libjpeg-devel libreiserfs-devel python-devel te_ams te_latex tetex transfig %define xvers 3.0 %define xvermaj 3 -%define changeset 09656 +%define changeset 09664 %define build_xmtest 0 %define with_pygrub 1 %define xen_build_dir xen-3.0-testing -Version: 3.0.2_09656 -Release: 1 +Version: 3.0.2_09664 +Release: 2 License: GPL Group: System/Kernel Autoreqprov: on @@ -65,13 +65,22 @@ Patch25: xen-bonding.diff Patch26: xen-hvm-localtime.diff Patch27: xen-hvm-auto-balloon.diff -Patch28: xen-spurious-interrupts.diff -Patch29: xen-x86-gpfn-range-check.diff -Patch30: xen-BUILD_BUG_ON.diff -Patch31: xen-pirq_shared.diff +Patch28: xen-ioapic-ack-default.diff +Patch29: xen-BUILD_BUG_ON.diff +Patch30: xen-pirq_shared.diff +Patch31: xen-lost-mouse.diff +Patch32: xen-removable-media.diff Patch49: xen-enable-hvm-debug.diff Patch50: xen-enable-debug Patch99: xen-poweroff.diff +Patch100: xen-get-mfn-from-gpfn.diff +Patch101: xen-pirq-mask-into-bitmap.diff +Patch102: xen-intr-ack-routine.diff +Patch103: xen-perfc-array-range.diff +Patch104: xen-balloon-drv-lru-hijack.diff +Patch105: xen-cirrus-corruption.diff +Patch106: xen-svm-init-intercept-handler.diff +Patch107: xen-svm-reset-host-selectors.diff URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/ Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -414,6 +423,12 @@ %prep %setup -q -n %xen_build_dir +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 +%patch103 -p1 +%patch104 -p1 +%patch105 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -447,6 +462,9 @@ %patch29 -p1 %patch30 -p1 %patch31 -p1 +%patch32 -p1 +%patch106 -p1 +%patch107 -p1 #%patch49 -p1 XEN_EXTRAVERSION=%version-%release XEN_EXTRAVERSION=${XEN_EXTRAVERSION#%{xvers}} @@ -753,6 +771,34 @@ %{insserv_cleanup} %changelog -n xen +* Thu May 04 2006 - cgriffin(a)novell.com +- Update xen-3.0-testing tree, changeset 9664: + + Changesets 9663 and 9664 fix AMD fully virtualized + guests causing the system to reboot when + first starting up. (#169855) +* Thu May 04 2006 - cgriffin(a)novell.com +- With a Xen domain set up with a loop-mountable file as rootfs, + the "xm start " invocation fails. The cause is a bug + domUloader.py (#172586) +* Thu May 04 2006 - rmaxfiel(a)novell.com +- Added the ability to 'attach' and 'detach' removable media + devices to hvm guests. Also made cdrom eject when the eject + request comes from the hvm guest. (#159907) +- Fixed the loss of mouse when a SDL session ends with 'grab' + in effect. (#159001) +* Thu May 04 2006 - cgriffin(a)novell.com +- Update xen-3.0-testing tree, changeset 9661: + + Drop patches merged upstream + + Took Kier's official patches for dropped patches most + notably spurious interrupts (#152892) +- Took Intel's patch to fix screen corruption when + resizing the screen of windows hvm guests (#164573) +* Wed May 03 2006 - kallan(a)novell.com +- Added configuring network interfaces when using Xen bridging instructions + to the README.SuSE file as requested by bug #171533. +* Mon May 01 2006 - tthomas(a)novell.com +- Added message to xm save to indicate that save is not currently + supported for fully virtualized guests. (#161661) * Fri Apr 28 2006 - ccoffing(a)novell.com - Close fds before exec-ing vncviewer, so yast2-vm doesn't hang when viewing fully-virtualized console (#168392). ++++++ README.SuSE ++++++ --- arch/i386/xen/README.SuSE 2006-04-21 01:03:44.000000000 +0200 +++ STABLE/xen/README.SuSE 2006-05-03 19:19:53.000000000 +0200 @@ -317,6 +317,22 @@ additional domains. This issue may be addressed in a future update. +Configuring network interfaces when using Xen bridging: +Due to the renaming of network interfaces by the network-bridge script +(e.g. eth0 to peth0), network interfaces should not be configured or restarted +while they are enslaved to a Xen bridge. Before configuring a network +interface enslaved to a Xen bridge, shutdown all VMs using the interface. +Then use the network-bridge script to remove the Xen bridge and to restore the +network interface back to normal (put peth0 back to eth0). For example, to +remove the Xen bridge and restore eth0 back to normal do the following: + /etc/xen/scripts/network-bridge stop netdev=eth0 +With the Xen bridge removed and eth0 put back to normal, eth0 can then be +configured or restarted. Once the configuration is complete, Xen bridging can +be started back up again (creating the Xen bridge and renaming eth0 to peth0) +by doing the following: + /etc/xen/scripts/network-bridge start netdev=eth0 +The VMs can then be started again. + For debugging, here's what happens on bootup of a domU: - xenstored saves the device setup in xenstore - domU is created ++++++ domUloader.py ++++++ --- arch/i386/xen/domUloader.py 2006-01-20 23:25:05.000000000 +0100 +++ STABLE/xen/domUloader.py 2006-05-05 04:23:07.000000000 +0200 @@ -182,7 +182,10 @@ def __repr__(self): "string representation for debugging" - strg = "[" + self.domname + "," + self.physdev + "," + strg = "[" + self.domname + "," + if self.physdev: + strg += self.physdev + strg += "," if self.loopfile: strg += self.loopfile strg += "," + str(self.pcount) + ",mapped %ix]" % self.mapped ++++++ xen-balloon-drv-lru-hijack.diff ++++++ --- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c Tue May 2 14:25:22 2006 +++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c Tue May 2 16:24:29 2006 @@ -94,8 +94,8 @@ static DECLARE_WORK(balloon_worker, balloon_process, NULL); static struct timer_list balloon_timer; -#define PAGE_TO_LIST(p) (&(p)->ballooned) -#define LIST_TO_PAGE(l) list_entry((l), struct page, ballooned) +#define PAGE_TO_LIST(p) (&(p)->lru) +#define LIST_TO_PAGE(l) list_entry((l), struct page, lru) #define UNLIST_PAGE(p) \ do { \ list_del(PAGE_TO_LIST(p)); \ --- a/linux-2.6-xen-sparse/include/linux/mm.h Tue May 2 14:25:22 2006 +++ b/linux-2.6-xen-sparse/include/linux/mm.h Tue May 2 16:24:29 2006 @@ -248,9 +248,6 @@ #if NR_CPUS >= CONFIG_SPLIT_PTLOCK_CPUS spinlock_t ptl; #endif -#ifdef CONFIG_XEN - struct list_head ballooned; -#endif }; pgoff_t index; /* Our offset within mapping. */ struct list_head lru; /* Pageout list, eg. active_list ++++++ xen-cirrus-corruption.diff ++++++ diff -r b6c5920e5d99 tools/ioemu/hw/cirrus_vga.c --- a/tools/ioemu/hw/cirrus_vga.c Thu Apr 6 18:58:39 2006 +0100 +++ b/tools/ioemu/hw/cirrus_vga.c Thu May 4 10:59:06 2006 -0600 @@ -1187,6 +1187,17 @@ cirrus_hook_write_sr(CirrusVGAState * s, s->hw_cursor_y = (reg_value << 3) | (reg_index >> 5); break; case 0x07: // Extended Sequencer Mode + /* Win2K seems to assume that the VRAM is set to 0xff + * whenever VGA/SVGA mode changes + */ + if ((s->sr[0x07] ^ reg_value) & CIRRUS_SR7_BPP_SVGA) + memset(s->vram_ptr, 0xff, s->real_vram_size); + s->sr[0x07] = reg_value; +#ifdef DEBUG_CIRRUS + printf("cirrus: handled outport sr_index %02x, sr_value %02x\n", + reg_index, reg_value); +#endif + break; case 0x08: // EEPROM Control case 0x09: // Scratch Register 0 case 0x0a: // Scratch Register 1 @@ -3021,10 +3032,6 @@ static void cirrus_init_common(CirrusVGA } s->cr[0x27] = device_id; - /* Win2K seems to assume that the pattern buffer is at 0xff - initially ! */ - memset(s->vram_ptr, 0xff, s->real_vram_size); - s->cirrus_hidden_dac_lockindex = 5; s->cirrus_hidden_dac_data = 0; ++++++ xen-get-mfn-from-gpfn.diff ++++++ --- a/xen/include/asm-x86/mm.h Thu Apr 27 08:58:50 2006 +++ b/xen/include/asm-x86/mm.h Thu Apr 27 13:14:26 2006 @@ -272,6 +272,8 @@ * been used by the read-only MPT map. */ #define phys_to_machine_mapping ((unsigned long *)RO_MPT_VIRT_START) +#define NR_P2M_TABLE_ENTRIES ((unsigned long *)RO_MPT_VIRT_END \ + - phys_to_machine_mapping) #define INVALID_MFN (~0UL) #define VALID_MFN(_mfn) (!((_mfn) & (1U<<31))) @@ -280,7 +282,9 @@ { unsigned long mfn; - if ( __copy_from_user(&mfn, &phys_to_machine_mapping[pfn], sizeof(mfn)) ) + if ( unlikely(pfn >= NR_P2M_TABLE_ENTRIES) || + unlikely(__copy_from_user(&mfn, &phys_to_machine_mapping[pfn], + sizeof(mfn))) ) mfn = INVALID_MFN; return mfn; ++++++ xen-intr-ack-routine.diff ++++++ ++++ 862 lines (skipped) ++++++ xen-ioapic-ack-default.diff ++++++ Change default IO-APIC ack mode for single IO-APIC systems to old-style. Jan Index: xen-3.0-testing/xen/arch/x86/io_apic.c =================================================================== --- xen-3.0-testing.orig/xen/arch/x86/io_apic.c 2006-05-04 17:37:39.000000000 +0200 +++ xen-3.0-testing/xen/arch/x86/io_apic.c 2006-05-04 17:37:40.000000000 +0200 @@ -1329,7 +1329,7 @@ static unsigned int startup_level_ioapic return 0; /* don't check for pending */ } -int ioapic_ack_new = 1; +int ioapic_ack_new = -1; static void setup_ioapic_ack(char *s) { if ( !strcmp(s, "old") ) @@ -1761,6 +1761,8 @@ void __init setup_IO_APIC(void) else io_apic_irqs = ~PIC_IRQS; + if (ioapic_ack_new < 0) + ioapic_ack_new = (nr_ioapics > 1); printk("ENABLING IO-APIC IRQs\n"); printk(" -> Using %s ACK method\n", ioapic_ack_new ? "new" : "old"); ++++++ xen-lost-mouse.diff ++++++ Index: xen-3.0-testing/tools/ioemu/sdl.c =================================================================== --- xen-3.0-testing.orig/tools/ioemu/sdl.c +++ xen-3.0-testing/tools/ioemu/sdl.c @@ -565,6 +565,9 @@ static void sdl_refresh(DisplayState *ds static void sdl_cleanup(void) { + if (gui_grab) + sdl_grab_end(); + SDL_Quit(); } ++++++ xen-perfc-array-range.diff ++++++ --- a/xen/common/perfc.c Fri Apr 28 13:06:33 2006 +++ b/xen/common/perfc.c Tue May 2 14:25:22 2006 @@ -116,7 +116,7 @@ counters += NR_CPUS; break; case TYPE_ARRAY: - for ( j = 0; j < NR_CPUS; j++ ) + for ( j = 0; j < perfc_info[i].nr_elements; j++ ) atomic_set(&counters[j],0); case TYPE_S_ARRAY: counters += perfc_info[i].nr_elements; ++++++ xen-pirq-mask-into-bitmap.diff ++++++ --- a/xen/arch/ia64/xen/irq.c Thu Apr 27 13:14:26 2006 +++ b/xen/arch/ia64/xen/irq.c Fri Apr 28 13:04:56 2006 @@ -1358,25 +1358,20 @@ int pirq_guest_unmask(struct domain *d) { irq_desc_t *desc; - int i, j, pirq; - u32 m; + int pirq; shared_info_t *s = d->shared_info; - for ( i = 0; i < ARRAY_SIZE(d->pirq_mask); i++ ) + for ( pirq = find_first_bit(d->pirq_mask, NR_PIRQS); + pirq < NR_PIRQS; + pirq = find_next_bit(d->pirq_mask, NR_PIRQS, pirq+1) ) { - m = d->pirq_mask[i]; - while ( (j = ffs(m)) != 0 ) - { - m &= ~(1 << --j); - pirq = (i << 5) + j; - desc = &irq_desc[pirq]; - spin_lock_irq(&desc->lock); - if ( !test_bit(d->pirq_to_evtchn[pirq], &s->evtchn_mask[0]) && - test_and_clear_bit(pirq, &d->pirq_mask) && - (--((irq_guest_action_t *)desc->action)->in_flight == 0) ) - desc->handler->end(pirq); - spin_unlock_irq(&desc->lock); - } + desc = &irq_desc[pirq]; + spin_lock_irq(&desc->lock); + if ( !test_bit(d->pirq_to_evtchn[pirq], &s->evtchn_mask[0]) && + test_and_clear_bit(pirq, &d->pirq_mask) && + (--((irq_guest_action_t *)desc->action)->in_flight == 0) ) + desc->handler->end(pirq); + spin_unlock_irq(&desc->lock); } return 0; --- a/xen/arch/x86/irq.c Thu Apr 27 13:14:26 2006 +++ b/xen/arch/x86/irq.c Fri Apr 28 13:04:56 2006 @@ -171,26 +171,20 @@ int pirq_guest_unmask(struct domain *d) { irq_desc_t *desc; - unsigned int i, j, pirq; - u32 m; + unsigned int pirq; shared_info_t *s = d->shared_info; - for ( i = 0; i < ARRAY_SIZE(d->pirq_mask); i++ ) - { - m = d->pirq_mask[i]; - while ( m != 0 ) - { - j = find_first_set_bit(m); - m &= ~(1 << j); - pirq = (i << 5) + j; - desc = &irq_desc[irq_to_vector(pirq)]; - spin_lock_irq(&desc->lock); - if ( !test_bit(d->pirq_to_evtchn[pirq], &s->evtchn_mask[0]) && - test_and_clear_bit(pirq, &d->pirq_mask) && - (--((irq_guest_action_t *)desc->action)->in_flight == 0) ) - desc->handler->end(irq_to_vector(pirq)); - spin_unlock_irq(&desc->lock); - } + for ( pirq = find_first_bit(d->pirq_mask, NR_PIRQS); + pirq < NR_PIRQS; + pirq = find_next_bit(d->pirq_mask, NR_PIRQS, pirq+1) ) + { + desc = &irq_desc[irq_to_vector(pirq)]; + spin_lock_irq(&desc->lock); + if ( !test_bit(d->pirq_to_evtchn[pirq], &s->evtchn_mask[0]) && + test_and_clear_bit(pirq, &d->pirq_mask) && + (--((irq_guest_action_t *)desc->action)->in_flight == 0) ) + desc->handler->end(irq_to_vector(pirq)); + spin_unlock_irq(&desc->lock); } return 0; --- a/xen/include/xen/sched.h Thu Apr 27 13:14:26 2006 +++ b/xen/include/xen/sched.h Fri Apr 28 13:04:56 2006 @@ -133,7 +133,7 @@ */ #define NR_PIRQS 256 /* Put this somewhere sane! */ u16 pirq_to_evtchn[NR_PIRQS]; - u32 pirq_mask[NR_PIRQS/32]; + DECLARE_BITMAP(pirq_mask, NR_PIRQS); /* I/O capabilities (access to IRQs and memory-mapped I/O). */ struct rangeset *iomem_caps; ++++++ xen-pirq_shared.diff ++++++ --- /var/tmp/diff_new_pack.MylqaQ/_old 2006-05-07 16:43:54.000000000 +0200 +++ /var/tmp/diff_new_pack.MylqaQ/_new 2006-05-07 16:43:54.000000000 +0200 @@ -7,11 +7,11 @@ Index: xen-3.0-testing/xen/arch/x86/irq.c =================================================================== ---- xen-3.0-testing.orig/xen/arch/x86/irq.c -+++ xen-3.0-testing/xen/arch/x86/irq.c +--- xen-3.0-testing.orig/xen/arch/x86/irq.c 2006-05-04 17:29:01.000000000 +0200 ++++ xen-3.0-testing/xen/arch/x86/irq.c 2006-05-04 17:29:03.000000000 +0200 @@ -200,7 +200,7 @@ static void __do_IRQ_guest(int vector) if ( (action->ack_type != ACKTYPE_NONE) && - !test_and_set_bit(irq, &d->pirq_mask) ) + !test_and_set_bit(irq, d->pirq_mask) ) action->in_flight++; - send_guest_pirq(d, irq); + send_guest_pirq(d, irq, action->nr_guests > 1); @@ -20,8 +20,8 @@ Index: xen-3.0-testing/xen/arch/ia64/xen/irq.c =================================================================== ---- xen-3.0-testing.orig/xen/arch/ia64/xen/irq.c -+++ xen-3.0-testing/xen/arch/ia64/xen/irq.c +--- xen-3.0-testing.orig/xen/arch/ia64/xen/irq.c 2006-05-04 17:29:01.000000000 +0200 ++++ xen-3.0-testing/xen/arch/ia64/xen/irq.c 2006-05-04 17:29:03.000000000 +0200 @@ -1351,7 +1351,7 @@ static void __do_IRQ_guest(int irq) d = action->guest[i]; if ( !test_and_set_bit(irq, &d->pirq_mask) ) @@ -33,8 +33,8 @@ */ Index: xen-3.0-testing/xen/common/event_channel.c =================================================================== ---- xen-3.0-testing.orig/xen/common/event_channel.c -+++ xen-3.0-testing/xen/common/event_channel.c +--- xen-3.0-testing.orig/xen/common/event_channel.c 2006-04-06 17:50:26.000000000 +0200 ++++ xen-3.0-testing/xen/common/event_channel.c 2006-05-04 17:29:03.000000000 +0200 @@ -479,10 +479,18 @@ void send_guest_virq(struct vcpu *v, int evtchn_set_pending(v, port); } @@ -57,8 +57,8 @@ Index: xen-3.0-testing/xen/include/xen/event.h =================================================================== ---- xen-3.0-testing.orig/xen/include/xen/event.h -+++ xen-3.0-testing/xen/include/xen/event.h +--- xen-3.0-testing.orig/xen/include/xen/event.h 2006-04-06 17:50:27.000000000 +0200 ++++ xen-3.0-testing/xen/include/xen/event.h 2006-05-04 17:29:03.000000000 +0200 @@ -28,8 +28,9 @@ extern void send_guest_virq(struct vcpu * send_guest_pirq: * @d: Domain to which physical IRQ should be sent @@ -72,8 +72,8 @@ #define event_pending(v) \ Index: xen-3.0-testing/xen/include/public/xen.h =================================================================== ---- xen-3.0-testing.orig/xen/include/public/xen.h -+++ xen-3.0-testing/xen/include/public/xen.h +--- xen-3.0-testing.orig/xen/include/public/xen.h 2006-04-06 17:50:27.000000000 +0200 ++++ xen-3.0-testing/xen/include/public/xen.h 2006-05-04 17:29:03.000000000 +0200 @@ -370,6 +370,14 @@ typedef struct shared_info { arch_shared_info_t arch; ++++++ xen-removable-media.diff ++++++ ++++ 1467 lines (skipped) ++++++ xen-svm-init-intercept-handler.diff ++++++ ++++ 700 lines (skipped) ++++++ xen-svm-reset-host-selectors.diff ++++++ --- a/xen/arch/x86/hvm/svm/svm.c Thu May 4 16:08:19 2006 +++ b/xen/arch/x86/hvm/svm/svm.c Thu May 4 20:26:02 2006 @@ -61,6 +61,9 @@ /* Useful define */ #define MAX_INST_SIZE 15 +#define set_segment_register(name, value) \ + __asm__ __volatile__ ( "movw %%ax ,%%" STR(name) "" : : "a" (value) ) + /* * External functions, etc. We should move these to some suitable header file(s) */ @@ -680,6 +683,17 @@ static void svm_ctxt_switch_to(struct vcpu *v) { +#if __x86_64__ + /* + * This is required, because VMRUN does consistency check + * and some of the DOM0 selectors are pointing to + * invalid GDT locations, and cause AMD processors + * to shutdown. + */ + set_segment_register(ds, 0); + set_segment_register(es, 0); + set_segment_register(ss, 0); +#endif } void svm_final_setup_guest(struct vcpu *v) --- a/xen/arch/x86/hvm/svm/vmcb.c Thu May 4 16:08:19 2006 +++ b/xen/arch/x86/hvm/svm/vmcb.c Thu May 4 20:26:02 2006 @@ -428,6 +428,8 @@ if (svm_dbg_on) svm_dump_vmcb(__func__, vmcb); + + vmcb->tlb_control = 1; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit wvstreams
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package wvstreams checked in at Sun May 7 16:43:44 CEST 2006. -------- --- wvstreams/wvstreams.changes 2006-01-25 21:42:53.000000000 +0100 +++ STABLE/wvstreams/wvstreams.changes 2006-05-03 13:24:54.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 3 13:24:43 CEST 2006 - kukuk(a)suse.de + +- Fix compiling on some architectures + +------------------------------------------------------------------- New: ---- compiler.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wvstreams.spec ++++++ --- /var/tmp/diff_new_pack.loCUTd/_old 2006-05-07 16:42:48.000000000 +0200 +++ /var/tmp/diff_new_pack.loCUTd/_new 2006-05-07 16:42:48.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package wvstreams (Version 4.2.1) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -14,7 +14,7 @@ BuildRequires: db-devel gcc-c++ openssl-devel pam-devel pkgconfig License: LGPL Version: 4.2.1 -Release: 1 +Release: 14 Summary: Network Programming Library in C++ Source0: http://open.nit.ca/download/%{name}-%{version}.tar.bz2 Patch0: set-empty.diff @@ -23,6 +23,7 @@ Patch3: wvstreams-const.diff Patch4: wvstreams-gcc41.patch Patch5: wvstreams-wvmodem-iotcl.patch +Patch6: compiler.diff Group: Development/Libraries/Other BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -61,6 +62,7 @@ #%patch3 %patch4 %patch5 +%patch6 %build export CFLAGS="$RPM_OPT_FLAGS -fPIC" @@ -101,6 +103,8 @@ %{_libdir}/*.so %changelog -n wvstreams +* Wed May 03 2006 - kukuk(a)suse.de +- Fix compiling on some architectures * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Nov 30 2005 - hvogel(a)suse.de ++++++ compiler.diff ++++++ --- linuxstreams/wvinterface.cc +++ linuxstreams/wvinterface.cc 2006/05/03 08:45:23 @@ -22,6 +22,7 @@ #include <linux/sockios.h> #define _LINUX_IF_H /* Hack to prevent loading linux/if.h */ +#include <linux/compiler.h> #include <linux/wireless.h> #define min(x,y) ({ \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0