gentoo christmass resync : 25.12.2020

5 files changed, 83 insertions, 44 deletions

diff --git a/mail-filter/postgrey/Manifest b/mail-filter/postgrey/Manifest
index 180a866dd058..33d73acfba45 100644
--- a/mail-filter/postgrey/Manifest
+++ b/mail-filter/postgrey/Manifest
@@ -1,10 +1,11 @@
-AUX postgrey-1.34-perl-5.18.patch 952 BLAKE2B b84356fcbef08e1029501dd36bd31d6b4477c3ae30ba9bbb31bc40544d5dbc4e92cde46b88c1141186d0a9af039746b6f46aa992731a42420a4d79b9e5927fa3 SHA512 2145d3d0fff5c993075a3a792adb899a9d28760b43a21daacb4b4a94b5f3a587ecd29700314ae20379d4909bf22d518161e9dcd556963dc185c014351845f6b0
 AUX postgrey-1.34-r3.rc.new 2373 BLAKE2B 6f7a1197735b710fbb23fd49acb1fc9a9b743e7c2e27c93441d2670de58448003d9c2d47305c01c8e54df8e958532a064cb413f010b744c058ceeb8016f973a2 SHA512 a9f9c841249b303da2bd4c976e2cd2fe85264929e298745e08f684f86659da548d9348c15a5723697835ee44c584405582605792f545eb9b1c097f82fc15720e
 AUX postgrey.conf.new 1914 BLAKE2B 826949afe4a8a7bbfe9dec493fd619b91235945420bbd5e4c70709aff23a7393277c88edac1b1f149ea34b4fdfce4649715a97b38052d3e2c360716439bf6489 SHA512 07c7bf82fa24486a62701238bc3684e7ed445bceeb54c842eba39b0d83732b704954247978784142ecf20329352dbe698ba2d9a76576d5082315a314278a6740
 AUX postgrey.service 345 BLAKE2B 4ca6ab7a5649ea49fe69128b64111113301ab891f3de9f2d433e40eca14d178dcb992f70802cc73d003e7903fc3edcb53242c656b9208fdd0aaef2562577d522 SHA512 f5f92cae916a8000da460c0c5bd2194b49518cf2bdadf7f6c4512a29dbee73b4a75d530ed0d2049ac46103235246b5b3b88e55216c9ed1a012ed306a4bf7d58c
 AUX targrey-0.31-postgrey-1.34.patch 8555 BLAKE2B 5957c9ea2fa62554bb45ecad71712f5a5c7c655a132434fe6520335a07f2ad5475cd45fe592c8769f44df03f951ee6bfffa1aad2c331aa393ea20b64fe783d96 SHA512 af4433f08120ae6ab07179f1adb88ca8c86c142b68727657555cef04d84105912e8e67c969c860ea000930196c6046b7b2bef2647f04b202ceecaf163d8515d5
 DIST postgrey-1.36.tar.gz 38797 BLAKE2B b8e4dedb28ababc92cdd1d128652a468caeb55eb611ca019148a2e538d3cc0d397cd14889942904b05c9471bb13ed9fa6250e399d47df22241895c109a68315d SHA512 9b2502b873658c1ef8a86bff091d61b8dc8d66f7395bc0a869f9e6ec60b691a317c084ae326f49ce8dd926f0fa2620a58f3ad76c25e1b1c9606557d2802d1395
 DIST postgrey-1.37.tar.gz 41815 BLAKE2B dd8a1f62f56a614c25863afde089f1882a1567e3a53a24b1d12b6f23994388caf99059f05775853065143f4f953a6fd964625d5c865993e0e679dd545b848c11 SHA512 369968212ea60539efc0d4a7ae84f7c3ce13f5622e6ee070a0089423ef81ca8f7541ebd20289291d0e6a3aec2ca30dbc9c0d9c0a6f0a686adfadb5d0dd7830ca
+DIST postgrey-1.37_p20190625.tar.gz 124667 BLAKE2B ca2caba51a72198e42d6d4d9c5c7590b62c1bd1589d05bfb4096fb4d95ff62ff96976beac8c1b35136a4a6830af936244485ff7dcdcd46d8558a4bef0bbb123a SHA512 f3caf3c7663bd8784701c7e1ad45d1c577edf6fac14591a6983fda25e7f8a875f2501780a8f97ce72e6a324878404e9ac2a003a07ae07ad4debae61fe734b8d4
 EBUILD postgrey-1.36-r1.ebuild 1748 BLAKE2B 17fa8ad75a46cac8658b70666b16427405282799ce1d2528677fefb573c0e8638d68075b7dc6401ebd5722639404a970f1644e0fe7bb1afb6a81bf6af00a6ba6 SHA512 0ea4a73933a11d84894bc8a286193a3b1d71f2ecf5ac2513e9c3cf18364479485519839d09fed3a15152a1208c9dd908695c853a2a17a003b295f9842bbf99bb
-EBUILD postgrey-1.37.ebuild 1662 BLAKE2B b4f70a90e59b28635840c222dc6fb6d7a9008705649db3ed50445ed1c19b0c15be49d5574547197a82ada5242115f4c358e8245b27dc1c18073b119eef6d20a6 SHA512 17512115c889bceccc2a8fd09ffc8aa5815b37256b473a7f794c42f4fd561dc625e7d72f6f67b9a1abe2b89a6a14e0f51ecec913029ea7fd12e1fdca8d707790
-MISC metadata.xml 582 BLAKE2B 68f063bb59cf9526167905dc77294f8c5da400bf2a128dab804f2286c594db84c397f98233fe4428842f0191d495c776b299bd6ab8fc9c3fda509df7c80f3611 SHA512 0b40a89f66f637c4086475a4808771e967063ad6841a7b23174ce2a2adc7c3bc25ce683a37d18c6935f9d2f4ef081cac0c465270484bc15cbe552fd2a3160e01
+EBUILD postgrey-1.37.ebuild 1656 BLAKE2B ab895b8c30d8817c7bb8d990a8828540ade53107ce56c569cfa1fe5a4c76140c3b57d38cafc8320885ecaa1cb4c32dc09788dc32ff029a5620dea31ef4d74408 SHA512 3fc92f83203ffb093268aae830bbdb2aed01da388fed571ebe530b8d43261aaf0c6ab2ed4ec37384a5912e8d4f42f9ad982e5e296274c68de14ca75098813a3b
+EBUILD postgrey-1.37_p20190625-r1.ebuild 1723 BLAKE2B 1fee548caf43321267bc90f709464b559778b865c6eef028b0429a8df88b96bb7dae63bb38f2c42a0a2268226e600fc26bee1c3f507dd1118d7d50f4987af6c4 SHA512 cf9b26c4c940b2c2937e24573bc187e2016d0f08ee90147254a43f0a95b31f29c3cd473de03d53420b5e87c4fd0fb21dda92b218bdbe2ca2947f48d9625b2467
+MISC metadata.xml 541 BLAKE2B 8f30317d462b08e6fffae9e71ebe09c5eaf7d2595df60211201a0c63c409693617bef6be47862d323a50ca5037b28aee97811ff846324fd470d7745b812d632c SHA512 3211c4a2afbd3bb58fc4a179776014e1bf85571ad8e522b5f07171305f934c353b531d2adf12588c076d0122ccaf079a23d71cd3b3c854f4c2d01ee80e7f5de1
diff --git a/mail-filter/postgrey/files/postgrey-1.34-perl-5.18.patch b/mail-filter/postgrey/files/postgrey-1.34-perl-5.18.patch
deleted file mode 100644
index 615c6e5b77d1..000000000000
--- a/mail-filter/postgrey/files/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 <yasu@utahime.org>
-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;
--- 
-2.0.3
-
diff --git a/mail-filter/postgrey/metadata.xml b/mail-filter/postgrey/metadata.xml
index 2805de6dd07d..53aeb0809926 100644
--- a/mail-filter/postgrey/metadata.xml
+++ b/mail-filter/postgrey/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>lists@xunil.at</email>
-		<name>Stefan Weichinger</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
 	</maintainer>
 	<longdescription>
 		Postgrey is a Postfix policy server implementing greylisting developed by David Schweikert at the ISG.EE.
@@ -15,4 +11,7 @@
 	<use>
 		<flag name="targrey">Enables the targrey patch</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">schweikert/postgrey</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/postgrey/postgrey-1.37.ebuild b/mail-filter/postgrey/postgrey-1.37.ebuild
index 37e2c1011e8c..03ab30c7a0e3 100644
--- a/mail-filter/postgrey/postgrey-1.37.ebuild
+++ b/mail-filter/postgrey/postgrey-1.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ http://postgrey.schweikert.ch/pub/old/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild b/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild
new file mode 100644
index 000000000000..7714cf102c09
--- /dev/null
+++ b/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+COMMIT="eb420c5dee57dd54e6f63bad5d74e85f5cc9535d"
+DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting"
+HOMEPAGE="http://postgrey.schweikert.ch/"
+SRC_URI="https://github.com/schweikert/postgrey/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DEPEND="
+	acct-group/postgrey
+	acct-user/postgrey
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-lang/perl-5.6.0
+	dev-perl/Net-Server
+	dev-perl/IO-Multiplex
+	dev-perl/BerkeleyDB
+	dev-perl/Net-DNS
+	dev-perl/NetAddr-IP
+	dev-perl/Net-RBLClient
+	dev-perl/Parse-Syslog
+	virtual/perl-Digest-SHA
+	>=sys-libs/db-4.1
+"
+
+src_prepare() {
+	default
+	# bug 479400
+	sed -i 's@#!/usr/bin/perl -T -w@#!/usr/bin/perl -w@' postgrey || die "sed failed"
+	sed -i -e '/git/d' Makefile || die
+}
+
+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}-1.34-r3.rc.new ${PN}
+	insopts -o root -g root -m 640
+	newconfd "${FILESDIR}"/${PN}.conf.new ${PN}
+	systemd_dounit "${FILESDIR}"/postgrey.service
+}