April 2006 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-packager
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package yast2-packager checked in at Tue Apr 4 18:24:44 CEST 2006. -------- --- yast2-packager/yast2-packager.changes 2006-03-30 10:51:47.000000000 +0200 +++ yast2-packager/yast2-packager.changes 2006-04-04 15:34:45.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 4 15:33:53 CEST 2006 - locilka(a)suse.cz + +- Added initial Signatures-Handling callbacks (#162858) +- 2.13.57 + +------------------------------------------------------------------- Old: ---- yast2-packager-2.13.56.tar.bz2 New: ---- yast2-packager-2.13.57.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.DEbS2e/_old 2006-04-04 18:24:38.000000000 +0200 +++ /var/tmp/diff_new_pack.DEbS2e/_new 2006-04-04 18:24:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.13.56) +# spec file for package yast2-packager (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-packager -Version: 2.13.56 +Version: 2.13.57 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.13.56.tar.bz2 +Source0: yast2-packager-2.13.57.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.56 +%setup -n yast2-packager-2.13.57 %build %{prefix}/bin/y2tool y2autoconf @@ -78,6 +78,9 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog -n yast2-packager +* Tue Apr 04 2006 - locilka(a)suse.cz +- Added initial Signatures-Handling callbacks (#162858) +- 2.13.57 * Thu Mar 30 2006 - mvidner(a)suse.cz - Don't run the modules if another process has the zypp lock (#160319). - 2.13.56 ++++++ yast2-packager-2.13.56.tar.bz2 -> yast2-packager-2.13.57.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.56/VERSION new/yast2-packager-2.13.57/VERSION --- old/yast2-packager-2.13.56/VERSION 2006-03-30 10:50:25.000000000 +0200 +++ new/yast2-packager-2.13.57/VERSION 2006-04-04 15:33:47.000000000 +0200 @@ -1 +1 @@ -2.13.56 +2.13.57 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.56/configure new/yast2-packager-2.13.57/configure --- old/yast2-packager-2.13.56/configure 2006-03-30 11:09:25.000000000 +0200 +++ new/yast2-packager-2.13.57/configure 2006-04-04 15:45:17.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.56. +# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.57. # # 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.56' -PACKAGE_STRING='yast2-packager 2.13.56' +PACKAGE_VERSION='2.13.57' +PACKAGE_STRING='yast2-packager 2.13.57' 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.56 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.13.57 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.56:";; + short | recursive ) echo "Configuration of yast2-packager 2.13.57:";; 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.56 +yast2-packager configure 2.13.57 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.56, which was +It was created by yast2-packager $as_me 2.13.57, 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.56' + VERSION='2.13.57' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.56" +VERSION="2.13.57" 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.56, which was +This file was extended by yast2-packager $as_me 2.13.57, 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.56 +yast2-packager config.status 2.13.57 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.56/configure.in new/yast2-packager-2.13.57/configure.in --- old/yast2-packager-2.13.56/configure.in 2006-03-30 11:09:17.000000000 +0200 +++ new/yast2-packager-2.13.57/configure.in 2006-04-04 15:45:12.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.13.56, http://www.suse.de/feedback, yast2-packager) +AC_INIT(yast2-packager, 2.13.57, 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.56" +VERSION="2.13.57" 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.56/src/modules/SignatureCheckCallbacks.ycp new/yast2-packager-2.13.57/src/modules/SignatureCheckCallbacks.ycp --- old/yast2-packager-2.13.56/src/modules/SignatureCheckCallbacks.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.13.57/src/modules/SignatureCheckCallbacks.ycp 2006-04-04 15:23:29.000000000 +0200 @@ -0,0 +1,75 @@ +/** + * Module: SignatureCheckCallbacks.ycp + * Authors: Lukas Ocilka <locilka(a)suse.cz> + * + * Callbacks for handling signatures. + * + * $Id: SignatureCheckCallbacks.ycp 28363 2006-02-24 12:27:15Z locilka $ + */ + +{ + textdomain "packager"; + + module "SignatureCheckCallbacks"; + + import "SignatureCheckDialogs"; + + // Name of the callback handler function. Required callback prototype is + // boolean(string keyid, string keyname). The callback function should ask + // user whether the unknown key can be accepted, returned true value means to + // accept the file. + boolean AcceptUnknownGpgKey (string keyid, string keyname) { + // FIXME: one of these two dialogs should be used + + string filename = "FIXME: 'filename' is undefined variable!"; + return SignatureCheckDialogs::ItemSignedWithUnknownSignature(`file, filename, keyid); + + // This function would need more complex handling + // it also offers to import the signature into the keyring + SignatureCheckDialogs::ItemSignedWithPublicSignature(`file, filename, keyid, keyname); + return nil; + } + + // Name of the callback handler function. Required callback prototype is + // boolean(string filename). The callback function should ask user whether the + // unsigned file can be accepted, returned true value means to accept the + // file. + boolean AcceptUnsignedFile (string filename) { + return SignatureCheckDialogs::UseUnsignedItem(`file, filename); + } + + // Name of the callback handler function. Required callback prototype is + // boolean(string filename, string keyid, string keyname). The callback + // function should ask user whether the unsigned file can be accepted, + // returned true value means to accept the file. + boolean AcceptVerificationFailed (string filename, string keyid, string keyname) { + // FIXME: the description doesn't match the function name + // see also AcceptUnsignedFile() function + return SignatureCheckDialogs::UseCorruptedItem(`file, filename); + } + + // Name of the callback handler function. Required callback prototype is void + // (string keyid, string keyname). The callback function should inform user + // that a trusted key has been added. + void TrustedKeyAdded (string keyid, string keyname) { + // FIXME: we have no dialog for this message + return nil; + } + + // Name of the callback handler function. Required callback prototype is void + // (string keyid, string keyname). The callback function should inform user + // that a trusted key has been removed. + void TrustedKeyRemoved (string keyid, string keyname) { + // FIXME: we have no dialog for this message + return nil; + } + + // Name of the callback handler function. Required callback prototype is + // boolean(string keyid, string keyname). The callback function should ask + // user whether the key is trusted, returned true value means the key is + // trusted. + boolean ImportGpgKey (string keyid, string keyname) { + // FIXME: description of the function doesn't match the function name!!! + return nil; + } +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.56/src/modules/SignatureCheckDialogs.ycp new/yast2-packager-2.13.57/src/modules/SignatureCheckDialogs.ycp --- old/yast2-packager-2.13.56/src/modules/SignatureCheckDialogs.ycp 2006-03-30 10:49:57.000000000 +0200 +++ new/yast2-packager-2.13.57/src/modules/SignatureCheckDialogs.ycp 2006-04-04 15:22:38.000000000 +0200 @@ -235,9 +235,9 @@ * @param symbol item_type `file or `package * @param string item_name file name or package name * @param string key_id - * @return symbol `yes, `no or `retry + * @return boolean true if 'yes, use file' */ - global symbol ItemSignedWithUnknownSignature (symbol item_type, string item_name, string key_id) { + global boolean ItemSignedWithUnknownSignature (symbol item_type, string item_name, string key_id) { string description_text = sformat((item_type == `package ? // popup question, %1 stands for the package name, %2 for the key ID _("The package %1 is digitally signed with an unknown @@ -273,11 +273,11 @@ ); // This will optionally offer to retrieve the key from gpg keyservers - // That's why it returns 'symbol' instead of 'boolean' + // That's why it will return 'symbol' instead of 'boolean' // But by now it only handles yes/no/cancel - symbol ret = (WaitForYesNoCancelUserInput() == true ? `yes : `no); + boolean ret = WaitForYesNoCancelUserInput(); // default value - if (ret == nil) ret = `no; + if (ret == nil) ret = false; UI::CloseDialog(); return ret; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package yast2 checked in at Tue Apr 4 18:24:29 CEST 2006. -------- --- yast2/yast2.changes 2006-03-29 21:22:04.000000000 +0200 +++ yast2/yast2.changes 2006-04-04 15:41:27.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 4 15:31:08 CEST 2006 - locilka(a)suse.cz + +- Added mapping for Pkg::CallbackAcceptUnsignedFile() callback + (#162858) +- 2.13.42 + +------------------------------------------------------------------- Old: ---- yast2-2.13.41.tar.bz2 New: ---- yast2-2.13.42.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.MJ4Z3r/_old 2006-04-04 18:24:15.000000000 +0200 +++ /var/tmp/diff_new_pack.MJ4Z3r/_new 2006-04-04 18:24:15.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.13.41) +# spec file for package yast2 (Version 2.13.42) # # 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.41 -Release: 2 +Version: 2.13.42 +Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.13.41.tar.bz2 +Source0: yast2-2.13.42.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.41 +%setup -n yast2-2.13.42 %build %{prefix}/bin/y2tool y2autoconf @@ -192,6 +192,10 @@ %doc %{prefix}/share/doc/packages/yast2/wizard %changelog -n yast2 +* Tue Apr 04 2006 - locilka(a)suse.cz +- Added mapping for Pkg::CallbackAcceptUnsignedFile() callback + (#162858) +- 2.13.42 * Wed Mar 29 2006 - mvidner(a)suse.cz - Added PackageLock, a module to handle the big Zypp lock (#160319). - 2.13.41 ++++++ yast2-2.13.41.tar.bz2 -> yast2-2.13.42.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/VERSION new/yast2-2.13.42/VERSION --- old/yast2-2.13.41/VERSION 2006-03-29 17:03:01.000000000 +0200 +++ new/yast2-2.13.42/VERSION 2006-04-04 15:38:54.000000000 +0200 @@ -1 +1 @@ -2.13.41 +2.13.42 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/base.pot new/yast2-2.13.42/base.pot --- old/yast2-2.13.41/base.pot 2005-12-14 16:33:36.000000000 +0100 +++ new/yast2-2.13.42/base.pot 2006-02-07 16:03:17.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-14 16:33+0100\n" +"POT-Creation-Date: 2006-02-07 16:03+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -258,53 +258,53 @@ msgstr "" #. translators: progress message - command line interface ready -#: library/commandline/src/CommandLine.ycp:1263 +#: library/commandline/src/CommandLine.ycp:1258 msgid "Ready" msgstr "" #. non-GUI handling -#: library/commandline/src/CommandLine.ycp:1287 +#: library/commandline/src/CommandLine.ycp:1282 msgid "Initializing" msgstr "" #. translators: Progress message - the command line interface is about to finish -#: library/commandline/src/CommandLine.ycp:1326 +#: library/commandline/src/CommandLine.ycp:1321 msgid "Finishing" msgstr "" #. translators: The command line interface is finished -#: library/commandline/src/CommandLine.ycp:1333 +#: library/commandline/src/CommandLine.ycp:1328 msgid "Done" msgstr "" #. translators: The command line interface is finished without writing the changes -#: library/commandline/src/CommandLine.ycp:1336 +#: library/commandline/src/CommandLine.ycp:1331 msgid "Quitting (without changes)" msgstr "" #. prompt message displayed in the commandline mode #. when user is asked to replay "yes" or "no" (localized) -#: library/commandline/src/CommandLine.ycp:1351 -msgid "yes/no?: " +#: library/commandline/src/CommandLine.ycp:1346 +msgid "yes or no?" msgstr "" #. yes - used in the command line mode as input text for yes/no confirmation -#: library/commandline/src/CommandLine.ycp:1356 +#: library/commandline/src/CommandLine.ycp:1351 msgid "yes" msgstr "" #. no - used in the command line mode as input text for yes/no confirmation -#: library/commandline/src/CommandLine.ycp:1359 +#: library/commandline/src/CommandLine.ycp:1354 msgid "no" msgstr "" #. error report -#: library/control/src/ProductControl.ycp:811 +#: library/control/src/ProductControl.ycp:813 msgid "No workflow defined for this installation mode." msgstr "" #. message popup, %1 is a label of some widget -#: library/cwm/src/CWM.ycp:630 +#: library/cwm/src/CWM.ycp:626 #, ycp-format msgid "The value of %1 is invalid." msgstr "" @@ -598,37 +598,37 @@ msgstr "" #. combobox header -#: library/cwm/src/TablePopup.ycp:413 +#: library/cwm/src/TablePopup.ycp:417 msgid "&Selected Option" msgstr "" #. heading / label -#: library/cwm/src/TablePopup.ycp:459 +#: library/cwm/src/TablePopup.ycp:463 msgid "Current Option: " msgstr "" #. error report -#: library/cwm/src/TablePopup.ycp:652 +#: library/cwm/src/TablePopup.ycp:663 msgid "The selected option is already present." msgstr "" #. table header, shortcut for changed, keep very short -#: library/cwm/src/TablePopup.ycp:823 +#: library/cwm/src/TablePopup.ycp:835 msgid "Ch." msgstr "" #. table header -#: library/cwm/src/TablePopup.ycp:825 library/cwm/src/TablePopup.ycp:830 +#: library/cwm/src/TablePopup.ycp:837 library/cwm/src/TablePopup.ycp:842 msgid "Option" msgstr "" #. table header -#: library/cwm/src/TablePopup.ycp:827 library/cwm/src/TablePopup.ycp:832 +#: library/cwm/src/TablePopup.ycp:839 library/cwm/src/TablePopup.ycp:844 msgid "Value" msgstr "" #. help 1/4 -#: library/cwm/src/TablePopup.ycp:836 +#: library/cwm/src/TablePopup.ycp:848 msgid "" "<big>Editing the Settings</big> \n" "To edit the settings, choose the appropriate\n" @@ -636,21 +636,21 @@ msgstr "" #. help 2/4, optional -#: library/cwm/src/TablePopup.ycp:841 +#: library/cwm/src/TablePopup.ycp:853 msgid "" "To add a new option, click Add. To remove\n" "an option, select it and click Delete." msgstr "" #. help 3/4, optional -#: library/cwm/src/TablePopup.ycp:846 +#: library/cwm/src/TablePopup.ycp:858 msgid "" "The Ch. column of the table shows \n" "whether the option was changed." msgstr "" #. help 4/4, optional -#: library/cwm/src/TablePopup.ycp:851 +#: library/cwm/src/TablePopup.ycp:863 msgid "" "To reorder the options, select an option\n" "and use Up and Down to move it up or down\n" @@ -659,12 +659,12 @@ #. push button #. Button label -#: library/cwm/src/TablePopup.ycp:859 library/modules/Label.ycp:184 +#: library/cwm/src/TablePopup.ycp:871 library/modules/Label.ycp:184 msgid "&Up" msgstr "" #. push button -#: library/cwm/src/TablePopup.ycp:861 +#: library/cwm/src/TablePopup.ycp:873 msgid "&Down" msgstr "" @@ -1277,43 +1277,176 @@ msgid "All changes will be lost!" msgstr "" +#. translators: summary header for messages generated through autoinstallation +#: library/modules/Report.ycp:81 +msgid "Messages" +msgstr "" + +#. Report configuration - will be normal messages displayed? +#. '%1' will be replaced by translated string "Yes" or "No" +#: library/modules/Report.ycp:86 +#, ycp-format +msgid "Display Messages: %1" +msgstr "" + +#. translators: summary if the messages should be displayed +#. translators: summary if the messages should be written to log file +#. translators: summary if the warnings should be displayed +#. translators: summary if the warnings should be written to log file +#. translators: summary if the errors should be displayed +#. translators: summary if the errors should be written to log file +#: library/modules/Report.ycp:88 library/modules/Report.ycp:96 +#: library/modules/Report.ycp:105 library/modules/Report.ycp:113 +#: library/modules/Report.ycp:122 library/modules/Report.ycp:130 +msgid "Yes" +msgstr "" + +#. translators: summary if the errors should be written to log file +#: library/modules/Report.ycp:88 library/modules/Report.ycp:96 +#: library/modules/Report.ycp:105 library/modules/Report.ycp:113 +#: library/modules/Report.ycp:122 library/modules/Report.ycp:132 +msgid "No" +msgstr "" + +#. Report configuration - will have normal messages timeout? +#. '%1' will be replaced by number of seconds +#: library/modules/Report.ycp:91 +#, ycp-format +msgid "Time-out Messages: %1" +msgstr "" + +#. Report configuration - will be normal messages logged to file? +#. '%1' will be replaced by translated string "Yes" or "No" +#: library/modules/Report.ycp:94 +#, ycp-format +msgid "Log Messages: %1" +msgstr "" + +#. translators: summary header for warnings generated through autoinstallation +#: library/modules/Report.ycp:99 +msgid "Warnings" +msgstr "" + +#. Report configuration - will be warning messages displayed? +#. '%1' will be replaced by translated string "Yes" or "No" +#: library/modules/Report.ycp:103 +#, ycp-format +msgid "Display Warnings: %1" +msgstr "" + +#. Report configuration - will have warning messages timeout? +#. '%1' will be replaced by number of seconds +#: library/modules/Report.ycp:108 +#, ycp-format +msgid "Time-out Warnings: %1" +msgstr "" + +#. Report configuration - will be warning messages logged to file? +#. '%1' will be replaced by translated string "Yes" or "No" +#: library/modules/Report.ycp:111 +#, ycp-format +msgid "Log Warnings: %1" +msgstr "" + +#. translators: summary header for errors generated through autoinstallation +#: library/modules/Report.ycp:116 +msgid "Errors" +msgstr "" + +#. Report configuration - will be error messages displayed? +#. '%1' will be replaced by translated string "Yes" or "No" +#: library/modules/Report.ycp:120 +#, ycp-format +msgid "Display Errors: %1" +msgstr "" + +#. Report configuration - will have error messages timeout? +#. '%1' will be replaced by number of seconds +#: library/modules/Report.ycp:125 +#, ycp-format +msgid "Time-out Errors: %1" +msgstr "" + +#. Report configuration - will be error messages logged to file? +#. '%1' will be replaced by translated string "Yes" or "No" +#: library/modules/Report.ycp:128 +#, ycp-format +msgid "Log Errors: %1" +msgstr "" + +#. translators: warnings summary header +#: library/modules/Report.ycp:635 +msgid "Warning:" +msgid_plural "Warnings:" +msgstr[0] "" +msgstr[1] "" + +#. translators: errors summary header +#: library/modules/Report.ycp:649 +msgid "Error:" +msgid_plural "Errors:" +msgstr[0] "" +msgstr[1] "" + +#. translators: message summary header +#: library/modules/Report.ycp:663 library/modules/Report.ycp:677 +msgid "Message:" +msgid_plural "Messages:" +msgstr[0] "" +msgstr[1] "" + +#. translators: summary if the module has not been used yet in AutoYaST profile +#: library/modules/Summary.ycp:49 +msgid "Not configured yet." +msgstr "" + +#. translators: summary if no hardware was detected +#: library/modules/Summary.ycp:65 +msgid "Not detected." +msgstr "" + #. translators: Tree header #: library/modules/ValueBrowser.ycp:141 msgid "&Variable" msgstr "" #. label -#: library/network/src/CWMFirewallInterfaces.ycp:77 +#: library/network/src/CWMFirewallInterfaces.ycp:104 msgid "Firewall is disabled" msgstr "" #. label -#: library/network/src/CWMFirewallInterfaces.ycp:82 +#: library/network/src/CWMFirewallInterfaces.ycp:109 msgid "Firewall port is closed" msgstr "" #. label -#: library/network/src/CWMFirewallInterfaces.ycp:87 +#: library/network/src/CWMFirewallInterfaces.ycp:114 msgid "Firewall port is open on all interfaces" msgstr "" #. label -#: library/network/src/CWMFirewallInterfaces.ycp:92 +#: library/network/src/CWMFirewallInterfaces.ycp:119 msgid "Firewall port is open on selected interfaces" msgstr "" #. label -#: library/network/src/CWMFirewallInterfaces.ycp:97 +#: library/network/src/CWMFirewallInterfaces.ycp:124 msgid "No network interfaces are configured" msgstr "" +#. multi selection box item +#: library/network/src/CWMFirewallInterfaces.ycp:186 +msgid "All NetworkManager Interfaces" +msgstr "" + #. transaltors: selection box title -#: library/network/src/CWMFirewallInterfaces.ycp:278 +#: library/network/src/CWMFirewallInterfaces.ycp:365 msgid "&Network Interfaces with Open Port in Firewall" msgstr "" #. question popup -#: library/network/src/CWMFirewallInterfaces.ycp:338 +#: library/network/src/CWMFirewallInterfaces.ycp:431 msgid "" "No interface is selected. Service will not\n" "be available for other computers.\n" @@ -1322,7 +1455,7 @@ msgstr "" #. yes-no popup -#: library/network/src/CWMFirewallInterfaces.ycp:358 +#: library/network/src/CWMFirewallInterfaces.ycp:475 #, ycp-format msgid "" "Because of SuSE Firewall settings, the port\n" @@ -1333,7 +1466,7 @@ msgstr "" #. yes-no popup -#: library/network/src/CWMFirewallInterfaces.ycp:373 +#: library/network/src/CWMFirewallInterfaces.ycp:492 #, ycp-format msgid "" "Because of SuSE Firewall settings, the port\n" @@ -1344,23 +1477,23 @@ msgstr "" #. translators: selection box title -#: library/network/src/CWMFirewallInterfaces.ycp:450 +#: library/network/src/CWMFirewallInterfaces.ycp:569 msgid "Network &Interfaces with Open Port in Firewall" msgstr "" #. push button to select all network intefaces for firewall -#: library/network/src/CWMFirewallInterfaces.ycp:459 +#: library/network/src/CWMFirewallInterfaces.ycp:578 msgid "Select &All" msgstr "" #. push button to deselect all network intefaces for firewall -#: library/network/src/CWMFirewallInterfaces.ycp:462 +#: library/network/src/CWMFirewallInterfaces.ycp:581 msgid "Select &None" msgstr "" #. help text for firewall settings widget 1/3, #. %1 is check box label, eg. "Open Port in Firewall" (without quotes) -#: library/network/src/CWMFirewallInterfaces.ycp:680 +#: library/network/src/CWMFirewallInterfaces.ycp:799 #, ycp-format msgid "" "<big>Firewall Settings</big> \n" @@ -1371,7 +1504,7 @@ #. help text for firewall port openning widget 2/3, optional #. %1 is push button label, eg. "Firewall &Details" (without quotes) #. note: %2 is correct, do not replace with %1!!! -#: library/network/src/CWMFirewallInterfaces.ycp:688 +#: library/network/src/CWMFirewallInterfaces.ycp:807 #, ycp-format msgid "" "To select interfaces on which to open the port,\n" @@ -1379,37 +1512,46 @@ msgstr "" #. help text for firewall settings widget 3/3, -#: library/network/src/CWMFirewallInterfaces.ycp:692 +#: library/network/src/CWMFirewallInterfaces.ycp:811 msgid "" "This option is available only if the firewall\n" "is enabled." msgstr "" #. part of help text - check box label, NO SHORTCUT!!! -#: library/network/src/CWMFirewallInterfaces.ycp:705 +#: library/network/src/CWMFirewallInterfaces.ycp:824 msgid "Open Port in Firewall" msgstr "" #. part of help text - push button label, NO SHORTCUT!!! -#: library/network/src/CWMFirewallInterfaces.ycp:707 +#: library/network/src/CWMFirewallInterfaces.ycp:826 msgid "Firewall Details" msgstr "" #. check box -#: library/network/src/CWMFirewallInterfaces.ycp:736 +#: library/network/src/CWMFirewallInterfaces.ycp:855 msgid "Open Port in &Firewall" msgstr "" #. push button -#: library/network/src/CWMFirewallInterfaces.ycp:739 +#: library/network/src/CWMFirewallInterfaces.ycp:858 msgid "Firewall &Details" msgstr "" #. label text -#: library/network/src/CWMFirewallInterfaces.ycp:768 +#: library/network/src/CWMFirewallInterfaces.ycp:887 msgid "Firewall is open" msgstr "" +#. TRANSLATORS: pop-up question when reading the service configuration +#: library/network/src/NetworkService.ycp:108 +msgid "" +"Your network interfaces are currently controlled by NetworkManager\n" +"but the service to configure might not work well with it.\n" +"\n" +"Really continue?" +msgstr "" + #. TRANSLATORS: popup informing message, allowed characters for port-names #: library/network/src/PortAliases.ycp:112 msgid "" @@ -1419,39 +1561,39 @@ msgstr "" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/SuSEFirewall.ycp:72 +#: library/network/src/SuSEFirewall.ycp:79 msgid "External Zone" msgstr "" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/SuSEFirewall.ycp:74 +#: library/network/src/SuSEFirewall.ycp:81 msgid "Internal Zone" msgstr "" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/SuSEFirewall.ycp:76 +#: library/network/src/SuSEFirewall.ycp:83 msgid "Demilitarized Zone" msgstr "" #. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title -#: library/network/src/SuSEFirewall.ycp:1103 +#: library/network/src/SuSEFirewall.ycp:1140 msgid "Unknown Zone" msgstr "" #. TRANSLATORS: a popup error message -#: library/network/src/SuSEFirewall.ycp:1323 +#: library/network/src/SuSEFirewall.ycp:1360 #, ycp-format msgid "Cannot enable service '%1'." msgstr "" #. TRANSLATORS: a popup error message -#: library/network/src/SuSEFirewall.ycp:1345 +#: library/network/src/SuSEFirewall.ycp:1382 #, ycp-format msgid "Cannot disable service '%1'." msgstr "" #. TRANSLATORS: Error message, %1 = interface name (like eth0) -#: library/network/src/SuSEFirewall.ycp:1458 +#: library/network/src/SuSEFirewall.ycp:1497 #, ycp-format msgid "" "Interface '%1' is included in multiple firewall zones.\n" @@ -1462,8 +1604,8 @@ msgstr "" #. TRANSLATORS: Error message, %1 = interface name (like eth0) -#: library/network/src/SuSEFirewall.ycp:1730 -#: library/network/src/SuSEFirewall.ycp:1787 +#: library/network/src/SuSEFirewall.ycp:1782 +#: library/network/src/SuSEFirewall.ycp:1843 #, ycp-format msgid "" "Interface '%1' is not assigned to any firewall zone.\n" @@ -1471,78 +1613,78 @@ msgstr "" #. TRANSLATORS: Dialog caption -#: library/network/src/SuSEFirewall.ycp:2111 +#: library/network/src/SuSEFirewall.ycp:2175 msgid "Initializing Firewall Configuration" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2116 +#: library/network/src/SuSEFirewall.ycp:2180 msgid "Check for network devices" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2118 +#: library/network/src/SuSEFirewall.ycp:2182 msgid "Read current configuration" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2120 +#: library/network/src/SuSEFirewall.ycp:2184 msgid "Check possibly conflicting services" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2124 +#: library/network/src/SuSEFirewall.ycp:2188 msgid "Checking for network devices..." msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2126 +#: library/network/src/SuSEFirewall.ycp:2190 msgid "Reading current configuration..." msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2128 +#: library/network/src/SuSEFirewall.ycp:2192 msgid "Checking possibly conflicting services..." msgstr "" #. TRANSLATORS: Dialog caption -#: library/network/src/SuSEFirewall.ycp:2227 +#: library/network/src/SuSEFirewall.ycp:2291 msgid "Writing Firewall Configuration" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2232 +#: library/network/src/SuSEFirewall.ycp:2296 msgid "Write firewall settings" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2234 +#: library/network/src/SuSEFirewall.ycp:2298 msgid "Adjust firewall service" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2238 +#: library/network/src/SuSEFirewall.ycp:2302 msgid "Writing firewall settings..." msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2240 +#: library/network/src/SuSEFirewall.ycp:2304 msgid "Adjusting firewall service..." msgstr "" #. TRANSLATORS: a popup error message -#: library/network/src/SuSEFirewall.ycp:2256 +#: library/network/src/SuSEFirewall.ycp:2320 msgid "Writing settings failed" msgstr "" #. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...) -#: library/network/src/SuSEFirewallProposal.ycp:136 +#: library/network/src/SuSEFirewallProposal.ycp:137 #, ycp-format msgid "New network device '%1' found; added as an internal firewall interface" msgstr "" #. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...) -#: library/network/src/SuSEFirewallProposal.ycp:143 +#: library/network/src/SuSEFirewallProposal.ycp:144 #, ycp-format msgid "New network device '%1' found; added as an external firewall interface" msgstr "" @@ -1550,7 +1692,7 @@ #. TRANSLATORS: Proposal informative text "Firewall is enabled" with link around #. "enabled" must be surrounded with the "%1" and "%2" strings #. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" -#: library/network/src/SuSEFirewallProposal.ycp:330 +#: library/network/src/SuSEFirewallProposal.ycp:349 #, ycp-format msgid "Firewall is %1enabled%2" msgstr "" @@ -1558,7 +1700,7 @@ #. TRANSLATORS: Proposal informative text "Firewall is disabled" with link around #. "disabled" must be surrounded with the "%1" and "%2" strings #. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" -#: library/network/src/SuSEFirewallProposal.ycp:335 +#: library/network/src/SuSEFirewallProposal.ycp:354 #, ycp-format msgid "Firewall is %1disabled%2" msgstr "" @@ -1566,7 +1708,7 @@ #. TRANSLATORS: Network proposal informative text "SSH is enabled" with link around #. "enabled" must be surrounded with the "%1" and "%2" strings #. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" -#: library/network/src/SuSEFirewallProposal.ycp:353 +#: library/network/src/SuSEFirewallProposal.ycp:384 #, ycp-format msgid "SSH port is %1open%2" msgstr "" @@ -1574,20 +1716,20 @@ #. TRANSLATORS: Network proposal informative text "SSH is disabled" with link around #. "disabled" must be surrounded with the "%1" and "%2" strings #. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" -#: library/network/src/SuSEFirewallProposal.ycp:358 +#: library/network/src/SuSEFirewallProposal.ycp:389 #, ycp-format msgid "SSH port is %1blocked%2" msgstr "" #. TRANSLATORS: This is a warning message. Installation over SSH without SSH allowed on firewall -#: library/network/src/SuSEFirewallProposal.ycp:364 -msgid "You are installing system over the SSH but you have not opened the SSH port on the firewall." +#: library/network/src/SuSEFirewallProposal.ycp:395 +msgid "You are installing a system over SSH, but you have not opened the SSH port on the firewall." msgstr "" #. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is enabled" with link around #. "enabled" must be surrounded with the "%1" and "%2" strings #. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" -#: library/network/src/SuSEFirewallProposal.ycp:383 +#: library/network/src/SuSEFirewallProposal.ycp:414 #, ycp-format msgid "Remote Administration (VNC) ports are %1open%2" msgstr "" @@ -1595,14 +1737,14 @@ #. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is disabled" with link around #. "disabled" must be surrounded with the "%1" and "%2" strings #. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" -#: library/network/src/SuSEFirewallProposal.ycp:388 +#: library/network/src/SuSEFirewallProposal.ycp:419 #, ycp-format msgid "Remote Administration (VNC) ports are %1blocked%2" msgstr "" #. TRANSLATORS: This is a warning message. Installation over VNC without VNC allowed on firewall -#: library/network/src/SuSEFirewallProposal.ycp:393 -msgid "You are installing system over the Remote Administration (VNC) but you have not opened the VNC ports on the firewall." +#: library/network/src/SuSEFirewallProposal.ycp:424 +msgid "You are installing a system using remote administration (VNC), but you have not opened the VNC ports on the firewall." msgstr "" #. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box... @@ -1736,49 +1878,43 @@ msgstr "" #. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box... -#: library/network/src/SuSEFirewallServices.ycp:183 +#: library/network/src/SuSEFirewallServices.ycp:185 msgid "Remote Access to Display Manager" msgstr "" #. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box... -#: library/network/src/SuSEFirewallServices.ycp:191 +#: library/network/src/SuSEFirewallServices.ycp:193 msgid "Remote File Alteration Monitor" msgstr "" #. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box... -#: library/network/src/SuSEFirewallServices.ycp:197 +#: library/network/src/SuSEFirewallServices.ycp:199 msgid "Portable Batch System (PBS)" msgstr "" #. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box... -#: library/network/src/SuSEFirewallServices.ycp:204 +#: library/network/src/SuSEFirewallServices.ycp:206 msgid "MySQL Remote Access" msgstr "" #. TRANSLATORS: Name of unknown service. This should never happen, just for cases..., %1 is a requested service id like nis-server -#: library/network/src/SuSEFirewallServices.ycp:234 +#: library/network/src/SuSEFirewallServices.ycp:236 #, ycp-format msgid "Unknown service '%1'" msgstr "" #. Popup when initializing the package manager -#. popup when initializing the package manager #: library/packages/src/PackageSystem.ycp:77 -#: library/packages/src/Require.ycp:75 msgid "Reading package information..." msgstr "" #. Error message, no packages sources found -#. error popup, no packages sources -#. FIXME: translation #: library/packages/src/PackageSystem.ycp:99 -#: library/packages/src/Require.ycp:87 msgid "No package source defined." msgstr "" #. popup heading, with rich text widget and Yes/No buttons #: library/packages/src/PackageSystem.ycp:128 -#: library/packages/src/Require.ycp:343 msgid "Do you accept this license agreement?" msgid_plural "Do you accept these license agreements?" msgstr[0] "" @@ -1809,19 +1945,14 @@ "packages, YaST may not work properly.\n" msgstr "" -#. this is a separator used at merging package list items -#: library/packages/src/common.ycp:83 -msgid ", " -msgstr "" - #. the message is followed by list of required packages #. Popup Text -#: library/packages/src/common.ycp:85 library/packages/src/common.ycp:109 +#: library/packages/src/common.ycp:84 library/packages/src/common.ycp:108 msgid "These packages need to be installed:" msgstr "" #. Popup Text -#: library/packages/src/common.ycp:111 +#: library/packages/src/common.ycp:110 msgid "These packages need to be removed:" msgstr "" @@ -1933,22 +2064,22 @@ msgstr "" #. KiloByte abbreviated -#: library/types/src/String.ycp:80 +#: library/types/src/String.ycp:96 msgid "KB" msgstr "" #. MegaByte abbreviated -#: library/types/src/String.ycp:82 +#: library/types/src/String.ycp:98 msgid "MB" msgstr "" #. GigaByte abbreviated -#: library/types/src/String.ycp:84 +#: library/types/src/String.ycp:100 msgid "GB" msgstr "" #. TeraByte abbreviated -#: library/types/src/String.ycp:86 +#: library/types/src/String.ycp:102 msgid "TB" msgstr "" @@ -2024,134 +2155,6 @@ msgid "&Exported Directories" msgstr "" -#. translators: summary header for messages generated through autoinstallation -#: library/wizard/src/Report.ycp:81 -msgid "Messages" -msgstr "" - -#. Report configuration - will be normal messages displayed? -#. '%1' will be replaced by translated string "Yes" or "No" -#: library/wizard/src/Report.ycp:86 -#, ycp-format -msgid "Display Messages: %1" -msgstr "" - -#. translators: summary if the messages should be displayed -#. translators: summary if the messages should be written to log file -#. translators: summary if the warnings should be displayed -#. translators: summary if the warnings should be written to log file -#. translators: summary if the errors should be displayed -#. translators: summary if the errors should be written to log file -#: library/wizard/src/Report.ycp:88 library/wizard/src/Report.ycp:96 -#: library/wizard/src/Report.ycp:105 library/wizard/src/Report.ycp:113 -#: library/wizard/src/Report.ycp:122 library/wizard/src/Report.ycp:130 -msgid "Yes" -msgstr "" - -#. translators: summary if the errors should be written to log file -#: library/wizard/src/Report.ycp:88 library/wizard/src/Report.ycp:96 -#: library/wizard/src/Report.ycp:105 library/wizard/src/Report.ycp:113 -#: library/wizard/src/Report.ycp:122 library/wizard/src/Report.ycp:132 -msgid "No" -msgstr "" - -#. Report configuration - will have normal messages timeout? -#. '%1' will be replaced by number of seconds -#: library/wizard/src/Report.ycp:91 -#, ycp-format -msgid "Time-out Messages: %1" -msgstr "" - -#. Report configuration - will be normal messages logged to file? -#. '%1' will be replaced by translated string "Yes" or "No" -#: library/wizard/src/Report.ycp:94 -#, ycp-format -msgid "Log Messages: %1" -msgstr "" - -#. translators: summary header for warnings generated through autoinstallation -#: library/wizard/src/Report.ycp:99 -msgid "Warnings" -msgstr "" - -#. Report configuration - will be warning messages displayed? -#. '%1' will be replaced by translated string "Yes" or "No" -#: library/wizard/src/Report.ycp:103 -#, ycp-format -msgid "Display Warnings: %1" -msgstr "" - -#. Report configuration - will have warning messages timeout? -#. '%1' will be replaced by number of seconds -#: library/wizard/src/Report.ycp:108 -#, ycp-format -msgid "Time-out Warnings: %1" -msgstr "" - -#. Report configuration - will be warning messages logged to file? -#. '%1' will be replaced by translated string "Yes" or "No" -#: library/wizard/src/Report.ycp:111 -#, ycp-format -msgid "Log Warnings: %1" -msgstr "" - -#. translators: summary header for errors generated through autoinstallation -#: library/wizard/src/Report.ycp:116 -msgid "Errors" -msgstr "" - -#. Report configuration - will be error messages displayed? -#. '%1' will be replaced by translated string "Yes" or "No" -#: library/wizard/src/Report.ycp:120 -#, ycp-format -msgid "Display Errors: %1" -msgstr "" - -#. Report configuration - will have error messages timeout? -#. '%1' will be replaced by number of seconds -#: library/wizard/src/Report.ycp:125 -#, ycp-format -msgid "Time-out Errors: %1" -msgstr "" - -#. Report configuration - will be error messages logged to file? -#. '%1' will be replaced by translated string "Yes" or "No" -#: library/wizard/src/Report.ycp:128 -#, ycp-format -msgid "Log Errors: %1" -msgstr "" - -#. translators: warnings summary header -#: library/wizard/src/Report.ycp:635 -msgid "Warning:" -msgid_plural "Warnings:" -msgstr[0] "" -msgstr[1] "" - -#. translators: errors summary header -#: library/wizard/src/Report.ycp:649 -msgid "Error:" -msgid_plural "Errors:" -msgstr[0] "" -msgstr[1] "" - -#. translators: message summary header -#: library/wizard/src/Report.ycp:663 library/wizard/src/Report.ycp:677 -msgid "Message:" -msgid_plural "Messages:" -msgstr[0] "" -msgstr[1] "" - -#. translators: summary if the module has not been used yet in AutoYaST profile -#: library/wizard/src/Summary.ycp:49 -msgid "Not configured yet." -msgstr "" - -#. translators: summary if no hardware was detected -#: library/wizard/src/Summary.ycp:65 -msgid "Not detected." -msgstr "" - #. button text #: library/wizard/src/Wizard.ycp:153 library/wizard/src/Wizard.ycp:306 msgid "&Apply" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/configure new/yast2-2.13.42/configure --- old/yast2-2.13.41/configure 2006-03-29 17:06:37.000000000 +0200 +++ new/yast2-2.13.42/configure 2006-04-04 15:54:42.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 2.13.41. +# Generated by GNU Autoconf 2.59 for yast2 2.13.42. # # Report bugs to <http://www.suse.de/feedback>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.13.41' -PACKAGE_STRING='yast2 2.13.41' +PACKAGE_VERSION='2.13.42' +PACKAGE_STRING='yast2 2.13.42' 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 2.13.41 to adapt to many kinds of systems. +\`configure' configures yast2 2.13.42 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 2.13.41:";; + short | recursive ) echo "Configuration of yast2 2.13.42:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.13.41 +yast2 configure 2.13.42 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 $as_me 2.13.41, which was +It was created by yast2 $as_me 2.13.42, 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' - VERSION='2.13.41' + VERSION='2.13.42' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.41" +VERSION="2.13.42" RPMNAME="yast2" MAINTAINER="Stanislav Visnovsky <visnov(a)suse.cz>" @@ -2797,7 +2797,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2 $as_me 2.13.41, which was +This file was extended by yast2 $as_me 2.13.42, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2852,7 +2852,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2 config.status 2.13.41 +yast2 config.status 2.13.42 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-2.13.41/configure.in new/yast2-2.13.42/configure.in --- old/yast2-2.13.41/configure.in 2006-03-29 17:06:24.000000000 +0200 +++ new/yast2-2.13.42/configure.in 2006-04-04 15:54:36.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.13.41, http://www.suse.de/feedback, yast2) +AC_INIT(yast2, 2.13.42, 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.41" +VERSION="2.13.42" RPMNAME="yast2" MAINTAINER="Stanislav Visnovsky <visnov(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/library/modules/Version.ycp new/yast2-2.13.42/library/modules/Version.ycp --- old/yast2-2.13.41/library/modules/Version.ycp 2006-03-29 17:07:15.000000000 +0200 +++ new/yast2-2.13.42/library/modules/Version.ycp 2006-04-04 15:55:01.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.13.41"; +global string yast2 = "2.13.42"; /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.41/library/packages/src/PackageCallbacksInit.ycp new/yast2-2.13.42/library/packages/src/PackageCallbacksInit.ycp --- old/yast2-2.13.41/library/packages/src/PackageCallbacksInit.ycp 2005-08-09 14:54:55.000000000 +0200 +++ new/yast2-2.13.42/library/packages/src/PackageCallbacksInit.ycp 2006-04-04 15:42:13.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Initialize packager callbacks * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: PackageCallbacksInit.ycp 24643 2005-08-05 07:10:25Z jsrain $ + * $Id: PackageCallbacksInit.ycp 29661 2006-04-04 13:42:05Z locilka $ * * This module is used to initialize package manager callbacks */ @@ -41,6 +41,9 @@ // Pkg::CallbackProgressDownload ("PackageCallbacks::ProgressDownload"); // Pkg::CallbackDoneDownload ("PackageCallbacks::DoneDownload"); + // Signature-related callbacks + Pkg::CallbackAcceptUnsignedFile ("SignatureCheckCallbacks::AcceptUnsignedFile"); + SetMediaCallbacks (); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit suseRegister
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package suseRegister checked in at Tue Apr 4 18:24:03 CEST 2006. -------- --- suseRegister/suseRegister.changes 2006-03-31 10:25:51.000000000 +0200 +++ suseRegister/suseRegister.changes 2006-04-04 15:50:53.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 4 15:49:18 CEST 2006 - mc(a)suse.de + +- provide release in products +- remove xen magic + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suseRegister.spec ++++++ --- /var/tmp/diff_new_pack.WR5vaq/_old 2006-04-04 18:23:58.000000000 +0200 +++ /var/tmp/diff_new_pack.WR5vaq/_new 2006-04-04 18:23:58.000000000 +0200 @@ -13,7 +13,7 @@ Name: suseRegister BuildRequires: mono-core Version: 1.0 -Release: 38 +Release: 39 Summary: Registration tool Group: Productivity/Other License: GPL @@ -59,6 +59,9 @@ /usr/lib/suseRegister/bin/* %changelog -n suseRegister +* Tue Apr 04 2006 - mc(a)suse.de +- provide release in products +- remove xen magic * Fri Mar 31 2006 - mc(a)suse.de - check location of query-pool [#162302] * Thu Mar 30 2006 - mc(a)suse.de ++++++ suseRegister-1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.0/suse_register new/suseRegister-1.0/suse_register --- old/suseRegister-1.0/suse_register 2006-03-31 10:22:30.000000000 +0200 +++ new/suseRegister-1.0/suse_register 2006-04-04 15:48:56.000000000 +0200 @@ -89,8 +89,8 @@ my $uname = "/bin/uname"; my $hwinfo = "/usr/sbin/hwinfo"; my $zmdInit = "/etc/init.d/novell-zmd"; -my $xenstoreread = "/usr/bin/xenstore-read"; -my $xenstorewrite = "/usr/bin/xenstore-write"; +#my $xenstoreread = "/usr/bin/xenstore-read"; +#my $xenstorewrite = "/usr/bin/xenstore-write"; my $mono = "/usr/bin/mono"; my $createGuid = "/usr/lib/suseRegister/bin/create-guid.exe"; @@ -340,43 +340,45 @@ ########## host GUID (virtualization) ############# - if(-d "/proc/xen" && - -e $xenstoreread) - { - print STDERR "Found XEN\n" if($debug >= 2); - - # FIXME: check if this command really returns what we want - my $val = `$xenstoreread domid 2>/dev/null`; - chomp($val); - - if(defined $val && $val eq "0") - { - print STDERR "We are Domain-0\n" if($debug >= 2); - - # we are Domain-0 - if(-e $xenstorewrite) - { - print STDERR "Write hostGUID to xenbus\n" if($debug); +# spec not finished and this seems not to work + +# if(-d "/proc/xen" && +# -e $xenstoreread) +# { +# print STDERR "Found XEN\n" if($debug >= 2); + +# # FIXME: check if this command really returns what we want +# my $val = `$xenstoreread domid 2>/dev/null`; +# chomp($val); + +# if(defined $val && $val eq "0") +# { +# print STDERR "We are Domain-0\n" if($debug >= 2); + +# # we are Domain-0 +# if(-e $xenstorewrite) +# { +# print STDERR "Write hostGUID to xenbus\n" if($debug); - `$xenstorewrite hostGUID $guid 2>/dev/null`; - # FIXME: after rebooting Domain-0 this value might be gone - } - } - else - { - print STDERR "try to read hostGUID from xenbus\n" if($debug >= 2); - - $val = `$xenstoreread hostGUID 2>/dev/null`; - chomp($val); - - if(defined $val && $val ne "") - { - print STDERR "Got hostGUID: $val\n" if($debug); +# `$xenstorewrite hostGUID $guid 2>/dev/null`; +# # FIXME: after rebooting Domain-0 this value might be gone +# } +# } +# else +# { +# print STDERR "try to read hostGUID from xenbus\n" if($debug >= 2); + +# $val = `$xenstoreread hostGUID 2>/dev/null`; +# chomp($val); + +# if(defined $val && $val ne "") +# { +# print STDERR "Got hostGUID: $val\n" if($debug); - $hostGUID = $val; - } - } - } +# $hostGUID = $val; +# } +# } +# } ############## some initial values ######################## @@ -832,7 +834,8 @@ { $writer->startTag("product", "version" => $PArray->[1], - "arch" => $PArray->[2]); + "release" => $PArray->[2], + "arch" => $PArray->[3]); if ($PArray->[0] =~ /\s+/) { $writer->cdata($PArray->[0]); @@ -1002,7 +1005,8 @@ { $writer->startTag("product", "version" => $PArray->[1], - "arch" => $PArray->[2]); + "release" => $PArray->[2], + "arch" => $PArray->[3]); if ($PArray->[0] =~ /\s+/) { $writer->cdata($PArray->[0]); @@ -1294,6 +1298,7 @@ my $type = $p[1]; my $product = $p[2]; my $version = $p[3]; + my $release = ""; my $arch = $p[4]; if(!defined $arch || $arch eq "" || $arch eq "noarch") @@ -1302,9 +1307,22 @@ chomp($arch); } + if(defined $version && $version ne "") + { + my @v = split("-", $version, 2); + if(exists $v[0] && defined $v[0] && $v[0] ne "") + { + $version = $v[0]; + } + if(exists $v[1] && defined $v[1] && $v[1] ne "") + { + $release = $v[1]; + } + } + if($installed eq "i" && lc($type) eq lc("product")) { - push @installedProducts, [$product, $version, $arch]; + push @installedProducts, [$product, $version, $release, $arch]; } } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kernel-source
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package kernel-source checked in at Tue Apr 4 18:24:03 CEST 2006. -------- --- kernel-source/kernel-bigsmp.changes 2006-04-03 14:26:28.000000000 +0200 +++ kernel-source/kernel-bigsmp.changes 2006-04-04 15:47:45.000000000 +0200 @@ -1,0 +2,84 @@ +Tue Apr 4 15:20:52 CEST 2006 - garloff(a)suse.de + +- Xen configurations: Build backend/frontend drivers as modules. +- patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices + that report a periph. qualifier of 3 better during scan. +- patches.fixes/sg2616dio_lk.diff: Fix memory leak when doing + direct I/O via sg. + +------------------------------------------------------------------- +Tue Apr 4 14:29:07 CEST 2006 - hare(a)suse.de + +- add patches.arch/s390-dasd-eer-october2005.diff + Extended error reporting for DASDs. +- add patches.arch/s390-02-0{2,3,4}-october2005.diff + Include patches from IBM. +- patches.arch/s390-mapped-base.patch + Enable patch now that mapped_base is back in. +- patches.arch/s390-dasd-erp-debug.patch + Remove obsolete patch. + +------------------------------------------------------------------- +Tue Apr 4 14:15:51 CEST 2006 - olh(a)suse.de + +- add patches.arch/ppc-iseries-irq-256max.patch + iSeries has only 256 IRQs (158811 - LTC22471) + +------------------------------------------------------------------- +Tue Apr 4 13:46:39 CEST 2006 - hare(a)suse.de + +- add patches.fixes/bus-uevent-after-sysfs-links + We should send bus device events after all links are created. + +------------------------------------------------------------------- +Tue Apr 4 13:34:41 CEST 2006 - olh(a)suse.de + +- add patches.arch/ppc-kdump-shutdown-interrupts.patch + end all interrupts before starting the kdump kernel (152932 - LTC21954) + +------------------------------------------------------------------- +Mon Apr 3 21:49:26 CEST 2006 - gregkh(a)suse.de + +- patches.fixes/sysfs-off-by-one.patch: sysfs: zero terminate + sysfs write buffers (CVE-2006-1055). + +------------------------------------------------------------------- +Mon Apr 3 22:10:15 CEST 2006 - mason(a)suse.de + +- patches.drivers/e1000-no-tso: [e1000] Disable TSO for now + (157600). +- patches.fixes/hrtimer-opt: optimize run_hrtimer_queue when + there is no work to do (161587). +- patches.fixes/calc-load-opt: Combining nr_running() & + nr_interruptible() into a single function (162658). +- patches.suse/cache_reap-latency: reduce irq latencies in + cache_reap (160144). +- patches.suse/drain-node-pages-latency: drain_node_pages latency + fix (160144). +- enable e1000 TSO again + +------------------------------------------------------------------- +Mon Apr 3 14:53:46 CEST 2006 - ak(a)suse.de + +- patches.fixes/nodehotplug-sysfs: Fix NULL pointer dereference + in node_read_numastat(). +- patches.suse/kdb-x86_64-longjmp: Fix longjmp in x86-64 kdb. + +------------------------------------------------------------------- +Mon Apr 3 13:43:38 CEST 2006 - jbeulich(a)novell.com + +- Update x86-64 Xen config file (enable HOTPLUG_CPU) (162576). + +------------------------------------------------------------------- +Mon Apr 3 13:43:38 CEST 2006 - jbeulich(a)novell.com + +- patches.arch/microcode-quiet: Quieten down microcode update + driver (158643). + +------------------------------------------------------------------- +Mon Apr 3 14:27:01 CEST 2006 - ak(a)suse.de + +- patches.arch/x86_64-hpet-drift: Fix drift with HPET timer + enabled (158650). + +------------------------------------------------------------------- kernel-debug.changes: same change kernel-default.changes: same change kernel-dummy.changes: same change kernel-iseries64.changes: same change kernel-kdump.changes: same change kernel-ppc64.changes: same change kernel-s390.changes: same change kernel-smp.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-um.changes: same change kernel-xen.changes: same change kernel-xenpae.changes: same change New: ---- needed_space_in_mb ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-bigsmp.spec ++++++ --- /var/tmp/diff_new_pack.IfX8hf/_old 2006-04-04 18:21:41.000000000 +0200 +++ /var/tmp/diff_new_pack.IfX8hf/_new 2006-04-04 18:21:41.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 12 +Release: 13 Summary: Kernel with Multiprocessor Support and PAE License: GPL Group: System/Kernel @@ -115,7 +115,7 @@ -Source Timestamp: 2006-04-03 12:19:51 +0000 +Source Timestamp: 2006-04-04 13:47:08 +0000 %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then @@ -441,6 +441,56 @@ %files -f kernel.files %changelog -n kernel-bigsmp +* Tue Apr 04 2006 - garloff(a)suse.de +- Xen configurations: Build backend/frontend drivers as modules. +- patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices + that report a periph. qualifier of 3 better during scan. +- patches.fixes/sg2616dio_lk.diff: Fix memory leak when doing + direct I/O via sg. +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.arch/s390-dasd-eer-october2005.diff + Extended error reporting for DASDs. +- add patches.arch/s390-02-0{2,3,4}-october2005.diff + Include patches from IBM. +- patches.arch/s390-mapped-base.patch + Enable patch now that mapped_base is back in. +- patches.arch/s390-dasd-erp-debug.patch + Remove obsolete patch. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-iseries-irq-256max.patch + iSeries has only 256 IRQs (158811 - LTC22471) +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.fixes/bus-uevent-after-sysfs-links + We should send bus device events after all links are created. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-kdump-shutdown-interrupts.patch + end all interrupts before starting the kdump kernel (152932 - LTC21954) +* Mon Apr 03 2006 - mason(a)suse.de +- patches.drivers/e1000-no-tso: [e1000] Disable TSO for now + (157600). +- patches.fixes/hrtimer-opt: optimize run_hrtimer_queue when + there is no work to do (161587). +- patches.fixes/calc-load-opt: Combining nr_running() & + nr_interruptible() into a single function (162658). +- patches.suse/cache_reap-latency: reduce irq latencies in + cache_reap (160144). +- patches.suse/drain-node-pages-latency: drain_node_pages latency + fix (160144). +- enable e1000 TSO again +* Mon Apr 03 2006 - gregkh(a)suse.de +- patches.fixes/sysfs-off-by-one.patch: sysfs: zero terminate + sysfs write buffers (CVE-2006-1055). +* Mon Apr 03 2006 - ak(a)suse.de +- patches.fixes/nodehotplug-sysfs: Fix NULL pointer dereference + in node_read_numastat(). +- patches.suse/kdb-x86_64-longjmp: Fix longjmp in x86-64 kdb. +* Mon Apr 03 2006 - ak(a)suse.de +- patches.arch/x86_64-hpet-drift: Fix drift with HPET timer + enabled (158650). +* Mon Apr 03 2006 - jbeulich(a)novell.com +- Update x86-64 Xen config file (enable HOTPLUG_CPU) (162576). +- patches.arch/microcode-quiet: Quieten down microcode update + driver (158643). * Mon Apr 03 2006 - trenn(a)suse.de - patches.arch/acpi_suppress_aetime.patch: acpi_os_wait_semaphore(): don't complain about timeout (118958). kernel-debug.spec: same change kernel-default.spec: same change ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.IfX8hf/_old 2006-04-04 18:21:41.000000000 +0200 +++ /var/tmp/diff_new_pack.IfX8hf/_new 2006-04-04 18:21:41.000000000 +0200 @@ -17,7 +17,7 @@ Summary: Internal dummy package for synchronizing release numbers Group: System/Kernel Version: 2.6.16 -Release: 12 +Release: 13 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -27,7 +27,7 @@ -------- Andreas Gruenbacher <agruen(a)suse.de> -Source Timestamp: 2006-04-03 12:19:51 +0000 +Source Timestamp: 2006-04-04 13:47:08 +0000 %install @@ -40,6 +40,56 @@ /etc/dummy %changelog -n kernel-dummy +* Tue Apr 04 2006 - garloff(a)suse.de +- Xen configurations: Build backend/frontend drivers as modules. +- patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices + that report a periph. qualifier of 3 better during scan. +- patches.fixes/sg2616dio_lk.diff: Fix memory leak when doing + direct I/O via sg. +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.arch/s390-dasd-eer-october2005.diff + Extended error reporting for DASDs. +- add patches.arch/s390-02-0{2,3,4}-october2005.diff + Include patches from IBM. +- patches.arch/s390-mapped-base.patch + Enable patch now that mapped_base is back in. +- patches.arch/s390-dasd-erp-debug.patch + Remove obsolete patch. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-iseries-irq-256max.patch + iSeries has only 256 IRQs (158811 - LTC22471) +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.fixes/bus-uevent-after-sysfs-links + We should send bus device events after all links are created. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-kdump-shutdown-interrupts.patch + end all interrupts before starting the kdump kernel (152932 - LTC21954) +* Mon Apr 03 2006 - mason(a)suse.de +- patches.drivers/e1000-no-tso: [e1000] Disable TSO for now + (157600). +- patches.fixes/hrtimer-opt: optimize run_hrtimer_queue when + there is no work to do (161587). +- patches.fixes/calc-load-opt: Combining nr_running() & + nr_interruptible() into a single function (162658). +- patches.suse/cache_reap-latency: reduce irq latencies in + cache_reap (160144). +- patches.suse/drain-node-pages-latency: drain_node_pages latency + fix (160144). +- enable e1000 TSO again +* Mon Apr 03 2006 - gregkh(a)suse.de +- patches.fixes/sysfs-off-by-one.patch: sysfs: zero terminate + sysfs write buffers (CVE-2006-1055). +* Mon Apr 03 2006 - ak(a)suse.de +- patches.fixes/nodehotplug-sysfs: Fix NULL pointer dereference + in node_read_numastat(). +- patches.suse/kdb-x86_64-longjmp: Fix longjmp in x86-64 kdb. +* Mon Apr 03 2006 - ak(a)suse.de +- patches.arch/x86_64-hpet-drift: Fix drift with HPET timer + enabled (158650). +* Mon Apr 03 2006 - jbeulich(a)novell.com +- Update x86-64 Xen config file (enable HOTPLUG_CPU) (162576). +- patches.arch/microcode-quiet: Quieten down microcode update + driver (158643). * Mon Apr 03 2006 - trenn(a)suse.de - patches.arch/acpi_suppress_aetime.patch: acpi_os_wait_semaphore(): don't complain about timeout (118958). ++++++ kernel-iseries64.spec ++++++ --- /var/tmp/diff_new_pack.IfX8hf/_old 2006-04-04 18:21:41.000000000 +0200 +++ /var/tmp/diff_new_pack.IfX8hf/_new 2006-04-04 18:21:41.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 11 +Release: 12 Summary: 64-Bit Kernel for iSeries License: GPL Group: System/Kernel @@ -116,7 +116,7 @@ -Source Timestamp: 2006-04-03 12:19:51 +0000 +Source Timestamp: 2006-04-04 13:47:08 +0000 %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then @@ -442,6 +442,56 @@ %files -f kernel.files %changelog -n kernel-iseries64 +* Tue Apr 04 2006 - garloff(a)suse.de +- Xen configurations: Build backend/frontend drivers as modules. +- patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices + that report a periph. qualifier of 3 better during scan. +- patches.fixes/sg2616dio_lk.diff: Fix memory leak when doing + direct I/O via sg. +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.arch/s390-dasd-eer-october2005.diff + Extended error reporting for DASDs. +- add patches.arch/s390-02-0{2,3,4}-october2005.diff + Include patches from IBM. +- patches.arch/s390-mapped-base.patch + Enable patch now that mapped_base is back in. +- patches.arch/s390-dasd-erp-debug.patch + Remove obsolete patch. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-iseries-irq-256max.patch + iSeries has only 256 IRQs (158811 - LTC22471) +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.fixes/bus-uevent-after-sysfs-links + We should send bus device events after all links are created. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-kdump-shutdown-interrupts.patch + end all interrupts before starting the kdump kernel (152932 - LTC21954) +* Mon Apr 03 2006 - mason(a)suse.de +- patches.drivers/e1000-no-tso: [e1000] Disable TSO for now + (157600). +- patches.fixes/hrtimer-opt: optimize run_hrtimer_queue when + there is no work to do (161587). +- patches.fixes/calc-load-opt: Combining nr_running() & + nr_interruptible() into a single function (162658). +- patches.suse/cache_reap-latency: reduce irq latencies in + cache_reap (160144). +- patches.suse/drain-node-pages-latency: drain_node_pages latency + fix (160144). +- enable e1000 TSO again +* Mon Apr 03 2006 - gregkh(a)suse.de +- patches.fixes/sysfs-off-by-one.patch: sysfs: zero terminate + sysfs write buffers (CVE-2006-1055). +* Mon Apr 03 2006 - ak(a)suse.de +- patches.fixes/nodehotplug-sysfs: Fix NULL pointer dereference + in node_read_numastat(). +- patches.suse/kdb-x86_64-longjmp: Fix longjmp in x86-64 kdb. +* Mon Apr 03 2006 - ak(a)suse.de +- patches.arch/x86_64-hpet-drift: Fix drift with HPET timer + enabled (158650). +* Mon Apr 03 2006 - jbeulich(a)novell.com +- Update x86-64 Xen config file (enable HOTPLUG_CPU) (162576). +- patches.arch/microcode-quiet: Quieten down microcode update + driver (158643). * Mon Apr 03 2006 - trenn(a)suse.de - patches.arch/acpi_suppress_aetime.patch: acpi_os_wait_semaphore(): don't complain about timeout (118958). ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.IfX8hf/_old 2006-04-04 18:21:41.000000000 +0200 +++ /var/tmp/diff_new_pack.IfX8hf/_new 2006-04-04 18:21:41.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 12 +Release: 13 Summary: kernel for kdump License: GPL Group: System/Kernel @@ -125,7 +125,7 @@ -Source Timestamp: 2006-04-03 12:19:51 +0000 +Source Timestamp: 2006-04-04 13:47:08 +0000 %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then @@ -451,6 +451,56 @@ %files -f kernel.files %changelog -n kernel-kdump +* Tue Apr 04 2006 - garloff(a)suse.de +- Xen configurations: Build backend/frontend drivers as modules. +- patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices + that report a periph. qualifier of 3 better during scan. +- patches.fixes/sg2616dio_lk.diff: Fix memory leak when doing + direct I/O via sg. +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.arch/s390-dasd-eer-october2005.diff + Extended error reporting for DASDs. +- add patches.arch/s390-02-0{2,3,4}-october2005.diff + Include patches from IBM. +- patches.arch/s390-mapped-base.patch + Enable patch now that mapped_base is back in. +- patches.arch/s390-dasd-erp-debug.patch + Remove obsolete patch. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-iseries-irq-256max.patch + iSeries has only 256 IRQs (158811 - LTC22471) +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.fixes/bus-uevent-after-sysfs-links + We should send bus device events after all links are created. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-kdump-shutdown-interrupts.patch + end all interrupts before starting the kdump kernel (152932 - LTC21954) +* Mon Apr 03 2006 - mason(a)suse.de +- patches.drivers/e1000-no-tso: [e1000] Disable TSO for now + (157600). +- patches.fixes/hrtimer-opt: optimize run_hrtimer_queue when + there is no work to do (161587). +- patches.fixes/calc-load-opt: Combining nr_running() & + nr_interruptible() into a single function (162658). +- patches.suse/cache_reap-latency: reduce irq latencies in + cache_reap (160144). +- patches.suse/drain-node-pages-latency: drain_node_pages latency + fix (160144). +- enable e1000 TSO again +* Mon Apr 03 2006 - gregkh(a)suse.de +- patches.fixes/sysfs-off-by-one.patch: sysfs: zero terminate + sysfs write buffers (CVE-2006-1055). +* Mon Apr 03 2006 - ak(a)suse.de +- patches.fixes/nodehotplug-sysfs: Fix NULL pointer dereference + in node_read_numastat(). +- patches.suse/kdb-x86_64-longjmp: Fix longjmp in x86-64 kdb. +* Mon Apr 03 2006 - ak(a)suse.de +- patches.arch/x86_64-hpet-drift: Fix drift with HPET timer + enabled (158650). +* Mon Apr 03 2006 - jbeulich(a)novell.com +- Update x86-64 Xen config file (enable HOTPLUG_CPU) (162576). +- patches.arch/microcode-quiet: Quieten down microcode update + driver (158643). * Mon Apr 03 2006 - trenn(a)suse.de - patches.arch/acpi_suppress_aetime.patch: acpi_os_wait_semaphore(): don't complain about timeout (118958). ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.IfX8hf/_old 2006-04-04 18:21:42.000000000 +0200 +++ /var/tmp/diff_new_pack.IfX8hf/_new 2006-04-04 18:21:42.000000000 +0200 @@ -20,7 +20,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 11 +Release: 12 Summary: Kernel for ppc64 Systems License: GPL, LGPL Group: System/Kernel @@ -130,7 +130,7 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux-pmac-benh/CREDITS for more details. -Source Timestamp: 2006-04-03 12:19:51 +0000 +Source Timestamp: 2006-04-04 13:47:08 +0000 %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then @@ -456,6 +456,56 @@ %files -f kernel.files %changelog -n kernel-ppc64 +* Tue Apr 04 2006 - garloff(a)suse.de +- Xen configurations: Build backend/frontend drivers as modules. +- patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices + that report a periph. qualifier of 3 better during scan. +- patches.fixes/sg2616dio_lk.diff: Fix memory leak when doing + direct I/O via sg. +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.arch/s390-dasd-eer-october2005.diff + Extended error reporting for DASDs. +- add patches.arch/s390-02-0{2,3,4}-october2005.diff + Include patches from IBM. +- patches.arch/s390-mapped-base.patch + Enable patch now that mapped_base is back in. +- patches.arch/s390-dasd-erp-debug.patch + Remove obsolete patch. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-iseries-irq-256max.patch + iSeries has only 256 IRQs (158811 - LTC22471) +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.fixes/bus-uevent-after-sysfs-links + We should send bus device events after all links are created. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-kdump-shutdown-interrupts.patch + end all interrupts before starting the kdump kernel (152932 - LTC21954) +* Mon Apr 03 2006 - mason(a)suse.de +- patches.drivers/e1000-no-tso: [e1000] Disable TSO for now + (157600). +- patches.fixes/hrtimer-opt: optimize run_hrtimer_queue when + there is no work to do (161587). +- patches.fixes/calc-load-opt: Combining nr_running() & + nr_interruptible() into a single function (162658). +- patches.suse/cache_reap-latency: reduce irq latencies in + cache_reap (160144). +- patches.suse/drain-node-pages-latency: drain_node_pages latency + fix (160144). +- enable e1000 TSO again +* Mon Apr 03 2006 - gregkh(a)suse.de +- patches.fixes/sysfs-off-by-one.patch: sysfs: zero terminate + sysfs write buffers (CVE-2006-1055). +* Mon Apr 03 2006 - ak(a)suse.de +- patches.fixes/nodehotplug-sysfs: Fix NULL pointer dereference + in node_read_numastat(). +- patches.suse/kdb-x86_64-longjmp: Fix longjmp in x86-64 kdb. +* Mon Apr 03 2006 - ak(a)suse.de +- patches.arch/x86_64-hpet-drift: Fix drift with HPET timer + enabled (158650). +* Mon Apr 03 2006 - jbeulich(a)novell.com +- Update x86-64 Xen config file (enable HOTPLUG_CPU) (162576). +- patches.arch/microcode-quiet: Quieten down microcode update + driver (158643). * Mon Apr 03 2006 - trenn(a)suse.de - patches.arch/acpi_suppress_aetime.patch: acpi_os_wait_semaphore(): don't complain about timeout (118958). ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.IfX8hf/_old 2006-04-04 18:21:42.000000000 +0200 +++ /var/tmp/diff_new_pack.IfX8hf/_new 2006-04-04 18:21:42.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 11 +Release: 12 Summary: The Standard Kernel License: GPL Group: System/Kernel @@ -113,7 +113,7 @@ -Source Timestamp: 2006-04-03 12:19:51 +0000 +Source Timestamp: 2006-04-04 13:47:08 +0000 %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then @@ -439,6 +439,56 @@ %files -f kernel.files %changelog -n kernel-s390 +* Tue Apr 04 2006 - garloff(a)suse.de +- Xen configurations: Build backend/frontend drivers as modules. +- patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices + that report a periph. qualifier of 3 better during scan. +- patches.fixes/sg2616dio_lk.diff: Fix memory leak when doing + direct I/O via sg. +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.arch/s390-dasd-eer-october2005.diff + Extended error reporting for DASDs. +- add patches.arch/s390-02-0{2,3,4}-october2005.diff + Include patches from IBM. +- patches.arch/s390-mapped-base.patch + Enable patch now that mapped_base is back in. +- patches.arch/s390-dasd-erp-debug.patch + Remove obsolete patch. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-iseries-irq-256max.patch + iSeries has only 256 IRQs (158811 - LTC22471) +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.fixes/bus-uevent-after-sysfs-links + We should send bus device events after all links are created. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-kdump-shutdown-interrupts.patch + end all interrupts before starting the kdump kernel (152932 - LTC21954) +* Mon Apr 03 2006 - mason(a)suse.de +- patches.drivers/e1000-no-tso: [e1000] Disable TSO for now + (157600). +- patches.fixes/hrtimer-opt: optimize run_hrtimer_queue when + there is no work to do (161587). +- patches.fixes/calc-load-opt: Combining nr_running() & + nr_interruptible() into a single function (162658). +- patches.suse/cache_reap-latency: reduce irq latencies in + cache_reap (160144). +- patches.suse/drain-node-pages-latency: drain_node_pages latency + fix (160144). +- enable e1000 TSO again +* Mon Apr 03 2006 - gregkh(a)suse.de +- patches.fixes/sysfs-off-by-one.patch: sysfs: zero terminate + sysfs write buffers (CVE-2006-1055). +* Mon Apr 03 2006 - ak(a)suse.de +- patches.fixes/nodehotplug-sysfs: Fix NULL pointer dereference + in node_read_numastat(). +- patches.suse/kdb-x86_64-longjmp: Fix longjmp in x86-64 kdb. +* Mon Apr 03 2006 - ak(a)suse.de +- patches.arch/x86_64-hpet-drift: Fix drift with HPET timer + enabled (158650). +* Mon Apr 03 2006 - jbeulich(a)novell.com +- Update x86-64 Xen config file (enable HOTPLUG_CPU) (162576). +- patches.arch/microcode-quiet: Quieten down microcode update + driver (158643). * Mon Apr 03 2006 - trenn(a)suse.de - patches.arch/acpi_suppress_aetime.patch: acpi_os_wait_semaphore(): don't complain about timeout (118958). ++++++ kernel-smp.spec ++++++ --- /var/tmp/diff_new_pack.IfX8hf/_old 2006-04-04 18:21:42.000000000 +0200 +++ /var/tmp/diff_new_pack.IfX8hf/_new 2006-04-04 18:21:42.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 12 +Release: 13 Summary: Kernel with Multiprocessor Support License: GPL Group: System/Kernel @@ -124,7 +124,7 @@ -Source Timestamp: 2006-04-03 12:19:51 +0000 +Source Timestamp: 2006-04-04 13:47:08 +0000 %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then @@ -450,6 +450,56 @@ %files -f kernel.files %changelog -n kernel-smp +* Tue Apr 04 2006 - garloff(a)suse.de +- Xen configurations: Build backend/frontend drivers as modules. +- patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices + that report a periph. qualifier of 3 better during scan. +- patches.fixes/sg2616dio_lk.diff: Fix memory leak when doing + direct I/O via sg. +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.arch/s390-dasd-eer-october2005.diff + Extended error reporting for DASDs. +- add patches.arch/s390-02-0{2,3,4}-october2005.diff + Include patches from IBM. +- patches.arch/s390-mapped-base.patch + Enable patch now that mapped_base is back in. +- patches.arch/s390-dasd-erp-debug.patch + Remove obsolete patch. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-iseries-irq-256max.patch + iSeries has only 256 IRQs (158811 - LTC22471) +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.fixes/bus-uevent-after-sysfs-links + We should send bus device events after all links are created. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-kdump-shutdown-interrupts.patch + end all interrupts before starting the kdump kernel (152932 - LTC21954) +* Mon Apr 03 2006 - mason(a)suse.de +- patches.drivers/e1000-no-tso: [e1000] Disable TSO for now + (157600). +- patches.fixes/hrtimer-opt: optimize run_hrtimer_queue when + there is no work to do (161587). +- patches.fixes/calc-load-opt: Combining nr_running() & + nr_interruptible() into a single function (162658). +- patches.suse/cache_reap-latency: reduce irq latencies in + cache_reap (160144). +- patches.suse/drain-node-pages-latency: drain_node_pages latency + fix (160144). +- enable e1000 TSO again +* Mon Apr 03 2006 - gregkh(a)suse.de +- patches.fixes/sysfs-off-by-one.patch: sysfs: zero terminate + sysfs write buffers (CVE-2006-1055). +* Mon Apr 03 2006 - ak(a)suse.de +- patches.fixes/nodehotplug-sysfs: Fix NULL pointer dereference + in node_read_numastat(). +- patches.suse/kdb-x86_64-longjmp: Fix longjmp in x86-64 kdb. +* Mon Apr 03 2006 - ak(a)suse.de +- patches.arch/x86_64-hpet-drift: Fix drift with HPET timer + enabled (158650). +* Mon Apr 03 2006 - jbeulich(a)novell.com +- Update x86-64 Xen config file (enable HOTPLUG_CPU) (162576). +- patches.arch/microcode-quiet: Quieten down microcode update + driver (158643). * Mon Apr 03 2006 - trenn(a)suse.de - patches.arch/acpi_suppress_aetime.patch: acpi_os_wait_semaphore(): don't complain about timeout (118958). ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.IfX8hf/_old 2006-04-04 18:21:42.000000000 +0200 +++ /var/tmp/diff_new_pack.IfX8hf/_new 2006-04-04 18:21:42.000000000 +0200 @@ -25,7 +25,7 @@ %endif PreReq: /sbin/insserv /usr/bin/grep /bin/sed /bin/uname /bin/mkdir /bin/cat /bin/ln /bin/rm /etc/rc.status Version: 2.6.16 -Release: 12 +Release: 13 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 Source1: functions.sh Source2: source-post.sh @@ -93,7 +93,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2006-04-03 12:19:51 +0000 +Source Timestamp: 2006-04-04 13:47:08 +0000 %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then @@ -273,6 +273,56 @@ %files -f kernel-source.files %changelog -n kernel-source +* Tue Apr 04 2006 - garloff(a)suse.de +- Xen configurations: Build backend/frontend drivers as modules. +- patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices + that report a periph. qualifier of 3 better during scan. +- patches.fixes/sg2616dio_lk.diff: Fix memory leak when doing + direct I/O via sg. +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.arch/s390-dasd-eer-october2005.diff + Extended error reporting for DASDs. +- add patches.arch/s390-02-0{2,3,4}-october2005.diff + Include patches from IBM. +- patches.arch/s390-mapped-base.patch + Enable patch now that mapped_base is back in. +- patches.arch/s390-dasd-erp-debug.patch + Remove obsolete patch. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-iseries-irq-256max.patch + iSeries has only 256 IRQs (158811 - LTC22471) +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.fixes/bus-uevent-after-sysfs-links + We should send bus device events after all links are created. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-kdump-shutdown-interrupts.patch + end all interrupts before starting the kdump kernel (152932 - LTC21954) +* Mon Apr 03 2006 - mason(a)suse.de +- patches.drivers/e1000-no-tso: [e1000] Disable TSO for now + (157600). +- patches.fixes/hrtimer-opt: optimize run_hrtimer_queue when + there is no work to do (161587). +- patches.fixes/calc-load-opt: Combining nr_running() & + nr_interruptible() into a single function (162658). +- patches.suse/cache_reap-latency: reduce irq latencies in + cache_reap (160144). +- patches.suse/drain-node-pages-latency: drain_node_pages latency + fix (160144). +- enable e1000 TSO again +* Mon Apr 03 2006 - gregkh(a)suse.de +- patches.fixes/sysfs-off-by-one.patch: sysfs: zero terminate + sysfs write buffers (CVE-2006-1055). +* Mon Apr 03 2006 - ak(a)suse.de +- patches.fixes/nodehotplug-sysfs: Fix NULL pointer dereference + in node_read_numastat(). +- patches.suse/kdb-x86_64-longjmp: Fix longjmp in x86-64 kdb. +* Mon Apr 03 2006 - ak(a)suse.de +- patches.arch/x86_64-hpet-drift: Fix drift with HPET timer + enabled (158650). +* Mon Apr 03 2006 - jbeulich(a)novell.com +- Update x86-64 Xen config file (enable HOTPLUG_CPU) (162576). +- patches.arch/microcode-quiet: Quieten down microcode update + driver (158643). * Mon Apr 03 2006 - trenn(a)suse.de - patches.arch/acpi_suppress_aetime.patch: acpi_os_wait_semaphore(): don't complain about timeout (118958). ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.IfX8hf/_old 2006-04-04 18:21:42.000000000 +0200 +++ /var/tmp/diff_new_pack.IfX8hf/_new 2006-04-04 18:21:42.000000000 +0200 @@ -49,7 +49,7 @@ Summary: Kernel Symbol Versions (modversions) Group: Development/Sources Version: 2.6.16 -Release: 12 +Release: 13 Requires: linux Requires: kernel-source = 2.6.16-%release Source11: arch-symbols @@ -84,7 +84,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2006-04-03 12:19:51 +0000 +Source Timestamp: 2006-04-04 13:47:08 +0000 %install @@ -127,6 +127,56 @@ /boot/symsets-*-*.tar.gz %changelog -n kernel-syms +* Tue Apr 04 2006 - garloff(a)suse.de +- Xen configurations: Build backend/frontend drivers as modules. +- patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices + that report a periph. qualifier of 3 better during scan. +- patches.fixes/sg2616dio_lk.diff: Fix memory leak when doing + direct I/O via sg. +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.arch/s390-dasd-eer-october2005.diff + Extended error reporting for DASDs. +- add patches.arch/s390-02-0{2,3,4}-october2005.diff + Include patches from IBM. +- patches.arch/s390-mapped-base.patch + Enable patch now that mapped_base is back in. +- patches.arch/s390-dasd-erp-debug.patch + Remove obsolete patch. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-iseries-irq-256max.patch + iSeries has only 256 IRQs (158811 - LTC22471) +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.fixes/bus-uevent-after-sysfs-links + We should send bus device events after all links are created. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-kdump-shutdown-interrupts.patch + end all interrupts before starting the kdump kernel (152932 - LTC21954) +* Mon Apr 03 2006 - mason(a)suse.de +- patches.drivers/e1000-no-tso: [e1000] Disable TSO for now + (157600). +- patches.fixes/hrtimer-opt: optimize run_hrtimer_queue when + there is no work to do (161587). +- patches.fixes/calc-load-opt: Combining nr_running() & + nr_interruptible() into a single function (162658). +- patches.suse/cache_reap-latency: reduce irq latencies in + cache_reap (160144). +- patches.suse/drain-node-pages-latency: drain_node_pages latency + fix (160144). +- enable e1000 TSO again +* Mon Apr 03 2006 - gregkh(a)suse.de +- patches.fixes/sysfs-off-by-one.patch: sysfs: zero terminate + sysfs write buffers (CVE-2006-1055). +* Mon Apr 03 2006 - ak(a)suse.de +- patches.fixes/nodehotplug-sysfs: Fix NULL pointer dereference + in node_read_numastat(). +- patches.suse/kdb-x86_64-longjmp: Fix longjmp in x86-64 kdb. +* Mon Apr 03 2006 - ak(a)suse.de +- patches.arch/x86_64-hpet-drift: Fix drift with HPET timer + enabled (158650). +* Mon Apr 03 2006 - jbeulich(a)novell.com +- Update x86-64 Xen config file (enable HOTPLUG_CPU) (162576). +- patches.arch/microcode-quiet: Quieten down microcode update + driver (158643). * Mon Apr 03 2006 - trenn(a)suse.de - patches.arch/acpi_suppress_aetime.patch: acpi_os_wait_semaphore(): don't complain about timeout (118958). ++++++ kernel-um.spec ++++++ --- /var/tmp/diff_new_pack.IfX8hf/_old 2006-04-04 18:21:42.000000000 +0200 +++ /var/tmp/diff_new_pack.IfX8hf/_new 2006-04-04 18:21:42.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 12 +Release: 13 Summary: The User Mode Linux kernel. License: GPL Group: System/Kernel @@ -116,7 +116,7 @@ -Source Timestamp: 2006-04-03 12:19:51 +0000 +Source Timestamp: 2006-04-04 13:47:08 +0000 %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then @@ -442,6 +442,56 @@ %files -f kernel.files %changelog -n kernel-um +* Tue Apr 04 2006 - garloff(a)suse.de +- Xen configurations: Build backend/frontend drivers as modules. +- patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices + that report a periph. qualifier of 3 better during scan. +- patches.fixes/sg2616dio_lk.diff: Fix memory leak when doing + direct I/O via sg. +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.arch/s390-dasd-eer-october2005.diff + Extended error reporting for DASDs. +- add patches.arch/s390-02-0{2,3,4}-october2005.diff + Include patches from IBM. +- patches.arch/s390-mapped-base.patch + Enable patch now that mapped_base is back in. +- patches.arch/s390-dasd-erp-debug.patch + Remove obsolete patch. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-iseries-irq-256max.patch + iSeries has only 256 IRQs (158811 - LTC22471) +* Tue Apr 04 2006 - hare(a)suse.de +- add patches.fixes/bus-uevent-after-sysfs-links + We should send bus device events after all links are created. +* Tue Apr 04 2006 - olh(a)suse.de +- add patches.arch/ppc-kdump-shutdown-interrupts.patch + end all interrupts before starting the kdump kernel (152932 - LTC21954) +* Mon Apr 03 2006 - mason(a)suse.de +- patches.drivers/e1000-no-tso: [e1000] Disable TSO for now + (157600). +- patches.fixes/hrtimer-opt: optimize run_hrtimer_queue when + there is no work to do (161587). +- patches.fixes/calc-load-opt: Combining nr_running() & + nr_interruptible() into a single function (162658). +- patches.suse/cache_reap-latency: reduce irq latencies in + cache_reap (160144). +- patches.suse/drain-node-pages-latency: drain_node_pages latency + fix (160144). +- enable e1000 TSO again +* Mon Apr 03 2006 - gregkh(a)suse.de +- patches.fixes/sysfs-off-by-one.patch: sysfs: zero terminate + sysfs write buffers (CVE-2006-1055). +* Mon Apr 03 2006 - ak(a)suse.de +- patches.fixes/nodehotplug-sysfs: Fix NULL pointer dereference + in node_read_numastat(). +- patches.suse/kdb-x86_64-longjmp: Fix longjmp in x86-64 kdb. +* Mon Apr 03 2006 - ak(a)suse.de +- patches.arch/x86_64-hpet-drift: Fix drift with HPET timer + enabled (158650). +* Mon Apr 03 2006 - jbeulich(a)novell.com +- Update x86-64 Xen config file (enable HOTPLUG_CPU) (162576). +- patches.arch/microcode-quiet: Quieten down microcode update + driver (158643). * Mon Apr 03 2006 - trenn(a)suse.de - patches.arch/acpi_suppress_aetime.patch: acpi_os_wait_semaphore(): don't complain about timeout (118958). kernel-xen.spec: same change kernel-xenpae.spec: same change ++++++ build-source-timestamp ++++++ --- kernel-source/build-source-timestamp 2006-04-03 14:26:22.000000000 +0200 +++ kernel-source/build-source-timestamp 2006-04-04 15:47:41.000000000 +0200 @@ -1 +1 @@ -2006-04-03 12:19:51 +0000 +2006-04-04 13:47:08 +0000 ++++++ config.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xen new/config/i386/xen --- old/config/i386/xen 2006-04-02 20:32:10.000000000 +0200 +++ new/config/i386/xen 2006-04-03 13:31:29.000000000 +0200 @@ -1,5 +1,7 @@ # # Automatically generated make config: don't edit +# Linux kernel version: 2.6.16-rc6-git1 +# Wed Mar 15 16:02:30 2006 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -3063,19 +3065,19 @@ # CONFIG_XEN_PRIVILEGED_GUEST=y # CONFIG_XEN_UNPRIVILEGED_GUEST is not set -CONFIG_XEN_PCIDEV_BACKEND=y +CONFIG_XEN_PCIDEV_BACKEND=m CONFIG_XEN_PCIDEV_BACKEND_VPCI=y # CONFIG_XEN_PCIDEV_BACKEND_PASS is not set # CONFIG_XEN_PCIDEV_BE_DEBUG is not set -CONFIG_XEN_BLKDEV_BACKEND=y +CONFIG_XEN_BLKDEV_BACKEND=m # CONFIG_XEN_BLKDEV_TAP_BE is not set -CONFIG_XEN_NETDEV_BACKEND=y +CONFIG_XEN_NETDEV_BACKEND=m # CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set -CONFIG_XEN_NETDEV_LOOPBACK=y +CONFIG_XEN_NETDEV_LOOPBACK=m CONFIG_XEN_TPMDEV_BACKEND=m CONFIG_XEN_TPMDEV_CLOSE_IF_VTPM_FAILS=y -CONFIG_XEN_BLKDEV_FRONTEND=y -CONFIG_XEN_NETDEV_FRONTEND=y +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_NETDEV_FRONTEND=m # CONFIG_XEN_BLKDEV_TAP is not set CONFIG_XEN_TPMDEV_FRONTEND=m CONFIG_XEN_CONSOLE=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xenpae new/config/i386/xenpae --- old/config/i386/xenpae 2006-04-02 20:32:10.000000000 +0200 +++ new/config/i386/xenpae 2006-04-03 13:31:29.000000000 +0200 @@ -1,5 +1,7 @@ # # Automatically generated make config: don't edit +# Linux kernel version: 2.6.16-rc6-git1 +# Wed Mar 15 16:03:39 2006 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -3061,19 +3063,19 @@ # CONFIG_XEN_PRIVILEGED_GUEST=y # CONFIG_XEN_UNPRIVILEGED_GUEST is not set -CONFIG_XEN_PCIDEV_BACKEND=y +CONFIG_XEN_PCIDEV_BACKEND=m CONFIG_XEN_PCIDEV_BACKEND_VPCI=y # CONFIG_XEN_PCIDEV_BACKEND_PASS is not set # CONFIG_XEN_PCIDEV_BE_DEBUG is not set -CONFIG_XEN_BLKDEV_BACKEND=y +CONFIG_XEN_BLKDEV_BACKEND=m # CONFIG_XEN_BLKDEV_TAP_BE is not set -CONFIG_XEN_NETDEV_BACKEND=y +CONFIG_XEN_NETDEV_BACKEND=m # CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set -CONFIG_XEN_NETDEV_LOOPBACK=y +CONFIG_XEN_NETDEV_LOOPBACK=m CONFIG_XEN_TPMDEV_BACKEND=m CONFIG_XEN_TPMDEV_CLOSE_IF_VTPM_FAILS=y -CONFIG_XEN_BLKDEV_FRONTEND=y -CONFIG_XEN_NETDEV_FRONTEND=y +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_NETDEV_FRONTEND=m # CONFIG_XEN_BLKDEV_TAP is not set CONFIG_XEN_TPMDEV_FRONTEND=m CONFIG_XEN_CONSOLE=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/xen new/config/x86_64/xen --- old/config/x86_64/xen 2006-04-02 20:32:10.000000000 +0200 +++ new/config/x86_64/xen 2006-04-04 14:20:15.000000000 +0200 @@ -1,5 +1,7 @@ # # Automatically generated make config: don't edit +# Linux kernel version: 2.6.16-rc6-git1 +# Wed Mar 15 16:00:26 2006 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -73,7 +75,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_OBSOLETE_MODPARM=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_KMOD=y @@ -134,7 +135,7 @@ # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_NR_CPUS=32 -# CONFIG_HOTPLUG_CPU is not set +CONFIG_HOTPLUG_CPU=y CONFIG_SWIOTLB=y # CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x100000 @@ -164,6 +165,7 @@ # CONFIG_ACPI_HOTKEY is not set CONFIG_ACPI_FAN=m CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=m CONFIG_ACPI_ASUS=m CONFIG_ACPI_IBM=m @@ -2794,19 +2796,19 @@ # CONFIG_XEN_PRIVILEGED_GUEST=y # CONFIG_XEN_UNPRIVILEGED_GUEST is not set -CONFIG_XEN_PCIDEV_BACKEND=y +CONFIG_XEN_PCIDEV_BACKEND=m CONFIG_XEN_PCIDEV_BACKEND_VPCI=y # CONFIG_XEN_PCIDEV_BACKEND_PASS is not set # CONFIG_XEN_PCIDEV_BE_DEBUG is not set -CONFIG_XEN_BLKDEV_BACKEND=y +CONFIG_XEN_BLKDEV_BACKEND=m # CONFIG_XEN_BLKDEV_TAP_BE is not set -CONFIG_XEN_NETDEV_BACKEND=y +CONFIG_XEN_NETDEV_BACKEND=m # CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set -CONFIG_XEN_NETDEV_LOOPBACK=y +CONFIG_XEN_NETDEV_LOOPBACK=m CONFIG_XEN_TPMDEV_BACKEND=m CONFIG_XEN_TPMDEV_CLOSE_IF_VTPM_FAILS=y -CONFIG_XEN_BLKDEV_FRONTEND=y -CONFIG_XEN_NETDEV_FRONTEND=y +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_NETDEV_FRONTEND=m # CONFIG_XEN_BLKDEV_TAP is not set CONFIG_XEN_TPMDEV_FRONTEND=m CONFIG_XEN_CONSOLE=y ++++++ kabi.tar.bz2 ++++++ ++++++ minmem ++++++ --- kernel-source/minmem 2006-04-03 18:37:49.000000000 +0200 +++ kernel-source/minmem 2006-04-04 15:47:58.000000000 +0200 @@ -1 +1 @@ -514000 +1048576 ++++++ novell-kmp.tar.bz2 ++++++ ++++++ patches.arch.tar.bz2 ++++++ ++++ 1647 lines of diff (skipped) ++++++ patches.drivers.tar.bz2 ++++++ ++++++ patches.fixes.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/bus-uevent-after-sysfs-links new/patches.fixes/bus-uevent-after-sysfs-links --- old/patches.fixes/bus-uevent-after-sysfs-links 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/bus-uevent-after-sysfs-links 2006-04-04 14:22:24.000000000 +0200 @@ -0,0 +1,99 @@ +From: Kay Sievers <kay.sievers(a)suse.de> +Subject: Send device uevents after sysfs population + +split bus_add_device() and send device uevents after sysfs population + +Signed-off-by: Kay Sievers <kay.sievers(a)suse.de> +Signed-off-by: Hannes Reinecke <hare(a)suse.de> + +--- + + base.h | 1 + + bus.c | 22 ++++++++++++++++++---- + core.c | 3 ++- + 3 files changed, 21 insertions(+), 5 deletions(-) + +diff --git a/drivers/base/base.h b/drivers/base/base.h +index 5735b38..bbbc2ac 100644 +--- a/drivers/base/base.h ++++ b/drivers/base/base.h +@@ -11,6 +11,7 @@ extern int cpu_dev_init(void); + extern int attribute_container_init(void); + + extern int bus_add_device(struct device * dev); ++extern void bus_attach_device(struct device * dev); + extern void bus_remove_device(struct device * dev); + + extern int bus_add_driver(struct device_driver *); +diff --git a/drivers/base/bus.c b/drivers/base/bus.c +index 48718b7..3dd63e6 100644 +--- a/drivers/base/bus.c ++++ b/drivers/base/bus.c +@@ -357,8 +357,7 @@ static void device_remove_attrs(struct b + * @dev: device being added + * + * - Add the device to its bus's list of devices. +- * - Try to attach to driver. +- * - Create link to device's physical location. ++ * - Create link to device's bus. + */ + int bus_add_device(struct device * dev) + { +@@ -367,8 +366,6 @@ int bus_add_device(struct device * dev) + + if (bus) { + pr_debug("bus %s: add device %s\n", bus->name, dev->bus_id); +- device_attach(dev); +- klist_add_tail(&dev->knode_bus, &bus->klist_devices); + error = device_add_attrs(bus, dev); + if (!error) { + sysfs_create_link(&bus->devices.kobj, &dev->kobj, dev->bus_id); +@@ -379,6 +376,22 @@ int bus_add_device(struct device * dev) + } + + /** ++ * bus_attach_device - add device to bus ++ * @dev: device tried to attach to a driver ++ * ++ * - Try to attach to driver. ++ */ ++void bus_attach_device(struct device * dev) ++{ ++ struct bus_type * bus = dev->bus; ++ ++ if (bus) { ++ device_attach(dev); ++ klist_add_tail(&dev->knode_bus, &bus->klist_devices); ++ } ++} ++ ++/** + * bus_remove_device - remove device from bus + * @dev: device to be removed + * +@@ -728,6 +741,7 @@ EXPORT_SYMBOL_GPL(bus_find_device); + EXPORT_SYMBOL_GPL(bus_for_each_drv); + + EXPORT_SYMBOL_GPL(bus_add_device); ++EXPORT_SYMBOL_GPL(bus_attach_device); + EXPORT_SYMBOL_GPL(bus_remove_device); + EXPORT_SYMBOL_GPL(bus_register); + EXPORT_SYMBOL_GPL(bus_unregister); +diff --git a/drivers/base/core.c b/drivers/base/core.c +index 6b355bd..d5e15a0 100644 +--- a/drivers/base/core.c ++++ b/drivers/base/core.c +@@ -274,11 +274,12 @@ int device_add(struct device *dev) + dev->uevent_attr.store = store_uevent; + device_create_file(dev, &dev->uevent_attr); + +- kobject_uevent(&dev->kobj, KOBJ_ADD); + if ((error = device_pm_add(dev))) + goto PMError; + if ((error = bus_add_device(dev))) + goto BusError; ++ kobject_uevent(&dev->kobj, KOBJ_ADD); ++ bus_attach_device(dev); + if (parent) + klist_add_tail(&dev->knode_parent, &parent->klist_children); + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/calc-load-opt new/patches.fixes/calc-load-opt --- old/patches.fixes/calc-load-opt 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/calc-load-opt 2006-04-03 22:10:36.000000000 +0200 @@ -0,0 +1,93 @@ +From: SGI +Subject: Combining nr_running() & nr_interruptible() into a single function +Patch-mainline: yes +References: 162658 + +Currently, count_active_tasks() calls both nr_running() & nr_interruptible(). +Each of these functions does a "for_each_cpu" & reads values from the +runqueue of each cpu. Although this is not a lot of instructions, each +runqueue may be located on different node. Depending on the architecture, +a unique TLB entry may be required to access each runqueue. + +Since there may be more runqueues than cpu TLB entries, a scan of all runqueues +can trash the TLB. Each memory reference incurs a TLB miss & refill. + +In addition, the runqueue cacheline that contains nr_running & +nr_uninterruptible may be evicted from the cache between the two passes. +This causes unnecessary cache misses. + +Combining nr_running() & nr_interruptible() into a single function +substantially reduces the TLB & cache misses on large systems. This should +have no measureable effect on smaller systems. + +On a 128p IA64 system running a memory stress workload, the new function reduced +the overhead of calc_load() from 605 usec/call to 324 usec/call. + +(Same as previous patch except reorder extern as requested by Ingo) + + +Signed-off-by: Jack Steiner <steiner(a)sgi.com> +Acked-by: Ingo Molnar <mingo(a)elte.hu> +Acked-by: mason(a)suse.com + +--- + + include/linux/sched.h | 1 + + kernel/sched.c | 16 ++++++++++++++++ + kernel/timer.c | 2 +- + 3 files changed, 18 insertions(+), 1 deletion(-) + + + +Index: linux/include/linux/sched.h +=================================================================== +--- linux.orig/include/linux/sched.h 2006-03-31 16:36:01.053010665 -0600 ++++ linux/include/linux/sched.h 2006-03-31 16:36:27.914206359 -0600 +@@ -100,6 +100,7 @@ DECLARE_PER_CPU(struct runqueue, runqueu + extern int nr_processes(void); + extern unsigned long nr_running(void); + extern unsigned long nr_uninterruptible(void); ++extern unsigned long nr_active(void); + extern unsigned long nr_iowait(void); + + #include <linux/time.h> +Index: linux/kernel/sched.c +=================================================================== +--- linux.orig/kernel/sched.c 2006-03-31 16:35:49.202248196 -0600 ++++ linux/kernel/sched.c 2006-03-31 16:36:27.918205941 -0600 +@@ -1609,6 +1609,22 @@ unsigned long nr_iowait(void) + return sum; + } + ++unsigned long nr_active(void) ++{ ++ unsigned long i, running = 0, uninterruptible = 0; ++ ++ for_each_online_cpu(i) { ++ running += cpu_rq(i)->nr_running; ++ uninterruptible += cpu_rq(i)->nr_uninterruptible; ++ } ++ ++ if (unlikely((long)uninterruptible < 0)) ++ uninterruptible = 0; ++ ++ return running + uninterruptible; ++} ++ ++ + #ifdef CONFIG_SMP + + /* +Index: linux/kernel/timer.c +=================================================================== +--- linux.orig/kernel/timer.c 2006-03-31 16:35:44.482741090 -0600 ++++ linux/kernel/timer.c 2006-03-31 16:36:27.922205524 -0600 +@@ -852,7 +852,7 @@ void update_process_times(int user_tick) + */ + static unsigned long count_active_tasks(void) + { +- return (nr_running() + nr_uninterruptible()) * FIXED_1; ++ return nr_active() * FIXED_1; + } + + /* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/hrtimer-opt new/patches.fixes/hrtimer-opt --- old/patches.fixes/hrtimer-opt 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/hrtimer-opt 2006-04-03 22:10:36.000000000 +0200 @@ -0,0 +1,26 @@ +From: SGI +Subject: optimize run_hrtimer_queue when there is no work to do +Patch-mainline: yes +References: 161587 + +Acked-by: mason(a)suse.com + +Index: linux-2.6.15/kernel/hrtimer.c +=================================================================== +--- linux-2.6.15.orig/kernel/hrtimer.c 2006-03-28 12:16:22.000000000 -0600 ++++ linux-2.6.15/kernel/hrtimer.c 2006-03-28 12:20:00.093356079 -0600 +@@ -586,8 +586,13 @@ int hrtimer_get_res(const clockid_t whic + */ + static inline void run_hrtimer_queue(struct hrtimer_base *base) + { +- ktime_t now = base->get_time(); ++ ktime_t now; + struct rb_node *node; ++ ++ if (!base->first) ++ return; ++ ++ now = base->get_time(); + + spin_lock_irq(&base->lock); + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/nodehotplug-sysfs new/patches.fixes/nodehotplug-sysfs --- old/patches.fixes/nodehotplug-sysfs 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/nodehotplug-sysfs 2006-04-03 15:38:07.000000000 +0200 @@ -0,0 +1,23 @@ +Subject: Fix NULL pointer dereference in node_read_numastat() +From: clameter(a)sgi.com +Acked-by: ak(a)suse.de + +zone_pcp() only returns valid values if the processor is online. + +Change node_read_numastat() to only scan online processors. + +Signed-off-by: Christoph Lameter <clameter(a)sgi.com> + +Index: linux-2.6.16/drivers/base/node.c +=================================================================== +--- linux-2.6.16.orig/drivers/base/node.c ++++ linux-2.6.16/drivers/base/node.c +@@ -106,7 +106,7 @@ static ssize_t node_read_numastat(struct + other_node = 0; + for (i = 0; i < MAX_NR_ZONES; i++) { + struct zone *z = &pg->node_zones[i]; +- for (cpu = 0; cpu < NR_CPUS; cpu++) { ++ for_each_online_cpu (cpu) { + struct per_cpu_pageset *ps = zone_pcp(z,cpu); + numa_hit += ps->numa_hit; + numa_miss += ps->numa_miss; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/sg2616dio_lk.diff new/patches.fixes/sg2616dio_lk.diff --- old/patches.fixes/sg2616dio_lk.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/sg2616dio_lk.diff 2006-04-04 15:24:58.000000000 +0200 @@ -0,0 +1,30 @@ +From: Douglas Gilbert <dougg(a)torque.net> +Subject: sg: fix leak when dio setup fails +Patch-mainline: + +Here is the reworked patch again. This time it has been +tested with a program provided by Bryan. The patch is +against lk 2.6.16 . + +Changelog: + - when the sg driver is unable to setup direct IO, + free that scatter gather list prior to falling + back to indirect IO + +Signed-off-by: Douglas Gilbert <dougg(a)torque.net> +Signed-off-by: Kurt Garloff <garloff(a)suse.de> + +--- linux/drivers/scsi/sg.c 2006-03-20 10:08:49.000000000 -0500 ++++ linux/drivers/scsi/sg.c2616dio_lk 2006-03-22 18:26:23.000000000 -0500 +@@ -1834,8 +1834,10 @@ + res = st_map_user_pages(schp->buffer, mx_sc_elems, + (unsigned long)hp->dxferp, dxfer_len, + (SG_DXFER_TO_DEV == hp->dxfer_direction) ? 1 : 0); +- if (res <= 0) ++ if (res <= 0) { ++ sg_remove_scat(schp); + return 1; ++ } + schp->k_use_sg = res; + schp->dio_in_use = 1; + hp->info |= SG_INFO_DIRECT_IO; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/sysfs-off-by-one.patch new/patches.fixes/sysfs-off-by-one.patch --- old/patches.fixes/sysfs-off-by-one.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/sysfs-off-by-one.patch 2006-04-03 23:22:07.000000000 +0200 @@ -0,0 +1,30 @@ +From foo@baz Tue Apr 9 12:12:43 2002 +Date: Fri, 31 Mar 2006 15:37:06 -0800 +From: Greg Kroah-Hartman <gregkh(a)suse.de> +Subject: sysfs: zero terminate sysfs write buffers (CVE-2006-1055) +Patch-mainline: 2.6.17-rc1 + +No one should be writing a PAGE_SIZE worth of data to a normal sysfs +file, so properly terminate the buffer. + +Thanks to Al Viro for pointing out my stupidity here. + +CVE-2006-1055 has been assigned for this. + +Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> + +--- + fs/sysfs/file.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- gregkh-2.6.orig/fs/sysfs/file.c ++++ gregkh-2.6/fs/sysfs/file.c +@@ -183,7 +183,7 @@ fill_write_buffer(struct sysfs_buffer * + return -ENOMEM; + + if (count >= PAGE_SIZE) +- count = PAGE_SIZE; ++ count = PAGE_SIZE - 1; + error = copy_from_user(buffer->page,buf,count); + buffer->needs_read_fill = 1; + return error ? -EFAULT : count; ++++++ patches.rpmify.tar.bz2 ++++++ ++++++ patches.suse.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/cache_reap-latency new/patches.suse/cache_reap-latency --- old/patches.suse/cache_reap-latency 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/cache_reap-latency 2006-04-03 22:10:36.000000000 +0200 @@ -0,0 +1,142 @@ +From: Christoph Lameter <clameter(a)engr.sgi.com> +Subject: reduce irq latencies in cache_reap +References: 160144 + +cache_reap takes the l3->list_lock (disabling interrupts) unconditionally +and then does a few checks and maybe does some cleanup. This patch makes +cache_reap() only take the lock if there is work to do and then the lock is +taken and released for each cleaning action. + +The checking of when to do the next reaping is done without any locking and +becomes racy. Should not matter since reaping can also be skipped if the +slab mutex cannot be acquired. + +The same is true for the touched processing. If we get this wrong once in +awhile then we will mistakenly clean or not clean the shared cache. This +will impact performance slightly. + +Note that the additional drain_array() function introduced here will fall +out in a subsequent patch since array cleaning will now be very similar +from all callers. + +Signed-off-by: Christoph Lameter <clameter(a)sgi.com> +Acked-by: mason(a)suse.com +Cc: Pekka Enberg <penberg(a)cs.helsinki.fi> +Cc: Manfred Spraul <manfred(a)colorfullife.com> +Signed-off-by: Andrew Morton <akpm(a)osdl.org> + mm/slab.c | 56 ++++++++++++++++++++++++++++++++++++++++++-------------- + 1 files changed, 42 insertions(+), 14 deletions(-) + +Index: linux/mm/slab.c +=================================================================== +--- linux.orig/mm/slab.c 2006-03-17 11:36:29.000000000 -0600 ++++ linux/mm/slab.c 2006-03-17 12:17:19.648554644 -0600 +@@ -292,13 +292,13 @@ struct kmem_list3 { + struct list_head slabs_full; + struct list_head slabs_free; + unsigned long free_objects; +- unsigned long next_reap; +- int free_touched; + unsigned int free_limit; + unsigned int colour_next; /* Per-node cache coloring */ + spinlock_t list_lock; + struct array_cache *shared; /* shared per node */ + struct array_cache **alien; /* on other nodes */ ++ unsigned long next_reap; /* updated without locking */ ++ int free_touched; /* updated without locking */ + }; + + /* +@@ -3543,6 +3543,22 @@ static void drain_array_locked(struct km + } + } + ++ ++/* ++ * Drain an array if it contains any elements taking the l3 lock only if ++ * necessary. ++ */ ++static void drain_array(struct kmem_cache *searchp, struct kmem_list3 *l3, ++ struct array_cache *ac) ++{ ++ if (ac && ac->avail) { ++ spin_lock_irq(&l3->list_lock); ++ drain_array_locked(searchp, ac, 0, ++ numa_node_id()); ++ spin_unlock_irq(&l3->list_lock); ++ } ++} ++ + /** + * cache_reap - Reclaim memory from caches. + * @unused: unused parameter +@@ -3580,34 +3596,49 @@ static void cache_reap(void *unused) + + check_irq_on(); + ++ /* ++ * We only take the l3 lock if absolutely necessary and we ++ * have established with reasonable certainty that ++ * we can do some work if the lock was obtained. ++ */ + l3 = searchp->nodelists[numa_node_id()]; ++ + reap_alien(searchp, l3); +- spin_lock_irq(&l3->list_lock); + +- drain_array_locked(searchp, cpu_cache_get(searchp), 0, +- numa_node_id()); ++ drain_array(searchp, l3, cpu_cache_get(searchp)); + ++ /* ++ * These are racy checks but it does not matter ++ * if we skip one check or scan twice. ++ */ + if (time_after(l3->next_reap, jiffies)) +- goto next_unlock; ++ goto next; + + l3->next_reap = jiffies + REAPTIMEOUT_LIST3; + +- if (l3->shared) +- drain_array_locked(searchp, l3->shared, 0, +- numa_node_id()); ++ drain_array(searchp, l3, l3->shared); + + if (l3->free_touched) { + l3->free_touched = 0; +- goto next_unlock; ++ goto next; + } + + tofree = + (l3->free_limit + 5 * searchp->num - + 1) / (5 * searchp->num); + do { ++ /* ++ * Do not lock if there are no free blocks. ++ */ ++ if (list_empty(&l3->slabs_free)) ++ break; ++ ++ spin_lock_irq(&l3->list_lock); + p = l3->slabs_free.next; +- if (p == &(l3->slabs_free)) ++ if (p == &(l3->slabs_free)) { ++ spin_unlock_irq(&l3->list_lock); + break; ++ } + + slabp = list_entry(p, struct slab, list); + BUG_ON(slabp->inuse); +@@ -3622,10 +3653,7 @@ static void cache_reap(void *unused) + l3->free_objects -= searchp->num; + spin_unlock_irq(&l3->list_lock); + slab_destroy(searchp, slabp); +- spin_lock_irq(&l3->list_lock); + } while (--tofree > 0); +- next_unlock: +- spin_unlock_irq(&l3->list_lock); + next: + cond_resched(); + } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/drain-node-pages-latency new/patches.suse/drain-node-pages-latency --- old/patches.suse/drain-node-pages-latency 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/drain-node-pages-latency 2006-04-03 22:10:36.000000000 +0200 @@ -0,0 +1,61 @@ +From: Christoph Lameter <clameter(a)sgi.com> +Subject: drain_node_pages latency fix +Patch-mainline: +References: 160144 + +1. Only disable interrupts if there is actually something to free + +2. Only dirty the pcp cacheline if we actually freed something. + +3. Disable interrupts for each single pcp and not for cleaning + all the pcps in all zones of a node. + +drain_node_pages is called every 2 seconds from cache_reap. This +fix should avoid most disabling of interrupts. + +Signed-off-by: Christoph Lameter <clameter(a)sgi.com> +Signed-off-by: Andrew Morton <akpm(a)osdl.org> +Acked-by: mason(a)suse.com + +--- + + mm/page_alloc.c | 10 ++++++---- + 1 files changed, 6 insertions(+), 4 deletions(-) + +--- linux.orig/mm/page_alloc.c 2006-03-13 14:32:31.577344017 -0800 ++++ linux/mm/page_alloc.c 2006-03-13 14:38:48.300112075 -0800 +@@ -594,6 +594,8 @@ static int rmqueue_bulk(struct zone *zon + /* + * Called from the slab reaper to drain pagesets on a particular node that + * belong to the currently executing processor. ++ * Note that this function must be called with the thread pinned to ++ * a single processor. + */ + void drain_node_pages(int nodeid) + { +@@ -600,7 +600,6 @@ void drain_node_pages(int nodeid) + int i, z; + unsigned long flags; + +- local_irq_save(flags); + for (z = 0; z < MAX_NR_ZONES; z++) { + struct zone *zone = NODE_DATA(nodeid)->node_zones + z; + struct per_cpu_pageset *pset; +@@ -610,11 +609,14 @@ void drain_node_pages(int nodeid) + struct per_cpu_pages *pcp; + + pcp = &pset->pcp[i]; +- free_pages_bulk(zone, pcp->count, &pcp->list, 0); +- pcp->count = 0; ++ if (pcp->count) { ++ local_irq_save(flags); ++ free_pages_bulk(zone, pcp->count, &pcp->list, 0); ++ pcp->count = 0; ++ local_irq_restore(flags); ++ } + } + } +- local_irq_restore(flags); + } + #endif + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/kdb-x86_64-longjmp new/patches.suse/kdb-x86_64-longjmp --- old/patches.suse/kdb-x86_64-longjmp 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/kdb-x86_64-longjmp 2006-04-03 15:38:07.000000000 +0200 @@ -0,0 +1,81 @@ +From: Joe Korty, AK +Subject: Fix longjmp in x86-64 kdb +Acked-by: ak(a)suse.de +Patch-mainline: never + +Index: linux-2.6.16/arch/x86_64/kdb/Makefile +=================================================================== +--- linux-2.6.16.orig/arch/x86_64/kdb/Makefile ++++ linux-2.6.16/arch/x86_64/kdb/Makefile +@@ -6,7 +6,7 @@ + # Copyright (c) 1999-2004 Silicon Graphics, Inc. All Rights Reserved. + # + +-obj-$(CONFIG_KDB) := kdba_bt.o kdba_bp.o kdba_id.o kdbasupport.o x86_64-dis.o kdba_io.o ++obj-$(CONFIG_KDB) := kdba_bt.o kdba_bp.o kdba_id.o kdbasupport.o x86_64-dis.o kdba_io.o longjmp.o + + override CFLAGS := $(CFLAGS:%-pg=% ) + +Index: linux-2.6.16/arch/x86_64/kdb/kdbasupport.c +=================================================================== +--- linux-2.6.16.orig/arch/x86_64/kdb/kdbasupport.c ++++ linux-2.6.16/arch/x86_64/kdb/kdbasupport.c +@@ -1029,6 +1029,7 @@ kdba_clearsinglestep(struct pt_regs *reg + regs->eflags &= ~EF_IE; + } + ++#if 0 + #ifdef KDB_HAVE_LONGJMP + int asmlinkage + kdba_setjmp(kdb_jmp_buf *jb) +@@ -1094,6 +1095,7 @@ kdba_longjmp(kdb_jmp_buf *jb, int reason + #endif /* CONFIG_FRAME_POINTER */ + } + #endif /* KDB_HAVE_LONGJMP */ ++#endif + + /* + * kdba_enable_lbr +Index: linux-2.6.16/arch/x86_64/kdb/longjmp.S +=================================================================== +--- /dev/null ++++ linux-2.6.16/arch/x86_64/kdb/longjmp.S +@@ -0,0 +1,38 @@ ++ /* setjmp / longjmp for the kernel. ++ * Inspired by the glibc version. ++ * From Joe Korty ++ */ ++ ++ .text ++ .globl kdba_setjmp ++ .p2align 4 ++kdba_setjmp: ++ movq %rbx,0x0(%rdi) ++ movq %rbp,0x8(%rdi) ++ movq %r12,0x10(%rdi) ++ movq %r13,0x18(%rdi) ++ movq %r14,0x20(%rdi) ++ movq %r15,0x28(%rdi) ++ leaq 0x8(%rsp),%rdx ++ movq %rdx,0x30(%rdi) ++ movq (%rsp),%rax ++ movq %rax,0x38(%rdi) ++ xorq %rax,%rax ++ ret ++ ++ .globl kdba_longjmp ++kdba_longjmp: ++ movq 0x0(%rdi),%rbx ++ movq 0x8(%rdi),%rbp ++ movq 0x10(%rdi),%r12 ++ movq 0x18(%rdi),%r13 ++ movq 0x20(%rdi),%r14 ++ movq 0x28(%rdi),%r15 ++ test %esi,%esi ++ mov $1,%eax ++ cmove %eax,%esi ++ mov %esi,%eax ++ movq 0x38(%rdi),%rdx ++ movq 0x30(%rdi),%rsp ++ jmpq *%rdx ++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/scsi-scan-tolerate-pq3-1 new/patches.suse/scsi-scan-tolerate-pq3-1 --- old/patches.suse/scsi-scan-tolerate-pq3-1 2006-04-03 14:25:08.000000000 +0200 +++ new/patches.suse/scsi-scan-tolerate-pq3-1 2006-04-04 15:24:37.000000000 +0200 @@ -1,6 +1,6 @@ From: Kurt Garloff <garloff(a)suse.de> Subject: Tolerate PQ 3 at LUN 0 for scanning -Patch-mainline: +Patch-mainline: References: 158532 Some devices report a peripheral qualifier of 3 for LUN 0; with the original diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/scsi-scan-tolerate-pq3-2 new/patches.suse/scsi-scan-tolerate-pq3-2 --- old/patches.suse/scsi-scan-tolerate-pq3-2 2006-04-03 14:25:08.000000000 +0200 +++ new/patches.suse/scsi-scan-tolerate-pq3-2 2006-04-04 15:24:43.000000000 +0200 @@ -1,6 +1,6 @@ From: Kurt Garloff <garloff(a)suse.de> Subject: Tolerate PQ 3 at LUN 0 for scanning -Patch-mainline: +Patch-mainline: References: 158532 Some devices report a peripheral qualifier of 3 for LUN 0; with the original diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/scsi-scan-tolerate-pq3-3 new/patches.suse/scsi-scan-tolerate-pq3-3 --- old/patches.suse/scsi-scan-tolerate-pq3-3 2006-04-03 14:25:08.000000000 +0200 +++ new/patches.suse/scsi-scan-tolerate-pq3-3 2006-04-04 15:24:51.000000000 +0200 @@ -1,6 +1,6 @@ From: Kurt Garloff <garloff(a)suse.de> Subject: Tolerate PQ 3 at LUN 0 for scanning -Patch-mainline: +Patch-mainline: References: 158532 Some devices report a peripheral qualifier of 3 for LUN 0; with the original @@ -15,9 +15,9 @@ reference for an infamous example. This is patch 3/3: -3. Implement the blacklist flag BLIST_ATTACH_PQ3 that makes the scsi - scanning code register PQ3 devices and continues scanning; only sg - will attach thanks to scsi_bus_match(). +Implement the blacklist flag BLIST_ATTACH_PQ3 that makes the scsi + scanning code register PQ3 devices and continues scanning; only sg + will attach thanks to scsi_bus_match(). Acked-by: Signed-off-by: Kurt Garloff <garloff(a)suse.de> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/scsi-scan-tolerate-pq3-4 new/patches.suse/scsi-scan-tolerate-pq3-4 --- old/patches.suse/scsi-scan-tolerate-pq3-4 2006-04-03 14:25:08.000000000 +0200 +++ new/patches.suse/scsi-scan-tolerate-pq3-4 2006-04-03 14:33:24.000000000 +0200 @@ -44,13 +44,13 @@ + pq = (result[0] >> 5) & 3; + /* DEBUG */ + if (pq != 0) { -+ printk(KERN_INFO "scsi scan: periph.qual. of %i for" -+ " device %s\n", pq, -+ sdev->sdev_gendev.bus_id); ++ sdev_printk(KERN_INFO, sdev, "scsi scan: peripheral " ++ "qualifier of %i, device not added\n", pq); + if (lun == 0) { + unsigned char vend[9], mod[17]; -+ printk(KERN_INFO "scsi scan: consider passing " -+ "scsi_mod.dev_flags=%s:%s:0x240 or 0x800000\n", ++ sdev_printk(KERN_INFO, sdev, "scsi scan: consider " ++ "passing scsi_mod.dev_flags=%s:%s:" ++ "0x240 or 0x800240\n", + scsi_inq_str(vend, result, 8, 16), + scsi_inq_str(mod, result, 16, 32)); + } ++++++ patches.uml.tar.bz2 ++++++ ++++++ patches.xen.tar.bz2 ++++++ ++++++ series.conf ++++++ --- kernel-source/series.conf 2006-04-03 14:26:23.000000000 +0200 +++ kernel-source/series.conf 2006-04-04 15:47:46.000000000 +0200 @@ -100,6 +100,7 @@ patches.arch/x86_64-memmap-alloc patches.arch/x86_64-clear-apic patches.arch/x86_64-mce-nmi-watchdog + patches.arch/x86_64-hpet-drift # for i386/x86-64 patches.arch/tune-generic @@ -143,12 +144,14 @@ patches.arch/ppc-iseries-systemid.patch patches.arch/ppc-iseries-slb_initialize.patch + patches.arch/ppc-iseries-irq-256max.patch patches.arch/ppc-kdump-veth-register.patch patches.arch/ppc-kdump-boot-cpu-id.patch patches.arch/ppc-kdump-EOI.patch patches.arch/ppc-kdump-iommu-init-fix.patch patches.arch/ppc-kdump-soft-reset.patch + patches.arch/ppc-kdump-shutdown-interrupts.patch patches.arch/ppc-poison_percpu.patch @@ -169,6 +172,7 @@ patches.suse/kdb-ia64 # x86-64 kdb, hacked up a bit patches.suse/kdb-x86_64 + patches.suse/kdb-x86_64-longjmp patches.suse/x86_64-kdebug-events patches.suse/x86_64-smp-kdb-stop @@ -376,10 +380,12 @@ # Remaining SCSI patches (garloff) patches.suse/scsi-scan-inq-ppc64-dflt patches.suse/scsi-error-test-unit-ready-timeout -+garloff patches.suse/scsi-scan-tolerate-pq3-1 -+garloff patches.suse/scsi-scan-tolerate-pq3-2 -+garloff patches.suse/scsi-scan-tolerate-pq3-3 -+debug patches.suse/scsi-scan-tolerate-pq3-4 + patches.suse/scsi-scan-tolerate-pq3-1 + patches.suse/scsi-scan-tolerate-pq3-2 + patches.suse/scsi-scan-tolerate-pq3-3 ++debug patches.suse/scsi-scan-tolerate-pq3-4 + + patches.fixes/sg2616dio_lk.diff patches.fixes/gdth-zero-map patches.suse/libata-enable-atapi.patch @@ -459,6 +465,8 @@ patches.drivers/export_symbol_gpl_future-rcu.patch patches.drivers/export_symbol_gpl_future-usb.patch + patches.fixes/sysfs-off-by-one.patch + ######################################################## # USB ######################################################## @@ -617,6 +625,10 @@ patches.arch/s390-01-04-october2005.diff patches.arch/s390-qeth-vipa-fix + patches.arch/s390-02-02-october2005.diff + patches.arch/s390-02-03-october2005.diff + patches.arch/s390-02-04-october2005.diff + patches.arch/s390-dasd-eer-october2005.diff patches.arch/s390-statistic-disclaimer.diff ######################################################## # @@ -626,11 +638,6 @@ ######################################################## # Enable RAW devices patches.arch/s390-raw-device - # Removing ERP debugging code (#36834) -+hare patches.arch/s390-dasd-erp-debug.patch - - # Fix /proc/mmap_base for s390/s390x -+hare patches.arch/s390-mapped-base.patch # bootsplash -- now duwe's job patches.suse/bootsplash @@ -914,9 +921,12 @@ patches.fixes/kernel-block-event-03.patch patches.suse/mapped-base + # Fix /proc/mmap_base for s390/s390x + patches.arch/s390-mapped-base.patch + patches.fixes/reiserfs-transaction-overflow patches.suse/ocfs2-application-hang - patches.drivers/e1000-no-tso ++off patches.drivers/e1000-no-tso patches.fixes/md-barrier-fixes patches.fixes/md-grow-max-fix @@ -938,6 +948,12 @@ patches.fixes/cpuset-memory-migration-interaction.patch patches.fixes/inotify-emit-delete + patches.fixes/nodehotplug-sysfs + patches.suse/drain-node-pages-latency + patches.suse/cache_reap-latency + patches.fixes/hrtimer-opt + patches.fixes/calc-load-opt ++hare patches.fixes/bus-uevent-after-sysfs-links # PLEASE KEEP THESE PATCHES AT THE END OF series.conf # (as all other arch specific patches should be kept at the end ++++++ supported.conf ++++++ --- kernel-source/supported.conf 2006-04-03 14:26:22.000000000 +0200 +++ kernel-source/supported.conf 2006-04-04 15:47:46.000000000 +0200 @@ -1473,13 +1473,13 @@ kernel/drivers/video/vfb kernel/drivers/video/vga16fb kernel/drivers/video/vgastate # VGA State Save/Restore - kernel/drivers/w1/ds9490r - kernel/drivers/w1/ds_w1_bridge - kernel/drivers/w1/matrox_w1 # Driver for transport(Dallas 1-wire prtocol) over VGA DDC(matrox gpio). - kernel/drivers/w1/w1_ds2433 # w1 family 23 (DS2433) driver - kernel/drivers/w1/w1_smem # Driver for 1-wire Dallas network protocol, 64bit memory family. - kernel/drivers/w1/w1_therm # Driver for 1-wire Dallas network protocol, temperature family. - kernel/drivers/w1/wire # Driver for 1-wire Dallas network protocol. +- kernel/drivers/w1/ds9490r +- kernel/drivers/w1/ds_w1_bridge +- kernel/drivers/w1/matrox_w1 # Driver for transport(Dallas 1-wire prtocol) over VGA DDC(matrox gpio). +- kernel/drivers/w1/w1_ds2433 # w1 family 23 (DS2433) driver +- kernel/drivers/w1/w1_smem # Driver for 1-wire Dallas network protocol, 64bit memory family. +- kernel/drivers/w1/w1_therm # Driver for 1-wire Dallas network protocol, temperature family. +- kernel/drivers/w1/wire # Driver for 1-wire Dallas network protocol. kernel/drivers/xen/blkback/blkbk # Xen block device backend kernel/drivers/xen/blkfront/xenblk # Xen block device frontend kernel/drivers/xen/netback/netbk # Xen network device backend ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit perl-Bootloader
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package perl-Bootloader checked in at Tue Apr 4 18:23:54 CEST 2006. -------- --- perl-Bootloader/perl-Bootloader.changes 2006-04-04 10:42:40.000000000 +0200 +++ perl-Bootloader/perl-Bootloader.changes 2006-04-04 18:23:39.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 4 18:23:17 CEST 2006 - jplack(a)suse.de + +- typo fixed + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.QrI9Ni/_old 2006-04-04 18:23:49.000000000 +0200 +++ /var/tmp/diff_new_pack.QrI9Ni/_new 2006-04-04 18:23:49.000000000 +0200 @@ -12,7 +12,7 @@ Name: perl-Bootloader Version: 0.2.17 -Release: 1 +Release: 2 Requires: perl >= %{perl_version} Requires: perl-gettext Autoreqprov: on @@ -56,6 +56,8 @@ /sbin/update-bootloader %changelog -n perl-Bootloader +* Tue Apr 04 2006 - jplack(a)suse.de +- typo fixed * Mon Apr 03 2006 - jplack(a)suse.de - extended interface to fix #161755 - bump version to 0.2.17 ++++++ perl-Bootloader-0.2.17.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.2.17/lib/Bootloader/Core.pm new/perl-Bootloader-0.2.17/lib/Bootloader/Core.pm --- old/perl-Bootloader-0.2.17/lib/Bootloader/Core.pm 2006-04-03 17:36:14.000000000 +0200 +++ new/perl-Bootloader-0.2.17/lib/Bootloader/Core.pm 2006-04-04 17:29:38.000000000 +0200 @@ -833,11 +833,11 @@ my $loader = {}; # keep old settings if given as parameter if (defined($old)) { - foreach my $key (keys %old) { + foreach my $key (keys %{$old}) { $loader->{$key} = $old->{$key}; } } - $loader{"log_records"} = []; + $loader->{"log_records"} = []; bless ($loader); return $loader; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit scsi
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package scsi checked in at Tue Apr 4 18:23:52 CEST 2006. -------- --- scsi/scsi.changes 2006-02-24 14:20:59.000000000 +0100 +++ scsi/scsi.changes 2006-04-04 17:11:07.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 4 17:10:52 CEST 2006 - hare(a)suse.de + +- Added support for RDAC controller. + +------------------------------------------------------------------- New: ---- sg3_utils-rdac-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scsi.spec ++++++ --- /var/tmp/diff_new_pack.W0yTAG/_old 2006-04-04 18:23:11.000000000 +0200 +++ /var/tmp/diff_new_pack.W0yTAG/_new 2006-04-04 18:23:11.000000000 +0200 @@ -22,13 +22,14 @@ Provides: scsiinfo sg_utils scsidev Autoreqprov: on Version: 1.7_2.36_1.19_0.17_0.97 -Release: 1 +Release: 6 Summary: SCSI Tools (Text Mode) Source: scsiinfo-%{sinfover}.tar.gz Patch: scsiinfo-%{sinfover}.diff Patch1: scsiinfo-%{sinfover}-scsifmt.diff Source2: http://www.garloff.de/kurt/linux/scsidev/scsidev-%{sdevver}.tar.gz Patch2: scsidev-%{sdevver}.diff +Patch3: sg3_utils-rdac-support.patch Source5: sysconfig.scsidev Source3: http://www.garloff.de/kurt/linux/rescan-scsi-bus.sh Source4: http://www.torque.net/sg/p/sg3_utils-%{sgutver}.tgz @@ -105,6 +106,8 @@ %patch1 -p1 cd ../scsidev-%{sdevver} %patch2 +cd ../sg3_utils-%{sgutver} +%patch3 -p1 %build cd ../scsiinfo-%{sinfover} @@ -214,6 +217,7 @@ %attr(755,root,root) %{_bindir}/sg_start %attr(755,root,root) %{_bindir}/sg_ident %attr(755,root,root) %{_bindir}/sg_map26 +%attr(755,root,root) %{_bindir}/sg_rdac %attr(755,root,root) %{_libdir}/libsgutils.a %attr(755,root,root) %{_libdir}/libsgutils.la %attr(755,root,root) %{_libdir}/libsgutils.so* @@ -258,6 +262,7 @@ %doc %{_mandir}/man8/sg_rmsn.8.gz %doc %{_mandir}/man8/sg_ident.8.gz %doc %{_mandir}/man8/sg_map26.8.gz +%doc %{_mandir}/man8/sg_rdac.8.gz # lsscsi %attr(755,root,root) %{_bindir}/lsscsi %doc %{_mandir}/man8/lsscsi.8.gz @@ -305,6 +310,8 @@ %{insserv_cleanup} %changelog -n scsi +* Tue Apr 04 2006 - hare(a)suse.de +- Added support for RDAC controller. * Fri Feb 24 2006 - garloff(a)suse.de - Update to lsscsi-0.17: * fix disappearance of block device names in lk 2.6.16-rc1 ++++++ sg3_utils-rdac-support.patch ++++++ ++++ 616 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit ocfs2-tools
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package ocfs2-tools checked in at Tue Apr 4 18:22:32 CEST 2006. -------- --- ocfs2-tools/ocfs2-tools.changes 2006-03-03 00:18:21.000000000 +0100 +++ ocfs2-tools/ocfs2-tools.changes 2006-04-04 17:07:40.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 4 17:07:28 CEST 2006 - lmb(a)suse.de + +- Install "ocfs2" init script and enable it (#160724). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocfs2-tools.spec ++++++ --- /var/tmp/diff_new_pack.WbuKli/_old 2006-04-04 18:22:18.000000000 +0200 +++ /var/tmp/diff_new_pack.WbuKli/_new 2006-04-04 18:22:18.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: e2fsprogs-devel glib2-devel gnutls-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel python-devel python-gtk readline-devel update-desktop-files vte Summary: Oracle Cluster File System 2 Core Tools Version: 1.2.0 -Release: 1 +Release: 5 License: GPL Group: System/Filesystems Source: ocfs2-tools-%{version}.tar.bz2 @@ -75,6 +75,7 @@ %install mkdir -p $RPM_BUILD_ROOT/etc/init.d cp -f vendor/common/o2cb.init $RPM_BUILD_ROOT/etc/init.d/o2cb +cp -f vendor/common/ocfs2.init $RPM_BUILD_ROOT/etc/init.d/ocfs2 mkdir -p ${RPM_BUILD_ROOT}/var/adm/fillup-templates cp -f vendor/common/o2cb.sysconfig ${RPM_BUILD_ROOT}/var/adm/fillup-templates/sysconfig.o2cb make DESTDIR="$RPM_BUILD_ROOT" install @@ -92,12 +93,15 @@ %post %run_ldconfig %{fillup_and_insserv -n -y -Y o2cb o2cb} +%{fillup_and_insserv -n -y -Y ocfs2 ocfs2} %preun +%stop_on_removal ocfs2 %stop_on_removal o2cb %postun %run_ldconfig +%restart_on_update ocfs2 %restart_on_update o2cb %{insserv_cleanup} @@ -113,6 +117,7 @@ /usr/sbin/debugfs.ocfs2 /usr/sbin/ocfs2cdsl /etc/init.d/o2cb +/etc/init.d/ocfs2 /usr/share/man/man8/debugfs.ocfs2.8* /usr/share/man/man8/fsck.ocfs2.8* /usr/share/man/man8/fsck.ocfs2.checks.8* @@ -133,6 +138,8 @@ /usr/share/man/man8/ocfs2console.8* %changelog -n ocfs2-tools +* Tue Apr 04 2006 - lmb(a)suse.de +- Install "ocfs2" init script and enable it (#160724). * Fri Mar 03 2006 - jeffm(a)suse.com - Updated to version 1.2.0, per Oracle * Fri Mar 03 2006 - jeffm(a)suse.com ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit ntop
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package ntop checked in at Tue Apr 4 18:22:11 CEST 2006. -------- --- ntop/ntop.changes 2006-03-20 15:41:21.000000000 +0100 +++ ntop/ntop.changes 2006-04-04 17:33:41.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 4 17:32:09 CEST 2006 - bg(a)suse.de + +- removing files ntop_darwin.[ch] (Bug #161809) +- fixing user/group (Bug #140309) + +------------------------------------------------------------------- New: ---- pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntop.spec ++++++ --- /var/tmp/diff_new_pack.VXeUtq/_old 2006-04-04 18:21:50.000000000 +0200 +++ /var/tmp/diff_new_pack.VXeUtq/_new 2006-04-04 18:21:50.000000000 +0200 @@ -17,7 +17,7 @@ PreReq: %fillup_prereq %insserv_prereq /bin/cat Autoreqprov: on Version: 3.2 -Release: 9 +Release: 11 Summary: Web-Based Network Traffic Monitor Source: %{name}-%{version}.tar.bz2 Source2: rcntop @@ -123,13 +123,13 @@ %{_libdir}/lib*.so /usr/sbin/rcntop /usr/sbin/passcheck -%dir /usr/share/ntop +%dir %attr(-,wwwrun,www) /usr/share/ntop /usr/share/ntop/html %dir %{_libdir}/ntop %{_libdir}/ntop/plugins %{_mandir}/man8/ntop.8.gz /var/adm/fillup-templates/sysconfig.ntop -%dir /var/lib/ntop +%dir %attr(-,wwwrun,www) /var/lib/ntop %dir /etc/ntop /etc/ntop/ntop-cert.pem /etc/ntop/AS-list.txt.gz @@ -140,6 +140,9 @@ %changelog -n ntop +* Tue Apr 04 2006 - bg(a)suse.de +- removing files ntop_darwin.[ch] (Bug #161809) +- fixing user/group (Bug #140309) * Mon Mar 20 2006 - bg(a)suse.de - fix initialization of formatBuf (Bug #159477) * Thu Jan 26 2006 - bg(a)suse.de ++++++ ntop-3.2.diff ++++++ --- /var/tmp/diff_new_pack.VXeUtq/_old 2006-04-04 18:21:50.000000000 +0200 +++ /var/tmp/diff_new_pack.VXeUtq/_new 2006-04-04 18:21:50.000000000 +0200 @@ -106,3 +106,44 @@ char hostLinkBuf[LEN_GENERAL_WORK_BUFFER], hostLinkBuf1[LEN_GENERAL_WORK_BUFFER]; FCSession **tmpTable, *session; +--- Makefile.am 2006/04/03 09:09:17 1.1 ++++ Makefile.am 2006/04/03 09:09:40 +@@ -134,8 +134,7 @@ + ntop.c pbuf.c \ + plugin.c prefs.c protocols.c \ + sessions.c term.c util.c utildl.c \ +- traffic.c vendor.c version.c \ +- ntop_darwin.c ++ traffic.c vendor.c version.c + + libntop_la_DEPENDENCIES = myrrd/libmyrrd.la config.h + libntop_la_LIBADD = +--- Makefile.in 2006/04/03 09:09:17 1.1 ++++ Makefile.in 2006/04/03 09:10:00 +@@ -97,7 +97,7 @@ + getopt.lo getopt1.lo globals-core.lo hash.lo iface.lo \ + initialize.lo leaks.lo ntop.lo pbuf.lo plugin.lo prefs.lo \ + protocols.lo sessions.lo term.lo util.lo utildl.lo traffic.lo \ +- vendor.lo version.lo ntop_darwin.lo ++ vendor.lo version.lo + libntop_la_OBJECTS = $(am_libntop_la_OBJECTS) + am_libntopreport_la_OBJECTS = emitter.lo globals-report.lo graph.lo \ + fcReport.lo http.lo report.lo reportUtils.lo ssl.lo \ +@@ -357,8 +357,7 @@ + ntop.c pbuf.c \ + plugin.c prefs.c protocols.c \ + sessions.c term.c util.c utildl.c \ +- traffic.c vendor.c version.c \ +- ntop_darwin.c ++ traffic.c vendor.c version.c + + libntop_la_DEPENDENCIES = myrrd/libmyrrd.la config.h + libntop_la_LIBADD = +@@ -556,7 +555,6 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntop-admin.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntop-main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntop.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntop_darwin.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pbuf.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdaPlugin.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Plo@am__quote@ ++++++ ntop-3.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ntop-3.2/ntop_darwin.c new/ntop-3.2/ntop_darwin.c --- old/ntop-3.2/ntop_darwin.c 2005-07-13 10:01:49.000000000 +0200 +++ new/ntop-3.2/ntop_darwin.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,538 +0,0 @@ -/* - * Copyright (C) 2001-05 Luca Deri <deri(a)ntop.org> - * - * http://www.ntop.org/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/* - This file contains some compatibility functions that are needed for - ntop to run on Darwin/MacOS X -*/ - -#if defined(DARWIN) && (!defined(TIGER)) - -/* ***************************************************************** */ - -/* - * This file was modified by Christoph Pfisterer <cp(a)chrisp.de> - * on Tue, Jan 23 2001. See the file "ChangeLog" for details of what - * was changed. - * - * - * Copyright (c) 1999 Apple Computer, Inc. All rights reserved. - * - * @APPLE_LICENSE_HEADER_START@ - * - * Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.1 (the "License"). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. - * - * The Original Code and all software distributed under the License are - * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON- INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License. - * - * @APPLE_LICENSE_HEADER_END@ - */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <errno.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <limits.h> -#include "mach-o/dyld.h" -#include "ntop_darwin.h" - -/* - * debugging macros - */ -#if DEBUG > 0 -#define DEBUG_PRINT(format) fprintf(stderr,(format));fflush(stderr) -#define DEBUG_PRINT1(format,arg1) fprintf(stderr,(format),(arg1));\ - fflush(stderr) -#define DEBUG_PRINT2(format,arg1,arg2) fprintf(stderr,(format),\ - (arg1),(arg2));fflush(stderr) -#define DEBUG_PRINT3(format,arg1,arg2,arg3) fprintf(stderr,(format),\ - (arg1),(arg2),(arg3));fflush(stderr) -#else -#define DEBUG_PRINT(format) /**/ -#define DEBUG_PRINT1(format,arg1) /**/ -#define DEBUG_PRINT2(format,arg1,arg2) /**/ -#define DEBUG_PRINT3(format,arg1,arg2,arg3) /**/ -#undef DEBUG -#endif - -/* - * The structure of a dlopen() handle. - */ -struct dlopen_handle { - dev_t dev; /* the path's device and inode number from stat(2) */ - ino_t ino; - int dlopen_mode; /* current dlopen mode for this handle */ - int dlopen_count; /* number of times dlopen() called on this handle */ - NSModule module; /* the NSModule returned by NSLinkModule() */ - struct dlopen_handle *prev; - struct dlopen_handle *next; -}; -static struct dlopen_handle *dlopen_handles = NULL; -static const struct dlopen_handle main_program_handle = {NULL}; -static char *dlerror_pointer = NULL; - -/* - * NSMakePrivateModulePublic() is not part of the public dyld API so we define - * it here. The internal dyld function pointer for - * __dyld_NSMakePrivateModulePublic is returned so thats all that maters to get - * the functionality need to implement the dlopen() interfaces. - */ -static int NSMakePrivateModulePublic(NSModule module) -{ - static NSModule *p; - - if(p == NULL) - _dyld_func_lookup("__dyld_NSMakePrivateModulePublic", (unsigned long *)&p); - - if(p == NULL) { -#ifdef DEBUG - printf("_dyld_func_lookup of __dyld_NSMakePrivateModulePublic " - "failed\n"); -#endif - return(FALSE); - } else - return(TRUE); -} - -/* - * helper routine: search for a named module in various locations - */ -static -int -_dl_search_paths( -const char *filename, -char *pathbuf, -struct stat *stat_buf) -{ - const char *pathspec; - const char *element; - const char *p; - char *q; - char *pathbuf_end; - const char *envvars[] = { - "$DYLD_LIBRARY_PATH", - "$LD_LIBRARY_PATH", - "/usr/lib:/lib", - NULL }; - int envvar_index; - - pathbuf_end = pathbuf + PATH_MAX - 8; - - for(envvar_index = 0; envvars[envvar_index]; envvar_index++) { - if(envvars[envvar_index][0] == '$') { - pathspec = getenv(envvars[envvar_index]+1); - } - else { - pathspec = envvars[envvar_index]; - } - - if(pathspec != NULL) { - element = pathspec; - while(*element) { - /* extract path list element */ - p = element; - q = pathbuf; - while(*p && *p != ':' && q < pathbuf_end) *q++ = *p++; - if(q == pathbuf) { /* empty element */ - if(*p) { - element = p+1; - continue; - } - break; - } - if (*p) { - element = p+1; - } - else{ - element = p; /* this terminates the loop */ - } - - /* add slash if neccessary */ - if(*(q-1) != '/' && q < pathbuf_end) { - *q++ = '/'; - } - - /* append module name */ - p = filename; - while(*p && q < pathbuf_end) *q++ = *p++; - *q++ = 0; - - if(q >= pathbuf_end) { - /* maybe add an error message here */ - break; - } - - if(stat(pathbuf, stat_buf) == 0) { - return 0; - } - } - } - } - - /* we have searched everywhere, now we give up */ - return -1; -} - -/* - * dlopen() the MacOS X version of the FreeBSD dlopen() interface. - */ -void* dlopen(const char *path, int mode) -{ - const char *module_path; - void *retval; - struct stat stat_buf; - NSObjectFileImage objectFileImage; - NSObjectFileImageReturnCode ofile_result_code; - NSModule module; - struct dlopen_handle *p; - unsigned long options; - NSSymbol NSSymbol; - void (*init)(void); - char pathbuf[PATH_MAX]; - - DEBUG_PRINT2("libdl: dlopen(%s,0x%x) -> ", path, (unsigned int)mode); - - dlerror_pointer = NULL; - /* - * A NULL path is to indicate the caller wants a handle for the - * main program. - */ - if(path == NULL) { - retval = (void *)&main_program_handle; - DEBUG_PRINT1("main / %p\n", retval); - return(retval); - } - - /* see if the path exists and if so get the device and inode number */ - if(stat(path, &stat_buf) == -1) { - dlerror_pointer = strerror(errno); - - if(path[0] == '/') { - DEBUG_PRINT1("ERROR (stat): %s\n", dlerror_pointer); - return(NULL); - } - - /* search for the module in various places */ - if(_dl_search_paths(path, pathbuf, &stat_buf)) { - /* dlerror_pointer is unmodified */ - DEBUG_PRINT1("ERROR (stat): %s\n", dlerror_pointer); - return(NULL); - } - DEBUG_PRINT1("found %s -> ", pathbuf); - module_path = pathbuf; - dlerror_pointer = NULL; - } - else{ - module_path = path; - } - - /* - * If we don't want an unshared handle see if we already have a handle - * for this path. - */ - if((mode & RTLD_UNSHARED) != RTLD_UNSHARED) { - p = dlopen_handles; - while(p != NULL) { - if(p->dev == stat_buf.st_dev && p->ino == stat_buf.st_ino) { - /* skip unshared handles */ - if((p->dlopen_mode & RTLD_UNSHARED) == RTLD_UNSHARED) - continue; - /* - * We have already created a handle for this path. The - * caller might be trying to promote an RTLD_LOCAL handle - * to a RTLD_GLOBAL. Or just looking it up with - * RTLD_NOLOAD. - */ - if((p->dlopen_mode & RTLD_LOCAL) == RTLD_LOCAL && - (mode & RTLD_GLOBAL) == RTLD_GLOBAL) { - /* promote the handle */ - if(NSMakePrivateModulePublic(p->module) == TRUE) { - p->dlopen_mode &= ~RTLD_LOCAL; - p->dlopen_mode |= RTLD_GLOBAL; - p->dlopen_count++; - DEBUG_PRINT1("%p\n", p); - return(p); - } - else{ - dlerror_pointer = "can't promote handle from " - "RTLD_LOCAL to RTLD_GLOBAL"; - DEBUG_PRINT1("ERROR: %s\n", dlerror_pointer); - return(NULL); - } - } - p->dlopen_count++; - DEBUG_PRINT1("%p\n", p); - return(p); - } - p = p->next; - } - } - - /* - * We do not have a handle for this path if we were just trying to - * look it up return NULL to indicate we don't have it. - */ - if((mode & RTLD_NOLOAD) == RTLD_NOLOAD) { - dlerror_pointer = "no existing handle for path RTLD_NOLOAD test"; - DEBUG_PRINT1("ERROR: %s\n", dlerror_pointer); - return(NULL); - } - - /* try to create an object file image from this path */ - ofile_result_code = NSCreateObjectFileImageFromFile(module_path, - &objectFileImage); - if(ofile_result_code != NSObjectFileImageSuccess) { - switch(ofile_result_code) { - case NSObjectFileImageFailure: - dlerror_pointer = "object file setup failure"; - DEBUG_PRINT1("ERROR: %s\n", dlerror_pointer); - return(NULL); - case NSObjectFileImageInappropriateFile: - dlerror_pointer = "not a Mach-O MH_BUNDLE file type"; - DEBUG_PRINT1("ERROR: %s\n", dlerror_pointer); - return(NULL); - case NSObjectFileImageArch: - dlerror_pointer = "no object for this architecture"; - DEBUG_PRINT1("ERROR: %s\n", dlerror_pointer); - return(NULL); - case NSObjectFileImageFormat: - dlerror_pointer = "bad object file format"; - DEBUG_PRINT1("ERROR: %s\n", dlerror_pointer); - return(NULL); - case NSObjectFileImageAccess: - dlerror_pointer = "can't read object file"; - DEBUG_PRINT1("ERROR: %s\n", dlerror_pointer); - return(NULL); - default: - dlerror_pointer = "unknown error from " - "NSCreateObjectFileImageFromFile()"; - DEBUG_PRINT1("ERROR: %s\n", dlerror_pointer); - return(NULL); - } - } - - /* try to link in this object file image */ - options = NSLINKMODULE_OPTION_PRIVATE; - if((mode & RTLD_NOW) == RTLD_NOW) - options |= NSLINKMODULE_OPTION_BINDNOW; - module = NSLinkModule(objectFileImage, module_path, options); - NSDestroyObjectFileImage(objectFileImage) ; - if(module == NULL) { - dlerror_pointer = "NSLinkModule() failed for dlopen()"; - DEBUG_PRINT1("ERROR: %s\n", dlerror_pointer); - return(NULL); - } - - /* - * If the handle is to be global promote the handle. It is done this - * way to avoid multiply defined symbols. - */ - if((mode & RTLD_GLOBAL) == RTLD_GLOBAL) { - if(NSMakePrivateModulePublic(module) == FALSE) { - dlerror_pointer = "can't promote handle from RTLD_LOCAL to " - "RTLD_GLOBAL"; - DEBUG_PRINT1("ERROR: %s\n", dlerror_pointer); - return(NULL); - } - } - - p = malloc(sizeof(struct dlopen_handle)); - if(p == NULL) { - dlerror_pointer = "can't allocate memory for the dlopen handle"; - DEBUG_PRINT1("ERROR: %s\n", dlerror_pointer); - return(NULL); - } - - /* fill in the handle */ - p->dev = stat_buf.st_dev; - p->ino = stat_buf.st_ino; - if(mode & RTLD_GLOBAL) - p->dlopen_mode = RTLD_GLOBAL; - else - p->dlopen_mode = RTLD_LOCAL; - p->dlopen_mode |= (mode & RTLD_UNSHARED) | - (mode & RTLD_NODELETE) | - (mode & RTLD_LAZY_UNDEF); - p->dlopen_count = 1; - p->module = module; - p->prev = NULL; - p->next = dlopen_handles; - if(dlopen_handles != NULL) - dlopen_handles->prev = p; - dlopen_handles = p; - - /* call the init function if one exists */ - NSSymbol = NSLookupSymbolInModule(p->module, "__init"); - if(NSSymbol != NULL) { - init = NSAddressOfSymbol(NSSymbol); - init(); - } - - DEBUG_PRINT1("%p\n", p); - return(p); -} - -/* - * dlsym() the MacOS X version of the FreeBSD dlopen() interface. - */ -void* dlsym(void * handle, const char *symbol) { - struct dlopen_handle *dlopen_handle, *p; - NSSymbol nsSymbol; - void *address; - - DEBUG_PRINT2("libdl: dlsym(%p,%s) -> ", handle, symbol); - - dlopen_handle = (struct dlopen_handle *)handle; - - /* - * If this is the handle for the main program do a global lookup. - */ - if(dlopen_handle == (struct dlopen_handle *)&main_program_handle) { - if(NSIsSymbolNameDefined(symbol) == TRUE) { - nsSymbol = NSLookupAndBindSymbol(symbol); - address = NSAddressOfSymbol(nsSymbol); - dlerror_pointer = NULL; - DEBUG_PRINT1("%p\n", address); - return(address); - } - else{ - dlerror_pointer = "symbol not found"; - DEBUG_PRINT1("ERROR: %s\n", dlerror_pointer); - return(NULL); - } - } - - /* - * Find this handle and do a lookup in just this module. - */ - p = dlopen_handles; - while(p != NULL) { - if(dlopen_handle == p) { - nsSymbol = NSLookupSymbolInModule(p->module, symbol); - if(nsSymbol != NULL) { - address = NSAddressOfSymbol(nsSymbol); - dlerror_pointer = NULL; - DEBUG_PRINT1("%p\n", address); - return(address); - } - else{ - dlerror_pointer = "symbol not found"; - DEBUG_PRINT1("ERROR: %s\n", dlerror_pointer); - return(NULL); - } - } - p = p->next; - } - - dlerror_pointer = "bad handle passed to dlsym()"; - DEBUG_PRINT1("ERROR: %s\n", dlerror_pointer); - return(NULL); -} - -/* - * dlerror() the MacOS X version of the FreeBSD dlopen() interface. - */ -const char * -dlerror( -void) -{ - const char *p; - - p = (const char *)dlerror_pointer; - dlerror_pointer = NULL; - return(p); -} - -/* - * dlclose() the MacOS X version of the FreeBSD dlopen() interface. - */ -int -dlclose( -void * handle) -{ - struct dlopen_handle *p, *q; - unsigned long options; - NSSymbol nsSymbol; - void (*fini)(void); - - DEBUG_PRINT1("libdl: dlclose(%p) -> ", handle); - - dlerror_pointer = NULL; - q = (struct dlopen_handle *)handle; - p = dlopen_handles; - while(p != NULL) { - if(p == q) { - /* if the dlopen() count is not zero we are done */ - p->dlopen_count--; - if(p->dlopen_count != 0) { - DEBUG_PRINT("OK"); - return(0); - } - - /* call the fini function if one exists */ - nsSymbol = NSLookupSymbolInModule(p->module, "__fini"); - if(nsSymbol != NULL) { - fini = NSAddressOfSymbol(nsSymbol); - fini(); - } - - /* unlink the module for this handle */ - options = 0; - if(p->dlopen_mode & RTLD_NODELETE) - options |= NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED; - if(p->dlopen_mode & RTLD_LAZY_UNDEF) - options |= NSUNLINKMODULE_OPTION_RESET_LAZY_REFERENCES; - if(NSUnLinkModule(p->module, options) == FALSE) { - dlerror_pointer = "NSUnLinkModule() failed for dlclose()"; - DEBUG_PRINT1("ERROR: %s\n", dlerror_pointer); - return(-1); - } - if(p->prev != NULL) - p->prev->next = p->next; - if(p->next != NULL) - p->next->prev = p->prev; - if(dlopen_handles == p) - dlopen_handles = p->next; - free(p); - DEBUG_PRINT("OK"); - return(0); - } - p = p->next; - } - dlerror_pointer = "invalid handle passed to dlclose()"; - DEBUG_PRINT1("ERROR: %s\n", dlerror_pointer); - return(-1); -} - -/* ***************************************************************** */ - -#endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ntop-3.2/ntop_darwin.h new/ntop-3.2/ntop_darwin.h --- old/ntop-3.2/ntop_darwin.h 2004-01-01 11:06:38.000000000 +0100 +++ new/ntop-3.2/ntop_darwin.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -/* - * Copyright (C) 2001-04 Luca Deri <deri(a)ntop.org> - * - * http://www.ntop.org/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/* - This file contains some compatibility functions that are needed for - ntop to run on Darwin/MacOS X -*/ - -#ifdef DARWIN - -/* ***************************************************************** */ - -/* - * This file was modified by Christoph Pfisterer <cp(a)chrisp.de> - * on Sat, May 5 2001. See the file "ChangeLog" for details of what - * was changed. - * - * - * Copyright (c) 1999 Apple Computer, Inc. All rights reserved. - * - * @APPLE_LICENSE_HEADER_START@ - * - * Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.1 (the "License"). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. - * - * The Original Code and all software distributed under the License are - * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON- INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License. - * - * @APPLE_LICENSE_HEADER_END@ - */ - -#ifdef __cplusplus -extern "C" { -#endif - -extern void * dlopen( - const char *path, - int mode); -extern void * dlsym( - void * handle, - const char *symbol); -extern const char * dlerror( - void); -extern int dlclose( - void * handle); - -#define RTLD_LAZY 0x1 -#define RTLD_NOW 0x2 -#define RTLD_LOCAL 0x4 -#define RTLD_GLOBAL 0x8 -#define RTLD_NOLOAD 0x10 -#define RTLD_SHARED 0x20 /* not used, the default */ -#define RTLD_UNSHARED 0x40 -#define RTLD_NODELETE 0x80 -#define RTLD_LAZY_UNDEF 0x100 - -#ifdef __cplusplus -} -#endif - -/* ***************************************************************** */ - -#endif /* DARWIN */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit mkinitrd
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package mkinitrd checked in at Tue Apr 4 18:21:43 CEST 2006. -------- --- mkinitrd/mkinitrd.changes 2006-03-23 12:08:07.000000000 +0100 +++ mkinitrd/mkinitrd.changes 2006-04-04 15:44:51.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Apr 4 15:43:05 CEST 2006 - garloff(a)suse.de + +- Put DOMU_INITRD_MODULES into xen initrds and load them rather + than driver_modules in a Xen domU. + +------------------------------------------------------------------- +Fri Mar 31 09:13:31 CEST 2006 - hare(a)suse.de + +- Get splash sizes from framebuffer, too (#141098) + +------------------------------------------------------------------- New: ---- Makefile ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.AeLaa4/_old 2006-04-04 18:21:32.000000000 +0200 +++ /var/tmp/diff_new_pack.AeLaa4/_new 2006-04-04 18:21:32.000000000 +0200 @@ -18,7 +18,7 @@ # bootsplash required only if creating splash initrd's. Autoreqprov: on Version: 1.2 -Release: 80 +Release: 82 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd @@ -85,6 +85,11 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog -n mkinitrd +* Tue Apr 04 2006 - garloff(a)suse.de +- Put DOMU_INITRD_MODULES into xen initrds and load them rather + than driver_modules in a Xen domU. +* Fri Mar 31 2006 - hare(a)suse.de +- Get splash sizes from framebuffer, too (#141098) * Thu Mar 23 2006 - hare(a)suse.de - Always check for mounted /proc and /sys (#151879) * Wed Mar 22 2006 - hare(a)suse.de ++++++ mkinitrd ++++++ --- mkinitrd/mkinitrd 2006-03-23 12:08:04.000000000 +0100 +++ mkinitrd/mkinitrd 2006-04-04 15:44:51.000000000 +0200 @@ -23,7 +23,7 @@ # This file is kept in the following CVS repository: # # $Source: /suse/yast2/cvsroot/mkinitrd/mkinitrd,v $ -# $Revision: 1.270 $ +# $Revision: 1.272 $ usage() { cat<<EOF @@ -45,6 +45,9 @@ all kernels found in /boot. -m "module list" Modules to include in initrd. Defaults to the INITRD_MODULES variable in /etc/sysconfig/kernel. + -u "DomU module list" Modules to include in initrd. Defaults to + the DOMU_INITRD_MODULES variable in + /etc/sysconfig/kernel. -f "feature list" Features to be enabled when generating initrd. Available features are: iscsi, md, mpath, lvm, lvm2, evms @@ -132,6 +135,8 @@ initrd_images= modules= modules_set= +domu_modules= +domu_modules_set= feature_list= boot_dir= splash="auto" @@ -196,6 +201,9 @@ m) modules=$OPTARG modules_set=1 ;; + u) domu_modules=$OPTARG + domu_modules_set=1 + ;; b) boot_dir=$OPTARG ;; d) rootdev=$OPTARG @@ -345,6 +353,13 @@ eval splash_size_$size=1 ;; esac done + # Get current modes from fb + for fb in /sys/class/graphics/fb* ; do + if [ -d $fb ] ; then + size=$(sed -ne 's/,/x/p' $fb/virtual_size) + eval splash_size_$size=1 + fi + done splashsizes="$(for x in ${!splash_size_*}; do echo ${x#splash_size_} done)" @@ -411,6 +426,20 @@ echo "$@" >&2 } +is_xen_kernel() { + local kversion=$1 + local cfg + + for cfg in ${root_dir}/boot/config-$kversion $root_dir/lib/modules/$kversion/build/.config + do + test -r $cfg || continue + grep -q "^CONFIG_XEN=y\$" $cfg + return + done + test $kversion != "${kversion%-xen*}" + return +} + # Check if module $1 is listed in $modules. has_module() { case " $modules " in @@ -1117,7 +1146,7 @@ local need_mdadm local need_mdconf local -a features - local fs_modules drv_modules uld_modules + local fs_modules drv_modules uld_modules xen_modules tmp_mnt=$work_dir/mnt tmp_mnt_small=${tmp_mnt}_small @@ -1778,8 +1807,12 @@ resolved_modules="$(resolve_modules $kernel_version $modules)" fi + if is_xen_kernel $kernel_version; then + xenu_modules="$(resolve_modules $kernel_version $domu_modules)" + fi + # Copy all modules into the initrd - for module in $resolved_modules; do + for module in $resolved_modules $xenu_modules; do if [ ! -r $root_dir/$module ]; then oops 9 "Module $module not found." continue @@ -1818,6 +1851,8 @@ for module in $resolved_modules; do if [ "$module" != "${module#*/kernel/fs/}" ]; then fs_modules="$fs_modules $module" + elif is_xen_kernel $kernel_version && [ "$module" != "${module#*/kernel/drivers/xen/*/xen}" ]; then + xen_modules="$xen_modules $module" else drv_modules="$drv_modules $module" fi @@ -1827,6 +1862,16 @@ echo -ne "Driver modules:\t" initrd_is_using_modules= + + if is_xen_kernel $kernel_version; then + # NOTE: We use the same settings as the dom0 initrd, except + # for the different module list. So we share fsck, dm, ... support. + cat_linuxrc <<-EOF + |caps="\$(</proc/xen/capabilities)" + |if [ "\$caps" != "\${caps%control_d*}" ]; then + EOF + fi + for modpath in $drv_modules; do module=${modpath##*/} module=${module%.ko} @@ -1943,10 +1988,42 @@ initrd_is_using_modules=1 done - echo + + if is_xen_kernel $kernel_version; then + cat_linuxrc <<-EOF + |else + EOF + echo -ne "\nXen domU modules:\t" + + for modpath in $xenu_modules $xen_modules; do + module=${modpath##*/} + module=${module%.ko} + echo -n "${module} " + cat_linuxrc <<-EOF + |params= + |for p in \$(cat /proc/cmdline) ; do + | case \$p in + | $module.*) + | params="\$params \${p#$module.}" + | ;; + | esac + |done + |echo "Loading $module" + |modprobe $module \$params + EOF + + initrd_is_using_modules=1 + done + + cat_linuxrc <<-EOF + |fi + EOF + fi if [ -z "$initrd_is_using_modules" ]; then echo "none" + else + echo fi if [ -n "$s390_dasd_disks" ]; then @@ -2866,6 +2943,12 @@ modules="$INITRD_MODULES" fi +if [ -z "$domu_modules_set" ]; then + # get DOMU_INITRD_MODULES from system configuration + . $root_dir/etc/sysconfig/kernel + domu_modules="$DOMU_INITRD_MODULES" +fi + ################################################################### # add modules required by features if [ -n "$root_lvm" ] ; then @@ -2956,7 +3039,7 @@ kernel_images=( $kernel_images ) boot_modules="$modules" -echo -e "Module list:\t$boot_modules" +echo -e "Module list:\t$boot_modules ($domu_modules)" for ((i=0 ; $i<${#kernel_images[@]} ; i++)); do echo modules="$boot_modules" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp-zmd-backend
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package libzypp-zmd-backend checked in at Tue Apr 4 18:21:25 CEST 2006. -------- --- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-04-03 19:30:07.000000000 +0200 +++ libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-04-04 17:38:20.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 4 17:37:45 CEST 2006 - kkaempf(a)suse.de + +- add 'service-delete' helper. +- rev 2912 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-zmd-backend.spec ++++++ --- /var/tmp/diff_new_pack.Xx6z4m/_old 2006-04-04 18:21:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Xx6z4m/_new 2006-04-04 18:21:11.000000000 +0200 @@ -22,7 +22,7 @@ Obsoletes: zmd-librc-backend Summary: ZMD backend for Package, Patch, Pattern, and Product Management Version: 7.1.1 -Release: 29 +Release: 30 Source: zmd-backend-%{version}.tar.bz2 Prefix: /usr @@ -68,6 +68,9 @@ /etc/logrotate.d/zmd-backend %changelog -n libzypp-zmd-backend +* Tue Apr 04 2006 - kkaempf(a)suse.de +- add 'service-delete' helper. +- rev 2912 * Mon Apr 03 2006 - kkaempf(a)suse.de - plainRpm() is deprecated, use location() - rev 2893 ++++++ zmd-backend-7.1.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/Makefile.am new/zmd-backend-7.1.1/src/Makefile.am --- old/zmd-backend-7.1.1/src/Makefile.am 2006-03-30 10:10:42.000000000 +0200 +++ new/zmd-backend-7.1.1/src/Makefile.am 2006-04-04 15:13:35.000000000 +0200 @@ -18,12 +18,14 @@ query-system \ query-files \ resolve-dependencies \ + service-delete \ package-files \ parse-metadata \ find-file \ update-status \ transact +service_delete_SOURCES = service-delete.cc zmd-backend.cc query_pool_SOURCES = query-pool.cc zmd-backend.cc query_system_SOURCES = query-system.cc zmd-backend.cc query_files_SOURCES = query-files.cc zmd-backend.cc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/Makefile.in new/zmd-backend-7.1.1/src/Makefile.in --- old/zmd-backend-7.1.1/src/Makefile.in 2006-03-30 10:10:45.000000000 +0200 +++ new/zmd-backend-7.1.1/src/Makefile.in 2006-04-04 15:16:09.000000000 +0200 @@ -40,8 +40,9 @@ target_triplet = @target@ bin_PROGRAMS = query-pool$(EXEEXT) query-system$(EXEEXT) \ query-files$(EXEEXT) resolve-dependencies$(EXEEXT) \ - package-files$(EXEEXT) parse-metadata$(EXEEXT) \ - find-file$(EXEEXT) update-status$(EXEEXT) transact$(EXEEXT) + service-delete$(EXEEXT) package-files$(EXEEXT) \ + parse-metadata$(EXEEXT) find-file$(EXEEXT) \ + update-status$(EXEEXT) transact$(EXEEXT) subdir = src DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -95,6 +96,12 @@ resolve_dependencies_LDADD = $(LDADD) resolve_dependencies_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) +am_service_delete_OBJECTS = service-delete.$(OBJEXT) \ + zmd-backend.$(OBJEXT) +service_delete_OBJECTS = $(am_service_delete_OBJECTS) +service_delete_LDADD = $(LDADD) +service_delete_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) am_transact_OBJECTS = transact.$(OBJEXT) transactions.$(OBJEXT) \ zmd-backend.$(OBJEXT) transact_OBJECTS = $(am_transact_OBJECTS) @@ -129,13 +136,13 @@ SOURCES = $(find_file_SOURCES) $(package_files_SOURCES) \ $(parse_metadata_SOURCES) $(query_files_SOURCES) \ $(query_pool_SOURCES) $(query_system_SOURCES) \ - $(resolve_dependencies_SOURCES) $(transact_SOURCES) \ - $(update_status_SOURCES) + $(resolve_dependencies_SOURCES) $(service_delete_SOURCES) \ + $(transact_SOURCES) $(update_status_SOURCES) DIST_SOURCES = $(find_file_SOURCES) $(package_files_SOURCES) \ $(parse_metadata_SOURCES) $(query_files_SOURCES) \ $(query_pool_SOURCES) $(query_system_SOURCES) \ - $(resolve_dependencies_SOURCES) $(transact_SOURCES) \ - $(update_status_SOURCES) + $(resolve_dependencies_SOURCES) $(service_delete_SOURCES) \ + $(transact_SOURCES) $(update_status_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-exec-recursive install-info-recursive \ @@ -300,6 +307,7 @@ AM_CXXFLAGS = $(PKG_MANAGEMENT_CFLAGS) $(SQLITE_CFLAGS) $(ZYPP_CFLAGS) LDADD = $(PKG_MANAGEMENT_LIBS) $(SQLITE_LIBS) $(ZYPP_LIBS) noinst_HEADERS = zmd-backend.h +service_delete_SOURCES = service-delete.cc zmd-backend.cc query_pool_SOURCES = query-pool.cc zmd-backend.cc query_system_SOURCES = query-system.cc zmd-backend.cc query_files_SOURCES = query-files.cc zmd-backend.cc @@ -391,6 +399,9 @@ resolve-dependencies$(EXEEXT): $(resolve_dependencies_OBJECTS) $(resolve_dependencies_DEPENDENCIES) @rm -f resolve-dependencies$(EXEEXT) $(CXXLINK) $(resolve_dependencies_LDFLAGS) $(resolve_dependencies_OBJECTS) $(resolve_dependencies_LDADD) $(LIBS) +service-delete$(EXEEXT): $(service_delete_OBJECTS) $(service_delete_DEPENDENCIES) + @rm -f service-delete$(EXEEXT) + $(CXXLINK) $(service_delete_LDFLAGS) $(service_delete_OBJECTS) $(service_delete_LDADD) $(LIBS) transact$(EXEEXT): $(transact_OBJECTS) $(transact_DEPENDENCIES) @rm -f transact$(EXEEXT) $(CXXLINK) $(transact_LDFLAGS) $(transact_OBJECTS) $(transact_LDADD) $(LIBS) @@ -411,6 +422,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/query-pool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/query-system.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolve-dependencies.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/service-delete.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transact.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transactions.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/update-status.Po@am__quote@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/service-delete.cc new/zmd-backend-7.1.1/src/service-delete.cc --- old/zmd-backend-7.1.1/src/service-delete.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/zmd-backend-7.1.1/src/service-delete.cc 2006-04-04 17:36:26.000000000 +0200 @@ -0,0 +1,90 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */ + +#include <iostream> + +#include "zmd-backend.h" + +#include <zypp/ZYpp.h> +#include <zypp/ZYppFactory.h> +#include <zypp/SourceManager.h> +#include <zypp/base/Logger.h> +#include <zypp/base/Exception.h> +#include <zypp/base/Algorithm.h> + +using namespace std; +using namespace zypp; + +#undef ZYPP_BASE_LOGGER_LOGGROUP +#define ZYPP_BASE_LOGGER_LOGGROUP "service-delete" + +//----------------------------------------------------------------------------- + +static int +service_delete( ZYpp::Ptr Z, const string & uri) +{ + SourceManager_Ptr manager = SourceManager::sourceManager(); + + MIL << "service_delete(" << uri << ")" << endl; + + try { + manager->restore( "/" ); + } + catch (Exception & excpt_r) { + ZYPP_CAUGHT( excpt_r ); + ERR << "Couldn't restore sources" << endl; + return 1; + } + + SourceManager::Source_const_iterator it; + for (it = manager->Source_begin(); it != manager->Source_end(); ++it) { + string src_uri = it->url().asString() + "?alias=" + it->alias(); + MIL << "Uri " << src_uri << endl; + if (src_uri == uri) { + manager->removeSource( it->alias() ); + try { + manager->store ("/", true /*metadata_cache*/); + } + catch (Exception & excpt_r) { + ZYPP_CAUGHT (excpt_r); + ERR << "Couldn't update source cache" << endl; + } + break; + } + } + if (it == manager->Source_end()) { + WAR << "Source not found" << endl; + return 1; + } + return 0; +} + +//----------------------------------------------------------------------------- + +int +main (int argc, char **argv) +{ + const char *logfile = getenv("ZYPP_LOGFILE"); + if (logfile != NULL) + zypp::base::LogControl::instance().logfile( logfile ); + else + zypp::base::LogControl::instance().logfile( ZMD_BACKEND_LOG ); + + MIL << "-------------------------------------" << endl; + string alias; + if (argc < 2) { + cerr << "Usage: service-delete <uri>" << endl; + exit( 1 ); + } + alias = argv[1]; + + MIL << "START service-delete " << alias << endl; + + ZYpp::Ptr Z = backend::getZYpp( true ); + Target_Ptr target = backend::initTarget( Z, false ); + + int result = service_delete( Z, alias ); + + MIL << "END service-delete" << endl; + + return result; +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0