From bdea17ae2da84da1daa70f79b2551874b09955af Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 12 Feb 2007 19:16:36 +0000 Subject: [PATCH 01/74] Initial import of postgrey. --- .cvsignore | 1 + README-rpm | 19 +++++ postgrey-1.27-group.patch | 21 ++++++ postgrey.init | 85 +++++++++++++++++++++ postgrey.spec | 155 ++++++++++++++++++++++++++++++++++++++ sources | 1 + 6 files changed, 282 insertions(+) create mode 100644 README-rpm create mode 100644 postgrey-1.27-group.patch create mode 100755 postgrey.init create mode 100644 postgrey.spec diff --git a/.cvsignore b/.cvsignore index e69de29..42fabd5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +postgrey-1.27.tar.gz diff --git a/README-rpm b/README-rpm new file mode 100644 index 0000000..bce1951 --- /dev/null +++ b/README-rpm @@ -0,0 +1,19 @@ +Edit your configuration files: + +/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): + +/etc/sysconfig/postgrey: + + OPTIONS="--inet=127.0.0.1:10023" + +/etc/postfix/main.cf: + + smtpd_recipient_restrictions = ... + check_policy_service inet:127.0.0.1:10023, ... + diff --git a/postgrey-1.27-group.patch b/postgrey-1.27-group.patch new file mode 100644 index 0000000..70d2d2c --- /dev/null +++ b/postgrey-1.27-group.patch @@ -0,0 +1,21 @@ +diff -Naupr postgrey-1.27.orig/postgrey postgrey-1.27/postgrey +--- postgrey-1.27.orig/postgrey 2006-07-17 14:53:30.000000000 +0200 ++++ postgrey-1.27/postgrey 2006-11-06 13:34:04.000000000 +0100 +@@ -441,7 +441,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} || '/var/spool/postfix/postgrey', + setsid => $opt{daemonize} ? 1 : undef, + pid_file => $opt{daemonize} ? $opt{pidfile} : undef, +@@ -623,7 +623,7 @@ B [I...] + -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 diff --git a/postgrey.init b/postgrey.init new file mode 100755 index 0000000..c485df3 --- /dev/null +++ b/postgrey.init @@ -0,0 +1,85 @@ +#!/bin/sh +# +# chkconfig: - 79 31 +# description: Postfix Greylisting Policy Server +# +# processname: postgrey +# + +# Source function library. +. /etc/rc.d/init.d/functions + +# Source networking configuration. +. /etc/sysconfig/network + +# Check that networking is up. +[ ${NETWORKING} = "no" ] && exit 0 + +prog=postgrey +postgrey=/usr/sbin/$prog +DBPATH=/var/spool/postfix/postgrey +SOCKET=$DBPATH/socket +OPTIONS="--unix=$SOCKET" + +# Source an auxiliary options file if we have one, and pick up OPTIONS, +if [ -r /etc/sysconfig/$prog ]; then + . /etc/sysconfig/$prog +fi + +[ -x $postgrey -a -d $DBPATH ] || exit 0 + +RETVAL=0 + +start() { + echo -n $"Starting $prog: " + daemon $postgrey -d $OPTIONS + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog +} +stop() { + echo -n $"Stopping $prog: " + killproc $postgrey + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog +} + +restart() { + stop + start +} + +reload() { + echo -n $"Reloading $prog: " + killproc $postgrey -HUP + RETVAL=$? + echo +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + restart + ;; + reload) + reload + ;; + condrestart) + [ -f /var/lock/subsys/$prog ] && restart + ;; + status) + status $postgrey + ;; + *) + echo $"Usage: $0 {start|stop|restart|condrestart|reload|status}" + exit 1 +esac + +exit $RETVAL diff --git a/postgrey.spec b/postgrey.spec new file mode 100644 index 0000000..baed395 --- /dev/null +++ b/postgrey.spec @@ -0,0 +1,155 @@ +%define confdir %{_sysconfdir}/postfix + +Summary: Postfix Greylisting Policy Server +Name: postgrey +Version: 1.27 +Release: 4%{?dist} +License: GPL +Group: System Environment/Daemons +Source0: http://isg.ee.ethz.ch/tools/postgrey/pub/postgrey-%{version}.tar.gz +Source1: postgrey.init +Source2: README-rpm +Patch0: postgrey-1.27-group.patch +URL: http://isg.ee.ethz.ch/tools/postgrey/ +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 + +%description +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 +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 + + +%build +# We only have perl scripts, so just "build" the man page +pod2man \ + --center="Postgrey Policy Server for Postfix" \ + --section="8" \ + postgrey > postgrey.8 + + +%install +%{__rm} -rf %{buildroot} + +# Configuration files +%{__mkdir_p} %{buildroot}%{confdir} +%{__install} -p -m 0644 postgrey_whitelist_{clients,recipients} \ + %{buildroot}%{confdir}/ +# 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 + +# Spool directory +%{__mkdir_p} %{buildroot}%{_var}/spool/postfix/postgrey + +# Init script +%{__install} -D -p -m 0755 %{SOURCE1} \ + %{buildroot}%{_sysconfdir}/rc.d/init.d/postgrey + +# Man page +%{__install} -D -p -m 0644 postgrey.8 \ + %{buildroot}%{_mandir}/man8/postgrey.8 + +# Optional report script +%{__install} -D -p -m 0755 contrib/postgreyreport \ + %{buildroot}%{_sbindir}/postgreyreport + + +%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 + +%preun +if [ $1 -eq 0 ]; then + /sbin/service postgrey stop &>/dev/null || : + /sbin/chkconfig --del postgrey +fi + +%postun +if [ $1 -ge 1 ]; then + /sbin/service postgrey condrestart &>/dev/null || : +fi + + +%files +%defattr(-, root, root, 0755) +%doc Changes COPYING README README-rpm +%{_sysconfdir}/rc.d/init.d/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/ + + +%changelog +* Mon Feb 12 2007 Matthias Saou 1.27-4 +- Silence %%setup. +- Fix init script mode in the srpm. +- Remove explicit perl(IO::Multiplex) requirement, not needed on FC6 (but + probably still on RHEL4). +- Add a comment line to the empty local whitelist file. + +* Mon Dec 4 2006 Matthias Saou 1.27-3 +- Add man page generation (Mike Wohlgemuth). + +* Fri Dec 1 2006 Matthias Saou 1.27-2 +- Include postgreyreport script. + +* Mon Nov 6 2006 Matthias Saou 1.27-1 +- Spec file cleanup. + +* Wed Jan 18 2006 Levente Farkas 1.24 +- some minor changes thanks to Peter Bieringer + +* Mon Jan 16 2006 Levente Farkas 1.24 +- upgrade to 1.24 + +* Sun Nov 13 2005 Levente Farkas 1.22 +- upgrade to 1.22 + +* Mon Aug 22 2005 Levente Farkas 1.21 +- spec file update from Luigi Iotti + +* Thu Apr 28 2005 Levente Farkas 1.21 +- update to 1.21 + +* Tue Mar 8 2005 Levente Farkas 1.18 +- update to 1.18 + +* Tue Dec 14 2004 Levente Farkas 1.17 +- update to 1.17 + +* Wed Jul 14 2004 Levente Farkas 1.14 +- guard the pre and post scripts + +* Wed Jul 7 2004 Levente Farkas 1.13 +- initial release 1.13 + diff --git a/sources b/sources index e69de29..afb845d 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +df3a8b4a0c6ab7e8e5bb5be0de096c47 postgrey-1.27.tar.gz From 8757676f4b59e6daa4bb74809916c1159071231f Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Fri, 22 Jun 2007 14:19:12 +0000 Subject: [PATCH 02/74] Update to 1.28. --- .cvsignore | 2 +- ...27-group.patch => postgrey-1.28-group.patch | 12 ++++++------ postgrey.spec | 18 +++++++++++------- sources | 2 +- 4 files changed, 19 insertions(+), 15 deletions(-) rename postgrey-1.27-group.patch => postgrey-1.28-group.patch (73%) diff --git a/.cvsignore b/.cvsignore index 42fabd5..3f1d712 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -postgrey-1.27.tar.gz +postgrey-1.28.tar.gz diff --git a/postgrey-1.27-group.patch b/postgrey-1.28-group.patch similarity index 73% rename from postgrey-1.27-group.patch rename to postgrey-1.28-group.patch index 70d2d2c..d97947f 100644 --- a/postgrey-1.27-group.patch +++ b/postgrey-1.28-group.patch @@ -1,16 +1,16 @@ -diff -Naupr postgrey-1.27.orig/postgrey postgrey-1.27/postgrey ---- postgrey-1.27.orig/postgrey 2006-07-17 14:53:30.000000000 +0200 -+++ postgrey-1.27/postgrey 2006-11-06 13:34:04.000000000 +0100 -@@ -441,7 +441,7 @@ sub main() +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} || '/var/spool/postfix/postgrey', + dbdir => $opt{dbdir} || $DEFAULT_DBDIR, setsid => $opt{daemonize} ? 1 : undef, pid_file => $opt{daemonize} ? $opt{pidfile} : undef, -@@ -623,7 +623,7 @@ B [I...] +@@ -663,7 +663,7 @@ B [I...] -d, --daemonize run in the background --pidfile=PATH put daemon pid into this file --user=USER run as USER (default: postgrey) diff --git a/postgrey.spec b/postgrey.spec index baed395..44f48fe 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,15 +2,15 @@ Summary: Postfix Greylisting Policy Server Name: postgrey -Version: 1.27 -Release: 4%{?dist} +Version: 1.28 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons -Source0: http://isg.ee.ethz.ch/tools/postgrey/pub/postgrey-%{version}.tar.gz +URL: http://postgrey.schweikert.ch/ +Source0: http://postgrey.schweikert.ch/pub/postgrey-%{version}.tar.gz Source1: postgrey.init Source2: README-rpm -Patch0: postgrey-1.27-group.patch -URL: http://isg.ee.ethz.ch/tools/postgrey/ +Patch0: postgrey-1.28-group.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # We require postfix for its directories and gid Requires: postfix @@ -97,7 +97,7 @@ fi %files -%defattr(-, root, root, 0755) +%defattr(-,root,root,-) %doc Changes COPYING README README-rpm %{_sysconfdir}/rc.d/init.d/postgrey %config(noreplace) %{confdir}/postgrey_whitelist_clients @@ -106,10 +106,14 @@ fi %{_sbindir}/postgrey %{_sbindir}/postgreyreport %{_mandir}/man8/postgrey.8* -%dir %attr(0751, postgrey, postfix) %{_var}/spool/postfix/postgrey/ +%dir %attr(0751,postgrey,postfix) %{_var}/spool/postfix/postgrey/ %changelog +* Fri Jun 22 2007 Matthias Saou 1.28-1 +- Update to 1.28. +- Update URL to the new homepage. + * Mon Feb 12 2007 Matthias Saou 1.27-4 - Silence %%setup. - Fix init script mode in the srpm. diff --git a/sources b/sources index afb845d..a261f97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df3a8b4a0c6ab7e8e5bb5be0de096c47 postgrey-1.27.tar.gz +5d9d8a5c62f32fe7584aba2863774926 postgrey-1.28.tar.gz From 5fc9e95fe987c2e5eb38483a2642966993404e50 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 6 Aug 2007 09:45:53 +0000 Subject: [PATCH 03/74] Update to 1.30 and update License field. --- .cvsignore | 2 +- postgrey.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3f1d712..f0b383a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -postgrey-1.28.tar.gz +postgrey-1.30.tar.gz diff --git a/postgrey.spec b/postgrey.spec index 44f48fe..16816b5 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,9 +2,11 @@ Summary: Postfix Greylisting Policy Server Name: postgrey -Version: 1.28 +Version: 1.30 Release: 1%{?dist} -License: GPL +# 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 @@ -110,6 +112,10 @@ fi %changelog +* Mon Aug 6 2007 Matthias Saou 1.30-1 +- Update to 1.30. +- Update License field. + * Fri Jun 22 2007 Matthias Saou 1.28-1 - Update to 1.28. - Update URL to the new homepage. diff --git a/sources b/sources index a261f97..395bd90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d9d8a5c62f32fe7584aba2863774926 postgrey-1.28.tar.gz +5698c196a5874eb963a374d8aab183ca postgrey-1.30.tar.gz From b7851513945f7ac3cd8da9fb6d9d617a86982392 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Thu, 22 May 2008 14:20:48 +0000 Subject: [PATCH 04/74] Update to 1.31. --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index f0b383a..cab13a4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -postgrey-1.30.tar.gz +postgrey-1.31.tar.gz diff --git a/sources b/sources index 395bd90..ee4f7c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5698c196a5874eb963a374d8aab183ca postgrey-1.30.tar.gz +b7a8a6fc9f1ad802c5a516a3be34bb29 postgrey-1.31.tar.gz From 28d1c5ea7262dd494fc45d1e854f48331c337577 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Thu, 22 May 2008 14:24:52 +0000 Subject: [PATCH 05/74] Commit missing spec file changes. --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 16816b5..5d6c5af 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Summary: Postfix Greylisting Policy Server Name: postgrey -Version: 1.30 +Version: 1.31 Release: 1%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -112,6 +112,9 @@ fi %changelog +* Thu May 22 2008 Matthias Saou 1.31-1 +- Update to 1.31. + * Mon Aug 6 2007 Matthias Saou 1.30-1 - Update to 1.30. - Update License field. From be27b50af4432788ed0b7850d32236cb0bc60d49 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 27 Feb 2009 01:55:48 +0000 Subject: [PATCH 06/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 5d6c5af..e1818e5 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -3,7 +3,7 @@ Summary: Postfix Greylisting Policy Server Name: postgrey Version: 1.31 -Release: 1%{?dist} +Release: 2%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" License: GPLv2+ @@ -112,6 +112,9 @@ fi %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 1.31-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu May 22 2008 Matthias Saou 1.31-1 - Update to 1.31. From 418b70b6d0f2fa1c2baaad5785912e7de417149b Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Sun, 12 Apr 2009 15:18:17 +0000 Subject: [PATCH 07/74] - Update to 1.32. - Update init script to the new style. - Slightly update README-rpm instructions. --- .cvsignore | 2 +- README-rpm | 6 ++- postgrey.init | 124 +++++++++++++++++++++++++++++++------------------- postgrey.spec | 11 +++-- sources | 2 +- 5 files changed, 90 insertions(+), 55 deletions(-) diff --git a/.cvsignore b/.cvsignore index cab13a4..86aad99 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -postgrey-1.31.tar.gz +postgrey-1.32.tar.gz diff --git a/README-rpm b/README-rpm index bce1951..a06f52c 100644 --- a/README-rpm +++ b/README-rpm @@ -1,4 +1,4 @@ -Edit your configuration files: +To make use of postgrey, edit your configuration files: /etc/postfix/main.cf: @@ -10,10 +10,12 @@ Or if you like to use inet sockets (modify the IP if needed): /etc/sysconfig/postgrey: - OPTIONS="--inet=127.0.0.1:10023" + options="--inet=127.0.0.1:10023" /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! + diff --git a/postgrey.init b/postgrey.init index c485df3..17f9f19 100755 --- a/postgrey.init +++ b/postgrey.init @@ -1,48 +1,56 @@ #!/bin/sh # -# chkconfig: - 79 31 +# postgrey Postfix Greylisting Policy Server +# +# chkconfig: - 79 31 # description: Postfix Greylisting Policy Server -# -# processname: postgrey -# + +### BEGIN INIT INFO +# Provides: postgrey +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Should-Start: +# Should-Stop: +# Default-Start: +# Default-Stop: 0 1 2 3 4 5 6 +# Short-Description: Postfix Greylisting Policy Server +# Description: 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 seen, or if the triplet was first +# seen less than 5 minutes, then the mail gets rejected +# with a temporary error. +### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions -# Source networking configuration. -. /etc/sysconfig/network +exec="/usr/sbin/postgrey" +prog="postgrey" +options="--unix=/var/spool/postfix/postgrey/socket" -# Check that networking is up. -[ ${NETWORKING} = "no" ] && exit 0 +[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog -prog=postgrey -postgrey=/usr/sbin/$prog -DBPATH=/var/spool/postfix/postgrey -SOCKET=$DBPATH/socket -OPTIONS="--unix=$SOCKET" - -# Source an auxiliary options file if we have one, and pick up OPTIONS, -if [ -r /etc/sysconfig/$prog ]; then - . /etc/sysconfig/$prog -fi - -[ -x $postgrey -a -d $DBPATH ] || exit 0 - -RETVAL=0 +lockfile=/var/lock/subsys/$prog start() { + [ -x $exec ] || exit 5 echo -n $"Starting $prog: " - daemon $postgrey -d $OPTIONS - RETVAL=$? + daemon $exec -d $options + retval=$? echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog + [ $retval -eq 0 ] && touch $lockfile + return $retval } + stop() { echo -n $"Stopping $prog: " - killproc $postgrey - RETVAL=$? + killproc $prog + retval=$? echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog + [ $retval -eq 0 ] && rm -f $lockfile + return $retval } restart() { @@ -52,34 +60,54 @@ restart() { reload() { echo -n $"Reloading $prog: " - killproc $postgrey -HUP - RETVAL=$? + killproc $prog -HUP + retval=$? echo + return $retval } - -# See how we were called. + +force_reload() { + restart +} + +rh_status() { + status $prog +} + +rh_status_q() { + rh_status &>/dev/null +} + + case "$1" in start) - start - ;; + rh_status_q && exit 0 + $1 + ;; stop) - stop - ;; + rh_status_q || exit 0 + $1 + ;; restart) - restart - ;; + $1 + ;; reload) - reload - ;; - condrestart) - [ -f /var/lock/subsys/$prog ] && restart - ;; + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; status) - status $postgrey - ;; + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; *) - echo $"Usage: $0 {start|stop|restart|condrestart|reload|status}" - exit 1 + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 2 esac +exit $? -exit $RETVAL diff --git a/postgrey.spec b/postgrey.spec index e1818e5..7943db7 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,8 +2,8 @@ Summary: Postfix Greylisting Policy Server Name: postgrey -Version: 1.31 -Release: 2%{?dist} +Version: 1.32 +Release: 1%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" License: GPLv2+ @@ -112,7 +112,12 @@ fi %changelog -* Thu Feb 26 2009 Fedora Release Engineering - 1.31-2 +* Sun Apr 12 2009 Matthias Saou 1.32-1 +- Update to 1.32. +- Update init script to the new style. +- Slightly update README-rpm instructions. + +* Thu Feb 26 2009 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Thu May 22 2008 Matthias Saou 1.31-1 diff --git a/sources b/sources index ee4f7c8..03fa10b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b7a8a6fc9f1ad802c5a516a3be34bb29 postgrey-1.31.tar.gz +524a4e165bf997996f3bccade394712f postgrey-1.32.tar.gz From 8fce753a72186ace4f7c497bc0eab136de59d646 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 26 Jul 2009 19:18:01 +0000 Subject: [PATCH 08/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 7943db7..9374ee3 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -3,7 +3,7 @@ Summary: Postfix Greylisting Policy Server Name: postgrey Version: 1.32 -Release: 1%{?dist} +Release: 2%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" License: GPLv2+ @@ -112,6 +112,9 @@ fi %changelog +* Sun Jul 26 2009 Fedora Release Engineering - 1.32-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Sun Apr 12 2009 Matthias Saou 1.32-1 - Update to 1.32. - Update init script to the new style. From a1fd55d509711f58ea233f2150223bbe9643b1c1 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:31:45 +0000 Subject: [PATCH 09/74] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 79bca95..87241fd 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 0e4252ebe7bcb0c06b2570e78caea46f43245b8c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 09:40:57 +0000 Subject: [PATCH 10/74] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 87241fd..0000000 --- a/Makefile +++ /dev/null @@ -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 $$d/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) From 998bf374986498d357d47d9731fdcbb4fb21d118 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 10:17:40 -0600 Subject: [PATCH 11/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 9374ee3..bc0476c 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -3,7 +3,7 @@ Summary: Postfix Greylisting Policy Server Name: postgrey Version: 1.32 -Release: 2%{?dist} +Release: 3%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" License: GPLv2+ @@ -112,6 +112,9 @@ fi %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 1.32-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sun Jul 26 2009 Fedora Release Engineering - 1.32-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From ba10f117e61b49feceec868e038af78a809d397d Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Wed, 8 Jun 2011 10:27:33 +0200 Subject: [PATCH 12/74] Update to 1.34. --- .gitignore | 1 + postgrey.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 86aad99..ec15fa9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ postgrey-1.32.tar.gz +/postgrey-1.34.tar.gz diff --git a/postgrey.spec b/postgrey.spec index bc0476c..fc468a1 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,8 +2,8 @@ Summary: Postfix Greylisting Policy Server Name: postgrey -Version: 1.32 -Release: 3%{?dist} +Version: 1.34 +Release: 1%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" License: GPLv2+ @@ -112,6 +112,9 @@ fi %changelog +* Tue Jun 7 2011 Matthias Saou 1.34-1 +- Update to 1.34. + * Wed Feb 09 2011 Fedora Release Engineering - 1.32-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 03fa10b..257cc49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -524a4e165bf997996f3bccade394712f postgrey-1.32.tar.gz +f736a7be1094593f1a66cd13f32b39ef postgrey-1.34.tar.gz From 5eda692a0ec6be7b3755f51f4a7b85a11961c34a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 19:10:21 -0600 Subject: [PATCH 13/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index fc468a1..f20f61f 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -3,7 +3,7 @@ Summary: Postfix Greylisting Policy Server Name: postgrey Version: 1.34 -Release: 1%{?dist} +Release: 2%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" License: GPLv2+ @@ -112,6 +112,9 @@ fi %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.34-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Jun 7 2011 Matthias Saou 1.34-1 - Update to 1.34. From 497f8ed26b3cfb05a49897a622d98a6889193b24 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 20 Mar 2012 08:33:46 -0500 Subject: [PATCH 14/74] Migrate to systemd. --- postgrey.service | 23 +++++++++++++++++ postgrey.spec | 63 +++++++++++++++++++++++++++++++++++----------- postgrey.sysconfig | 1 + 3 files changed, 73 insertions(+), 14 deletions(-) create mode 100644 postgrey.service create mode 100644 postgrey.sysconfig diff --git a/postgrey.service b/postgrey.service new file mode 100644 index 0000000..4cb5ede --- /dev/null +++ b/postgrey.service @@ -0,0 +1,23 @@ +[Unit] +Description=Postfix Greylisting Service +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 \ + --unix=/var/spool/postfix/postgrey/socket \ + --pidfile=/var/run/postgrey.pid \ + --daemonize \ + $POSTGREY_OPTS + +Restart=always +RestartSec=1 + +[Install] +WantedBy=multi-user.target diff --git a/postgrey.spec b/postgrey.spec index f20f61f..433c217 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -3,23 +3,27 @@ Summary: Postfix Greylisting Policy Server Name: postgrey Version: 1.34 -Release: 2%{?dist} +Release: 3%{?dist} # 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 +Source1: postgrey.service Source2: README-rpm +Source3: postgrey.sysconfig 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 +#Requires(post): /sbin/chkconfig +#Requires(preun): /sbin/service, /sbin/chkconfig +#Requires(postun): /sbin/service +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units BuildArch: noarch %description @@ -63,8 +67,12 @@ echo "# Clients that should not be greylisted. See postgrey(8)." \ %{__mkdir_p} %{buildroot}%{_var}/spool/postfix/postgrey # Init script -%{__install} -D -p -m 0755 %{SOURCE1} \ - %{buildroot}%{_sysconfdir}/rc.d/init.d/postgrey +%{__install} -D -p -m 0644 %{SOURCE1} \ + %{buildroot}%{_unitdir}/postgrey.service + +# Sysconfig +%{__install} -D -p -m 0644 %{SOURCE3} \ + %{buildroot}%{_sysconfdir}/sysconfig/postgrey # Man page %{__install} -D -p -m 0644 postgrey.8 \ @@ -84,24 +92,48 @@ echo "# Clients that should not be greylisted. See postgrey(8)." \ -M -r postgrey &>/dev/null || : %post -/sbin/chkconfig --add postgrey +#/sbin/chkconfig --add postgrey +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi %preun -if [ $1 -eq 0 ]; then - /sbin/service postgrey stop &>/dev/null || : - /sbin/chkconfig --del postgrey +#if [ $1 -eq 0 ]; then +# /sbin/service postgrey stop &>/dev/null || : +# /sbin/chkconfig --del postgrey +#fi +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable postgrey.service > /dev/null 2>&1 || : + /bin/systemctl stop postgrey.service > /dev/null 2>&1 || : fi %postun -if [ $1 -ge 1 ]; then - /sbin/service postgrey condrestart &>/dev/null || : +#if [ $1 -ge 1 ]; then +# /sbin/service postgrey condrestart &>/dev/null || : +#fi +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart postgrey.service >/dev/null 2>&1 || : fi +%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 +%{_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 @@ -112,6 +144,9 @@ fi %changelog +* Tue Mar 20 2012 Jon Ciesla - 1.34-3 +- Migrate to systemd, BZ 714430. + * Sat Jan 14 2012 Fedora Release Engineering - 1.34-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/postgrey.sysconfig b/postgrey.sysconfig new file mode 100644 index 0000000..f735afd --- /dev/null +++ b/postgrey.sysconfig @@ -0,0 +1 @@ +POSTGREY_OPTS="--delay=60" From 0c374a126fed8d3b4b90a6432652180e7d852740 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 20 Jul 2012 21:50:36 -0500 Subject: [PATCH 15/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 433c217..c22dd91 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -3,7 +3,7 @@ Summary: Postfix Greylisting Policy Server Name: postgrey Version: 1.34 -Release: 3%{?dist} +Release: 4%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" License: GPLv2+ @@ -144,6 +144,9 @@ fi %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 1.34-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Mar 20 2012 Jon Ciesla - 1.34-3 - Migrate to systemd, BZ 714430. From 2ccdaf2eba466661deab70a0682baff2159ec1ea Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 12:15:18 -0600 Subject: [PATCH 16/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index c22dd91..bb045a3 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -3,7 +3,7 @@ Summary: Postfix Greylisting Policy Server Name: postgrey Version: 1.34 -Release: 4%{?dist} +Release: 5%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" License: GPLv2+ @@ -144,6 +144,9 @@ fi %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.34-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Jul 21 2012 Fedora Release Engineering - 1.34-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 23dccba29568161337f1165a555a1d70233192fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 17 Jul 2013 13:15:20 +0200 Subject: [PATCH 17/74] Perl 5.18 rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index bb045a3..5063f01 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -3,7 +3,7 @@ Summary: Postfix Greylisting Policy Server Name: postgrey Version: 1.34 -Release: 5%{?dist} +Release: 6%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" License: GPLv2+ @@ -144,6 +144,9 @@ fi %changelog +* Wed Jul 17 2013 Petr Pisar - 1.34-6 +- Perl 5.18 rebuild + * Thu Feb 14 2013 Fedora Release Engineering - 1.34-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 6fdee003a9390a4c66fe957b2c33dede8ef7f126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Sat, 20 Jul 2013 13:55:38 +0200 Subject: [PATCH 18/74] Build-require systemd-units --- postgrey.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/postgrey.spec b/postgrey.spec index 5063f01..42ffd16 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -15,6 +15,7 @@ Source2: README-rpm Source3: postgrey.sysconfig Patch0: postgrey-1.28-group.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: systemd-units # We require postfix for its directories and gid Requires: postfix Requires(pre): /usr/sbin/useradd @@ -146,6 +147,7 @@ fi %changelog * Wed Jul 17 2013 Petr Pisar - 1.34-6 - Perl 5.18 rebuild +- Build-require systemd-units * Thu Feb 14 2013 Fedora Release Engineering - 1.34-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 48ced5b0c928a7c042e820ae821ec6a351ddf2ac Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 00:01:23 -0500 Subject: [PATCH 19/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 42ffd16..532052c 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -3,7 +3,7 @@ Summary: Postfix Greylisting Policy Server Name: postgrey Version: 1.34 -Release: 6%{?dist} +Release: 7%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" License: GPLv2+ @@ -145,6 +145,9 @@ fi %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.34-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jul 17 2013 Petr Pisar - 1.34-6 - Perl 5.18 rebuild - Build-require systemd-units From 988dc768b057e60554b69f677b3a92021001016e Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Wed, 1 Jan 2014 02:55:31 +0100 Subject: [PATCH 20/74] make postgrey work with perl 5.18 (#1039551) --- postgrey-1.34-perl-5.18.patch | 33 +++++++++++++++++++++++++++++++++ postgrey.spec | 7 ++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 postgrey-1.34-perl-5.18.patch diff --git a/postgrey-1.34-perl-5.18.patch b/postgrey-1.34-perl-5.18.patch new file mode 100644 index 0000000..13ec89c --- /dev/null +++ b/postgrey-1.34-perl-5.18.patch @@ -0,0 +1,33 @@ +From 9673b54064691a5b9c295ffea340d8a1f9ee1cb8 Mon Sep 17 00:00:00 2001 +From: Yasuhiro KIMURA +Date: Sat, 17 Aug 2013 22:05:27 +0900 +Subject: [PATCH] Make postgrey work with Perl 5.18 + +--- + postgrey | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/postgrey b/postgrey +index 7cb0352..37f69bd 100755 +--- a/postgrey ++++ b/postgrey +@@ -557,6 +557,16 @@ sub main() + if($opt{dbdir}) { + $opt{dbdir} =~ /^(.*)$/; $opt{dbdir} = $1; + } ++ # untaint what is given on --pidfile. It is not security sensitive since ++ # it is provided by the admin ++ if($opt{pidfile}) { ++ $opt{pidfile} =~ /^(.*)$/; $opt{pidfile} = $1; ++ } ++ # untaint what is given on --inet. It is not security sensitive since ++ # it is provided by the admin ++ if($opt{inet}) { ++ $opt{inet} =~ /^(.*)$/; $opt{inet} = $1; ++ } + + # determine proper "logsock" for Sys::Syslog + my $syslog_logsock; +-- +1.8.4.2 + diff --git a/postgrey.spec b/postgrey.spec index 532052c..c4d99b2 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -3,7 +3,7 @@ Summary: Postfix Greylisting Policy Server Name: postgrey Version: 1.34 -Release: 7%{?dist} +Release: 8%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" License: GPLv2+ @@ -14,6 +14,7 @@ Source1: postgrey.service Source2: README-rpm Source3: postgrey.sysconfig Patch0: postgrey-1.28-group.patch +Patch1: postgrey-1.34-perl-5.18.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: systemd-units # We require postfix for its directories and gid @@ -39,6 +40,7 @@ again later, as it is however required per RFC. %prep %setup -q %patch0 -p1 -b .group +%patch1 -p1 -b .perl-5.18 %{__install} -p -m 0644 %{SOURCE2} README-rpm @@ -145,6 +147,9 @@ fi %changelog +* Wed Jan 01 2014 Nils Philippsen - 1.34-8 +- make postgrey work with perl 5.18 (#1039551) + * Sun Aug 04 2013 Fedora Release Engineering - 1.34-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 485605b72c8f3a1ba2eb0cf6efe80c95f52fdcb9 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Sun, 12 Jan 2014 23:28:17 +0800 Subject: [PATCH 21/74] SPEC cleanup; Add tmpfiles control. Try build #1 --- postgrey-tmpfiles.conf | 1 + postgrey.spec | 110 +++++++++++++++-------------------------- 2 files changed, 42 insertions(+), 69 deletions(-) create mode 100644 postgrey-tmpfiles.conf diff --git a/postgrey-tmpfiles.conf b/postgrey-tmpfiles.conf new file mode 100644 index 0000000..19c61d1 --- /dev/null +++ b/postgrey-tmpfiles.conf @@ -0,0 +1 @@ +d /var/run/postgrey 0755 postgrey postgrey - diff --git a/postgrey.spec b/postgrey.spec index c4d99b2..2f3ebf9 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -1,32 +1,29 @@ -%define confdir %{_sysconfdir}/postfix +%global confdir %{_sysconfdir}/postfix -Summary: Postfix Greylisting Policy Server -Name: postgrey -Version: 1.34 -Release: 8%{?dist} +Name: postgrey +Version: 1.34 +Release: 8%{?dist} # 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.service -Source2: README-rpm -Source3: postgrey.sysconfig -Patch0: postgrey-1.28-group.patch -Patch1: postgrey-1.34-perl-5.18.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: systemd-units +Summary: Postfix Greylisting Policy Server +License: GPLv2+ +URL: http://postgrey.schweikert.ch/ +Source0: http://postgrey.schweikert.ch/pub/postgrey-%{version}.tar.gz +Source1: postgrey.service +Source2: README-rpm +Source3: postgrey.sysconfig +Source4: postgrey-tmpfiles.conf +Patch0: postgrey-1.28-group.patch +Patch1: postgrey-1.34-perl-5.18.patch +BuildArch: noarch +BuildRequires: systemd # 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 -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -BuildArch: noarch +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +Requires: postfix +Requires(pre): shadow-utils +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd %description Postgrey is a Postfix policy server implementing greylisting. When a request @@ -36,13 +33,11 @@ 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 %patch1 -p1 -b .perl-5.18 -%{__install} -p -m 0644 %{SOURCE2} README-rpm - +install -pm0644 %{SOURCE2} README-rpm %build # We only have perl scripts, so just "build" the man page @@ -51,76 +46,53 @@ pod2man \ --section="8" \ postgrey > postgrey.8 - %install -%{__rm} -rf %{buildroot} - # Configuration files -%{__mkdir_p} %{buildroot}%{confdir} -%{__install} -p -m 0644 postgrey_whitelist_{clients,recipients} \ +mkdir -p %{buildroot}%{confdir} +istall -pm0644 postgrey_whitelist_{clients,recipients} \ %{buildroot}%{confdir}/ # 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 +install -pDm0755 postgrey %{buildroot}%{_sbindir}/postgrey # Spool directory -%{__mkdir_p} %{buildroot}%{_var}/spool/postfix/postgrey +mkdir -p %{buildroot}%{_localstatedir}/spool/postfix/postgrey # Init script -%{__install} -D -p -m 0644 %{SOURCE1} \ +install -pDm0644 %{SOURCE1} \ %{buildroot}%{_unitdir}/postgrey.service # Sysconfig -%{__install} -D -p -m 0644 %{SOURCE3} \ +install -pDm0644 %{SOURCE3} \ %{buildroot}%{_sysconfdir}/sysconfig/postgrey # Man page -%{__install} -D -p -m 0644 postgrey.8 \ +install -pDm0644 postgrey.8 \ %{buildroot}%{_mandir}/man8/postgrey.8 # Optional report script -%{__install} -D -p -m 0755 contrib/postgreyreport \ +install -pDm0755 contrib/postgreyreport \ %{buildroot}%{_sbindir}/postgreyreport - -%clean -%{__rm} -rf %{buildroot} - +# Tmpfiles.d +mkdir -p %{buildroot}%{_tmpfilesdir} +install -m0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/%{name}.conf %pre -/usr/sbin/useradd -d %{_var}/spool/postfix/postgrey -s /sbin/nologin \ +/usr/sbin/useradd -d %{_localstatedir}/spool/postfix/postgrey -s /sbin/nologin \ -M -r postgrey &>/dev/null || : %post -#/sbin/chkconfig --add postgrey -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +%systemd_post postgrey.service %preun -#if [ $1 -eq 0 ]; then -# /sbin/service postgrey stop &>/dev/null || : -# /sbin/chkconfig --del postgrey -#fi -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable postgrey.service > /dev/null 2>&1 || : - /bin/systemctl stop postgrey.service > /dev/null 2>&1 || : -fi +%systemd_preun postgrey.service %postun -#if [ $1 -ge 1 ]; then -# /sbin/service postgrey condrestart &>/dev/null || : -#fi -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart postgrey.service >/dev/null 2>&1 || : -fi +%systemd_postun postgrey.service %triggerun -- postgrey < 1.34-3 # Save the current service runlevel info @@ -133,9 +105,10 @@ fi /bin/systemctl try-restart postgrey.service >/dev/null 2>&1 || : %files -%defattr(-,root,root,-) %doc Changes COPYING README README-rpm %{_unitdir}/postgrey.service +%{_tmpfilesdir}/postgrey.conf +%{_localstatedir}/run/postgrey %{_sysconfdir}/sysconfig/postgrey %config(noreplace) %{confdir}/postgrey_whitelist_clients %config(noreplace) %{confdir}/postgrey_whitelist_recipients @@ -143,8 +116,7 @@ fi %{_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/ %changelog * Wed Jan 01 2014 Nils Philippsen - 1.34-8 From c051211258d1ed2d56bcb8fbbe42c61ea5374a45 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Sun, 12 Jan 2014 23:43:07 +0800 Subject: [PATCH 22/74] Fix typo --- postgrey.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 2f3ebf9..a615fad 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -49,7 +49,7 @@ pod2man \ %install # Configuration files mkdir -p %{buildroot}%{confdir} -istall -pm0644 postgrey_whitelist_{clients,recipients} \ +install -pm0644 postgrey_whitelist_{clients,recipients} \ %{buildroot}%{confdir}/ # Local whitelist file echo "# Clients that should not be greylisted. See postgrey(8)." \ From 0f06bbca1096e9a8ab16cf42615f30663f86ffc9 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Mon, 13 Jan 2014 00:32:52 +0800 Subject: [PATCH 23/74] Update systemd unit files by adding 3 extra options and 1 new entry for documentation. SPEC cleanup, useradd operation is optimized. Missing dependencies first try by perl magic R. Delete tmpfiles commit since it's nonsense. --- postgrey-tmpfiles.conf | 1 - postgrey.service | 5 +++++ postgrey.spec | 26 +++++++++++++------------- 3 files changed, 18 insertions(+), 14 deletions(-) delete mode 100644 postgrey-tmpfiles.conf diff --git a/postgrey-tmpfiles.conf b/postgrey-tmpfiles.conf deleted file mode 100644 index 19c61d1..0000000 --- a/postgrey-tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /var/run/postgrey 0755 postgrey postgrey - diff --git a/postgrey.service b/postgrey.service index 4cb5ede..7dd3425 100644 --- a/postgrey.service +++ b/postgrey.service @@ -1,5 +1,6 @@ [Unit] Description=Postfix Greylisting Service +Documentation=man:postgrey(8) Before=postfix.service [Service] @@ -13,11 +14,15 @@ PIDFile=/var/run/postgrey.pid ExecStart=/usr/sbin/postgrey \ --unix=/var/spool/postfix/postgrey/socket \ --pidfile=/var/run/postgrey.pid \ + --group=postgrey \ + --user=postgrey \ + --greylist-text="Greylisted for %%s seconds" --daemonize \ $POSTGREY_OPTS Restart=always RestartSec=1 +TimeoutSec=5 [Install] WantedBy=multi-user.target diff --git a/postgrey.spec b/postgrey.spec index a615fad..5e140d1 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.34 -Release: 8%{?dist} +Release: 9%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" Summary: Postfix Greylisting Policy Server @@ -12,13 +12,12 @@ Source0: http://postgrey.schweikert.ch/pub/postgrey-%{version}.tar.gz Source1: postgrey.service Source2: README-rpm Source3: postgrey.sysconfig -Source4: postgrey-tmpfiles.conf Patch0: postgrey-1.28-group.patch Patch1: postgrey-1.34-perl-5.18.patch BuildArch: noarch BuildRequires: systemd -# We require postfix for its directories and gid Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +# We require postfix for its directories and gid Requires: postfix Requires(pre): shadow-utils Requires(post): systemd @@ -26,9 +25,9 @@ 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. @@ -77,13 +76,12 @@ install -pDm0644 postgrey.8 \ install -pDm0755 contrib/postgreyreport \ %{buildroot}%{_sbindir}/postgreyreport -# Tmpfiles.d -mkdir -p %{buildroot}%{_tmpfilesdir} -install -m0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/%{name}.conf - %pre -/usr/sbin/useradd -d %{_localstatedir}/spool/postfix/postgrey -s /sbin/nologin \ - -M -r postgrey &>/dev/null || : +getent group postgrey >/dev/null || groupadd -r postgrey +getent passwd postgrey >/dev/null || \ + useradd -r -g postgrey -d %{_localstatedir}/spool/postfix/postgrey -s /sbin/nologin \ + -c "Postfix Greylisting Service" postgrey +exit 0 %post %systemd_post postgrey.service @@ -107,8 +105,6 @@ install -m0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/%{name}.conf %files %doc Changes COPYING README README-rpm %{_unitdir}/postgrey.service -%{_tmpfilesdir}/postgrey.conf -%{_localstatedir}/run/postgrey %{_sysconfdir}/sysconfig/postgrey %config(noreplace) %{confdir}/postgrey_whitelist_clients %config(noreplace) %{confdir}/postgrey_whitelist_recipients @@ -119,6 +115,10 @@ install -m0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/%{name}.conf %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Sat Jan 11 2014 Christopher Meng - 1.34-9 +- Update systemd service unit to be more powerful. +- SPEC cleanup(BZ#850279). + * Wed Jan 01 2014 Nils Philippsen - 1.34-8 - make postgrey work with perl 5.18 (#1039551) From 961f4024888b3c4c6a07ea9bb0e91b0d491792ff Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Mon, 13 Jan 2014 00:58:10 +0800 Subject: [PATCH 24/74] Perl magic is useless, so manually added missing deps. --- postgrey.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/postgrey.spec b/postgrey.spec index 5e140d1..4213d47 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -16,7 +16,17 @@ Patch0: postgrey-1.28-group.patch Patch1: postgrey-1.34-perl-5.18.patch BuildArch: noarch BuildRequires: systemd -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +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 # We require postfix for its directories and gid Requires: postfix Requires(pre): shadow-utils @@ -115,9 +125,10 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog -* Sat Jan 11 2014 Christopher Meng - 1.34-9 +* Sun Jan 12 2014 Christopher Meng - 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 - 1.34-8 - make postgrey work with perl 5.18 (#1039551) From b1e53fb893de62214b95ff88eac942e0928c8061 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Tue, 14 Jan 2014 16:01:33 +0800 Subject: [PATCH 25/74] Fix typo. --- postgrey.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/postgrey.spec b/postgrey.spec index 4213d47..f14b893 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.34 -Release: 9%{?dist} +Release: 10%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" Summary: Postfix Greylisting Policy Server @@ -26,7 +26,7 @@ Requires: perl(Pod::Usage) Requires: perl(POSIX) Requires: perl(strict) Requires: perl(Sys::Hostname) -Requires: perl(Sys::Syslog +Requires: perl(Sys::Syslog) # We require postfix for its directories and gid Requires: postfix Requires(pre): shadow-utils @@ -125,6 +125,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Tue Jan 14 2014 Christopher Meng - 1.34-10 +- Fix typo in the SPEC. + * Sun Jan 12 2014 Christopher Meng - 1.34-9 - Update systemd service unit to be more powerful. - SPEC cleanup(BZ#850279). From b42c7d5c620c98bab2012d3f913a2245b81b9cb3 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Tue, 21 Jan 2014 10:11:38 +0800 Subject: [PATCH 26/74] Fix systemd option with backslash added. --- postgrey.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgrey.service b/postgrey.service index 7dd3425..ebd316e 100644 --- a/postgrey.service +++ b/postgrey.service @@ -16,7 +16,7 @@ ExecStart=/usr/sbin/postgrey \ --pidfile=/var/run/postgrey.pid \ --group=postgrey \ --user=postgrey \ - --greylist-text="Greylisted for %%s seconds" + --greylist-text="Greylisted for %%s seconds" \ --daemonize \ $POSTGREY_OPTS From f83072d58c5ca9ecf08d73e43ff793e48d883164 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Tue, 21 Jan 2014 10:13:41 +0800 Subject: [PATCH 27/74] Try auto requires again. --- postgrey.spec | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/postgrey.spec b/postgrey.spec index f14b893..d3bc490 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -16,17 +16,18 @@ Patch0: postgrey-1.28-group.patch Patch1: postgrey-1.34-perl-5.18.patch BuildArch: noarch BuildRequires: systemd -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) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +#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) # We require postfix for its directories and gid Requires: postfix Requires(pre): shadow-utils From a1f3cd6b2dd3edf654a0ad3869095ed878c0ec42 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Tue, 21 Jan 2014 10:33:14 +0800 Subject: [PATCH 28/74] Finalization. --- postgrey.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index d3bc490..bd46bff 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.34 -Release: 10%{?dist} +Release: 11%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" Summary: Postfix Greylisting Policy Server @@ -126,6 +126,10 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Tue Jan 21 2014 Christopher Meng - 1.34-11 +- Let perl magic to determine the dependencies. +- Fix systemd unit typo. + * Tue Jan 14 2014 Christopher Meng - 1.34-10 - Fix typo in the SPEC. From e5c95f48f209d65eca9b4fd07b34699f285785e8 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Tue, 21 Jan 2014 10:44:58 +0800 Subject: [PATCH 29/74] grammar error ;) --- postgrey.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index bd46bff..2d9f554 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -127,7 +127,7 @@ exit 0 %changelog * Tue Jan 21 2014 Christopher Meng - 1.34-11 -- Let perl magic to determine the dependencies. +- Let perl magic determine the dependencies. - Fix systemd unit typo. * Tue Jan 14 2014 Christopher Meng - 1.34-10 From b8223c529e045aa96c4e210fda8bc02bd86921d0 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Thu, 6 Feb 2014 10:39:28 +0800 Subject: [PATCH 30/74] Fix BZ#1058654. --- postgrey.service | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/postgrey.service b/postgrey.service index ebd316e..01df702 100644 --- a/postgrey.service +++ b/postgrey.service @@ -8,7 +8,6 @@ Type=forking EnvironmentFile=-/etc/sysconfig/postgrey ExecStartPre=-/bin/rm -f /var/run/postgrey.pid - PIDFile=/var/run/postgrey.pid ExecStart=/usr/sbin/postgrey \ @@ -16,7 +15,7 @@ ExecStart=/usr/sbin/postgrey \ --pidfile=/var/run/postgrey.pid \ --group=postgrey \ --user=postgrey \ - --greylist-text="Greylisted for %%s seconds" \ + '--greylist-text=Greylisted for %%s seconds' \ --daemonize \ $POSTGREY_OPTS From eb9dea0bdcff4a52701b3a4eff9ca6d3af7c8556 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Thu, 6 Feb 2014 10:42:57 +0800 Subject: [PATCH 31/74] Bump the rev. --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 2d9f554..a4986cd 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.34 -Release: 11%{?dist} +Release: 12%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" Summary: Postfix Greylisting Policy Server @@ -126,6 +126,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Thu Feb 06 2014 Christopher Meng - 1.34-12 +- Correct the syntax of systemd unit to support option with space-separated content. + * Tue Jan 21 2014 Christopher Meng - 1.34-11 - Let perl magic determine the dependencies. - Fix systemd unit typo. From 049e281a94499066a074bd6f101084a99745851b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 11:57:15 -0500 Subject: [PATCH 32/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index a4986cd..f255c25 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.34 -Release: 12%{?dist} +Release: 13%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" Summary: Postfix Greylisting Policy Server @@ -126,6 +126,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.34-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Feb 06 2014 Christopher Meng - 1.34-12 - Correct the syntax of systemd unit to support option with space-separated content. From 5f0dc7c87d71b60057c4ace6354b0ef199c45143 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 27 Aug 2014 11:37:51 +0200 Subject: [PATCH 33/74] Perl 5.20 rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index f255c25..b6598ec 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.34 -Release: 13%{?dist} +Release: 14%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" Summary: Postfix Greylisting Policy Server @@ -126,6 +126,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Wed Aug 27 2014 Jitka Plesnikova - 1.34-14 +- Perl 5.20 rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.34-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 55eeb051d73311f2d85b1c458908fb2eca717e53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 7 Nov 2014 10:13:04 +0100 Subject: [PATCH 34/74] Build-require perl-podlators for pod2man --- postgrey.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index b6598ec..245a993 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.34 -Release: 14%{?dist} +Release: 15%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" Summary: Postfix Greylisting Policy Server @@ -15,6 +15,7 @@ Source3: postgrey.sysconfig Patch0: postgrey-1.28-group.patch Patch1: postgrey-1.34-perl-5.18.patch BuildArch: noarch +BuildRequires: perl-podlators BuildRequires: systemd Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) #Requires: perl(BerkeleyDB) @@ -126,6 +127,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Fri Nov 07 2014 Petr Pisar - 1.34-15 +- Build-require perl-podlators for pod2man (bug #1161477) + * Wed Aug 27 2014 Jitka Plesnikova - 1.34-14 - Perl 5.20 rebuild From 4a542da90fe0acb1d1f5c6bb416cea5b2feda123 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 3 Jun 2015 18:24:48 +0200 Subject: [PATCH 35/74] Perl 5.22 rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 245a993..b2fe0f7 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.34 -Release: 15%{?dist} +Release: 16%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" Summary: Postfix Greylisting Policy Server @@ -127,6 +127,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Wed Jun 03 2015 Jitka Plesnikova - 1.34-16 +- Perl 5.22 rebuild + * Fri Nov 07 2014 Petr Pisar - 1.34-15 - Build-require perl-podlators for pod2man (bug #1161477) From 59ad8f7ef470a4b39c1da4a80e697158e29f306e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 15:43:06 +0000 Subject: [PATCH 36/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index b2fe0f7..7ae5832 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.34 -Release: 16%{?dist} +Release: 17%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" Summary: Postfix Greylisting Policy Server @@ -127,6 +127,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 1.34-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Jun 03 2015 Jitka Plesnikova - 1.34-16 - Perl 5.22 rebuild From 3fb603a837e185537d2a9c10a9fcf773c1a282df Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Fri, 13 Nov 2015 21:25:32 +0800 Subject: [PATCH 37/74] Update to 1.36 (1.35 skipped) - Refine release section of postgrey manpage. - Refine configuration instructions. --- .gitignore | 1 + README-rpm | 23 ++++++++++++++++++----- postgrey.service | 11 +++++------ postgrey.spec | 46 +++++++++++++++++++++++++++------------------- postgrey.sysconfig | 26 +++++++++++++++++++++++++- sources | 2 +- 6 files changed, 77 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index ec15fa9..7c3118a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ postgrey-1.32.tar.gz /postgrey-1.34.tar.gz +/postgrey-1.36.tar.gz diff --git a/README-rpm b/README-rpm index a06f52c..7e3f3cb 100644 --- a/README-rpm +++ b/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. diff --git a/postgrey.service b/postgrey.service index 01df702..9da9c13 100644 --- a/postgrey.service +++ b/postgrey.service @@ -5,18 +5,17 @@ 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 \ - --unix=/var/spool/postfix/postgrey/socket \ - --pidfile=/var/run/postgrey.pid \ - --group=postgrey \ - --user=postgrey \ + $POSTGREY_TYPE \ + $POSTGREY_PID \ + $POSTGREY_GROUP \ + $POSTGREY_USER \ '--greylist-text=Greylisted for %%s seconds' \ --daemonize \ + $POSTGREY_DELAY \ $POSTGREY_OPTS Restart=always diff --git a/postgrey.spec b/postgrey.spec index 7ae5832..837d23e 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -1,8 +1,8 @@ %global confdir %{_sysconfdir}/postfix Name: postgrey -Version: 1.34 -Release: 17%{?dist} +Version: 1.36 +Release: 1%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" Summary: Postfix Greylisting Policy Server @@ -12,12 +12,11 @@ Source0: http://postgrey.schweikert.ch/pub/postgrey-%{version}.tar.gz Source1: postgrey.service Source2: README-rpm Source3: postgrey.sysconfig -Patch0: postgrey-1.28-group.patch -Patch1: postgrey-1.34-perl-5.18.patch BuildArch: noarch BuildRequires: perl-podlators BuildRequires: systemd Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +## Note: If --privacy specified, perl(Digest::SHA) will be needed. #Requires: perl(BerkeleyDB) #Requires: perl(Fcntl) #Requires: perl(Getopt::Long) @@ -29,8 +28,8 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $ve #Requires: perl(strict) #Requires: perl(Sys::Hostname) #Requires: perl(Sys::Syslog) -# We require postfix for its directories and gid -Requires: postfix +# Requiring postfix for its directories and GID. +Recommends: postfix Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd @@ -46,45 +45,48 @@ again later, as it is however required per RFC. %prep %setup -q -%patch0 -p1 -b .group -%patch1 -p1 -b .perl-5.18 -install -pm0644 %{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 %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 -# Configuration files +# 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 +# Main script. install -pDm0755 postgrey %{buildroot}%{_sbindir}/postgrey -# Spool directory +# Spool directory. mkdir -p %{buildroot}%{_localstatedir}/spool/postfix/postgrey -# Init script +# Systemd service. install -pDm0644 %{SOURCE1} \ %{buildroot}%{_unitdir}/postgrey.service -# Sysconfig +# Sysconfig file. install -pDm0644 %{SOURCE3} \ %{buildroot}%{_sysconfdir}/sysconfig/postgrey -# Man page +# Manpage. install -pDm0644 postgrey.8 \ %{buildroot}%{_mandir}/man8/postgrey.8 -# Optional report script +# Optional report script. install -pDm0755 contrib/postgreyreport \ %{buildroot}%{_sbindir}/postgreyreport @@ -115,7 +117,8 @@ exit 0 /bin/systemctl try-restart postgrey.service >/dev/null 2>&1 || : %files -%doc Changes COPYING README README-rpm +%doc Changes README README.exim README.Fedora +%license COPYING %{_unitdir}/postgrey.service %{_sysconfdir}/sysconfig/postgrey %config(noreplace) %{confdir}/postgrey_whitelist_clients @@ -127,6 +130,11 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Fri Sep 04 2015 Christopher Meng - 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 - 1.34-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/postgrey.sysconfig b/postgrey.sysconfig index f735afd..1074c68 100644 --- a/postgrey.sysconfig +++ b/postgrey.sysconfig @@ -1 +1,25 @@ -POSTGREY_OPTS="--delay=60" +# 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="" diff --git a/sources b/sources index 257cc49..fbeefa5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f736a7be1094593f1a66cd13f32b39ef postgrey-1.34.tar.gz +eb4c9426347851d45cdb51e396745a66 postgrey-1.36.tar.gz From 071fbab8bc0dc23462baaf3cf8da320bc9ad5135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 26 Nov 2015 11:14:50 +0100 Subject: [PATCH 38/74] Rebuild against fixed "file" tool that broke Perl dependencies --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 837d23e..b30bd03 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.36 -Release: 1%{?dist} +Release: 2%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" Summary: Postfix Greylisting Policy Server @@ -130,6 +130,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Thu Nov 26 2015 Petr Pisar - 1.36-2 +- Rebuild against fixed "file" tool that broke Perl dependencies (bug #1279401) + * Fri Sep 04 2015 Christopher Meng - 1.36-1 - Update to 1.36 (1.35 skipped) - Refine release section of postgrey manpage. From 44dceb65787d60b5c694ae55aa5ef909f98d7683 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 18:23:44 +0000 Subject: [PATCH 39/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index b30bd03..22ffc38 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.36 -Release: 2%{?dist} +Release: 3%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" Summary: Postfix Greylisting Policy Server @@ -130,6 +130,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.36-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Nov 26 2015 Petr Pisar - 1.36-2 - Rebuild against fixed "file" tool that broke Perl dependencies (bug #1279401) From c0da8e31c1d5be090cafe6d6c9dd6255ca1ffea3 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 15 May 2016 02:32:59 +0200 Subject: [PATCH 40/74] Perl 5.24 rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 22ffc38..03111ab 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.36 -Release: 3%{?dist} +Release: 4%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" Summary: Postfix Greylisting Policy Server @@ -130,6 +130,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Sun May 15 2016 Jitka Plesnikova - 1.36-4 +- Perl 5.24 rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 1.36-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From d93727a5dc1465fa38c40089543b2873c1e579f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 09:51:49 +0200 Subject: [PATCH 41/74] Mandatory Perl build-requires added --- postgrey.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/postgrey.spec b/postgrey.spec index 03111ab..1b4999c 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -13,6 +13,7 @@ Source1: postgrey.service Source2: README-rpm Source3: postgrey.sysconfig BuildArch: noarch +BuildRequires: perl-generators BuildRequires: perl-podlators BuildRequires: systemd Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) From 377a0eaf36ecd9da0773f65cbdd19b02aaa4bde6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 07:47:18 +0000 Subject: [PATCH 42/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 1b4999c..6f686ab 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.36 -Release: 4%{?dist} +Release: 5%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" Summary: Postfix Greylisting Policy Server @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.36-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sun May 15 2016 Jitka Plesnikova - 1.36-4 - Perl 5.24 rebuild From 4255164bbd8a01acb18ff08c66ea9d5eaad6b681 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Sat, 11 Mar 2017 12:19:33 +0100 Subject: [PATCH 43/74] version 1.37 --- .gitignore | 1 + postgrey.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7c3118a..96709de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ postgrey-1.32.tar.gz /postgrey-1.34.tar.gz /postgrey-1.36.tar.gz +/postgrey-1.37.tar.gz diff --git a/postgrey.spec b/postgrey.spec index 6f686ab..11573ce 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -1,8 +1,8 @@ %global confdir %{_sysconfdir}/postfix Name: postgrey -Version: 1.36 -Release: 5%{?dist} +Version: 1.37 +Release: 1%{?dist} # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" Summary: Postfix Greylisting Policy Server @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Sat Mar 11 2017 Nils Philippsen - 1.37-1 +- version 1.37 + * Sat Feb 11 2017 Fedora Release Engineering - 1.36-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index fbeefa5..eaf5fbc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eb4c9426347851d45cdb51e396745a66 postgrey-1.36.tar.gz +SHA512 (postgrey-1.37.tar.gz) = 369968212ea60539efc0d4a7ae84f7c3ce13f5622e6ee070a0089423ef81ca8f7541ebd20289291d0e6a3aec2ca30dbc9c0d9c0a6f0a686adfadb5d0dd7830ca From 82ec5888ef598202a96f40f8bee25a60bb3c0da1 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Sat, 11 Mar 2017 12:19:51 +0100 Subject: [PATCH 44/74] fix syntax error in sysconfig file (#1292066) --- postgrey.spec | 1 + postgrey.sysconfig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 11573ce..a01ae7d 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -133,6 +133,7 @@ exit 0 %changelog * Sat Mar 11 2017 Nils Philippsen - 1.37-1 - version 1.37 +- fix syntax error in sysconfig file (#1292066) * Sat Feb 11 2017 Fedora Release Engineering - 1.36-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/postgrey.sysconfig b/postgrey.sysconfig index 1074c68..b2aa724 100644 --- a/postgrey.sysconfig +++ b/postgrey.sysconfig @@ -3,7 +3,7 @@ # 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 +# --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 From a00a0f0321195807d63c37ac3761becf1bf7d113 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Sat, 11 Mar 2017 12:20:37 +0100 Subject: [PATCH 45/74] remove unused patches --- postgrey-1.28-group.patch | 21 --------------------- postgrey-1.34-perl-5.18.patch | 33 --------------------------------- 2 files changed, 54 deletions(-) delete mode 100644 postgrey-1.28-group.patch delete mode 100644 postgrey-1.34-perl-5.18.patch diff --git a/postgrey-1.28-group.patch b/postgrey-1.28-group.patch deleted file mode 100644 index d97947f..0000000 --- a/postgrey-1.28-group.patch +++ /dev/null @@ -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 [I...] - -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 diff --git a/postgrey-1.34-perl-5.18.patch b/postgrey-1.34-perl-5.18.patch deleted file mode 100644 index 13ec89c..0000000 --- a/postgrey-1.34-perl-5.18.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9673b54064691a5b9c295ffea340d8a1f9ee1cb8 Mon Sep 17 00:00:00 2001 -From: Yasuhiro KIMURA -Date: Sat, 17 Aug 2013 22:05:27 +0900 -Subject: [PATCH] Make postgrey work with Perl 5.18 - ---- - postgrey | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/postgrey b/postgrey -index 7cb0352..37f69bd 100755 ---- a/postgrey -+++ b/postgrey -@@ -557,6 +557,16 @@ sub main() - if($opt{dbdir}) { - $opt{dbdir} =~ /^(.*)$/; $opt{dbdir} = $1; - } -+ # untaint what is given on --pidfile. It is not security sensitive since -+ # it is provided by the admin -+ if($opt{pidfile}) { -+ $opt{pidfile} =~ /^(.*)$/; $opt{pidfile} = $1; -+ } -+ # untaint what is given on --inet. It is not security sensitive since -+ # it is provided by the admin -+ if($opt{inet}) { -+ $opt{inet} =~ /^(.*)$/; $opt{inet} = $1; -+ } - - # determine proper "logsock" for Sys::Syslog - my $syslog_logsock; --- -1.8.4.2 - From 85fb389aec465e4156a4f9194ec3f10dffb10d22 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Sat, 11 Mar 2017 12:22:57 +0100 Subject: [PATCH 46/74] move comment to the line it comments --- postgrey.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index a01ae7d..e0a8972 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -3,9 +3,9 @@ Name: postgrey Version: 1.37 Release: 1%{?dist} +Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" -Summary: Postfix Greylisting Policy Server License: GPLv2+ URL: http://postgrey.schweikert.ch/ Source0: http://postgrey.schweikert.ch/pub/postgrey-%{version}.tar.gz From c3989a7d2975c712b7f0e76af7c3c81846badd14 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 4 Jun 2017 07:59:11 +0200 Subject: [PATCH 47/74] Perl 5.26 rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index e0a8972..8f900f1 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Sun Jun 04 2017 Jitka Plesnikova - 1.37-2 +- Perl 5.26 rebuild + * Sat Mar 11 2017 Nils Philippsen - 1.37-1 - version 1.37 - fix syntax error in sysconfig file (#1292066) From 517671853358efbaa07919c8e39b79f349c6954c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 08:58:16 +0000 Subject: [PATCH 48/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 8f900f1..05627da 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.37-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sun Jun 04 2017 Jitka Plesnikova - 1.37-2 - Perl 5.26 rebuild From ce7c4001a5d0d261b9cf2c55669cf335a2969913 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 05:39:07 +0000 Subject: [PATCH 49/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 05627da..5c4741a 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.37-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.37-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From c002ba8ba9c86c925a5580864895d60944140584 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 28 Jun 2018 03:55:44 +0200 Subject: [PATCH 50/74] Perl 5.28 rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 5c4741a..144dc9f 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Thu Jun 28 2018 Jitka Plesnikova - 1.37-5 +- Perl 5.28 rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 1.37-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 11e8974a2b5a6264f7ed2c87d4aaf143bc663c4d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 22:46:54 +0000 Subject: [PATCH 51/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 144dc9f..f4f9dae 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.37-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Jun 28 2018 Jitka Plesnikova - 1.37-5 - Perl 5.28 rebuild From 26c6b881cf33684fdc5c9e78af040cfaee27e6f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 04:42:05 +0000 Subject: [PATCH 52/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index f4f9dae..f6fb28d 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 1.37-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.37-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From c27042c33924c5090010b69ea63848d4bcbbd09f Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 30 May 2019 13:53:01 +0200 Subject: [PATCH 53/74] Perl 5.30 rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index f6fb28d..ac54b22 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Thu May 30 2019 Jitka Plesnikova - 1.37-8 +- Perl 5.30 rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 1.37-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From e1dab6a2004972f004593fa1786cd3c40c72167b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 11:11:37 +0000 Subject: [PATCH 54/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index ac54b22..d8646d3 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 1.37-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu May 30 2019 Jitka Plesnikova - 1.37-8 - Perl 5.30 rebuild From 52447898b9aba0f5436f1e9f52e2076444cc0a41 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 09:37:07 +0000 Subject: [PATCH 55/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index d8646d3..379a5d6 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 1.37-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 1.37-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From d6d91d4fab3302e36cc87adc07eaf382e06ca02a Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 22 Jun 2020 17:47:22 +0200 Subject: [PATCH 56/74] Perl 5.32 rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 379a5d6..faee6fd 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Mon Jun 22 2020 Jitka Plesnikova - 1.37-11 +- Perl 5.32 rebuild + * Thu Jan 30 2020 Fedora Release Engineering - 1.37-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 4a49d8de3c18c27325e17681cf97b5026bfbfa89 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 22:53:34 +0000 Subject: [PATCH 57/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index faee6fd..3f36219 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.37-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jun 22 2020 Jitka Plesnikova - 1.37-11 - Perl 5.32 rebuild From 8285f8978d9e5eaa252ea5755958ca1175e8a4b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 08:28:31 +0000 Subject: [PATCH 58/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 3f36219..9b08a59 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.37-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.37-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From a2c61eec51da2e9c957b07fbff8bbc45e11c60a3 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 21 May 2021 12:33:38 +0200 Subject: [PATCH 59/74] Perl 5.34 rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 9b08a59..47c88ee 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Fri May 21 2021 Jitka Plesnikova - 1.37-14 +- Perl 5.34 rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 1.37-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 55ded7b3401b9b904e29ef812058cd95d62d3716 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 03:56:22 +0000 Subject: [PATCH 60/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 47c88ee..8e71b6d 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.37-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri May 21 2021 Jitka Plesnikova - 1.37-14 - Perl 5.34 rebuild From 312591a4b28644d1ad399991c50b29404d70c0e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 09:19:39 +0000 Subject: [PATCH 61/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 8e71b6d..e3176db 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 1.37-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.37-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 8754025d142e40f5f40296aa367f8c07b2c5c8d4 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 31 Jan 2022 14:18:00 -0800 Subject: [PATCH 62/74] epel8-playground decommissioned : https://pagure.io/epel/issue/136 --- .cvsignore | 0 Makefile | 21 --------------------- dead.package | 1 + sources | 0 4 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 sources diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile b/Makefile deleted file mode 100644 index 79bca95..0000000 --- a/Makefile +++ /dev/null @@ -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) 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 diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000 From d230fc2174446f612645d6a54fe33bce0b5d20ab Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 30 May 2022 19:30:28 +0200 Subject: [PATCH 63/74] Perl 5.36 rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index e3176db..0e259e3 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Mon May 30 2022 Jitka Plesnikova - 1.37-17 +- Perl 5.36 rebuild + * Fri Jan 21 2022 Fedora Release Engineering - 1.37-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 3ea2421e8cb43ec2ef2dc607c0e63241bd8e77a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 15:16:57 +0000 Subject: [PATCH 64/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 0e259e3..c2abab0 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1.37-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon May 30 2022 Jitka Plesnikova - 1.37-17 - Perl 5.36 rebuild From 5fd48fbbe92b35f756f3a65f44ab1b4e3b1c69ae Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 13 Jan 2023 21:09:53 +0100 Subject: [PATCH 65/74] Remove perl(MODULE_COMPAT), it will be replaced by generators --- postgrey.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index c2abab0..a5d653f 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -16,7 +16,6 @@ BuildArch: noarch BuildRequires: perl-generators BuildRequires: perl-podlators BuildRequires: systemd -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) ## Note: If --privacy specified, perl(Digest::SHA) will be needed. #Requires: perl(BerkeleyDB) #Requires: perl(Fcntl) From dd1e84ff018f5d02318c6f5bb39f7f271a5d2df9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 10:09:00 +0000 Subject: [PATCH 66/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index a5d653f..4b5d57e 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -130,6 +130,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 1.37-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 1.37-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From e076139656f74d42f96aa312130f11c1fed16ac3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 06:08:34 +0000 Subject: [PATCH 67/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 4b5d57e..d871e34 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -130,6 +130,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 1.37-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jan 20 2023 Fedora Release Engineering - 1.37-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 81eaafcf3a9c9e36db76e0012656187318a9d8d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 22:13:29 +0000 Subject: [PATCH 68/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index d871e34..d95bc4e 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -130,6 +130,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.37-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 1.37-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From edd42372f7148000b0d53328a51c26eea73b7f61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 00:00:29 +0000 Subject: [PATCH 69/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index d95bc4e..6e12dec 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -130,6 +130,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 1.37-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.37-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b9110f9cd2c9376f7426c9640963584c8df5df35 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 08:21:17 +0000 Subject: [PATCH 70/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 6e12dec..5837580 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -130,6 +130,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 1.37-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jan 26 2024 Fedora Release Engineering - 1.37-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ff033da9b6a2937daa05ce82724fe0630ad27093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 02:08:42 +0200 Subject: [PATCH 71/74] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- postgrey.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/postgrey.spec b/postgrey.spec index 5837580..6731f53 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,11 +2,12 @@ Name: postgrey Version: 1.37 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" -License: GPLv2+ +# 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 @@ -130,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Fri Jul 26 2024 Miroslav Suchý - 1.37-24 +- convert license to SPDX + * Fri Jul 19 2024 Fedora Release Engineering - 1.37-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b9e9f5ec8f28cd41c2ce35f5930aa8e81f2ef955 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 10:40:08 +0000 Subject: [PATCH 72/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 6731f53..b5bd715 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -131,6 +131,9 @@ exit 0 %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 1.37-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 1.37-24 - convert license to SPDX From 1a6a58b3f593edace41e57f674a586a5d867998d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 16:44:31 +0100 Subject: [PATCH 73/74] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- postgrey.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/postgrey.spec b/postgrey.spec index b5bd715..8df2f85 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -31,7 +31,6 @@ BuildRequires: systemd #Requires: perl(Sys::Syslog) # Requiring postfix for its directories and GID. Recommends: postfix -Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -52,6 +51,11 @@ sed -i 's|nogroup|postgrey|g' postgrey 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 </dev/null || groupadd -r postgrey -getent passwd postgrey >/dev/null || \ - useradd -r -g postgrey -d %{_localstatedir}/spool/postfix/postgrey -s /sbin/nologin \ - -c "Postfix Greylisting Service" postgrey -exit 0 +install -m0644 -D postgrey.sysusers.conf %{buildroot}%{_sysusersdir}/postgrey.conf + %post %systemd_post postgrey.service @@ -129,8 +129,12 @@ exit 0 %{_sbindir}/postgreyreport %{_mandir}/man8/postgrey.8* %dir %attr(0751,postgrey,postfix) %{_localstatedir}/spool/postfix/postgrey/ +%{_sysusersdir}/postgrey.conf %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.37-26 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Sat Jan 18 2025 Fedora Release Engineering - 1.37-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 37eb9837d19d1479d7fbbe74b9792b502dea4dbf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 06:05:10 +0000 Subject: [PATCH 74/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- postgrey.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgrey.spec b/postgrey.spec index 8df2f85..d1a1e2d 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,7 +2,7 @@ Name: postgrey Version: 1.37 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Postfix Greylisting Policy Server # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any # later version" @@ -132,6 +132,9 @@ install -m0644 -D postgrey.sysusers.conf %{buildroot}%{_sysusersdir}/postgrey.co %{_sysusersdir}/postgrey.conf %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.37-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.37-26 - Add sysusers.d config file to allow rpm to create users/groups automatically