gentoo resync : 28.04.2021

9 files changed, 35 insertions, 155 deletions

diff --git a/mail-filter/amavisd-milter/Manifest b/mail-filter/amavisd-milter/Manifest
index ca93c700b2ab..423376e94cbc 100644
--- a/mail-filter/amavisd-milter/Manifest
+++ b/mail-filter/amavisd-milter/Manifest
@@ -1,12 +1,7 @@
-AUX amavisd-milter-1.6.0-policybank.patch 937 BLAKE2B 54cd7ffbbdc0396874a3fb8672a62974945ccbe5e18e15ddffccc7f9f83cac3ec0e92a1ce5b83b0ee94903f56831bfdeecb2f879cd495820d84b87fe973c671b SHA512 a329e9b4e0c7b7de4b2b09ec8cf9f9157f7602761843278239530831673bd70e4a15cc5b3ec91700808de6a6a29baa00ea2f96d6c40736da27c7cb4fc059af4d
 AUX amavisd-milter.confd 357 BLAKE2B 4c584ef42c9c1f135160d574dabed9882978930ddf1051161ca7a8ac64a926390ce3aa693957b786cf0f8e83a41b325574c4a19e82b638c2f96726e335ae654d SHA512 354c7e1a0224bd0f8bd40e35dca99fc5c489f9b7ecc2292d992e5594ac969800ab19e99a784957bcc76e3b06788b0623fc5019d8965f002a67c3e01681c541de
-AUX amavisd-milter.initd 678 BLAKE2B 75c31115806da7e9f7fd2746e26cd2ebff55edec6611349f2321e99eba7588a69f005ce810595aad2e70bc54576ff870184974bd6bb91af6e3924fb955387499 SHA512 017cc4e2461b524768f2c7f69a1d16b99c08ebf39d024913e79e5ffb2033a2dbd5eb64cedb3b9e370a0143256fdb17652492385f996f0dbe4baaaa96557a16c6
-AUX amavisd-milter.initd-r1 679 BLAKE2B c6d8d8a8b23c01923e2909f5b58cc8228ac693d210a6bd65d9048aa9ac40dadcfb74bb67eded81315fb4c8545bbc652c90e3db1d61f733d1687deb58795f152d SHA512 c043d41da85b206705c5e58204904b30d2076d9563ca52cac60b31eb9638f4574e5b0b771e43e74e83af1f417944ed737f10699a82933cfbee07e9d69a529695
-AUX amavisd-milter.initd-r2 399 BLAKE2B bf842ef6bca77bebe76fe6969676669c97454eee977e67ccf455b09c2ddc2e290739dbb8dbc525625c82eec690826ce39224f188d3e9819fdd8d55169290dc12 SHA512 2021255da427782854b5b0de670359a7f955491bb4de5e6ec0a961cd571183c81c07468559a7f9c9289b069ada3b8c05dab1e07c8d3beb0e4b01199f24794052
-DIST amavisd-milter-1.5.0.tar.gz 175759 BLAKE2B c9de40eadbfca71a3a35c340372163ed7b685ff7150cdb85ab073cc78abcbc5dfb5fcaccc0b1518fa3a354d6ddcf19b6690d5a125e0f2ccb3ea190be57348b88 SHA512 ef206cd2c64cf48edb8a679b92a960451e0edbec11e0c207942bf6f435f7d14538a409d8197774ea4bbf63f27ed73d52a7c51531155be6d8724981b5dd9e0037
-DIST amavisd-milter-1.6.0.tar.gz 187994 BLAKE2B 87d3d870236b50e9c8c7bf3876fc476fb28ff6ee208c8da77c2f9ab2f1ccc0b883cc551718f4f9639125484965180100088d94557f065c7bf904fc912dd2794a SHA512 2e0b39b733f88742fcb2f4e884e528b70731ad5950bd56d3af1391d666dc018d2f6c1ad4212e787872a503bccbc65c52d55ae195c384e9333e4f39d25b1d1a34
+AUX amavisd-milter.initd-r2 402 BLAKE2B 1b25d6eff80efac18b0674e91602e163ce94545dfa9879666af88a206526c1dd55d7563ea418a0b3921d64fc494227a3f03ad81ef5ff0cd92725dfb136aa22c4 SHA512 0d0fdc98bcea9c72332cba2dbe5809b8dabedbe27a15be39b22a4428f0ec3903743f911ac9737c031c04e9152bb62522dbc0ae9fc03b1ca0c2e593aedd88b5c4
 DIST amavisd-milter-1.7.0.tar.gz 192688 BLAKE2B 882ecdc1f4b1b3fba2f7f82ffb3e7f4ecf27ce42fc14df926a508b852dd142161af9ce65bc367a5968f64a29a40cb362a0783bdbaf4dff2559715bfd53170f73 SHA512 52fdfe4acdd94e387de63d93aa3347dce46e7e16b8ab51679c7bbfc4f6faba160de5ca55aae141cbd06f3d9d1122dea67fdd67562dd5b8314055f7f6071545af
-EBUILD amavisd-milter-1.5.0-r1.ebuild 681 BLAKE2B fd6a954e839da2eb92d023615cdc8d65358e6ee22a7c29aed0f4adfaaa6f04cc70024818fa1005cc71c7d0e16e9841c57c62672cb73d0870f5138cf28bc0cf55 SHA512 0f9c5b732a70a3e9a9206e62c6d92115f9c998c642bdbfa7f6813b4b29865dc793d41de0c27c95a48febbf1e312ef2960efa34f79aa84c2b7a3ad9ba28a2cc92
-EBUILD amavisd-milter-1.6.0-r1.ebuild 730 BLAKE2B 1a451372ba7008105209790587ee1560346a694e4752b7db09fd6b920e8e8a78c633a087baeb57f7c629b4a5e55a4827002ba1f653560877f14a04d6858b0769 SHA512 43e7ce94bea93f1b4b08966f43669715ee7545c5ab176421aa19fd1dff3741c82bcd4725fd64884fa83b25a074ccdd75be3af2dcf736a011e44b1cc8b59776b5
-EBUILD amavisd-milter-1.7.0-r1.ebuild 683 BLAKE2B fec5ac2a2ee5628af601666da5b8f9a0344d3c117e5df7221ccd194282602b67509713998ede1c26a16dc7558750a7c809b4a040d63290934d43ee49a0d99413 SHA512 c48343bed9a8faa06d0214ca7e9aa1d8ad3426e5b10d4939d3773c6d1c5b5aafbf3a7ba17c69caf88b9642cd8053f8bf7ce94eda2465db93a6132e2d63188174
+DIST amavisd-milter-1.7.1.tar.gz 193425 BLAKE2B e93f7f8f4c3b5e59fbfc160e60c8620231f8ab2a5fa06c39cf42b71c0c0abca4e27a1334d01e89337628ccdd685e059be469eeafc385521a780de1bf82bf3070 SHA512 db2fd53a3047a21fb20743fce7d01899eb92efffc62159d3022e0b5014dbfb3667e1664868734d84b58f5daadd8270d3e05a68c60a01a1ac35d104105cc86586
+EBUILD amavisd-milter-1.7.0-r1.ebuild 681 BLAKE2B 0cec22748f64aeae06d5ed2f21944011cce1e53122db498b05eff33d6a74ffe44e255eefde8499c34e1cc8a304000dccc8a683505d5d528ff02efcb1cb32cde0 SHA512 cb5ff423c862a70707351ed7c6eeb7dc9b5130513b6f26ba315a2377ac6a1894d3f335a37c4d39b5ab376332cf391ed04d4131c50d5580e61e11d6b708a415ca
+EBUILD amavisd-milter-1.7.1.ebuild 683 BLAKE2B b1c7a90b44fce5629f78510e61a581c326773f791186610f6b9fff599c7baed6ca1b4c08ecccd6782b8e3bb6888bcdaa405a9674fc4518324024835e74a17993 SHA512 5eb1c946d9b1ec4d314a796aa99eb0da12158b41cbc627ae0d1928056f83e36c9213f6b62ebdc63bd9afeaeb187383571198e5fb5338b5b62d0348130e72f750
 MISC metadata.xml 332 BLAKE2B 5bc31a7148c73721bd5563f2c951ea025db1387cf6dcee67fecc9dbde770199b8d3e1659b34ae8f07dc039880cf2b9484f20afe799983b2837c28bd2b03c1733 SHA512 ae325c6633d2d141416bf0953de89fe177c0afb04e2396ff22e2d1afd258d2a1ac756a868fd3b00466cd9ac80de858a1730d34d4d8e9930d67296ed0e3986101
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.5.0-r1.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.5.0-r1.ebuild
deleted file mode 100644
index 35da9fce706b..000000000000
--- a/mail-filter/amavisd-milter/amavisd-milter-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="sendmail milter for amavisd-new"
-HOMEPAGE="http://amavisd-milter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-		mail-filter/amavisd-new"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch_user
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS CHANGES INSTALL README TODO
-
-	newinitd "${FILESDIR}/amavisd-milter.initd" amavisd-milter
-	newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
-}
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild
deleted file mode 100644
index 74a12efd464c..000000000000
--- a/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="sendmail milter for amavisd-new"
-HOMEPAGE="http://amavisd-milter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-		mail-filter/amavisd-new"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-policybank.patch"
-	epatch_user
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS CHANGES INSTALL README TODO
-
-	newinitd "${FILESDIR}/amavisd-milter.initd-r1" amavisd-milter
-	newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
-}
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.7.0-r1.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.7.0-r1.ebuild
index 3e8aa64faa2e..ec76a0bd1156 100644
--- a/mail-filter/amavisd-milter/amavisd-milter-1.7.0-r1.ebuild
+++ b/mail-filter/amavisd-milter/amavisd-milter-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/prehor/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.7.1.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.7.1.ebuild
new file mode 100644
index 000000000000..1f5babae3926
--- /dev/null
+++ b/mail-filter/amavisd-milter/amavisd-milter-1.7.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="sendmail milter for amavisd-new"
+HOMEPAGE="https://github.com/prehor/amavisd-milter/"
+SRC_URI="https://github.com/prehor/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
+	elibc_uclibc? ( net-libs/libnsl:0= )"
+RDEPEND="${DEPEND}
+	mail-filter/amavisd-new"
+
+DOCS=( AMAVISD-MILTER.md CHANGES INSTALL )
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/amavisd-milter.initd-r2" amavisd-milter
+	newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
+}
diff --git a/mail-filter/amavisd-milter/files/amavisd-milter-1.6.0-policybank.patch b/mail-filter/amavisd-milter/files/amavisd-milter-1.6.0-policybank.patch
deleted file mode 100644
index afbdefc55c80..000000000000
--- a/mail-filter/amavisd-milter/files/amavisd-milter-1.6.0-policybank.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- amavisd-milter/mlfi.c	22 Apr 2013 00:36:12 -0000	1.60
-+++ amavisd-milter/mlfi.c	13 Jan 2015 17:00:47 -0000
-@@ -695,14 +695,14 @@
-     l = 0;
-     *mlfi->mlfi_amabuf = '\0';
-     if ((policybank_from_daemon_name == 1) && (mlfi->mlfi_daemon_name != NULL)) {
--	l += snprintfcat(0, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
-+	l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
- 	    "%s", mlfi->mlfi_daemon_name);
-     }
-     if (auth_type != NULL) {
- 	if (l > 0) {
--	    l += snprintfcat(0, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length, ",");
-+	    l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length, ",");
- 	}
--	l += snprintfcat(0, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
-+	l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
- 	    "SMTP_AUTH,SMTP_AUTH_%s", auth_type);
- 	if (auth_ssf != NULL && *auth_ssf != '\0') {
- 	    l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
diff --git a/mail-filter/amavisd-milter/files/amavisd-milter.initd b/mail-filter/amavisd-milter/files/amavisd-milter.initd
deleted file mode 100644
index 68652d6be3e7..000000000000
--- a/mail-filter/amavisd-milter/files/amavisd-milter.initd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-NAME="amavisd-milter"
-DAEMON="/usr/sbin/${NAME}"
-
-depend() {
-        use logger dns amavis sendmail
-}
-
-start() {
-        ebegin "Starting ${NAME}"
-        start-stop-daemon --start --quiet --exec "${DAEMON}" -p "${PIDFILE}" --user amavis -- ${DOPTIONS}
-        eend $? "Failed to start ${NAME}"
-}
-
-stop() {
-        ebegin "Stopping ${NAME}"
-        start-stop-daemon --stop --name "${NAME}"
-        eend $? "Failed to stop ${NAME}"
-}
-
-restart() {
-        svc_stop
-        # needed to avoid potential mi_stop errors
-        sleep 4
-        svc_start
-}
diff --git a/mail-filter/amavisd-milter/files/amavisd-milter.initd-r1 b/mail-filter/amavisd-milter/files/amavisd-milter.initd-r1
deleted file mode 100644
index 61ae169e9bb4..000000000000
--- a/mail-filter/amavisd-milter/files/amavisd-milter.initd-r1
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-NAME="amavisd-milter"
-DAEMON="/usr/sbin/${NAME}"
-
-depend() {
-        use logger dns amavisd sendmail
-}
-
-start() {
-        ebegin "Starting ${NAME}"
-        start-stop-daemon --start --quiet --exec "${DAEMON}" -p "${PIDFILE}" --user amavis -- ${DOPTIONS}
-        eend $? "Failed to start ${NAME}"
-}
-
-stop() {
-        ebegin "Stopping ${NAME}"
-        start-stop-daemon --stop --name "${NAME}"
-        eend $? "Failed to stop ${NAME}"
-}
-
-restart() {
-        svc_stop
-        # needed to avoid potential mi_stop errors
-        sleep 4
-        svc_start
-}
diff --git a/mail-filter/amavisd-milter/files/amavisd-milter.initd-r2 b/mail-filter/amavisd-milter/files/amavisd-milter.initd-r2
index 4acd7992258f..bcd27759103b 100644
--- a/mail-filter/amavisd-milter/files/amavisd-milter.initd-r2
+++ b/mail-filter/amavisd-milter/files/amavisd-milter.initd-r2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 name="amavisd-milter"
@@ -15,4 +15,5 @@ depend() {
 start_pre() {
 	# needed to avoid potential mi_stop errors
 	[ "${RC_CMD}" = "restart" ] && sleep 4
+	:
 }