diff -Nru packagekit-1.1.12/debian/changelog packagekit-1.1.12/debian/changelog --- packagekit-1.1.12/debian/changelog 2019-03-01 12:09:06.000000000 +0000 +++ packagekit-1.1.12/debian/changelog 2019-03-02 21:02:38.000000000 +0000 @@ -1,10 +1,26 @@ -packagekit (1.1.12-2ubuntu1) disco; urgency=low +packagekit (1.1.12-5) unstable; urgency=medium - * Merge from Debian unstable. Remaining changes: - - debian/patches/frontend-locking.diff: Implement frontend locking - in a simple way. + * Fix FTBFS on !amd64 architectures by removing the + GTK+2 plugin properly. - -- Julian Andres Klode Fri, 01 Mar 2019 13:09:06 +0100 + -- Matthias Klumpp Sat, 02 Mar 2019 22:02:38 +0100 + +packagekit (1.1.12-4) unstable; urgency=medium + + * Add aptcc-frontend-locking.patch + - This implements APT frontend locking, which prevents other programs + from stealing the dpkg lock in race conditions where apt(cc) has to + release the lock in order to run dpkg. + + -- Matthias Klumpp Sat, 02 Mar 2019 16:46:16 +0100 + +packagekit (1.1.12-3) unstable; urgency=medium + + * Do not ship the GTK+2 plugin (Closes: #922118) + - Unfortunately we still need to build-depend on GTK+2 to + enable the GTK plugin build. + + -- Matthias Klumpp Fri, 01 Mar 2019 10:02:38 +0100 packagekit (1.1.12-2) unstable; urgency=medium @@ -25,14 +41,6 @@ -- Matthias Klumpp Tue, 26 Feb 2019 21:56:06 +0100 -packagekit (1.1.12-1ubuntu1) disco; urgency=low - - * Merge from Debian unstable. Remaining changes: - - debian/patches/frontend-locking.diff: Implement frontend locking - in a simple way. - - -- Julian Andres Klode Mon, 07 Jan 2019 08:39:47 +0100 - packagekit (1.1.12-1) unstable; urgency=medium * New upstream version: 1.1.12 @@ -43,14 +51,6 @@ -- Matthias Klumpp Sat, 22 Dec 2018 18:11:20 +0100 -packagekit (1.1.11-1ubuntu1) disco; urgency=low - - * Merge from Debian unstable. Remaining changes: - - debian/patches/frontend-locking.diff: Implement frontend locking - in a simple way. - - -- Julian Andres Klode Mon, 12 Nov 2018 11:14:45 +0100 - packagekit (1.1.11-1) unstable; urgency=medium * New upstream version: 1.1.11 @@ -65,60 +65,6 @@ -- Matthias Klumpp Mon, 15 Oct 2018 18:54:28 +0200 -packagekit (1.1.10-1ubuntu7) cosmic; urgency=medium - - * Pass --no-restart-after-upgrade to dh_installsystemd to avoid PackageKit - restarting while upgrading under PackageKit (LP: #1790613) - - -- Julian Andres Klode Mon, 15 Oct 2018 15:37:44 +0200 - -packagekit (1.1.10-1ubuntu6) cosmic; urgency=medium - - * debian/patches/aptcc-Always-try-multi-arch-lookups-for-lists.patch: - - Always try multi-arch paths for .list files, as dpkg does not add the - architecture only for multi-arch systems - - -- Julian Andres Klode Wed, 26 Sep 2018 12:47:42 +0200 - -packagekit (1.1.10-1ubuntu5) cosmic; urgency=medium - - * debian/patches/aptcc-removing-duplicate-delete-call.patch: - - Import upstream patch fixing a duplicate delete statement in providesCodec - - -- Julian Andres Klode Wed, 05 Sep 2018 12:07:34 +0200 - -packagekit (1.1.10-1ubuntu4) cosmic; urgency=medium - - * debian/patches/aptcc-Fix-invalid-version-dereference-in-AptInf-prov.patch: - Fix dereferencing of invalid version in providesCodec() (LP: #1790671) - - -- Julian Andres Klode Tue, 04 Sep 2018 18:18:05 +0200 - -packagekit (1.1.10-1ubuntu3) cosmic; urgency=medium - - * debian/patches/0001-aptcc-Only-autoremove-packages-that-relate-to-the-cu.patch: - * debian/patches/0002-aptcc-Use-installed-version-to-determine-garbage.patch: - - Correct autoremove behaviour to only autoremove packages that relate to - the current transaction (LP: #1552792) - - -- Robert Ancell Mon, 03 Sep 2018 14:20:00 +1200 - -packagekit (1.1.10-1ubuntu2) cosmic; urgency=medium - - * debian/patches/frontend-locking.diff: Implement frontend locking in a - simple way. Will need some more work to upstream, and possibly some - error checking. - - -- Julian Andres Klode Tue, 07 Aug 2018 16:25:51 +0200 - -packagekit (1.1.10-1ubuntu1) cosmic; urgency=medium - - * debian/patches/0001-De-register-callbacks-on-PkClientHelper-finalize.patch: - * debian/patches/0001-Fix-issues-with-debconf-helper-not-working.patch: - - Fix debconf interaction (LP: #1722185) - - -- Robert Ancell Mon, 21 May 2018 15:13:02 +1200 - packagekit (1.1.10-1) unstable; urgency=high * New upstream release: 1.1.10 @@ -1225,4 +1171,3 @@ * Initial release (Closes: #468132) -- Matthias Klumpp Wed, 25 Aug 2010 19:40:12 +0200 - diff -Nru packagekit-1.1.12/debian/control packagekit-1.1.12/debian/control --- packagekit-1.1.12/debian/control 2019-02-27 04:43:25.000000000 +0000 +++ packagekit-1.1.12/debian/control 2019-03-02 17:42:22.000000000 +0000 @@ -1,8 +1,7 @@ Source: packagekit Section: admin Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Matthias Klumpp +Maintainer: Matthias Klumpp Uploaders: Julian Andres Klode Build-Depends: autoconf-archive, bash-completion, @@ -13,7 +12,7 @@ gtk-doc-tools, intltool, libappstream-dev (>= 0.11), - libapt-pkg-dev (>= 1.7.0~alpha2ubuntu1~), + libapt-pkg-dev (>= 1.8), libarchive-dev, libgirepository1.0-dev (>= 1.36), libglib2.0-dev (>= 2.46), diff -Nru packagekit-1.1.12/debian/packagekit-gtk3-module.install packagekit-1.1.12/debian/packagekit-gtk3-module.install --- packagekit-1.1.12/debian/packagekit-gtk3-module.install 2019-02-27 04:43:25.000000000 +0000 +++ packagekit-1.1.12/debian/packagekit-gtk3-module.install 2019-03-01 22:02:09.000000000 +0000 @@ -1,3 +1,2 @@ usr/lib/*/gnome-settings-daemon-3.0/gtk-modules/* usr/lib/gnome-settings-daemon-3.0/gtk-modules -usr/lib/*/gtk-2.0/modules/*.so usr/lib/*/gtk-3.0/modules/*.so diff -Nru packagekit-1.1.12/debian/patches/04_aptcc-frontend-locking.patch packagekit-1.1.12/debian/patches/04_aptcc-frontend-locking.patch --- packagekit-1.1.12/debian/patches/04_aptcc-frontend-locking.patch 1970-01-01 00:00:00.000000000 +0000 +++ packagekit-1.1.12/debian/patches/04_aptcc-frontend-locking.patch 2019-03-02 17:40:43.000000000 +0000 @@ -0,0 +1,53 @@ +From 5ba21995f9a212076bc8957d1ef1be7110ec1db4 Mon Sep 17 00:00:00 2001 +From: Julian Andres Klode +Date: Fri, 1 Mar 2019 13:12:07 +0100 +Subject: [PATCH] aptcc: Implement frontend-locking + +This implements APT frontend locking, which prevents other programs +from stealing the dpkg lock in race conditions where apt(cc) has to +release the lock in order to run dpkg. + +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1795614 +--- + backends/aptcc/apt-intf.cpp | 3 ++- + configure.ac | 6 ++++++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/backends/aptcc/apt-intf.cpp b/backends/aptcc/apt-intf.cpp +index 5b4ee2829..7ef92273d 100644 +--- a/backends/aptcc/apt-intf.cpp ++++ b/backends/aptcc/apt-intf.cpp +@@ -2384,7 +2384,7 @@ bool AptIntf::installPackages(PkBitfield flags) + + // we could try to see if this is the case + setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", 1); +- _system->UnLock(); ++ _system->UnLockInner(); + + pkgPackageManager::OrderResult res; + res = PM->DoInstallPreFork(); +@@ -2482,6 +2482,7 @@ bool AptIntf::installPackages(PkBitfield flags) + close(readFromChildFD[0]); + close(readFromChildFD[1]); + close(pty_master); ++ _system->LockInner(); + + cout << "Parent finished..." << endl; + return true; +diff --git a/configure.ac b/configure.ac +index 27d695cb4..a7abd8c11 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -462,6 +462,12 @@ if test x$enable_aptcc = xyes; then + AC_MSG_RESULT([yes]), + AC_MSG_FAILURE([need libapt-pkg 1.1 or later])) + ++ AC_MSG_CHECKING([whether apt has frontend locking / is at least version 1.7]) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], ++ [[_system->LockInner();]])], ++ AC_MSG_RESULT([yes]), ++ AC_MSG_FAILURE([need libapt-pkg 1.7 or later - or backported frontend locking])) ++ + AC_MSG_CHECKING([whether apt supports ddtp]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[pkgCache::DescIterator d;]])], diff -Nru packagekit-1.1.12/debian/patches/frontend-locking.diff packagekit-1.1.12/debian/patches/frontend-locking.diff --- packagekit-1.1.12/debian/patches/frontend-locking.diff 2018-11-12 10:12:08.000000000 +0000 +++ packagekit-1.1.12/debian/patches/frontend-locking.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -Description: PoC frontend locking patch - This needs more work to be upstreamed, but should allow us to check - frontend locking IRL. -Forwarded: no -Author: Julian Andres Klode -Last-Update: 2018-08-07 ---- a/backends/aptcc/apt-intf.cpp -+++ b/backends/aptcc/apt-intf.cpp -@@ -2384,7 +2384,7 @@ bool AptIntf::installPackages(PkBitfield - - // we could try to see if this is the case - setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", 1); -- _system->UnLock(); -+ _system->UnLockInner(); - - pkgPackageManager::OrderResult res; - res = PM->DoInstallPreFork(); -@@ -2482,6 +2482,7 @@ bool AptIntf::installPackages(PkBitfield - close(readFromChildFD[0]); - close(readFromChildFD[1]); - close(pty_master); -+ _system->LockInner(); - - cout << "Parent finished..." << endl; - return true; diff -Nru packagekit-1.1.12/debian/patches/series packagekit-1.1.12/debian/patches/series --- packagekit-1.1.12/debian/patches/series 2019-03-01 12:08:45.000000000 +0000 +++ packagekit-1.1.12/debian/patches/series 2019-03-02 17:40:59.000000000 +0000 @@ -1,5 +1,5 @@ policy.diff -frontend-locking.diff 01_aptcc-no-distupgrade.patch 02_keep-ref-on-transaction-while-doing-polkit-call.patch 03_aptcc-use-correct-return-type-in-function.patch +04_aptcc-frontend-locking.patch diff -Nru packagekit-1.1.12/debian/rules packagekit-1.1.12/debian/rules --- packagekit-1.1.12/debian/rules 2019-02-27 04:43:25.000000000 +0000 +++ packagekit-1.1.12/debian/rules 2019-03-02 21:02:38.000000000 +0000 @@ -54,6 +54,7 @@ rm -f $(INSTALLDIR)/usr/share/PackageKit/pk-upgrade-distro.sh rm -f $(INSTALLDIR)/usr/bin/packagekit-bugreport.sh rm -f $(INSTALLDIR)/var/lib/PackageKit/transactions.db + rm -rf $(INSTALLDIR)/usr/lib/*/gtk-2.0/ rm $(INSTALLDIR)/etc/PackageKit/Vendor.conf ifeq ($(shell dpkg-vendor --query vendor),Ubuntu)