projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6e3e90a)
mail-filter/postgrey: revbump to 1.35-r2
authorIan Delaney <idella4@gentoo.org>
Wed, 23 Sep 2015 14:29:18 +0000 (22:29 +0800)
committerIan Delaney <idella4@gentoo.org>
Wed, 23 Sep 2015 14:29:51 +0000 (22:29 +0800)
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 [new file with mode: 0644] patch | blob
mail-filter/postgrey/postgrey-1.34-r1.ebuild [deleted file] patch | blob | history
mail-filter/postgrey/postgrey-1.34.ebuild [deleted file] patch | blob | history
mail-filter/postgrey/postgrey-1.35-r1.ebuild patch | blob | history
mail-filter/postgrey/postgrey-1.35-r2.ebuild [moved from mail-filter/postgrey/postgrey-1.34-r2.ebuild with 82% similarity] patch | blob | history
mail-filter/postgrey/postgrey-1.35.ebuild [deleted file] patch | blob | history

diff --git a/mail-filter/postgrey/files/postgrey.service b/mail-filter/postgrey/files/postgrey.service
new file mode 100644 (file)
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 (file)
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 (file)
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 6fbe9eece4d96cd3116eda20e8cc748a9cc2270a..c5a9e3c5742184491900d10463cd59bb461b85d4 100644 (file)
--- 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 0ece65fcb5b5d776d055d8971be8bb8e965023fc..9a4ec78592eff464a3a5810c34fc0f8291b21696 100644 (file)
--- 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 (file)
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}
-}
Unnamed repository; edit this file 'description' to name the repository.