From fb2df44a2e97174a4ca9e8fa8d14a0bca71b6117 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 3 Jun 2024 14:18:38 -0500 Subject: [PATCH 01/11] 1.35.8 --- .gitignore | 1 + sources | 2 +- ufdbGuard.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8d4c867..fead3ab 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /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 eb0ae73..b1cbb67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ufdbGuard-1.35.7.tar.gz) = 52842c11ae971d4d3e172f6e4d64f61a45af9d8ad830498e51d0a26a39fb9732f4ae9e633dc5d4418ab8b9f021d499e81403709d41cf9d8ce01fc035bcfa87e6 +SHA512 (ufdbGuard-1.35.8.tar.gz) = bd10ad7821294aae2900c1a6d8cf4fd9305b636cbc361bebc497ec9b31e52f1addf5537ad8451d163425e958d9cc0150329e9b2c83d5123c7710e2c53dc9d892 diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 20d6092..1658a31 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,5 +1,5 @@ Name: ufdbGuard -Version: 1.35.7 +Version: 1.35.8 Release: 1%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ @@ -131,6 +131,9 @@ exit 0 %endif %changelog +* 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 From 0817e72f8fb4cde69c19c93b13a8fbaa022032aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:09:49 +0000 Subject: [PATCH 02/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ufdbGuard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 1658a31..54df030 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.35.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPL-2.0-only @@ -131,6 +131,9 @@ exit 0 %endif %changelog +* 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 From 36a5947f4f24672e8cf38911173c4c93953aec9c Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 30 Jul 2024 15:22:51 -0500 Subject: [PATCH 03/11] Fix FTBFS --- ufdbGuard.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 54df030..149852d 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -26,6 +26,7 @@ BuildRequires: systemd BuildRequires: systemd-rpm-macros %endif BuildRequires: openssl-devel +BuildRequires: openssl-devel-engine BuildRequires: bind-utils BuildRequires: wget Requires(pre): shadow-utils From 6b3067c2e44351fd9aaedbeb42a877b431a5c0b6 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 8 Jan 2025 12:58:24 -0600 Subject: [PATCH 04/11] Fix FTBFS --- ufdbGuard.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 149852d..4c42f44 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.35.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPL-2.0-only @@ -44,7 +44,7 @@ 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 %build @@ -132,6 +132,9 @@ exit 0 %endif %changelog +* 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 From b1f8eb88eda946e91dff253c4866beef494b34ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:38:52 +0000 Subject: [PATCH 05/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ufdbGuard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 4c42f44..5f1c50a 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.35.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPL-2.0-only @@ -132,6 +132,9 @@ exit 0 %endif %changelog +* 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 From f8cbf55610ca41eadc366c6bb47112c7523a1c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 16:44:40 +0100 Subject: [PATCH 06/11] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- ufdbGuard.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 5f1c50a..10d2af7 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.35.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPL-2.0-only @@ -29,7 +29,6 @@ BuildRequires: openssl-devel BuildRequires: openssl-devel-engine BuildRequires: bind-utils BuildRequires: wget -Requires(pre): shadow-utils Requires: logrotate %description @@ -47,6 +46,11 @@ You can also make your own URL database for ufdbGuard. 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 @@ -130,8 +130,12 @@ exit 0 %if %{with tmpfiles} %config(noreplace) %{_tmpfilesdir}/ufdbGuard.conf %endif +%{_sysusersdir}/ufdbguard.conf %changelog +* 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 From 02f84207ab014880e4129ca6098f3cddc8d33ab3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:43:42 +0000 Subject: [PATCH 07/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ufdbGuard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 10d2af7..1b0abc7 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.35.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPL-2.0-only @@ -133,6 +133,9 @@ install -m0644 -D ufdbguard.sysusers.conf %{buildroot}%{_sysusersdir}/ufdbguard. %{_sysusersdir}/ufdbguard.conf %changelog +* 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 From 5643cf0b87256fdfba4ae30409d2f16e1467d346 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 20 Jan 2026 03:30:28 +0000 Subject: [PATCH 08/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- ufdbGuard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 1b0abc7..e8560c4 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.35.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPL-2.0-only @@ -133,6 +133,9 @@ install -m0644 -D ufdbguard.sysusers.conf %{buildroot}%{_sysusersdir}/ufdbguard. %{_sysusersdir}/ufdbguard.conf %changelog +* 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 From 8a721089f7ffe760b67e808285287e1bb17aa87c Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 12 Jun 2026 20:00:03 -0400 Subject: [PATCH 09/11] Rebuilt for openssl 4.0 --- ufdbGuard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index e8560c4..3461d49 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.35.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPL-2.0-only @@ -133,6 +133,9 @@ install -m0644 -D ufdbguard.sysusers.conf %{buildroot}%{_sysusersdir}/ufdbguard. %{_sysusersdir}/ufdbguard.conf %changelog +* 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 From 5439f5079c558ccc51ee518e7faa362e9f26a0be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:07:20 +0000 Subject: [PATCH 10/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- ufdbGuard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 3461d49..89f180d 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.35.8 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPL-2.0-only @@ -133,6 +133,9 @@ install -m0644 -D ufdbguard.sysusers.conf %{buildroot}%{_sysusersdir}/ufdbguard. %{_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 From 0184f07e41c641932cb1b7f2c32523f7b917fdc5 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 5 Aug 2026 13:03:39 -0500 Subject: [PATCH 11/11] Use openssl3 --- ufdbGuard.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 89f180d..ae31187 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -25,8 +25,13 @@ 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: logrotate