From 8b37b707ea8e38a281bd3b6899fe934de7327f09 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 23:57:24 +0000 Subject: [PATCH 01/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- spampd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spampd.spec b/spampd.spec index c8506e6..4eb474f 100644 --- a/spampd.spec +++ b/spampd.spec @@ -1,7 +1,7 @@ Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.30 -Release: 31%{?dist} +Release: 32%{?dist} License: GPLv2+ URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm Source0: http://www.worlddesign.com/Content/rd/mta/spampd/spampd-%{version}.tar.gz @@ -92,6 +92,9 @@ indicating it's spam and why. %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 2.30-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 2.30-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From a9ecdf23848685a8283688f33011b581fc27d101 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 11:11:47 +0000 Subject: [PATCH 02/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- spampd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spampd.spec b/spampd.spec index 4eb474f..443bed5 100644 --- a/spampd.spec +++ b/spampd.spec @@ -1,7 +1,7 @@ Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.30 -Release: 32%{?dist} +Release: 33%{?dist} License: GPLv2+ URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm Source0: http://www.worlddesign.com/Content/rd/mta/spampd/spampd-%{version}.tar.gz @@ -92,6 +92,9 @@ indicating it's spam and why. %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.30-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jan 30 2020 Fedora Release Engineering - 2.30-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 4ac94729ec81537b347263618d44cbcaeee89294 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 21:46:35 +0000 Subject: [PATCH 03/25] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- spampd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/spampd.spec b/spampd.spec index 443bed5..6c3f04e 100644 --- a/spampd.spec +++ b/spampd.spec @@ -13,6 +13,7 @@ Patch0: spampd-2.30-Fix-POD-errors.patch Patch1: spampd-2.30-untaint.patch Patch2: spampd-2.30-no-pid-file.patch +BuildRequires: make BuildRequires: perl-generators BuildRequires: perl-podlators BuildRequires: perl-Pod-Html From 0dec17c07426b9a2d7c300ed0ca8a7e7722c2e21 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:47:49 +0000 Subject: [PATCH 04/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- spampd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spampd.spec b/spampd.spec index 6c3f04e..b057174 100644 --- a/spampd.spec +++ b/spampd.spec @@ -1,7 +1,7 @@ Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.30 -Release: 33%{?dist} +Release: 34%{?dist} License: GPLv2+ URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm Source0: http://www.worlddesign.com/Content/rd/mta/spampd/spampd-%{version}.tar.gz @@ -93,6 +93,9 @@ indicating it's spam and why. %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2.30-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 2.30-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From f7abceb184b346e36acb1ef5d7103b4888de0852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:17 +0100 Subject: [PATCH 05/25] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- spampd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spampd.spec b/spampd.spec index b057174..291906b 100644 --- a/spampd.spec +++ b/spampd.spec @@ -1,7 +1,7 @@ Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.30 -Release: 34%{?dist} +Release: 35%{?dist} License: GPLv2+ URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm Source0: http://www.worlddesign.com/Content/rd/mta/spampd/spampd-%{version}.tar.gz @@ -93,6 +93,10 @@ indicating it's spam and why. %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.30-35 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Wed Jan 27 2021 Fedora Release Engineering - 2.30-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 2ca1c9bb861e5a5834ce0bdcb05fb0cc0c8b7807 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 18:00:28 +0000 Subject: [PATCH 06/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- spampd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spampd.spec b/spampd.spec index 291906b..0023013 100644 --- a/spampd.spec +++ b/spampd.spec @@ -1,7 +1,7 @@ Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.30 -Release: 35%{?dist} +Release: 36%{?dist} License: GPLv2+ URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm Source0: http://www.worlddesign.com/Content/rd/mta/spampd/spampd-%{version}.tar.gz @@ -93,6 +93,9 @@ indicating it's spam and why. %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.30-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.30-35 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 098716f1584a28045de366ba1f387cea3b5738a7 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Thu, 12 Aug 2021 19:51:42 +1000 Subject: [PATCH 07/25] Update to 2.61. --- .gitignore | 1 + sources | 2 +- spampd.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6e13055..f849ef9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ spampd-2.30.tar.gz +/spampd-2.61.tar.gz diff --git a/sources b/sources index 86c023e..206c813 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -742c6f2cb75db54e59d044a8ee40445f spampd-2.30.tar.gz +SHA512 (spampd-2.61.tar.gz) = e2f84c4b24648d4f4db70174f04b72981faa1c54ffc4bbc433d14c730ef4ad7fd4cd3772a476f25be0bee103e951700d038634d14848f1eb90849d1a6655199b diff --git a/spampd.spec b/spampd.spec index 0023013..2d35b4e 100644 --- a/spampd.spec +++ b/spampd.spec @@ -1,10 +1,10 @@ Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd -Version: 2.30 -Release: 36%{?dist} +Version: 2.61 +Release: 1%{?dist} License: GPLv2+ URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm -Source0: http://www.worlddesign.com/Content/rd/mta/spampd/spampd-%{version}.tar.gz +Source0: https://github.com/mpaperno/spampd/archive/refs/tags/spampd-%{version}.tar.gz Source1: spampd.service Source2: README.systemd Source3: spampd.sysconfig @@ -93,6 +93,9 @@ indicating it's spam and why. %changelog +* Thu Aug 12 2021 Bojan Smojver - 2.61-1 +- Update to 2.61 + * Fri Jul 23 2021 Fedora Release Engineering - 2.30-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From a2273c4a1d290e37ad419fbc99b77d8a2a816192 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Thu, 12 Aug 2021 20:00:09 +1000 Subject: [PATCH 08/25] Remove POD patch. --- spampd-2.30-Fix-POD-errors.patch | 47 -------------------------------- spampd.spec | 2 -- 2 files changed, 49 deletions(-) delete mode 100644 spampd-2.30-Fix-POD-errors.patch diff --git a/spampd-2.30-Fix-POD-errors.patch b/spampd-2.30-Fix-POD-errors.patch deleted file mode 100644 index 89b0f8c..0000000 --- a/spampd-2.30-Fix-POD-errors.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e6cb97994529af83f48d52e7464f449756ec8c00 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Tue, 6 Aug 2013 14:36:59 +0200 -Subject: [PATCH] Fix POD errors -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Petr Písař ---- - spampd | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/spampd b/spampd -index e2fe0c4..59a1cb1 100755 ---- a/spampd -+++ b/spampd -@@ -1075,10 +1075,10 @@ L. - - =head1 Requires - --=over 5 -- - Perl modules: - -+=over 5 -+ - =item B - - =item B -@@ -1390,11 +1390,11 @@ Prints usage information. - - =head2 Deprecated Options - --=over 5 -- - The following options are no longer used but still accepted for backwards - compatibility with prevoius I versions: - -+=over 5 -+ - =item B<--dead-letters> - - =item B<--heloname> --- -1.8.1.4 - diff --git a/spampd.spec b/spampd.spec index 2d35b4e..a8df0c0 100644 --- a/spampd.spec +++ b/spampd.spec @@ -9,7 +9,6 @@ Source1: spampd.service Source2: README.systemd Source3: spampd.sysconfig # Fix POD errors, -Patch0: spampd-2.30-Fix-POD-errors.patch Patch1: spampd-2.30-untaint.patch Patch2: spampd-2.30-no-pid-file.patch @@ -38,7 +37,6 @@ indicating it's spam and why. %prep %setup -q -%patch0 -p1 %patch1 -p0 -b .untaint %patch2 -p0 -b .no-pid-file %{__rm} -f spampd.html From db67bd363353d312e72bf1ac90fb6f21a1bbff4b Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Thu, 12 Aug 2021 20:14:22 +1000 Subject: [PATCH 09/25] Remove untaint patch, already marked to run under -T. Rework no PID patch. --- spampd-2.30-no-pid-file.patch | 11 ----------- spampd-2.30-untaint.patch | 25 ------------------------- spampd-2.61-no-pid-file.patch | 12 ++++++++++++ spampd.spec | 6 ++---- 4 files changed, 14 insertions(+), 40 deletions(-) delete mode 100644 spampd-2.30-no-pid-file.patch delete mode 100644 spampd-2.30-untaint.patch create mode 100644 spampd-2.61-no-pid-file.patch diff --git a/spampd-2.30-no-pid-file.patch b/spampd-2.30-no-pid-file.patch deleted file mode 100644 index 4b60b87..0000000 --- a/spampd-2.30-no-pid-file.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- spampd.orig 2013-12-09 21:05:43.757669743 +1100 -+++ spampd 2013-12-10 05:39:13.299825730 +1100 -@@ -898,7 +898,7 @@ - syslog_facility => 'mail', - background => $background, - # setsid => 1, -- pid_file => $pidfile, -+ pid_file => $background ? $pidfile : undef, - user => $user, - group => $group, - max_servers => $children, diff --git a/spampd-2.30-untaint.patch b/spampd-2.30-untaint.patch deleted file mode 100644 index 6d29723..0000000 --- a/spampd-2.30-untaint.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- spampd 2013-11-04 16:03:52.000000000 +0100 -+++ /usr/sbin/spampd 2013-11-04 16:05:05.000000000 +0100 -@@ -900,6 +900,22 @@ - usage(0); - } - -+# Untaint some options provided by admin command line. -+$pidfile =~ /^(.*)$/; -+$pidfile = $1; -+ -+$relayhost =~ /^(.*)$/; -+$relayhost = $1; -+ -+$relayport =~ /^(.*)$/; -+$relayport = $1; -+ -+$host =~ /^(.*)$/; -+$host = $1; -+ -+$port =~ /^(.*)$/; -+$port = $1; -+ - if ( $options{tagall} ) { $tagall = 1; } - if ( $options{'log-rules-hit'} ) { $rh = 1; } - if ( $options{debug} ) { $debug = 1; $nsloglevel = 4; } diff --git a/spampd-2.61-no-pid-file.patch b/spampd-2.61-no-pid-file.patch new file mode 100644 index 0000000..a75148a --- /dev/null +++ b/spampd-2.61-no-pid-file.patch @@ -0,0 +1,12 @@ +diff -ruN spampd-2.61-v/spampd.pl spampd-2.61/spampd.pl +--- spampd-2.61-v/spampd.pl 2021-08-07 06:01:37.000000000 +1000 ++++ spampd-2.61/spampd.pl 2021-08-12 20:08:31.674060714 +1000 +@@ -675,7 +675,7 @@ + 'max-servers|mxs=i' => \$srv_p->{max_servers}, + 'children|c=i' => sub { $srv_p->{max_servers} = $_[1]; }, + 'maxrequests|mr|r=i' => \$srv_p->{max_requests}, +- 'pid|p=s' => \$srv_p->{pid_file}, ++ 'pid|p=s' => $srv_p->{background} ? \$srv_p->{pid_file} : undef, + 'user|u=s' => \$srv_p->{user}, + 'group|g=s' => \$srv_p->{group}, + 'logsock|ls=s' => \$srv_p->{syslog_logsock}, diff --git a/spampd.spec b/spampd.spec index a8df0c0..04db24a 100644 --- a/spampd.spec +++ b/spampd.spec @@ -9,8 +9,7 @@ Source1: spampd.service Source2: README.systemd Source3: spampd.sysconfig # Fix POD errors, -Patch1: spampd-2.30-untaint.patch -Patch2: spampd-2.30-no-pid-file.patch +Patch0: spampd-2.61-no-pid-file.patch BuildRequires: make BuildRequires: perl-generators @@ -37,8 +36,7 @@ indicating it's spam and why. %prep %setup -q -%patch1 -p0 -b .untaint -%patch2 -p0 -b .no-pid-file +%patch0 -p1 -b .no-pid-file %{__rm} -f spampd.html %{__chmod} -x changelog.txt %{__cp} %{SOURCE2} . From d86b54a8bf15dc06d91e58c9f6dc13e5ed478d94 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Thu, 12 Aug 2021 22:04:50 +1000 Subject: [PATCH 10/25] Fix POD generation, rename Perl script to one with no extension. --- spampd.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spampd.spec b/spampd.spec index 04db24a..a874dc2 100644 --- a/spampd.spec +++ b/spampd.spec @@ -43,14 +43,14 @@ indicating it's spam and why. %build -%{__make} spampd.8 -%{__make} spampd.html +pod2man spampd.pod spampd.8 +pod2html spampd.pod spampd.html %install %{__rm} -rf %{buildroot} # Main program -%{__install} -D -p -m 0755 spampd \ +%{__install} -D -p -m 0755 spampd.pl \ %{buildroot}%{_sbindir}/spampd # Man page %{__install} -D -p -m 0644 spampd.8 \ From 1ef57c9f6acb6e676a29c6ddccb657e2715aacbf Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Thu, 12 Aug 2021 22:14:01 +1000 Subject: [PATCH 11/25] Adjust syntax of pod2html. --- spampd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spampd.spec b/spampd.spec index a874dc2..8c2311c 100644 --- a/spampd.spec +++ b/spampd.spec @@ -44,7 +44,7 @@ indicating it's spam and why. %build pod2man spampd.pod spampd.8 -pod2html spampd.pod spampd.html +pod2html --infile=spampd.pod --outfile=spampd.html %install From 8bb6331ae51be292a7084e5241ec911928e4e058 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Fri, 13 Aug 2021 03:49:59 +1000 Subject: [PATCH 12/25] Set pid_file to undef when not in background more simply. --- spampd-2.61-no-pid-file.patch | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/spampd-2.61-no-pid-file.patch b/spampd-2.61-no-pid-file.patch index a75148a..b5151e1 100644 --- a/spampd-2.61-no-pid-file.patch +++ b/spampd-2.61-no-pid-file.patch @@ -1,12 +1,11 @@ diff -ruN spampd-2.61-v/spampd.pl spampd-2.61/spampd.pl --- spampd-2.61-v/spampd.pl 2021-08-07 06:01:37.000000000 +1000 -+++ spampd-2.61/spampd.pl 2021-08-12 20:08:31.674060714 +1000 -@@ -675,7 +675,7 @@ - 'max-servers|mxs=i' => \$srv_p->{max_servers}, - 'children|c=i' => sub { $srv_p->{max_servers} = $_[1]; }, - 'maxrequests|mr|r=i' => \$srv_p->{max_requests}, -- 'pid|p=s' => \$srv_p->{pid_file}, -+ 'pid|p=s' => $srv_p->{background} ? \$srv_p->{pid_file} : undef, - 'user|u=s' => \$srv_p->{user}, - 'group|g=s' => \$srv_p->{group}, - 'logsock|ls=s' => \$srv_p->{syslog_logsock}, ++++ spampd-2.61/spampd.pl 2021-08-13 03:48:34.527166029 +1000 +@@ -761,6 +761,7 @@ + + # Set misc. options based on other options. + $srv_p->{setsid}= 0 if !$srv_p->{background}; ++ $srv_p->{pid_file} = undef if !$srv_p->{background}; + $sa_p->{home_dir_for_helpers} = $sa_p->{userstate_dir}; + $sa_p->{username} = $srv_p->{user}; + } From 7eb3fcb70c5d8e269ad92e86609a5f915d69e95e Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Thu, 19 Aug 2021 00:02:03 +1000 Subject: [PATCH 13/25] Add perl(Net::Server) dependency. --- spampd.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/spampd.spec b/spampd.spec index 8c2311c..4843fda 100644 --- a/spampd.spec +++ b/spampd.spec @@ -1,7 +1,7 @@ Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.61 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm Source0: https://github.com/mpaperno/spampd/archive/refs/tags/spampd-%{version}.tar.gz @@ -17,6 +17,8 @@ BuildRequires: perl-podlators BuildRequires: perl-Pod-Html BuildRequires: systemd-units +Requires: perl(Net::Server) + Requires(pre): /usr/sbin/useradd Requires(post): systemd Requires(preun): systemd @@ -89,6 +91,9 @@ pod2html --infile=spampd.pod --outfile=spampd.html %changelog +* Thu Aug 19 2021 Bojan Smojver - 2.61-2 +- Add perl(Net::Server) dependency + * Thu Aug 12 2021 Bojan Smojver - 2.61-1 - Update to 2.61 From b488302547430217c2c84c3c94d4786129e375b2 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Fri, 20 Aug 2021 06:17:32 +1000 Subject: [PATCH 14/25] Add --homedir option to service file. --- spampd.service | 2 +- spampd.spec | 10 ++++++---- spampd.sysconfig | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/spampd.service b/spampd.service index 0ab26c9..0ed8952 100644 --- a/spampd.service +++ b/spampd.service @@ -7,7 +7,7 @@ Wants=sa-update.timer User=spampd Group=spampd EnvironmentFile=/etc/sysconfig/spampd -ExecStart=/usr/sbin/spampd --nodetach --u=spampd --g=spampd $SPAMPD_OPTIONS +ExecStart=/usr/sbin/spampd --nodetach -u spampd -g spampd --homedir /var/spool/spampd $SPAMPD_OPTIONS [Install] WantedBy=multi-user.target diff --git a/spampd.spec b/spampd.spec index 4843fda..401b00c 100644 --- a/spampd.spec +++ b/spampd.spec @@ -1,14 +1,13 @@ Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.61 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm -Source0: https://github.com/mpaperno/spampd/archive/refs/tags/spampd-%{version}.tar.gz +Source0: https://github.com/mpaperno/spampd/archive/refs/tags/%{name}-%{version}.tar.gz Source1: spampd.service Source2: README.systemd Source3: spampd.sysconfig -# Fix POD errors, Patch0: spampd-2.61-no-pid-file.patch BuildRequires: make @@ -87,10 +86,13 @@ pod2html --infile=spampd.pod --outfile=spampd.html %{_unitdir}/spampd.service %{_sbindir}/spampd %{_mandir}/man8/spampd.8* -%attr(0750,spampd,spampd) /var/spool/spampd/ +%attr(0750,spampd,spampd) /var/spool/spampd %changelog +* Fri Aug 20 2021 Bojan Smojver - 2.61-3 +- Add --homedir option to service file + * Thu Aug 19 2021 Bojan Smojver - 2.61-2 - Add perl(Net::Server) dependency diff --git a/spampd.sysconfig b/spampd.sysconfig index 7829c3c..7c7cda2 100644 --- a/spampd.sysconfig +++ b/spampd.sysconfig @@ -1 +1 @@ -SPAMPD_OPTIONS="--a --L --maxsize=500 --host=127.0.0.1:10026 --relayhost=127.0.0.1:10027" +SPAMPD_OPTIONS="-a -L --maxsize 500 --host 127.0.0.1:10026 --relayhost 127.0.0.1:10027" From 3b47e62f60f9c4b3131d5858cc2ecaf88685024c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 01:22:28 +0000 Subject: [PATCH 15/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- spampd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spampd.spec b/spampd.spec index 401b00c..f33d8f8 100644 --- a/spampd.spec +++ b/spampd.spec @@ -1,7 +1,7 @@ Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.61 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm Source0: https://github.com/mpaperno/spampd/archive/refs/tags/%{name}-%{version}.tar.gz @@ -90,6 +90,9 @@ pod2html --infile=spampd.pod --outfile=spampd.html %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2.61-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Aug 20 2021 Bojan Smojver - 2.61-3 - Add --homedir option to service file From bcf14b166b3c44f1fc7f5c0c20e626139536876d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 09:07:09 +0000 Subject: [PATCH 16/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- spampd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spampd.spec b/spampd.spec index f33d8f8..b9db057 100644 --- a/spampd.spec +++ b/spampd.spec @@ -1,7 +1,7 @@ Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.61 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm Source0: https://github.com/mpaperno/spampd/archive/refs/tags/%{name}-%{version}.tar.gz @@ -90,6 +90,9 @@ pod2html --infile=spampd.pod --outfile=spampd.html %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.61-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 2.61-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 02cc7e1afe08fc2bc9cc11adae9200b2ce453b9f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:45:42 +0000 Subject: [PATCH 17/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- spampd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spampd.spec b/spampd.spec index b9db057..93d7627 100644 --- a/spampd.spec +++ b/spampd.spec @@ -1,7 +1,7 @@ Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.61 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm Source0: https://github.com/mpaperno/spampd/archive/refs/tags/%{name}-%{version}.tar.gz @@ -90,6 +90,9 @@ pod2html --infile=spampd.pod --outfile=spampd.html %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2.61-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 2.61-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 7edd41e17953a51efb21025c6e9385ba2d068bca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 02:12:33 +0000 Subject: [PATCH 18/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- spampd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spampd.spec b/spampd.spec index 93d7627..6b0ec50 100644 --- a/spampd.spec +++ b/spampd.spec @@ -1,7 +1,7 @@ Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.61 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm Source0: https://github.com/mpaperno/spampd/archive/refs/tags/%{name}-%{version}.tar.gz @@ -90,6 +90,9 @@ pod2html --infile=spampd.pod --outfile=spampd.html %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.61-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 2.61-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 6ac358f92bc9072bcf525bda86811127f8c9e130 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 04:03:10 +0000 Subject: [PATCH 19/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- spampd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spampd.spec b/spampd.spec index 6b0ec50..e751680 100644 --- a/spampd.spec +++ b/spampd.spec @@ -1,7 +1,7 @@ Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.61 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm Source0: https://github.com/mpaperno/spampd/archive/refs/tags/%{name}-%{version}.tar.gz @@ -90,6 +90,9 @@ pod2html --infile=spampd.pod --outfile=spampd.html %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.61-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 2.61-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From d1822ec1765deaf9b63afa5a44465942c439eb04 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 20/25] Eliminate use of obsolete %patchN syntax (#2283636) --- spampd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spampd.spec b/spampd.spec index e751680..fb91dde 100644 --- a/spampd.spec +++ b/spampd.spec @@ -37,7 +37,7 @@ indicating it's spam and why. %prep %setup -q -%patch0 -p1 -b .no-pid-file +%patch -P0 -p1 -b .no-pid-file %{__rm} -f spampd.html %{__chmod} -x changelog.txt %{__cp} %{SOURCE2} . From 09700f6a467cf4bc65a187ede1ed5b00cf69e21b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 06:08:10 +0000 Subject: [PATCH 21/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- spampd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spampd.spec b/spampd.spec index fb91dde..bc21d01 100644 --- a/spampd.spec +++ b/spampd.spec @@ -1,7 +1,7 @@ Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.61 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm Source0: https://github.com/mpaperno/spampd/archive/refs/tags/%{name}-%{version}.tar.gz @@ -90,6 +90,9 @@ pod2html --infile=spampd.pod --outfile=spampd.html %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.61-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2.61-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 42dd60210dc98c5401fbebb0fa61739003d43d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:01:56 +0200 Subject: [PATCH 22/25] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- spampd.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/spampd.spec b/spampd.spec index bc21d01..af693b9 100644 --- a/spampd.spec +++ b/spampd.spec @@ -1,8 +1,9 @@ Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.61 -Release: 9%{?dist} -License: GPLv2+ +Release: 10%{?dist} +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm Source0: https://github.com/mpaperno/spampd/archive/refs/tags/%{name}-%{version}.tar.gz Source1: spampd.service @@ -90,6 +91,9 @@ pod2html --infile=spampd.pod --outfile=spampd.html %changelog +* Fri Jul 26 2024 Miroslav Suchý - 2.61-10 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 2.61-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From ba9c107c126322c193f3b660b00f8360ec0f6601 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 11:18:10 +0000 Subject: [PATCH 23/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- spampd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spampd.spec b/spampd.spec index af693b9..fb58c0d 100644 --- a/spampd.spec +++ b/spampd.spec @@ -1,7 +1,7 @@ Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.61 -Release: 10%{?dist} +Release: 11%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm @@ -91,6 +91,9 @@ pod2html --infile=spampd.pod --outfile=spampd.html %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.61-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 2.61-10 - convert license to SPDX From 0afe41379c2ca95fd955f2f3adfbb824332b2bd2 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 24/25] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- spampd.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/spampd.spec b/spampd.spec index fb58c0d..a60a41f 100644 --- a/spampd.spec +++ b/spampd.spec @@ -1,7 +1,7 @@ Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.61 -Release: 11%{?dist} +Release: 12%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm @@ -19,7 +19,6 @@ BuildRequires: systemd-units Requires: perl(Net::Server) -Requires(pre): /usr/sbin/useradd Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -43,6 +42,11 @@ indicating it's spam and why. %{__chmod} -x changelog.txt %{__cp} %{SOURCE2} . +# Create a sysusers.d config file +cat >spampd.sysusers.conf </dev/null || : %post %systemd_post spampd.service @@ -88,9 +91,13 @@ pod2html --infile=spampd.pod --outfile=spampd.html %{_sbindir}/spampd %{_mandir}/man8/spampd.8* %attr(0750,spampd,spampd) /var/spool/spampd +%{_sysusersdir}/spampd.conf %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.61-12 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Sun Jan 19 2025 Fedora Release Engineering - 2.61-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6f6c9ffc3a649289984cbc51cbe9a3bc5a53fa92 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:34:42 +0000 Subject: [PATCH 25/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- spampd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spampd.spec b/spampd.spec index a60a41f..5936b98 100644 --- a/spampd.spec +++ b/spampd.spec @@ -1,7 +1,7 @@ Summary: Transparent SMTP/LMTP proxy filter using spamassassin Name: spampd Version: 2.61 -Release: 12%{?dist} +Release: 13%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm @@ -95,6 +95,9 @@ install -m0644 -D spampd.sysusers.conf %{buildroot}%{_sysusersdir}/spampd.conf %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.61-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.61-12 - Add sysusers.d config file to allow rpm to create users/groups automatically