diff --git a/.gitignore b/.gitignore index 93c6603..fead3ab 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ /ufdbGuard-1.35.3.tar.gz /ufdbGuard-1.35.4.tar.gz /ufdbGuard-1.35.5.tar.gz +/ufdbGuard-1.35.6.tar.gz +/ufdbGuard-1.35.7.tar.gz +/ufdbGuard-1.35.8.tar.gz diff --git a/sources b/sources index ca2081a..b1cbb67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ufdbGuard-1.35.5.tar.gz) = 04f52d7fa648c959ef6cfa619f31004cb2ca7f33179fcddcd33e9e09fe58386cf504f9e1a7a3f215f45e6e1e12a166081d0f503cec55cc32f7a75893b8abf945 +SHA512 (ufdbGuard-1.35.8.tar.gz) = bd10ad7821294aae2900c1a6d8cf4fd9305b636cbc361bebc497ec9b31e52f1addf5537ad8451d163425e958d9cc0150329e9b2c83d5123c7710e2c53dc9d892 diff --git a/ufdbGuard.service b/ufdbGuard.service deleted file mode 100644 index ba01df0..0000000 --- a/ufdbGuard.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=ufdbGuard URL filter -After=syslog.target network.target - -[Service] -User=ufdb -Type=forking -EnvironmentFile=-/etc/sysconfig/ufdbguard -ExecStart=/usr/sbin/ufdbguardd - -[Install] -WantedBy=multi-user.target - \ No newline at end of file diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 7f71261..ae31187 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,13 +1,12 @@ Name: ufdbGuard -Version: 1.35.5 -Release: 1%{?dist} +Version: 1.35.8 +Release: 9%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ -License: GPLv2 +License: GPL-2.0-only Source0: https://www.urlfilterdb.com/files/downloads/%{name}-%{version}.tar.gz -Source1: ufdbGuard.service -Source2: ufdbGuard.logrotate +Source1: ufdbGuard.logrotate %if 0%{?fedora} || 0%{?rhel} >= 7 %bcond_without tmpfiles @@ -26,10 +25,15 @@ BuildRequires: systemd %else BuildRequires: systemd-rpm-macros %endif +%if 0%{?fedora} > 44 +BuildRequires: openssl3-devel +BuildRequires: openssl3-devel-engine +%else BuildRequires: openssl-devel +BuildRequires: openssl-devel-engine +%endif BuildRequires: bind-utils BuildRequires: wget -Requires(pre): shadow-utils Requires: logrotate %description @@ -44,9 +48,14 @@ You can also make your own URL database for ufdbGuard. %prep %setup -q -iconv -c --to-code=UTF-8 CHANGELOG > CHANGELOG.new +iconv -c --from-code=ISO-8859-1 --to-code=UTF-8 -o CHANGELOG.new CHANGELOG mv CHANGELOG.new CHANGELOG +# Create a sysusers.d config file +cat >ufdbguard.sysusers.conf < \ %{buildroot}/usr/lib/tmpfiles.d/ufdbGuard.conf %endif +install -m0644 -D ufdbguard.sysusers.conf %{buildroot}%{_sysusersdir}/ufdbguard.conf + -%pre -getent group ufdb >/dev/null || groupadd -r ufdb -getent passwd ufdb >/dev/null || \ - useradd -r -g ufdb -d /var/lib/ufdbguard -s /sbin/nologin \ - -c "ufdbGuard URL filter" ufdb -exit 0 %post -%systemd_post ufdbGuard.service +%systemd_post ufdbguard.service %preun -%systemd_preun ufdbGuard.service +%systemd_preun ufdbguard.service %postun -%systemd_postun_with_restart ufdbGuard.service +%systemd_postun_with_restart ufdbguard.service %files @@ -126,13 +130,57 @@ exit 0 %dir %{_sharedstatedir}/ufdbguard/ %attr(-, ufdb, ufdb) %dir %{_localstatedir}/log/ufdbguard/ %{_sharedstatedir}/ufdbguard/* -%{_unitdir}/ufdbGuard.service +%{_unitdir}/ufdbguard.service %attr(-, ufdb, ufdb) %dir %{_var}/run/ufdbguard/ %if %{with tmpfiles} %config(noreplace) %{_tmpfilesdir}/ufdbGuard.conf %endif +%{_sysusersdir}/ufdbguard.conf %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.35.8-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jun 13 2026 Yaakov Selkowitz - 1.35.8-8 +- Rebuilt for openssl 4.0 + +* Tue Jan 20 2026 Fedora Release Engineering - 1.35.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 1.35.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.35.8-5 +- Add sysusers.d config file to allow rpm to create users/groups automatically + +* Sun Jan 19 2025 Fedora Release Engineering - 1.35.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Jan 08 2025 Gwyn Ciesla - 1.35.8-3 +- Fix FTBFS + +* Sat Jul 20 2024 Fedora Release Engineering - 1.35.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jun 03 2024 Gwyn Ciesla - 1.35.8-1 +- 1.35.8 + +* Fri Mar 22 2024 Gwyn Ciesla - 1.35.7-1 +- 1.35.7 +- use upstream unit file + +* Fri Feb 02 2024 Gwyn Ciesla - 1.35.6-1 +- 1.35.6 + +* Sat Jan 27 2024 Fedora Release Engineering - 1.35.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 1.35.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sun Mar 05 2023 Gwyn Ciesla - 1.35.5-2 +- migrated to SPDX license + * Tue Feb 07 2023 Gwyn Ciesla - 1.35.5-1 - 1.35.5