From 566d4cae15c90b0073101ade210925d4226832a8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 22 Oct 2024 13:39:46 +0100 Subject: [PATCH 1/5] Rebuild for Jansson 2.14 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/) --- opendnssec.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/opendnssec.spec b/opendnssec.spec index 67917bd..ee53473 100644 --- a/opendnssec.spec +++ b/opendnssec.spec @@ -4,7 +4,7 @@ Summary: DNSSEC key and zone management software Name: opendnssec Version: 2.1.14 -Release: 0.2rc1%{?dist} +Release: 0.3rc1%{?dist} License: BSD-2-Clause Url: http://www.opendnssec.org/ Source0: http://www.opendnssec.org/files/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz @@ -196,6 +196,10 @@ ods-enforcer update all >/dev/null 2>/dev/null ||: %systemd_postun_with_restart ods-signerd.service %changelog +* Tue Oct 22 2024 Richard W.M. Jones - 2.1.14-0.3rc1 +- Rebuild for Jansson 2.14 + (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/) + * Thu Jul 18 2024 Fedora Release Engineering - 2.1.14-0.2rc1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From e0e84268d9a542adcfbe0c5e31f282f62eebd886 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 21:39:28 +0000 Subject: [PATCH 2/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- opendnssec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opendnssec.spec b/opendnssec.spec index ee53473..363399e 100644 --- a/opendnssec.spec +++ b/opendnssec.spec @@ -4,7 +4,7 @@ Summary: DNSSEC key and zone management software Name: opendnssec Version: 2.1.14 -Release: 0.3rc1%{?dist} +Release: 0.4rc1%{?dist} License: BSD-2-Clause Url: http://www.opendnssec.org/ Source0: http://www.opendnssec.org/files/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz @@ -196,6 +196,9 @@ ods-enforcer update all >/dev/null 2>/dev/null ||: %systemd_postun_with_restart ods-signerd.service %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 2.1.14-0.4rc1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Oct 22 2024 Richard W.M. Jones - 2.1.14-0.3rc1 - Rebuild for Jansson 2.14 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/) From fbf6915b0d7a9bd06e6b95029495e13b9661f817 Mon Sep 17 00:00:00 2001 From: Rafael Guterres Jeffman Date: Tue, 21 Jan 2025 15:13:53 -0300 Subject: [PATCH 3/5] Rebase to stable version 2.1.14 and use systemd-users for ods user Signed-off-by: Rafael Guterres Jeffman --- .gitignore | 2 ++ opendnssec-sysusers.conf | 1 + opendnssec.spec | 21 ++++++++++++--------- sources | 4 ++-- 4 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 opendnssec-sysusers.conf diff --git a/.gitignore b/.gitignore index 1c99c24..105f0cf 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ /opendnssec-2.1.10.tar.gz /opendnssec-2.1.14rc1.tar.gz /opendnssec-2.1.14rc1.tar.gz.sig +/opendnssec-2.1.14.tar.gz +/opendnssec-2.1.14.tar.gz.sig diff --git a/opendnssec-sysusers.conf b/opendnssec-sysusers.conf new file mode 100644 index 0000000..b47c25f --- /dev/null +++ b/opendnssec-sysusers.conf @@ -0,0 +1 @@ +u ods - "opendnssec daemon account" diff --git a/opendnssec.spec b/opendnssec.spec index 363399e..59c9f47 100644 --- a/opendnssec.spec +++ b/opendnssec.spec @@ -1,14 +1,13 @@ -%global prever rc1 %global _hardened_build 1 Summary: DNSSEC key and zone management software Name: opendnssec Version: 2.1.14 -Release: 0.4rc1%{?dist} +Release: 1%{?dist} License: BSD-2-Clause Url: http://www.opendnssec.org/ -Source0: http://www.opendnssec.org/files/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz -Source10: http://www.opendnssec.org/files/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz.sig +Source0: https://dist.opendnssec.org/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz +Source10: https://dist.opendnssec.org/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz.sig Source1: ods-enforcerd.service Source2: ods-signerd.service Source3: ods.sysconfig @@ -17,6 +16,7 @@ Source5: tmpfiles-opendnssec.conf Source6: opendnssec.cron Source7: opendnssec-2.1.sqlite_convert.sql Source8: opendnssec-2.1.sqlite_rpmversion.sql +Source9: %{name}-sysusers.conf Patch1: 0001-Pass-right-remaining-buffer-size-in-hsm_hex_unparse-.patch Patch2: opendnssec-configure-c99.patch Patch3: opendnssec-2.1.14rc1-gcc14.patch @@ -94,6 +94,7 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/ install -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/ install -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/ods install -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/opendnssec/ +install -D %{SOURCE9} %{buildroot}%{_sysusersdir}/%{name}.conf mkdir -p %{buildroot}%{_tmpfilesdir}/ install -m 0644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/opendnssec.conf mkdir -p %{buildroot}%{_localstatedir}/run/opendnssec @@ -131,13 +132,11 @@ sed -i "s:sqlite_convert.sql:%{_datadir}/opendnssec/migration/1.4-2.0_db_convert %{_bindir}/* %attr(0755,root,root) %dir %{_datadir}/opendnssec %{_datadir}/opendnssec/* +%{_sysusersdir}/%{name}.conf %pre -getent group ods >/dev/null || groupadd -r ods -getent passwd ods >/dev/null || \ -useradd -r -g ods -d /etc/opendnssec -s /sbin/nologin \ --c "opendnssec daemon account" ods -exit 0 + +%sysusers_create_package %{name} %{SOURCE9} %post # Initialise a slot on the softhsm on first install @@ -196,6 +195,10 @@ ods-enforcer update all >/dev/null 2>/dev/null ||: %systemd_postun_with_restart ods-signerd.service %changelog +* Tue Jan 21 2025 Rafel Jeffman - 2.1.14-1 +- Upstream release 2.1.14 +- Use systemd-sysusers + * Fri Jan 17 2025 Fedora Release Engineering - 2.1.14-0.4rc1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 71692d1..1f2ad74 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (opendnssec-2.1.14rc1.tar.gz) = 82e86f1146e889328ac702ced686d01ddc4afb05450e03198d32a70409fcca702c59fdcebf93b35458ba9a9f5d34d8cd038291f9de8341a8d42947c271e3ac9e -SHA512 (opendnssec-2.1.14rc1.tar.gz.sig) = 205dfe315e72d1055df713f6c25b9dda3d233dab23d17e6bc7b4e942365560ad2da822cfad48b6cdd401eeb33a61817e261b35f0d5da03281b4de7479331fb99 +SHA512 (opendnssec-2.1.14.tar.gz.sig) = 45684220fa29e31e7c77a2f5802f5e56edb780a536fe7c81b9fae2b9c41664647f1f321f1f3bea8a82d806dda08d21ac32edc8f3e5ed3bea72729c7fd3b94620 +SHA512 (opendnssec-2.1.14.tar.gz) = 406532008b85fbcae765a41e9fba28ce97051d86f6b64f58ded02288ac7a417a83bf93739712588b641c7d782a06448aeeb65415fd5585f70a362211a184593f From 2b0ad4dfa103b7f407758fb444a1a2932147e534 Mon Sep 17 00:00:00 2001 From: Rafael Guterres Jeffman Date: Tue, 21 Jan 2025 15:13:53 -0300 Subject: [PATCH 4/5] Rebase to stable version 2.1.14 and use systemd-users for ods user Signed-off-by: Rafael Guterres Jeffman --- .gitignore | 2 ++ opendnssec-sysusers.conf | 1 + opendnssec.spec | 21 ++++++++++++--------- sources | 4 ++-- 4 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 opendnssec-sysusers.conf diff --git a/.gitignore b/.gitignore index 1c99c24..105f0cf 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ /opendnssec-2.1.10.tar.gz /opendnssec-2.1.14rc1.tar.gz /opendnssec-2.1.14rc1.tar.gz.sig +/opendnssec-2.1.14.tar.gz +/opendnssec-2.1.14.tar.gz.sig diff --git a/opendnssec-sysusers.conf b/opendnssec-sysusers.conf new file mode 100644 index 0000000..b47c25f --- /dev/null +++ b/opendnssec-sysusers.conf @@ -0,0 +1 @@ +u ods - "opendnssec daemon account" diff --git a/opendnssec.spec b/opendnssec.spec index 67917bd..0e522e1 100644 --- a/opendnssec.spec +++ b/opendnssec.spec @@ -1,14 +1,13 @@ -%global prever rc1 %global _hardened_build 1 Summary: DNSSEC key and zone management software Name: opendnssec Version: 2.1.14 -Release: 0.2rc1%{?dist} +Release: 1%{?dist} License: BSD-2-Clause Url: http://www.opendnssec.org/ -Source0: http://www.opendnssec.org/files/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz -Source10: http://www.opendnssec.org/files/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz.sig +Source0: https://dist.opendnssec.org/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz +Source10: https://dist.opendnssec.org/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz.sig Source1: ods-enforcerd.service Source2: ods-signerd.service Source3: ods.sysconfig @@ -17,6 +16,7 @@ Source5: tmpfiles-opendnssec.conf Source6: opendnssec.cron Source7: opendnssec-2.1.sqlite_convert.sql Source8: opendnssec-2.1.sqlite_rpmversion.sql +Source9: %{name}-sysusers.conf Patch1: 0001-Pass-right-remaining-buffer-size-in-hsm_hex_unparse-.patch Patch2: opendnssec-configure-c99.patch Patch3: opendnssec-2.1.14rc1-gcc14.patch @@ -94,6 +94,7 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/ install -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/ install -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/ods install -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/opendnssec/ +install -D %{SOURCE9} %{buildroot}%{_sysusersdir}/%{name}.conf mkdir -p %{buildroot}%{_tmpfilesdir}/ install -m 0644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/opendnssec.conf mkdir -p %{buildroot}%{_localstatedir}/run/opendnssec @@ -131,13 +132,11 @@ sed -i "s:sqlite_convert.sql:%{_datadir}/opendnssec/migration/1.4-2.0_db_convert %{_bindir}/* %attr(0755,root,root) %dir %{_datadir}/opendnssec %{_datadir}/opendnssec/* +%{_sysusersdir}/%{name}.conf %pre -getent group ods >/dev/null || groupadd -r ods -getent passwd ods >/dev/null || \ -useradd -r -g ods -d /etc/opendnssec -s /sbin/nologin \ --c "opendnssec daemon account" ods -exit 0 + +%sysusers_create_package %{name} %{SOURCE9} %post # Initialise a slot on the softhsm on first install @@ -196,6 +195,10 @@ ods-enforcer update all >/dev/null 2>/dev/null ||: %systemd_postun_with_restart ods-signerd.service %changelog +* Tue Jan 21 2025 Rafel Jeffman - 2.1.14-1 +- Upstream release 2.1.14 +- Use systemd-sysusers + * Thu Jul 18 2024 Fedora Release Engineering - 2.1.14-0.2rc1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 71692d1..1f2ad74 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (opendnssec-2.1.14rc1.tar.gz) = 82e86f1146e889328ac702ced686d01ddc4afb05450e03198d32a70409fcca702c59fdcebf93b35458ba9a9f5d34d8cd038291f9de8341a8d42947c271e3ac9e -SHA512 (opendnssec-2.1.14rc1.tar.gz.sig) = 205dfe315e72d1055df713f6c25b9dda3d233dab23d17e6bc7b4e942365560ad2da822cfad48b6cdd401eeb33a61817e261b35f0d5da03281b4de7479331fb99 +SHA512 (opendnssec-2.1.14.tar.gz.sig) = 45684220fa29e31e7c77a2f5802f5e56edb780a536fe7c81b9fae2b9c41664647f1f321f1f3bea8a82d806dda08d21ac32edc8f3e5ed3bea72729c7fd3b94620 +SHA512 (opendnssec-2.1.14.tar.gz) = 406532008b85fbcae765a41e9fba28ce97051d86f6b64f58ded02288ac7a417a83bf93739712588b641c7d782a06448aeeb65415fd5585f70a362211a184593f From dc2d8a5cfcb296d2d6db9be7d549886d11867bfa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:34:57 +0000 Subject: [PATCH 5/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- opendnssec.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opendnssec.spec b/opendnssec.spec index 59c9f47..f11d67a 100644 --- a/opendnssec.spec +++ b/opendnssec.spec @@ -3,7 +3,7 @@ Summary: DNSSEC key and zone management software Name: opendnssec Version: 2.1.14 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-2-Clause Url: http://www.opendnssec.org/ Source0: https://dist.opendnssec.org/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz @@ -195,6 +195,9 @@ ods-enforcer update all >/dev/null 2>/dev/null ||: %systemd_postun_with_restart ods-signerd.service %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 2.1.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jan 21 2025 Rafel Jeffman - 2.1.14-1 - Upstream release 2.1.14 - Use systemd-sysusers