April 2010 - openSUSE Commits - openSUSE Mailing Lists

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '10

29 Apr '10

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Fri Apr 30 01:38:39 CEST 2010. -------- --- kiwi/kiwi.changes 2010-04-23 10:12:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2010-04-29 13:03:22.000000000 +0200 @@ -1,0 +2,20 @@ +Fri Apr 23 10:53:37 CEST 2010 - ms(a)suse.de + +- v4.32 +- fixed repartition code for overlay systems (clicfs) +- support new createrepo repomd.xml metadata information. + kiwi now reads the repomd.xml if it exists and parses the + primary data section in order to get all metadata file names +- automatically skip the gpg-pubkey packages during migration +- removed kiwi's own pattern solving module. The satsolver + approach is the preferred solution to implement this +- don't use --follow-symlinks for iso type if old live iso + style is in use (bnc #599712) +- added parted to isoboot images this is required for + the hybrid persistent feature. also increased min space + for clicfs embedded ext3 filesystem. Also fixed the + createHybridPersistent() function to use fdisk instead + of parted. The problem here is that parted doesn't accept + the partitiont able written by the isohybrid tool. + +------------------------------------------------------------------- @@ -12 +32 @@ - options to be ignored + options to be ignored (bnc #587361) calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.fqcmyU/_old 2010-04-30 01:35:27.000000000 +0200 +++ /var/tmp/diff_new_pack.fqcmyU/_new 2010-04-30 01:35:27.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 4.31) +# spec file for package kiwi (Version 4.32) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -60,7 +60,7 @@ Requires: clicfs %endif Summary: OpenSuSE - KIWI Image System -Version: 4.31 +Version: 4.32 Release: 1 Group: System/Management License: GPLv2 ++++++ kiwi.tar.bz2 ++++++ kiwi/kiwi.tar.bz2 /mounts/work_src_done/STABLE/kiwi/kiwi.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-product-creator for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '10

29 Apr '10

Hello community, here is the log from the commit of package yast2-product-creator for openSUSE:Factory checked in at Fri Apr 30 01:35:04 CEST 2010. -------- --- yast2-product-creator/yast2-product-creator.changes 2010-04-28 16:57:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-product-creator/yast2-product-creator.changes 2010-04-29 18:03:54.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Apr 29 18:02:40 CEST 2010 - jsuchome(a)suse.cz + +- remember the directory of the saved configuration (bnc#600922) +- 2.19.10 + +------------------------------------------------------------------- +Thu Apr 29 13:24:34 CEST 2010 - jsuchome(a)suse.cz + +- check availability of selected packages and report problem + (bnc#599952) +- 2.19.9 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-product-creator-2.19.8.tar.bz2 New: ---- yast2-product-creator-2.19.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-product-creator.spec ++++++ --- /var/tmp/diff_new_pack.COSWbC/_old 2010-04-30 01:35:00.000000000 +0200 +++ /var/tmp/diff_new_pack.COSWbC/_new 2010-04-30 01:35:00.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-product-creator (Version 2.19.8) +# spec file for package yast2-product-creator (Version 2.19.10) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-product-creator -Version: 2.19.8 +Version: 2.19.10 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-product-creator-2.19.8.tar.bz2 +Source0: yast2-product-creator-2.19.10.tar.bz2 Prefix: /usr @@ -62,7 +62,7 @@ XEN images etc.), based on existing installation sources. %prep -%setup -n yast2-product-creator-2.19.8 +%setup -n yast2-product-creator-2.19.10 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-product-creator-2.19.8.tar.bz2 -> yast2-product-creator-2.19.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.8/VERSION new/yast2-product-creator-2.19.10/VERSION --- old/yast2-product-creator-2.19.8/VERSION 2010-04-28 16:56:14.000000000 +0200 +++ new/yast2-product-creator-2.19.10/VERSION 2010-04-29 18:03:16.000000000 +0200 @@ -1 +1 @@ -2.19.8 +2.19.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.8/src/Kiwi.ycp new/yast2-product-creator-2.19.10/src/Kiwi.ycp --- old/yast2-product-creator-2.19.8/src/Kiwi.ycp 2010-04-28 16:05:26.000000000 +0200 +++ new/yast2-product-creator-2.19.10/src/Kiwi.ycp 2010-04-29 18:02:19.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Data for kiwi configuration, input and output functions. * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: Kiwi.ycp 61261 2010-03-11 10:11:33Z jsuchome $ + * $Id: Kiwi.ycp 61899 2010-04-28 14:56:41Z jsuchome $ */ { module "Kiwi"; @@ -352,7 +352,7 @@ %2</image>", image_tag, image_contents); - config_dir = tmp_dir + "/" + KiwiConfig["name"]:""; + config_dir = tmp_dir + "/" + KiwiConfig["original_directory"]:KiwiConfig["name"]:""; SCR::Execute (.target.mkdir, config_dir); SCR::Write (.target.string, config_dir + "/config.xml", write_string); // config.xml may contain password, do not let other users read it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.8/src/complex.ycp new/yast2-product-creator-2.19.10/src/complex.ycp --- old/yast2-product-creator-2.19.8/src/complex.ycp 2009-12-22 15:49:36.000000000 +0100 +++ new/yast2-product-creator-2.19.10/src/complex.ycp 2010-04-29 18:02:19.000000000 +0200 @@ -682,6 +682,7 @@ } string task = get_current_task (config); + config["original_directory"] = d; config["kiwi_configuration_" + task] = images_dir + "/" + d; config["current_task"] = task; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.8/src/kiwi_dialogs.ycp new/yast2-product-creator-2.19.10/src/kiwi_dialogs.ycp --- old/yast2-product-creator-2.19.8/src/kiwi_dialogs.ycp 2010-02-26 16:34:11.000000000 +0100 +++ new/yast2-product-creator-2.19.10/src/kiwi_dialogs.ycp 2010-04-29 18:02:19.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs for kiwi configuration * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: kiwi_dialogs.ycp 61052 2010-02-26 15:33:41Z jsuchome $ + * $Id: kiwi_dialogs.ycp 61911 2010-04-29 11:26:01Z jsuchome $ */ { textdomain "product-creator"; @@ -40,6 +40,12 @@ string content_key = Kiwi::content_key; + map section_type_label = $[ + "image" : _("Packages for Image"), + "bootstrap" : _("Bootstrap"), + "xen" : _("Xen Specific Packages") + ]; + // read available the images under /usr/share/kiwi/image/ directory list<term> GetAvailableImages (string subdir) { @@ -1858,6 +1864,38 @@ ]; } +/** + * Check if selected packages are available (some of them may not after + * deleting some repository) + */ +define boolean CheckForAvailablePackages () { + + Popup::ShowFeedback (_("Checking packages availability..."), _("Please wait...")); + foreach (map pmap, KiwiConfig["packages"]:[], { + string type = pmap["type"]:""; + if (type != "delete") + { + list<string> n_a = []; + foreach (map p, pmap["package"]:[], { + if (p["name"]:"" != "" && !Package::Available (p["name"]:"")) + n_a = add (n_a, p["name"]:""); + }); + if (size (n_a) > 0) + { + string type_label = section_type_label[type]:type; + // popup headline + Popup::LongText (_("Missing packages"), + // popup text + `RichText (sformat (_("These packages from section '%1' are not available with selected repositories: +%2. +Check the list of packages and package repositories."), type_label, mergestring (sort (n_a), " "))), 70, 25); + } + } + }); + Popup::ClearFeedback (); + return true; +} + /** * Main dialog for Kiwi image configuration */ @@ -1865,6 +1903,8 @@ InitImageConfiguration (); +CheckForAvailablePackages (); + map<string, map> widget_descr = get_widget_description (); widget_descr["tab"] = CWMTab::CreateWidget($[ "tab_order" : [ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-printer for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '10

29 Apr '10

Hello community, here is the log from the commit of package yast2-printer for openSUSE:Factory checked in at Fri Apr 30 01:34:48 CEST 2010. -------- --- yast2-printer/yast2-printer.changes 2010-04-23 12:42:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2010-04-29 15:52:21.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Apr 29 15:48:27 CEST 2010 - jsmeix(a)suse.de + +- Do no longer show positive feedback in TestClientOnlyServer + because this would cause annoying popups for the user + because in most cases TestClientOnlyServer is called + implicitely without a button click. + Only show positive feedback in printingvianetwork.ycp + when TestClientOnlyServer is called by the user when + clicking the [Test Server] button. +- 2.19.9 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-printer-2.19.8.tar.bz2 New: ---- yast2-printer-2.19.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-printer.spec ++++++ --- /var/tmp/diff_new_pack.Rcep7k/_old 2010-04-30 01:34:40.000000000 +0200 +++ /var/tmp/diff_new_pack.Rcep7k/_new 2010-04-30 01:34:40.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-printer (Version 2.19.8) +# spec file for package yast2-printer (Version 2.19.9) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-printer -Version: 2.19.8 +Version: 2.19.9 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-printer-2.19.8.tar.bz2 +Source0: yast2-printer-2.19.9.tar.bz2 Prefix: /usr @@ -54,7 +54,7 @@ Developer documentation for yast2-printer. %prep -%setup -n yast2-printer-2.19.8 +%setup -n yast2-printer-2.19.9 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-printer-2.19.8.tar.bz2 -> yast2-printer-2.19.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.8/VERSION new/yast2-printer-2.19.9/VERSION --- old/yast2-printer-2.19.8/VERSION 2010-04-08 15:10:33.000000000 +0200 +++ new/yast2-printer-2.19.9/VERSION 2010-04-23 16:34:39.000000000 +0200 @@ -1 +1 @@ -2.19.8 +2.19.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.8/configure new/yast2-printer-2.19.9/configure --- old/yast2-printer-2.19.8/configure 2010-04-23 11:47:43.000000000 +0200 +++ new/yast2-printer-2.19.9/configure 2010-04-29 15:47:55.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-printer 2.19.8. +# Generated by GNU Autoconf 2.63 for yast2-printer 2.19.9. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-printer' PACKAGE_TARNAME='yast2-printer' -PACKAGE_VERSION='2.19.8' -PACKAGE_STRING='yast2-printer 2.19.8' +PACKAGE_VERSION='2.19.9' +PACKAGE_STRING='yast2-printer 2.19.9' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1336,7 +1336,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-printer 2.19.8 to adapt to many kinds of systems. +\`configure' configures yast2-printer 2.19.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1407,7 +1407,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-printer 2.19.8:";; + short | recursive ) echo "Configuration of yast2-printer 2.19.9:";; esac cat <<\_ACEOF @@ -1502,7 +1502,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-printer configure 2.19.8 +yast2-printer configure 2.19.9 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1516,7 +1516,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-printer $as_me 2.19.8, which was +It was created by yast2-printer $as_me 2.19.9, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2363,7 +2363,7 @@ # Define the identity of the package. PACKAGE='yast2-printer' - VERSION='2.19.8' + VERSION='2.19.9' cat >>confdefs.h <<_ACEOF @@ -2587,7 +2587,7 @@ -VERSION="2.19.8" +VERSION="2.19.9" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)novell.com>" @@ -5413,7 +5413,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-printer $as_me 2.19.8, which was +This file was extended by yast2-printer $as_me 2.19.9, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5467,7 +5467,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-printer config.status 2.19.8 +yast2-printer config.status 2.19.9 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.8/configure.in new/yast2-printer-2.19.9/configure.in --- old/yast2-printer-2.19.8/configure.in 2010-04-23 11:47:38.000000000 +0200 +++ new/yast2-printer-2.19.9/configure.in 2010-04-29 15:47:49.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-printer, 2.19.8, http://bugs.opensuse.org/, yast2-printer) +AC_INIT(yast2-printer, 2.19.9, http://bugs.opensuse.org/, yast2-printer) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.19.8" +VERSION="2.19.9" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)novell.com>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.8/src/Printer.ycp new/yast2-printer-2.19.9/src/Printer.ycp --- old/yast2-printer-2.19.8/src/Printer.ycp 2010-04-22 10:56:39.000000000 +0200 +++ new/yast2-printer-2.19.9/src/Printer.ycp 2010-04-23 16:34:29.000000000 +0200 @@ -2232,11 +2232,6 @@ // First do the most meaningful test and only if this works return true. // The subsequent tests are only there to provide more info for the user // what might be the reason why the server is not accessible via port 631. - string netcat_test_good_message = sformat( // Popup message - // where %1 will be replaced by the server name. - _("The server '%1' is accessible via port 631 (IPP/CUPS)."), - server_name - ); string netcat_test_fail_message = sformat( // Popup message // where %1 will be replaced by the server name. _("The server '%1' is not accessible via port 631 (IPP/CUPS)."), @@ -2271,16 +2266,20 @@ // Only the netcat test provides a really meaningful result // so that only this test returns immediately true if it was successful. if( ! Printerlib::ExecuteBashCommand( "type -P netcat" ) ) - { // netcat is required for a meaningful test. - // Show negative feedback: - Popup::ErrorDetails( // Popup::ErrorDetails message: - _("Cannot execute the program 'netcat'"), - // Popup::ErrorDetails details: - _("The RPM package 'netcat' is required for a meaningful test.") + "\n" - + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" - ); + { // netcat is required for a meaningful test + // but in most cases TestClientOnlyServer is called + // implicitely without a button click by the user + // so that even the netcat test is silently skipped + // and no negative feedback is shown when netcat is not executable: if( fail_if_executable_is_missing ) - { return false; + { // Show negative feedback: + Popup::ErrorDetails( // Popup::ErrorDetails message: + _("Cannot execute the program 'netcat'"), + // Popup::ErrorDetails details: + _("The RPM package 'netcat' is required for a meaningful test.") + "\n" + + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" + ); + return false; } } else @@ -2288,10 +2287,8 @@ // Make netcat verbose, otherwise there would be no output at all // but some output is needed for the Popup::ErrorDetails below: if( Printerlib::ExecuteBashCommand( "netcat -v -w 1 -z " + server_name + " 631" ) ) - { // Show positive feedback. - // Show it as TimedMessage so that is disappears automatically - // when TestClientOnlyServer() is called from ApplyNetworkPrintingSettings(): - Popup::TimedMessage( netcat_test_good_message, 3 ); + { // Don't show positive feedback because this would be annoying popups for the user + // because in most cases TestClientOnlyServer is called implicitely without a button click. return true; } // The netcat-test failed: @@ -2342,8 +2339,8 @@ return false; } // netcat was not executable but at least the ping-test was successful. - // There was already a Popup::ErrorDetails that netcat is required for a meaningful test - // so that the less meaningful ping-test is all what could be done in this case. + // Don't show positive feedback because this would be annoying popups for the user + // because in most cases TestClientOnlyServer is called implicitely without a button click. return true; } // The ping-test failed: @@ -2395,8 +2392,8 @@ return false; } // ping was not executable but at least the host-test was successful. - // There was already a Popup::ErrorDetails that netcat is required for a meaningful test - // so that the last host-test is all what could be done in this case. + // Don't show positive feedback because this would be annoying popups for the user + // because in most cases TestClientOnlyServer is called implicitely without a button click. return true; } // The host-test failed: @@ -2423,7 +2420,8 @@ return false; } // Neither netcat nor ping nor host were executable. - // There was already a Popup::ErrorDetails that netcat is required for a meaningful test + // Don't show any kind of feedback because this would be annoying popups for the user + // because in most cases TestClientOnlyServer is called implicitely without a button click // so that nothing else could be done in this case except a "hope-for-the-best" successful return: return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.8/src/printingvianetwork.ycp new/yast2-printer-2.19.9/src/printingvianetwork.ycp --- old/yast2-printer-2.19.8/src/printingvianetwork.ycp 2010-04-22 11:15:12.000000000 +0200 +++ new/yast2-printer-2.19.9/src/printingvianetwork.ycp 2010-04-23 16:34:26.000000000 +0200 @@ -924,8 +924,17 @@ } if( `test_client_conf_server == event["ID"]:nil ) { string current_client_conf_input_value = (string)UI::QueryWidget( `id(`client_conf_input), `Value ); - // Ignore what TestClientOnlyServer() returns, it shows sufficient popups to the user: - Printer::TestClientOnlyServer( deletechars( tolower( current_client_conf_input_value ), " " ), true ); + string server_name = deletechars( tolower( current_client_conf_input_value ), " " ); + // No need for error popups because TestClientOnlyServer shows sufficient error popups: + if( Printer::TestClientOnlyServer( server_name, true ) ) + { // Show positive feedback because TestClientOnlyServer doesn't do it: + Popup::Message( sformat( // Popup message + // where %1 will be replaced by the server name. + _("The server '%1' is accessible via port 631 (IPP/CUPS)."), + server_name + ) + ); + } } } return nil; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gcc41 for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '10

29 Apr '10

Hello community, here is the log from the commit of package gcc41 for openSUSE:Factory checked in at Fri Apr 30 01:34:25 CEST 2010. -------- --- gcc41/gcc41.changes 2009-11-20 13:45:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/gcc41/gcc41.changes 2010-04-29 13:15:13.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Apr 29 11:14:40 UTC 2010 - rguenther(a)novell.com + +- Drop cross-avr-gcc. + +------------------------------------------------------------------- +Wed Apr 14 16:27:11 CEST 2010 - rguenther(a)novell.com + +- Fix cross-avr-patch-dwarf.patch. + +------------------------------------------------------------------- libgcj41.changes: same change calling whatdependson for head-i586 Old: ---- cross-avr-gcc.changes cross-avr-gcc.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcc41.spec ++++++ ++++ 939 lines (skipped) ++++ between gcc41/gcc41.spec ++++ and /mounts/work_src_done/STABLE/gcc41/gcc41.spec ++++++ libgcj41.spec ++++++ --- /var/tmp/diff_new_pack.wbuh3y/_old 2010-04-30 01:32:38.000000000 +0200 +++ /var/tmp/diff_new_pack.wbuh3y/_new 2010-04-30 01:32:38.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libgcj41 (Version 4.1.2_20070115) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,12 +28,15 @@ # # Please submit bugfixes or comments via http://www.suse.de/feedback/ # + # PREFIX_FOR_OPT is the definition for _prefix # LIBDIR_FOR_OPT is the definition for _libdir + # Run the testsuite if there's a file named RUN_TESTS in the source %if 0%{!?run_tests:1} %define run_tests %(test -f %_sourcedir/RUN_TESTS && echo 1 || echo 0) %endif + # Ada currently fails to build on a few platforms, enable it only # on those that work # Note that AdaCore only supports %ix86, x86_64 and ia64 @@ -43,6 +46,7 @@ # alpha ppc64 s390x %define build_ada 0 %endif + # We don't want to build java on arm %ifarch mips %arm %define build_java 0 @@ -51,8 +55,10 @@ %define build_java 1 %define build_libjava 0%{?building_libjava:1} %endif + %define build_fortran 1 %define build_objcp 0%{!?building_libjava:1} + %if 0%{?build_for_base:1} %define build_ada 0 %define build_java 0 @@ -85,14 +91,17 @@ %if %{run_tests} BuildRequires: dejagnu expect %endif + # Define this as 1 to get gcc packages for business products %define gcc_for_opt 0 + # Disable the use of icecream for this package. It would generate # too much parallelism when building state2 and stage3 and the runtime libs # Just touch RUN_TESTS in the source dir to run the testsuite. %if %{gcc_for_opt} %define run_tests 0 %endif + # Define version number of libgcc_s %ifarch hppa %define libgcc_s 4 @@ -106,6 +115,7 @@ %else %define build_nof 0 %endif + %define separate_bi32 0 %define separate_bi64 0 %ifarch ppc @@ -116,6 +126,7 @@ %ifarch x86_64 s390x %define separate_bi32 1 %endif + # Define two macros to trigger -32bit or -64bit package variants %define separate_biarch 0 %if %{separate_bi32} @@ -126,19 +137,23 @@ %define separate_biarch 1 %define separate_biarch_suffix -64bit %endif + %ifarch x86_64 ia64 s390x alpha ppc64 # 64-bit is primary build target %define build_primary_64bit 1 %else %define build_primary_64bit 0 %endif + %define biarch_libjava 0 + # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc + Url: http://gcc.gnu.org/ License: GPL Version: 4.1.2_20070115 -Release: 13 +Release: 14 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.1 @@ -148,6 +163,7 @@ %define versionspecificlibs 0 %endif # COMMON-END + %if 0%{?!building_libjava:1} Requires: binutils glibc-devel Requires: cpp41 = %{version}-%{release} @@ -155,6 +171,7 @@ Obsoletes: gcc41-mudflap Requires: libmudflap >= %{version}-%{release} %endif + # COMMON-BEGIN Group: System/Libraries AutoReqProv: on @@ -256,6 +273,7 @@ Patch300: gcc-4.1.0-power6.diff Patch301: nov341254-pic.diff Patch302: nov341254-altivec.diff + %if "%{gcc_target_arch}" == "avr" # Joerg Wunsch places his cross-avr-gcc-patches there: # http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/avr-gcc/files @@ -267,6 +285,7 @@ Patch1004: cross-avr-patch-newdevices.patch Patch1005: cross-avr-patch-zz-atmega256x.patch %endif + Summary: Java Runtime Library for gcc Group: System/Libraries %if "41" != "" @@ -320,6 +339,8 @@ This package contains the java bytecode interpreter gij and related tools. +# PACKAGE-BEGIN +# PACKAGE-BEGIN %package -n libffi41 License: GPL Summary: Foreign Function Interface library @@ -347,9 +368,6 @@ Provides: g-wrap:/usr/lib/libffi.so.4 %description -n libffi41-32bit -This is a re-packaged binary rpm. For the package source, please look -for the source of the package without the "32bit" ending - A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language. %post -n libffi41-32bit @@ -369,9 +387,6 @@ Provides: g-wrap:/usr/lib/libffi.so.4 %description -n libffi41-64bit -This is a re-packaged binary rpm. For the package source, please look -for the source of the package without the "64bit" ending - A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language. %post -n libffi41-64bit @@ -380,6 +395,7 @@ %postun -n libffi41-64bit /sbin/ldconfig # PACKAGE-END + # PACKAGE-BEGIN # PACKAGE-BEGIN @@ -392,6 +408,9 @@ %description -n libffi41-devel A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language. +# PACKAGE-END +# PACKAGE-BEGIN +# PACKAGE-BEGIN %package -n libffi41-devel-32bit License: GPL Summary: Foreign Function Interface library development files @@ -400,10 +419,10 @@ Requires: libffi41-32bit >= %{version}-%{release} %description -n libffi41-devel-32bit -This is a re-packaged binary rpm. For the package source, please look -for the source of the package without the "32bit" ending - A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language. +# PACKAGE-END +# PACKAGE-BEGIN +# PACKAGE-BEGIN %package -n libffi41-devel-64bit License: GPL Summary: Foreign Function Interface library development files @@ -412,10 +431,8 @@ Requires: libffi41-64bit >= %{version}-%{release} %description -n libffi41-devel-64bit -This is a re-packaged binary rpm. For the package source, please look -for the source of the package without the "64bit" ending - A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language. +# PACKAGE-END %package -n gcc41-testresults License: GPL @@ -426,7 +443,12 @@ Results from running the gcc and target library testsuites. +# COMMON-BEGIN +# Define the canonical target and host architecture +# %gcc_target_arch is supposed to be the full target triple +# %TARGET_ARCH is the canonicalized CPU part +# %CONFIGURE_TARGET is the target triple used for --target= %if 0%{?gcc_target_arch:1} %define CONFIGURE_TARGET %{gcc_target_arch} %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/") @@ -437,15 +459,20 @@ %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/") %endif %define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/") + %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac) + %ifarch ppc %define GCCDIST powerpc64-suse-linux %else %define GCCDIST %{HOST_ARCH}-suse-linux %endif + %define libsubdir %{_libdir}/gcc/%{GCCDIST}/%{gcc_version} %define gxxinclude %{_prefix}/include/c++/%{gcc_version} + # COMMON-END + # Versionspecific directories %define versmainlibdir %{libsubdir} %define versmainlibdirbi32 %{libsubdir}/32 @@ -458,6 +485,7 @@ %ifarch ppc64 %define versnoflibdir %{libsubdir}/32/nof %endif + # If we use versionspecific libs, they end in libsubdir %if %{versionspecificlibs} %define mainlibdir %{libsubdir} @@ -477,6 +505,7 @@ %define mainlibdirbi64 %{_prefix}/lib64 %define noflibdir %{_prefix}/lib/nof %endif + # Now define a few macros that make it easy to package libs and # related files just to the right package, without caring for the # exact path the files are in. @@ -535,6 +564,7 @@ %endif %endif %endif + %if %{build_nof} %define versmainlib() %{versmainlibdir}/%1\ %{versnoflibdir}/%1\ @@ -587,6 +617,7 @@ %endif %endif %endif + # COMMON-BEGIN %prep @@ -684,6 +715,7 @@ %patch300 %patch301 -p1 %patch302 -p1 + %if "%{gcc_target_arch}" == "avr" %patch1000 %patch1001 @@ -696,8 +728,10 @@ %build # Avoid conflict with commercial libjawt.so sed -i -e 's/libjawt/libgcjawt/g' libjava/Makefile.{am,in} + # Avoid rebuilding of generated files contrib/gcc_update --touch + rm -rf obj-%{GCCDIST} mkdir obj-%{GCCDIST} cd obj-%{GCCDIST} @@ -719,6 +753,7 @@ %endif # Replace 2 spaces by one finally RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/ / /g'` + languages=c,c++,objc %if %{build_fortran} languages=$languages,fortran @@ -736,6 +771,7 @@ %if 0%{?gcc_target_arch:1} languages=c,c++ %endif + J=%{?jobs:%jobs} if test -z "$J"; then J=$(getconf _NPROCESSORS_CONF) @@ -751,26 +787,32 @@ JL=1 fi PARALLEL="-j$J -l$JL" + # we don't want some miscompiles in the testsuite, or some fault in # the compiler to kill the machine. Hence we limit the amount of memory # by the physical RAM plus half of swap #MEM=$(free -m | awk '/^Mem:/ {print $2}') #SWAP=$(free -m | awk '/^Swap:/ {print $2}') #ulimit -v $(((MEM + SWAP/2)*1024)) + # In general we want to ship release checking enabled compilers # and run BETA with checking enabled. #ENABLE_CHECKING=--enable-checking ENABLE_CHECKING="--enable-checking=release" + %if "%{name}" != "gcc41" export PATH=/opt/cross/bin:$PATH %endif + # Work around tail/head -1 changes export _POSIX2_VERSION=199209 + # configure tries to parse include/features.h to detect # if glibc supports SSP. When cross compiling we would need # to install a cross glibc, which we don't, or make the whole # thing point to the native glibc, which is in /, hence the # --with-sysroot=/ + %if %{build_ada} # Using the host gnatmake like # CC="gcc%{hostsuffix}" GNATBIND="gnatbind%{hostsuffix}" @@ -850,7 +892,9 @@ --with-long-double-128 \ %endif --host=%{GCCDIST} + # COMMON-END + # Only run profiled bootstrap on archs where it works #%ifarch %ix86 x86_64 ppc ppc64 ia64 #make profiledbootstrap BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL @@ -875,6 +919,7 @@ manpath=%{_mandir}:%{_infodir} export manpath %endif + cd obj-%{GCCDIST} # Work around tail/head -1 changes export _POSIX2_VERSION=199209 @@ -887,6 +932,7 @@ make install DESTDIR=$RPM_BUILD_ROOT %endif mkdir -p $RPM_BUILD_ROOT%{_libdir} + # Remove some useless .la files for lib in libobjc libgfortran libgfortranbegin libmudflap libmudflapth \ libstdc++ libsupc++; do @@ -907,6 +953,7 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/libffi.la %endif %endif + %if %{biarch} %if %{build_primary_64bit} mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib @@ -914,6 +961,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib64 %endif %endif + # Move shared libs around %if %{versionspecificlibs} %else @@ -933,7 +981,9 @@ %endif done %endif + rm -f $RPM_BUILD_ROOT%{_prefix}/bin/c++%{binsuffix} + %if %{biarch} %if %{build_primary_64bit} # move around some libs that end in wrong paths @@ -962,6 +1012,7 @@ popd %endif %endif + # Remove some crap from the .la files: for l in `find $RPM_BUILD_ROOT -name '*.la'`; do echo "changing $l" @@ -986,6 +1037,7 @@ perl -pi -e "s|^(.*elf_i386.*)|\1 %{m32:-rpath=/opt/gcc33/lib} %{\!m32:-rpath=/opt/gcc33/lib64}|;" $RPM_BUILD_ROOT%{_prefix}/lib64/gcc/x86_64-suse-linux/3.3/specs %endif %endif + %if %{run_tests} cp `find . -name "*.sum"` ../testresults/ cp `find . -name "*.log" \! -name "config.log" |grep -v 'acats/tests' ` ../testresults/ @@ -1026,8 +1078,10 @@ find $RPM_BUILD_ROOT -name libgcj.a -o -name lib-gnu-java-awt-peer-gtk.a \ -o -name libgjsmalsa.a \ -o -name libgij.a -o -name libgcjawt.a | xargs rm -f + find $RPM_BUILD_ROOT -name libgcj.spec | xargs \ sed -i -e 's/lib: /&%%{static:%%eJava programs cannot be linked statically}/' + mv $RPM_BUILD_ROOT%{libsubdir}/include/libffi/ffitarget.h $RPM_BUILD_ROOT%{_prefix}/include/ rm -r $RPM_BUILD_ROOT%{libsubdir}/include/libffi %endif @@ -1059,11 +1113,13 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/libiberty.a %endif %endif + # Move mudflap header %if 0%{!?building_libjava:1} mv $RPM_BUILD_ROOT/usr/include/mf-runtime.h $RPM_BUILD_ROOT%{libsubdir}/include/ rm $RPM_BUILD_ROOT%{_mandir}/man1/jv-convert%{binsuffix}.1 %endif + # For building libjava only we need to delete other manpages %if 0%{?building_libjava:1} rm $RPM_BUILD_ROOT%{_prefix}/bin/addr2name.awk%{binsuffix} @@ -1073,6 +1129,7 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/jcf-dump%{binsuffix}.1 rm $RPM_BUILD_ROOT%{_mandir}/man1/jv-scan%{binsuffix}.1 %endif + # Delete some files... %if %{versionspecificlibs} %if %{build_libjava} @@ -1083,6 +1140,7 @@ rm $RPM_BUILD_ROOT%{_infodir}/*.info* rm $RPM_BUILD_ROOT%{_prefix}/share/locale/*/LC_MESSAGES/*.mo %endif + %if %{build_java} %if %{build_libjava} @@ -1183,6 +1241,7 @@ %defattr(-,root,root) %mainlib libffi.so.* + %if %{separate_biarch} %files -n libffi41%{separate_biarch_suffix} @@ -1199,6 +1258,7 @@ %mainlib libffi.a + %if %{separate_biarch} %files -n libffi41-devel%{separate_biarch_suffix} @@ -1210,6 +1270,7 @@ %endif %endif %endif + %if %{run_tests} %files -n gcc41-testresults ++++++ change_spec ++++++ --- /var/tmp/diff_new_pack.wbuh3y/_old 2010-04-30 01:32:38.000000000 +0200 +++ /var/tmp/diff_new_pack.wbuh3y/_new 2010-04-30 01:32:38.000000000 +0200 @@ -106,7 +106,7 @@ fi ## non-icecream cross compilers. export outfile - for arch in avr; do + for arch in ; do cross_arch=$arch sh micro-cross.spec.in > cross-$arch-gcc.spec test -f gcc*.changes && ln -f gcc*.changes cross-$arch-gcc.changes done ++++++ cross-avr-patch-dwarf.patch ++++++ --- /var/tmp/diff_new_pack.wbuh3y/_old 2010-04-30 01:32:38.000000000 +0200 +++ /var/tmp/diff_new_pack.wbuh3y/_new 2010-04-30 01:32:38.000000000 +0200 @@ -1,10 +1,10 @@ --- gcc/config/avr/avr.h.orig 2006-04-13 15:31:19.000000000 +0200 +++ gcc/config/avr/avr.h 2006-04-13 16:23:16.000000000 +0200 -@@ -892,3 +892,7 @@ - #define ZERO_REGNO 1 +@@ -872,3 +872,7 @@ + #define DWARF2_DEBUGGING_INFO 1 -+#define DWARF2_DEBUGGING_INFO 1 - #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG + #define OBJECT_FORMAT_ELF + +/* Offset from the frame pointer register value to the top of the stack. */ +#define FRAME_POINTER_CFA_OFFSET(FNDECL) 0 ++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit autoyast2 for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '10

29 Apr '10

Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at Fri Apr 30 01:25:33 CEST 2010. -------- --- autoyast2/autoyast2.changes 2010-04-27 11:25:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2010-04-29 11:20:48.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Apr 28 14:02:30 CEST 2010 - ug(a)suse.de + +- old callback behavior (popups) for add-ons if no + signature-handling is configured. +- 2.19.7 + +------------------------------------------------------------------- +Wed Apr 28 11:14:29 CEST 2010 - ug(a)suse.de + +- path to image script fixed + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- autoyast2-2.19.6.tar.bz2 New: ---- autoyast2-2.19.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.Kta1vJ/_old 2010-04-30 01:18:41.000000000 +0200 +++ /var/tmp/diff_new_pack.Kta1vJ/_new 2010-04-30 01:18:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package autoyast2 (Version 2.19.6) +# spec file for package autoyast2 (Version 2.19.7) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: autoyast2 -Version: 2.19.6 +Version: 2.19.7 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.19.6.tar.bz2 +Source0: autoyast2-2.19.7.tar.bz2 Prefix: /usr @@ -65,7 +65,7 @@ %package installation License: GPLv2+ -Version: 2.19.6 +Version: 2.19.7 Release: 1 Summary: YaST2 - Auto Installation Modules Group: System/YaST @@ -82,7 +82,7 @@ generated with the autoyast2 package. %prep -%setup -n autoyast2-2.19.6 +%setup -n autoyast2-2.19.7 %build %{prefix}/bin/y2tool y2autoconf ++++++ autoyast2-2.19.6.tar.bz2 -> autoyast2-2.19.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.6/VERSION new/autoyast2-2.19.7/VERSION --- old/autoyast2-2.19.6/VERSION 2010-04-27 11:19:46.000000000 +0200 +++ new/autoyast2-2.19.7/VERSION 2010-04-29 11:17:27.000000000 +0200 @@ -1 +1 @@ -2.19.6 +2.19.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.6/configure new/autoyast2-2.19.7/configure --- old/autoyast2-2.19.6/configure 2010-04-27 11:21:18.000000000 +0200 +++ new/autoyast2-2.19.7/configure 2010-04-29 11:17:33.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for autoyast2 2.19.6. +# Generated by GNU Autoconf 2.63 for autoyast2 2.19.7. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='autoyast2' PACKAGE_TARNAME='autoyast2' -PACKAGE_VERSION='2.19.6' -PACKAGE_STRING='autoyast2 2.19.6' +PACKAGE_VERSION='2.19.7' +PACKAGE_STRING='autoyast2 2.19.7' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1282,7 +1282,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 autoyast2 2.19.6 to adapt to many kinds of systems. +\`configure' configures autoyast2 2.19.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1353,7 +1353,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of autoyast2 2.19.6:";; + short | recursive ) echo "Configuration of autoyast2 2.19.7:";; esac cat <<\_ACEOF @@ -1433,7 +1433,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -autoyast2 configure 2.19.6 +autoyast2 configure 2.19.7 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1447,7 +1447,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by autoyast2 $as_me 2.19.6, which was +It was created by autoyast2 $as_me 2.19.7, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2427,7 +2427,7 @@ # Define the identity of the package. PACKAGE='autoyast2' - VERSION='2.19.6' + VERSION='2.19.7' cat >>confdefs.h <<_ACEOF @@ -2549,7 +2549,7 @@ -VERSION="2.19.6" +VERSION="2.19.7" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug(a)suse.de>" @@ -3609,7 +3609,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by autoyast2 $as_me 2.19.6, which was +This file was extended by autoyast2 $as_me 2.19.7, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3659,7 +3659,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -autoyast2 config.status 2.19.6 +autoyast2 config.status 2.19.7 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.6/configure.in new/autoyast2-2.19.7/configure.in --- old/autoyast2-2.19.6/configure.in 2010-04-27 11:21:15.000000000 +0200 +++ new/autoyast2-2.19.7/configure.in 2010-04-29 11:17:30.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(autoyast2, 2.19.6, http://bugs.opensuse.org/, autoyast2) +AC_INIT(autoyast2, 2.19.7, http://bugs.opensuse.org/, autoyast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.19.6" +VERSION="2.19.7" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug(a)suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.6/src/modules/AutoInstall.ycp new/autoyast2-2.19.7/src/modules/AutoInstall.ycp --- old/autoyast2-2.19.6/src/modules/AutoInstall.ycp 2009-06-30 12:11:06.000000000 +0200 +++ new/autoyast2-2.19.7/src/modules/AutoInstall.ycp 2010-04-28 14:05:16.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Auto-installation related functions module * Author: Anas Nashif <nashif(a)suse.de> * - * $Id: AutoInstall.ycp 57800 2009-06-30 10:11:05Z ug $ + * $Id: AutoInstall.ycp 61896 2010-04-28 12:05:15Z ug $ */ { module "AutoInstall"; @@ -79,6 +79,15 @@ global define boolean callbackFalse_boolean_string_string_integer(string dummy1, string dummy2, integer dummy3) { return false; } + + global define boolean callbackTrue_boolean_string_string_string(string dummy1, string dummy2, string dummy3) { + return true; + } + + global define boolean callbackFalse_boolean_string_string_string(string dummy1, string dummy2, string dummy3) { + return false; + } + /** * Read saved data in continue mode * @return boolean true on success diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.6/src/modules/AutoinstGeneral.ycp new/autoyast2-2.19.7/src/modules/AutoinstGeneral.ycp --- old/autoyast2-2.19.6/src/modules/AutoinstGeneral.ycp 2010-04-27 11:21:11.000000000 +0200 +++ new/autoyast2-2.19.7/src/modules/AutoinstGeneral.ycp 2010-04-28 14:05:16.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Configuration of general settings for autoyast * Authors: Anas Nashif (nashif(a)suse.de) * - * $Id: AutoinstGeneral.ycp 61884 2010-04-27 09:21:10Z ug $ + * $Id: AutoinstGeneral.ycp 61896 2010-04-28 12:05:15Z ug $ */ { @@ -25,6 +25,7 @@ import "Pkg"; import "ProductFeatures"; import "Storage"; + import "SignatureCheckCallbacks"; // All shared data are in yast2.rpm to break cyclic dependencies import "AutoinstData"; @@ -177,6 +178,20 @@ * @return void */ global define void SetSignatureHandling() { + + // this will break compatibility a bit. A XML file without signature handling can + // block the installation now because we have the popups back + Pkg::CallbackAcceptUnsignedFile (SignatureCheckCallbacks::AcceptUnsignedFile); + Pkg::CallbackAcceptFileWithoutChecksum (SignatureCheckCallbacks::AcceptFileWithoutChecksum); + Pkg::CallbackAcceptVerificationFailed (SignatureCheckCallbacks::AcceptVerificationFailed); + Pkg::CallbackTrustedKeyAdded (SignatureCheckCallbacks::TrustedKeyAdded); + Pkg::CallbackAcceptUnknownGpgKey (SignatureCheckCallbacks::AcceptUnknownGpgKey); + Pkg::CallbackImportGpgKey (SignatureCheckCallbacks::ImportGpgKey); + Pkg::CallbackAcceptNonTrustedGpgKey (SignatureCheckCallbacks::TrustGpgKey); + Pkg::CallbackAcceptWrongDigest (SignatureCheckCallbacks::AcceptWrongDigest); + Pkg::CallbackAcceptUnknownDigest (SignatureCheckCallbacks::AcceptUnknownDigest); + Pkg::CallbackTrustedKeyRemoved (SignatureCheckCallbacks::TrustedKeyRemoved); + if( haskey(signature_handling, "accept_unsigned_file" ) ) Pkg::CallbackAcceptUnsignedFile( signature_handling["accept_unsigned_file"]:false ? AutoInstall::callbackTrue_boolean_string_integer : AutoInstall::callbackFalse_boolean_string_integer @@ -209,6 +224,14 @@ Pkg::CallbackAcceptNonTrustedGpgKey( signature_handling["accept_non_trusted_gpg_key"]:false ? AutoInstall::callbackTrue_boolean_map : AutoInstall::callbackFalse_boolean_map ); + if( haskey(signature_handling, "accept_wrong_digest") ) + Pkg::CallbackAcceptWrongDigest( + signature_handling["accept_wrong_digest":false ? AutoInstall::callbackTrue_boolean_string_string_string : AutoInstall::callbackFalse_boolean_string_string_string + ); + if( haskey(signature_handling, "accept_unknown_digest") ) + Pkg::CallbackAcceptWrongDigest( + signature_handling["accept_unknown_digest":false ? AutoInstall::callbackTrue_boolean_string_string : AutoInstall::callbackFalse_boolean_string_string + ); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.6/src/modules/AutoinstSoftware.ycp new/autoyast2-2.19.7/src/modules/AutoinstSoftware.ycp --- old/autoyast2-2.19.6/src/modules/AutoinstSoftware.ycp 2010-02-19 11:09:48.000000000 +0100 +++ new/autoyast2-2.19.7/src/modules/AutoinstSoftware.ycp 2010-04-28 11:36:36.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Software * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: AutoinstSoftware.ycp 60864 2010-02-19 10:09:47Z ug $ + * $Id: AutoinstSoftware.ycp 61894 2010-04-28 09:36:35Z ug $ * */ { @@ -310,11 +310,12 @@ // don't copy subdirs. They have to be mentioned explicit. Copy only files from that dir. y2milestone("will get %1 from %2 to %3", file, instsource+"/"+source, target ); if( size(file) > 0 && substring( file, size(file)-1 ) != "/" ) - if( !GetURL( instsource+"/"+source+file, target+"/"+source+"/"+file ) ) { - Popup::Error( sformat(_("can not read '%1'. ISO creation failed"), instsource+"/"+source+file ) ); - ret = false; - break; + while( ret && !GetURL( instsource+"/"+source+file, target+"/"+source+"/"+file ) ) { + if( !Popup::YesNo( sformat(_("can not read '%1'. Try again?"), instsource+"/"+source+file ) ) ) + ret = false; } + if( !ret ) + break; }); } else { // copy a file @@ -327,7 +328,7 @@ }); // lets always copy an optional(!) driverupdate file. It's very unlikely that it's in directory.yast GetURL( instsource+"/driverupdate", target+"/driverupdate" ); - SCR::Execute (.target.bash, sformat("cp /var/adm/autoinstall/scripts/fetch_image.sh %1/",target) ); + SCR::Execute (.target.bash, sformat("cp /usr/lib/YaST2/bin/fetch_image.sh %1/",target) ); return ret; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sysvinit for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '10

29 Apr '10

Hello community, here is the log from the commit of package sysvinit for openSUSE:Factory checked in at Fri Apr 30 01:18:25 CEST 2010. -------- --- sysvinit/sysvinit.changes 2010-04-27 14:38:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/sysvinit/sysvinit.changes 2010-04-29 13:01:12.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 29 13:00:25 CEST 2010 - werner(a)suse.de + +- Add URL of upstream location + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysvinit.spec ++++++ --- /var/tmp/diff_new_pack.JvWkCQ/_old 2010-04-30 01:18:15.000000000 +0200 +++ /var/tmp/diff_new_pack.JvWkCQ/_new 2010-04-30 01:18:15.000000000 +0200 @@ -29,10 +29,11 @@ Group: System/Base AutoReqProv: on Version: 2.88 -Release: 2 +Release: 3 Summary: SysV-Style init BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: audit-devel libselinux-devel libsepol-devel pam-devel +Url: http://savannah.nongnu.org/projects/sysvinit/ Source: http://download.savannah.gnu.org/releases/sysvinit/sysvinit-2.88dsf.tar.bz2 Source2: killproc-2.16.tar.bz2 Source3: powerd-2.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit imlib2 for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '10

29 Apr '10

Hello community, here is the log from the commit of package imlib2 for openSUSE:Factory checked in at Fri Apr 30 01:18:01 CEST 2010. -------- --- imlib2/imlib2.changes 2010-04-15 12:02:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/imlib2/imlib2.changes 2010-04-29 17:06:05.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 29 17:05:34 CEST 2010 - meissner(a)suse.de + +- fixed incorrect overflow checking (CVE-2010-0991, bnc#598935) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- imlib2-1.4.3-fixoverflow-checker.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ imlib2.spec ++++++ --- /var/tmp/diff_new_pack.XcQ0fP/_old 2010-04-30 01:10:47.000000000 +0200 +++ /var/tmp/diff_new_pack.XcQ0fP/_new 2010-04-30 01:10:47.000000000 +0200 @@ -21,10 +21,11 @@ BuildRequires: freetype2-devel giflib-devel libpng-devel libtiff-devel xorg-x11-devel Summary: Image handling and conversion library. Version: 1.4.3 -Release: 1 +Release: 2 License: BSD3c(or similar) Group: Development/Libraries/X11 Source: %name-%version.tar.bz2 +Patch0: %name-%version-fixoverflow-checker.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://sourceforge.net/projects/enlightenment/ Suggests: imlib2-loaders @@ -90,6 +91,7 @@ %prep %setup -q +%patch0 -p1 %build autoreconf --force --install ++++++ imlib2-1.4.3-fixoverflow-checker.patch ++++++ diff -ur imlib2-1.4.3/src/lib/image.h imlib2/src/lib/image.h --- imlib2-1.4.3/src/lib/image.h 2010-03-14 16:26:27.000000000 +0100 +++ imlib2/src/lib/image.h 2010-04-29 17:00:27.375691000 +0200 @@ -190,6 +190,6 @@ # define IMAGE_DIMENSIONS_OK(w, h) \ ( ((w) > 0) && ((h) > 0) && \ - ((unsigned long long)(w) * (unsigned long long)(w) <= (1ULL << 29) - 1) ) + ((unsigned long long)(w) * (unsigned long long)(h) <= (1ULL << 29) - 1) ) #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ncurses for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '10

29 Apr '10

Hello community, here is the log from the commit of package yast2-ncurses for openSUSE:Factory checked in at Fri Apr 30 01:10:15 CEST 2010. -------- --- yast2-ncurses/yast2-ncurses.changes 2010-04-14 11:24:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes 2010-04-29 15:02:22.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 27 15:12:45 CEST 2010 - gs(a)suse.de + +- NCTextPad: do not append \n after the very last line + (bnc #573553) +- V 2.19.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ncurses-2.19.3.tar.bz2 New: ---- yast2-ncurses-2.19.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.1PGD69/_old 2010-04-30 01:02:17.000000000 +0200 +++ /var/tmp/diff_new_pack.1PGD69/_new 2010-04-30 01:02:17.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.19.3) +# spec file for package yast2-ncurses (Version 2.19.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-ncurses -Version: 2.19.3 +Version: 2.19.4 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.19.3.tar.bz2 +Source0: yast2-ncurses-2.19.4.tar.bz2 Prefix: /usr @@ -56,7 +56,7 @@ component for YaST2. %prep -%setup -n yast2-ncurses-2.19.3 +%setup -n yast2-ncurses-2.19.4 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-ncurses-2.19.3.tar.bz2 -> yast2-ncurses-2.19.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.19.3/VERSION new/yast2-ncurses-2.19.4/VERSION --- old/yast2-ncurses-2.19.3/VERSION 2010-04-14 10:50:40.000000000 +0200 +++ new/yast2-ncurses-2.19.4/VERSION 2010-04-29 14:59:21.000000000 +0200 @@ -1 +1 @@ -2.19.3 +2.19.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.19.3/configure new/yast2-ncurses-2.19.4/configure --- old/yast2-ncurses-2.19.3/configure 2010-04-14 10:54:38.000000000 +0200 +++ new/yast2-ncurses-2.19.4/configure 2010-04-29 15:00:28.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-ncurses 2.19.3. +# Generated by GNU Autoconf 2.63 for yast2-ncurses 2.19.4. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ncurses' PACKAGE_TARNAME='yast2-ncurses' -PACKAGE_VERSION='2.19.3' -PACKAGE_STRING='yast2-ncurses 2.19.3' +PACKAGE_VERSION='2.19.4' +PACKAGE_STRING='yast2-ncurses 2.19.4' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1529,7 +1529,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-ncurses 2.19.3 to adapt to many kinds of systems. +\`configure' configures yast2-ncurses 2.19.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1600,7 +1600,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ncurses 2.19.3:";; + short | recursive ) echo "Configuration of yast2-ncurses 2.19.4:";; esac cat <<\_ACEOF @@ -1712,7 +1712,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ncurses configure 2.19.3 +yast2-ncurses configure 2.19.4 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1726,7 +1726,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-ncurses $as_me 2.19.3, which was +It was created by yast2-ncurses $as_me 2.19.4, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2706,7 +2706,7 @@ # Define the identity of the package. PACKAGE='yast2-ncurses' - VERSION='2.19.3' + VERSION='2.19.4' cat >>confdefs.h <<_ACEOF @@ -2828,7 +2828,7 @@ -VERSION="2.19.3" +VERSION="2.19.4" RPMNAME="yast2-ncurses" MAINTAINER="Gabriele Mohr <gs(a)suse.de>" @@ -17396,7 +17396,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ncurses $as_me 2.19.3, which was +This file was extended by yast2-ncurses $as_me 2.19.4, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17459,7 +17459,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-ncurses config.status 2.19.3 +yast2-ncurses config.status 2.19.4 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.19.3/configure.in new/yast2-ncurses-2.19.4/configure.in --- old/yast2-ncurses-2.19.3/configure.in 2010-04-14 10:54:29.000000000 +0200 +++ new/yast2-ncurses-2.19.4/configure.in 2010-04-29 15:00:13.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses, 2.19.3, http://bugs.opensuse.org/, yast2-ncurses) +AC_INIT(yast2-ncurses, 2.19.4, http://bugs.opensuse.org/, yast2-ncurses) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.19.3" +VERSION="2.19.4" RPMNAME="yast2-ncurses" MAINTAINER="Gabriele Mohr <gs(a)suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.19.3/src/NCDialog.cc new/yast2-ncurses-2.19.4/src/NCDialog.cc --- old/yast2-ncurses-2.19.3/src/NCDialog.cc 2009-10-06 10:01:12.000000000 +0200 +++ new/yast2-ncurses-2.19.4/src/NCDialog.cc 2010-04-29 14:59:42.000000000 +0200 @@ -99,6 +99,7 @@ dlgstyle = &NCurses::style()[mystyleset]; + eventReason = YEvent::UnknownReason; helpPopup = 0; yuiDebug() << "+++ " << this << endl; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.19.3/src/NCTextPad.cc new/yast2-ncurses-2.19.4/src/NCTextPad.cc --- old/yast2-ncurses-2.19.3/src/NCTextPad.cc 2009-10-06 10:01:12.000000000 +0200 +++ new/yast2-ncurses-2.19.4/src/NCTextPad.cc 2010-04-27 15:06:29.000000000 +0200 @@ -534,9 +534,12 @@ ret += wch[0]; } - ret += L"\n"; - ++l; + // do not append \n after the very last line (bnc #573553) + if ( l < lines.size() ) + { + ret += L"\n"; + } } return ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.19.3/src/NCtoY2Event.cc new/yast2-ncurses-2.19.4/src/NCtoY2Event.cc --- old/yast2-ncurses-2.19.3/src/NCtoY2Event.cc 2009-10-06 10:01:12.000000000 +0200 +++ new/yast2-ncurses-2.19.4/src/NCtoY2Event.cc 2010-04-29 09:32:35.000000000 +0200 @@ -52,7 +52,7 @@ case button: - if ( widget->isValid() ) + if ( widget && widget->isValid() ) return new YWidgetEvent( dynamic_cast<YWidget *>( widget ), reason ); else return 0; @@ -70,7 +70,7 @@ return new YTimeoutEvent(); case key: - if ( widget->isValid() ) + if ( widget && widget->isValid() ) return new YKeyEvent( keySymbol, dynamic_cast<YWidget *>( widget ) ); else return 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dhcp for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '10

29 Apr '10

Hello community, here is the log from the commit of package dhcp for openSUSE:Factory checked in at Fri Apr 30 01:01:15 CEST 2010. -------- --- dhcp/dhcp.changes 2010-03-12 16:57:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/dhcp/dhcp.changes 2010-04-29 13:18:44.000000000 +0200 @@ -1,0 +2,21 @@ +Thu Apr 29 11:18:20 UTC 2010 - mt(a)suse.de + +- Updated to ISC DHCP 3.1-ESV, an extended support version release + which includes a small number of bug fixes (bnc#592178) over the + 3.1.3 version: + * Modified the handling of a connection to avoid releasing the + omapi io object for the connection while it is still in use. + One symptom from this error was a segfault when a failover + secondary attempted to connect to the failover primary if + their clocks were not synchronized. + * Fix test in dhcp_interface_signal_handler to check that the + inner handler has a signal_handler before calling it. + * When using 'ignore client-updates;', the FQDN returned to the + client is no longer truncated to one octet. + * Clean up some compiler warnings - ticket 19054. +- Fixed vlan interface check in dhcpd-restart-hook if-up.d script + (bnc#599702) +- Touch dhclient.leases in post-install script instead to provide + an empty file, versioned provides/obsoletes (rpmlint warnings). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- dhcp-3.1.3.tar.bz2 New: ---- dhcp-3.1-ESV.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcp.spec ++++++ --- /var/tmp/diff_new_pack.8YMPmU/_old 2010-04-30 01:00:34.000000000 +0200 +++ /var/tmp/diff_new_pack.8YMPmU/_new 2010-04-30 01:00:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package dhcp (Version 3.1.3) +# spec file for package dhcp (Version 3.1.3.ESV) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,6 +19,7 @@ Name: dhcp +%define isc_version 3.1-ESV %define susefw2dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services %define omc_prefix /usr/share/omc %define omc_svcdir %{omc_prefix}/svcinfo.d @@ -30,13 +31,13 @@ License: BSD3c(or similar) Group: Productivity/Networking/Boot/Servers AutoReqProv: on -Version: 3.1.3 -Release: 3 +Version: 3.1.3.ESV +Release: 1 Summary: Common Files Used by ISC DHCP Software Url: http://www.isc.org/isc/dhcp.html -Source0: dhcp-%{version}.tar.bz2 -#Source0: http://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz -#Source1: http://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz.asc +Source0: dhcp-%{isc_version}.tar.bz2 +#Source0: http://ftp.isc.org/isc/dhcp/dhcp-%{isc_version}.tar.gz +#Source1: http://ftp.isc.org/isc/dhcp/dhcp-%{isc_version}.tar.gz.asc Source2: rc.dhcpd Source3: rc.dhcrelay Source11: sysconfig.dhcpd @@ -103,8 +104,9 @@ Group: Productivity/Networking/Boot/Clients Requires: net-tools dhcp /usr/bin/host PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp -Provides: dhcp_client dhclient -Obsoletes: dhclient +Provides: dhcp_client +Provides: dhclient = %{version} +Obsoletes: dhclient < %{version} AutoReqProv: on %package relay @@ -113,8 +115,9 @@ Group: Productivity/Networking/Boot/Servers Requires: net-tools dhcp PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp -Provides: dhcp_relay dhcrelay -Obsoletes: dhcrelay +Provides: dhcp_relay +Provides: dhcrelay = %{version} +Obsoletes: dhcrelay < %{version} AutoReqProv: on %package devel @@ -189,7 +192,7 @@ Ted Lemon <mellon(a)fugue.com> %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{isc_version} ## %patch0 -p0 %patch1 -p0 @@ -293,7 +296,6 @@ install -m 644 sysconfig.syslog-dhcpd $RPM_BUILD_ROOT/var/adm/fillup-templates/ install -m 644 sysconfig.dhcrelay $RPM_BUILD_ROOT/var/adm/fillup-templates/ rm -f $RPM_BUILD_ROOT/var/lib/dhcp/dhcpd.leases -touch $RPM_BUILD_ROOT/var/lib/dhcp/dhclient.leases install -m 644 client/dhclient.conf $RPM_BUILD_ROOT/etc/dhclient.conf sed '/^max-lease-time/ a \ \ @@ -409,6 +411,9 @@ %preun relay %stop_on_removal dhcrelay +%post client +touch var/lib/dhcp/dhclient.leases + %clean if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi @@ -467,7 +472,6 @@ /sbin/dhclient /sbin/dhclient-script %config(noreplace) /etc/dhclient.conf -%config(noreplace) /var/lib/dhcp/dhclient.leases %doc %{_mandir}/man5/dhclient.conf.5.gz %doc %{_mandir}/man5/dhclient.leases.5.gz %doc %{_mandir}/man8/dhclient.8.gz ++++++ if-up.d.dhcpd-restart-hook ++++++ --- /var/tmp/diff_new_pack.8YMPmU/_old 2010-04-30 01:00:35.000000000 +0200 +++ /var/tmp/diff_new_pack.8YMPmU/_new 2010-04-30 01:00:35.000000000 +0200 @@ -62,7 +62,7 @@ { test -d /sys/class/net/$1/bridge -o \ -d /sys/class/net/$1/bonding -o \ - -d /proc/net/vlan/$1 + -f /proc/net/vlan/$1 } case "$0" in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libzypp for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '10

29 Apr '10

Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at Fri Apr 30 00:53:05 CEST 2010. -------- --- libzypp/libzypp.changes 2010-04-27 11:52:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2010-04-29 18:23:40.000000000 +0200 @@ -1,0 +2,32 @@ +Thu Apr 29 17:10:29 CEST 2010 - ma(a)suse.de + +- Cleanup when deleting packages. New zypp.conf global option + solver.cleandepsOnRemove telling whether the solver should per + default try to remove packages exclusively required by the ones + he's asked to delete (default false). +- Resolver::cleandepsOnRemove API to allow applications to change + the solver option. +- version 7.4.0 (4) + +------------------------------------------------------------------- +Thu Apr 29 01:13:40 CEST 2010 - ma(a)suse.de + +- Update translations. + +------------------------------------------------------------------- +Wed Apr 28 16:35:04 CEST 2010 - ma(a)suse.de + +- Enable splitprovides on update. + +------------------------------------------------------------------- +Wed Apr 28 01:13:37 CEST 2010 - ma(a)suse.de + +- Update translations. + +------------------------------------------------------------------- +Tue Apr 27 17:42:20 CEST 2010 - ma(a)suse.de + +- Selectable: Classify broken but locked patch as isUnwanted (bnc#577118) +- version 7.3.0 (2) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libzypp-7.2.0.tar.bz2 New: ---- libzypp-7.4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.32RxoC/_old 2010-04-30 00:52:42.000000000 +0200 +++ /var/tmp/diff_new_pack.32RxoC/_new 2010-04-30 00:52:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libzypp (Version 7.2.0) +# spec file for package libzypp (Version 7.4.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,8 +24,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Summary: Package, Patch, Pattern, and Product Management -Version: 7.2.0 -Release: 2 +Version: 7.4.0 +Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc Prefix: /usr @@ -39,7 +39,7 @@ BuildRequires: libudev-devel BuildRequires: boost-devel dejagnu doxygen gcc-c++ gettext-devel graphviz libxml2-devel -BuildRequires: libsatsolver-devel >= 0.14.13 +BuildRequires: libsatsolver-devel >= 0.14.17 %if 0%{?suse_version} %requires_eq satsolver-tools %else ++++++ libzypp-7.2.0.tar.bz2 -> libzypp-7.4.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/VERSION.cmake new/libzypp-7.4.0/VERSION.cmake --- old/libzypp-7.2.0/VERSION.cmake 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/VERSION.cmake 2010-04-29 18:08:13.000000000 +0200 @@ -59,10 +59,10 @@ # changes file. See './mkChangelog -h' for help. # SET(LIBZYPP_MAJOR "7") -SET(LIBZYPP_COMPATMINOR "2") -SET(LIBZYPP_MINOR "2") +SET(LIBZYPP_COMPATMINOR "4") +SET(LIBZYPP_MINOR "4") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 7.2.0 (2) +# LAST RELEASED: 7.4.0 (4) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/devel/devel.ma/CleandepsOnRemove.cc new/libzypp-7.4.0/devel/devel.ma/CleandepsOnRemove.cc --- old/libzypp-7.2.0/devel/devel.ma/CleandepsOnRemove.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-7.4.0/devel/devel.ma/CleandepsOnRemove.cc 2010-04-29 18:08:13.000000000 +0200 @@ -0,0 +1,141 @@ +#include "Tools.h" + +#include <zypp/PoolQuery.h> +#include <zypp/target/rpm/librpmDb.h> +#include <zypp/parser/ProductFileReader.h> +#include "zypp/pool/GetResolvablesToInsDel.h" +#include "zypp/sat/WhatObsoletes.h" +#include "zypp/ExternalProgram.h" + +/////////////////////////////////////////////////////////////////// + +//static const Pathname sysRoot( getenv("SYSROOT") ? getenv("SYSROOT") : "/Local/ROOT" ); +//static const Pathname sysRoot( "/tmp/ToolScanRepos" ); +static const Pathname sysRoot( "/" ); + +/////////////////////////////////////////////////////////////////// + +bool solve() +{ + bool rres = false; + { + //zypp::base::LogControl::TmpLineWriter shutUp; + //getZYpp()->resolver()->setOnlyRequires( true ); + rres = getZYpp()->resolver()->resolvePool(); + } + if ( ! rres ) + { + ERR << "resolve " << rres << endl; + getZYpp()->resolver()->problems(); + return false; + } + MIL << "resolve " << rres << endl; + return true; +} + +bool upgrade() +{ + bool rres = false; + { + //zypp::base::LogControl::TmpLineWriter shutUp; + Measure x( "Upgrade" ); + rres = getZYpp()->resolver()->doUpgrade(); + } + if ( ! rres ) + { + Measure x( "Upgrade Error" ); + ERR << "upgrade " << rres << endl; + getZYpp()->resolver()->problems(); + return false; + } + MIL << "upgrade " << rres << endl; + return true; +} + +namespace zypp +{ + namespace target + { + void writeUpgradeTestcase(); + } +} + +std::ostream & operator<<( std::ostream & str, const sat::Solvable::SplitIdent & obj ) +{ + str << "{" << obj.ident() << "}{" << obj.kind() << "}{" << obj.name () << "}" << endl; + return str; +} + +namespace zypp { +std::ostream & dumpOn( std::ostream & str, const Url & obj ) +{ + str << "{" << obj.getHost() << "}{" << obj.getPort() << "}"; + return str; +} +} + +int main( int argc, char * argv[] ) +try { + --argc,++argv; + zypp::base::LogControl::instance().logToStdErr(); + INT << "===[START]==========================================" << endl; + /////////////////////////////////////////////////////////////////// + if ( sysRoot == "/" ) + ::unsetenv( "ZYPP_CONF" ); + ResPool pool( ResPool::instance() ); + sat::Pool satpool( sat::Pool::instance() ); + /////////////////////////////////////////////////////////////////// + dumpRange( WAR << "satpool.multiversion " , satpool.multiversionBegin(), satpool.multiversionEnd() ) << endl; + TestSetup::LoadSystemAt( sysRoot, Arch_i586 ); + /////////////////////////////////////////////////////////////////// + + char * fix[] = { + "test" + }; + argv = fix; + argc = arraySize(fix); + for ( ; argc; --argc,++argv ) + { + ui::Selectable::Ptr p( getSel<Package>( *argv ) ); + if ( p ) + USR << p->setToDelete() << endl; + else + ERR < todel; + { + getZYpp()->resolver()->setCleandepsOnRemove( false ); + SEC << "=== Solve noclean:" << endl; + solve(); + std::copy( make_filter_begin<resfilter::ByTransact>(pool), + make_filter_end<resfilter::ByTransact>(pool), + std::inserter( todel, todel.begin() ) ); + WAR << todel << endl; + } + { + getZYpp()->resolver()->setCleandepsOnRemove( true ); + SEC << "=== Solve clean:" << endl; + solve(); + SEC << "========================================================" << endl; + for_( it, make_filter_begin<resfilter::ByTransact>(pool), make_filter_end<resfilter::ByTransact>(pool) ) + { + ( todel.find( *it ) == todel.end() ? INT : USR ) << *it << endl; + } + SEC << "========================================================" << endl; + } + + + + /////////////////////////////////////////////////////////////////// + INT << "===[END]============================================" << endl << endl; + zypp::base::LogControl::instance().logNothing(); + return 0; +} +catch ( const Exception & exp ) +{ + INT << exp << endl << exp.historyAsString(); +} +catch (...) +{} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/devel/devel.ma/Main.cc new/libzypp-7.4.0/devel/devel.ma/Main.cc --- old/libzypp-7.2.0/devel/devel.ma/Main.cc 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/devel/devel.ma/Main.cc 2010-04-29 18:08:13.000000000 +0200 @@ -90,28 +90,14 @@ TestSetup::LoadSystemAt( sysRoot, Arch_i586 ); /////////////////////////////////////////////////////////////////// - PoolQuery q; - q.setMatchGlob(); - - //q.addDependency( sat::SolvAttr("solvable:provides"), Capability("zypper = 1.4.1-1.1") ); - //q.addDependency( sat::SolvAttr("solvable:provides"), Capability("z* = 1.2.8") ); - q.addDependency( sat::SolvAttr("solvable:name"), "zypp*", Rel("="), Edition("1.2.8") ); - //q.addDependency( sat::SolvAttr("solvable:provides"), "zypp*" ); - q.serialize( SEC ); - - for_( solvIter, q.begin(), q.end() ) + ui::Selectable::Ptr p( getSel<Package>( "kruler" ) ); + if ( p ) { - sat::Solvable solvable( *solvIter ); - USR << "Found matches in " << solvable << endl; - if ( true ) - for_( attrIter, solvIter.matchesBegin(), solvIter.matchesEnd() ) - { - sat::LookupAttr::iterator attr( *attrIter ); - USR << " " << attr.inSolvAttr() << "\t\"" << attr.asString() << "\"" << endl; - } + USR << p->setToDelete() << endl; + getZYpp()->resolver()->setCleandepsOnRemove( true ); + solve(); } - /////////////////////////////////////////////////////////////////// INT << "===[END]============================================" << endl << endl; zypp::base::LogControl::instance().logNothing(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/libzypp.spec.cmake new/libzypp-7.4.0/libzypp.spec.cmake --- old/libzypp-7.2.0/libzypp.spec.cmake 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/libzypp.spec.cmake 2010-04-29 18:08:13.000000000 +0200 @@ -31,7 +31,7 @@ BuildRequires: libudev-devel BuildRequires: boost-devel dejagnu doxygen gcc-c++ gettext-devel graphviz libxml2-devel -BuildRequires: libsatsolver-devel >= 0.14.13 +BuildRequires: libsatsolver-devel >= 0.14.17 %if 0%{?suse_version} %requires_eq satsolver-tools %else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/package/libzypp.changes new/libzypp-7.4.0/package/libzypp.changes --- old/libzypp-7.2.0/package/libzypp.changes 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/package/libzypp.changes 2010-04-29 18:08:13.000000000 +0200 @@ -1,4 +1,36 @@ ------------------------------------------------------------------- +Thu Apr 29 17:10:29 CEST 2010 - ma(a)suse.de + +- Cleanup when deleting packages. New zypp.conf global option + solver.cleandepsOnRemove telling whether the solver should per + default try to remove packages exclusively required by the ones + he's asked to delete (default false). +- Resolver::cleandepsOnRemove API to allow applications to change + the solver option. +- version 7.4.0 (4) + +------------------------------------------------------------------- +Thu Apr 29 01:13:40 CEST 2010 - ma(a)suse.de + +- Update translations. + +------------------------------------------------------------------- +Wed Apr 28 16:35:04 CEST 2010 - ma(a)suse.de + +- Enable splitprovides on update. + +------------------------------------------------------------------- +Wed Apr 28 01:13:37 CEST 2010 - ma(a)suse.de + +- Update translations. + +------------------------------------------------------------------- +Tue Apr 27 17:42:20 CEST 2010 - ma(a)suse.de + +- Selectable: Classify broken but locked patch as isUnwanted (bnc#577118) +- version 7.3.0 (2) + +------------------------------------------------------------------- Tue Apr 27 11:25:17 CEST 2010 - ma(a)suse.de - Use libudev to detect available cd/dvd devices (bnc#590707,fate#308980) Files old/libzypp-7.2.0/po/zypp-po.tar.bz2 and new/libzypp-7.4.0/po/zypp-po.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/zypp/KeyRing.cc new/libzypp-7.4.0/zypp/KeyRing.cc --- old/libzypp-7.2.0/zypp/KeyRing.cc 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/zypp/KeyRing.cc 2010-04-29 18:08:13.000000000 +0200 @@ -620,13 +620,12 @@ if(str::regex_match(line, what, rxNoKey)) { if ( what.size() >= 1 ) + { id = what[1]; + break; + } //dumpRegexpResults(what); } - else - { - MIL << "'" << line << "'" << endl; - } } if ( count == 0 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/zypp/ResPool.cc new/libzypp-7.4.0/zypp/ResPool.cc --- old/libzypp-7.2.0/zypp/ResPool.cc 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/zypp/ResPool.cc 2010-04-29 18:08:13.000000000 +0200 @@ -14,6 +14,7 @@ #include "zypp/base/SerialNumber.h" +#include "zypp/ZYppFactory.h" #include "zypp/ResPool.h" #include "zypp/pool/PoolImpl.h" #include "zypp/pool/PoolStats.h" @@ -53,6 +54,9 @@ ResPoolProxy ResPool::proxy() const { return _pimpl->proxy( *this ); } + Resolver & ResPool::resolver() const + { return *getZYpp()->resolver(); } + const SerialNumber & ResPool::serial() const { return _pimpl->serial(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/zypp/ResPool.h new/libzypp-7.4.0/zypp/ResPool.h --- old/libzypp-7.2.0/zypp/ResPool.h 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/zypp/ResPool.h 2010-04-29 18:08:13.000000000 +0200 @@ -27,6 +27,7 @@ class SerialNumber; class ResPoolProxy; + class Resolver; /////////////////////////////////////////////////////////////////// // @@ -62,6 +63,9 @@ /** preliminary */ ResPoolProxy proxy() const; + /** The Resolver */ + Resolver & resolver() const; + public: /** The pools serial number. Changing whenever the * whenever the content changes. (Resolvables or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/zypp/Resolver.cc new/libzypp-7.4.0/zypp/Resolver.cc --- old/libzypp-7.2.0/zypp/Resolver.cc 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/zypp/Resolver.cc 2010-04-29 18:08:13.000000000 +0200 @@ -33,9 +33,8 @@ // METHOD TYPE : Ctor // Resolver::Resolver( const ResPool & pool ) - { - _pimpl = new solver::detail::Resolver(pool); - } + : _pimpl( new Impl(pool) ) + {} /////////////////////////////////////////////////////////////////// // @@ -75,14 +74,14 @@ { _pimpl->doUpdate(); } void Resolver::setForceResolve( bool yesno_r ) { _pimpl->setForceResolve( yesno_r ); } - bool Resolver::forceResolve() { return _pimpl->forceResolve(); } + bool Resolver::forceResolve() const { return _pimpl->forceResolve(); } void Resolver::setIgnoreAlreadyRecommended( bool yesno_r) { _pimpl->setIgnoreAlreadyRecommended( yesno_r ); } - bool Resolver::ignoreAlreadyRecommended() { return _pimpl->ignoreAlreadyRecommended(); } + bool Resolver::ignoreAlreadyRecommended() const { return _pimpl->ignoreAlreadyRecommended(); } void Resolver::setOnlyRequires( bool yesno_r ) { _pimpl->setOnlyRequires( yesno_r ); } void Resolver::resetOnlyRequires() { _pimpl->setOnlyRequires( indeterminate ); } - bool Resolver::onlyRequires() { return _pimpl->onlyRequires(); } + bool Resolver::onlyRequires() const { return _pimpl->onlyRequires(); } bool Resolver::upgradeMode() const { return _pimpl->isUpgradeMode(); } @@ -98,6 +97,10 @@ void Resolver::setDefaultSolveSrcPackages() { _pimpl->setSolveSrcPackages( indeterminate ); } bool Resolver::solveSrcPackages() const { return _pimpl->solveSrcPackages(); } + void Resolver::setCleandepsOnRemove( bool yesno_r ) { _pimpl->setCleandepsOnRemove( yesno_r ); } + void Resolver::setDefaultCleandepsOnRemove() { _pimpl->setCleandepsOnRemove( indeterminate ); } + bool Resolver::cleandepsOnRemove() const { return _pimpl->cleandepsOnRemove(); } + void Resolver::addUpgradeRepo( Repository repo_r ) { _pimpl->addUpgradeRepo( repo_r ); } bool Resolver::upgradingRepo( Repository repo_r ) const { return _pimpl->upgradingRepo( repo_r ); } void Resolver::removeUpgradeRepo( Repository repo_r ) { _pimpl->removeUpgradeRepo( repo_r ); } @@ -108,8 +111,8 @@ void Resolver::removeRequire( const Capability & capability ) { _pimpl->removeExtraRequire( capability ); } void Resolver::removeConflict( const Capability & capability ){ _pimpl->removeExtraConflict( capability ); } - CapabilitySet Resolver::getRequire() { return _pimpl->extraRequires(); } - CapabilitySet Resolver::getConflict() { return _pimpl->extraConflicts(); } + CapabilitySet Resolver::getRequire() const { return _pimpl->extraRequires(); } + CapabilitySet Resolver::getConflict() const { return _pimpl->extraConflicts(); } std::list<PoolItem> Resolver::problematicUpdateItems() const { return _pimpl->problematicUpdateItems(); } @@ -135,7 +138,8 @@ void Resolver::reset() { _pimpl->reset( false ); /* Do not keep extra requires/conflicts */ } - + std::ostream & operator<<( std::ostream & str, const Resolver & obj ) + { return str << *obj._pimpl; } ///////////////////////////////////////////////////////////////// } // namespace zypp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/zypp/Resolver.h new/libzypp-7.4.0/zypp/Resolver.h --- old/libzypp-7.2.0/zypp/Resolver.h 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/zypp/Resolver.h 2010-04-29 18:08:13.000000000 +0200 @@ -161,14 +161,14 @@ * This behaviour is favourited by ZMD. **/ void setForceResolve( bool force ); - bool forceResolve(); + bool forceResolve() const; /** * Ignore recommended packages that were already recommended by * the installed packages **/ void setIgnoreAlreadyRecommended( bool yesno_r ); - bool ignoreAlreadyRecommended(); + bool ignoreAlreadyRecommended() const; /** * Setting whether required packages are installed ONLY @@ -177,7 +177,7 @@ **/ void setOnlyRequires( bool yesno_r ); void resetOnlyRequires(); // set back to default (described in zypp.conf) - bool onlyRequires(); + bool onlyRequires() const; /** * Whether the \ref Resolver is in upgrade mode. @@ -218,6 +218,14 @@ void setDefaultSolveSrcPackages(); bool solveSrcPackages() const; + /** + * Cleanup when deleting packages. Whether the solver should per default + * try to remove packages exclusively required by the ones he's asked to delete. + */ + void setCleandepsOnRemove( bool yesno_r ); + void setDefaultCleandepsOnRemove(); // set back to default (in zypp.conf) + bool cleandepsOnRemove() const; + /** \name Upgrade to content of a specific repository. * \note This is an ordinary solver request. You should simply * \ref resolvePool to execute, and not \ref doUpgrade. @@ -275,13 +283,13 @@ * Get all the additional requirements set by \ref addRequire(Capability). * */ - CapabilitySet getRequire(); + CapabilitySet getRequire() const; /** * Get all the additional conflicts set by \ref addConflict(Capability). * */ - CapabilitySet getConflict(); + CapabilitySet getConflict() const; /** * Generates a solver Testcase of the current state @@ -357,12 +365,17 @@ solver::detail::ItemCapKindList installedSatisfied( const PoolItem & item ); - private: - solver::detail::Resolver_Ptr _pimpl; + friend std::ostream & operator<<( std::ostream & str, const Resolver & obj ); + + typedef solver::detail::Resolver Impl; + zypp::RW_pointer<Impl,rw_pointer::Intrusive<Impl> > _pimpl; }; /////////////////////////////////////////////////////////////////// + /** \relates Resolver Stream output */ + std::ostream & operator<<( std::ostream & str, const Resolver & obj ); + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/zypp/ZConfig.cc new/libzypp-7.4.0/zypp/ZConfig.cc --- old/libzypp-7.2.0/zypp/ZConfig.cc 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/zypp/ZConfig.cc 2010-04-29 18:08:13.000000000 +0200 @@ -229,6 +229,7 @@ , commit_downloadMode ( DownloadDefault ) , solver_onlyRequires ( false ) , solver_allowVendorChange ( false ) + , solver_cleandepsOnRemove ( false ) , solver_upgradeTestcasesToKeep ( 2 ) , solverUpgradeRemoveDroppedPackages( true ) , apply_locks_file ( true ) @@ -356,6 +357,10 @@ { solver_allowVendorChange.set( str::strToBool( value, solver_allowVendorChange ) ); } + else if ( entry == "solver.cleandepsOnRemove" ) + { + solver_cleandepsOnRemove.set( str::strToBool( value, solver_cleandepsOnRemove ) ); + } else if ( entry == "solver.upgradeTestcasesToKeep" ) { solver_upgradeTestcasesToKeep.set( str::strtonum<unsigned>( value ) ); @@ -479,6 +484,7 @@ Option<bool> solver_onlyRequires; Option<bool> solver_allowVendorChange; + Option<bool> solver_cleandepsOnRemove; Option<unsigned> solver_upgradeTestcasesToKeep; DefaultOption<bool> solverUpgradeRemoveDroppedPackages; @@ -702,6 +708,9 @@ bool ZConfig::solver_allowVendorChange() const { return _pimpl->solver_allowVendorChange; } + bool ZConfig::solver_cleandepsOnRemove() const + { return _pimpl->solver_cleandepsOnRemove; } + Pathname ZConfig::solver_checkSystemFile() const { return ( _pimpl->solver_checkSystemFile.empty() ? (configPath()/"systemCheck") : _pimpl->solver_checkSystemFile ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/zypp/ZConfig.h new/libzypp-7.4.0/zypp/ZConfig.h --- old/libzypp-7.2.0/zypp/ZConfig.h 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/zypp/ZConfig.h 2010-04-29 18:08:13.000000000 +0200 @@ -254,6 +254,11 @@ bool solver_allowVendorChange() const; /** + * Whether removing a package should also remove no longer needed requirements. + */ + bool solver_cleandepsOnRemove() const; + + /** * When committing a dist upgrade (e.g. <tt>zypper dup</tt>) * a solver testcase is written. It is needed in bugreports, * in case something went wrong. This returns the number of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/zypp/base/Easy.h new/libzypp-7.4.0/zypp/base/Easy.h --- old/libzypp-7.2.0/zypp/base/Easy.h 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/zypp/base/Easy.h 2010-04-29 18:08:13.000000000 +0200 @@ -31,8 +31,8 @@ * \endcode */ #define arrayBegin(A) (&A[0]) -#define arrayEnd(A) (&A[0] + (sizeof(A)/sizeof(*A))) - +#define arraySize(A) (sizeof(A)/sizeof(*A)) +#define arrayEnd(A) (&A[0] + arraySize(A)) /////////////////////////////////////////////////////////////////// namespace zypp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/zypp/solver/detail/Resolver.cc new/libzypp-7.4.0/zypp/solver/detail/Resolver.cc --- old/libzypp-7.2.0/zypp/solver/detail/Resolver.cc 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/zypp/solver/detail/Resolver.cc 2010-04-29 18:08:13.000000000 +0200 @@ -58,7 +58,19 @@ std::ostream & Resolver::dumpOn( std::ostream & os ) const { - return os << "<resolver/>"; + os << "<resolver>" << endl; + #define OUTS(t) os << " " << #t << ":\t" << t << endl; + OUTS( _forceResolve ); + OUTS( _upgradeMode ); + OUTS( _updateMode ); + OUTS( _verifying ); + OUTS( _onlyRequires ); + OUTS( _allowVendorChange ); + OUTS( _solveSrcPackages ); + OUTS( _cleandepsOnRemove ); + OUTS( _ignoreAlreadyRecommended ); + #undef OUT + return os << "<resolver/>"; } @@ -75,7 +87,8 @@ , _onlyRequires ( ZConfig::instance().solver_onlyRequires() ) , _allowVendorChange ( ZConfig::instance().solver_allowVendorChange() ) , _solveSrcPackages ( false ) - , _ignoreAlreadyRecommended (false) + , _cleandepsOnRemove ( ZConfig::instance().solver_cleandepsOnRemove() ) + , _ignoreAlreadyRecommended (true) { sat::Pool satPool( sat::Pool::instance() ); @@ -100,6 +113,11 @@ _onlyRequires = indeterminate(state_r) ? ZConfig::instance().solver_onlyRequires() : bool(state_r); } +void Resolver::setCleandepsOnRemove( TriBool state_r ) +{ + _cleandepsOnRemove = indeterminate(state_r) ? ZConfig::instance().solver_cleandepsOnRemove() : bool(state_r); +} + //--------------------------------------------------------------------------- ResPool Resolver::pool() const @@ -272,6 +290,7 @@ _satResolver->setNoupdateprovide (false); _satResolver->setDosplitprovides (false); _satResolver->setSolveSrcPackages ( solveSrcPackages() ); + _satResolver->setCleandepsOnRemove ( cleandepsOnRemove() ); if (_upgradeMode) { // may overwrite some settings diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/zypp/solver/detail/Resolver.h new/libzypp-7.4.0/zypp/solver/detail/Resolver.h --- old/libzypp-7.2.0/zypp/solver/detail/Resolver.h 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/zypp/solver/detail/Resolver.h 2010-04-29 18:08:13.000000000 +0200 @@ -113,6 +113,7 @@ // packages, hardware packages (modalias) bool _allowVendorChange; // whether the solver should allow or disallow vendor changes. bool _solveSrcPackages; // whether to generate solver jobs for selected source packges. + bool _cleandepsOnRemove; // whether removing a package should also remove no longer needed requirements bool _ignoreAlreadyRecommended; //ignore recommended packages that have already been recommended by the installed packages //@} @@ -168,8 +169,8 @@ void removeQueueItem( SolverQueueItem_Ptr item ); void addQueueItem( SolverQueueItem_Ptr item ); - CapabilitySet extraRequires() { return _extra_requires; } - CapabilitySet extraConflicts() { return _extra_conflicts; } + CapabilitySet extraRequires() const { return _extra_requires; } + CapabilitySet extraConflicts() const { return _extra_conflicts; } void addWeak( const PoolItem & item ); @@ -204,6 +205,9 @@ bool solveSrcPackages() const { return _solveSrcPackages; } void setSolveSrcPackages( TriBool state_r ) { _solveSrcPackages = indeterminate(state_r) ? false : bool(state_r); } + + bool cleandepsOnRemove() const { return _cleandepsOnRemove; } + void setCleandepsOnRemove( TriBool state_r ); //@} ResolverProblemList problems() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/zypp/solver/detail/SATResolver.cc new/libzypp-7.4.0/zypp/solver/detail/SATResolver.cc --- old/libzypp-7.2.0/zypp/solver/detail/SATResolver.cc 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/zypp/solver/detail/SATResolver.cc 2010-04-29 18:08:13.000000000 +0200 @@ -66,6 +66,8 @@ IMPL_PTR_TYPE(SATResolver); +#define MAYBE_CLEANDEPS (cleandepsOnRemove()?SOLVER_CLEANDEPS:0) + //--------------------------------------------------------------------------- // Callbacks for SAT policies //--------------------------------------------------------------------------- @@ -121,6 +123,7 @@ os << " distupgrade = " << _distupgrade << endl; os << " distupgrade_removeunsupported = " << _distupgrade_removeunsupported << endl; os << " solveSrcPackages = " << _solveSrcPackages << endl; + os << " cleandepsOnRemove = " << _cleandepsOnRemove << endl; } else { os << "<NULL>"; } @@ -136,16 +139,17 @@ , _fixsystem(false) , _allowdowngrade(false) , _allowarchchange(false) - , _allowvendorchange(false) + , _allowvendorchange(ZConfig::instance().solver_allowVendorChange()) , _allowuninstall(false) , _updatesystem(false) , _noupdateprovide(false) , _dosplitprovides(false) , _onlyRequires(ZConfig::instance().solver_onlyRequires()) - , _ignorealreadyrecommended(false) + , _ignorealreadyrecommended(true) , _distupgrade(false) , _distupgrade_removeunsupported(false) - + , _solveSrcPackages(false) + , _cleandepsOnRemove(ZConfig::instance().solver_cleandepsOnRemove()) { } @@ -694,7 +698,7 @@ ERR << "Delete: " << *iter << " not found" << endl; } else { MIL << "Delete " << *iter << endl; - queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE ); + queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE | MAYBE_CLEANDEPS ); queue_push( &(_jobQueue), id); } } @@ -713,7 +717,7 @@ } for (CapabilitySet::const_iterator iter = conflict_caps.begin(); iter != conflict_caps.end(); iter++) { - queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE_PROVIDES); + queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE_PROVIDES | MAYBE_CLEANDEPS ); queue_push( &(_jobQueue), iter->id() ); MIL << "Conflicts " << *iter << endl; } @@ -763,7 +767,7 @@ for (PoolItemList::const_iterator iter = _items_to_remove.begin(); iter != _items_to_remove.end(); iter++) { sat::detail::IdType ident( (*iter)->satSolvable().ident().id() ); MIL << "Delete " << *iter << ident << endl; - queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE_NAME ); + queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE_NAME | MAYBE_CLEANDEPS ); queue_push( &(_jobQueue), ident); } @@ -807,7 +811,7 @@ _solv->allowuninstall = _allowuninstall; _solv->allowarchchange = _allowarchchange; _solv->allowvendorchange = _allowvendorchange; - _solv->dosplitprovides = _dosplitprovides; + _solv->dosplitprovides = true; _solv->noupdateprovide = _noupdateprovide; _solv->dontinstallrecommended = true; // #FIXME dontinstallrecommended maybe set to false if it works correctly _solv->distupgrade = _distupgrade; @@ -941,59 +945,64 @@ ignoreId = 0; probr = solver_findproblemrule(_solv, problem); - switch (solver_problemruleinfo(_solv, &(_jobQueue), probr, &dep, &source, &target)) + switch (solver_ruleinfo(_solv, probr, &source, &target, &dep)) { - case SOLVER_PROBLEM_DISTUPGRADE_RULE: + case SOLVER_RULE_DISTUPGRADE: s = mapSolvable (source); ret = str::form (_("%s does not belong to a distupgrade repository"), s.asString().c_str()); break; - case SOLVER_PROBLEM_INFARCH_RULE: + case SOLVER_RULE_INFARCH: s = mapSolvable (source); ret = str::form (_("%s has inferior architecture"), s.asString().c_str()); break; - case SOLVER_PROBLEM_UPDATE_RULE: + case SOLVER_RULE_UPDATE: s = mapSolvable (source); ret = str::form (_("problem with installed package %s"), s.asString().c_str()); break; - case SOLVER_PROBLEM_JOB_RULE: + case SOLVER_RULE_JOB: ret = _("conflicting requests"); break; - case SOLVER_PROBLEM_RPM_RULE: + case SOLVER_RULE_RPM: ret = _("some dependency problem"); break; - case SOLVER_PROBLEM_JOB_NOTHING_PROVIDES_DEP: + case SOLVER_RULE_JOB_NOTHING_PROVIDES_DEP: ret = str::form (_("nothing provides requested %s"), dep2str(pool, dep)); detail += _("Have you enabled all requested repositories?"); break; - case SOLVER_PROBLEM_NOT_INSTALLABLE: + case SOLVER_RULE_RPM_NOT_INSTALLABLE: s = mapSolvable (source); ret = str::form (_("%s is not installable"), s.asString().c_str()); break; - case SOLVER_PROBLEM_NOTHING_PROVIDES_DEP: + case SOLVER_RULE_RPM_NOTHING_PROVIDES_DEP: ignoreId = source; // for setting weak dependencies s = mapSolvable (source); ret = str::form (_("nothing provides %s needed by %s"), dep2str(pool, dep), s.asString().c_str()); break; - case SOLVER_PROBLEM_SAME_NAME: + case SOLVER_RULE_RPM_SAME_NAME: s = mapSolvable (source); s2 = mapSolvable (target); ret = str::form (_("cannot install both %s and %s"), s.asString().c_str(), s2.asString().c_str()); break; - case SOLVER_PROBLEM_PACKAGE_CONFLICT: + case SOLVER_RULE_RPM_PACKAGE_CONFLICT: s = mapSolvable (source); s2 = mapSolvable (target); ret = str::form (_("%s conflicts with %s provided by %s"), s.asString().c_str(), dep2str(pool, dep), s2.asString().c_str()); break; - case SOLVER_PROBLEM_PACKAGE_OBSOLETES: + case SOLVER_RULE_RPM_PACKAGE_OBSOLETES: s = mapSolvable (source); s2 = mapSolvable (target); ret = str::form (_("%s obsoletes %s provided by %s"), s.asString().c_str(), dep2str(pool, dep), s2.asString().c_str()); break; - case SOLVER_PROBLEM_SELF_CONFLICT: + case SOLVER_RULE_RPM_INSTALLEDPKG_OBSOLETES: + s = mapSolvable (source); + s2 = mapSolvable (target); + ret = str::form (_("installed %s obsoletes %s provided by %s"), s.asString().c_str(), dep2str(pool, dep), s2.asString().c_str()); + break; + case SOLVER_RULE_RPM_SELF_CONFLICT: s = mapSolvable (source); ret = str::form (_("solvable %s conflicts with %s provided by itself"), s.asString().c_str(), dep2str(pool, dep)); break; - case SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE: + case SOLVER_RULE_RPM_PACKAGE_REQUIRES: ignoreId = source; // for setting weak dependencies s = mapSolvable (source); Capability cap(dep); @@ -1374,7 +1383,7 @@ queue_push( &(_jobQueue), ident ); } else { MIL << "Lock NOT installed item " << *iter << endl; - queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE ); + queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE | MAYBE_CLEANDEPS ); queue_push( &(_jobQueue), ident ); } } @@ -1387,7 +1396,7 @@ queue_push( &(_jobQueue), ident ); } else { MIL << "Keep NOT installed item " << *iter << ident << endl; - queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE | SOLVER_WEAK); + queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE | SOLVER_WEAK | MAYBE_CLEANDEPS ); queue_push( &(_jobQueue), ident ); } } @@ -1405,7 +1414,7 @@ } for (CapabilitySet::const_iterator iter = system_conflicts.begin(); iter != system_conflicts.end(); iter++) { - queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE_PROVIDES); + queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE_PROVIDES | MAYBE_CLEANDEPS ); queue_push( &(_jobQueue), iter->id() ); MIL << "SYSTEM Conflicts " << *iter << endl; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/zypp/solver/detail/SATResolver.h new/libzypp-7.4.0/zypp/solver/detail/SATResolver.h --- old/libzypp-7.2.0/zypp/solver/detail/SATResolver.h 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/zypp/solver/detail/SATResolver.h 2010-04-29 18:08:13.000000000 +0200 @@ -97,6 +97,7 @@ bool _distupgrade; bool _distupgrade_removeunsupported; bool _solveSrcPackages; // false: generate no job rule for source packages selected in the pool + bool _cleandepsOnRemove; // whether removing a package should also remove no longer needed requirements // ---------------------------------- methods std::string SATprobleminfoString (Id problem, std::string &detail, Id &ignoreId); @@ -201,6 +202,9 @@ bool solveSrcPackages() const { return _solveSrcPackages; } void setSolveSrcPackages( bool state_r ) { _solveSrcPackages = state_r; } + bool cleandepsOnRemove() const { return _cleandepsOnRemove; } + void setCleandepsOnRemove( bool state_r ) { _cleandepsOnRemove = state_r; } + PoolItemList problematicUpdateItems( void ) const { return _problem_items; } PoolItemList resultItemsToInstall () { return _result_items_to_install; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/zypp/solver/detail/SolverQueueItemDelete.cc new/libzypp-7.4.0/zypp/solver/detail/SolverQueueItemDelete.cc --- old/libzypp-7.2.0/zypp/solver/detail/SolverQueueItemDelete.cc 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/zypp/solver/detail/SolverQueueItemDelete.cc 2010-04-29 18:08:13.000000000 +0200 @@ -24,6 +24,7 @@ #include "zypp/base/Logger.h" #include "zypp/IdString.h" +#include "zypp/Resolver.h" #include "zypp/solver/detail/SolverQueueItemDelete.h" ///////////////////////////////////////////////////////////////////////// @@ -69,11 +70,13 @@ bool SolverQueueItemDelete::addRule (_Queue & q) { +#define MAYBE_CLEANDEPS (pool().resolver().cleandepsOnRemove()?SOLVER_CLEANDEPS:0) + ::Id id = IdString(_name).id(); if (_soft) { - queue_push( &(q), SOLVER_ERASE_SOLVABLE_NAME | SOLVER_WEAK); + queue_push( &(q), SOLVER_ERASE_SOLVABLE_NAME | SOLVER_WEAK | MAYBE_CLEANDEPS ); } else { - queue_push( &(q), SOLVER_ERASE_SOLVABLE_NAME ); + queue_push( &(q), SOLVER_ERASE_SOLVABLE_NAME | MAYBE_CLEANDEPS ); } queue_push( &(q), id); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/zypp/ui/Selectable.cc new/libzypp-7.4.0/zypp/ui/Selectable.cc --- old/libzypp-7.2.0/zypp/ui/Selectable.cc 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/zypp/ui/Selectable.cc 2010-04-29 18:08:13.000000000 +0200 @@ -182,7 +182,12 @@ bool Selectable::isNeeded() const { - return fate() == TO_INSTALL || isBroken() ; + return fate() == TO_INSTALL || ( ! locked() && isBroken() ); + } + + bool Selectable::isUnwanted() const + { + return locked() && isBroken() ; } ResStatus::TransactByValue Selectable::modifiedBy() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/zypp/ui/Selectable.h new/libzypp-7.4.0/zypp/ui/Selectable.h --- old/libzypp-7.2.0/zypp/ui/Selectable.h 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/zypp/ui/Selectable.h 2010-04-29 18:08:13.000000000 +0200 @@ -363,7 +363,7 @@ //@{ /** Returns true for packages, because packages are not * classified by the solver. - */ + */ bool isUndetermined() const; /** Returns true if the patch is relevant which means that at least @@ -377,17 +377,20 @@ /** Whether a relevant patchs requirements are broken. */ bool isBroken() const; - /** This includes still broken patches, as well as those already - * selected to be installed. - * This is because already selected patches will be classified as - * \c satisfied. + /** This includes \c unlocked broken patches, as well as those already + * selected to be installed. This is because already selected + * patches will be classified as \c satisfied. \c Locked but broken + * patches will be classified as \ref isUnwanted. */ bool isNeeded() const; + + /** Broken (needed) but locked patches. */ + bool isUnwanted() const; //@} public: /** \name Query and maip objects fate in case of commit. - */ + */ //@{ enum Fate { TO_DELETE = -1, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-7.2.0/zypp.conf new/libzypp-7.4.0/zypp.conf --- old/libzypp-7.2.0/zypp.conf 2010-04-27 11:28:45.000000000 +0200 +++ new/libzypp-7.4.0/zypp.conf 2010-04-29 18:08:13.000000000 +0200 @@ -264,6 +264,15 @@ # solver.allowVendorChange = false ## +## Cleanup when deleting packages. Whether the solver should per default +## try to remove packages exclusively required by the ones he's asked to delete. +## +## Valid values: boolean +## Default value: false +## +# solver.cleandepsOnRemove = false + +## ## This file contains requirements/conflicts which fulfill the ## needs of a running system. ## For example the system would be broken if not glibc or kernel is ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0