From 67ded19926d3c6aae1c3c3672a87a8cdfb27375d Mon Sep 17 00:00:00 2001
From: Richard Hughes <rhughes@fedoraproject.org>
Date: Wed, 5 Nov 2008 09:54:59 +0000
Subject: [PATCH] - Increase the timeout for cleaning up unused transactions.
 Due to a bug in     the PkClient library the new TID was not being requested,
 and the old     TID was being re-used. This gave a DBUS error if the user
 spent longer     than five seconds entering the password the very first time
 they used     PackageKit to do an authentication. Apply a simple patch to
 mitigate     this, as a more invasive (and correct) patch is upstream. A new
 release     will follow in f10-updates. Fixes rh#469950

---
 PackageKit.spec                     | 15 ++++++++++++++-
 pk-cleanup-transaction-longer.patch | 13 +++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 pk-cleanup-transaction-longer.patch

diff --git a/PackageKit.spec b/PackageKit.spec
index 8529eb2..4d63519 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -8,7 +8,7 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.9
-Release:   3%{?dist}
+Release:   4%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -31,6 +31,9 @@ Patch3:    pk-install-qt-cmake-build.patch
 # upstream, 32f39d67971f1bd6dbf4b559a8f95e8712edccf8
 Patch4:    pk-fix-get-distro-upgrade.patch
 
+# upstream, with the proper fix not this bodge
+Patch5:    pk-cleanup-transaction-longer.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
@@ -216,6 +219,7 @@ codecs from configured repositories using PackageKit.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -389,6 +393,15 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Wed Nov 05 2008 Richard Hughes  <rhughes@redhat.com> - 0.3.9-4
+- Increase the timeout for cleaning up unused transactions. Due to a bug
+  in the PkClient library the new TID was not being requested, and the old
+  TID was being re-used. This gave a DBUS error if the user spent longer than
+  five seconds entering the password the very first time they used PackageKit
+  to do an authentication.
+  Apply a simple patch to mitigate this, as a more invasive (and correct)
+  patch is upstream. A new release will follow in f10-updates. Fixes rh#469950
+
 * Thu Oct 28 2008 Richard Hughes  <rhughes@redhat.com> - 0.3.9-3
 - Install the usr/share/cmake/Modules/FindQPackageKit.cmake file so we
   can build KPackageKit from svn head.
diff --git a/pk-cleanup-transaction-longer.patch b/pk-cleanup-transaction-longer.patch
new file mode 100644
index 0000000..b85cb63
--- /dev/null
+++ b/pk-cleanup-transaction-longer.patch
@@ -0,0 +1,13 @@
+diff --git a/src/pk-transaction-list.c b/src/pk-transaction-list.c
+index 2e5a018..ad9aedd 100644
+--- a/src/pk-transaction-list.c
++++ b/src/pk-transaction-list.c
+@@ -56,7 +56,7 @@ static void     pk_transaction_list_finalize	(GObject        *object);
+ #define PK_TRANSACTION_LIST_KEEP_FINISHED_TIMEOUT	5
+ 
+ /* how long the tid is valid before it's destroyed, in seconds */
+-#define PK_TRANSACTION_LIST_CREATE_COMMIT_TIMEOUT	5
++#define PK_TRANSACTION_LIST_CREATE_COMMIT_TIMEOUT	5000
+ 
+ /* the interval between each CST, in seconds */
+ #define PK_TRANSACTION_WEDGE_CHECK			10