diff --git a/.gitignore b/.gitignore index 105f0cf..1c99c24 100644 --- a/.gitignore +++ b/.gitignore @@ -24,5 +24,3 @@ /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 deleted file mode 100644 index b47c25f..0000000 --- a/opendnssec-sysusers.conf +++ /dev/null @@ -1 +0,0 @@ -u ods - "opendnssec daemon account" diff --git a/opendnssec.spec b/opendnssec.spec index f11d67a..66c54d7 100644 --- a/opendnssec.spec +++ b/opendnssec.spec @@ -1,13 +1,14 @@ +%global prever rc1 %global _hardened_build 1 Summary: DNSSEC key and zone management software Name: opendnssec Version: 2.1.14 -Release: 2%{?dist} +Release: 0.1rc1%{?dist} License: BSD-2-Clause Url: http://www.opendnssec.org/ -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 +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 Source1: ods-enforcerd.service Source2: ods-signerd.service Source3: ods.sysconfig @@ -16,7 +17,6 @@ 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,7 +94,6 @@ 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 @@ -132,11 +131,13 @@ 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 - -%sysusers_create_package %{name} %{SOURCE9} +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 %post # Initialise a slot on the softhsm on first install @@ -195,23 +196,6 @@ 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 - -* 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/) - -* Thu Jul 18 2024 Fedora Release Engineering - 2.1.14-0.2rc1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - * Thu Feb 08 2024 Alexander Bokovoy - 2.1.14-0.1rc1 - Upstream release 2.1.14RC1 - Fix build with gcc 14 diff --git a/sources b/sources index 1f2ad74..71692d1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (opendnssec-2.1.14.tar.gz.sig) = 45684220fa29e31e7c77a2f5802f5e56edb780a536fe7c81b9fae2b9c41664647f1f321f1f3bea8a82d806dda08d21ac32edc8f3e5ed3bea72729c7fd3b94620 -SHA512 (opendnssec-2.1.14.tar.gz) = 406532008b85fbcae765a41e9fba28ce97051d86f6b64f58ded02288ac7a417a83bf93739712588b641c7d782a06448aeeb65415fd5585f70a362211a184593f +SHA512 (opendnssec-2.1.14rc1.tar.gz) = 82e86f1146e889328ac702ced686d01ddc4afb05450e03198d32a70409fcca702c59fdcebf93b35458ba9a9f5d34d8cd038291f9de8341a8d42947c271e3ac9e +SHA512 (opendnssec-2.1.14rc1.tar.gz.sig) = 205dfe315e72d1055df713f6c25b9dda3d233dab23d17e6bc7b4e942365560ad2da822cfad48b6cdd401eeb33a61817e261b35f0d5da03281b4de7479331fb99