From 6739d15767890c01701c18b160dc0398bf0a418b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:43:50 +0000 Subject: [PATCH 1/5] 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 3b41af86c8d7109522aa8bdcc3632542b03ce317 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:16:42 +0000 Subject: [PATCH 2/5] Initialize branch EL-6 for postgrey --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 8397275966ec9b9b7a82f7e20779f5563dfb12e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 09:40:58 +0000 Subject: [PATCH 3/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 From beadb5ce354128f79278ecd66fedef0d5c96f627 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 3 Apr 2012 10:54:21 +0200 Subject: [PATCH 4/5] Update to 1.34 and spec file cleanups --- .gitignore | 3 ++- postgrey.spec | 46 ++++++++++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 86aad99..80a73a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -postgrey-1.32.tar.gz +/postgrey-1.32.tar.gz +/postgrey-1.34.tar.gz diff --git a/postgrey.spec b/postgrey.spec index 9374ee3..0e4486b 100644 --- a/postgrey.spec +++ b/postgrey.spec @@ -2,8 +2,8 @@ Summary: Postfix Greylisting Policy Server Name: postgrey -Version: 1.32 -Release: 2%{?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+ @@ -34,7 +34,7 @@ again later, as it is however required per RFC. %prep %setup -q %patch0 -p1 -b .group -%{__install} -p -m 0644 %{SOURCE2} README-rpm +install -p -m 0644 %{SOURCE2} README-rpm %build @@ -46,37 +46,37 @@ pod2man \ %install -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} # Configuration files -%{__mkdir_p} %{buildroot}%{confdir} -%{__install} -p -m 0644 postgrey_whitelist_{clients,recipients} \ +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 +install -D -p -m 0755 postgrey %{buildroot}%{_sbindir}/postgrey # Spool directory -%{__mkdir_p} %{buildroot}%{_var}/spool/postfix/postgrey +mkdir -p %{buildroot}%{_var}/spool/postfix/postgrey # Init script -%{__install} -D -p -m 0755 %{SOURCE1} \ +install -D -p -m 0755 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/rc.d/init.d/postgrey # Man page -%{__install} -D -p -m 0644 postgrey.8 \ +install -D -p -m 0644 postgrey.8 \ %{buildroot}%{_mandir}/man8/postgrey.8 # Optional report script -%{__install} -D -p -m 0755 contrib/postgreyreport \ +install -D -p -m 0755 contrib/postgreyreport \ %{buildroot}%{_sbindir}/postgreyreport %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} %pre @@ -112,10 +112,16 @@ 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 + * 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 +* 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. @@ -123,31 +129,31 @@ fi * 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 +* Thu May 22 2008 Matthias Saou 1.31-1 - Update to 1.31. -* Mon Aug 6 2007 Matthias Saou 1.30-1 +* 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 +* 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 +* 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 +* Mon Dec 4 2006 Matthias Saou 1.27-3 - Add man page generation (Mike Wohlgemuth). -* Fri Dec 1 2006 Matthias Saou 1.27-2 +* Fri Dec 1 2006 Matthias Saou 1.27-2 - Include postgreyreport script. -* Mon Nov 6 2006 Matthias Saou 1.27-1 +* Mon Nov 6 2006 Matthias Saou 1.27-1 - Spec file cleanup. * Wed Jan 18 2006 Levente Farkas 1.24 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 d86777b0e434ce1baf4649fa9d88c83ae63b5c04 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Mon, 7 Dec 2015 00:37:07 +0100 Subject: [PATCH 5/5] 2015-12-07: Retired orphaned package, because it was orphaned for more than six weeks. --- .gitignore | 2 - README-rpm | 21 ----- dead.package | 3 + postgrey-1.28-group.patch | 21 ----- postgrey.init | 113 ----------------------- postgrey.spec | 185 -------------------------------------- sources | 1 - 7 files changed, 3 insertions(+), 343 deletions(-) delete mode 100644 .gitignore delete mode 100644 README-rpm create mode 100644 dead.package delete mode 100644 postgrey-1.28-group.patch delete mode 100755 postgrey.init delete mode 100644 postgrey.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 80a73a5..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/postgrey-1.32.tar.gz -/postgrey-1.34.tar.gz diff --git a/README-rpm b/README-rpm deleted file mode 100644 index a06f52c..0000000 --- a/README-rpm +++ /dev/null @@ -1,21 +0,0 @@ -To make use of postgrey, 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, ... - -And don't forget to activate the service on startup! - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5b8e311 --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2015-12-07: Retired orphaned package, because it was orphaned for +more than six weeks. + 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.init b/postgrey.init deleted file mode 100755 index 17f9f19..0000000 --- a/postgrey.init +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/sh -# -# postgrey Postfix Greylisting Policy Server -# -# chkconfig: - 79 31 -# description: Postfix Greylisting Policy Server - -### 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 - -exec="/usr/sbin/postgrey" -prog="postgrey" -options="--unix=/var/spool/postfix/postgrey/socket" - -[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog - -lockfile=/var/lock/subsys/$prog - -start() { - [ -x $exec ] || exit 5 - echo -n $"Starting $prog: " - daemon $exec -d $options - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - killproc $prog - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - echo -n $"Reloading $prog: " - killproc $prog -HUP - retval=$? - echo - return $retval -} - -force_reload() { - restart -} - -rh_status() { - status $prog -} - -rh_status_q() { - rh_status &>/dev/null -} - - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? - diff --git a/postgrey.spec b/postgrey.spec deleted file mode 100644 index 0e4486b..0000000 --- a/postgrey.spec +++ /dev/null @@ -1,185 +0,0 @@ -%define confdir %{_sysconfdir}/postfix - -Summary: Postfix Greylisting Policy Server -Name: postgrey -Version: 1.34 -Release: 1%{?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 -Source2: README-rpm -Patch0: postgrey-1.28-group.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -# We require postfix for its directories and gid -Requires: postfix -Requires(pre): /usr/sbin/useradd -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/service, /sbin/chkconfig -Requires(postun): /sbin/service -BuildArch: noarch - -%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,-) -%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 -* 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 - -* 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. -- 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 -- Update to 1.31. - -* 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. - -* 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 deleted file mode 100644 index 257cc49..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -f736a7be1094593f1a66cd13f32b39ef postgrey-1.34.tar.gz