diff --git a/449.patch b/449.patch new file mode 100644 index 0000000..272ac54 --- /dev/null +++ b/449.patch @@ -0,0 +1,30 @@ +From 8c53aa3933cf51abd326ba5bc5811d04cf19488a Mon Sep 17 00:00:00 2001 +From: Patrick Uiterwijk +Date: Jun 03 2017 23:17:44 +0000 +Subject: Make sure to fix encoding all RPM Headers + + +The fix in #403 left some RPM Headers unfixed, most notably changelog* (because those are lists). +This patch makes use of fixEncodingRecurse to make sure all heades get encoded correctly. + +Signed-off-by: Patrick Uiterwijk + +--- + +diff --git a/hub/kojihub.py b/hub/kojihub.py +index 947f60d..d300038 100644 +--- a/hub/kojihub.py ++++ b/hub/kojihub.py +@@ -9883,10 +9883,7 @@ class RootExports(object): + raise koji.GenericError('either rpmID or taskID and filepath must be specified') + + headers = koji.get_header_fields(rpm_path, headers) +- for key, value in headers.items(): +- if isinstance(value, six.string_types): +- headers[key] = koji.fixEncoding(value, remove_nonprintable=True) +- return headers ++ return koji.fixEncodingRecurse(headers, remove_nonprintable=True) + + queryRPMSigs = staticmethod(query_rpm_sigs) + + diff --git a/koji.spec b/koji.spec index fb25534..4571dac 100644 --- a/koji.spec +++ b/koji.spec @@ -9,7 +9,7 @@ Name: koji Version: 1.12.0 -Release: 4%{?dist} +Release: 5%{?dist} # koji.ssl libs (from plague) are GPLv2+ License: LGPLv2 and GPLv2+ Summary: Build system tools @@ -26,6 +26,8 @@ Patch3: 7ec0e2c6b01f27f7a23546c64d775a1befd722e4.patch Patch4: 5bcf029d037a673e013211445cc6ac892c6ed11e.patch # https://pagure.io/koji/pull-request/403.patch Patch5: 403.patch +# https://pagure.io/koji/pull-request/449.patch +Patch6: 449.patch # Not upstreamable Patch100: fedora-config.patch @@ -169,6 +171,7 @@ koji-web is a web UI to the Koji system. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %patch100 -p1 -b .fedoraconfig %build @@ -338,6 +341,9 @@ fi %endif %changelog +* Sat Jun 03 2017 Patrick Uiterwijk - 1.12.0-5 +- Add patch for completing #349 fix + * Sat Jun 03 2017 Patrick Uiterwijk - 1.12.0-4 - Add upstreamed patch for #349