From 9b5f08321c10113428eb03cdf7b8a79d5c6895ab Mon Sep 17 00:00:00 2001 From: Stuart D. Gathman Date: Jan 03 2017 03:50:07 +0000 Subject: Fix for BZ#1409686, revert 80c06 (acme_tiny != acme-tiny) --- diff --git a/acme-tiny-chain.patch b/acme-tiny-chain.patch index 17e46b9..6669364 100644 --- a/acme-tiny-chain.patch +++ b/acme-tiny-chain.patch @@ -70,14 +70,14 @@ diff -up ./acme_tiny.py.chain ./acme_tiny.py + certchain = [result] + if chain: + def parse_link_header(line): -+ m = re.search(r"^Link:\s*<([^>]*)>(?:\s*;\s*(.*))?\r\n$", line) ++ m = re.search(r"^<([^>]*)>(?:\s*;\s*(.*))?$", line) + return (m.group(1), dict([(a[0],a[1].strip('"')) + for a in [attr.split("=") + for attr in m.group(2).split("\s*;\s*")]])) + + up = [ + link for link, attr in [ -+ parse_link_header(l) for l in headers.getallmatchingheaders("Link") ++ parse_link_header(l) for l in headers.get_all("Link") + ] if attr['rel'] == 'up' + ] + certchain += [urlopen(url).read() for url in up] diff --git a/acme-tiny.spec b/acme-tiny.spec index 21e052c..06c6321 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -129,11 +129,15 @@ exit 0 %else %config(noreplace) %{_sysconfdir}/cron.d/acme-tiny %endif +/usr/sbin/acme_tiny /usr/sbin/acme-tiny /usr/sbin/acme-tiny-sign /usr/sbin/cert-check %changelog +* Mon Jan 2 2017 Stuart D. Gathman 0.1-11.20160810git5a7b4e7 +- BZ#1409686 Message.getallmatchingheaders() is broken in python3. + * Mon Aug 22 2016 Stuart D. Gathman 0.1-10.20160810git5a7b4e7 - Fix cert writable check in sign script - More tips in README-fedora.md