From ae72492940a1f9a626e12358c0b785758044c748 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 03 2016 06:03:20 +0000 Subject: import PackageKit-1.0.7-6.el7 --- diff --git a/SOURCES/0001-Make-pk_console_get_prompt-big-endian-safe.patch b/SOURCES/0001-Make-pk_console_get_prompt-big-endian-safe.patch new file mode 100644 index 0000000..58f3885 --- /dev/null +++ b/SOURCES/0001-Make-pk_console_get_prompt-big-endian-safe.patch @@ -0,0 +1,27 @@ +From 710a9445777793e49160587882860cbb7b43e311 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Mon, 16 May 2016 15:27:35 +0100 +Subject: [PATCH] Make pk_console_get_prompt() big endian safe + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1255079 +--- + lib/packagekit-glib2/pk-console-shared.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/packagekit-glib2/pk-console-shared.c b/lib/packagekit-glib2/pk-console-shared.c +index 66cb372..d61f3a1 100644 +--- a/lib/packagekit-glib2/pk-console-shared.c ++++ b/lib/packagekit-glib2/pk-console-shared.c +@@ -116,7 +116,8 @@ pk_readline_unbuffered (const gchar *prompt) + g_warning ("Got unexpected EOF."); + break; + } else { +- g_string_append_len (str, (const gchar *) &c, 1); ++ gchar c_safe = (gchar) c; ++ g_string_append_len (str, (const gchar *) &c_safe, 1); + } + } + tcsetattr (fileno (tty), TCSAFLUSH, &ots); +-- +2.7.4 + diff --git a/SOURCES/CentOS-Vendor-Branding.patch b/SOURCES/CentOS-Vendor-Branding.patch deleted file mode 100644 index 8573a7d..0000000 --- a/SOURCES/CentOS-Vendor-Branding.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -uNrp PackageKit-1.0.7.orig/etc/Vendor.conf PackageKit-1.0.7/etc/Vendor.conf ---- PackageKit-1.0.7.orig/etc/Vendor.conf 2015-04-22 04:54:56.000000000 -0500 -+++ PackageKit-1.0.7/etc/Vendor.conf 2015-11-22 11:03:41.134500772 -0600 -@@ -48,3 +48,6 @@ FontUrl=none - # - # default=none - MimeUrl=none -+#added by CentOS -+VendorName=CentOS -+VendorIcon=fedora-logo-small diff --git a/SPECS/PackageKit.spec b/SPECS/PackageKit.spec index 39d304d..43275d0 100644 --- a/SPECS/PackageKit.spec +++ b/SPECS/PackageKit.spec @@ -6,19 +6,22 @@ Summary: Package management service Name: PackageKit Version: 1.0.7 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.freedesktop.org/software/PackageKit/ Source0: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz # Fedora-specific: set Vendor.conf up for Fedora. +Patch0: PackageKit-0.3.8-Fedora-Vendor.conf.patch # Backported from upstream; record the session UID in the yumdb Patch1: 0001-yum-Record-the-UID-of-the-session-user-in-the-yumdb.patch # Backported from upstream; support getting details from local files Patch2: 0001-yum-Add-support-for-GetDetailsLocal.patch -Patch0: CentOS-Vendor-Branding.patch + +# Backported from upstream; make BE safe +Patch3: 0001-Make-pk_console_get_prompt-big-endian-safe.patch Requires: %{name}-glib%{?_isa} = %{version}-%{release} Requires: PackageKit-backend @@ -187,9 +190,10 @@ using PackageKit. %prep %setup -q +%patch0 -p1 -b .fedora %patch1 -p1 -b .yumdb %patch2 -p1 -b .yumdetailslocal -%patch0 -p1 +%patch3 -p1 -b .be-safe NOCONFIGURE=1 ./autogen.sh @@ -339,12 +343,9 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || : %{_datadir}/gtk-doc/html/PackageKit %changelog -* Sun Nov 22 2015 Johnny Hughes - 1.0.7-5.el7.centos -- Modify Vendor Patch - -* Thu Nov 19 2015 CentOS Sources - 1.0.7-5.el7.centos -- remove old branding patch -- Update Vendor patch to reference CentOS +* Mon May 16 2016 Richard Hughes - 1.0.7-6 +- Make pk_console_get_prompt() big endian safe to fix PPC64 +- Resolves: #1255079 * Tue Jul 28 2015 Richard Hughes - 1.0.7-5 - Add support for GetDetailsLocal