diff --git a/acme-tiny.spec b/acme-tiny.spec index c4e4387..fceb923 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -9,7 +9,7 @@ Name: acme-tiny Version: 5.0.1 -Release: 13%{?dist} +Release: 2%{?dist} Summary: Tiny auditable script to issue, renew Let's Encrypt certificates License: MIT @@ -27,7 +27,8 @@ Source10: acme-tiny-notify.service Source11: acme-tiny.conf Requires(pre): shadow-utils -BuildRequires: systemd-rpm-macros +# systemd macros are not defined unless systemd is present +BuildRequires: systemd %{?systemd_requires} Requires: %{name}-core = %{version}-%{release} BuildArch: noarch @@ -49,7 +50,7 @@ acme_tiny on installed CSRs as the acme user for privilege separation. %package core Summary: Core python module of acme-tiny -Requires: openssl +Requires: openssl python3 %if 0%{?rhel} >= 5 && 0%{?rhel} < 7 # EL6 uses python2.6, which does not include argparse Requires: python-argparse @@ -69,8 +70,6 @@ sed -i.orig -e '1,1 s,^.*python$,#!/usr/bin/python,' acme_tiny.py sed -i.old -e '1,1 s/python$/python3/' *.py %endif -echo 'u acme - "Tiny Auditable ACME Client" %{_sharedstatedir}/acme' >acme.sysusers.conf - %build %install @@ -96,7 +95,6 @@ install -pm 644 %{SOURCE6} %{buildroot}%{_unitdir} install -pm 644 %{SOURCE7} %{buildroot}%{_unitdir} install -pm 644 %{SOURCE10} %{buildroot}%{_unitdir} install -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/sysconfig/%{name} -install -m 0644 -D acme.sysusers.conf %{buildroot}%{_sysusersdir}/acme.conf %pre getent group acme > /dev/null || groupadd -r acme @@ -128,7 +126,6 @@ exit 0 %{_sbindir}/cert-check %{_sbindir}/%{name} %{_sysconfdir}/%{name} -%{_sysusersdir}/acme.conf %files core %license LICENSE @@ -136,46 +133,13 @@ exit 0 %{_sbindir}/acme_tiny %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 5.0.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jul 23 2025 Fedora Release Engineering - 5.0.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Zbigniew Jędrzejewski-Szmek - 5.0.1-11 -- Add sysusers.d config file - -* Thu Jan 16 2025 Fedora Release Engineering - 5.0.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 5.0.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 5.0.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 5.0.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 5.0.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Mar 28 2023 Stuart D. Gathman - 5.0.1-5 -- Verified SPDX license - -* Wed Jan 18 2023 Fedora Release Engineering - 5.0.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 5.0.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 5.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +* Tue May 17 2022 Stuart D. Gathman 5.0.1-2 +- Add missing python3 dependency for new version * Thu Oct 28 2021 Stuart D. Gathman 5.0.1-1 - New upstream release -* Wed Sep 8 2021 Stuart D. Gathman 4.1.1-2 +* Tue Sep 8 2021 Stuart D. Gathman 4.1.1-2 - Remove CLI override in acme-tiny.service (uses /etc/sysconfig/acme-tiny now) * Tue Sep 7 2021 Stuart D. Gathman 4.1.1-1 diff --git a/notify.sh b/notify.sh index f3ca76b..9c58838 100755 --- a/notify.sh +++ b/notify.sh @@ -52,7 +52,6 @@ for cert in "$@"; do # run any dropin extension if test -x "$script"; then - [ "$verbose" = "y" ] && echo "Running $script $cert" - ACMEDIR="$acmedir" NOTIFY="$notify" VERBOSE="$verbose" "$script" "$cert" + "$script" "$cert" fi done