July 2012 - openSUSE Commits - openSUSE Mailing Lists

commit php5 for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '12

30 Jul '12

Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at 2012-07-30 20:38:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5 (Old) and /work/SRC/openSUSE:Factory/.php5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5", Maintainer is "PGajdos(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/php5/php5.changes 2012-06-25 14:40:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2012-07-30 20:38:31.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Jul 25 12:48:08 UTC 2012 - pgajdos(a)suse.com + +- updated to 5.3.15: + * fixes over 30 bugs and includes a fix for a security related + overflow issue in the stream implementation (CVE-2012-2688) + [bnc#772582] and open_basedir bypass, CVE-2012-3365 [bnc#772580] + +------------------------------------------------------------------- Old: ---- php-5.3.14.tar.bz2 New: ---- php-5.3.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.eSGqhH/_old 2012-07-30 20:39:02.000000000 +0200 +++ /var/tmp/diff_new_pack.eSGqhH/_new 2012-07-30 20:39:02.000000000 +0200 @@ -105,7 +105,7 @@ #define builtin_tz_ver 2007.9 ### ### -Version: 5.3.14 +Version: 5.3.15 Release: 0 Provides: php Provides: php-api = %{apiver} ++++++ php-5.3.14.tar.bz2 -> php-5.3.15.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/php5/php-5.3.14.tar.bz2 /work/SRC/openSUSE:Factory/.php5.new/php-5.3.15.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit parted for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '12

30 Jul '12

Hello community, here is the log from the commit of package parted for openSUSE:Factory checked in at 2012-07-30 20:38:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/parted (Old) and /work/SRC/openSUSE:Factory/.parted.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "parted", Maintainer is "PUzel(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/parted/parted.changes 2012-07-03 16:46:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.parted.new/parted.changes 2012-07-30 20:38:26.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 27 09:14:44 UTC 2012 - aj(a)suse.de + +- Fix build with missing gets declaration (glibc 2.16) + +------------------------------------------------------------------- New: ---- parted-stdio.h.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ parted.spec ++++++ --- /var/tmp/diff_new_pack.l7OBP4/_old 2012-07-30 20:38:30.000000000 +0200 +++ /var/tmp/diff_new_pack.l7OBP4/_new 2012-07-30 20:38:30.000000000 +0200 @@ -45,6 +45,7 @@ Patch17: fix-nilfs2-probe-function.patch Patch18: parted-fix-cciss-partition-naming.patch Patch19: dummy-bootcode-only-for-x86.patch +Patch20: parted-stdio.h.patch Requires: /sbin/udevadm BuildRequires: check-devel BuildRequires: device-mapper-devel >= 1.02.33 @@ -112,6 +113,7 @@ %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 %build export CFLAGS="%{optflags} `ncursesw6-config --cflags`" ++++++ parted-stdio.h.patch ++++++ Index: parted-2.4/lib/stdio.in.h =================================================================== --- parted-2.4.orig/lib/stdio.in.h +++ parted-2.4/lib/stdio.in.h @@ -731,11 +731,13 @@ _GL_CXXALIAS_RPL (gets, char *, (char *s _GL_CXXALIAS_SYS (gets, char *, (char *s)); # undef gets # endif +# if HAVE_RAW_DECL_GETS _GL_CXXALIASWARN (gets); /* It is very rare that the developer ever has full control of stdin, so any use of gets warrants an unconditional warning. Assume it is always declared, since it is required by C89. */ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); +# endif #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit PackageKit for openSUSE:12.2
by root＠hilbert.suse.de 30 Jul '12

30 Jul '12

Hello community, here is the log from the commit of package PackageKit for openSUSE:12.2 checked in at 2012-07-30 20:37:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/PackageKit (Old) and /work/SRC/openSUSE:12.2/.PackageKit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "PackageKit", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.2/PackageKit/PackageKit.changes 2012-07-30 00:22:42.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.PackageKit.new/PackageKit.changes 2012-07-30 20:37:34.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Jul 18 20:00:46 UTC 2012 - dimstar(a)opensuse.org + +- Add Patches from the openSUSE_Factory PK branch (in order to fix + bnc#769674 and bnc#770028): + + 0004-zypp-use-pre-increment-in-for-loops-to-avoid-tempora.patch + + 0005-zypp-don-t-waste-time-comparing-zypp-Arch-string-rep.patch + + 0006-zypp-set-CXXFLAGS-and-use-std-c-0x-as-libzypp-does-b.patch + + 0007-zypp-fix-missing-dtor.patch + + 0008-zypp-no-longer-use-the-old-and-deprecated-ZYppCommit.patch + + 0009-zypp-adjust-PK_FILTER_ENUM_NOT_DEVELOPMENT-bnc-77002.patch + +------------------------------------------------------------------- New: ---- 0004-zypp-use-pre-increment-in-for-loops-to-avoid-tempora.patch 0005-zypp-don-t-waste-time-comparing-zypp-Arch-string-rep.patch 0006-zypp-set-CXXFLAGS-and-use-std-c-0x-as-libzypp-does-b.patch 0007-zypp-fix-missing-dtor.patch 0008-zypp-no-longer-use-the-old-and-deprecated-ZYppCommit.patch 0009-zypp-adjust-PK_FILTER_ENUM_NOT_DEVELOPMENT-bnc-77002.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.Pf4GY0/_old 2012-07-30 20:37:39.000000000 +0200 +++ /var/tmp/diff_new_pack.Pf4GY0/_new 2012-07-30 20:37:39.000000000 +0200 @@ -55,9 +55,21 @@ Patch1: 0002-Build-against-npapi-sdk-instead-of-xulrunner.patch # PATCH-FIX-UPSTREAM 0003-Revert-packagekit-qt2-Since-new-methods-and-enums-wh.patch vuntz(a)opensuse.org -- Fix broken soversion of libpackagekit-qt2, will be fixed properly in next upstream version Patch2: 0003-Revert-packagekit-qt2-Since-new-methods-and-enums-wh.patch +# PATCH-FIX-UPSTREAM 0004-zypp-use-pre-increment-in-for-loops-to-avoid-tempora.patch dimstar(a)opensuse.org -- zypp: use pre-increment in for-loops to avoid temporaries +Patch3: 0004-zypp-use-pre-increment-in-for-loops-to-avoid-tempora.patch +# PATCH-FIX-UPSTREAM 0005-zypp-don-t-waste-time-comparing-zypp-Arch-string-rep.patch dimstar(a)opensuse.org -- don't waste time comparing zypp::Arch string representations +Patch4: 0005-zypp-don-t-waste-time-comparing-zypp-Arch-string-rep.patch +# PATCH-FIX-UPSTREAM 0006-zypp-set-CXXFLAGS-and-use-std-c-0x-as-libzypp-does-b.patch bnc#769764 dimstar(a)opensuse.org -- set CXXFLAGS and use --std=c++0x as libzypp does +Patch5: 0006-zypp-set-CXXFLAGS-and-use-std-c-0x-as-libzypp-does-b.patch +# PATCH-FIX-UPSTREAM 0007-zypp-fix-missing-dtor.patch dimstar(a)opensuse.org -- fix missing dtor +Patch6: 0007-zypp-fix-missing-dtor.patch +# PATCH-FIX-UPSTREAM 0008-zypp-no-longer-use-the-old-and-deprecated-ZYppCommit.patch bnc#769764 dimstar(a)opensuse.org -- no longer use the old and deprecated ZYppCommitResult members +Patch7: 0008-zypp-no-longer-use-the-old-and-deprecated-ZYppCommit.patch +# PATCH-FIX-UpSTREAM 0009-zypp-adjust-PK_FILTER_ENUM_NOT_DEVELOPMENT-bnc-77002.patch bnc#770028 dimstar(a)opensuse.org -- adjust PK_FILTER_ENUM_NOT_DEVELOPMENT +Patch8: 0009-zypp-adjust-PK_FILTER_ENUM_NOT_DEVELOPMENT-bnc-77002.patch # # PATCH-FIX-UPSTREAM PackageKit-zypp-packagesize.patch bnc#764677 dimstar(a)opensuse.org -- libzypp changed API and now returns Bytes instead of KBytes. -Patch3: PackageKit-zypp-packagesize.patch +Patch9: PackageKit-zypp-packagesize.patch BuildRequires: NetworkManager-devel BuildRequires: automake BuildRequires: docbook-utils @@ -296,6 +308,12 @@ %endif %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 %build # Needed due to patch 3 ++++++ 0001-Change-the-configuration-of-the-cron-script-to-a-sys.patch ++++++ --- /var/tmp/diff_new_pack.Pf4GY0/_old 2012-07-30 20:37:39.000000000 +0200 +++ /var/tmp/diff_new_pack.Pf4GY0/_new 2012-07-30 20:37:39.000000000 +0200 @@ -1,7 +1,7 @@ From 744da7ce30ec3ef1fc5e1a40a9ffab520315ab06 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz(a)opensuse.org> Date: Tue, 26 Jul 2011 11:34:22 +0200 -Subject: [PATCH 1/3] Change the configuration of the cron script to a +Subject: [PATCH 1/9] Change the configuration of the cron script to a sysconfig-like config --- @@ -65,5 +65,5 @@ +# SLEEP_MAX=3600 -- -1.7.9.2 +1.7.10.4 ++++++ 0002-Build-against-npapi-sdk-instead-of-xulrunner.patch ++++++ --- /var/tmp/diff_new_pack.Pf4GY0/_old 2012-07-30 20:37:39.000000000 +0200 +++ /var/tmp/diff_new_pack.Pf4GY0/_new 2012-07-30 20:37:39.000000000 +0200 @@ -1,7 +1,7 @@ From cb38c672b92c85923826612520076cbb5d204ad7 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer <wr(a)rosenauer.org> Date: Tue, 25 Oct 2011 14:27:15 +0200 -Subject: [PATCH 2/3] Build against npapi-sdk instead of xulrunner +Subject: [PATCH 2/9] Build against npapi-sdk instead of xulrunner https://bugs.freedesktop.org/show_bug.cgi?id=40026 --- @@ -22,5 +22,5 @@ nspr >= 4.8 \ cairo \ -- -1.7.9.2 +1.7.10.4 ++++++ 0003-Revert-packagekit-qt2-Since-new-methods-and-enums-wh.patch ++++++ --- /var/tmp/diff_new_pack.Pf4GY0/_old 2012-07-30 20:37:39.000000000 +0200 +++ /var/tmp/diff_new_pack.Pf4GY0/_new 2012-07-30 20:37:39.000000000 +0200 @@ -1,7 +1,7 @@ From 1e15aa707dfaf20d47e2679b0d6fb8a6fb2d59c2 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz(a)gnome.org> Date: Thu, 26 Apr 2012 15:17:01 +0200 -Subject: [PATCH 3/3] Revert "packagekit-qt2: Since new methods and enums +Subject: [PATCH 3/9] Revert "packagekit-qt2: Since new methods and enums where added let's change the version number to 2.0.1" This reverts commit 79545c4c40b20c2380c18971122efb7c72b7dd0a. @@ -28,5 +28,5 @@ AC_SUBST(LT_QT_REVISION) AC_SUBST(LT_QT_AGE) -- -1.7.9.2 +1.7.10.4 ++++++ 0004-zypp-use-pre-increment-in-for-loops-to-avoid-tempora.patch ++++++ >From 98fbc1bfdbb175314d02202ea3b3495ee62fda19 Mon Sep 17 00:00:00 2001 From: Michael Andres <ma(a)suse.de> Date: Fri, 6 Jul 2012 11:38:03 +0200 Subject: [PATCH 4/9] zypp: use pre-increment in for-loops to avoid temporaries --- backends/zypp/pk-backend-zypp.cpp | 50 ++++++++++++++++++------------------- backends/zypp/zypp-utils.cpp | 30 +++++++++++----------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index 5b30bee..71bdd55 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -191,7 +191,7 @@ backend_get_requires_thread (PkBackend *backend) gchar **id_parts = pk_package_id_split (package_ids[i]); for (ResPool::byIdent_iterator it = pool.byIdentBegin (ResKind::package, id_parts[PK_PACKAGE_ID_NAME]); - it != pool.byIdentEnd (ResKind::package, id_parts[PK_PACKAGE_ID_NAME]); it++) { + it != pool.byIdentEnd (ResKind::package, id_parts[PK_PACKAGE_ID_NAME]); ++it) { if (it->status ().isInstalled ()) { package = (*it); found = TRUE; @@ -228,7 +228,7 @@ backend_get_requires_thread (PkBackend *backend) if (!solver.resolvePool ()) { list<ResolverProblem_Ptr> problems = solver.problems (); - for (list<ResolverProblem_Ptr>::iterator it = problems.begin (); it != problems.end (); it++){ + for (list<ResolverProblem_Ptr>::iterator it = problems.begin (); it != problems.end (); ++it){ g_warning("Solver problem (This should never happen): '%s'", (*it)->description ().c_str ()); } return zypp_backend_finished_error ( @@ -239,7 +239,7 @@ backend_get_requires_thread (PkBackend *backend) // look for packages which would be uninstalled bool error = false; for (ResPool::byKind_iterator it = pool.byKindBegin (ResKind::package); - it != pool.byKindEnd (ResKind::package); it++) { + it != pool.byKindEnd (ResKind::package); ++it) { if (!error && !zypp_filter_solvable (_filters, it->resolvable()->satSolvable())) error = !zypp_backend_pool_item_notify (backend, *it); @@ -351,7 +351,7 @@ backend_get_depends_thread (PkBackend *backend) gboolean pool_item_found = FALSE; // Iterate over the resolvables and mark the one we want to check its dependencies for (ResPool::byIdent_iterator it = pool.byIdentBegin (ResKind::package, id_parts[PK_PACKAGE_ID_NAME]); - it != pool.byIdentEnd (ResKind::package, id_parts[PK_PACKAGE_ID_NAME]); it++) { + it != pool.byIdentEnd (ResKind::package, id_parts[PK_PACKAGE_ID_NAME]); ++it) { PoolItem selectable = *it; if (strcmp (selectable->name().c_str(), id_parts[PK_PACKAGE_ID_NAME]) == 0) { // This package matches the name we're looking @@ -446,7 +446,7 @@ backend_get_depends_thread (PkBackend *backend) // print dependencies for (map<string, sat::Solvable>::iterator it = caps.begin (); it != caps.end(); - it++) { + ++it) { // backup sanity check for no-solvables if (! it->second.name ().c_str() || @@ -524,7 +524,7 @@ backend_get_details_thread (PkBackend *backend) sat::Solvable package; for (vector<sat::Solvable>::iterator it = v.begin (); - it != v.end (); it++) { + it != v.end (); ++it) { if (zypp_ver_and_arch_equal (*it, id_parts[PK_PACKAGE_ID_VERSION], id_parts[PK_PACKAGE_ID_ARCH])) { package = *it; @@ -560,7 +560,7 @@ backend_get_details_thread (PkBackend *backend) Patch::constPtr patch = asKind<Patch>(item); sat::SolvableSet content = patch->contents (); - for (sat::SolvableSet::const_iterator it = content.begin (); it != content.end (); it++) + for (sat::SolvableSet::const_iterator it = content.begin (); it != content.end (); ++it) size += it->lookupNumAttribute (sat::SolvAttr::downloadsize); } else size = package.lookupNumAttribute (sat::SolvAttr::downloadsize); @@ -621,7 +621,7 @@ backend_get_distro_upgrades_thread(PkBackend *backend) backend, PK_ERROR_ENUM_INTERNAL_ERROR, "Could not parse /etc/products.d"); } - for (vector<parser::ProductFileData>::iterator it = result.begin (); it != result.end (); it++) { + for (vector<parser::ProductFileData>::iterator it = result.begin (); it != result.end (); ++it) { vector<parser::ProductFileData::Upgrade> upgrades = it->upgrades(); for (vector<parser::ProductFileData::Upgrade>::iterator it2 = upgrades.begin (); it2 != upgrades.end (); it2++) { if (it2->notify ()){ @@ -948,7 +948,7 @@ backend_get_update_detail_thread (PkBackend *backend) sat::SolvableSet content = patch->contents (); - for (sat::SolvableSet::const_iterator it = content.begin (); it != content.end (); it++) { + for (sat::SolvableSet::const_iterator it = content.begin (); it != content.end (); ++it) { //obsoletes = g_strconcat (obsoletes, zypp_build_package_id_capabilities (it->obsoletes ()), PK_PACKAGE_IDS_DELIM, (gchar *)NULL); if (strlen(obsoletes) == 0) { obsoletes = zypp_build_package_id_capabilities (it->obsoletes ()); @@ -1096,7 +1096,7 @@ backend_install_packages_thread (PkBackend *backend) // Do we have this installed ? gboolean system = false; for (ResPool::byName_iterator it = pool.byNameBegin (name); - it != pool.byNameEnd (name); it++) { + it != pool.byNameEnd (name); ++it) { g_debug ("PoolItem '%s'", it->satSolvable().asString().c_str()); @@ -1115,7 +1115,7 @@ backend_install_packages_thread (PkBackend *backend) // Choose the PoolItem with the right architecture and version for (ResPool::byName_iterator it = pool.byNameBegin (name); - it != pool.byNameEnd (name); it++) { + it != pool.byNameEnd (name); ++it) { if (zypp_ver_and_arch_equal (it->satSolvable(), id_parts[PK_PACKAGE_ID_VERSION], id_parts[PK_PACKAGE_ID_ARCH])) { @@ -1150,7 +1150,7 @@ backend_install_packages_thread (PkBackend *backend) // PK_INFO_ENUM_DOWNLOADING | INSTALLING) for each package. if (!zypp_perform_execution (backend, INSTALL, FALSE)) { // reset the status of the marked packages - for (vector<PoolItem>::iterator it = items->begin (); it != items->end (); it++) { + for (vector<PoolItem>::iterator it = items->begin (); it != items->end (); ++it) { it->statusReset (); } delete (items); @@ -1250,7 +1250,7 @@ backend_remove_packages_thread (PkBackend *backend) // Iterate over the resolvables and mark the ones we want to remove ResPool pool = ResPool::instance (); for (ResPool::byIdent_iterator it = pool.byIdentBegin (ResKind::package, id_parts[PK_PACKAGE_ID_NAME]); - it != pool.byIdentEnd (ResKind::package, id_parts[PK_PACKAGE_ID_NAME]); it++) { + it != pool.byIdentEnd (ResKind::package, id_parts[PK_PACKAGE_ID_NAME]); ++it) { if ((*it)->isSystem ()) { it->status ().setToBeUninstalled (ResStatus::USER); items->push_back (*it); @@ -1268,7 +1268,7 @@ backend_remove_packages_thread (PkBackend *backend) { if (!zypp_perform_execution (backend, REMOVE, TRUE)) { //reset the status of the marked packages - for (vector<PoolItem>::iterator it = items->begin (); it != items->end (); it++) { + for (vector<PoolItem>::iterator it = items->begin (); it != items->end (); ++it) { it->statusReset(); } delete (items); @@ -1347,7 +1347,7 @@ backend_resolve_thread (PkBackend *backend) vector<sat::Solvable> pkgs; /* Filter the list of packages with this name to 'pkgs' */ - for (vector<sat::Solvable>::iterator it = v.begin (); it != v.end (); it++) { + for (vector<sat::Solvable>::iterator it = v.begin (); it != v.end (); ++it) { if (zypp_filter_solvable (_filters, *it) || *it == sat::Solvable::noSolvable) @@ -1514,7 +1514,7 @@ backend_search_group_thread (PkBackend *backend) sat::LookupAttr look (sat::SolvAttr::group); - for (sat::LookupAttr::iterator it = look.begin (); it != look.end (); it++) { + for (sat::LookupAttr::iterator it = look.begin (); it != look.end (); ++it) { PkGroupEnum rpmGroup = get_enum_group (it.asString ()); if (pkGroup == rpmGroup) v.push_back (it.inSolvable ()); @@ -1580,7 +1580,7 @@ pk_backend_get_repo_list (PkBackend *backend, PkBitfield filters) return; } - for (list <RepoInfo>::iterator it = repos.begin(); it != repos.end(); it++) { + for (list <RepoInfo>::iterator it = repos.begin(); it != repos.end(); ++it) { if (pk_bitfield_contain (filters, PK_FILTER_ENUM_NOT_DEVELOPMENT) && zypp_is_development_repo (backend, *it)) continue; // RepoInfo::alias - Unique identifier for this source. @@ -1672,7 +1672,7 @@ backend_get_files_thread (PkBackend *backend) sat::Solvable package; for (vector<sat::Solvable>::iterator it = v.begin (); - it != v.end (); it++) { + it != v.end (); ++it) { char *version = g_strdup (it->edition ().asString ().c_str ()); if (strcmp (id_parts[PK_PACKAGE_ID_VERSION], version) == 0) { g_free (version); @@ -1695,7 +1695,7 @@ backend_get_files_thread (PkBackend *backend) target::rpm::RpmHeader::constPtr rpmHeader = zypp_get_rpmHeader (package.name (), package.edition ()); list<string> files = rpmHeader->tag_filenames (); - for (list<string>::iterator it = files.begin (); it != files.end (); it++) { + for (list<string>::iterator it = files.begin (); it != files.end (); ++it) { temp.append (*it); temp.append (";"); } @@ -1742,7 +1742,7 @@ backend_get_packages_thread (PkBackend *backend) zypp_build_pool (backend, TRUE); ResPool pool = ResPool::instance (); - for (ResPool::byKind_iterator it = pool.byKindBegin (ResKind::package); it != pool.byKindEnd (ResKind::package); it++) { + for (ResPool::byKind_iterator it = pool.byKindBegin (ResKind::package); it != pool.byKindEnd (ResKind::package); ++it) { v.push_back (it->satSolvable ()); } @@ -1786,7 +1786,7 @@ backend_update_packages_thread (PkBackend *backend) // Do we have already the latest version. gboolean system = false; for (ResPool::byName_iterator it = pool.byNameBegin (name); - it != pool.byNameEnd (name); it++) { + it != pool.byNameEnd (name); ++it) { if (!it->satSolvable().isSystem()) continue; if (zypp_ver_and_arch_equal (it->satSolvable(), id_parts[PK_PACKAGE_ID_VERSION], @@ -2000,7 +2000,7 @@ backend_what_provides_thread (PkBackend *backend) if (!solver.resolvePool ()) { list<ResolverProblem_Ptr> problems = solver.problems (); - for (list<ResolverProblem_Ptr>::iterator it = problems.begin (); it != problems.end (); it++){ + for (list<ResolverProblem_Ptr>::iterator it = problems.begin (); it != problems.end (); ++it){ g_warning("Solver problem (This should never happen): '%s'", (*it)->description ().c_str ()); } solver.setIgnoreAlreadyRecommended (FALSE); @@ -2010,7 +2010,7 @@ backend_what_provides_thread (PkBackend *backend) // look for packages which would be installed for (ResPool::byKind_iterator it = pool.byKindBegin (ResKind::package); - it != pool.byKindEnd (ResKind::package); it++) { + it != pool.byKindEnd (ResKind::package); ++it) { PkInfoEnum status = PK_INFO_ENUM_UNKNOWN; gboolean hit = FALSE; @@ -2031,7 +2031,7 @@ backend_what_provides_thread (PkBackend *backend) Capability cap (search); sat::WhatProvides prov (cap); - for (sat::WhatProvides::const_iterator it = prov.begin (); it != prov.end (); it++) { + for (sat::WhatProvides::const_iterator it = prov.begin (); it != prov.end (); ++it) { if (zypp_filter_solvable (_filters, *it)) continue; @@ -2094,7 +2094,7 @@ backend_download_packages_thread (PkBackend *backend) gchar **id_parts = pk_package_id_split (package_ids[i]); string name = id_parts[PK_PACKAGE_ID_NAME]; - for (ResPool::byName_iterator it = pool.byNameBegin (name); it != pool.byNameEnd (name); it++) { + for (ResPool::byName_iterator it = pool.byNameBegin (name); it != pool.byNameEnd (name); ++it) { if (zypp_ver_and_arch_equal (it->satSolvable(), id_parts[PK_PACKAGE_ID_VERSION], id_parts[PK_PACKAGE_ID_ARCH])) { size += 2 * it->satSolvable().lookupNumAttribute (sat::SolvAttr::downloadsize); diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp index 09042ec..66bc523 100644 --- a/backends/zypp/zypp-utils.cpp +++ b/backends/zypp/zypp-utils.cpp @@ -224,7 +224,7 @@ zypp_build_pool (PkBackend *backend, gboolean include_local) // Add resolvables from enabled repos RepoManager manager; try { - for (RepoManager::RepoConstIterator it = manager.repoBegin(); it != manager.repoEnd(); it++) { + for (RepoManager::RepoConstIterator it = manager.repoBegin(); it != manager.repoEnd(); ++it) { RepoInfo repo (*it); // skip disabled repos @@ -365,7 +365,7 @@ zypp_get_packages_by_name (PkBackend *backend, ResPool pool(ResPool::instance()); for (ResPool::byIdent_iterator it = pool.byIdentBegin (kind, package_name); - it != pool.byIdentEnd (kind, package_name); it++) { + it != pool.byIdentEnd (kind, package_name); ++it) { result.push_back (it->satSolvable ()); } } @@ -393,7 +393,7 @@ zypp_get_packages_by_file (PkBackend *backend, Capability cap (search_file); sat::WhatProvides prov (cap); - for(sat::WhatProvides::const_iterator it = prov.begin (); it != prov.end (); it++) { + for(sat::WhatProvides::const_iterator it = prov.begin (); it != prov.end (); ++it) { ret.push_back (*it); } } @@ -422,7 +422,7 @@ zypp_get_package_by_id (PkBackend *backend, const gchar *package_id) sat::Solvable package; for (vector<sat::Solvable>::iterator it = v.begin (); - it != v.end (); it++) { + it != v.end (); ++it) { if (zypp_ver_and_arch_equal (*it, id_parts[PK_PACKAGE_ID_VERSION], id_parts[PK_PACKAGE_ID_ARCH])) { package = *it; @@ -660,7 +660,7 @@ zypp_emit_filtered_packages_in_list (PkBackend *backend, const vector<sat::Solva PkBitfield filters = (PkBitfield) pk_backend_get_uint (backend, "filters"); // always emit system installed packages first - for (sat_it_t it = v.begin (); it != v.end (); it++) { + for (sat_it_t it = v.begin (); it != v.end (); ++it) { if (!it->isSystem() || zypp_filter_solvable (filters, *it)) continue; @@ -671,7 +671,7 @@ zypp_emit_filtered_packages_in_list (PkBackend *backend, const vector<sat::Solva } // then available packages later - for (sat_it_t it = v.begin (); it != v.end (); it++) { + for (sat_it_t it = v.begin (); it != v.end (); ++it) { gboolean match; if (it->isSystem() || @@ -869,7 +869,7 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) ResolverProblemList problems = zypp->resolver ()->problems (); gchar * emsg = NULL, * tempmsg = NULL; - for (ResolverProblemList::iterator it = problems.begin (); it != problems.end (); it++) { + for (ResolverProblemList::iterator it = problems.begin (); it != problems.end (); ++it) { if (emsg == NULL) { emsg = g_strdup ((*it)->description ().c_str ()); } @@ -882,7 +882,7 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) // reset the status of all touched PoolItems ResPool pool = ResPool::instance (); - for (ResPool::const_iterator it = pool.begin (); it != pool.end (); it++) { + for (ResPool::const_iterator it = pool.begin (); it != pool.end (); ++it) { if (it->status ().isToBeInstalled ()) it->statusReset (); } @@ -911,7 +911,7 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) g_debug ("simulating"); - for (ResPool::const_iterator it = pool.begin (); it != pool.end (); it++) { + for (ResPool::const_iterator it = pool.begin (); it != pool.end (); ++it) { if (type == REMOVE && !(*it)->isSystem ()) { it->statusReset (); continue; @@ -926,7 +926,7 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) // look for licenses to confirm - for (ResPool::const_iterator it = pool.begin (); it != pool.end (); it++) { + for (ResPool::const_iterator it = pool.begin (); it != pool.end (); ++it) { if (it->status ().isToBeInstalled () && !(it->satSolvable ().lookupStrAttribute (sat::SolvAttr::eula).empty ())) { gchar *eula_id = g_strdup ((*it)->name ().c_str ()); gboolean has_eula = pk_backend_is_eula_valid (backend, eula_id); @@ -962,7 +962,7 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) ZYppCommitResult::PoolItemList errors = result._errors; gchar *emsg = NULL, *tmpmsg = NULL; - for (ZYppCommitResult::PoolItemList::iterator it = errors.begin (); it != errors.end (); it++){ + for (ZYppCommitResult::PoolItemList::iterator it = errors.begin (); it != errors.end (); ++it){ if (emsg == NULL) { emsg = g_strdup ((*it)->name ().c_str ()); } else { @@ -973,7 +973,7 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) } ZYppCommitResult::PoolItemList remaining = result._remaining; - for (ZYppCommitResult::PoolItemList::iterator it = remaining.begin (); it != remaining.end (); it++){ + for (ZYppCommitResult::PoolItemList::iterator it = remaining.begin (); it != remaining.end (); ++it){ if (emsg == NULL) { emsg = g_strdup ((*it)->name ().c_str ()); } else { @@ -984,7 +984,7 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) } ZYppCommitResult::PoolItemList srcremaining = result._srcremaining; - for (ZYppCommitResult::PoolItemList::iterator it = srcremaining.begin (); it != srcremaining.end (); it++){ + for (ZYppCommitResult::PoolItemList::iterator it = srcremaining.begin (); it != srcremaining.end (); ++it){ if (emsg == NULL) { emsg = g_strdup ((*it)->name ().c_str ()); } else { @@ -1030,7 +1030,7 @@ zypp_build_package_id_capabilities (Capabilities caps) sat::WhatProvides provs (caps); - for (sat::WhatProvides::const_iterator it = provs.begin (); it != provs.end (); it++) { + for (sat::WhatProvides::const_iterator it = provs.begin (); it != provs.end (); ++it) { gchar *package_id = zypp_build_package_id_from_resolvable (*it); //package_ids = g_strconcat (package_ids, package_id, PK_PACKAGE_IDS_DELIM, (gchar *)NULL); if (strlen (package_ids) == 0) { @@ -1076,7 +1076,7 @@ zypp_refresh_cache (PkBackend *backend, gboolean force) int num_of_repos = repos.size (); gchar *repo_messages = NULL; - for (list <RepoInfo>::iterator it = repos.begin(); it != repos.end(); it++, i++) { + for (list <RepoInfo>::iterator it = repos.begin(); it != repos.end(); ++it, i++) { RepoInfo repo (*it); if (!zypp_is_valid_repo (backend, repo)) -- 1.7.10.4 ++++++ 0005-zypp-don-t-waste-time-comparing-zypp-Arch-string-rep.patch ++++++ >From e7cd99b8b4911662bf825c7158155726b45fc0b6 Mon Sep 17 00:00:00 2001 From: Michael Andres <ma(a)suse.de> Date: Fri, 6 Jul 2012 12:09:59 +0200 Subject: [PATCH 5/9] zypp: don't waste time comparing zypp::Arch string representations --- backends/zypp/zypp-utils.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp index 66bc523..726b9da 100644 --- a/backends/zypp/zypp-utils.cpp +++ b/backends/zypp/zypp-utils.cpp @@ -588,8 +588,7 @@ gboolean system_and_package_are_x86 (sat::Solvable item) { // i586, i686, ... all should be considered the same arch for our comparison - return (!strcmp (item.arch ().asString ().c_str (), "i586") && - !strcmp (ZConfig::defaultSystemArchitecture ().asString().c_str(), "i686")); + return ( item.arch() == Arch_i586 && ZConfig::defaultSystemArchitecture() == Arch_i686 ); } static gboolean -- 1.7.10.4 ++++++ 0006-zypp-set-CXXFLAGS-and-use-std-c-0x-as-libzypp-does-b.patch ++++++ >From 4c83afd82f9a7161f2a878fef9d82bde447eeb13 Mon Sep 17 00:00:00 2001 From: Michael Andres <ma(a)suse.de> Date: Fri, 6 Jul 2012 11:39:15 +0200 Subject: [PATCH 6/9] zypp: set CXXFLAGS and use --std=c++0x as libzypp does (bnc#769764) --- backends/zypp/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/backends/zypp/Makefile.am b/backends/zypp/Makefile.am index 4465910..afee825 100644 --- a/backends/zypp/Makefile.am +++ b/backends/zypp/Makefile.am @@ -10,6 +10,7 @@ libpk_backend_zypp_la_SOURCES = \ libpk_backend_zypp_la_LIBADD = $(PK_PLUGIN_LIBS) libpk_backend_zypp_la_LDFLAGS = -module -avoid-version $(ZYPP_LIBS) libpk_backend_zypp_la_CFLAGS = $(PK_PLUGIN_CFLAGS) $(WARNINGFLAGS_CPP) +libpk_backend_zypp_la_CXXFLAGS = $(PK_PLUGIN_CXXFLAGS) --std=c++0x -Wall -Woverloaded-virtual -Wnon-virtual-dtor libpk_backend_zypp_la_CPPFLAGS = $(PK_PLUGIN_CFLAGS) $(ZYPP_CFLAGS) -Wno-deprecated EXTRA_DIST = \ -- 1.7.10.4 ++++++ 0007-zypp-fix-missing-dtor.patch ++++++ >From e230555586b5fa6d9b41677237834bafcc7b1cab Mon Sep 17 00:00:00 2001 From: Michael Andres <ma(a)suse.de> Date: Fri, 6 Jul 2012 13:19:16 +0200 Subject: [PATCH 7/9] zypp: fix missing dtor --- backends/zypp/zypp-events.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backends/zypp/zypp-events.h b/backends/zypp/zypp-events.h index 5877f8d..9f29fbd 100644 --- a/backends/zypp/zypp-events.h +++ b/backends/zypp/zypp-events.h @@ -175,6 +175,9 @@ struct ZyppBackendReceiver _sub_percentage = 0; pk_backend_set_sub_percentage (_backend, _sub_percentage); } + +protected: + ~ZyppBackendReceiver() {} // or a public virtual one }; struct InstallResolvableReportReceiver : public zypp::callback::ReceiveReport<zypp::target::rpm::InstallResolvableReport>, ZyppBackendReceiver -- 1.7.10.4 ++++++ 0008-zypp-no-longer-use-the-old-and-deprecated-ZYppCommit.patch ++++++ >From 8e010c204c348892a7dd5ee11cdb30a24ded3563 Mon Sep 17 00:00:00 2001 From: Michael Andres <ma(a)suse.de> Date: Fri, 6 Jul 2012 13:25:25 +0200 Subject: [PATCH 8/9] zypp: no longer use the old and deprecated ZYppCommitResult members (bnc#769764) --- backends/zypp/zypp-utils.cpp | 54 +++++++++++++----------------------------- 1 file changed, 17 insertions(+), 37 deletions(-) diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp index 726b9da..55e13a3 100644 --- a/backends/zypp/zypp-utils.cpp +++ b/backends/zypp/zypp-utils.cpp @@ -956,50 +956,30 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) ZYppCommitResult result = zypp->commit (policy); - if(!result._errors.empty () || !result._remaining.empty () || !result._srcremaining.empty ()){ - - ZYppCommitResult::PoolItemList errors = result._errors; - gchar *emsg = NULL, *tmpmsg = NULL; - - for (ZYppCommitResult::PoolItemList::iterator it = errors.begin (); it != errors.end (); ++it){ - if (emsg == NULL) { - emsg = g_strdup ((*it)->name ().c_str ()); - } else { - tmpmsg = emsg; - emsg = g_strconcat (emsg, "\n", (*it)->name ().c_str (), NULL); - g_free (tmpmsg); - } - } - - ZYppCommitResult::PoolItemList remaining = result._remaining; - for (ZYppCommitResult::PoolItemList::iterator it = remaining.begin (); it != remaining.end (); ++it){ - if (emsg == NULL) { - emsg = g_strdup ((*it)->name ().c_str ()); - } else { - tmpmsg = emsg; - emsg = g_strconcat (emsg, "\n", (*it)->name ().c_str (), NULL); - g_free (tmpmsg); - } - } - - ZYppCommitResult::PoolItemList srcremaining = result._srcremaining; - for (ZYppCommitResult::PoolItemList::iterator it = srcremaining.begin (); it != srcremaining.end (); ++it){ - if (emsg == NULL) { - emsg = g_strdup ((*it)->name ().c_str ()); - } else { - tmpmsg = emsg; - emsg = g_strconcat (emsg, "\n", (*it)->name ().c_str (), NULL); - g_free (tmpmsg); + if ( ! result.allDone() ) + { + std::ostringstream todolist; + char separator = '\0'; + + // process all steps not DONE (ERROR and TODO) + const sat::Transaction & trans( result.transaction() ); + for_( it, trans.actionBegin(~sat::Transaction::STEP_DONE), trans.actionEnd() ) + { + if ( separator ) + todolist << separator << it->ident(); + else + { + todolist << it->ident(); + separator = '\n'; } } pk_backend_error_code (backend, PK_ERROR_ENUM_TRANSACTION_ERROR, "Transaction could not be completed.\n Theses packages could not be installed: %s", - emsg); + todolist.str().c_str()); - g_free (emsg); goto exit; - } + } ret = TRUE; } catch (const repo::RepoNotFoundException &ex) { -- 1.7.10.4 ++++++ 0009-zypp-adjust-PK_FILTER_ENUM_NOT_DEVELOPMENT-bnc-77002.patch ++++++ >From fb6dfc56c3608b931dda9723b6bd49d024d0e04a Mon Sep 17 00:00:00 2001 From: Michael Andres <ma(a)suse.de> Date: Fri, 6 Jul 2012 12:12:49 +0200 Subject: [PATCH 9/9] zypp: adjust PK_FILTER_ENUM_NOT_DEVELOPMENT (bnc#770028) --- backends/zypp/zypp-utils.cpp | 49 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp index 55e13a3..c8b69c2 100644 --- a/backends/zypp/zypp-utils.cpp +++ b/backends/zypp/zypp-utils.cpp @@ -146,33 +146,34 @@ zypp_is_changeable_media (PkBackend *backend, const Url &url) return is_cd; } +namespace { + /// Helper finding pattern at end or embedded in name. + /// E.g '-debug' in 'repo-debug' or 'repo-debug-update' + inline bool + name_ends_or_contains( const std::string & name_r, const std::string & pattern_r, const char sepchar_r = '-' ) + { + if ( ! pattern_r.empty() ) + { + for ( std::string::size_type pos = name_r.find( pattern_r ); + pos != std::string::npos; + pos = name_r.find( pattern_r, pos + pattern_r.size() ) ) + { + if ( pos + pattern_r.size() == name_r.size() // at end + || name_r[pos + pattern_r.size()] == sepchar_r ) // embedded + return true; + } + } + return false; + } +} + gboolean zypp_is_development_repo (PkBackend *backend, RepoInfo repo) { - string repo_debuginfo("-debuginfo"); - string repo_debug("-debug"); - string repo_development("-development"); - string repo_source ("-source"); - - string repo_name(repo.name()); - - if (repo_name.length() > repo_debuginfo.length() && - repo_name.compare(repo_name.length() - repo_debuginfo.length(), repo_debuginfo.length(), repo_debuginfo) == 0) - return TRUE; - - if (repo_name.length() > repo_debug.length() && - repo_name.compare(repo_name.length() - repo_debug.length(), repo_debug.length(), repo_debug) == 0) - return TRUE; - - if (repo_name.length() > repo_development.length() && - repo_name.compare(repo_name.length() - repo_development.length(), repo_development.length(), repo_development) == 0) - return TRUE; - - if (repo_name.length() > repo_source.length() && - repo_name.compare(repo_name.length() - repo_source.length(), repo_source.length(), repo_source) == 0) - return TRUE; - - return FALSE; + return ( name_ends_or_contains( repo.alias(), "-debuginfo" ) + || name_ends_or_contains( repo.alias(), "-debug" ) + || name_ends_or_contains( repo.alias(), "-source" ) + || name_ends_or_contains( repo.alias(), "-development" ) ); } gboolean -- 1.7.10.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit PackageKit for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '12

30 Jul '12

Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at 2012-07-30 20:37:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PackageKit (Old) and /work/SRC/openSUSE:Factory/.PackageKit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "PackageKit", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/PackageKit/PackageKit.changes 2012-06-26 17:10:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.PackageKit.new/PackageKit.changes 2012-07-30 20:37:30.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Jul 18 20:00:46 UTC 2012 - dimstar(a)opensuse.org + +- Add Patches from the openSUSE_Factory PK branch (in order to fix + bnc#769674 and bnc#770028): + + 0004-zypp-use-pre-increment-in-for-loops-to-avoid-tempora.patch + + 0005-zypp-don-t-waste-time-comparing-zypp-Arch-string-rep.patch + + 0006-zypp-set-CXXFLAGS-and-use-std-c-0x-as-libzypp-does-b.patch + + 0007-zypp-fix-missing-dtor.patch + + 0008-zypp-no-longer-use-the-old-and-deprecated-ZYppCommit.patch + + 0009-zypp-adjust-PK_FILTER_ENUM_NOT_DEVELOPMENT-bnc-77002.patch + +------------------------------------------------------------------- New: ---- 0004-zypp-use-pre-increment-in-for-loops-to-avoid-tempora.patch 0005-zypp-don-t-waste-time-comparing-zypp-Arch-string-rep.patch 0006-zypp-set-CXXFLAGS-and-use-std-c-0x-as-libzypp-does-b.patch 0007-zypp-fix-missing-dtor.patch 0008-zypp-no-longer-use-the-old-and-deprecated-ZYppCommit.patch 0009-zypp-adjust-PK_FILTER_ENUM_NOT_DEVELOPMENT-bnc-77002.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.cAC0I4/_old 2012-07-30 20:37:34.000000000 +0200 +++ /var/tmp/diff_new_pack.cAC0I4/_new 2012-07-30 20:37:34.000000000 +0200 @@ -55,9 +55,21 @@ Patch1: 0002-Build-against-npapi-sdk-instead-of-xulrunner.patch # PATCH-FIX-UPSTREAM 0003-Revert-packagekit-qt2-Since-new-methods-and-enums-wh.patch vuntz(a)opensuse.org -- Fix broken soversion of libpackagekit-qt2, will be fixed properly in next upstream version Patch2: 0003-Revert-packagekit-qt2-Since-new-methods-and-enums-wh.patch +# PATCH-FIX-UPSTREAM 0004-zypp-use-pre-increment-in-for-loops-to-avoid-tempora.patch dimstar(a)opensuse.org -- zypp: use pre-increment in for-loops to avoid temporaries +Patch3: 0004-zypp-use-pre-increment-in-for-loops-to-avoid-tempora.patch +# PATCH-FIX-UPSTREAM 0005-zypp-don-t-waste-time-comparing-zypp-Arch-string-rep.patch dimstar(a)opensuse.org -- don't waste time comparing zypp::Arch string representations +Patch4: 0005-zypp-don-t-waste-time-comparing-zypp-Arch-string-rep.patch +# PATCH-FIX-UPSTREAM 0006-zypp-set-CXXFLAGS-and-use-std-c-0x-as-libzypp-does-b.patch bnc#769764 dimstar(a)opensuse.org -- set CXXFLAGS and use --std=c++0x as libzypp does +Patch5: 0006-zypp-set-CXXFLAGS-and-use-std-c-0x-as-libzypp-does-b.patch +# PATCH-FIX-UPSTREAM 0007-zypp-fix-missing-dtor.patch dimstar(a)opensuse.org -- fix missing dtor +Patch6: 0007-zypp-fix-missing-dtor.patch +# PATCH-FIX-UPSTREAM 0008-zypp-no-longer-use-the-old-and-deprecated-ZYppCommit.patch bnc#769764 dimstar(a)opensuse.org -- no longer use the old and deprecated ZYppCommitResult members +Patch7: 0008-zypp-no-longer-use-the-old-and-deprecated-ZYppCommit.patch +# PATCH-FIX-UpSTREAM 0009-zypp-adjust-PK_FILTER_ENUM_NOT_DEVELOPMENT-bnc-77002.patch bnc#770028 dimstar(a)opensuse.org -- adjust PK_FILTER_ENUM_NOT_DEVELOPMENT +Patch8: 0009-zypp-adjust-PK_FILTER_ENUM_NOT_DEVELOPMENT-bnc-77002.patch # # PATCH-FIX-UPSTREAM PackageKit-zypp-packagesize.patch bnc#764677 dimstar(a)opensuse.org -- libzypp changed API and now returns Bytes instead of KBytes. -Patch3: PackageKit-zypp-packagesize.patch +Patch9: PackageKit-zypp-packagesize.patch BuildRequires: NetworkManager-devel BuildRequires: automake BuildRequires: docbook-utils @@ -296,6 +308,12 @@ %endif %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 %build # Needed due to patch 3 ++++++ 0001-Change-the-configuration-of-the-cron-script-to-a-sys.patch ++++++ --- /var/tmp/diff_new_pack.cAC0I4/_old 2012-07-30 20:37:34.000000000 +0200 +++ /var/tmp/diff_new_pack.cAC0I4/_new 2012-07-30 20:37:34.000000000 +0200 @@ -1,7 +1,7 @@ From 744da7ce30ec3ef1fc5e1a40a9ffab520315ab06 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz(a)opensuse.org> Date: Tue, 26 Jul 2011 11:34:22 +0200 -Subject: [PATCH 1/3] Change the configuration of the cron script to a +Subject: [PATCH 1/9] Change the configuration of the cron script to a sysconfig-like config --- @@ -65,5 +65,5 @@ +# SLEEP_MAX=3600 -- -1.7.9.2 +1.7.10.4 ++++++ 0002-Build-against-npapi-sdk-instead-of-xulrunner.patch ++++++ --- /var/tmp/diff_new_pack.cAC0I4/_old 2012-07-30 20:37:34.000000000 +0200 +++ /var/tmp/diff_new_pack.cAC0I4/_new 2012-07-30 20:37:34.000000000 +0200 @@ -1,7 +1,7 @@ From cb38c672b92c85923826612520076cbb5d204ad7 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer <wr(a)rosenauer.org> Date: Tue, 25 Oct 2011 14:27:15 +0200 -Subject: [PATCH 2/3] Build against npapi-sdk instead of xulrunner +Subject: [PATCH 2/9] Build against npapi-sdk instead of xulrunner https://bugs.freedesktop.org/show_bug.cgi?id=40026 --- @@ -22,5 +22,5 @@ nspr >= 4.8 \ cairo \ -- -1.7.9.2 +1.7.10.4 ++++++ 0003-Revert-packagekit-qt2-Since-new-methods-and-enums-wh.patch ++++++ --- /var/tmp/diff_new_pack.cAC0I4/_old 2012-07-30 20:37:34.000000000 +0200 +++ /var/tmp/diff_new_pack.cAC0I4/_new 2012-07-30 20:37:34.000000000 +0200 @@ -1,7 +1,7 @@ From 1e15aa707dfaf20d47e2679b0d6fb8a6fb2d59c2 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz(a)gnome.org> Date: Thu, 26 Apr 2012 15:17:01 +0200 -Subject: [PATCH 3/3] Revert "packagekit-qt2: Since new methods and enums +Subject: [PATCH 3/9] Revert "packagekit-qt2: Since new methods and enums where added let's change the version number to 2.0.1" This reverts commit 79545c4c40b20c2380c18971122efb7c72b7dd0a. @@ -28,5 +28,5 @@ AC_SUBST(LT_QT_REVISION) AC_SUBST(LT_QT_AGE) -- -1.7.9.2 +1.7.10.4 ++++++ 0004-zypp-use-pre-increment-in-for-loops-to-avoid-tempora.patch ++++++ >From 98fbc1bfdbb175314d02202ea3b3495ee62fda19 Mon Sep 17 00:00:00 2001 From: Michael Andres <ma(a)suse.de> Date: Fri, 6 Jul 2012 11:38:03 +0200 Subject: [PATCH 4/9] zypp: use pre-increment in for-loops to avoid temporaries --- backends/zypp/pk-backend-zypp.cpp | 50 ++++++++++++++++++------------------- backends/zypp/zypp-utils.cpp | 30 +++++++++++----------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index 5b30bee..71bdd55 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -191,7 +191,7 @@ backend_get_requires_thread (PkBackend *backend) gchar **id_parts = pk_package_id_split (package_ids[i]); for (ResPool::byIdent_iterator it = pool.byIdentBegin (ResKind::package, id_parts[PK_PACKAGE_ID_NAME]); - it != pool.byIdentEnd (ResKind::package, id_parts[PK_PACKAGE_ID_NAME]); it++) { + it != pool.byIdentEnd (ResKind::package, id_parts[PK_PACKAGE_ID_NAME]); ++it) { if (it->status ().isInstalled ()) { package = (*it); found = TRUE; @@ -228,7 +228,7 @@ backend_get_requires_thread (PkBackend *backend) if (!solver.resolvePool ()) { list<ResolverProblem_Ptr> problems = solver.problems (); - for (list<ResolverProblem_Ptr>::iterator it = problems.begin (); it != problems.end (); it++){ + for (list<ResolverProblem_Ptr>::iterator it = problems.begin (); it != problems.end (); ++it){ g_warning("Solver problem (This should never happen): '%s'", (*it)->description ().c_str ()); } return zypp_backend_finished_error ( @@ -239,7 +239,7 @@ backend_get_requires_thread (PkBackend *backend) // look for packages which would be uninstalled bool error = false; for (ResPool::byKind_iterator it = pool.byKindBegin (ResKind::package); - it != pool.byKindEnd (ResKind::package); it++) { + it != pool.byKindEnd (ResKind::package); ++it) { if (!error && !zypp_filter_solvable (_filters, it->resolvable()->satSolvable())) error = !zypp_backend_pool_item_notify (backend, *it); @@ -351,7 +351,7 @@ backend_get_depends_thread (PkBackend *backend) gboolean pool_item_found = FALSE; // Iterate over the resolvables and mark the one we want to check its dependencies for (ResPool::byIdent_iterator it = pool.byIdentBegin (ResKind::package, id_parts[PK_PACKAGE_ID_NAME]); - it != pool.byIdentEnd (ResKind::package, id_parts[PK_PACKAGE_ID_NAME]); it++) { + it != pool.byIdentEnd (ResKind::package, id_parts[PK_PACKAGE_ID_NAME]); ++it) { PoolItem selectable = *it; if (strcmp (selectable->name().c_str(), id_parts[PK_PACKAGE_ID_NAME]) == 0) { // This package matches the name we're looking @@ -446,7 +446,7 @@ backend_get_depends_thread (PkBackend *backend) // print dependencies for (map<string, sat::Solvable>::iterator it = caps.begin (); it != caps.end(); - it++) { + ++it) { // backup sanity check for no-solvables if (! it->second.name ().c_str() || @@ -524,7 +524,7 @@ backend_get_details_thread (PkBackend *backend) sat::Solvable package; for (vector<sat::Solvable>::iterator it = v.begin (); - it != v.end (); it++) { + it != v.end (); ++it) { if (zypp_ver_and_arch_equal (*it, id_parts[PK_PACKAGE_ID_VERSION], id_parts[PK_PACKAGE_ID_ARCH])) { package = *it; @@ -560,7 +560,7 @@ backend_get_details_thread (PkBackend *backend) Patch::constPtr patch = asKind<Patch>(item); sat::SolvableSet content = patch->contents (); - for (sat::SolvableSet::const_iterator it = content.begin (); it != content.end (); it++) + for (sat::SolvableSet::const_iterator it = content.begin (); it != content.end (); ++it) size += it->lookupNumAttribute (sat::SolvAttr::downloadsize); } else size = package.lookupNumAttribute (sat::SolvAttr::downloadsize); @@ -621,7 +621,7 @@ backend_get_distro_upgrades_thread(PkBackend *backend) backend, PK_ERROR_ENUM_INTERNAL_ERROR, "Could not parse /etc/products.d"); } - for (vector<parser::ProductFileData>::iterator it = result.begin (); it != result.end (); it++) { + for (vector<parser::ProductFileData>::iterator it = result.begin (); it != result.end (); ++it) { vector<parser::ProductFileData::Upgrade> upgrades = it->upgrades(); for (vector<parser::ProductFileData::Upgrade>::iterator it2 = upgrades.begin (); it2 != upgrades.end (); it2++) { if (it2->notify ()){ @@ -948,7 +948,7 @@ backend_get_update_detail_thread (PkBackend *backend) sat::SolvableSet content = patch->contents (); - for (sat::SolvableSet::const_iterator it = content.begin (); it != content.end (); it++) { + for (sat::SolvableSet::const_iterator it = content.begin (); it != content.end (); ++it) { //obsoletes = g_strconcat (obsoletes, zypp_build_package_id_capabilities (it->obsoletes ()), PK_PACKAGE_IDS_DELIM, (gchar *)NULL); if (strlen(obsoletes) == 0) { obsoletes = zypp_build_package_id_capabilities (it->obsoletes ()); @@ -1096,7 +1096,7 @@ backend_install_packages_thread (PkBackend *backend) // Do we have this installed ? gboolean system = false; for (ResPool::byName_iterator it = pool.byNameBegin (name); - it != pool.byNameEnd (name); it++) { + it != pool.byNameEnd (name); ++it) { g_debug ("PoolItem '%s'", it->satSolvable().asString().c_str()); @@ -1115,7 +1115,7 @@ backend_install_packages_thread (PkBackend *backend) // Choose the PoolItem with the right architecture and version for (ResPool::byName_iterator it = pool.byNameBegin (name); - it != pool.byNameEnd (name); it++) { + it != pool.byNameEnd (name); ++it) { if (zypp_ver_and_arch_equal (it->satSolvable(), id_parts[PK_PACKAGE_ID_VERSION], id_parts[PK_PACKAGE_ID_ARCH])) { @@ -1150,7 +1150,7 @@ backend_install_packages_thread (PkBackend *backend) // PK_INFO_ENUM_DOWNLOADING | INSTALLING) for each package. if (!zypp_perform_execution (backend, INSTALL, FALSE)) { // reset the status of the marked packages - for (vector<PoolItem>::iterator it = items->begin (); it != items->end (); it++) { + for (vector<PoolItem>::iterator it = items->begin (); it != items->end (); ++it) { it->statusReset (); } delete (items); @@ -1250,7 +1250,7 @@ backend_remove_packages_thread (PkBackend *backend) // Iterate over the resolvables and mark the ones we want to remove ResPool pool = ResPool::instance (); for (ResPool::byIdent_iterator it = pool.byIdentBegin (ResKind::package, id_parts[PK_PACKAGE_ID_NAME]); - it != pool.byIdentEnd (ResKind::package, id_parts[PK_PACKAGE_ID_NAME]); it++) { + it != pool.byIdentEnd (ResKind::package, id_parts[PK_PACKAGE_ID_NAME]); ++it) { if ((*it)->isSystem ()) { it->status ().setToBeUninstalled (ResStatus::USER); items->push_back (*it); @@ -1268,7 +1268,7 @@ backend_remove_packages_thread (PkBackend *backend) { if (!zypp_perform_execution (backend, REMOVE, TRUE)) { //reset the status of the marked packages - for (vector<PoolItem>::iterator it = items->begin (); it != items->end (); it++) { + for (vector<PoolItem>::iterator it = items->begin (); it != items->end (); ++it) { it->statusReset(); } delete (items); @@ -1347,7 +1347,7 @@ backend_resolve_thread (PkBackend *backend) vector<sat::Solvable> pkgs; /* Filter the list of packages with this name to 'pkgs' */ - for (vector<sat::Solvable>::iterator it = v.begin (); it != v.end (); it++) { + for (vector<sat::Solvable>::iterator it = v.begin (); it != v.end (); ++it) { if (zypp_filter_solvable (_filters, *it) || *it == sat::Solvable::noSolvable) @@ -1514,7 +1514,7 @@ backend_search_group_thread (PkBackend *backend) sat::LookupAttr look (sat::SolvAttr::group); - for (sat::LookupAttr::iterator it = look.begin (); it != look.end (); it++) { + for (sat::LookupAttr::iterator it = look.begin (); it != look.end (); ++it) { PkGroupEnum rpmGroup = get_enum_group (it.asString ()); if (pkGroup == rpmGroup) v.push_back (it.inSolvable ()); @@ -1580,7 +1580,7 @@ pk_backend_get_repo_list (PkBackend *backend, PkBitfield filters) return; } - for (list <RepoInfo>::iterator it = repos.begin(); it != repos.end(); it++) { + for (list <RepoInfo>::iterator it = repos.begin(); it != repos.end(); ++it) { if (pk_bitfield_contain (filters, PK_FILTER_ENUM_NOT_DEVELOPMENT) && zypp_is_development_repo (backend, *it)) continue; // RepoInfo::alias - Unique identifier for this source. @@ -1672,7 +1672,7 @@ backend_get_files_thread (PkBackend *backend) sat::Solvable package; for (vector<sat::Solvable>::iterator it = v.begin (); - it != v.end (); it++) { + it != v.end (); ++it) { char *version = g_strdup (it->edition ().asString ().c_str ()); if (strcmp (id_parts[PK_PACKAGE_ID_VERSION], version) == 0) { g_free (version); @@ -1695,7 +1695,7 @@ backend_get_files_thread (PkBackend *backend) target::rpm::RpmHeader::constPtr rpmHeader = zypp_get_rpmHeader (package.name (), package.edition ()); list<string> files = rpmHeader->tag_filenames (); - for (list<string>::iterator it = files.begin (); it != files.end (); it++) { + for (list<string>::iterator it = files.begin (); it != files.end (); ++it) { temp.append (*it); temp.append (";"); } @@ -1742,7 +1742,7 @@ backend_get_packages_thread (PkBackend *backend) zypp_build_pool (backend, TRUE); ResPool pool = ResPool::instance (); - for (ResPool::byKind_iterator it = pool.byKindBegin (ResKind::package); it != pool.byKindEnd (ResKind::package); it++) { + for (ResPool::byKind_iterator it = pool.byKindBegin (ResKind::package); it != pool.byKindEnd (ResKind::package); ++it) { v.push_back (it->satSolvable ()); } @@ -1786,7 +1786,7 @@ backend_update_packages_thread (PkBackend *backend) // Do we have already the latest version. gboolean system = false; for (ResPool::byName_iterator it = pool.byNameBegin (name); - it != pool.byNameEnd (name); it++) { + it != pool.byNameEnd (name); ++it) { if (!it->satSolvable().isSystem()) continue; if (zypp_ver_and_arch_equal (it->satSolvable(), id_parts[PK_PACKAGE_ID_VERSION], @@ -2000,7 +2000,7 @@ backend_what_provides_thread (PkBackend *backend) if (!solver.resolvePool ()) { list<ResolverProblem_Ptr> problems = solver.problems (); - for (list<ResolverProblem_Ptr>::iterator it = problems.begin (); it != problems.end (); it++){ + for (list<ResolverProblem_Ptr>::iterator it = problems.begin (); it != problems.end (); ++it){ g_warning("Solver problem (This should never happen): '%s'", (*it)->description ().c_str ()); } solver.setIgnoreAlreadyRecommended (FALSE); @@ -2010,7 +2010,7 @@ backend_what_provides_thread (PkBackend *backend) // look for packages which would be installed for (ResPool::byKind_iterator it = pool.byKindBegin (ResKind::package); - it != pool.byKindEnd (ResKind::package); it++) { + it != pool.byKindEnd (ResKind::package); ++it) { PkInfoEnum status = PK_INFO_ENUM_UNKNOWN; gboolean hit = FALSE; @@ -2031,7 +2031,7 @@ backend_what_provides_thread (PkBackend *backend) Capability cap (search); sat::WhatProvides prov (cap); - for (sat::WhatProvides::const_iterator it = prov.begin (); it != prov.end (); it++) { + for (sat::WhatProvides::const_iterator it = prov.begin (); it != prov.end (); ++it) { if (zypp_filter_solvable (_filters, *it)) continue; @@ -2094,7 +2094,7 @@ backend_download_packages_thread (PkBackend *backend) gchar **id_parts = pk_package_id_split (package_ids[i]); string name = id_parts[PK_PACKAGE_ID_NAME]; - for (ResPool::byName_iterator it = pool.byNameBegin (name); it != pool.byNameEnd (name); it++) { + for (ResPool::byName_iterator it = pool.byNameBegin (name); it != pool.byNameEnd (name); ++it) { if (zypp_ver_and_arch_equal (it->satSolvable(), id_parts[PK_PACKAGE_ID_VERSION], id_parts[PK_PACKAGE_ID_ARCH])) { size += 2 * it->satSolvable().lookupNumAttribute (sat::SolvAttr::downloadsize); diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp index 09042ec..66bc523 100644 --- a/backends/zypp/zypp-utils.cpp +++ b/backends/zypp/zypp-utils.cpp @@ -224,7 +224,7 @@ zypp_build_pool (PkBackend *backend, gboolean include_local) // Add resolvables from enabled repos RepoManager manager; try { - for (RepoManager::RepoConstIterator it = manager.repoBegin(); it != manager.repoEnd(); it++) { + for (RepoManager::RepoConstIterator it = manager.repoBegin(); it != manager.repoEnd(); ++it) { RepoInfo repo (*it); // skip disabled repos @@ -365,7 +365,7 @@ zypp_get_packages_by_name (PkBackend *backend, ResPool pool(ResPool::instance()); for (ResPool::byIdent_iterator it = pool.byIdentBegin (kind, package_name); - it != pool.byIdentEnd (kind, package_name); it++) { + it != pool.byIdentEnd (kind, package_name); ++it) { result.push_back (it->satSolvable ()); } } @@ -393,7 +393,7 @@ zypp_get_packages_by_file (PkBackend *backend, Capability cap (search_file); sat::WhatProvides prov (cap); - for(sat::WhatProvides::const_iterator it = prov.begin (); it != prov.end (); it++) { + for(sat::WhatProvides::const_iterator it = prov.begin (); it != prov.end (); ++it) { ret.push_back (*it); } } @@ -422,7 +422,7 @@ zypp_get_package_by_id (PkBackend *backend, const gchar *package_id) sat::Solvable package; for (vector<sat::Solvable>::iterator it = v.begin (); - it != v.end (); it++) { + it != v.end (); ++it) { if (zypp_ver_and_arch_equal (*it, id_parts[PK_PACKAGE_ID_VERSION], id_parts[PK_PACKAGE_ID_ARCH])) { package = *it; @@ -660,7 +660,7 @@ zypp_emit_filtered_packages_in_list (PkBackend *backend, const vector<sat::Solva PkBitfield filters = (PkBitfield) pk_backend_get_uint (backend, "filters"); // always emit system installed packages first - for (sat_it_t it = v.begin (); it != v.end (); it++) { + for (sat_it_t it = v.begin (); it != v.end (); ++it) { if (!it->isSystem() || zypp_filter_solvable (filters, *it)) continue; @@ -671,7 +671,7 @@ zypp_emit_filtered_packages_in_list (PkBackend *backend, const vector<sat::Solva } // then available packages later - for (sat_it_t it = v.begin (); it != v.end (); it++) { + for (sat_it_t it = v.begin (); it != v.end (); ++it) { gboolean match; if (it->isSystem() || @@ -869,7 +869,7 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) ResolverProblemList problems = zypp->resolver ()->problems (); gchar * emsg = NULL, * tempmsg = NULL; - for (ResolverProblemList::iterator it = problems.begin (); it != problems.end (); it++) { + for (ResolverProblemList::iterator it = problems.begin (); it != problems.end (); ++it) { if (emsg == NULL) { emsg = g_strdup ((*it)->description ().c_str ()); } @@ -882,7 +882,7 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) // reset the status of all touched PoolItems ResPool pool = ResPool::instance (); - for (ResPool::const_iterator it = pool.begin (); it != pool.end (); it++) { + for (ResPool::const_iterator it = pool.begin (); it != pool.end (); ++it) { if (it->status ().isToBeInstalled ()) it->statusReset (); } @@ -911,7 +911,7 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) g_debug ("simulating"); - for (ResPool::const_iterator it = pool.begin (); it != pool.end (); it++) { + for (ResPool::const_iterator it = pool.begin (); it != pool.end (); ++it) { if (type == REMOVE && !(*it)->isSystem ()) { it->statusReset (); continue; @@ -926,7 +926,7 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) // look for licenses to confirm - for (ResPool::const_iterator it = pool.begin (); it != pool.end (); it++) { + for (ResPool::const_iterator it = pool.begin (); it != pool.end (); ++it) { if (it->status ().isToBeInstalled () && !(it->satSolvable ().lookupStrAttribute (sat::SolvAttr::eula).empty ())) { gchar *eula_id = g_strdup ((*it)->name ().c_str ()); gboolean has_eula = pk_backend_is_eula_valid (backend, eula_id); @@ -962,7 +962,7 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) ZYppCommitResult::PoolItemList errors = result._errors; gchar *emsg = NULL, *tmpmsg = NULL; - for (ZYppCommitResult::PoolItemList::iterator it = errors.begin (); it != errors.end (); it++){ + for (ZYppCommitResult::PoolItemList::iterator it = errors.begin (); it != errors.end (); ++it){ if (emsg == NULL) { emsg = g_strdup ((*it)->name ().c_str ()); } else { @@ -973,7 +973,7 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) } ZYppCommitResult::PoolItemList remaining = result._remaining; - for (ZYppCommitResult::PoolItemList::iterator it = remaining.begin (); it != remaining.end (); it++){ + for (ZYppCommitResult::PoolItemList::iterator it = remaining.begin (); it != remaining.end (); ++it){ if (emsg == NULL) { emsg = g_strdup ((*it)->name ().c_str ()); } else { @@ -984,7 +984,7 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) } ZYppCommitResult::PoolItemList srcremaining = result._srcremaining; - for (ZYppCommitResult::PoolItemList::iterator it = srcremaining.begin (); it != srcremaining.end (); it++){ + for (ZYppCommitResult::PoolItemList::iterator it = srcremaining.begin (); it != srcremaining.end (); ++it){ if (emsg == NULL) { emsg = g_strdup ((*it)->name ().c_str ()); } else { @@ -1030,7 +1030,7 @@ zypp_build_package_id_capabilities (Capabilities caps) sat::WhatProvides provs (caps); - for (sat::WhatProvides::const_iterator it = provs.begin (); it != provs.end (); it++) { + for (sat::WhatProvides::const_iterator it = provs.begin (); it != provs.end (); ++it) { gchar *package_id = zypp_build_package_id_from_resolvable (*it); //package_ids = g_strconcat (package_ids, package_id, PK_PACKAGE_IDS_DELIM, (gchar *)NULL); if (strlen (package_ids) == 0) { @@ -1076,7 +1076,7 @@ zypp_refresh_cache (PkBackend *backend, gboolean force) int num_of_repos = repos.size (); gchar *repo_messages = NULL; - for (list <RepoInfo>::iterator it = repos.begin(); it != repos.end(); it++, i++) { + for (list <RepoInfo>::iterator it = repos.begin(); it != repos.end(); ++it, i++) { RepoInfo repo (*it); if (!zypp_is_valid_repo (backend, repo)) -- 1.7.10.4 ++++++ 0005-zypp-don-t-waste-time-comparing-zypp-Arch-string-rep.patch ++++++ >From e7cd99b8b4911662bf825c7158155726b45fc0b6 Mon Sep 17 00:00:00 2001 From: Michael Andres <ma(a)suse.de> Date: Fri, 6 Jul 2012 12:09:59 +0200 Subject: [PATCH 5/9] zypp: don't waste time comparing zypp::Arch string representations --- backends/zypp/zypp-utils.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp index 66bc523..726b9da 100644 --- a/backends/zypp/zypp-utils.cpp +++ b/backends/zypp/zypp-utils.cpp @@ -588,8 +588,7 @@ gboolean system_and_package_are_x86 (sat::Solvable item) { // i586, i686, ... all should be considered the same arch for our comparison - return (!strcmp (item.arch ().asString ().c_str (), "i586") && - !strcmp (ZConfig::defaultSystemArchitecture ().asString().c_str(), "i686")); + return ( item.arch() == Arch_i586 && ZConfig::defaultSystemArchitecture() == Arch_i686 ); } static gboolean -- 1.7.10.4 ++++++ 0006-zypp-set-CXXFLAGS-and-use-std-c-0x-as-libzypp-does-b.patch ++++++ >From 4c83afd82f9a7161f2a878fef9d82bde447eeb13 Mon Sep 17 00:00:00 2001 From: Michael Andres <ma(a)suse.de> Date: Fri, 6 Jul 2012 11:39:15 +0200 Subject: [PATCH 6/9] zypp: set CXXFLAGS and use --std=c++0x as libzypp does (bnc#769764) --- backends/zypp/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/backends/zypp/Makefile.am b/backends/zypp/Makefile.am index 4465910..afee825 100644 --- a/backends/zypp/Makefile.am +++ b/backends/zypp/Makefile.am @@ -10,6 +10,7 @@ libpk_backend_zypp_la_SOURCES = \ libpk_backend_zypp_la_LIBADD = $(PK_PLUGIN_LIBS) libpk_backend_zypp_la_LDFLAGS = -module -avoid-version $(ZYPP_LIBS) libpk_backend_zypp_la_CFLAGS = $(PK_PLUGIN_CFLAGS) $(WARNINGFLAGS_CPP) +libpk_backend_zypp_la_CXXFLAGS = $(PK_PLUGIN_CXXFLAGS) --std=c++0x -Wall -Woverloaded-virtual -Wnon-virtual-dtor libpk_backend_zypp_la_CPPFLAGS = $(PK_PLUGIN_CFLAGS) $(ZYPP_CFLAGS) -Wno-deprecated EXTRA_DIST = \ -- 1.7.10.4 ++++++ 0007-zypp-fix-missing-dtor.patch ++++++ >From e230555586b5fa6d9b41677237834bafcc7b1cab Mon Sep 17 00:00:00 2001 From: Michael Andres <ma(a)suse.de> Date: Fri, 6 Jul 2012 13:19:16 +0200 Subject: [PATCH 7/9] zypp: fix missing dtor --- backends/zypp/zypp-events.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backends/zypp/zypp-events.h b/backends/zypp/zypp-events.h index 5877f8d..9f29fbd 100644 --- a/backends/zypp/zypp-events.h +++ b/backends/zypp/zypp-events.h @@ -175,6 +175,9 @@ struct ZyppBackendReceiver _sub_percentage = 0; pk_backend_set_sub_percentage (_backend, _sub_percentage); } + +protected: + ~ZyppBackendReceiver() {} // or a public virtual one }; struct InstallResolvableReportReceiver : public zypp::callback::ReceiveReport<zypp::target::rpm::InstallResolvableReport>, ZyppBackendReceiver -- 1.7.10.4 ++++++ 0008-zypp-no-longer-use-the-old-and-deprecated-ZYppCommit.patch ++++++ >From 8e010c204c348892a7dd5ee11cdb30a24ded3563 Mon Sep 17 00:00:00 2001 From: Michael Andres <ma(a)suse.de> Date: Fri, 6 Jul 2012 13:25:25 +0200 Subject: [PATCH 8/9] zypp: no longer use the old and deprecated ZYppCommitResult members (bnc#769764) --- backends/zypp/zypp-utils.cpp | 54 +++++++++++++----------------------------- 1 file changed, 17 insertions(+), 37 deletions(-) diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp index 726b9da..55e13a3 100644 --- a/backends/zypp/zypp-utils.cpp +++ b/backends/zypp/zypp-utils.cpp @@ -956,50 +956,30 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) ZYppCommitResult result = zypp->commit (policy); - if(!result._errors.empty () || !result._remaining.empty () || !result._srcremaining.empty ()){ - - ZYppCommitResult::PoolItemList errors = result._errors; - gchar *emsg = NULL, *tmpmsg = NULL; - - for (ZYppCommitResult::PoolItemList::iterator it = errors.begin (); it != errors.end (); ++it){ - if (emsg == NULL) { - emsg = g_strdup ((*it)->name ().c_str ()); - } else { - tmpmsg = emsg; - emsg = g_strconcat (emsg, "\n", (*it)->name ().c_str (), NULL); - g_free (tmpmsg); - } - } - - ZYppCommitResult::PoolItemList remaining = result._remaining; - for (ZYppCommitResult::PoolItemList::iterator it = remaining.begin (); it != remaining.end (); ++it){ - if (emsg == NULL) { - emsg = g_strdup ((*it)->name ().c_str ()); - } else { - tmpmsg = emsg; - emsg = g_strconcat (emsg, "\n", (*it)->name ().c_str (), NULL); - g_free (tmpmsg); - } - } - - ZYppCommitResult::PoolItemList srcremaining = result._srcremaining; - for (ZYppCommitResult::PoolItemList::iterator it = srcremaining.begin (); it != srcremaining.end (); ++it){ - if (emsg == NULL) { - emsg = g_strdup ((*it)->name ().c_str ()); - } else { - tmpmsg = emsg; - emsg = g_strconcat (emsg, "\n", (*it)->name ().c_str (), NULL); - g_free (tmpmsg); + if ( ! result.allDone() ) + { + std::ostringstream todolist; + char separator = '\0'; + + // process all steps not DONE (ERROR and TODO) + const sat::Transaction & trans( result.transaction() ); + for_( it, trans.actionBegin(~sat::Transaction::STEP_DONE), trans.actionEnd() ) + { + if ( separator ) + todolist << separator << it->ident(); + else + { + todolist << it->ident(); + separator = '\n'; } } pk_backend_error_code (backend, PK_ERROR_ENUM_TRANSACTION_ERROR, "Transaction could not be completed.\n Theses packages could not be installed: %s", - emsg); + todolist.str().c_str()); - g_free (emsg); goto exit; - } + } ret = TRUE; } catch (const repo::RepoNotFoundException &ex) { -- 1.7.10.4 ++++++ 0009-zypp-adjust-PK_FILTER_ENUM_NOT_DEVELOPMENT-bnc-77002.patch ++++++ >From fb6dfc56c3608b931dda9723b6bd49d024d0e04a Mon Sep 17 00:00:00 2001 From: Michael Andres <ma(a)suse.de> Date: Fri, 6 Jul 2012 12:12:49 +0200 Subject: [PATCH 9/9] zypp: adjust PK_FILTER_ENUM_NOT_DEVELOPMENT (bnc#770028) --- backends/zypp/zypp-utils.cpp | 49 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp index 55e13a3..c8b69c2 100644 --- a/backends/zypp/zypp-utils.cpp +++ b/backends/zypp/zypp-utils.cpp @@ -146,33 +146,34 @@ zypp_is_changeable_media (PkBackend *backend, const Url &url) return is_cd; } +namespace { + /// Helper finding pattern at end or embedded in name. + /// E.g '-debug' in 'repo-debug' or 'repo-debug-update' + inline bool + name_ends_or_contains( const std::string & name_r, const std::string & pattern_r, const char sepchar_r = '-' ) + { + if ( ! pattern_r.empty() ) + { + for ( std::string::size_type pos = name_r.find( pattern_r ); + pos != std::string::npos; + pos = name_r.find( pattern_r, pos + pattern_r.size() ) ) + { + if ( pos + pattern_r.size() == name_r.size() // at end + || name_r[pos + pattern_r.size()] == sepchar_r ) // embedded + return true; + } + } + return false; + } +} + gboolean zypp_is_development_repo (PkBackend *backend, RepoInfo repo) { - string repo_debuginfo("-debuginfo"); - string repo_debug("-debug"); - string repo_development("-development"); - string repo_source ("-source"); - - string repo_name(repo.name()); - - if (repo_name.length() > repo_debuginfo.length() && - repo_name.compare(repo_name.length() - repo_debuginfo.length(), repo_debuginfo.length(), repo_debuginfo) == 0) - return TRUE; - - if (repo_name.length() > repo_debug.length() && - repo_name.compare(repo_name.length() - repo_debug.length(), repo_debug.length(), repo_debug) == 0) - return TRUE; - - if (repo_name.length() > repo_development.length() && - repo_name.compare(repo_name.length() - repo_development.length(), repo_development.length(), repo_development) == 0) - return TRUE; - - if (repo_name.length() > repo_source.length() && - repo_name.compare(repo_name.length() - repo_source.length(), repo_source.length(), repo_source) == 0) - return TRUE; - - return FALSE; + return ( name_ends_or_contains( repo.alias(), "-debuginfo" ) + || name_ends_or_contains( repo.alias(), "-debug" ) + || name_ends_or_contains( repo.alias(), "-source" ) + || name_ends_or_contains( repo.alias(), "-development" ) ); } gboolean -- 1.7.10.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nilfs-utils for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '12

30 Jul '12

Hello community, here is the log from the commit of package nilfs-utils for openSUSE:Factory checked in at 2012-07-30 20:36:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nilfs-utils (Old) and /work/SRC/openSUSE:Factory/.nilfs-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nilfs-utils", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/nilfs-utils/nilfs-utils.changes 2012-06-05 15:33:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nilfs-utils.new/nilfs-utils.changes 2012-07-30 20:36:47.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Jul 23 17:39:39 CEST 2012 - tiwai(a)suse.de + +- Update to version 2.1.4: Major version up, addition of + nilfs-cleanup and nilfs-resize programs, etc. + See ChangeLog for details +- Enable libmount for avoiding the read-only /etc/mtab problem + (bnc#773184) + +------------------------------------------------------------------- Old: ---- nilfs-utils-2.0.14.tar.bz2 nilfs-utils-headers.patch nilfs-utils-install-fixes.diff New: ---- nilfs-utils-2.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nilfs-utils.spec ++++++ --- /var/tmp/diff_new_pack.VhKOjI/_old 2012-07-30 20:36:51.000000000 +0200 +++ /var/tmp/diff_new_pack.VhKOjI/_new 2012-07-30 20:36:51.000000000 +0200 @@ -16,41 +16,52 @@ # +%define build_devel_pkg 0 + Name: nilfs-utils +BuildRequires: libmount-devel BuildRequires: libtool BuildRequires: libuuid-devel Summary: Utilities for NILFS License: GPL-2.0 Group: System/Filesystems -Version: 2.0.14 +Version: 2.1.4 Release: 0 Source: %{name}-%{version}.tar.bz2 -Patch1: nilfs-utils-install-fixes.diff -Patch2: nilfs-utils-headers.patch Url: http://www.nilfs.org BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package contains utility programs for NILFS v2. +%if %{build_devel_pkg} +%package devel +Summary: Development package for the libnilfs library +Group: Development/Libraries/C and C++ +Requires: %{lname} = %{version} + +%description devel +This package contains the development files for NILFS v2. +%endif + %prep %setup -q -%patch1 -p1 -%patch2 -p1 %build -autoreconf -fi -%configure +# autoreconf -fi +%configure --disable-static --enable-libmount make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT root_sbindir=/sbin root_libdir=/%{_lib} # remove unneeded files -rm -f $RPM_BUILD_ROOT%{_libdir}/*.a +# rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +%if !%{build_devel_pkg} # remove devel files (not packaged for the time being) rm -rf $RPM_BUILD_ROOT%{_includedir} rm -f $RPM_BUILD_ROOT%{_libdir}/*.so +%endif %post -p /sbin/ldconfig @@ -61,10 +72,15 @@ %config(noreplace) /etc/nilfs_cleanerd.conf /sbin/* %{_bindir}/* -%{_libdir}/libnilfs.so.* +%{_libdir}/libnilfs*.so.* %{_mandir}/man?/* -# %{_includedir}/nilfs.h -# %{_includedir}/nilfs_fs.h -# %{_libdir}/libnilfs.so + +%if %{build_devel_pkg} +%files devel +%defattr(-,root,root) +%{_includedir}/nilfs.h +%{_includedir}/nilfs_fs.h +%{_libdir}/libnilfs.so +%endif %changelog ++++++ nilfs-utils-2.0.14.tar.bz2 -> nilfs-utils-2.1.4.tar.bz2 ++++++ ++++ 30887 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit newt for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '12

30 Jul '12

Hello community, here is the log from the commit of package newt for openSUSE:Factory checked in at 2012-07-30 20:36:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/newt (Old) and /work/SRC/openSUSE:Factory/.newt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "newt", Maintainer is "lrupp(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/newt/newt.changes 2012-07-14 11:51:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.newt.new/newt.changes 2012-07-30 20:36:12.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 30 15:33:08 UTC 2012 - werner(a)suse.de + +- Use suse-version not sles-version + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ newt.spec ++++++ --- /var/tmp/diff_new_pack.ceWPrF/_old 2012-07-30 20:36:13.000000000 +0200 +++ /var/tmp/diff_new_pack.ceWPrF/_new 2012-07-30 20:36:13.000000000 +0200 @@ -43,9 +43,10 @@ %if 0%{?sles_version} == 9 BuildRequires: jadetex %endif -%if 0%{?sles_version} > 1220 +%if 0%{?suse_version} > 1220 BuildRequires: texlive-courier BuildRequires: texlive-dvips +BuildRequires: texlive-ec BuildRequires: texlive-helvetic BuildRequires: texlive-jadetex BuildRequires: texlive-times -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mpc for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '12

30 Jul '12

Hello community, here is the log from the commit of package mpc for openSUSE:Factory checked in at 2012-07-30 20:35:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mpc (Old) and /work/SRC/openSUSE:Factory/.mpc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mpc", Maintainer is "RGuenther(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/mpc/mpc.changes 2011-09-23 02:13:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mpc.new/mpc.changes 2012-07-30 20:35:57.000000000 +0200 @@ -1,0 +2,48 @@ +Mon Jul 23 12:47:08 UTC 2012 - jengelh(a)inai.de + +- Correct Requires of libmpc-devel to be libmpc3 rather than libmpc2 + +------------------------------------------------------------------- +Mon Jul 23 08:43:52 UTC 2012 - rguenther(a)suse.com + +- Update to version 1.0. + - Bump SONAME to libmpc3 + - License change: LGPLv3+ for code, GFDLv1.3+ (with no invariant sections) + for documentation + - Functions renamed: + mpc_mul_2exp to mpc_mul_2ui, mpc_div_2exp to mpc_div_2ui + - New functions: mpc_log10, mpc_mul_2si, mpc_div_2si + - Speed-ups: + - mpc_fma + - Bug fixes: + - mpc_div and mpc_norm now return a value indicating the effective + rounding direction, as the other functions + - mpc_mul, mpc_sqr and mpc_norm now return correct results even if there + are over- or underflows during the computation + - mpc_asin, mpc_proj, mpc_sqr: Wrong result when input variable has + infinite part and equals output variable is corrected + - mpc_fr_sub: Wrong return value for imaginary part is corrected +- Skips version 0.9: + - New functions: + - mpc_set_dc, mpc_set_ldc, mpc_get_dc, mpc_get_ldc for converting + between mpc type variables and C variables of type double _Complex + or long double _Complex + - mpc_sin_cos, computing simultaneously the sine and cosine + - Speed-ups: + - mpc_pow_si through binary exponentiation + - mpc_pow_z when the exponent fits in a long + - mpc_tan through the use of mpc_sin_cos + - Bug fixes: + - trigonometric functions: infinite loop due to overflow for large + arguments + - mpc_exp: close to infinite loop for argument close to 0 + - mpc_sqrt: close to infinite loop for argument close to 1 + - mpc_add_si: replaced macro by function, since the macro evaluated the + same expression twice + +------------------------------------------------------------------- +Sun Jan 29 20:35:55 UTC 2012 - jengelh(a)medozas.de + +- Remove redundant tags/sections per specfile guideline suggestions + +------------------------------------------------------------------- Old: ---- mpc-0.8.2.tar.bz2 New: ---- mpc-1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mpc.spec ++++++ --- /var/tmp/diff_new_pack.wFSg76/_old 2012-07-30 20:35:59.000000000 +0200 +++ /var/tmp/diff_new_pack.wFSg76/_new 2012-07-30 20:35:59.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package mpc (Version 0.8.2) +# spec file for package mpc # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,18 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - -%define debug_package_requires libmpc2 = %{version}-%{release} Name: mpc -BuildRequires: gmp-devel mpfr-devel -License: LGPL-2.1+ -Group: Development/Libraries/C and C++ -AutoReqProv: on -Version: 0.8.2 -Release: 1 +BuildRequires: gmp-devel +BuildRequires: mpfr-devel +Version: 1.0 +Release: 0 Summary: MPC multiple-precision complex shared library +License: LGPL-3.0+ +Group: Development/Libraries/C and C++ Url: http://www.multiprecision.org/mpc/ Source: mpc-%{version}.tar.bz2 Source2: baselibs.conf @@ -39,13 +36,11 @@ -%package -n libmpc2 -License: LGPL-2.1+ +%package -n libmpc3 Summary: MPC multiple-precision complex shared library Group: Development/Libraries/C and C++ -AutoReqProv: on -%description -n libmpc2 +%description -n libmpc3 MPC is a C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result. It is built upon and follows the same principles as MPFR. @@ -53,11 +48,10 @@ %package devel -License: LGPL-2.1+ Summary: MPC multiple-precision complex library development files Group: Development/Libraries/C and C++ -Requires: libmpc2 = %{version} mpfr-devel -AutoReqProv: on +Requires: libmpc3 = %{version} +Requires: mpfr-devel PreReq: %install_info_prereq %description devel @@ -79,26 +73,23 @@ %makeinstall rm $RPM_BUILD_ROOT%{_libdir}/libmpc.la -%post -n libmpc2 -p /sbin/ldconfig +%post -n libmpc3 -p /sbin/ldconfig %post devel %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz -%postun -n libmpc2 -p /sbin/ldconfig +%postun -n libmpc3 -p /sbin/ldconfig %postun devel %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz -%clean -rm -rf $RPM_BUILD_ROOT - -%files -n libmpc2 +%files -n libmpc3 %defattr(-,root,root) -%{_libdir}/libmpc.so.2* +%{_libdir}/libmpc.so.3* %files devel %defattr(-,root,root) -%doc AUTHORS NEWS COPYING.LIB +%doc AUTHORS NEWS COPYING.LESSER %doc %{_infodir}/mpc.info.gz %{_libdir}/libmpc.a %{_libdir}/libmpc.so ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.wFSg76/_old 2012-07-30 20:35:59.000000000 +0200 +++ /var/tmp/diff_new_pack.wFSg76/_new 2012-07-30 20:35:59.000000000 +0200 @@ -1,4 +1,4 @@ -libmpc2 +libmpc3 mpc-devel requires -mpc-<targettype> - requires "libmpc2-<targettype> = <version>" + requires "libmpc3-<targettype> = <version>" ++++++ mpc-0.8.2.tar.bz2 -> mpc-1.0.tar.bz2 ++++++ ++++ 76645 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libvisual for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '12

30 Jul '12

Hello community, here is the log from the commit of package libvisual for openSUSE:Factory checked in at 2012-07-30 20:34:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvisual (Old) and /work/SRC/openSUSE:Factory/.libvisual.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvisual", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libvisual/libvisual.changes 2012-02-21 12:38:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvisual.new/libvisual.changes 2012-07-30 20:34:38.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 26 11:11:11 UTC 2012 - dvaleev(a)suse.com + +- defining inline causes problems trying to build against + libvisual headers + +------------------------------------------------------------------- New: ---- libvisual-0.4.0-inlinedefineconflict.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvisual.spec ++++++ --- /var/tmp/diff_new_pack.hBXVqE/_old 2012-07-30 20:34:40.000000000 +0200 +++ /var/tmp/diff_new_pack.hBXVqE/_new 2012-07-30 20:34:40.000000000 +0200 @@ -41,6 +41,7 @@ Patch2: libvisual.visual_cpu_get_altivec.patch Patch3: %name-%{version}-unref-static.diff Patch4: libvisual-0.4.0-2.1-nmu.diff +Patch5: libvisual-0.4.0-inlinedefineconflict.patch %description Libvisual is a library that acts as a middle layer between applications @@ -87,6 +88,7 @@ %patch2 -p1 %patch3 %patch4 -p1 +%patch5 -p1 %build autoreconf -fiv ++++++ libvisual-0.4.0-inlinedefineconflict.patch ++++++ diff -ru libvisual-0.4.0.orig/libvisual/lv_cache.c libvisual-0.4.0/libvisual/lv_cache.c --- libvisual-0.4.0.orig/libvisual/lv_cache.c 2009-03-07 17:17:38.000000000 +0000 +++ libvisual-0.4.0/libvisual/lv_cache.c 2009-03-07 17:25:26.000000000 +0000 @@ -32,7 +32,7 @@ static int cache_dtor (VisObject *object); static int cache_remove_list_entry (VisCache *cache, VisListEntry **le); -static inline void handle_request_reset (VisCache *cache, VisListEntry *le); +static lv_inline void handle_request_reset (VisCache *cache, VisListEntry *le); static int cache_dtor (VisObject *object) { @@ -74,7 +74,7 @@ } -static inline void handle_request_reset (VisCache *cache, VisListEntry *le) +static lv_inline void handle_request_reset (VisCache *cache, VisListEntry *le) { VisCacheEntry *centry; diff -ru libvisual-0.4.0.orig/libvisual/lv_defines.h libvisual-0.4.0/libvisual/lv_defines.h --- libvisual-0.4.0.orig/libvisual/lv_defines.h 2009-03-07 17:17:38.000000000 +0000 +++ libvisual-0.4.0/libvisual/lv_defines.h 2009-03-07 17:24:17.000000000 +0000 @@ -63,13 +63,13 @@ /* Compiler specific optimalization macros */ #if __GNUC__ >= 3 -# define inline inline __attribute__ ((always_inline)) +# define lv_inline inline __attribute__ ((always_inline)) # define __malloc __attribute__ ((malloc)) # define __packed __attribute__ ((packed)) # define VIS_LIKELY(x) __builtin_expect (!!(x), 1) # define VIS_UNLIKELY(x) __builtin_expect (!!(x), 0) #else -# define inline /* no inline */ +# define lv_inline /* no inline */ # define __malloc /* no malloc */ # define __packed /* no packed */ # define VIS_LIKELY(x) (x) diff -ru libvisual-0.4.0.orig/libvisual/lv_time.h libvisual-0.4.0/libvisual/lv_time.h --- libvisual-0.4.0.orig/libvisual/lv_time.h 2009-03-07 17:17:38.000000000 +0000 +++ libvisual-0.4.0/libvisual/lv_time.h 2009-03-07 17:25:15.000000000 +0000 @@ -101,7 +101,7 @@ * * @return Nothing. */ -static inline void visual_timer_tsc_get (uint32_t *lo, uint32_t *hi) +static lv_inline void visual_timer_tsc_get (uint32_t *lo, uint32_t *hi) { #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64) __asm __volatile @@ -115,7 +115,7 @@ } /* FIXME use uint64_t here, make sure type exists */ -static inline unsigned long long visual_timer_tsc_get_returned () +static lv_inline unsigned long long visual_timer_tsc_get_returned () { uint32_t lo, hi; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lapack for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '12

30 Jul '12

Hello community, here is the log from the commit of package lapack for openSUSE:Factory checked in at 2012-07-30 20:33:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lapack (Old) and /work/SRC/openSUSE:Factory/.lapack.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lapack", Maintainer is "RGuenther(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/lapack/lapack.changes 2012-05-22 10:23:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lapack.new/lapack.changes 2012-07-30 20:33:35.000000000 +0200 @@ -1,0 +2,20 @@ +Wed Jul 25 14:30:36 UTC 2012 - idonmez(a)suse.com + +- Fix bnc#772628 + +------------------------------------------------------------------- +Thu Jul 19 20:44:04 UTC 2012 - scorot(a)free.fr + +- update baselibs.conf + +------------------------------------------------------------------- +Sun Jul 15 18:47:19 UTC 2012 - scorot(a)free.fr + +- build the c interface lapacke + +------------------------------------------------------------------- +Thu May 31 13:52:43 CEST 2012 - kukuk(a)suse.de + +- doxygen >= 1.7 is required for building docu + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lapack.spec ++++++ --- /var/tmp/diff_new_pack.sOaNUn/_old 2012-07-30 20:33:45.000000000 +0200 +++ /var/tmp/diff_new_pack.sOaNUn/_new 2012-07-30 20:33:45.000000000 +0200 @@ -25,7 +25,7 @@ Url: http://www.netlib.org/lapack/ Source0: http://www.netlib.org/lapack/%{name}-%{version}.tgz Patch1: lapack-3.2.2.patch -BuildRequires: doxygen +BuildRequires: doxygen >= 1.7 BuildRequires: gcc-fortran BuildRequires: python BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -125,10 +125,44 @@ The blas-man package contains documentation for BLAS (Basic Linear Algebra subprograms) routines, in the form of man pages. + +%package -n liblapacke3 +Summary: LAPACKE development files +Group: Development/Libraries/C and C++ + +%description -n liblapacke3 +This library provides a native C interface to LAPACK routines available +at www.netlib.org/lapack to facilitate usage of LAPACK functionality +for C programmers. + +This implementation introduces: +- row-major and column-major matrix layout controlled by the first function + parameter; +- an implementation with working arrays (middle-level interface) as well as + without working arrays (high-level interface); +- input scalars passed by value; +- error code as a return value instead of the INFO parameter. + + +%package -n lapacke-devel +Requires: liblapacke3 = %{version} +Provides: lapacke = %{version} +Provides: lapacke-devel-static = %{version} +Summary: LAPACKE development files +Group: Development/Libraries/C and C++ + +%description -n lapacke-devel +LAPACKE headers and development files. + %prep %setup -q %patch1 +# Bad licenses, bnc#772628 +rm DOCS/psfig.tex +rm lapacke/example/example_DGESV_rowmajor.c +rm lapacke/example/example_ZGESV_rowmajor.c + %build case "$RPM_ARCH" in i[0-9]86) PRECFLAGS="-ffloat-store" ;; @@ -177,6 +211,23 @@ OPTS="%{optflags}" \ NOOPT="%{optflags} -O0" ln -s libblas.a librefblas.a +cd lapacke +make %{?_smp_mflags} lapacke \ + CFLAGS="%{optflags} -fPIC -DADD_ -DHAVE_LAPACK_CONFIG_H -DLAPACK_COMPLEX_STRUCTURE" \ + LINKER=gfortran +mv ../liblapacke.a liblapacke_pic.a +mkdir tmp +( cd tmp; ar x ../liblapacke_pic.a ) +gfortran -shared -Wl,-soname=liblapacke.so.3 -o liblapacke.so.%version tmp/*.o +ln -s liblapacke.so.%{version} liblapacke.so +rm -rf tmp +make cleanlib +make %{?_smp_mflags} lapacke \ + CFLAGS="%{optflags} -DADD_ -DHAVE_LAPACK_CONFIG_H -DLAPACK_COMPLEX_STRUCTURE" +mv ../liblapacke.a liblapacke.a +# fix wrong end of line +sed -i 's/\r//' LICENSE +cd .. make lapack_testing \ OPTS="%{optflags} $PRECFLAGS" \ NOOPT="%{optflags} $PRECFLAGS -O0" @@ -221,6 +272,7 @@ %install install -d %{buildroot}/%{_libdir} +install -d %{buildroot}/%{_includedir} install -m 644 libblas.a %{buildroot}/%{_libdir} install -m 644 libblas_pic.a %{buildroot}/%{_libdir} install -m 644 liblapack.a %{buildroot}/%{_libdir} @@ -231,6 +283,14 @@ install -m 755 liblapack.so.%{version} %{buildroot}/%{_libdir} ln -s liblapack.so.%{version} %{buildroot}/%{_libdir}/liblapack.so.3 ln -s liblapack.so.%{version} %{buildroot}/%{_libdir}/liblapack.so +cd lapacke +install -m 644 include/*.h %{buildroot}/%{_includedir} +install -m 644 liblapacke.a %{buildroot}/%{_libdir} +install -m 644 liblapacke_pic.a %{buildroot}/%{_libdir} +install -m 755 liblapacke.so.%{version} %{buildroot}/%{_libdir} +ln -s liblapacke.so.%{version} %{buildroot}/%{_libdir}/liblapacke.so.3 +ln -s liblapacke.so.%{version} %{buildroot}/%{_libdir}/liblapacke.so +cd .. install -d %{buildroot}%{_mandir}/man3 install -m 0644 DOCS/man/man3/*.3 %{buildroot}%{_mandir}/man3/ find BLAS/SRC/ -name \*.f -type f -printf "%{_mandir}/man3/%f.3.gz\n" \ @@ -276,6 +336,9 @@ %post -n liblapack3 -p /sbin/ldconfig %postun -n liblapack3 -p /sbin/ldconfig +%post -n liblapacke3 -p /sbin/ldconfig +%postun -n liblapacke3 -p /sbin/ldconfig + %files -n liblapack3 %defattr(-,root,root) %doc LICENSE README @@ -306,4 +369,17 @@ %files -n blas-man -f blasmans %defattr(-,root,root) +%files -n liblapacke3 +%defattr(-,root,root,-) +%{_libdir}/liblapacke.so.%{version} +%{_libdir}/liblapacke.so.3 + +%files -n lapacke-devel +%defattr(-,root,root,-) +%doc lapacke/LICENSE lapacke/README +%{_libdir}/liblapacke.so +%{_libdir}/liblapacke.a +%{_libdir}/liblapacke_pic.a +%{_includedir}/*.h + %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.sOaNUn/_old 2012-07-30 20:33:45.000000000 +0200 +++ /var/tmp/diff_new_pack.sOaNUn/_new 2012-07-30 20:33:45.000000000 +0200 @@ -1,8 +1,12 @@ liblapack3 libblas3 +liblapacke3 lapack-devel requires -lapack-<targettype> requires "liblapack3-<targettype> = <version>" blas-devel requires -blas-<targettype> requires "libblas3-<targettype> = <version>" +lapacke-devel + requires -lapacke-<targettype> + requires "liblapacke3-<targettype> = <version>" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ksh for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '12

30 Jul '12

Hello community, here is the log from the commit of package ksh for openSUSE:Factory checked in at 2012-07-30 20:31:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksh (Old) and /work/SRC/openSUSE:Factory/.ksh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ksh", Maintainer is "werner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2012-06-06 18:02:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2012-07-30 20:31:29.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jul 13 12:47:35 UTC 2012 - agraf(a)suse.com + +- Fix qemu-user build by not evaluating ps output that doesn't reflect + what the virtual processes see + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksh.spec ++++++ --- /var/tmp/diff_new_pack.OHyXU9/_old 2012-07-30 20:31:43.000000000 +0200 +++ /var/tmp/diff_new_pack.OHyXU9/_new 2012-07-30 20:31:43.000000000 +0200 @@ -207,6 +207,12 @@ ((IGNORED & SIGMASK)) && let ++usesigexec || true test -t 0 || let ++usesigexec +%if 0%{?qemu_user_space_build:1} + # agraf: In a qemu user space build, ps can not find the actual sigmask + # of processes, so we run into an endless loop. Disable sigexec. + usesigexec=0 +%endif + if ((usesigexec > 0)) ; then ${CC:-gcc} ${RPM_OPT_FLAGS} -o sigexec %{S:42} -lutil for fd in /proc/$$/fd/*; do -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0