March 2013 - openSUSE Commits - openSUSE Mailing Lists

commit PackageKit.1367 for openSUSE:12.2:Update
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package PackageKit.1367 for openSUSE:12.2:Update checked in at 2013-03-01 21:52:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/PackageKit.1367 (Old) and /work/SRC/openSUSE:12.2:Update/.PackageKit.1367.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "PackageKit.1367", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-02-26 18:15:11.936010755 +0100 +++ /work/SRC/openSUSE:12.2:Update/.PackageKit.1367.new/PackageKit.changes 2013-03-01 21:52:01.000000000 +0100 @@ -0,0 +1,2395 @@ +------------------------------------------------------------------- +Fri Feb 22 08:59:12 UTC 2013 - coolo(a)suse.com + +- 0012-PackageKit-bnc804983.patch: add patch to forbid update to downgrade (bnc#804983) + +------------------------------------------------------------------- +Fri Nov 16 09:48:47 UTC 2012 - rlmu(a)suse.com + +- Add patches from the openSUSE_Factory PK branch (in order to fix bnc#747751) + + 0010-PackageKit-bnc747751-zypp-check-for-best-architecture-and-version-when-lo.patch + + 0011-PackageKit-bnc747751-zypp-always-solve-dependencies-with-IgnoreAlreadyRec.patch + +------------------------------------------------------------------- +Thu Oct 25 06:23:52 UTC 2012 - rlmu(a)suse.com + +Fix: bnc#747751 +- Edition compare wrong. +- Don't need default recommandation. + +------------------------------------------------------------------- +Wed Sep 19 10:28:23 UTC 2012 - glin(a)suse.com + +- Add PackageKit-bnc780058-zypp-backend-match-patches.patch to + avoid failure in the zypp backend get_files() (bnc#780058) + +------------------------------------------------------------------- +Wed Aug 22 02:57:11 UTC 2012 - glin(a)suse.com + +- Add PackageKit-bnc775651-ignore-accept-eula.patch to fix crash + after accepting EULA (bnc#775651) + +------------------------------------------------------------------- +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#769764 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 + +------------------------------------------------------------------- +Wed Jun 20 18:47:20 UTC 2012 - dimstar(a)opensuse.org + +- Add PackageKit-zypp-packagesize.patch: libzypp changed their + API and now returns Bytes instead of KBytes. +- Add call to autoreconf, as above patch touches the build system. + +------------------------------------------------------------------- +Wed Jun 20 13:23:02 UTC 2012 - coolo(a)suse.com + +- gcc46 is no longer required for libzypp + +------------------------------------------------------------------- +Thu Apr 26 06:31:34 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 0.7.4: + + New Features: + - Deprecate Message(untrusted-package) from the API + - Install pk-task-sync.h as part of the public API + - Add full integration so that UI can know when to repair the + system + + Libraries (glib): Add GType's for packagekit-glib2 enumerations + + Libraries (qt2): Add simulateRepairSystem and + repairSystem(bool) to the Transaction API + + Libraries (python): Speed up get_package_list + + Zypp Backend: + - Build pool before resolving + - Do not set a PACKAGE_NOT_FOUND error when resolving packages + + Non-zypp backends updates. + + Bugfixes: + - Add some documentation about the auto-untrusted logic + - Add some documentation for the new RepairSystem transaction + interaction + - Do not allow an empty resolve call to be passed down to the + backends + - Do not include the website in the tarball + - Drop --print-reply from dbus-send command used on + suspend/resume +- Remove doc subpackage, as it only contained the website which is + not shipped anymore in the tarball. Add a Obsoletes for it to the + main subpackage for smooth upgrades. +- Add a force_gcc46 define that we can use to force building with + gcc 4.6. This is needed in Factory for now, as libzypp doesn't + build with gcc 4.7 right now. When this is set, we use gcc46-c++ + BuildRequires and export CC and CXX environment variables to use + gcc 4.6. +- Add + 0003-Revert-packagekit-qt2-Since-new-methods-and-enums-wh.patch: + the soversion of libpackagekit-qt2 has been decreased by + accident, so revert this change for now. + +------------------------------------------------------------------- +Fri Mar 2 10:59:58 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 0.7.3: + + New Features: + - Add LANGUAGE_SUPPORT what-provides type + + Libraries (glib): + - Don't segfault the client if there are no cached properties + - Fix a critical warning in gnome-settings-daemon when setting + the proxy + - Fix transfer annotation of pk_results_get_package_sack() + - Fix transfer annotations for GPtrArray returns + - Do not send progress updates for non-verb packages + + Non-zypp backends updates. + + Bugfixes: + - Document CODEC what-provides type + - Don't crash when the system bus isn't available, just abort + with an error + - Fix a critical warning when starting gnome-settings-daemon + - Imply the install trusted polkit auth when we get the remove + auth + - Imply the install trusted polkit auth when we get the + untrusted auth + - Port the session example code to GDBus + - Website updates. +- Remove xz BuildRequires now that it comes for free in the build + system. + +------------------------------------------------------------------- +Wed Feb 15 11:08:41 UTC 2012 - vuntz(a)opensuse.org + +- Move dbus xml interface files from devel subpackage to main + subpackage: PackageKit now requires them at runtime to work. +- Move the zypp backend to a new backend-zypp subpackage: this will + make it clearer to users which backend is being used. It also + makes it easier to test small changes in the zypp backend. +- Move all test backends to devel subpackage, as they are not + useful to users. +- Add PackageKit-backend Requires to main subpackage, so we get a + working backend by default. This will be PackageKit-backend-zypp + since nothing else provides this right now. + +------------------------------------------------------------------- +Wed Jan 18 07:23:39 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 0.7.2: + + New Features: + - Add a new repair-system policy and use it by the + corresponding RepairSystem method + - Add a transaction_reset backend hook + - Add new roles SimulateRepairSystem and RepairSystem + - Add pk_*_enum_to_localised_text to pk-enum.h and export via + GIR + - Add possibility to connect/disconnect backend signals + - Add PropertiesChanged signals to the main and transaction + interfaces + - Allow the Plasma version to be specified for + PK_PROVIDES_ENUM_PLASMA_SERVICE + + Libraries (glib): + - Convert libpackagekit-glib2 from dbus-glib to GDBus + - Skip empty catalog entries + + Libraries (qt): + - Automatically rebuild moc files with different moc version + + Zypp Backend: + - Retrieve url for packages instead of returning "TODO" + + Non-zypp backends updates. + + Bugfixes: + - browser-plugin: Make it compile with newest xulrunner + - Fix a critical warning in the client tools when a simulation + is cancelled + - Fix builddir != srcdir issue + - Fix item-percentage call in the spawned backend + - gtk-plugin: Fix name of GTK plugin schema file + - Make PkProc part of the daemon again + - Remove deprecated g_thread_init() on GLib < 2.31 + - Set the frontend socket as environment variable in the + spawned backend + - Update the website matrix to include the new + (Simulate)RepairSystem roles +- Rebase patches, via git, including removal of + 0002-Retrieve-url-for-packages-instead-of-returning-TODO.patch + (fixed upstream). + +------------------------------------------------------------------- +Wed Dec 21 15:32:38 UTC 2011 - vuntz(a)opensuse.org + +- Update to version 0.7.1: + + New Features: + - Add command line option to keep environment + - Add Introspection support for PK-Plugins + - Add possibility for backends/plugins to skip transactions + - Add 'uid' and 'cmdline' properties to PkBackend + - Use the new g_thread_new() for new versions of GLib + + Libraries (qt): Drop packagekit-qt1 which is obsolete in favor + of packagekit-qt2 + + Libraries (qt2): + - Remove old Find* macro + - Really do not distribute moc files + + Zypp Backend: + - Dont call build pool inside the loop + - Only load repositories once + - Refactor the private static data into one structure + + Non-zypp backends updates ++++ 2198 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.2:Update/.PackageKit.1367.new/PackageKit.changes New: ---- 0001-Change-the-configuration-of-the-cron-script-to-a-sys.patch 0002-Build-against-npapi-sdk-instead-of-xulrunner.patch 0003-Revert-packagekit-qt2-Since-new-methods-and-enums-wh.patch 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 0010-PackageKit-bnc747751-zypp-check-for-best-architecture-and-version-when-lo.patch 0011-PackageKit-bnc747751-zypp-always-solve-dependencies-with-IgnoreAlreadyRec.patch 0012-PackageKit-bnc804983.patch PackageKit-0.7.4.tar.xz PackageKit-bnc775651-ignore-accept-eula.patch PackageKit-bnc780058-zypp-backend-match-patches.patch PackageKit-zypp-packagesize.patch PackageKit.changes PackageKit.spec baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ # # spec file for package PackageKit # # Copyright (c) 2013 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # $ pkcon search file /usr/bin/anjuta %define BUILD_CNF 1 %if 0%{suse_version} > 1130 %define xulrunner_version 20 %else %if 0%{suse_version} > 1120 %define xulrunner_version 192 %else %if 0%{suse_version} > 1110 %define xulrunner_version 191 %else %define xulrunner_version 190 %endif %endif %endif Name: PackageKit Version: 0.7.4 Release: 0 Summary: Simple software installation management software License: GPL-2.0+ Group: System/Daemons Url: http://packagekit.org/ Source: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz Source2: baselibs.conf # To update this package, please git-format-patch the tag of the # tarball version (eg: PACKAGEKIT_0_6_19) vs the distro tag (eg: openSUSE_Factory) # in https://github.com/openSUSE/PackageKit and keep the patches # in that git repository for easier tracking and merging. # When updating the package you can rebase the distro branch against # the new release tag. # # PATCH-FEATURE-OPENSUSE 0001-Change-the-configuration-of-the-cron-script-to-a-sys.patch vuntz(a)opensuse.org -- Change the configuration of the cron script to a sysconfig-like config Patch0: 0001-Change-the-configuration-of-the-cron-script-to-a-sys.patch # PATCH-FIX-UPSTREAM PackageKit-npapi.patch fdo#40026 wr(a)rosenauer.org -- Build against npapi-sdk instead of xulrunner 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. Patch9: PackageKit-zypp-packagesize.patch # PATCH-FIX-UPSTREAM PackageKit-bnc775651-ignore-accept-eula.patch bnc#775651 glin(a)suse.com -- ignore "accept-eula" transactions to avoid crash Patch10: PackageKit-bnc775651-ignore-accept-eula.patch # PATCH-FIX-UPSTREAM PackageKit-bnc780058-zypp-backend-match-patches.patch bnc#780058 glin(a)suse.com -- match patches in get_files() in zypp backend to avoid a potential failure. Patch11: PackageKit-bnc780058-zypp-backend-match-patches.patch # PATCH-FIX-OPENSUSE 0010-PackageKit-bnc747751-zypp-check-for-best-architecture-and-version-when-lo.patch bnc#747751 rlmu(a)suse.com -- choose best architechture and version. Patch12: 0010-PackageKit-bnc747751-zypp-check-for-best-architecture-and-version-when-lo.patch # PATCH-FIX-OPENSUSE 0011-PackageKit-bnc747751-zypp-always-solve-dependencies-with-IgnoreAlreadyRec.patch bnc#747751 rlmu(a)suse.com -- don't need default recommandation. Patch13: 0011-PackageKit-bnc747751-zypp-always-solve-dependencies-with-IgnoreAlreadyRec.patch # PATCH-FIX-OPENSUSE 0012-PackageKit-bnc804983.patch bnc#804983 coolo(a)suse.com -- do not allow update to downgrade Patch14: 0012-PackageKit-bnc804983.patch BuildRequires: NetworkManager-devel BuildRequires: automake BuildRequires: docbook-utils BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel BuildRequires: gstreamer-0_10-devel BuildRequires: gstreamer-0_10-plugins-base-devel BuildRequires: gtk-doc BuildRequires: gtk2-devel BuildRequires: gtk3-devel BuildRequires: intltool BuildRequires: libarchive-devel BuildRequires: libcppunit-devel BuildRequires: libgudev-1_0-devel BuildRequires: libqt4-devel BuildRequires: libtool BuildRequires: libzypp-devel BuildRequires: mozilla-nspr-devel >= 4.8 %if 0%{suse_version} > 1140 BuildRequires: pkgconfig(npapi-sdk) %else BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel %endif BuildRequires: pm-utils BuildRequires: polkit-devel >= 0.98 BuildRequires: python-devel # We need the %%mime_database_* macros BuildRequires: shared-mime-info BuildRequires: sqlite-devel BuildRequires: translation-update-upstream Requires: %{name}-branding = %{version} # We really want a working backend (likely zypp) Requires: %{name}-backend Recommends: %{name}-lang PreReq: %fillup_prereq # doc package only contained the website, and got removed in 0.7.4 Obsoletes: %{name}-doc < 0.7.4 # gtk+ 2 module was removed in 0.7.0 Obsoletes: %{name}-gtk-module < 0.7.0 # ruck was removed in 0.6.4, make sure it gets removed Obsoletes: ruck <= 0.6.3 BuildRoot: %{_tmppath}/%{name}-%{version}-build %py_requires %if %suse_version <= 1110 %define python_sitelib %{py_sitedir} %endif %description PackageKit is a system designed to make installing and updating software on your computer easier. The primary design goal is to unify all the software graphical tools used in different distributions, and use some of the latest technology like PolicyKit to make the process suck less. %package backend-zypp Summary: Simple software installation management software -- Zypp Backend Group: System/Daemons Requires: %{name} = %{version} Provides: %{name}-backend = %{version} %description backend-zypp PackageKit is a system designed to make installing and updating software on your computer easier. The primary design goal is to unify all the software graphical tools used in different distributions, and use some of the latest technology like PolicyKit to make the process suck less. %package -n typelib-1_0-PackageKitPlugin-1_0 Summary: Simple software installation management software -- Plugin library, Introspection bindings Group: System/Libraries %description -n typelib-1_0-PackageKitPlugin-1_0 PackageKit is a system designed to make installing and updating software on your computer easier. The primary design goal is to unify all the software graphical tools used in different distributions, and use some of the latest technology like PolicyKit to make the process suck less. This package provides the GObject Introspection bindings for the PackageKit plugin library. %package browser-plugin Summary: Simple software installation management software Group: Productivity/Networking/Web/Browsers Recommends: %{name} = %{version} Supplements: packageand(%{name}:MozillaFirefox) Supplements: packageand(%{name}:epiphany) %description browser-plugin PackageKit is a system designed to make installing and updating software on your computer easier. The primary design goal is to unify all the software graphical tools used in different distributions, and use some of the latest technology like PolicyKit to make the process suck less. %package gstreamer-plugin Summary: Simple software installation management software Group: Productivity/Multimedia/Other Requires(post): update-alternatives Requires(postun): update-alternatives Recommends: %{name} = %{version} Supplements: packageand(%{name}:gstreamer-0_10-plugins-base) %if %suse_version > 1130 Provides: opensuse-codecs-installer = 10.3.1 Obsoletes: opensuse-codecs-installer <= 10.3.1 %endif %description gstreamer-plugin PackageKit is a system designed to make installing and updating software on your computer easier. The primary design goal is to unify all the software graphical tools used in different distributions, and use some of the latest technology like PolicyKit to make the process suck less. %package gtk3-module Summary: Simple software installation management software Group: System/Libraries Recommends: %{name} = %{version} Supplements: packageand(%{name}:gtk3) %glib2_gsettings_schema_requires %description gtk3-module PackageKit is a system designed to make installing and updating software on your computer easier. The primary design goal is to unify all the software graphical tools used in different distributions, and use some of the latest technology like PolicyKit to make the process suck less. %package devel Summary: Needed include files and libraries for development Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: libpackagekit-glib2-devel Requires: typelib-1_0-PackageKitPlugin-1_0 = %{version} %description devel This package contains all necessary include files, libraries, configuration files and development tools (with manual pages) needed to compile and link applications using PackageKit. %package -n libpackagekit-glib2-14 Summary: Simple software installation management software Group: System/Libraries Recommends: %{name} Provides: libpackagekit-glib12 = %{version} Obsoletes: libpackagekit-glib12 < %{version} %description -n libpackagekit-glib2-14 PackageKit is a system designed to make installing and updating software on your computer easier. The primary design goal is to unify all the software graphical tools used in different distributions, and use some of the latest technology like PolicyKit to make the process suck less. %package -n typelib-1_0-PackageKitGlib-1_0 Summary: Simple software installation management software -- Introspection bindings Group: System/Libraries %description -n typelib-1_0-PackageKitGlib-1_0 PackageKit is a system designed to make installing and updating software on your computer easier. The primary design goal is to unify all the software graphical tools used in different distributions, and use some of the latest technology like PolicyKit to make the process suck less. This package provides the GObject Introspection bindings for the PackageKit client library. %package -n libpackagekit-glib2-devel Summary: Simple software installation management software Group: Development/Libraries/GNOME Requires: libpackagekit-glib2-14 = %{version} Requires: typelib-1_0-PackageKitGlib-1_0 = %{version} Provides: libpackagekit-glib12-devel = %{version} Obsoletes: libpackagekit-glib12-devel < %{version} %description -n libpackagekit-glib2-devel PackageKit is a system designed to make installing and updating software on your computer easier. The primary design goal is to unify all the software graphical tools used in different distributions, and use some of the latest technology like PolicyKit to make the process suck less. %package -n libpackagekit-qt2-2 Summary: Simple software installation management software Group: System/Libraries Recommends: %{name} %description -n libpackagekit-qt2-2 PackageKit is a system designed to make installing and updating software on your computer easier. The primary design goal is to unify all the software graphical tools used in different distributions, and use some of the latest technology like PolicyKit to make the process suck less. %package -n libpackagekit-qt2-devel Summary: Simple software installation management software Group: Development/Libraries/C and C++ Requires: libpackagekit-qt2-2 = %{version} %description -n libpackagekit-qt2-devel PackageKit is a system designed to make installing and updating software on your computer easier. The primary design goal is to unify all the software graphical tools used in different distributions, and use some of the latest technology like PolicyKit to make the process suck less. %package branding-upstream Summary: Simple software installation management software -- Upstream default configuration Group: System/Daemons Requires: %{name} = %{version} Provides: %{name}-branding = %{version} Conflicts: otherproviders(%{name}-branding) Supplements: packageand(%{name}:branding-upstream) BuildArch: noarch #BRAND: Provide configuration files - #BRAND: /etc/PackageKit/* %description branding-upstream PackageKit is a system designed to make installing and updating software on your computer easier. The primary design goal is to unify all the software graphical tools used in different distributions, and use some of the latest technology like PolicyKit to make the process suck less. This package provides the upstream default configuration for PackageKit. %lang_package %prep %setup -q translation-update-upstream %patch0 -p1 %if 0%{?suse_version} > 1140 %patch1 -p1 %endif %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 %patch10 -p1 %patch11 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 %build # Needed due to patch 3 autoreconf -fi %configure \ --disable-static \ --enable-zypp \ --with-default-backend=zypp \ --with-security-framework=polkit \ --with-mozilla-plugin-dir=%{_libdir}/browser-plugins \ %if ! %BUILD_CNF --disable-command-not-found \ %endif %{nil} make %{?_smp_mflags} V=1 %install %makeinstall mv %{buildroot}%{_sysconfdir}/bash_completion.d/pk-completion.{ba,}sh find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} + # the pm-utils package in openSUSE uses libexecdir and not libdir %if "%{_libdir}" != "%{_libexecdir}" test ! -e %{buildroot}%{_libexecdir}/pm-utils mv %{buildroot}%{_libdir}/pm-utils %{buildroot}%{_libexecdir}/pm-utils %endif # move the cron configuration to a sysconfig template install -d %{buildroot}%{_localstatedir}/adm/fillup-templates mv %{buildroot}%{_sysconfdir}/sysconfig/packagekit-background %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.packagekit-background # create ghost file touch %{buildroot}%{_libexecdir}/gst-install-plugins-helper %find_lang %{name} %{?no_lang_C} %fdupes $RPM_BUILD_ROOT %post %{fillup_only -n packagekit-background} %mime_database_post %postun %mime_database_postun %post gstreamer-plugin update-alternatives --install %{_libexecdir}/gst-install-plugins-helper gst-install-plugins-helper %{_libexecdir}/pk-gstreamer-install 10 %postun gstreamer-plugin # Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed if [ ! -f %{_libexecdir}/pk-gstreamer-install ]; then update-alternatives --remove gst-install-plugins-helper %{_libexecdir}/pk-gstreamer-install fi %post gtk3-module %glib2_gsettings_schema_post %postun gtk3-module %glib2_gsettings_schema_postun %post -n libpackagekit-glib2-14 -p /sbin/ldconfig %post -n libpackagekit-qt2-2 -p /sbin/ldconfig %postun -n libpackagekit-glib2-14 -p /sbin/ldconfig %postun -n libpackagekit-qt2-2 -p /sbin/ldconfig %files lang -f %{name}.lang %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING HACKING NEWS README %dir %{_sysconfdir}/PackageKit %dir %{_sysconfdir}/PackageKit/events %dir %{_sysconfdir}/PackageKit/events/post-transaction.d %dir %{_sysconfdir}/PackageKit/events/pre-transaction.d %dir %{_datadir}/PackageKit %dir %{_datadir}/PackageKit/helpers %dir %{_datadir}/PackageKit/helpers/test_spawn %dir %{_libdir}/packagekit-backend %dir %{_libdir}/packagekit-plugins %dir %{python_sitelib}/packagekit %dir %{_libexecdir}/pm-utils %dir %{_libexecdir}/pm-utils/sleep.d %dir %{_localstatedir}/lib/PackageKit %{_sysconfdir}/PackageKit/events/post-transaction.d/README %{_sysconfdir}/PackageKit/events/pre-transaction.d/README %{_sysconfdir}/bash_completion.d/pk-completion.sh %{_sysconfdir}/cron.daily/packagekit-background.cron %{_sysconfdir}/dbus-1/system.d/org.freedesktop.PackageKit.conf %if %BUILD_CNF %{_sysconfdir}/profile.d/PackageKit.sh %endif %{_localstatedir}/adm/fillup-templates/sysconfig.packagekit-background %{_bindir}/packagekit-bugreport.sh %{_bindir}/pk-debuginfo-install %{_bindir}/pkcon %{_bindir}/pkmon %{_bindir}/pkgenpack %{_libdir}/packagekit-backend/libpk_backend_dummy.so %{_libdir}/packagekit-plugins/libpk_plugin-check-shared-libraries-in-use.so %{_libdir}/packagekit-plugins/libpk-plugin-clear-firmware-requests.so %{_libdir}/packagekit-plugins/libpk_plugin-no-update-process.so %{_libdir}/packagekit-plugins/libpk_plugin-scan-desktop-files.so %{_libdir}/packagekit-plugins/libpk_plugin_scripts.so %{_libdir}/packagekit-plugins/libpk_plugin-update-check-processes.so %{_libdir}/packagekit-plugins/libpk_plugin-update-package-list.so %{_libexecdir}/packagekitd %{_libexecdir}/pm-utils/sleep.d/95packagekit %if %BUILD_CNF %{_libexecdir}/pk-command-not-found %endif %{python_sitelib}/packagekit/* %{_sbindir}/pk-device-rebind %{_datadir}/dbus-1/interfaces/org.freedesktop.PackageKit.Transaction.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.PackageKit.xml %{_datadir}/mime/packages/packagekit-*.xml %{_datadir}/PackageKit/helpers/test_spawn/search-name.sh %{_datadir}/PackageKit/pk-upgrade-distro.sh %{_datadir}/polkit-1/actions/org.freedesktop.packagekit.policy %{_datadir}/dbus-1/system-services/* %doc %{_mandir}/man?/*.* %verify(not md5 size mtime) %{_localstatedir}/lib/PackageKit/transactions.db %files backend-zypp %defattr(-,root,root) %{_libdir}/packagekit-backend/libpk_backend_zypp.so %files -n typelib-1_0-PackageKitPlugin-1_0 %defattr(-,root,root) %{_libdir}/girepository-1.0/PackageKitPlugin-1.0.typelib %files browser-plugin %defattr(-,root,root) %{_libdir}/browser-plugins/packagekit-plugin.so %files gstreamer-plugin %defattr(-,root,root) %ghost %attr(755,root,root) %{_libexecdir}/gst-install-plugins-helper %{_libexecdir}/pk-gstreamer-install %files gtk3-module %defattr(-,root,root) %dir %{_libdir}/gnome-settings-daemon-3.0 %dir %{_libdir}/gnome-settings-daemon-3.0/gtk-modules %{_libdir}/gnome-settings-daemon-3.0/gtk-modules/pk-gtk-module.desktop %{_libdir}/gtk-3.0/modules/* %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.gtk-modules-packagekit.gschema.xml %files devel %defattr(-,root,root) %doc %{_datadir}/gtk-doc/html/PackageKit # Test backends are not useful, except for developers %{_libdir}/packagekit-backend/libpk_backend_test_fail.so %{_libdir}/packagekit-backend/libpk_backend_test_nop.so %{_libdir}/packagekit-backend/libpk_backend_test_spawn.so %{_libdir}/packagekit-backend/libpk_backend_test_succeed.so %{_libdir}/packagekit-backend/libpk_backend_test_thread.so %{_libdir}/pkgconfig/packagekit-plugin.pc %dir %{_includedir}/PackageKit %{_includedir}/PackageKit/backend/ %{_includedir}/PackageKit/plugin/ %{_datadir}/gir-1.0/PackageKitPlugin-1.0.gir %files -n libpackagekit-glib2-14 %defattr(-,root,root) %{_libdir}/libpackagekit-glib2.so.* %files -n typelib-1_0-PackageKitGlib-1_0 %defattr(-,root,root) %{_libdir}/girepository-1.0/PackageKitGlib-1.0.typelib %files -n libpackagekit-glib2-devel %defattr(-,root,root) %{_libdir}/libpackagekit-glib2.so %{_libdir}/pkgconfig/packagekit-glib2.pc %dir %{_includedir}/PackageKit %{_includedir}/PackageKit/packagekit-glib2/ %{_datadir}/gir-1.0/PackageKitGlib-1.0.gir %files -n libpackagekit-qt2-2 %defattr(-,root,root) %{_libdir}/libpackagekit-qt2.so.* %files -n libpackagekit-qt2-devel %defattr(-,root,root) %{_libdir}/libpackagekit-qt2.so %{_libdir}/cmake/packagekit-qt2/ %{_libdir}/pkgconfig/packagekit-qt2.pc %dir %{_includedir}/PackageKit %{_includedir}/PackageKit/packagekit-qt2/ %files branding-upstream %defattr(-,root,root) %if %BUILD_CNF %config(noreplace) %{_sysconfdir}/PackageKit/CommandNotFound.conf %endif %config(noreplace) %{_sysconfdir}/PackageKit/PackageKit.conf # This file should not be touched by users/admins, so we can replace it %{_sysconfdir}/PackageKit/Vendor.conf %changelog ++++++ 0001-Change-the-configuration-of-the-cron-script-to-a-sys.patch ++++++ >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/9] Change the configuration of the cron script to a sysconfig-like config --- contrib/cron/packagekit-background | 43 +++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/contrib/cron/packagekit-background b/contrib/cron/packagekit-background index e5b5c9b..783e2df 100644 --- a/contrib/cron/packagekit-background +++ b/contrib/cron/packagekit-background @@ -1,18 +1,41 @@ -# should we attempt to do this? (valid: yes|no) +## Path: System/Cron/PackageKit +## Description: Cron job to update the system daily with PackageKit + +## Type: yesno +## Default: no +# +# Run the cron job. +# ENABLED=no -# don't install, just check (valid: yes|no) +## Type: yesno +## Default: no +# +# Check if updates are available, instead of installing. +# CHECK_ONLY=no -# if MAILTO is set, the mail command is used to deliver PackageKit output -# by default MAILTO is unset, so crond mails the output by itself -#MAILTO=root +## Type: string +## Default: "" +# +# If MAILTO is set, the mail command is used to deliver PackageKit output. +# By default MAILTO is unset, so crond mails the output by itself. +# +MAILTO="" -# you may set SYSTEM_NAME if you want your PackageKit emails tagged -# differently default is output of hostname command -#SYSTEM_NAME="" +## Type: string +## Default: "" +# +# You may set SYSTEM_NAME if you want your PackageKit emails tagged differently. +# Default is output of hostname command. +# +SYSTEM_NAME="" -# update checks will sleep random time before contacting the servers to +## Type: integer +## Default: 3600 +# +# Update checks will sleep random time before contacting the servers to # avoid hammering them with thousands of request at the same time - this -# is the maximum sleep time (in seconds) for the random wait period +# is the maximum sleep time (in seconds) for the random wait period. +# SLEEP_MAX=3600 -- 1.7.10.4 ++++++ 0002-Build-against-npapi-sdk-instead-of-xulrunner.patch ++++++ >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/9] Build against npapi-sdk instead of xulrunner https://bugs.freedesktop.org/show_bug.cgi?id=40026 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3c52f68..026f635 100644 --- a/configure.ac +++ b/configure.ac @@ -349,7 +349,7 @@ AC_ARG_ENABLE(browser_plugin, AS_HELP_STRING([--enable-browser-plugin],[Build br enable_browser_plugin=$enableval,enable_browser_plugin=yes) if test x$enable_browser_plugin = xyes; then PKG_CHECK_MODULES(PK_BROWSER_PLUGIN, \ - mozilla-plugin >= 8.0 \ + npapi-sdk \ gio-unix-2.0 \ nspr >= 4.8 \ cairo \ -- 1.7.10.4 ++++++ 0003-Revert-packagekit-qt2-Since-new-methods-and-enums-wh.patch ++++++ >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/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. This is just wrong, as it results in .so.1 instead of .so.2 (which was intended): we're going backwards with the soversion. Next version will have a proper fix. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 026f635..f7129f2 100644 --- a/configure.ac +++ b/configure.ac @@ -55,7 +55,7 @@ AC_SUBST(LT_AGE) # LT_QT_CURRENT=2 LT_QT_REVISION=0 -LT_QT_AGE=1 +LT_QT_AGE=0 AC_SUBST(LT_QT_CURRENT) AC_SUBST(LT_QT_REVISION) AC_SUBST(LT_QT_AGE) -- 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 ++++++ 0010-PackageKit-bnc747751-zypp-check-for-best-architecture-and-version-when-lo.patch ++++++ >From 2cbabf8a960ca60e80bdcb8b538aa50824f404fc Mon Sep 17 00:00:00 2001 From: Michael Andres <ma(a)suse.de> Date: Tue, 9 Oct 2012 12:25:09 +0200 Subject: [PATCH 1/2] zypp: check for best architecture and version when looking for the 'newest' package Just a hotfix. Actually PK should also follow solver policies like repo priority, keep vendor and architecture of installed packages, etc. --- backends/zypp/pk-backend-zypp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index 25a1ec5..e885885 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -1337,7 +1337,7 @@ backend_resolve_thread (PkBackend *backend) if (newest == sat::Solvable::noSolvable) { newest = *it; - } else if (it->edition().match (newest.edition()) > 0) { + } else if (it->edition() > newest.edition() || Arch::compare(it->arch(), newest.arch()) > 0) { newest = *it; } pkgs.push_back (*it); -- 1.7.10.4 ++++++ 0011-PackageKit-bnc747751-zypp-always-solve-dependencies-with-IgnoreAlreadyRec.patch ++++++ >From 1d77867056fa8281c3902a0b2b7fbc8865864994 Mon Sep 17 00:00:00 2001 From: Michael Andres <ma(a)suse.de> Date: Tue, 16 Oct 2012 15:34:37 +0200 Subject: [PATCH 2/2] zypp: always solve dependencies with 'IgnoreAlreadyRecommended ON' (bnc#747751) --- backends/zypp/pk-backend-zypp.cpp | 1 + backends/zypp/zypp-utils.cpp | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index e885885..4f1f573 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -224,6 +224,7 @@ backend_get_requires_thread (PkBackend *backend) Resolver solver(pool); solver.setForceResolve (true); + solver.setIgnoreAlreadyRecommended (TRUE); if (!solver.resolvePool ()) { list<ResolverProblem_Ptr> problems = solver.problems (); diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp index 280fe7c..2fa5b4c 100644 --- a/backends/zypp/zypp-utils.cpp +++ b/backends/zypp/zypp-utils.cpp @@ -727,6 +727,7 @@ zypp_get_patches (PkBackend *backend, set<PoolItem> &patches) ZYpp::Ptr zypp; zypp = get_zypp (backend); + zypp->resolver ()->setIgnoreAlreadyRecommended (TRUE); zypp->resolver ()->resolvePool (); for (ResPoolProxy::const_iterator it = zypp->poolProxy ().byKindBegin<Patch>(); @@ -845,13 +846,10 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) if (force) zypp->resolver ()->setForceResolve (force); - if (type == UPDATE) { - //zypp->resolver ()->setOnlyRequires (TRUE); - zypp->resolver ()->setIgnoreAlreadyRecommended (TRUE); - } // Gather up any dependencies pk_backend_set_status (backend, PK_STATUS_ENUM_DEP_RESOLVE); + zypp->resolver ()->setIgnoreAlreadyRecommended (TRUE); if (!zypp->resolver ()->resolvePool ()) { // Manual intervention required to resolve dependencies // TODO: Figure out what we need to do with PackageKit @@ -987,8 +985,6 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) try { ZYpp::Ptr zypp = get_zypp (backend); zypp->resolver ()->setForceResolve (FALSE); - if (type == UPDATE) - zypp->resolver ()->setIgnoreAlreadyRecommended (FALSE); } catch (const Exception &ex) { /* we tried */ } return ret; -- 1.7.10.4 ++++++ 0012-PackageKit-bnc804983.patch ++++++ Index: PackageKit-0.7.4/backends/zypp/pk-backend-zypp.cpp =================================================================== --- PackageKit-0.7.4.orig/backends/zypp/pk-backend-zypp.cpp +++ PackageKit-0.7.4/backends/zypp/pk-backend-zypp.cpp @@ -1807,7 +1807,21 @@ backend_update_packages_thread (PkBacken if (system == true) continue; sat::Solvable solvable = zypp_get_package_by_id (backend, package_ids[i]); + ui::Selectable::Ptr sel( ui::Selectable::get( solvable )); PoolItem item = ResPool::instance ().find (solvable); + // patches are special - they are not installed and can't have update candidates + if (sel->kind() != ResKind::patch) { + MIL << "sel " << sel->kind() << " " << sel->ident() << endl; + if (sel->installedEmpty()) { + zypp_backend_finished_error (backend, PK_ERROR_ENUM_DEP_RESOLUTION_FAILED, "Package %s is not installed", package_ids[i]); + return FALSE; + } + item = sel->updateCandidateObj(); + if (!item) { + zypp_backend_finished_error(backend, PK_ERROR_ENUM_DEP_RESOLUTION_FAILED, "There is no update candidate for %s", sel->installedObj().satSolvable().asString().c_str()); + return FALSE; + } + } item.status ().setToBeInstalled (ResStatus::USER); Patch::constPtr patch = asKind<Patch>(item.resolvable ()); zypp_check_restart (&restart, patch); ++++++ PackageKit-bnc775651-ignore-accept-eula.patch ++++++ >From 9f1800ad48bff17fbebcc85760c327d78ecc9ee4 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin <chingpang(a)gmail.com> Date: Wed, 15 Aug 2012 16:33:19 +0800 Subject: [PATCH] Ignore "accept-eula" in pk-transaction-run The "accept-eula" transaction could be proceeded by pk-transaction-run accidentally. This commit ignores that kind of transaction to avoid the potential crash. https://bugs.freedesktop.org/show_bug.cgi?id=53532 --- src/pk-transaction.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/pk-transaction.c b/src/pk-transaction.c index dd009e8..347d72e 100644 --- a/src/pk-transaction.c +++ b/src/pk-transaction.c @@ -2246,6 +2246,10 @@ pk_transaction_run (PkTransaction *transaction) g_return_val_if_fail (PK_IS_TRANSACTION (transaction), FALSE); g_return_val_if_fail (priv->tid != NULL, FALSE); + /* Ignore "accept-eula" */ + if (priv->role == PK_ROLE_ENUM_ACCEPT_EULA) + return TRUE; + /* prepare for use; the transaction list ensures this is safe */ pk_backend_reset (priv->backend); -- 1.7.7 ++++++ PackageKit-bnc780058-zypp-backend-match-patches.patch ++++++ diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index b0ffc9d..9d46302 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -1652,7 +1652,6 @@ backend_get_files_thread (PkBackend *backend) MIL << endl; gchar **package_ids; ZYpp::Ptr zypp; - zypp = get_zypp (backend); if (zypp == NULL){ pk_backend_finished (backend); @@ -1671,10 +1670,13 @@ backend_get_files_thread (PkBackend *backend) vector<sat::Solvable> v; vector<sat::Solvable> v2; + vector<sat::Solvable> v3; zypp_get_packages_by_name (backend, (const gchar *)id_parts[PK_PACKAGE_ID_NAME], ResKind::package, v); zypp_get_packages_by_name (backend, (const gchar *)id_parts[PK_PACKAGE_ID_NAME], ResKind::srcpackage, v2); + zypp_get_packages_by_name (backend, (const gchar *)id_parts[PK_PACKAGE_ID_NAME], ResKind::patch, v3); v.insert (v.end (), v2.begin (), v2.end ()); + v.insert (v.end (), v3.begin (), v3.end ()); sat::Solvable package; for (vector<sat::Solvable>::iterator it = v.begin (); ++++++ PackageKit-zypp-packagesize.patch ++++++ >From e6191bb910bca7f47726be2ee273b29e9d74442d Mon Sep 17 00:00:00 2001 From: Max Lin <max.lin(a)gmx.com> Date: Mon, 18 Jun 2012 15:33:27 +0800 Subject: [PATCH] zypp: Fix calculation of package size with recent versions of libzypp Since the return size no longer is KBytes in libzypp, but Bytes, we do not need to do size * 1024, starting with libzypp 11.4.0. --- backends/zypp/pk-backend-zypp.cpp | 6 ++++++ configure.ac | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index f7398e0..d909b35 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" + #include <gmodule.h> #include <glib.h> #include <pk-backend.h> @@ -580,7 +582,11 @@ backend_get_details_thread (PkBackend *backend) group, package.lookupStrAttribute (sat::SolvAttr::description).c_str (), package.lookupStrAttribute (sat::SolvAttr::url).c_str (), +#ifdef ZYPP_RETURN_BYTES + size); +#else size * 1024); +#endif } } catch (const target::rpm::RpmException &ex) { diff --git a/configure.ac b/configure.ac index 12a3610..3d9ea64 100644 --- a/configure.ac +++ b/configure.ac @@ -742,6 +742,10 @@ fi if test x$enable_zypp = xyes; then PKG_CHECK_MODULES(ZYPP, libzypp >= 6.16.0) + PKG_CHECK_EXISTS(libzypp >= 11.4.0, [ ZYPP_RETURN_BYTES="yes" ], [ ZYPP_RETURN_BYTES="no" ]) + if test "x$ZYPP_RETURN_BYTES" = "xyes"; then + AC_DEFINE(ZYPP_RETURN_BYTES, 1, [define if libzypp returns package size in bytes]) + fi fi if test x$enable_slapt = xyes; then -- 1.7.10 ++++++ baselibs.conf ++++++ libpackagekit-glib2-14 libpackagekit-glib2-devel requires -libpackagekit-glib2-<targettype> requires "libpackagekit-glib2-14-<targettype> = <version>" libpackagekit-qt14 libpackagekit-qt-devel requires -libpackagekit-qt-<targettype> requires "libpackagekit-qt14-<targettype> = <version>" libpackagekit-qt2-2 libpackagekit-qt2-devel requires -libpackagekit-qt2-<targettype> requires "libpackagekit-qt2-2-<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 xls2csv for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package xls2csv for openSUSE:Factory checked in at 2013-03-01 20:46:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xls2csv (Old) and /work/SRC/openSUSE:Factory/.xls2csv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xls2csv", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xls2csv/xls2csv.changes 2011-09-23 12:51:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xls2csv.new/xls2csv.changes 2013-03-01 20:46:19.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 28 06:03:05 UTC 2013 - coolo(a)suse.com + +- update license to new format + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xls2csv.spec ++++++ --- /var/tmp/diff_new_pack.mMa1Sc/_old 2013-03-01 20:46:28.000000000 +0100 +++ /var/tmp/diff_new_pack.mMa1Sc/_new 2013-03-01 20:46:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xls2csv # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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,16 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: xls2csv Version: 1.06 -Release: 1 +Release: 0 Summary: A script that recodes a spreadsheet's charset and saves as CSV +License: Artistic-1.0 or GPL-2.0+ Group: Productivity/Text/Convertors -License: Artistic-1.0 ; GPL-2.0+ Url: http://search.cpan.org/~ken/xls2csv-1.06/script/xls2csv # repacked http://search.cpan.org/CPAN/authors/id/K/KE/KEN/%%{name}-%%{version}.tar.gz Source0: %{name}-%{version}.tar.bz2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xdm for openSUSE:12.3
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package xdm for openSUSE:12.3 checked in at 2013-03-01 20:45:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/xdm (Old) and /work/SRC/openSUSE:12.3/.xdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xdm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.3/xdm/xdm.changes 2013-03-01 14:02:40.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.xdm.new/xdm.changes 2013-03-01 20:46:06.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 1 12:44:10 UTC 2013 - fcrozat(a)suse.com + +- Add systemd-user-sessions to xdm initscript X-Should-Start, to + ensure user login is available when xdm is started. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdm.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/init.d/xdm new/etc/init.d/xdm --- old/etc/init.d/xdm 2012-11-19 17:30:45.000000000 +0100 +++ new/etc/init.d/xdm 2013-03-01 13:43:48.000000000 +0100 @@ -15,7 +15,7 @@ # Provides: xdm display-manager # Required-Start: $remote_fs dbus # Required-Stop: $remote_fs -# Should-Start: ypbind $syslog gpm firstboot kbd resmgr earlyxdm winbind acpid ntp +# Should-Start: ypbind $syslog gpm firstboot kbd resmgr earlyxdm winbind acpid ntp systemd-user-sessions # Should-Stop: ypbind $syslog gpm firstboot kbd resmgr earlyxdm winbind acpid ntp # Default-Start: 5 # Default-Stop: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xdm for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package xdm for openSUSE:Factory checked in at 2013-03-01 20:45:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdm (Old) and /work/SRC/openSUSE:Factory/.xdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xdm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xdm/xdm.changes 2013-03-01 14:02:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2013-03-01 20:45:54.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 1 12:44:10 UTC 2013 - fcrozat(a)suse.com + +- Add systemd-user-sessions to xdm initscript X-Should-Start, to + ensure user login is available when xdm is started. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdm.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/init.d/xdm new/etc/init.d/xdm --- old/etc/init.d/xdm 2012-11-19 17:30:45.000000000 +0100 +++ new/etc/init.d/xdm 2013-03-01 13:43:48.000000000 +0100 @@ -15,7 +15,7 @@ # Provides: xdm display-manager # Required-Start: $remote_fs dbus # Required-Stop: $remote_fs -# Should-Start: ypbind $syslog gpm firstboot kbd resmgr earlyxdm winbind acpid ntp +# Should-Start: ypbind $syslog gpm firstboot kbd resmgr earlyxdm winbind acpid ntp systemd-user-sessions # Should-Stop: ypbind $syslog gpm firstboot kbd resmgr earlyxdm winbind acpid ntp # Default-Start: 5 # Default-Stop: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit syslinux for openSUSE:12.3
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package syslinux for openSUSE:12.3 checked in at 2013-03-01 20:45:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/syslinux (Old) and /work/SRC/openSUSE:12.3/.syslinux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "syslinux", Maintainer is "snwint(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/syslinux/syslinux.changes 2013-03-01 11:34:00.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.syslinux.new/syslinux.changes 2013-03-01 20:45:38.000000000 +0100 @@ -4 +4 @@ -- isohybrid: write only mbr unless explicitly specified otherwise +- isohybrid_mbr.diff: write only mbr unless explicitly specified otherwise ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit syslinux for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package syslinux for openSUSE:Factory checked in at 2013-03-01 20:45:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syslinux (Old) and /work/SRC/openSUSE:Factory/.syslinux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "syslinux", Maintainer is "snwint(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes 2013-02-18 14:00:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2013-03-01 20:45:27.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 28 16:00:50 CET 2013 - snwint(a)suse.de + +- isohybrid_mbr.diff: write only mbr unless explicitly specified otherwise + +------------------------------------------------------------------- New: ---- syslinux-4.04-isohybrid_mbr.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslinux.spec ++++++ --- /var/tmp/diff_new_pack.jq1RtH/_old 2013-03-01 20:45:38.000000000 +0100 +++ /var/tmp/diff_new_pack.jq1RtH/_new 2013-03-01 20:45:38.000000000 +0100 @@ -44,6 +44,7 @@ Patch7: %{name}-%{version}-gcc47.diff Patch8: %{name}-%{version}-isohybrid_efi.diff Patch9: %{name}-%{version}-isohybrid_efi_optional.diff +Patch10: %{name}-%{version}-isohybrid_mbr.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -69,6 +70,7 @@ %patch7 -p0 %patch8 -p0 %patch9 -p1 +%patch10 -p1 %build cp %{SOURCE2} . ++++++ syslinux-4.04-isohybrid_mbr.diff ++++++ diff --git a/utils/isohybrid.c b/utils/isohybrid.c index 09f4520..954b5ed 100644 --- a/utils/isohybrid.c +++ b/utils/isohybrid.c @@ -653,12 +653,10 @@ initialise_mbr(uint8_t *mbr) continue; } - if (i == 1) - mbr[0] = 0x80; - if (i == part_data) { chs = ofs2chs(offset); + mbr[0] = 0x80; mbr[1] = chs >> 8; mbr[2] = chs >> 16; mbr[3] = chs >> 24; @@ -945,7 +943,7 @@ main(int argc, char *argv[]) } if (!(mode & (MODE_MBR | MODE_GPT))) { - mode |= (mode & EFI) ? MODE_GPT : MODE_MBR; + mode |= MODE_MBR; } if ((mode & EFI) && !offset) type = 0; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sudo for openSUSE:12.3
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package sudo for openSUSE:12.3 checked in at 2013-03-01 20:45:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/sudo (Old) and /work/SRC/openSUSE:12.3/.sudo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sudo", Maintainer is "VCizek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/sudo/sudo.changes 2013-01-31 01:38:59.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.sudo.new/sudo.changes 2013-03-01 20:45:26.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Mar 1 11:12:28 UTC 2013 - vcizek(a)suse.com + +- added two security fixes: + * CVE-2013-1775 (bnc#806919) + + sudo-1.8.6p3-CVE-2013-1775.patch + * CVE-2013-1776 (bnc#806921) + + sudo-1.8.6p3-CVE-2013-1776.patch + +------------------------------------------------------------------- New: ---- sudo-1.8.6p3-CVE-2013-1775.patch sudo-1.8.6p3-CVE-2013-1776.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sudo.spec ++++++ --- /var/tmp/diff_new_pack.wvJfwT/_old 2013-03-01 20:45:27.000000000 +0100 +++ /var/tmp/diff_new_pack.wvJfwT/_new 2013-03-01 20:45:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sudo # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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,6 +28,8 @@ Source2: README.SUSE Patch0: sudoers2ldif-env.patch Patch1: sudo-sudoers.patch +Patch2: sudo-1.8.6p3-CVE-2013-1775.patch +Patch3: sudo-1.8.6p3-CVE-2013-1776.patch BuildRequires: audit-devel BuildRequires: groff BuildRequires: libselinux-devel @@ -57,6 +59,8 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %ifarch s390 s390x %sparc ++++++ sudo-1.8.6p3-CVE-2013-1775.patch ++++++ 63210a2b8f2f199b521f6c8213bb29775c09375c plugins/sudoers/check.c | 53 +++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 25 deletions(-) Index: sudo-1.8.6p3/plugins/sudoers/check.c =================================================================== --- sudo-1.8.6p3.orig/plugins/sudoers/check.c 2012-09-18 15:56:29.000000000 +0200 +++ sudo-1.8.6p3/plugins/sudoers/check.c 2013-03-01 12:10:34.285863069 +0100 @@ -627,31 +627,34 @@ timestamp_status(char *timestampdir, cha */ if (status == TS_OLD && !ISSET(flags, TS_REMOVE)) { mtim_get(&sb, &mtime); - /* Negative timeouts only expire manually (sudo -k). */ - if (def_timestamp_timeout < 0 && mtime.tv_sec != 0) - status = TS_CURRENT; - else { - now = time(NULL); - if (def_timestamp_timeout && - now - mtime.tv_sec < 60 * def_timestamp_timeout) { - /* - * Check for bogus time on the stampfile. The clock may - * have been set back or someone could be trying to spoof us. - */ - if (mtime.tv_sec > now + 60 * def_timestamp_timeout * 2) { - time_t tv_sec = (time_t)mtime.tv_sec; - log_error(0, - _("timestamp too far in the future: %20.20s"), - 4 + ctime(&tv_sec)); - if (timestampfile) - (void) unlink(timestampfile); - else - (void) rmdir(timestampdir); - status = TS_MISSING; - } else if (get_boottime(&boottime) && timevalcmp(&mtime, &boottime, <)) { - status = TS_OLD; - } else { - status = TS_CURRENT; + if (timevalisset(&mtime)) { + /* Negative timeouts only expire manually (sudo -k). */ + if (def_timestamp_timeout < 0) { + status = TS_CURRENT; + } else { + now = time(NULL); + if (def_timestamp_timeout && + now - mtime.tv_sec < 60 * def_timestamp_timeout) { + /* + * Check for bogus time on the stampfile. The clock may + * have been set back or user could be trying to spoof us. + */ + if (mtime.tv_sec > now + 60 * def_timestamp_timeout * 2) { + time_t tv_sec = (time_t)mtime.tv_sec; + log_error(0, + _("timestamp too far in the future: %20.20s"), + 4 + ctime(&tv_sec)); + if (timestampfile) + (void) unlink(timestampfile); + else + (void) rmdir(timestampdir); + status = TS_MISSING; + } else if (get_boottime(&boottime) && + timevalcmp(&mtime, &boottime, <)) { + status = TS_OLD; + } else { + status = TS_CURRENT; + } } } } ++++++ sudo-1.8.6p3-CVE-2013-1776.patch ++++++ 2b18d55589975e70dd98f24bca5b0aaabc56a9b5 plugins/sudoers/check.c | 4 +++- plugins/sudoers/sudoers.c | 4 ++++ plugins/sudoers/sudoers.h | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) Index: sudo-1.8.6p3/plugins/sudoers/check.c =================================================================== --- sudo-1.8.6p3.orig/plugins/sudoers/check.c 2013-03-01 12:10:18.668403327 +0100 +++ sudo-1.8.6p3/plugins/sudoers/check.c 2013-03-01 12:10:18.684403798 +0100 @@ -82,6 +82,7 @@ static struct tty_info { dev_t rdev; /* tty device ID */ ino_t ino; /* tty inode number */ struct timeval ctime; /* tty inode change time */ + pid_t sid; /* ID of session with controlling tty */ } tty_info; static int build_timestamp(char **, char **); @@ -138,13 +139,14 @@ check_user(int validated, int mode) if (ISSET(mode, MODE_IGNORE_TICKET)) SET(validated, FLAG_CHECK_USER); - /* Stash the tty's ctime for tty ticket comparison. */ + /* Stash the tty's device, session ID and ctime for ticket comparison. */ if (def_tty_tickets && user_ttypath && stat(user_ttypath, &sb) == 0) { tty_info.dev = sb.st_dev; tty_info.ino = sb.st_ino; tty_info.rdev = sb.st_rdev; if (tty_is_devpts(user_ttypath)) ctim_get(&sb, &tty_info.ctime); + tty_info.sid = user_sid; } if (build_timestamp(&timestampdir, &timestampfile) == -1) { Index: sudo-1.8.6p3/plugins/sudoers/sudoers.c =================================================================== --- sudo-1.8.6p3.orig/plugins/sudoers/sudoers.c 2012-09-18 15:56:30.000000000 +0200 +++ sudo-1.8.6p3/plugins/sudoers/sudoers.c 2013-03-01 12:10:18.685403827 +0100 @@ -1410,6 +1410,10 @@ deserialize_info(char * const args[], ch sudo_user.cols = atoi(*cur + sizeof("cols=") - 1); continue; } + if (MATCHES(*cur, "sid=")) { + sudo_user.sid = atoi(*cur + sizeof("sid=") - 1); + continue; + } } if (user_cwd == NULL) user_cwd = "unknown"; Index: sudo-1.8.6p3/plugins/sudoers/sudoers.h =================================================================== --- sudo-1.8.6p3.orig/plugins/sudoers/sudoers.h 2012-09-18 15:57:43.000000000 +0200 +++ sudo-1.8.6p3/plugins/sudoers/sudoers.h 2013-03-01 12:10:18.685403827 +0100 @@ -95,6 +95,7 @@ struct sudo_user { int flags; uid_t uid; uid_t gid; + pid_t sid; }; /* @@ -171,8 +172,8 @@ struct sudo_user { #define user_name (sudo_user.name) #define user_uid (sudo_user.uid) #define user_gid (sudo_user.gid) +#define user_sid (sudo_user.sid) #define user_passwd (sudo_user.pw->pw_passwd) -#define user_uuid (sudo_user.uuid) #define user_dir (sudo_user.pw->pw_dir) #define user_gids (sudo_user.gids) #define user_ngids (sudo_user.ngids) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sudo for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package sudo for openSUSE:Factory checked in at 2013-03-01 20:45:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sudo (Old) and /work/SRC/openSUSE:Factory/.sudo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sudo", Maintainer is "VCizek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sudo/sudo.changes 2012-12-05 14:09:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sudo.new/sudo.changes 2013-03-01 20:45:09.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Mar 1 11:12:28 UTC 2013 - vcizek(a)suse.com + +- added two security fixes: + * CVE-2013-1775 (bnc#806919) + + sudo-1.8.6p3-CVE-2013-1775.patch + * CVE-2013-1776 (bnc#806921) + + sudo-1.8.6p3-CVE-2013-1776.patch + +------------------------------------------------------------------- New: ---- sudo-1.8.6p3-CVE-2013-1775.patch sudo-1.8.6p3-CVE-2013-1776.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sudo.spec ++++++ --- /var/tmp/diff_new_pack.7XucCn/_old 2013-03-01 20:45:26.000000000 +0100 +++ /var/tmp/diff_new_pack.7XucCn/_new 2013-03-01 20:45:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sudo # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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,6 +28,8 @@ Source2: README.SUSE Patch0: sudoers2ldif-env.patch Patch1: sudo-sudoers.patch +Patch2: sudo-1.8.6p3-CVE-2013-1775.patch +Patch3: sudo-1.8.6p3-CVE-2013-1776.patch BuildRequires: audit-devel BuildRequires: groff BuildRequires: libselinux-devel @@ -57,6 +59,8 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %ifarch s390 s390x %sparc ++++++ sudo-1.8.6p3-CVE-2013-1775.patch ++++++ 63210a2b8f2f199b521f6c8213bb29775c09375c plugins/sudoers/check.c | 53 +++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 25 deletions(-) Index: sudo-1.8.6p3/plugins/sudoers/check.c =================================================================== --- sudo-1.8.6p3.orig/plugins/sudoers/check.c 2012-09-18 15:56:29.000000000 +0200 +++ sudo-1.8.6p3/plugins/sudoers/check.c 2013-03-01 12:10:34.285863069 +0100 @@ -627,31 +627,34 @@ timestamp_status(char *timestampdir, cha */ if (status == TS_OLD && !ISSET(flags, TS_REMOVE)) { mtim_get(&sb, &mtime); - /* Negative timeouts only expire manually (sudo -k). */ - if (def_timestamp_timeout < 0 && mtime.tv_sec != 0) - status = TS_CURRENT; - else { - now = time(NULL); - if (def_timestamp_timeout && - now - mtime.tv_sec < 60 * def_timestamp_timeout) { - /* - * Check for bogus time on the stampfile. The clock may - * have been set back or someone could be trying to spoof us. - */ - if (mtime.tv_sec > now + 60 * def_timestamp_timeout * 2) { - time_t tv_sec = (time_t)mtime.tv_sec; - log_error(0, - _("timestamp too far in the future: %20.20s"), - 4 + ctime(&tv_sec)); - if (timestampfile) - (void) unlink(timestampfile); - else - (void) rmdir(timestampdir); - status = TS_MISSING; - } else if (get_boottime(&boottime) && timevalcmp(&mtime, &boottime, <)) { - status = TS_OLD; - } else { - status = TS_CURRENT; + if (timevalisset(&mtime)) { + /* Negative timeouts only expire manually (sudo -k). */ + if (def_timestamp_timeout < 0) { + status = TS_CURRENT; + } else { + now = time(NULL); + if (def_timestamp_timeout && + now - mtime.tv_sec < 60 * def_timestamp_timeout) { + /* + * Check for bogus time on the stampfile. The clock may + * have been set back or user could be trying to spoof us. + */ + if (mtime.tv_sec > now + 60 * def_timestamp_timeout * 2) { + time_t tv_sec = (time_t)mtime.tv_sec; + log_error(0, + _("timestamp too far in the future: %20.20s"), + 4 + ctime(&tv_sec)); + if (timestampfile) + (void) unlink(timestampfile); + else + (void) rmdir(timestampdir); + status = TS_MISSING; + } else if (get_boottime(&boottime) && + timevalcmp(&mtime, &boottime, <)) { + status = TS_OLD; + } else { + status = TS_CURRENT; + } } } } ++++++ sudo-1.8.6p3-CVE-2013-1776.patch ++++++ 2b18d55589975e70dd98f24bca5b0aaabc56a9b5 plugins/sudoers/check.c | 4 +++- plugins/sudoers/sudoers.c | 4 ++++ plugins/sudoers/sudoers.h | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) Index: sudo-1.8.6p3/plugins/sudoers/check.c =================================================================== --- sudo-1.8.6p3.orig/plugins/sudoers/check.c 2013-03-01 12:10:18.668403327 +0100 +++ sudo-1.8.6p3/plugins/sudoers/check.c 2013-03-01 12:10:18.684403798 +0100 @@ -82,6 +82,7 @@ static struct tty_info { dev_t rdev; /* tty device ID */ ino_t ino; /* tty inode number */ struct timeval ctime; /* tty inode change time */ + pid_t sid; /* ID of session with controlling tty */ } tty_info; static int build_timestamp(char **, char **); @@ -138,13 +139,14 @@ check_user(int validated, int mode) if (ISSET(mode, MODE_IGNORE_TICKET)) SET(validated, FLAG_CHECK_USER); - /* Stash the tty's ctime for tty ticket comparison. */ + /* Stash the tty's device, session ID and ctime for ticket comparison. */ if (def_tty_tickets && user_ttypath && stat(user_ttypath, &sb) == 0) { tty_info.dev = sb.st_dev; tty_info.ino = sb.st_ino; tty_info.rdev = sb.st_rdev; if (tty_is_devpts(user_ttypath)) ctim_get(&sb, &tty_info.ctime); + tty_info.sid = user_sid; } if (build_timestamp(&timestampdir, &timestampfile) == -1) { Index: sudo-1.8.6p3/plugins/sudoers/sudoers.c =================================================================== --- sudo-1.8.6p3.orig/plugins/sudoers/sudoers.c 2012-09-18 15:56:30.000000000 +0200 +++ sudo-1.8.6p3/plugins/sudoers/sudoers.c 2013-03-01 12:10:18.685403827 +0100 @@ -1410,6 +1410,10 @@ deserialize_info(char * const args[], ch sudo_user.cols = atoi(*cur + sizeof("cols=") - 1); continue; } + if (MATCHES(*cur, "sid=")) { + sudo_user.sid = atoi(*cur + sizeof("sid=") - 1); + continue; + } } if (user_cwd == NULL) user_cwd = "unknown"; Index: sudo-1.8.6p3/plugins/sudoers/sudoers.h =================================================================== --- sudo-1.8.6p3.orig/plugins/sudoers/sudoers.h 2012-09-18 15:57:43.000000000 +0200 +++ sudo-1.8.6p3/plugins/sudoers/sudoers.h 2013-03-01 12:10:18.685403827 +0100 @@ -95,6 +95,7 @@ struct sudo_user { int flags; uid_t uid; uid_t gid; + pid_t sid; }; /* @@ -171,8 +172,8 @@ struct sudo_user { #define user_name (sudo_user.name) #define user_uid (sudo_user.uid) #define user_gid (sudo_user.gid) +#define user_sid (sudo_user.sid) #define user_passwd (sudo_user.pw->pw_passwd) -#define user_uuid (sudo_user.uuid) #define user_dir (sudo_user.pw->pw_dir) #define user_gids (sudo_user.gids) #define user_ngids (sudo_user.ngids) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit smp_utils for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package smp_utils for openSUSE:Factory checked in at 2013-03-01 20:44:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/smp_utils (Old) and /work/SRC/openSUSE:Factory/.smp_utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "smp_utils", Maintainer is "hare(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/smp_utils/smp_utils.changes 2011-10-04 18:15:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.smp_utils.new/smp_utils.changes 2013-03-01 20:44:46.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Mar 1 11:54:46 UTC 2013 - cfarrell(a)suse.com + +- license update: BSD-3-Clause and GPL-2.0 + See mptctl.h + +------------------------------------------------------------------- +Thu Feb 28 06:00:53 UTC 2013 - coolo(a)suse.com + +- update license to new format + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smp_utils.spec ++++++ --- /var/tmp/diff_new_pack.ul1i00/_old 2013-03-01 20:44:55.000000000 +0100 +++ /var/tmp/diff_new_pack.ul1i00/_new 2013-03-01 20:44:55.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package smp_utils # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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,30 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: smp_utils -License: BSD-3-Clause ; GPL-2.0+ -Group: Hardware/Other -AutoReqProv: on +Provides: scsi:/usr/bin/smp_conf_general Provides: scsi:/usr/bin/smp_conf_route_info Provides: scsi:/usr/bin/smp_discover Provides: scsi:/usr/bin/smp_discover_list Provides: scsi:/usr/bin/smp_phy_control Provides: scsi:/usr/bin/smp_phy_test Provides: scsi:/usr/bin/smp_read_gpio +Provides: scsi:/usr/bin/smp_rep_exp_route_tbl Provides: scsi:/usr/bin/smp_rep_general Provides: scsi:/usr/bin/smp_rep_manufacturer Provides: scsi:/usr/bin/smp_rep_phy_err_log Provides: scsi:/usr/bin/smp_rep_phy_sata Provides: scsi:/usr/bin/smp_rep_route_info Provides: scsi:/usr/bin/smp_write_gpio -Provides: scsi:/usr/bin/smp_conf_general -Provides: scsi:/usr/bin/smp_rep_exp_route_tbl Version: 0.94 -Release: 1 +Release: 0 Summary: Utilities for the SAS Management Protocol (SMP) +License: BSD-3-Clause and GPL-2.0 +Group: Hardware/Other Source: http://sg.danny.cz/sg/p/%{name}-%{version}.tar.bz2 Patch1: smp_utils-Makefile.diff Patch2: %{name}-compile-fixes -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sensors for openSUSE:12.3
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package sensors for openSUSE:12.3 checked in at 2013-03-01 20:44:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/sensors (Old) and /work/SRC/openSUSE:12.3/.sensors.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sensors", Maintainer is "JDelvare(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/sensors/sensors.changes 2013-01-31 01:38:04.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.sensors.new/sensors.changes 2013-03-01 20:44:44.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Feb 28 18:43:13 CET 2013 - jdelvare(a)suse.de + +- lm_sensors-r6111-detection-Winbond-W83627SF.diff: Add detection + of Winbond W83627SF/GF (no sensors.) +- lm_sensors-r6112-detection-AMD-family-16h.diff: Add detection of + AMD family 16h power sensors. +- lm_sensors-r6113-ITE-IT877x-IT878x-driver.diff: Map IT8771E, + IT8772E, IT8782F and IT8783F to it87. +- lm_sensors-r6117-detection-ITE-IT8752F.diff: Add detection of + IT8752F. +- lm_sensors-r6123-AnalogDev-ADT7410-driver.diff: We have a driver + for the ADT7410 since kernel 3.7. + +------------------------------------------------------------------- New: ---- lm_sensors-r6111-detection-Winbond-W83627SF.diff lm_sensors-r6112-detection-AMD-family-16h.diff lm_sensors-r6113-ITE-IT877x-IT878x-driver.diff lm_sensors-r6117-detection-ITE-IT8752F.diff lm_sensors-r6123-AnalogDev-ADT7410-driver.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sensors.spec ++++++ --- /var/tmp/diff_new_pack.NMKA66/_old 2013-03-01 20:44:44.000000000 +0100 +++ /var/tmp/diff_new_pack.NMKA66/_new 2013-03-01 20:44:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sensors # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -34,6 +34,11 @@ Patch2: lm_sensors-3.0.0-sensord-separate.patch Patch3: lm_sensors-3.0.0-sysconfig_metadata.patch Patch4: lm_sensors-3.0.3-hint-at-kernel-extra-package.patch +Patch5: lm_sensors-r6111-detection-Winbond-W83627SF.diff +Patch6: lm_sensors-r6112-detection-AMD-family-16h.diff +Patch7: lm_sensors-r6113-ITE-IT877x-IT878x-driver.diff +Patch8: lm_sensors-r6117-detection-ITE-IT8752F.diff +Patch9: lm_sensors-r6123-AnalogDev-ADT7410-driver.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 s390x @@ -136,6 +141,11 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ++++++ lm_sensors-r6111-detection-Winbond-W83627SF.diff ++++++ Subject: Add detection of Winbond W83627SF/GF (no sensors) Upstream: yes, r6111 --- prog/detect/sensors-detect | 4 ++++ 1 file changed, 4 insertions(+) --- lm_sensors-3.3.3.orig/prog/detect/sensors-detect +++ lm_sensors-3.3.3/prog/detect/sensors-detect @@ -1945,6 +1945,10 @@ use constant FEAT_SMBUS => (1 << 7); logdev => 0x0b, features => FEAT_IN | FEAT_FAN | FEAT_TEMP, }, { + name => "Winbond W83627SF/GF Super IO", + driver => "not-a-sensor", + devid => 0x59, + }, { name => "Winbond W83627THF/THG Super IO Sensors", driver => "w83627hf", devid => 0x82, ++++++ lm_sensors-r6112-detection-AMD-family-16h.diff ++++++ Subject: Add detection of AMD family 16h power sensors Upstream: yes, r6112 --- prog/detect/sensors-detect | 4 ++++ 1 file changed, 4 insertions(+) --- lm_sensors-3.3.3.orig/prog/detect/sensors-detect +++ lm_sensors-3.3.3/prog/detect/sensors-detect @@ -2353,6 +2353,10 @@ use vars qw(@cpu_ids); driver => "fam15h_power", detect => sub { amd_pci_detect('1604') }, }, { + name => "AMD Family 16h power sensors", + driver => "fam15h_power", + detect => sub { amd_pci_detect('1534') }, + }, { name => "Intel digital thermal sensor", driver => "coretemp", detect => \&coretemp_detect, ++++++ lm_sensors-r6113-ITE-IT877x-IT878x-driver.diff ++++++ Subject: Map ITE IT8771E, IT8772E, IT8782F and IT8783F to it87 Upstream: yes, r6113 --- prog/detect/sensors-detect | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- lm_sensors-3.3.3.orig/prog/detect/sensors-detect +++ lm_sensors-3.3.3/prog/detect/sensors-detect @@ -2225,13 +2225,13 @@ use constant FEAT_SMBUS => (1 << 7); features => FEAT_IN | FEAT_FAN | FEAT_TEMP, }, { name => "ITE IT8771E Super IO Sensors", - driver => "to-be-written", # it87 + driver => "it87", devid => 0x8771, logdev => 0x04, features => FEAT_IN | FEAT_FAN | FEAT_TEMP, }, { name => "ITE IT8772E Super IO Sensors", - driver => "to-be-written", # it87 + driver => "it87", devid => 0x8772, logdev => 0x04, features => FEAT_IN | FEAT_FAN | FEAT_TEMP, @@ -2243,13 +2243,13 @@ use constant FEAT_SMBUS => (1 << 7); features => FEAT_IN | FEAT_FAN | FEAT_TEMP, }, { name => "ITE IT8782F Super IO Sensors", - driver => "to-be-written", # it87 + driver => "it87", devid => 0x8782, logdev => 0x04, features => FEAT_IN | FEAT_FAN | FEAT_TEMP, }, { name => "ITE IT8783F Super IO Sensors", - driver => "to-be-written", # it87 + driver => "it87", devid => 0x8783, logdev => 0x04, features => FEAT_IN | FEAT_FAN | FEAT_TEMP, ++++++ lm_sensors-r6117-detection-ITE-IT8752F.diff ++++++ Subject: Add detection of ITE IT8752F Upstream: yes, r6117 --- prog/detect/sensors-detect | 6 ++++++ 1 file changed, 6 insertions(+) --- lm_sensors-3.3.3.orig/prog/detect/sensors-detect +++ lm_sensors-3.3.3/prog/detect/sensors-detect @@ -2224,6 +2224,12 @@ use constant FEAT_SMBUS => (1 << 7); logdev => 0x04, features => FEAT_IN | FEAT_FAN | FEAT_TEMP, }, { + name => "ITE IT8752F Super IO Sensors", + driver => "to-be-written", # it87 + devid => 0x8752, + logdev => 0x04, + features => FEAT_IN | FEAT_FAN | FEAT_TEMP, + }, { name => "ITE IT8771E Super IO Sensors", driver => "it87", devid => 0x8771, ++++++ lm_sensors-r6123-AnalogDev-ADT7410-driver.diff ++++++ Subject: Update Analog Devices ADT7410 detection Upstream: yes, r6123 We have a driver for the ADT7410 since kernel 3.7. ADT7420 is register compatible with the ADT7410. --- prog/detect/sensors-detect | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- lm_sensors-3.3.3.orig/prog/detect/sensors-detect +++ lm_sensors-3.3.3/prog/detect/sensors-detect @@ -637,8 +637,8 @@ use vars qw(@i2c_adapter_names); i2c_addrs => [0x2c..0x2e], i2c_detect => sub { adt7490_detect(@_); }, }, { - name => "Analog Devices ADT7410", - driver => "to-be-written", + name => "Analog Devices ADT7410/ADT7420", + driver => "adt7410", i2c_addrs => [0x48..0x4b], i2c_detect => sub { adt7410_detect(@_); }, }, { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0