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

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

.cvsignore

@@ -1 +0,0 @@
-postgrey-1.32.tar.gz

.gitignore

@@ -0,0 +1,4 @@
+postgrey-1.32.tar.gz
+/postgrey-1.34.tar.gz
+/postgrey-1.36.tar.gz
+/postgrey-1.37.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: postgrey
-# $Id$
-NAME := postgrey
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

README-rpm

@@ -1,21 +1,34 @@
-To make use of postgrey, edit your configuration files:
+1. To make use of postgrey in postfix, edit postfix configuration file:
 
 /etc/postfix/main.cf:
 
   smtpd_recipient_restrictions = ...
     check_policy_service unix:postgrey/socket, ...
 
-
-Or if you like to use inet sockets (modify the IP if needed):
+Or if TCP sockets (modify IP / port if needed) is preferred, first change
+POSTGREY_TYPE:
 
 /etc/sysconfig/postgrey:
 
-  options="--inet=127.0.0.1:10023"
+  POSTGREY_TYPE="--inet=127.0.0.1:10023"
+
+then modify postfix configuration file:
 
 /etc/postfix/main.cf:
 
   smtpd_recipient_restrictions = ...
     check_policy_service inet:127.0.0.1:10023, ...
 
-And don't forget to activate the service on startup!
+After above steps, please restart the postfix service to make sure postfix has
+loaded the changes. And don't forget to activate the service on startup!
 
+2. If --privacy option is passed to postgrey in /etc/sysconfig/postgrey, make
+sure perl(Digest::SHA) is installed, using dnf to install if not available:
+
+    dnf install perl\(Digest::SHA\)
+
+Don't forget to escape the parentheses if other perl modules are absent.
+
+3. Postgrey could be used with exim if you want, but need to modify the
+systemd service file like removing the dependency of postfix.service. More
+details in README.exim underneath /usr/share/doc/postgrey.

postgrey-1.28-group.patch

@@ -1,21 +0,0 @@
-diff -Naupr postgrey-1.28.orig/postgrey postgrey-1.28/postgrey
---- postgrey-1.28.orig/postgrey	2007-06-21 15:44:54.000000000 +0200
-+++ postgrey-1.28/postgrey	2007-06-22 16:17:31.000000000 +0200
-@@ -486,7 +486,7 @@ sub main()
-             port             => [ $opt{inet} ? $opt{inet} : $opt{unix}."|unix" ],
-             proto            => $opt{inet} ? 'tcp' : 'unix',
-             user             => $opt{user} || 'postgrey',
--            group            => $opt{group} || 'nogroup',
-+            group            => $opt{group} || 'postgrey',
-             dbdir            => $opt{dbdir} || $DEFAULT_DBDIR,
-             setsid           => $opt{daemonize} ? 1 : undef,
-             pid_file         => $opt{daemonize} ? $opt{pidfile} : undef,
-@@ -663,7 +663,7 @@ B<postgrey> [I<options>...]
-  -d, --daemonize         run in the background
-      --pidfile=PATH      put daemon pid into this file
-      --user=USER         run as USER (default: postgrey)
--     --group=GROUP       run as group GROUP (default: nogroup)
-+     --group=GROUP       run as group GROUP (default: postgrey)
-      --dbdir=PATH        put db files in PATH (default: /var/spool/postfix/postgrey)
-      --delay=N           greylist for N seconds (default: 300)
-      --max-age=N         delete entries older than N days since the last time

postgrey.service

@@ -0,0 +1,26 @@
+[Unit]
+Description=Postfix Greylisting Service
+Documentation=man:postgrey(8)
+Before=postfix.service
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/sysconfig/postgrey
+ExecStartPre=-/bin/rm -f /var/run/postgrey.pid
+PIDFile=/var/run/postgrey.pid
+ExecStart=/usr/sbin/postgrey \
+ $POSTGREY_TYPE \
+ $POSTGREY_PID \
+ $POSTGREY_GROUP \
+ $POSTGREY_USER \
+ '--greylist-text=Greylisted for %%s seconds' \
+ --daemonize \
+ $POSTGREY_DELAY \
+ $POSTGREY_OPTS
+
+Restart=always
+RestartSec=1
+TimeoutSec=5
+
+[Install]
+WantedBy=multi-user.target

postgrey.spec

@@ -1,117 +1,294 @@
-%define confdir %{_sysconfdir}/postfix
+%global confdir %{_sysconfdir}/postfix
 
-Summary: Postfix Greylisting Policy Server
-Name: postgrey
-Version: 1.32
-Release: 2%{?dist}
+Name:              postgrey
+Version:           1.37
+Release:           27%{?dist}
+Summary:           Postfix Greylisting Policy Server
 # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any
 # later version"
-License: GPLv2+
-Group: System Environment/Daemons
-URL: http://postgrey.schweikert.ch/
-Source0: http://postgrey.schweikert.ch/pub/postgrey-%{version}.tar.gz
-Source1: postgrey.init
-Source2: README-rpm
-Patch0: postgrey-1.28-group.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-# We require postfix for its directories and gid
-Requires: postfix
-Requires(pre): /usr/sbin/useradd
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/service, /sbin/chkconfig
-Requires(postun): /sbin/service
-BuildArch: noarch
+# Automatically converted from old format: GPLv2+ - review is highly recommended.
+License:           GPL-2.0-or-later
+URL:               http://postgrey.schweikert.ch/
+Source0:           http://postgrey.schweikert.ch/pub/postgrey-%{version}.tar.gz
+Source1:           postgrey.service
+Source2:           README-rpm
+Source3:           postgrey.sysconfig
+BuildArch:         noarch
+BuildRequires:     perl-generators
+BuildRequires:     perl-podlators
+BuildRequires:     systemd
+## Note: If --privacy specified, perl(Digest::SHA) will be needed.
+#Requires:          perl(BerkeleyDB)
+#Requires:          perl(Fcntl)
+#Requires:          perl(Getopt::Long)
+#Requires:          perl(IO::Multiplex)
+#Requires:          perl(Net::DNS)
+#Requires:          perl(Net::Server)
+#Requires:          perl(Pod::Usage)
+#Requires:          perl(POSIX)
+#Requires:          perl(strict)
+#Requires:          perl(Sys::Hostname)
+#Requires:          perl(Sys::Syslog)
+# Requiring postfix for its directories and GID.
+Recommends:        postfix
+Requires(post):    systemd
+Requires(preun):   systemd
+Requires(postun):  systemd
 
 %description
-Postgrey is a Postfix policy server implementing greylisting.  When a request
+Postgrey is a Postfix policy server implementing greylisting. When a request
 for delivery of a mail is received by Postfix via SMTP, the triplet CLIENT_IP /
-SENDER / RECIPIENT is built.  If it is the first time that this triplet is
+SENDER / RECIPIENT is built. If it is the first time that this triplet is
 seen, or if the triplet was first seen less than 5 minutes, then the mail gets
 rejected with a temporary error. Hopefully spammers or viruses will not try
 again later, as it is however required per RFC.
 
-
 %prep
 %setup -q
-%patch0 -p1 -b .group
-%{__install} -p -m 0644 %{SOURCE2} README-rpm
+# Set default group tp postgrey.
+sed -i 's|nogroup|postgrey|g' postgrey
+# No perldoc, man is enough.
+sed -i 's|POD ||g;s|perldoc|man|g' README
+install -pm0644 %{SOURCE2} README.Fedora
 
+# Create a sysusers.d config file
+cat >postgrey.sysusers.conf <<EOF
+u postgrey - 'Postfix Greylisting Service' %{_localstatedir}/spool/postfix/postgrey -
+EOF
 
 %build
-# We only have perl scripts, so just "build" the man page
+# We only have perl scripts, so just "build" the man page.
 pod2man \
     --center="Postgrey Policy Server for Postfix" \
     --section="8" \
+    --release="Postgrey %{version}" \
     postgrey > postgrey.8
 
-
 %install
-%{__rm} -rf %{buildroot}
-
-# Configuration files
-%{__mkdir_p} %{buildroot}%{confdir}
-%{__install} -p -m 0644 postgrey_whitelist_{clients,recipients} \
+# Configuration files.
+mkdir -p %{buildroot}%{confdir}
+install -pm0644 postgrey_whitelist_{clients,recipients} \
     %{buildroot}%{confdir}/
-# Local whitelist file
+# Local whitelist file.
 echo "# Clients that should not be greylisted.  See postgrey(8)." \
     > %{buildroot}%{confdir}/postgrey_whitelist_clients.local
 
-# Main script
-%{__install} -D -p -m 0755 postgrey %{buildroot}%{_sbindir}/postgrey
+# Main script.
+install -pDm0755 postgrey %{buildroot}%{_sbindir}/postgrey
 
-# Spool directory
-%{__mkdir_p} %{buildroot}%{_var}/spool/postfix/postgrey
+# Spool directory.
+mkdir -p %{buildroot}%{_localstatedir}/spool/postfix/postgrey
 
-# Init script
-%{__install} -D -p -m 0755 %{SOURCE1} \
-    %{buildroot}%{_sysconfdir}/rc.d/init.d/postgrey
+# Systemd service.
+install -pDm0644 %{SOURCE1} \
+    %{buildroot}%{_unitdir}/postgrey.service
 
-# Man page
-%{__install} -D -p -m 0644 postgrey.8 \
+# Sysconfig file.
+install -pDm0644 %{SOURCE3} \
+    %{buildroot}%{_sysconfdir}/sysconfig/postgrey
+
+# Manpage.
+install -pDm0644 postgrey.8 \
     %{buildroot}%{_mandir}/man8/postgrey.8
 
-# Optional report script
-%{__install} -D -p -m 0755 contrib/postgreyreport \
+# Optional report script.
+install -pDm0755 contrib/postgreyreport \
     %{buildroot}%{_sbindir}/postgreyreport
 
+install -m0644 -D postgrey.sysusers.conf %{buildroot}%{_sysusersdir}/postgrey.conf
 
-%clean
-%{__rm} -rf %{buildroot}
-
-
-%pre
-/usr/sbin/useradd -d %{_var}/spool/postfix/postgrey -s /sbin/nologin \
-    -M -r postgrey &>/dev/null || :
 
 %post
-/sbin/chkconfig --add postgrey
+%systemd_post postgrey.service
 
 %preun
-if [ $1 -eq 0 ]; then
-    /sbin/service postgrey stop &>/dev/null || :
-    /sbin/chkconfig --del postgrey
-fi
+%systemd_preun postgrey.service
 
 %postun
-if [ $1 -ge 1 ]; then
-    /sbin/service postgrey condrestart &>/dev/null || :
-fi
+%systemd_postun postgrey.service
 
+%triggerun -- postgrey < 1.34-3
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply postgrey
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save postgrey >/dev/null 2>&1 ||:
+
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del postgrey >/dev/null 2>&1 || :
+/bin/systemctl try-restart postgrey.service >/dev/null 2>&1 || :
 
 %files
-%defattr(-,root,root,-)
-%doc Changes COPYING README README-rpm
-%{_sysconfdir}/rc.d/init.d/postgrey
+%doc Changes README README.exim README.Fedora
+%license COPYING
+%{_unitdir}/postgrey.service
+%{_sysconfdir}/sysconfig/postgrey
 %config(noreplace) %{confdir}/postgrey_whitelist_clients
 %config(noreplace) %{confdir}/postgrey_whitelist_recipients
 %config(noreplace) %{confdir}/postgrey_whitelist_clients.local
 %{_sbindir}/postgrey
 %{_sbindir}/postgreyreport
 %{_mandir}/man8/postgrey.8*
-%dir %attr(0751,postgrey,postfix) %{_var}/spool/postfix/postgrey/
-
+%dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/
+%{_sysusersdir}/postgrey.conf
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.37-26
+- Add sysusers.d config file to allow rpm to create users/groups automatically
+
+* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 1.37-24
+- convert license to SPDX
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.37-17
+- Perl 5.36 rebuild
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.37-14
+- Perl 5.34 rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.37-11
+- Perl 5.32 rebuild
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.37-8
+- Perl 5.30 rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jun 28 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.37-5
+- Perl 5.28 rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.37-2
+- Perl 5.26 rebuild
+
+* Sat Mar 11 2017 Nils Philippsen <nils@tiptoe.de> - 1.37-1
+- version 1.37
+- fix syntax error in sysconfig file (#1292066)
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.36-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sun May 15 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.36-4
+- Perl 5.24 rebuild
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.36-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Nov 26 2015 Petr Pisar <ppisar@redhat.com> - 1.36-2
+- Rebuild against fixed "file" tool that broke Perl dependencies (bug #1279401)
+
+* Fri Sep 04 2015 Christopher Meng <rpm@cicku.me> - 1.36-1
+- Update to 1.36 (1.35 skipped)
+- Refine release section of postgrey manpage.
+- Refine configuration instructions.
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.34-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed Jun 03 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.34-16
+- Perl 5.22 rebuild
+
+* Fri Nov 07 2014 Petr Pisar <ppisar@redhat.com> - 1.34-15
+- Build-require perl-podlators for pod2man (bug #1161477)
+
+* Wed Aug 27 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.34-14
+- Perl 5.20 rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.34-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu Feb 06 2014 Christopher Meng <rpm@cicku.me> - 1.34-12
+- Correct the syntax of systemd unit to support option with space-separated content.
+
+* Tue Jan 21 2014 Christopher Meng <rpm@cicku.me> - 1.34-11
+- Let perl magic determine the dependencies.
+- Fix systemd unit typo.
+
+* Tue Jan 14 2014 Christopher Meng <rpm@cicku.me> - 1.34-10
+- Fix typo in the SPEC.
+
+* Sun Jan 12 2014 Christopher Meng <rpm@cicku.me> - 1.34-9
+- Update systemd service unit to be more powerful.
+- SPEC cleanup(BZ#850279).
+- Add missing dependencies(BZ#1039355).
+
+* Wed Jan 01 2014 Nils Philippsen <nils@redhat.com> - 1.34-8
+- make postgrey work with perl 5.18 (#1039551)
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.34-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 1.34-6
+- Perl 5.18 rebuild
+- Build-require systemd-units
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.34-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.34-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Mar 20 2012 Jon Ciesla <limburgher@gmail.com> - 1.34-3
+- Migrate to systemd, BZ 714430.
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.34-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Jun  7 2011 Matthias Saou <http://freshrpms.net/> 1.34-1
+- Update to 1.34.
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.32-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.32-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

postgrey.sysconfig

@@ -0,0 +1,25 @@
+# Postgrey offers 2 listening types, --inet and --unix. As default, Fedora
+# postgrey works under UNIX socket, but, changing to TCP socket on user's own
+# is also available, for instance, let it work at 10023 port of localhost:
+#   --inet=10023
+# To be more detailed, there is another way if you still run it at localhost:
+#   --inet=127.0.0.1:10023
+POSTGREY_TYPE="--unix=/var/spool/postfix/postgrey/socket"
+
+# If postgrey works under UNIX socket way, PID file can be specified to
+# custom location, note that no need to set this if postgrey is working
+# under TCP socket way.
+POSTGREY_PID="--pidfile=/var/run/postgrey.pid"
+
+# Name of group which postgrey belongs, default is postgrey
+POSTGREY_GROUP="--group=postgrey"
+
+# Name of user which postgrey belongs, default is postgrey
+POSTGREY_USER="--user=postgrey"
+
+# DELAY
+POSTGREY_DELAY="--delay=60"
+
+# For more options can be used, please read manpage or execute `postgrey -h`.
+# Custom options.
+POSTGREY_OPTS=""

sources

@@ -1 +1 @@
-524a4e165bf997996f3bccade394712f  postgrey-1.32.tar.gz
+SHA512 (postgrey-1.37.tar.gz) = 369968212ea60539efc0d4a7ae84f7c3ce13f5622e6ee070a0089423ef81ca8f7541ebd20289291d0e6a3aec2ca30dbc9c0d9c0a6f0a686adfadb5d0dd7830ca