From 858e4b58e1a72605045c328fc3fb56c172ea73ac Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 1/7] Eliminate use of obsolete %patchN syntax (#2283636) --- sqlgrey.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sqlgrey.spec b/sqlgrey.spec index b4145ac..c51c05b 100644 --- a/sqlgrey.spec +++ b/sqlgrey.spec @@ -30,8 +30,8 @@ to 90% of junk mails (spam and virus) before they reach your Postfix server %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch -P0 -p1 +%patch -P1 -p1 %build make %{?_smp_mflags} From a913fafd2d96569eb3c402c501330ac4fdffdcd3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 06:17:24 +0000 Subject: [PATCH 2/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- sqlgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sqlgrey.spec b/sqlgrey.spec index c51c05b..57c4100 100644 --- a/sqlgrey.spec +++ b/sqlgrey.spec @@ -1,6 +1,6 @@ Name: sqlgrey Version: 1.8.0 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Postfix grey-listing policy service License: GPLv2+ URL: http://sqlgrey.sourceforge.net/ @@ -80,6 +80,9 @@ exit 0 %systemd_postun_with_restart sqlgrey.service %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.8.0-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1.8.0-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 15a9823ac12177fec16188816ab4808a1ea2bff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:03:46 +0200 Subject: [PATCH 3/7] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- sqlgrey.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sqlgrey.spec b/sqlgrey.spec index 57c4100..25cef5a 100644 --- a/sqlgrey.spec +++ b/sqlgrey.spec @@ -1,8 +1,9 @@ Name: sqlgrey Version: 1.8.0 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Postfix grey-listing policy service -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://sqlgrey.sourceforge.net/ Source0: http://dl.sourceforge.net/sqlgrey/sqlgrey-%{version}.tar.gz Source1: sqlgrey.service @@ -80,6 +81,9 @@ exit 0 %systemd_postun_with_restart sqlgrey.service %changelog +* Fri Jul 26 2024 Miroslav Suchý - 1.8.0-29 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 1.8.0-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b9397b7870895f5705c4af1e346fb0e4b7408d87 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 11:28:40 +0000 Subject: [PATCH 4/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- sqlgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sqlgrey.spec b/sqlgrey.spec index 25cef5a..ef48bf9 100644 --- a/sqlgrey.spec +++ b/sqlgrey.spec @@ -1,6 +1,6 @@ Name: sqlgrey Version: 1.8.0 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Postfix grey-listing policy service # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -81,6 +81,9 @@ exit 0 %systemd_postun_with_restart sqlgrey.service %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.8.0-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 1.8.0-29 - convert license to SPDX From 06b2c8855ead1816e22aa74be603316916d37c28 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 8 Feb 2025 18:14:17 -0800 Subject: [PATCH 5/7] Adjust to sbin/bin consolidation. Fixes FTBFS rhbz#2341376 --- sqlgrey.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sqlgrey.spec b/sqlgrey.spec index ef48bf9..c87372b 100644 --- a/sqlgrey.spec +++ b/sqlgrey.spec @@ -1,6 +1,6 @@ Name: sqlgrey Version: 1.8.0 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Postfix grey-listing policy service # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -39,7 +39,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make rh-install ROOTDIR=$RPM_BUILD_ROOT +make rh-install ROOTDIR=$RPM_BUILD_ROOT SBINDIR=$RPM_BUILD_ROOT/usr/bin install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/sqlgrey.service rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ mkdir -p -m 755 $RPM_BUILD_ROOT%{_var}/lib @@ -49,8 +49,8 @@ touch $RPM_BUILD_ROOT%{_var}/lib/sqlgrey/sqlgrey.db %files %doc Changelog CONTRIB COPYING FAQ HOWTO README* TODO %{_unitdir}/sqlgrey.service -%{_sbindir}/sqlgrey -%{_sbindir}/update_sqlgrey_config +%{_bindir}/sqlgrey +%{_bindir}/update_sqlgrey_config %{_bindir}/sqlgrey-logstats.pl %{_mandir}/man1/sqlgrey.1* %attr(-,sqlgrey,sqlgrey) %dir %{_var}/lib/sqlgrey @@ -81,6 +81,9 @@ exit 0 %systemd_postun_with_restart sqlgrey.service %changelog +* Sat Feb 08 2025 Kevin Fenzi - 1.8.0-31 +- Adjust to sbin/bin consolidation. Fixes FTBFS rhbz#2341376 + * Sun Jan 19 2025 Fedora Release Engineering - 1.8.0-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From f00747ea0f411b6df88619fc32f93df08d3088cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 16:44:37 +0100 Subject: [PATCH 6/7] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- sqlgrey.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sqlgrey.spec b/sqlgrey.spec index c87372b..0f7e59b 100644 --- a/sqlgrey.spec +++ b/sqlgrey.spec @@ -1,6 +1,6 @@ Name: sqlgrey Version: 1.8.0 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Postfix grey-listing policy service # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -13,7 +13,6 @@ BuildArch: noarch Requires: postfix Requires: perl(DBD::SQLite) -Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -34,6 +33,11 @@ to 90% of junk mails (spam and virus) before they reach your Postfix server %patch -P0 -p1 %patch -P1 -p1 +# Create a sysusers.d config file +cat >sqlgrey.sysusers.conf </dev/null || groupadd -r sqlgrey -getent passwd sqlgrey >/dev/null || \ - useradd -r -g sqlgrey -d /var/lib/sqlgrey -s /sbin/nologin \ - -c "SQLgrey server" sqlgrey -exit 0 %post %systemd_post sqlgrey.service @@ -81,6 +82,9 @@ exit 0 %systemd_postun_with_restart sqlgrey.service %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.8.0-32 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Sat Feb 08 2025 Kevin Fenzi - 1.8.0-31 - Adjust to sbin/bin consolidation. Fixes FTBFS rhbz#2341376 From 89c04d0972e9f6588318dcf32edd4f528150e3c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:39:40 +0000 Subject: [PATCH 7/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- sqlgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sqlgrey.spec b/sqlgrey.spec index 0f7e59b..f8b9ea6 100644 --- a/sqlgrey.spec +++ b/sqlgrey.spec @@ -1,6 +1,6 @@ Name: sqlgrey Version: 1.8.0 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Postfix grey-listing policy service # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -82,6 +82,9 @@ install -m0644 -D sqlgrey.sysusers.conf %{buildroot}%{_sysusersdir}/sqlgrey.conf %systemd_postun_with_restart sqlgrey.service %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.8.0-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.8.0-32 - Add sysusers.d config file to allow rpm to create users/groups automatically