From ab2fb07deb40114ac78f6cf65cc3a7cb01fa88aa Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 14 Jul 2020 12:15:38 -0500 Subject: [PATCH 01/36] Initial import. --- .gitignore | 1 + sources | 1 + ufdbGuard-common.patch | 13 +++++ ufdbGuard.logrotate | 8 +++ ufdbGuard.service | 13 +++++ ufdbGuard.spec | 122 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 158 insertions(+) create mode 100644 .gitignore create mode 100644 sources create mode 100644 ufdbGuard-common.patch create mode 100644 ufdbGuard.logrotate create mode 100644 ufdbGuard.service create mode 100644 ufdbGuard.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ff82ee4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/ufdbGuard-1.34.5.tar.gz diff --git a/sources b/sources new file mode 100644 index 0000000..88b6e4a --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (ufdbGuard-1.34.5.tar.gz) = c8b32033f37ae93025dbd9722ecad30c4b7673658382ad7e1de15946dd0d611597a41359c7d5f8e619f950eec1f14867f5348d2329606b495997684fc9f59c72 diff --git a/ufdbGuard-common.patch b/ufdbGuard-common.patch new file mode 100644 index 0000000..bad4e09 --- /dev/null +++ b/ufdbGuard-common.patch @@ -0,0 +1,13 @@ +--- src/Makefile.in~ 2020-03-27 07:50:19.000000000 -0500 ++++ src/Makefile.in 2020-04-17 12:09:55.956728670 -0500 +@@ -23,8 +23,8 @@ + RM = rm -f + # SOLARIS_LIBS= -lsocket -lnsl -lrt -L /opt/csw/lib + +-CFLAGS = @CFLAGS@ +-CXXFLAGS= @CXXFLAGS@ ++CFLAGS = @CFLAGS@ -fcommon ++CXXFLAGS= @CXXFLAGS@ -fcommon + CPPFLAGS= @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ diff --git a/ufdbGuard.logrotate b/ufdbGuard.logrotate new file mode 100644 index 0000000..b302d66 --- /dev/null +++ b/ufdbGuard.logrotate @@ -0,0 +1,8 @@ +/var/log/ufdbguard/* { + missingok + monthly + notifempty + compress + copytruncate + su ufdb ufdb +} diff --git a/ufdbGuard.service b/ufdbGuard.service new file mode 100644 index 0000000..ba01df0 --- /dev/null +++ b/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 + \ No newline at end of file diff --git a/ufdbGuard.spec b/ufdbGuard.spec new file mode 100644 index 0000000..9329de0 --- /dev/null +++ b/ufdbGuard.spec @@ -0,0 +1,122 @@ +Name: ufdbGuard +Version: 1.34.5 +Release: 2%{?dist} +Summary: A URL filter for squid +URL: https://www.urlfilterdb.com/ +License: GPLv2 + +Source0: https://www.urlfilterdb.com/files/downloads/%{name}-%{version}.tar.gz +Source1: ufdbGuard.service +Source2: ufdbGuard.logrotate +# Adapt to new Fedora default gcc flag, -fnocommon. +Patch0: ufdbGuard-common.patch + +BuildRequires: bzip2-devel +BuildRequires: zlib-devel +BuildRequires: perl-interpreter +BuildRequires: gcc +%if %{?rhel:7}%{!?rhel:0} +%{?systemd_requires} +BuildRequires: systemd +%else +BuildRequires: systemd-rpm-macros +%endif +BuildRequires: openssl-devel +Requires(pre): shadow-utils +Requires: logrotate + +%description +ufdbGuard is a free URL filter for Squid with additional features like +SafeSearch enforcement for a large number of search engines, safer HTTPS +visits and dynamic detection of proxies (URL filter circumventors). + +ufdbGuard supports free and commercial URL databases that can be +downloaded from various sites and vendors. +You can also make your own URL database for ufdbGuard. + +%prep +%setup -q + +%patch0 -p0 + +iconv -c --to-code=UTF-8 CHANGELOG > CHANGELOG.new +mv CHANGELOG.new CHANGELOG + +%build +INSTALL_PROGRAM=./install-sh %configure \ + --with-ufdb-user=ufdb \ + --prefix=%{_prefix} \ + --with-ufdb-bindir=%{_sbindir} \ + --with-ufdb-piddir=%{_localstatedir}/run/ufdbguard \ + --with-ufdb-mandir=%{_mandir} \ + --with-ufdb-images_dir=%{_sharedstatedir}/ufdbguard/images \ + --with-ufdb-logdir=%{_localstatedir}/log/ufdbguard \ + --with-ufdb-samplesdir=%{_sharedstatedir}/ufdbguard/samples \ + --with-ufdb-config=%{_sysconfdir}/ufdbguard \ + --with-ufdb-dbhome=%{_sharedstatedir}/ufdbguard/blacklists \ + --with-ufdb-imagesdir=%{_sharedstatedir}/ufdbguard/images + +%make_build + +%install +mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d +mkdir -p %{buildroot}%{_sysconfdir}/init.d +mkdir -p %{buildroot}%{_sysconfdir}/ufdbguard +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/ufdbguard +%make_install INSTALL="../install-sh -c" +for i in $(find doc/ -type f -name '*.1'); do + install -p -D -m 0644 $i %{buildroot}%{_mandir}/man1/ +done +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}%{_unitdir}/ufdbGuard.service +install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/ufdbGuard + +rm -rf %{buildroot}%{_sysconfdir}/rc.d/init.d/ufdb + +#remove sysinit file +rm -rf %{buildroot}%{_sysconfdir}/init.d + +#remove ufdbsignal as it's setuid. +rm -f %{buildroot}%{_sbindir}/ufdbsignal + +%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 + +%preun +%systemd_preun ufdbGuard.service + +%postun +%systemd_postun_with_restart ufdbGuard.service + + +%files +%license COPYING GPL +%doc README CHANGELOG CREDITS +%config(noreplace) %{_sysconfdir}/sysconfig/ufdbguard +%config(noreplace) %dir %{_sysconfdir}/ufdbguard/ +%config(noreplace) %{_sysconfdir}/ufdbguard/* +%config(noreplace) %{_sysconfdir}/logrotate.d/ufdbGuard +%{_sbindir}/* +%{_mandir}/man1/ufdb* +%{_mandir}/man8/ufdb* +%dir %{_sharedstatedir}/ufdbguard/ +%attr(-, ufdb, ufdb) %dir %{_localstatedir}/log/ufdbguard/ +%{_sharedstatedir}/ufdbguard/* +%{_unitdir}/ufdbGuard.service + +%changelog +* Tue Jul 14 2020 Gwyn Ciesla - 1.34.5-2 +- Review fixes. + +* Fri Apr 17 2020 Gwyn Ciesla - 1.34.5-1 +- Initial package. \ No newline at end of file From dfe511a6204109c19f7e29dc2503c61d55da8df8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:11:45 +0000 Subject: [PATCH 02/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ufdbGuard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 9329de0..bdc1672 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.34.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPLv2 @@ -115,6 +115,9 @@ exit 0 %{_unitdir}/ufdbGuard.service %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.34.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 14 2020 Gwyn Ciesla - 1.34.5-2 - Review fixes. From 939d6a9a19a3f2326a1f3b066bcd94bd38fb76bc Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 3 Aug 2020 11:20:53 -0500 Subject: [PATCH 03/36] 1.34.6 --- .gitignore | 1 + sources | 2 +- ufdbGuard.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ff82ee4..1ae25f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /ufdbGuard-1.34.5.tar.gz +/ufdbGuard-1.34.6.tar.gz diff --git a/sources b/sources index 88b6e4a..93864b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ufdbGuard-1.34.5.tar.gz) = c8b32033f37ae93025dbd9722ecad30c4b7673658382ad7e1de15946dd0d611597a41359c7d5f8e619f950eec1f14867f5348d2329606b495997684fc9f59c72 +SHA512 (ufdbGuard-1.34.6.tar.gz) = 47c87097533f5e35e2d9f33f17d93ccc541ad39f52c42f3e91d6c1f99d9c28d24f0c502e8590b91d2081ede1c239337f57b030e1a735f0128a104c6f19e91dee diff --git a/ufdbGuard.spec b/ufdbGuard.spec index bdc1672..56d03d3 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard -Version: 1.34.5 -Release: 3%{?dist} +Version: 1.34.6 +Release: 1%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPLv2 @@ -115,6 +115,9 @@ exit 0 %{_unitdir}/ufdbGuard.service %changelog +* Mon Aug 03 2020 Gwyn Ciesla - 1.34.6-1 +- 1.34.6 + * Wed Jul 29 2020 Fedora Release Engineering - 1.34.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 3a523f30b3772c0167c6e27c009969263d249567 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 10 Aug 2020 10:20:39 -0500 Subject: [PATCH 04/36] tmpfiles fixes --- ufdbGuard.spec | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 56d03d3..d6b7beb 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.34.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPLv2 @@ -11,6 +11,12 @@ Source2: ufdbGuard.logrotate # Adapt to new Fedora default gcc flag, -fnocommon. Patch0: ufdbGuard-common.patch +%if 0%{?fedora} || 0%{?rhel} >= 7 +%bcond_without tmpfiles +%else +%bcond_with tmpfiles +%endif + BuildRequires: bzip2-devel BuildRequires: zlib-devel BuildRequires: perl-interpreter @@ -62,7 +68,7 @@ INSTALL_PROGRAM=./install-sh %configure \ mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d mkdir -p %{buildroot}%{_sysconfdir}/init.d mkdir -p %{buildroot}%{_sysconfdir}/ufdbguard -mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/ufdbguard +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/ %make_install INSTALL="../install-sh -c" for i in $(find doc/ -type f -name '*.1'); do install -p -D -m 0644 $i %{buildroot}%{_mandir}/man1/ @@ -82,6 +88,15 @@ rm -rf %{buildroot}%{_sysconfdir}/init.d #remove ufdbsignal as it's setuid. rm -f %{buildroot}%{_sbindir}/ufdbsignal +mkdir -p %{buildroot}%{_var}/run/ufdbguard +%if %{with tmpfiles} +# Setup tmpfiles.d config for the above +mkdir -p %{buildroot}/usr/lib/tmpfiles.d +echo 'd /var/run/ufdbguard 0750 ufdb ufdb -' > \ + %{buildroot}/usr/lib/tmpfiles.d/ufdbGuard.conf +%endif + + %pre getent group ufdb >/dev/null || groupadd -r ufdb getent passwd ufdb >/dev/null || \ @@ -113,8 +128,16 @@ exit 0 %attr(-, ufdb, ufdb) %dir %{_localstatedir}/log/ufdbguard/ %{_sharedstatedir}/ufdbguard/* %{_unitdir}/ufdbGuard.service +%attr(-, ufdb, ufdb) %dir %{_var}/run/ufdbguard/ +%if %{with tmpfiles} +%config(noreplace) %{_tmpfilesdir}/ufdbGuard.conf +%endif %changelog +* Fri Aug 07 2020 Gwyn Ciesla - 1.34.6-2 +- Correct sysconfig file placement. +- Fix tmpfiles config. + * Mon Aug 03 2020 Gwyn Ciesla - 1.34.6-1 - 1.34.6 From fb8ca6611598cab643a17ceb6b053d0420430486 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 2 Sep 2020 13:54:49 -0500 Subject: [PATCH 05/36] Fix logrotate --- ufdbGuard.logrotate | 2 +- ufdbGuard.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ufdbGuard.logrotate b/ufdbGuard.logrotate index b302d66..6ab6242 100644 --- a/ufdbGuard.logrotate +++ b/ufdbGuard.logrotate @@ -1,4 +1,4 @@ -/var/log/ufdbguard/* { +/var/log/ufdbguard/*.log { missingok monthly notifempty diff --git a/ufdbGuard.spec b/ufdbGuard.spec index d6b7beb..9aa110a 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.34.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPLv2 @@ -134,6 +134,9 @@ exit 0 %endif %changelog +* Wed Sep 02 2020 Gwyn Ciesla - 1.34.6-3 +- Correct logrotate configure. + * Fri Aug 07 2020 Gwyn Ciesla - 1.34.6-2 - Correct sysconfig file placement. - Fix tmpfiles config. From d6fe043b263efd92474b25c544cb634f4328d6e5 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 15 Oct 2020 13:17:54 -0500 Subject: [PATCH 06/36] 1.35.1 --- .gitignore | 1 + sources | 2 +- ufdbGuard-common.patch | 13 ------------- ufdbGuard.spec | 13 ++++++------- 4 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 ufdbGuard-common.patch diff --git a/.gitignore b/.gitignore index 1ae25f0..8aef0fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /ufdbGuard-1.34.5.tar.gz /ufdbGuard-1.34.6.tar.gz +/ufdbGuard-1.35.1.tar.gz diff --git a/sources b/sources index 93864b9..a4e26f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ufdbGuard-1.34.6.tar.gz) = 47c87097533f5e35e2d9f33f17d93ccc541ad39f52c42f3e91d6c1f99d9c28d24f0c502e8590b91d2081ede1c239337f57b030e1a735f0128a104c6f19e91dee +SHA512 (ufdbGuard-1.35.1.tar.gz) = 2cb25bb67f307e5ea84750c91f7048d2a3e4a08384ec3af1483ba7b8517765aa46e53a1e1ba8d250e0c6066998bba75e4339b92df2fc36f4690a88c9b4ad01cf diff --git a/ufdbGuard-common.patch b/ufdbGuard-common.patch deleted file mode 100644 index bad4e09..0000000 --- a/ufdbGuard-common.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/Makefile.in~ 2020-03-27 07:50:19.000000000 -0500 -+++ src/Makefile.in 2020-04-17 12:09:55.956728670 -0500 -@@ -23,8 +23,8 @@ - RM = rm -f - # SOLARIS_LIBS= -lsocket -lnsl -lrt -L /opt/csw/lib - --CFLAGS = @CFLAGS@ --CXXFLAGS= @CXXFLAGS@ -+CFLAGS = @CFLAGS@ -fcommon -+CXXFLAGS= @CXXFLAGS@ -fcommon - CPPFLAGS= @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 9aa110a..c465150 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard -Version: 1.34.6 -Release: 3%{?dist} +Version: 1.35.1 +Release: 1%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPLv2 @@ -8,8 +8,6 @@ License: GPLv2 Source0: https://www.urlfilterdb.com/files/downloads/%{name}-%{version}.tar.gz Source1: ufdbGuard.service Source2: ufdbGuard.logrotate -# Adapt to new Fedora default gcc flag, -fnocommon. -Patch0: ufdbGuard-common.patch %if 0%{?fedora} || 0%{?rhel} >= 7 %bcond_without tmpfiles @@ -43,8 +41,6 @@ You can also make your own URL database for ufdbGuard. %prep %setup -q -%patch0 -p0 - iconv -c --to-code=UTF-8 CHANGELOG > CHANGELOG.new mv CHANGELOG.new CHANGELOG @@ -134,6 +130,9 @@ exit 0 %endif %changelog +* Thu Oct 15 2020 Gwyn Ciesla - 1.35.1-1 +- 1.35.1 + * Wed Sep 02 2020 Gwyn Ciesla - 1.34.6-3 - Correct logrotate configure. @@ -151,4 +150,4 @@ exit 0 - Review fixes. * Fri Apr 17 2020 Gwyn Ciesla - 1.34.5-1 -- Initial package. \ No newline at end of file +- Initial package. From fbe933668a8e09d7683fd1102eaa3f123a02a16e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 30 Oct 2020 13:09:13 -0500 Subject: [PATCH 07/36] 1.35.2 --- .gitignore | 1 + sources | 2 +- ufdbGuard.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8aef0fa..bb89271 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /ufdbGuard-1.34.5.tar.gz /ufdbGuard-1.34.6.tar.gz /ufdbGuard-1.35.1.tar.gz +/ufdbGuard-1.35.2.tar.gz diff --git a/sources b/sources index a4e26f0..feb1f3b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ufdbGuard-1.35.1.tar.gz) = 2cb25bb67f307e5ea84750c91f7048d2a3e4a08384ec3af1483ba7b8517765aa46e53a1e1ba8d250e0c6066998bba75e4339b92df2fc36f4690a88c9b4ad01cf +SHA512 (ufdbGuard-1.35.2.tar.gz) = aff4d58d254920c5150043c0899205356dc8dca7913886f4692f2bb01fa0faa39387447e2e57759f9e2a41efd042191c4547f0317197ca8cf203dc5d8f94bb70 diff --git a/ufdbGuard.spec b/ufdbGuard.spec index c465150..fd61783 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,5 +1,5 @@ Name: ufdbGuard -Version: 1.35.1 +Version: 1.35.2 Release: 1%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ @@ -130,6 +130,9 @@ exit 0 %endif %changelog +* Fri Oct 30 2020 Gwyn Ciesla = 1.35.2-1 +- 1.35.2 + * Thu Oct 15 2020 Gwyn Ciesla - 1.35.1-1 - 1.35.1 From e5f8d81d2015ca529a88bfe3bbc30cdf131d9605 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 2 Nov 2020 11:48:25 -0600 Subject: [PATCH 08/36] 1.35.3 --- .gitignore | 1 + sources | 2 +- ufdbGuard.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bb89271..a5237f4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /ufdbGuard-1.34.6.tar.gz /ufdbGuard-1.35.1.tar.gz /ufdbGuard-1.35.2.tar.gz +/ufdbGuard-1.35.3.tar.gz diff --git a/sources b/sources index feb1f3b..43d83ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ufdbGuard-1.35.2.tar.gz) = aff4d58d254920c5150043c0899205356dc8dca7913886f4692f2bb01fa0faa39387447e2e57759f9e2a41efd042191c4547f0317197ca8cf203dc5d8f94bb70 +SHA512 (ufdbGuard-1.35.3.tar.gz) = 0f9d6fb5d6d52fe6f9ae3b55d535f718c590bdaaa734217627ba852edf6607d9c48ad8bfe44f2d1585724f2e09eb62cc5c862941fcc10af721a6e9e365ff6be2 diff --git a/ufdbGuard.spec b/ufdbGuard.spec index fd61783..7a764d1 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,5 +1,5 @@ Name: ufdbGuard -Version: 1.35.2 +Version: 1.35.3 Release: 1%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ @@ -130,7 +130,10 @@ exit 0 %endif %changelog -* Fri Oct 30 2020 Gwyn Ciesla = 1.35.2-1 +* Mon Nov 02 2020 Gwyn Ciesla - 1.35.3-1 +- 1.35.3 + +* Fri Oct 30 2020 Gwyn Ciesla - 1.35.2-1 - 1.35.2 * Thu Oct 15 2020 Gwyn Ciesla - 1.35.1-1 From 3b4528bf1f03c43c8cfcbdfa39e7d8636e80007c Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 12 Jan 2021 01:33:02 +0000 Subject: [PATCH 09/36] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- ufdbGuard.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 7a764d1..7b77c02 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -15,6 +15,7 @@ Source2: ufdbGuard.logrotate %bcond_with tmpfiles %endif +BuildRequires: make BuildRequires: bzip2-devel BuildRequires: zlib-devel BuildRequires: perl-interpreter From d9721c55a0e1ea0e4fe240ba5461b69ea4cbac79 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:35:20 +0000 Subject: [PATCH 10/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ufdbGuard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 7b77c02..d33a88d 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.35.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPLv2 @@ -131,6 +131,9 @@ exit 0 %endif %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.35.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Nov 02 2020 Gwyn Ciesla - 1.35.3-1 - 1.35.3 From c90e28eda497789f45f3373002e4d0f74c956350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:06 +0100 Subject: [PATCH 11/36] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- ufdbGuard.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index d33a88d..4831edf 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.35.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPLv2 @@ -131,6 +131,10 @@ exit 0 %endif %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.35.3-3 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Wed Jan 27 2021 Fedora Release Engineering - 1.35.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From ea30bef96ceae9671c52b0f2c97c8e23778b28f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 19:56:56 +0000 Subject: [PATCH 12/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ufdbGuard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 4831edf..09cb45e 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.35.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPLv2 @@ -131,6 +131,9 @@ exit 0 %endif %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.35.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.35.3-3 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From f41da30b890bb0d66a8496c22e1970926d3ab082 Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:17:11 +0200 Subject: [PATCH 13/36] Rebuilt with OpenSSL 3.0.0 --- ufdbGuard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 09cb45e..7b8661d 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.35.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPLv2 @@ -131,6 +131,9 @@ exit 0 %endif %changelog +* Tue Sep 14 2021 Sahana Prasad - 1.35.3-5 +- Rebuilt with OpenSSL 3.0.0 + * Fri Jul 23 2021 Fedora Release Engineering - 1.35.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From f38339dfa22752aef1039a59f6a67d890bb45afc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:25:56 +0000 Subject: [PATCH 14/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ufdbGuard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 7b8661d..56f711d 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.35.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPLv2 @@ -131,6 +131,9 @@ exit 0 %endif %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.35.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Sep 14 2021 Sahana Prasad - 1.35.3-5 - Rebuilt with OpenSSL 3.0.0 From 353516000556ea6dad474af619d3a0c544127475 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 31 Jan 2022 17:47:00 -0800 Subject: [PATCH 15/36] epel8-playground decommissioned : https://pagure.io/epel/issue/136 --- README.md | 3 --- dead.package | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 README.md create mode 100644 dead.package diff --git a/README.md b/README.md deleted file mode 100644 index 7417316..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ufdbGuard - -The ufdbGuard package \ No newline at end of file diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a72aec0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel8-playground decommissioned : https://pagure.io/epel/issue/136 From 21a2ab9fa0317e1e70727fe7640686394ab2f7b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:17:42 +0000 Subject: [PATCH 16/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ufdbGuard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 56f711d..7f20af0 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.35.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPLv2 @@ -131,6 +131,9 @@ exit 0 %endif %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.35.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.35.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From a4935527d112ab4cbd0137b079954581657cd006 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 4 Jan 2023 10:08:11 -0600 Subject: [PATCH 17/36] 1.35.4 --- .gitignore | 1 + sources | 2 +- ufdbGuard.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a5237f4..22faa38 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /ufdbGuard-1.35.1.tar.gz /ufdbGuard-1.35.2.tar.gz /ufdbGuard-1.35.3.tar.gz +/ufdbGuard-1.35.4.tar.gz diff --git a/sources b/sources index 43d83ed..609d535 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ufdbGuard-1.35.3.tar.gz) = 0f9d6fb5d6d52fe6f9ae3b55d535f718c590bdaaa734217627ba852edf6607d9c48ad8bfe44f2d1585724f2e09eb62cc5c862941fcc10af721a6e9e365ff6be2 +SHA512 (ufdbGuard-1.35.4.tar.gz) = 8b937fb3589387a918607f5addbbfc7e2174abdf50c36687b6a903b4bcba86c913138e82345a675475008bab08fe82bb8e339bb75e6a0d93ea0fb7d5d1a2576b diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 7f20af0..2f363cf 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard -Version: 1.35.3 -Release: 7%{?dist} +Version: 1.35.4 +Release: 1%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPLv2 @@ -27,6 +27,8 @@ BuildRequires: systemd BuildRequires: systemd-rpm-macros %endif BuildRequires: openssl-devel +BuildRequires: bind-utils +BuildRequires: wget Requires(pre): shadow-utils Requires: logrotate @@ -131,6 +133,9 @@ exit 0 %endif %changelog +* Wed Jan 04 2023 Gwyn Ciesla - 1.35.4-1 +- 1.35.4 + * Sat Jul 23 2022 Fedora Release Engineering - 1.35.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 3f90d5190238a04ce788ef003fe319e668d56f80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:42:34 +0000 Subject: [PATCH 18/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ufdbGuard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 2f363cf..0549583 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.35.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPLv2 @@ -133,6 +133,9 @@ exit 0 %endif %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.35.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jan 04 2023 Gwyn Ciesla - 1.35.4-1 - 1.35.4 From 03e400a3ce677f3199aec08d45301cb8970544e3 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 7 Feb 2023 11:50:53 -0600 Subject: [PATCH 19/36] 1.35.5 --- .gitignore | 1 + sources | 2 +- ufdbGuard.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 22faa38..93c6603 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /ufdbGuard-1.35.2.tar.gz /ufdbGuard-1.35.3.tar.gz /ufdbGuard-1.35.4.tar.gz +/ufdbGuard-1.35.5.tar.gz diff --git a/sources b/sources index 609d535..ca2081a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ufdbGuard-1.35.4.tar.gz) = 8b937fb3589387a918607f5addbbfc7e2174abdf50c36687b6a903b4bcba86c913138e82345a675475008bab08fe82bb8e339bb75e6a0d93ea0fb7d5d1a2576b +SHA512 (ufdbGuard-1.35.5.tar.gz) = 04f52d7fa648c959ef6cfa619f31004cb2ca7f33179fcddcd33e9e09fe58386cf504f9e1a7a3f215f45e6e1e12a166081d0f503cec55cc32f7a75893b8abf945 diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 0549583..7f71261 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard -Version: 1.35.4 -Release: 2%{?dist} +Version: 1.35.5 +Release: 1%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPLv2 @@ -133,6 +133,9 @@ exit 0 %endif %changelog +* Tue Feb 07 2023 Gwyn Ciesla - 1.35.5-1 +- 1.35.5 + * Sat Jan 21 2023 Fedora Release Engineering - 1.35.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 67d7c055ce9827bbf527c2e85f51c837d60f1d7e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Sat, 4 Mar 2023 20:00:13 -0600 Subject: [PATCH 20/36] migrated to SPDX license --- ufdbGuard.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 7f71261..05ff871 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,9 +1,9 @@ Name: ufdbGuard Version: 1.35.5 -Release: 1%{?dist} +Release: 2%{?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 @@ -133,6 +133,9 @@ exit 0 %endif %changelog +* 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 From 2ba674f1a923b8b62d79485d48b84a9a98794e46 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:01:15 +0000 Subject: [PATCH 21/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ufdbGuard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 05ff871..200707b 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.35.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPL-2.0-only @@ -133,6 +133,9 @@ exit 0 %endif %changelog +* 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 From c1819e37b51d48a678f2fca5989942d07c4807c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:00:44 +0000 Subject: [PATCH 22/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ufdbGuard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 200707b..3fcbd60 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard Version: 1.35.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPL-2.0-only @@ -133,6 +133,9 @@ exit 0 %endif %changelog +* 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 From 3e36007dbaaf88a0719c0eaadbd29eb7a8f7c34d Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 2 Feb 2024 16:00:30 -0600 Subject: [PATCH 23/36] 1.35.6 --- .gitignore | 1 + sources | 2 +- ufdbGuard.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 93c6603..a3d1ae8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /ufdbGuard-1.35.3.tar.gz /ufdbGuard-1.35.4.tar.gz /ufdbGuard-1.35.5.tar.gz +/ufdbGuard-1.35.6.tar.gz diff --git a/sources b/sources index ca2081a..826ed50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ufdbGuard-1.35.5.tar.gz) = 04f52d7fa648c959ef6cfa619f31004cb2ca7f33179fcddcd33e9e09fe58386cf504f9e1a7a3f215f45e6e1e12a166081d0f503cec55cc32f7a75893b8abf945 +SHA512 (ufdbGuard-1.35.6.tar.gz) = 40243d0973919f324cd8ec3666b8beb8b19e58b4e646b91f73b90a10762a4ba08708c37dbea8c6a605c2c9655db561f26a27f7539ea7a6dc04a7dbc27b7fabf0 diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 3fcbd60..446786b 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,6 +1,6 @@ Name: ufdbGuard -Version: 1.35.5 -Release: 4%{?dist} +Version: 1.35.6 +Release: 1%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ License: GPL-2.0-only @@ -133,6 +133,9 @@ exit 0 %endif %changelog +* 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 From bf96368ef3643d8099e6734c2481c954b0e05387 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 22 Mar 2024 14:54:14 -0500 Subject: [PATCH 24/36] 1.35.7 --- .gitignore | 1 + sources | 2 +- ufdbGuard.service | 13 ------------- ufdbGuard.spec | 15 +++++++++------ 4 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 ufdbGuard.service diff --git a/.gitignore b/.gitignore index a3d1ae8..8d4c867 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /ufdbGuard-1.35.4.tar.gz /ufdbGuard-1.35.5.tar.gz /ufdbGuard-1.35.6.tar.gz +/ufdbGuard-1.35.7.tar.gz diff --git a/sources b/sources index 826ed50..eb0ae73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ufdbGuard-1.35.6.tar.gz) = 40243d0973919f324cd8ec3666b8beb8b19e58b4e646b91f73b90a10762a4ba08708c37dbea8c6a605c2c9655db561f26a27f7539ea7a6dc04a7dbc27b7fabf0 +SHA512 (ufdbGuard-1.35.7.tar.gz) = 52842c11ae971d4d3e172f6e4d64f61a45af9d8ad830498e51d0a26a39fb9732f4ae9e633dc5d4418ab8b9f021d499e81403709d41cf9d8ce01fc035bcfa87e6 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 446786b..9dc6e08 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -1,5 +1,5 @@ Name: ufdbGuard -Version: 1.35.6 +Version: 1.35.7 Release: 1%{?dist} Summary: A URL filter for squid URL: https://www.urlfilterdb.com/ @@ -76,7 +76,6 @@ 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}%{_unitdir}/ufdbGuard.service install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/ufdbGuard rm -rf %{buildroot}%{_sysconfdir}/rc.d/init.d/ufdb @@ -104,13 +103,13 @@ getent passwd ufdb >/dev/null || \ 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 +125,17 @@ 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 %changelog +* 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 From 10accd93f82d89c13fb358a6518e644a33325243 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 22 Mar 2024 14:55:05 -0500 Subject: [PATCH 25/36] 1.35.7 --- ufdbGuard.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ufdbGuard.spec b/ufdbGuard.spec index 9dc6e08..20d6092 100644 --- a/ufdbGuard.spec +++ b/ufdbGuard.spec @@ -6,8 +6,7 @@ URL: https://www.urlfilterdb.com/ 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 @@ -76,7 +75,7 @@ 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 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/ufdbGuard +install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/ufdbGuard rm -rf %{buildroot}%{_sysconfdir}/rc.d/init.d/ufdb From fb2df44a2e97174a4ca9e8fa8d14a0bca71b6117 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 3 Jun 2024 14:18:38 -0500 Subject: [PATCH 26/36] 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 27/36] 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 28/36] 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 29/36] 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 30/36] 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 31/36] 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 32/36] 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 33/36] 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 34/36] 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 35/36] 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 36/36] 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