From d6b2f7032eda9d7689fbae39a8278ce85f577a7e Mon Sep 17 00:00:00 2001 From: "Stuart D. Gathman" Date: Tue, 7 Sep 2021 21:45:22 -0400 Subject: [PATCH 01/18] Set default days before expiration in /etc/sysconfig/acme-tiny --- acme-tiny-sign.sh | 6 +++++- acme-tiny.conf | 4 ++++ acme-tiny.spec | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 acme-tiny.conf diff --git a/acme-tiny-sign.sh b/acme-tiny-sign.sh index d2f1799..b4acea8 100755 --- a/acme-tiny-sign.sh +++ b/acme-tiny-sign.sh @@ -5,9 +5,13 @@ if test "$(id -u)" -eq 0; then exit 2 fi -DAYS="${1:-7}" +. /etc/sysconfig/acme-tiny +DAYS="${1:-$DAYS}" +test -n "$DAYS" || DAYS="7" if [[ "$DAYS" =~ ^[0-9]+$ ]]; then + echo "Days before expiration: $DAYS" secs=$(( $DAYS * 24 * 60 * 60 )) + exit else echo "Invalid number of days: $DAYS" exit 1 diff --git a/acme-tiny.conf b/acme-tiny.conf new file mode 100644 index 0000000..28e81fe --- /dev/null +++ b/acme-tiny.conf @@ -0,0 +1,4 @@ +# Default settings for acme-tiny wrapper script + +# Number of days before expiration to renew a certificate +DAYS=7 diff --git a/acme-tiny.spec b/acme-tiny.spec index fe3641c..29a6366 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -78,6 +78,7 @@ mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_libexecdir}/%{name} mkdir -p %{buildroot}%{_sharedstatedir}/acme/{private,csr,certs,.notify} mkdir -p %{buildroot}%{_sysconfdir}/%{name}/notify.d +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig chmod 0700 %{buildroot}%{_sharedstatedir}/acme/private install -m 0755 acme-tiny-sign.sh %{buildroot}%{_libexecdir}/%{name}/sign @@ -87,6 +88,7 @@ ln -sf acme_tiny %{buildroot}%{_sbindir}/%{name} ln -sf %{_libexecdir}/%{name}/sign %{buildroot}%{_sbindir}/acme-tiny-sign ln -sf %{_libexecdir}/%{name}/notify %{buildroot}%{_sysconfdir}/%{name}/notify.sh install -m 0755 cert-check.py %{buildroot}%{_sbindir}/cert-check +install -m 0644 acme-tiny.conf %{buildroot}%{_sbindir}/sysconfig/%{name} install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d mkdir -p %{buildroot}%{_unitdir} install -pm 644 %{SOURCE6} %{buildroot}%{_unitdir} @@ -122,6 +124,7 @@ exit 0 %{_sbindir}/cert-check %{_sbindir}/%{name} %{_sysconfdir}/%{name} +%{_sysconfdir}/sysconfig/%{name} %files core %license LICENSE @@ -131,6 +134,7 @@ exit 0 %changelog * Tue Sep 7 2021 Stuart D. Gathman 4.1.1-1 - New upstream release +- Set days before expiration in /etc/sysconfig * Thu May 27 2021 Stuart D. Gathman 4.1.0-7 - Fix BZ#1839904 From 5c1698c70ef3359b7edd11537a4e3b3645976bc9 Mon Sep 17 00:00:00 2001 From: "Stuart D. Gathman" Date: Tue, 7 Sep 2021 21:45:22 -0400 Subject: [PATCH 02/18] Set default days before expiration in /etc/sysconfig/acme-tiny --- acme-tiny-sign.sh | 6 +++++- acme-tiny.conf | 4 ++++ acme-tiny.spec | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 acme-tiny.conf diff --git a/acme-tiny-sign.sh b/acme-tiny-sign.sh index d2f1799..b4acea8 100755 --- a/acme-tiny-sign.sh +++ b/acme-tiny-sign.sh @@ -5,9 +5,13 @@ if test "$(id -u)" -eq 0; then exit 2 fi -DAYS="${1:-7}" +. /etc/sysconfig/acme-tiny +DAYS="${1:-$DAYS}" +test -n "$DAYS" || DAYS="7" if [[ "$DAYS" =~ ^[0-9]+$ ]]; then + echo "Days before expiration: $DAYS" secs=$(( $DAYS * 24 * 60 * 60 )) + exit else echo "Invalid number of days: $DAYS" exit 1 diff --git a/acme-tiny.conf b/acme-tiny.conf new file mode 100644 index 0000000..28e81fe --- /dev/null +++ b/acme-tiny.conf @@ -0,0 +1,4 @@ +# Default settings for acme-tiny wrapper script + +# Number of days before expiration to renew a certificate +DAYS=7 diff --git a/acme-tiny.spec b/acme-tiny.spec index fe3641c..5e91304 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -24,6 +24,7 @@ Source8: README-fedora.md # simple script hook to kick services when cert is updated Source9: notify.sh Source10: acme-tiny-notify.service +Source11: acme-tiny.conf Requires(pre): shadow-utils # systemd macros are not defined unless systemd is present @@ -78,6 +79,7 @@ mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_libexecdir}/%{name} mkdir -p %{buildroot}%{_sharedstatedir}/acme/{private,csr,certs,.notify} mkdir -p %{buildroot}%{_sysconfdir}/%{name}/notify.d +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig chmod 0700 %{buildroot}%{_sharedstatedir}/acme/private install -m 0755 acme-tiny-sign.sh %{buildroot}%{_libexecdir}/%{name}/sign @@ -92,6 +94,7 @@ mkdir -p %{buildroot}%{_unitdir} install -pm 644 %{SOURCE6} %{buildroot}%{_unitdir} install -pm 644 %{SOURCE7} %{buildroot}%{_unitdir} install -pm 644 %{SOURCE10} %{buildroot}%{_unitdir} +install -m 0644 %{SOURCE11} %{buildroot}%{_sbindir}/sysconfig/%{name} %pre getent group acme > /dev/null || groupadd -r acme @@ -122,6 +125,7 @@ exit 0 %{_sbindir}/cert-check %{_sbindir}/%{name} %{_sysconfdir}/%{name} +%{_sysconfdir}/sysconfig/%{name} %files core %license LICENSE @@ -131,6 +135,7 @@ exit 0 %changelog * Tue Sep 7 2021 Stuart D. Gathman 4.1.1-1 - New upstream release +- Set days before expiration in /etc/sysconfig * Thu May 27 2021 Stuart D. Gathman 4.1.0-7 - Fix BZ#1839904 From 0231e1b9b56373b60aa1485137c73826dbd73786 Mon Sep 17 00:00:00 2001 From: "Stuart D. Gathman" Date: Tue, 7 Sep 2021 21:45:22 -0400 Subject: [PATCH 03/18] Set default days before expiration in /etc/sysconfig/acme-tiny --- acme-tiny-sign.sh | 5 ++++- acme-tiny.conf | 4 ++++ acme-tiny.spec | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 acme-tiny.conf diff --git a/acme-tiny-sign.sh b/acme-tiny-sign.sh index d2f1799..9999005 100755 --- a/acme-tiny-sign.sh +++ b/acme-tiny-sign.sh @@ -5,8 +5,11 @@ if test "$(id -u)" -eq 0; then exit 2 fi -DAYS="${1:-7}" +. /etc/sysconfig/acme-tiny +DAYS="${1:-$DAYS}" +test -n "$DAYS" || DAYS="7" if [[ "$DAYS" =~ ^[0-9]+$ ]]; then + echo "Days before expiration: $DAYS" secs=$(( $DAYS * 24 * 60 * 60 )) else echo "Invalid number of days: $DAYS" diff --git a/acme-tiny.conf b/acme-tiny.conf new file mode 100644 index 0000000..28e81fe --- /dev/null +++ b/acme-tiny.conf @@ -0,0 +1,4 @@ +# Default settings for acme-tiny wrapper script + +# Number of days before expiration to renew a certificate +DAYS=7 diff --git a/acme-tiny.spec b/acme-tiny.spec index fe3641c..05f2df8 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -24,6 +24,7 @@ Source8: README-fedora.md # simple script hook to kick services when cert is updated Source9: notify.sh Source10: acme-tiny-notify.service +Source11: acme-tiny.conf Requires(pre): shadow-utils # systemd macros are not defined unless systemd is present @@ -78,6 +79,7 @@ mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_libexecdir}/%{name} mkdir -p %{buildroot}%{_sharedstatedir}/acme/{private,csr,certs,.notify} mkdir -p %{buildroot}%{_sysconfdir}/%{name}/notify.d +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig chmod 0700 %{buildroot}%{_sharedstatedir}/acme/private install -m 0755 acme-tiny-sign.sh %{buildroot}%{_libexecdir}/%{name}/sign @@ -92,6 +94,7 @@ mkdir -p %{buildroot}%{_unitdir} 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} %pre getent group acme > /dev/null || groupadd -r acme @@ -122,6 +125,7 @@ exit 0 %{_sbindir}/cert-check %{_sbindir}/%{name} %{_sysconfdir}/%{name} +%{_sysconfdir}/sysconfig/%{name} %files core %license LICENSE @@ -131,6 +135,7 @@ exit 0 %changelog * Tue Sep 7 2021 Stuart D. Gathman 4.1.1-1 - New upstream release +- Set days before expiration in /etc/sysconfig * Thu May 27 2021 Stuart D. Gathman 4.1.0-7 - Fix BZ#1839904 From 6196b1a0ed0864900458d082939c9e502b5bbb0d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 20:53:24 +0000 Subject: [PATCH 04/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acme-tiny.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acme-tiny.spec b/acme-tiny.spec index 605194d..6b16467 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -9,7 +9,7 @@ Name: acme-tiny Version: 5.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tiny auditable script to issue, renew Let's Encrypt certificates License: MIT @@ -133,6 +133,9 @@ exit 0 %{_sbindir}/acme_tiny %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 5.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Oct 28 2021 Stuart D. Gathman 5.0.1-1 - New upstream release From 63da791110847177a61d3089821569e0bc9a704f Mon Sep 17 00:00:00 2001 From: "Stuart D. Gathman" Date: Tue, 17 May 2022 23:10:44 -0400 Subject: [PATCH 05/18] Add missing dependency on python3 --- acme-tiny.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/acme-tiny.spec b/acme-tiny.spec index 605194d..fceb923 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -9,7 +9,7 @@ Name: acme-tiny Version: 5.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tiny auditable script to issue, renew Let's Encrypt certificates License: MIT @@ -50,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 @@ -133,6 +133,9 @@ exit 0 %{_sbindir}/acme_tiny %changelog +* 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 From 51195094a81843886f36bf4bc4a2e0fed7638b02 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:24:07 +0000 Subject: [PATCH 06/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acme-tiny.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acme-tiny.spec b/acme-tiny.spec index 6b16467..8a877fb 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -9,7 +9,7 @@ Name: acme-tiny Version: 5.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tiny auditable script to issue, renew Let's Encrypt certificates License: MIT @@ -133,6 +133,9 @@ exit 0 %{_sbindir}/acme_tiny %changelog +* 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 From a24ade1723530bdf6a5fb8d58ebf0d5d1a21614f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:21:34 +0000 Subject: [PATCH 07/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acme-tiny.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acme-tiny.spec b/acme-tiny.spec index 8a877fb..4b5b69b 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -9,7 +9,7 @@ Name: acme-tiny Version: 5.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tiny auditable script to issue, renew Let's Encrypt certificates License: MIT @@ -133,6 +133,9 @@ exit 0 %{_sbindir}/acme_tiny %changelog +* 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 From 5614e7fd15259c5bf2a6eaf7579de573cf66aaef Mon Sep 17 00:00:00 2001 From: "Stuart D. Gathman" Date: Wed, 29 Mar 2023 00:02:46 -0400 Subject: [PATCH 08/18] Verify SPDX licence match --- acme-tiny.spec | 7 +++++-- notify.sh | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/acme-tiny.spec b/acme-tiny.spec index 4b5b69b..2cc8945 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -9,7 +9,7 @@ Name: acme-tiny Version: 5.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tiny auditable script to issue, renew Let's Encrypt certificates License: MIT @@ -133,6 +133,9 @@ exit 0 %{_sbindir}/acme_tiny %changelog +* 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 @@ -145,7 +148,7 @@ exit 0 * Thu Oct 28 2021 Stuart D. Gathman 5.0.1-1 - New upstream release -* Tue Sep 8 2021 Stuart D. Gathman 4.1.1-2 +* Wed 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 9c58838..edcd529 100755 --- a/notify.sh +++ b/notify.sh @@ -52,6 +52,7 @@ for cert in "$@"; do # run any dropin extension if test -x "$script"; then + [ "$verbose" = "y" ] && echo "Running $script $cert" "$script" "$cert" fi done From c0325ba9916cd893bb96c76942441b1fd11c3275 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 12:51:50 +0000 Subject: [PATCH 09/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acme-tiny.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acme-tiny.spec b/acme-tiny.spec index 2cc8945..5a554b9 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -9,7 +9,7 @@ Name: acme-tiny Version: 5.0.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tiny auditable script to issue, renew Let's Encrypt certificates License: MIT @@ -133,6 +133,9 @@ exit 0 %{_sbindir}/acme_tiny %changelog +* 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 From d0da9ba3482a6ab78cdf848997ddd80a9d1bbe71 Mon Sep 17 00:00:00 2001 From: Herr Ernst Date: Tue, 29 Aug 2023 08:21:35 +0000 Subject: [PATCH 10/18] Source dropin script So variables like $acmedir and $notify are also available and checks like for httpd and sendmail are possible in external script --- notify.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notify.sh b/notify.sh index edcd529..290a95b 100755 --- a/notify.sh +++ b/notify.sh @@ -53,6 +53,6 @@ for cert in "$@"; do # run any dropin extension if test -x "$script"; then [ "$verbose" = "y" ] && echo "Running $script $cert" - "$script" "$cert" + source "$script" "$cert" fi done From 11b4bc888d591b6b1e87eb1f8165e0c1efc29464 Mon Sep 17 00:00:00 2001 From: Herr Ernst Date: Tue, 29 Aug 2023 17:15:43 +0000 Subject: [PATCH 11/18] Undo sourcing dropin script, instead pass vars as env --- notify.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notify.sh b/notify.sh index 290a95b..f3ca76b 100755 --- a/notify.sh +++ b/notify.sh @@ -53,6 +53,6 @@ for cert in "$@"; do # run any dropin extension if test -x "$script"; then [ "$verbose" = "y" ] && echo "Running $script $cert" - source "$script" "$cert" + ACMEDIR="$acmedir" NOTIFY="$notify" VERBOSE="$verbose" "$script" "$cert" fi done From f66dd5959acc72b74f3ef9829441c2452a6ffc47 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:06:07 +0000 Subject: [PATCH 12/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- acme-tiny.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acme-tiny.spec b/acme-tiny.spec index 5a554b9..def332b 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -9,7 +9,7 @@ Name: acme-tiny Version: 5.0.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Tiny auditable script to issue, renew Let's Encrypt certificates License: MIT @@ -133,6 +133,9 @@ exit 0 %{_sbindir}/acme_tiny %changelog +* 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 From ac00c1c43e2e514c45eae259db2323f7a3d5408b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:37:04 +0000 Subject: [PATCH 13/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- acme-tiny.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acme-tiny.spec b/acme-tiny.spec index def332b..35ee3c8 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -9,7 +9,7 @@ Name: acme-tiny Version: 5.0.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Tiny auditable script to issue, renew Let's Encrypt certificates License: MIT @@ -133,6 +133,9 @@ exit 0 %{_sbindir}/acme_tiny %changelog +* 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 From 91e84d7225eb0797eb674dbe2080ec811e717a37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:33:22 +0000 Subject: [PATCH 14/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- acme-tiny.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acme-tiny.spec b/acme-tiny.spec index 35ee3c8..e3bfb0c 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -9,7 +9,7 @@ Name: acme-tiny Version: 5.0.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Tiny auditable script to issue, renew Let's Encrypt certificates License: MIT @@ -133,6 +133,9 @@ exit 0 %{_sbindir}/acme_tiny %changelog +* 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 From c41bfb7f5727586797eac9027c231b564b74fb19 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:31:50 +0000 Subject: [PATCH 15/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- acme-tiny.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acme-tiny.spec b/acme-tiny.spec index e3bfb0c..768c3de 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -9,7 +9,7 @@ Name: acme-tiny Version: 5.0.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Tiny auditable script to issue, renew Let's Encrypt certificates License: MIT @@ -133,6 +133,9 @@ exit 0 %{_sbindir}/acme_tiny %changelog +* 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 From e2cc44637e45c5e30777febb9660ab12981319cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 16 Jan 2025 18:37:46 +0100 Subject: [PATCH 16/18] Add sysusers.d config file This will help with https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. Once automatic creation in rpm is turned on, the scriptlets can be dropped here. For now, just add a sysusers file that is equivalent to the scriptlets, to allow rpm to generate its metadata. --- acme-tiny.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/acme-tiny.spec b/acme-tiny.spec index 768c3de..dde3585 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -9,7 +9,7 @@ Name: acme-tiny Version: 5.0.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Tiny auditable script to issue, renew Let's Encrypt certificates License: MIT @@ -27,8 +27,7 @@ Source10: acme-tiny-notify.service Source11: acme-tiny.conf Requires(pre): shadow-utils -# systemd macros are not defined unless systemd is present -BuildRequires: systemd +BuildRequires: systemd-rpm-macros %{?systemd_requires} Requires: %{name}-core = %{version}-%{release} BuildArch: noarch @@ -70,6 +69,8 @@ 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 @@ -95,6 +96,7 @@ 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 @@ -126,6 +128,7 @@ exit 0 %{_sbindir}/cert-check %{_sbindir}/%{name} %{_sysconfdir}/%{name} +%{_sysusersdir}/acme.conf %files core %license LICENSE @@ -133,6 +136,9 @@ exit 0 %{_sbindir}/acme_tiny %changelog +* 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 From a96fdb7828e634cab09a79c3379c2ec847b68d16 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:43:50 +0000 Subject: [PATCH 17/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- acme-tiny.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acme-tiny.spec b/acme-tiny.spec index dde3585..89f8288 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -9,7 +9,7 @@ Name: acme-tiny Version: 5.0.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Tiny auditable script to issue, renew Let's Encrypt certificates License: MIT @@ -136,6 +136,9 @@ exit 0 %{_sbindir}/acme_tiny %changelog +* 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 From cb5965263c065409c6dde0aecbaad31b30f75059 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:25:13 +0000 Subject: [PATCH 18/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- acme-tiny.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acme-tiny.spec b/acme-tiny.spec index 89f8288..c4e4387 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -9,7 +9,7 @@ Name: acme-tiny Version: 5.0.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Tiny auditable script to issue, renew Let's Encrypt certificates License: MIT @@ -136,6 +136,9 @@ 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