diff --git a/acme-tiny-sign.sh b/acme-tiny-sign.sh index 93eda8a..edceb37 100644 --- a/acme-tiny-sign.sh +++ b/acme-tiny-sign.sh @@ -27,7 +27,7 @@ for csr in csr/*.csr; do fi if test -w "$crt" || test ! -e "$crt"; then echo acme_tiny --account-key private/account.key --csr "$csr" \ - --acme-dir /var/www/challenges/ --chain --out "$crt" + --acme-dir /var/www/challenges/ --out "$crt" else echo "Can't write to $crt" rc="1" @@ -35,7 +35,7 @@ for csr in csr/*.csr; do fi if /usr/sbin/acme_tiny --account-key private/account.key --csr "$csr" \ - --acme-dir /var/www/challenges/ --chain > "$tmp"; then + --acme-dir /var/www/challenges/ > "$tmp"; then mv "$tmp" "$crt" || exit 1 else test -e "$tmp" && test ! -s "$tmp" && rm "$tmp" diff --git a/acme-tiny.spec b/acme-tiny.spec index 476c138..14683b3 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -31,7 +31,7 @@ Source6: acme-tiny.timer Source7: acme-tiny.service Source8: README-fedora.md # Fetch and include intermediate cert(s), too. -#Patch0: acme-tiny-chain.patch +Patch0: acme-tiny-chain.patch # Python3 broke getallmatchingheaders() and the fix breaks python2 Patch1: acme-tiny-chain2.patch @@ -79,11 +79,12 @@ unneeded packages. %prep %setup -q -n %{name}-%{version} cp -p %{SOURCE1} %{SOURCE2} %{SOURCE8} . +sed -i.orig -e '1,1 s,^.*python$,#!/usr/bin/python,' acme_tiny.py %if %{use_python3} #patch0 -p1 -b .chain sed -i.old -e '1,1 s/python$/python3/' *.py #else -#patch1 -p1 -b .chain +#patch1 -p1 -b .chain2 %endif %build