Merge branch 'master' into epel8

.gitignore

@@ -3,8 +3,3 @@
 /ufdbGuard-1.35.1.tar.gz
 /ufdbGuard-1.35.2.tar.gz
 /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

sources

@@ -1 +1 @@
-SHA512 (ufdbGuard-1.35.8.tar.gz) = bd10ad7821294aae2900c1a6d8cf4fd9305b636cbc361bebc497ec9b31e52f1addf5537ad8451d163425e958d9cc0150329e9b2c83d5123c7710e2c53dc9d892
+SHA512 (ufdbGuard-1.35.3.tar.gz) = 0f9d6fb5d6d52fe6f9ae3b55d535f718c590bdaaa734217627ba852edf6607d9c48ad8bfe44f2d1585724f2e09eb62cc5c862941fcc10af721a6e9e365ff6be2

ufdbGuard.service

@@ -0,0 +1,13 @@
+[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
+	

ufdbGuard.spec

@@ -1,12 +1,13 @@
 Name:		ufdbGuard
-Version:	1.35.8
-Release:	9%{?dist}
+Version:	1.35.3
+Release:	1%{?dist}
 Summary:	A URL filter for squid
 URL:		https://www.urlfilterdb.com/
-License:	GPL-2.0-only
+License:	GPLv2
 
 Source0:	https://www.urlfilterdb.com/files/downloads/%{name}-%{version}.tar.gz
-Source1:	ufdbGuard.logrotate
+Source1:	ufdbGuard.service
+Source2:	ufdbGuard.logrotate
 
 %if 0%{?fedora} || 0%{?rhel} >= 7
 %bcond_without tmpfiles
@@ -14,7 +15,6 @@ Source1:	ufdbGuard.logrotate
 %bcond_with    tmpfiles
 %endif
 
-BuildRequires: make
 BuildRequires: bzip2-devel
 BuildRequires: zlib-devel
 BuildRequires: perl-interpreter 
@@ -25,15 +25,8 @@ 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
@@ -48,14 +41,9 @@ You can also make your own URL database for ufdbGuard.
 %prep
 %setup -q
 
-iconv -c --from-code=ISO-8859-1 --to-code=UTF-8 -o CHANGELOG.new CHANGELOG
+iconv -c --to-code=UTF-8 CHANGELOG > CHANGELOG.new
 mv CHANGELOG.new CHANGELOG
 
-# Create a sysusers.d config file
-cat >ufdbguard.sysusers.conf <<EOF
-u ufdb - 'ufdbGuard URL filter' /var/lib/ufdbguard -
-EOF
-
 %build
 INSTALL_PROGRAM=./install-sh %configure \
 	--with-ufdb-user=ufdb \
@@ -85,7 +73,8 @@ for i in $(find doc/ -type f -name '*.8'); do
     install -p -D -m 0644 $i %{buildroot}%{_mandir}/man8/
 done
 
-install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/ufdbGuard
+install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/ufdbGuard.service
+install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/ufdbGuard
 
 rm -rf %{buildroot}%{_sysconfdir}/rc.d/init.d/ufdb
 
@@ -103,18 +92,22 @@ echo 'd /var/run/ufdbguard 0750 ufdb ufdb -' > \
     %{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
@@ -130,85 +123,13 @@ install -m0644 -D ufdbguard.sysusers.conf %{buildroot}%{_sysusersdir}/ufdbguard.
 %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 <releng@fedoraproject.org> - 1.35.8-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jun 13 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 1.35.8-8
-- Rebuilt for openssl 4.0
-
-* Tue Jan 20 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.35.8-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.35.8-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.35.8-5
-- Add sysusers.d config file to allow rpm to create users/groups automatically
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.35.8-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Jan 08 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.35.8-3
-- Fix FTBFS
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.35.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Jun 03 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.35.8-1
-- 1.35.8
-
-* Fri Mar 22 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.35.7-1
-- 1.35.7
-- use upstream unit file
-
-* Fri Feb 02 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.35.6-1
-- 1.35.6
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.35.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.35.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sun Mar 05 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.35.5-2
-- migrated to SPDX license
-
-* Tue Feb 07 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.35.5-1
-- 1.35.5
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.35.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jan 04 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.35.4-1
-- 1.35.4
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.35.3-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.35.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1.35.3-5
-- Rebuilt with OpenSSL 3.0.0
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.35.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.35.3-3
-- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.35.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
 * Mon Nov 02 2020 Gwyn Ciesla <gwync@protonmail.com> - 1.35.3-1
 - 1.35.3