Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers.

.gitignore

@@ -1 +1,2 @@
 spampd-2.30.tar.gz
+/spampd-2.61.tar.gz

sources

@@ -1 +1 @@
-742c6f2cb75db54e59d044a8ee40445f  spampd-2.30.tar.gz
+SHA512 (spampd-2.61.tar.gz) = e2f84c4b24648d4f4db70174f04b72981faa1c54ffc4bbc433d14c730ef4ad7fd4cd3772a476f25be0bee103e951700d038634d14848f1eb90849d1a6655199b

spampd-2.30-Fix-POD-errors.patch

@@ -1,47 +0,0 @@
-From e6cb97994529af83f48d52e7464f449756ec8c00 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-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ř <ppisar@redhat.com>
----
- 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<http://www.WorldDesign.com/index.cfm/rd/mta/spampd.htm>.
- 
- =head1 Requires
- 
--=over 5
--
- Perl modules:
- 
-+=over 5
-+
- =item B<Mail::SpamAssassin>
- 
- =item B<Net::Server::PreForkSimple>
-@@ -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<spampd> versions:
- 
-+=over 5
-+
- =item  B<--dead-letters>
- 
- =item  B<--heloname>
--- 
-1.8.1.4
-

spampd-2.30-no-pid-file.patch

@@ -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,

spampd-2.30-untaint.patch

@@ -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; }

spampd-2.61-no-pid-file.patch

@@ -0,0 +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-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};
+ }

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

spampd.spec

@@ -1,24 +1,24 @@
 Summary: Transparent SMTP/LMTP proxy filter using spamassassin
 Name: spampd
-Version: 2.30
-Release: 32%{?dist}
-License: GPLv2+
+Version: 2.61
+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
-Source0: http://www.worlddesign.com/Content/rd/mta/spampd/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, <https://github.com/mpaperno/spampd/issues/1>
-Patch0:  spampd-2.30-Fix-POD-errors.patch
-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
 BuildRequires: perl-podlators
 BuildRequires: perl-Pod-Html
 BuildRequires: systemd-units
 
-Requires(pre): /usr/sbin/useradd
+Requires: perl(Net::Server)
+
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -37,23 +37,26 @@ indicating it's spam and why.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0 -b .untaint
-%patch2 -p0 -b .no-pid-file
+%patch -P0 -p1 -b .no-pid-file
 %{__rm} -f spampd.html
 %{__chmod} -x changelog.txt
 %{__cp} %{SOURCE2} .
 
+# Create a sysusers.d config file
+cat >spampd.sysusers.conf <<EOF
+u spampd - - /var/spool/spampd -
+EOF
+
 
 %build
-%{__make} spampd.8
-%{__make} spampd.html
+pod2man spampd.pod spampd.8
+pod2html --infile=spampd.pod --outfile=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 \
@@ -67,11 +70,10 @@ indicating it's spam and why.
 # Home directory
 %{__mkdir_p} %{buildroot}/var/spool/spampd
 
+install -m0644 -D spampd.sysusers.conf %{buildroot}%{_sysusersdir}/spampd.conf
+
 
 
-%pre
-/usr/sbin/useradd -r -M -s /sbin/nologin -d /var/spool/spampd \
-    spampd &>/dev/null || :
 
 %post
 %systemd_post spampd.service
@@ -88,10 +90,63 @@ indicating it's spam and why.
 %{_unitdir}/spampd.service
 %{_sbindir}/spampd
 %{_mandir}/man8/spampd.8*
-%attr(0750,spampd,spampd) /var/spool/spampd/
+%attr(0750,spampd,spampd) /var/spool/spampd
+%{_sysusersdir}/spampd.conf
 
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.61-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.61-12
+- Add sysusers.d config file to allow rpm to create users/groups automatically
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.61-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 2.61-10
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.61-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.61-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.61-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.61-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.61-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.61-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Aug 20 2021 Bojan Smojver <bojan@rexursive.com> - 2.61-3
+- Add --homedir option to service file
+
+* Thu Aug 19 2021 Bojan Smojver <bojan@rexursive.com> - 2.61-2
+- Add perl(Net::Server) dependency
+
+* Thu Aug 12 2021 Bojan Smojver <bojan@rexursive.com> - 2.61-1
+- Update to 2.61
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.30-36
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.30-35
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.30-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.30-33
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.30-32
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

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"