From 0da38f6cdd439284d863fd541a89f36728a9f7a5 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Tue, 17 Dec 2013 17:02:48 +0000 Subject: [PATCH] New upstream release --- .gitignore | 1 + ...t-when-re-using-a-PkPackage-instance.patch | 74 ------------ 0022-Use-syslog-correctly.patch | 105 ------------------ PackageKit.spec | 41 +++++-- sources | 2 +- 5 files changed, 32 insertions(+), 191 deletions(-) delete mode 100644 0001-Do-not-assert-when-re-using-a-PkPackage-instance.patch delete mode 100644 0022-Use-syslog-correctly.patch diff --git a/.gitignore b/.gitignore index d8842a8..5a080f2 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ PackageKit-0.6.7.tar.bz2 /PackageKit-0.8.12.tar.xz /PackageKit-0.8.13.tar.xz /PackageKit-0.8.14.tar.xz +/PackageKit-0.8.15.tar.xz diff --git a/0001-Do-not-assert-when-re-using-a-PkPackage-instance.patch b/0001-Do-not-assert-when-re-using-a-PkPackage-instance.patch deleted file mode 100644 index 5514d24..0000000 --- a/0001-Do-not-assert-when-re-using-a-PkPackage-instance.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 9a6e31aac2ddf6c4bd28c70c60b333e81680ef3c Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Tue, 3 Dec 2013 09:22:12 +0000 -Subject: [PATCH] Do not assert when re-using a PkPackage instance - -This fixes commit 8d26af195536cd50f5cd8e6124df4439bb21d287 which added the -additional restriction that the PkPackage couldn't be re-used. This restriction -made the daemon crash when getting package history in gnome-software. - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1036837 ---- - lib/packagekit-glib2/pk-package.c | 5 ++++- - lib/packagekit-glib2/pk-self-test.c | 8 -------- - 2 files changed, 4 insertions(+), 9 deletions(-) - -diff --git a/lib/packagekit-glib2/pk-package.c b/lib/packagekit-glib2/pk-package.c -index beaad5f..a9560bb 100644 ---- a/lib/packagekit-glib2/pk-package.c -+++ b/lib/packagekit-glib2/pk-package.c -@@ -166,7 +166,10 @@ pk_package_set_id (PkPackage *package, const gchar *package_id, GError **error) - - g_return_val_if_fail (PK_IS_PACKAGE (package), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); -- g_return_val_if_fail (priv->package_id == NULL, FALSE); -+ -+ /* free old data */ -+ g_free (priv->package_id); -+ g_free (priv->package_id_data); - - /* copy the package-id into package_id_data, change the ';' into '\0' - * and reference the pointers in the const gchar * array */ -diff --git a/lib/packagekit-glib2/pk-self-test.c b/lib/packagekit-glib2/pk-self-test.c -index 753810d..a5e139c 100644 ---- a/lib/packagekit-glib2/pk-self-test.c -+++ b/lib/packagekit-glib2/pk-self-test.c -@@ -1937,35 +1937,27 @@ pk_test_package_func (void) - ret = pk_package_set_id (package, "gnome-power-manager", &error); - g_assert_error (error, 1, 0); - g_assert (!ret); -- g_object_unref (package); - g_clear_error (&error); - - /* set invalid id (sections) */ -- package = pk_package_new (); - ret = pk_package_set_id (package, "gnome-power-manager;0.1.2;i386", &error); - g_assert_error (error, 1, 0); - g_assert (!ret); -- g_object_unref (package); - g_clear_error (&error); - - /* set invalid id (sections) */ -- package = pk_package_new (); - ret = pk_package_set_id (package, "gnome-power-manager;0.1.2;i386;fedora;dave", &error); - g_assert_error (error, 1, 0); - g_assert (!ret); -- g_object_unref (package); - g_clear_error (&error); - - /* set invalid name */ -- package = pk_package_new (); - ret = pk_package_set_id (package, ";0.1.2;i386;fedora", &error); - g_assert_error (error, 1, 0); - g_assert (!ret); -- g_object_unref (package); - g_clear_error (&error); - - /* set valid name */ -- package = pk_package_new (); - ret = pk_package_set_id (package, "gnome-power-manager;0.1.2;i386;fedora", &error); - g_assert_no_error (error); - g_assert (ret); --- -1.8.4.2 - diff --git a/0022-Use-syslog-correctly.patch b/0022-Use-syslog-correctly.patch deleted file mode 100644 index 19444ca..0000000 --- a/0022-Use-syslog-correctly.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 2295b08d4f19b650abc7a14436a486715a913d1c Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Wed, 4 Dec 2013 13:57:59 +0000 -Subject: [PATCH 22/50] Use syslog() correctly - -Resolves: https://bugs.freedesktop.org/show_bug.cgi?id=72275 ---- - src/pk-main.c | 4 ++-- - src/pk-transaction.c | 16 +++++++++------- - 2 files changed, 11 insertions(+), 9 deletions(-) - -diff --git a/src/pk-main.c b/src/pk-main.c -index 3ce5694..457a511 100644 ---- a/src/pk-main.c -+++ b/src/pk-main.c -@@ -241,7 +241,7 @@ main (int argc, char *argv[]) - pk_conf_set_bool (conf, "KeepEnvironment", keep_environment); - - /* log the startup */ -- syslog (LOG_DAEMON, "daemon start"); -+ syslog (LOG_DAEMON | LOG_DEBUG, "daemon start"); - - /* after how long do we timeout? */ - exit_idle_time = pk_conf_get_int (conf, "ShutdownTimeout"); -@@ -309,7 +309,7 @@ main (int argc, char *argv[]) - g_main_loop_run (loop); - out: - /* log the shutdown */ -- syslog (LOG_DAEMON, "daemon quit"); -+ syslog (LOG_DAEMON | LOG_DEBUG, "daemon quit"); - closelog (); - - if (timer_id > 0) -diff --git a/src/pk-transaction.c b/src/pk-transaction.c -index 9e741f7..6471d1b 100644 ---- a/src/pk-transaction.c -+++ b/src/pk-transaction.c -@@ -1246,7 +1246,7 @@ pk_transaction_finished_cb (PkBackendJob *job, PkExitEnum exit_enum, PkTransacti - if (info == PK_INFO_ENUM_REMOVING || - info == PK_INFO_ENUM_INSTALLING || - info == PK_INFO_ENUM_UPDATING) { -- syslog (LOG_DAEMON, -+ syslog (LOG_DAEMON | LOG_DEBUG, - "in %s for %s package %s was %s for uid %i", - transaction->priv->tid, - pk_role_enum_to_string (transaction->priv->role), -@@ -1281,7 +1281,7 @@ pk_transaction_finished_cb (PkBackendJob *job, PkExitEnum exit_enum, PkTransacti - - /* report to syslog */ - if (transaction->priv->uid != PK_TRANSACTION_UID_INVALID) { -- syslog (LOG_DAEMON, -+ syslog (LOG_DAEMON | LOG_INFO, - "%s transaction %s from uid %i finished with %s after %ims", - pk_role_enum_to_string (transaction->priv->role), - transaction->priv->tid, -@@ -1289,7 +1289,7 @@ pk_transaction_finished_cb (PkBackendJob *job, PkExitEnum exit_enum, PkTransacti - pk_exit_enum_to_string (exit_enum), - time_ms); - } else { -- syslog (LOG_DAEMON, -+ syslog (LOG_DAEMON | LOG_INFO, - "%s transaction %s finished with %s after %ims", - pk_role_enum_to_string (transaction->priv->role), - transaction->priv->tid, -@@ -2473,7 +2473,7 @@ pk_transaction_commit (PkTransaction *transaction) - pk_transaction_db_set_cmdline (priv->transaction_db, priv->tid, priv->cmdline); - - /* report to syslog */ -- syslog (LOG_DAEMON, -+ syslog (LOG_DAEMON | LOG_DEBUG, - "new %s transaction %s scheduled from uid %i", - pk_role_enum_to_string (priv->role), - priv->tid, -@@ -2664,7 +2664,9 @@ pk_transaction_action_obtain_authorization_finished_cb (GObject *source_object, - "Failed to obtain authentication."); - pk_transaction_finished_emit (transaction, PK_EXIT_ENUM_FAILED, 0); - -- syslog (LOG_AUTHPRIV, "uid %i failed to obtain auth", priv->uid); -+ syslog (LOG_AUTH | LOG_NOTICE, -+ "uid %i failed to obtain auth", -+ priv->uid); - goto out; - } - -@@ -2677,7 +2679,7 @@ pk_transaction_action_obtain_authorization_finished_cb (GObject *source_object, - } - - /* log success too */ -- syslog (LOG_AUTHPRIV, "uid %i obtained auth", priv->uid); -+ syslog (LOG_AUTH | LOG_INFO, "uid %i obtained auth", priv->uid); - out: - if (result != NULL) - g_object_unref (result); -@@ -2876,7 +2878,7 @@ pk_transaction_obtain_authorization (PkTransaction *transaction, - } - - /* log */ -- syslog (LOG_AUTHPRIV, -+ syslog (LOG_AUTH | LOG_INFO, - "uid %i is trying to obtain %s auth (only_trusted:%i)", - priv->uid, - action_id, --- -1.8.4.2 - diff --git a/PackageKit.spec b/PackageKit.spec index 6b0738e..7894a9c 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -5,8 +5,8 @@ Summary: Package management service Name: PackageKit -Version: 0.8.14 -Release: 4%{?dist} +Version: 0.8.15 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.packagekit.org Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz @@ -17,16 +17,16 @@ Patch0: PackageKit-0.3.8-Fedora-Vendor.conf.patch # Upstreamable? allow use of xulrunner2 for browser-plugin support Patch4: PackageKit-0.7.4-xulrunner2.patch -# Upstream already -Patch5: 0001-Do-not-assert-when-re-using-a-PkPackage-instance.patch -Patch6: 0022-Use-syslog-correctly.patch - Requires: %{name}-glib%{?_isa} = %{version}-%{release} Requires: PackageKit-backend Requires: shared-mime-info Requires: comps-extras Requires: systemd +# This is for https://bugzilla.redhat.com/show_bug.cgi?id=1041577 and can be +# removed when libsolv is available in updates +Requires: libsolv >= 0.4.1 + # required by patch4 BuildRequires: automake gtk-doc libtool BuildRequires: glib2-devel >= 2.32.0 @@ -220,8 +220,6 @@ using PackageKit. %setup -q %patch0 -p1 -b .fedora %patch4 -p1 -b .xulrunner2 -%patch5 -p1 -b .no-history-crash -%patch6 -p1 -b .use_syslog_correctly NOCONFIGURE=1 ./autogen.sh @@ -229,11 +227,12 @@ NOCONFIGURE=1 ./autogen.sh %configure \ --disable-static \ --enable-yum \ - --disable-bash-completion \ %if 0%{?rhel} == 0 --enable-hawkey \ --enable-introspection \ --enable-bash-completion \ +%else + --disable-bash-completion \ %endif --with-default-backend=auto \ --disable-local \ @@ -311,7 +310,6 @@ systemctl enable packagekit-offline-update.service &> /dev/null || : %{_datadir}/polkit-1/rules.d/* %{_datadir}/PackageKit/pk-upgrade-distro.sh %{_libexecdir}/packagekitd -%{_libexecdir}/pk-trigger-offline-update %{_bindir}/pkmon %{_bindir}/pkcon %{_bindir}/packagekit-bugreport.sh @@ -334,7 +332,6 @@ systemctl enable packagekit-offline-update.service &> /dev/null || : %files yum %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/PackageKit/Yum.conf %{_libdir}/packagekit-backend/libpk_backend_yum.so %dir %{_datadir}/PackageKit/helpers/yum %{_datadir}/PackageKit/helpers/yum/* @@ -403,6 +400,28 @@ systemctl enable packagekit-offline-update.service &> /dev/null || : %{_libdir}/pkgconfig/packagekit-plugin.pc %changelog +* Tue Dec 17 2013 Richard Hughes - 0.8.15-1 +- New upstream release +- Do not update the role when doing the test transaction +- Ignore progressbar start text if it unchanged +- Only show some status values in pkcon after a small delay +- Resolve internally in pkcon to provide a better output +- Use the filter when removing and installing software using pkcon +- Use the system database location when compiling with --enable-local +- hawkey: Actually report progress when using DownloadPackages() +- hawkey: Allow upgrading packages using InstallFiles +- hawkey: Do not enable profiling by default +- hawkey: Do not return available packages that are already installed +- hawkey: Emit percentage events when processing a large transaction +- hawkey: Implement RepairSystem +- hawkey: List the packages in the downgrade warning +- hawkey: Never replace newer metadata with an older copy +- hawkey: Never use a cached sack when installing local packages +- hawkey: Return a better error when the rpmdb is hosed +- hawkey: Try harder to get the package name when cleaning up +- hawkey: Use 'local' for the package-id data for files +- hawkey: Use the correct error code when the lock is required + * Thu Dec 12 2013 Michael Schwendt - 0.8.14-4 - Replace the PackageKit dependency in PackageKit-backend-devel with a dep on PackageKit-glib-devel (which it needs for its diff --git a/sources b/sources index 601ca13..23af4f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -72fcf8b7c0ed40d0aff73d0cf78cb428 PackageKit-0.8.14.tar.xz +147e35b64e3e3b9ca8b2baefb37531f6 PackageKit-0.8.15.tar.xz