commit: c8244c3de06e6a1b6ba8d3d179b1f77d39fce964 Author: Ian Delaney <idella4 <AT> gentoo <DOT> org> AuthorDate: Wed Sep 23 14:29:18 2015 +0000 Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> CommitDate: Wed Sep 23 14:29:51 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8244c3d
mail-filter/postgrey: revbump to 1.35-r2 Inherit systemd eclass, add service for systemd, rm old versions, ack to Stefan G. Weichinger for submitting service file, fixes Bug 528032 Package-Manager: portage-2.2.20.1 mail-filter/postgrey/files/postgrey.service | 17 ++++++ mail-filter/postgrey/postgrey-1.34-r1.ebuild | 68 --------------------- mail-filter/postgrey/postgrey-1.34.ebuild | 62 ------------------- mail-filter/postgrey/postgrey-1.35-r1.ebuild | 2 +- ...grey-1.34-r2.ebuild => postgrey-1.35-r2.ebuild} | 15 +++-- mail-filter/postgrey/postgrey-1.35.ebuild | 70 ---------------------- 6 files changed, 27 insertions(+), 207 deletions(-) diff --git a/mail-filter/postgrey/files/postgrey.service b/mail-filter/postgrey/files/postgrey.service new file mode 100644 index 0000000..7321eee --- /dev/null +++ b/mail-filter/postgrey/files/postgrey.service @@ -0,0 +1,17 @@ +[Unit] +Description=Postfix Greylisting Service +Before=postfix.service + +[Service] +Type=simple +ExecStart=/usr/sbin/postgrey --inet=127.0.0.1:10030 \ + --pidfile=/var/run/postgrey.pid \ + --group=postgrey --user=postgrey \ + --greylist-text="Greylisted for %%s seconds" +Restart=always +RestartSec=5 +TimeoutSec=10 + +[Install] +WantedBy=multi-user.target + diff --git a/mail-filter/postgrey/postgrey-1.34-r1.ebuild b/mail-filter/postgrey/postgrey-1.34-r1.ebuild deleted file mode 100644 index d865c23..0000000 --- a/mail-filter/postgrey/postgrey-1.34-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit eutils user - -DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting" -HOMEPAGE="http://postgrey.schweikert.ch/"; -SRC_URI="http://postgrey.schweikert.ch/pub/${P}.tar.gz - http://postgrey.schweikert.ch/pub/old/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 hppa ~ppc ppc64 x86" -IUSE="targrey" - -DEPEND="" -RDEPEND=">=dev-lang/perl-5.6.0 - dev-perl/net-server - dev-perl/IO-Multiplex - dev-perl/BerkeleyDB - dev-perl/Net-DNS - dev-perl/Parse-Syslog - dev-perl/Net-RBLClient - >=sys-libs/db-4.1" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /dev/null ${PN} -} - -src_prepare() { - if use targrey ; then - epatch "${FILESDIR}"/targrey-0.31-postgrey-1.34.patch - fi -} - -src_install() { - # postgrey data/DB in /var - diropts -m0770 -o ${PN} -g ${PN} - dodir /var/spool/postfix/${PN} - keepdir /var/spool/postfix/${PN} - fowners postgrey:postgrey /var/spool/postfix/${PN} - fperms 0770 /var/spool/postfix/${PN} - - # postgrey binary - dosbin ${PN} - dosbin contrib/postgreyreport - - # policy-test script - dosbin policy-test - - # postgrey data in /etc/postfix - insinto /etc/postfix - insopts -o root -g ${PN} -m 0640 - doins postgrey_whitelist_clients postgrey_whitelist_recipients - - # documentation - dodoc Changes README - - # init.d + conf.d files - insopts -o root -g root -m 755 - newinitd "${FILESDIR}"/${PN}.rc.new ${PN} - insopts -o root -g root -m 640 - newconfd "${FILESDIR}"/${PN}.conf.new ${PN} -} diff --git a/mail-filter/postgrey/postgrey-1.34.ebuild b/mail-filter/postgrey/postgrey-1.34.ebuild deleted file mode 100644 index fc55259..0000000 --- a/mail-filter/postgrey/postgrey-1.34.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit eutils user - -DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting" -HOMEPAGE="http://postgrey.schweikert.ch/"; -SRC_URI="http://postgrey.schweikert.ch/pub/${P}.tar.gz - http://postgrey.schweikert.ch/pub/old/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 hppa ~ppc ppc64 x86" -IUSE="" - -DEPEND="" -RDEPEND=">=dev-lang/perl-5.6.0 - dev-perl/net-server - dev-perl/IO-Multiplex - dev-perl/BerkeleyDB - dev-perl/Net-DNS - dev-perl/Parse-Syslog - dev-perl/Net-RBLClient - >=sys-libs/db-4.1" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /dev/null ${PN} -} - -src_install() { - # postgrey data/DB in /var - diropts -m0770 -o ${PN} -g ${PN} - dodir /var/spool/postfix/${PN} - keepdir /var/spool/postfix/${PN} - fowners postgrey:postgrey /var/spool/postfix/${PN} - fperms 0770 /var/spool/postfix/${PN} - - # postgrey binary - dosbin ${PN} - dosbin contrib/postgreyreport - - # policy-test script - dosbin policy-test - - # postgrey data in /etc/postfix - insinto /etc/postfix - insopts -o root -g ${PN} -m 0640 - doins postgrey_whitelist_clients postgrey_whitelist_recipients - - # documentation - dodoc Changes README - - # init.d + conf.d files - insopts -o root -g root -m 755 - newinitd "${FILESDIR}"/${PN}.rc.new ${PN} - insopts -o root -g root -m 640 - newconfd "${FILESDIR}"/${PN}.conf.new ${PN} -} diff --git a/mail-filter/postgrey/postgrey-1.35-r1.ebuild b/mail-filter/postgrey/postgrey-1.35-r1.ebuild index 6fbe9ee..c5a9e3c 100644 --- a/mail-filter/postgrey/postgrey-1.35-r1.ebuild +++ b/mail-filter/postgrey/postgrey-1.35-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/mail-filter/postgrey/postgrey-1.34-r2.ebuild b/mail-filter/postgrey/postgrey-1.35-r2.ebuild similarity index 82% rename from mail-filter/postgrey/postgrey-1.34-r2.ebuild rename to mail-filter/postgrey/postgrey-1.35-r2.ebuild index 0ece65f..9a4ec78 100644 --- a/mail-filter/postgrey/postgrey-1.34-r2.ebuild +++ b/mail-filter/postgrey/postgrey-1.35-r2.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=5 -inherit eutils user +inherit eutils systemd user DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting" HOMEPAGE="http://postgrey.schweikert.ch/"; SRC_URI="http://postgrey.schweikert.ch/pub/${P}.tar.gz - http://postgrey.schweikert.ch/pub/old/${P}.tar.gz"; +http://postgrey.schweikert.ch/pub/old/${P}.tar.gz"; LICENSE="GPL-2" SLOT="0" @@ -24,6 +24,7 @@ RDEPEND=">=dev-lang/perl-5.6.0 dev-perl/Net-DNS dev-perl/Parse-Syslog dev-perl/Net-RBLClient + virtual/perl-Digest-SHA >=sys-libs/db-4.1" pkg_setup() { @@ -35,6 +36,7 @@ src_prepare() { if use targrey ; then epatch "${FILESDIR}"/targrey-0.31-postgrey-1.34.patch fi + # bug 479400 sed -i 's@#!/usr/bin/perl -T -w@#!/usr/bin/perl -w@' postgrey || die "sed failed" } @@ -59,11 +61,12 @@ src_install() { doins postgrey_whitelist_clients postgrey_whitelist_recipients # documentation - dodoc Changes README + dodoc Changes README README.exim # init.d + conf.d files insopts -o root -g root -m 755 - newinitd "${FILESDIR}"/${PN}.rc.new ${PN} + newinitd "${FILESDIR}"/${PN}-1.34-r3.rc.new ${PN} insopts -o root -g root -m 640 newconfd "${FILESDIR}"/${PN}.conf.new ${PN} + systemd_dounit "${FILESDIR}"/postgrey.service } diff --git a/mail-filter/postgrey/postgrey-1.35.ebuild b/mail-filter/postgrey/postgrey-1.35.ebuild deleted file mode 100644 index 938b52e..0000000 --- a/mail-filter/postgrey/postgrey-1.35.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils user - -DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting" -HOMEPAGE="http://postgrey.schweikert.ch/"; -SRC_URI="http://postgrey.schweikert.ch/pub/${P}.tar.gz -http://postgrey.schweikert.ch/pub/old/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="targrey" - -DEPEND="" -RDEPEND=">=dev-lang/perl-5.6.0 -dev-perl/net-server -dev-perl/IO-Multiplex -dev-perl/BerkeleyDB -dev-perl/Net-DNS -dev-perl/Parse-Syslog -dev-perl/Net-RBLClient -virtual/perl-Digest-SHA ->=sys-libs/db-4.1" - -pkg_setup() { -enewgroup ${PN} -enewuser ${PN} -1 -1 /dev/null ${PN} -} - -src_prepare() { -if use targrey ; then -epatch "${FILESDIR}"/targrey-0.31-postgrey-1.34.patch -fi -sed -i 's@#!/usr/bin/perl -T -w@#!/usr/bin/perl -w@' postgrey || die "sed failed" -} - -src_install() { -# postgrey data/DB in /var -diropts -m0770 -o ${PN} -g ${PN} -dodir /var/spool/postfix/${PN} -keepdir /var/spool/postfix/${PN} -fowners postgrey:postgrey /var/spool/postfix/${PN} -fperms 0770 /var/spool/postfix/${PN} - -# postgrey binary -dosbin ${PN} -dosbin contrib/postgreyreport - -# policy-test script -dosbin policy-test - -# postgrey data in /etc/postfix -insinto /etc/postfix -insopts -o root -g ${PN} -m 0640 -doins postgrey_whitelist_clients postgrey_whitelist_recipients - -# documentation -dodoc Changes README README.exim - -# init.d + conf.d files -insopts -o root -g root -m 755 -newinitd "${FILESDIR}"/${PN}.rc.new ${PN} -insopts -o root -g root -m 640 -newconfd "${FILESDIR}"/${PN}.conf.new ${PN} -}
