gentoo resync : 12.07.2021

7 files changed, 93 insertions, 99 deletions

diff --git a/mail-filter/postfwd/Manifest b/mail-filter/postfwd/Manifest
index 5d6b87ab7e39..f745c6bef936 100644
--- a/mail-filter/postfwd/Manifest
+++ b/mail-filter/postfwd/Manifest
@@ -1,10 +1,8 @@
-AUX postfwd.conf 429 BLAKE2B 9a899d660732afe05e893fb689b483264f42a08f23603cc251f54d52ec1a22e26b71cd1903f18b8778f19ea4d69e362587b86795bced1b7bba2cb702a40757ee SHA512 409d31933fa172af728e6fa2c3dddb1280a3fff5ea6bb9732c5e69e6266f92848553777773edf939bdf387544f9d0c1a5dd764b4c3c11aa2ceeebd5ceafc9fa5
 AUX postfwd.conf.3 421 BLAKE2B 689d11d9a9f71ef84dea8ee01bd20f9406534025a23ec5fc34a7cdfe4d9fb40d68b7d1e94640ff9aa698c21b77e190cf85aa0cf2d2ddb597093742db64cd535d SHA512 c13a0c35c57d7387d36ebc483f37ca4a80f0a7221ec4f7c243a8dd3ab7871b11a3554f1dc38d5b6c10103c508ce91c15c68bea08a427f01825607c17b66d4943
-AUX postfwd.init 632 BLAKE2B dd15670e8e372e1c785314501102c4f22f67e5da43edaa6e5f2815a37be777672d10ad9e454d57607773609f59c3fe61e4c96d29553f1e492c8de3c6a867dc0a SHA512 132e5b44352ab6d8ca9eb565217fba77db311c3a604509407f079587e1f6147d4a4aa105348113c596f1186fbea1e1e0a7ccd7c7be9fe29bfa8404e7f08c950e
-AUX postfwd.init.3 629 BLAKE2B 08d4a9ea497827b3f2062b36bdf62812fef572edf2eae4be905443452a7914612813bec1444450b02fbe37ff42ebaec3fc84fec3a59a217d08e198c625818ae5 SHA512 154120a05506710c2f9b3faae4119e96b3366b34e84ab650e2a24152ea3d342821130409843469982debdd7b12c740262210684cbf887657fded44b52d1f7bff
 AUX postfwd.init.3-r1 416 BLAKE2B 3643658faf4edb22aa1e1de2fdc3a3ee6f436f30a08b0e0046279e4b44b051a8f943afcb7e268b14fc7d13f3e822ad379cc70d53459b9c43191db9d80ddb4e81 SHA512 86bef531d1c6bf27284b0de13eae372ff9b5c62eb0ee04957e0ff740c391d221544f19e8dc0bd58408fe9effac9387afbf1ededb9e0ebae02d92478a77463eb9
-AUX postfwd.service 596 BLAKE2B b11a4f82fcf52556dc0271c29c68feb268b5ce9afc684b81401fb6c8272c177ebe13ff8f64ba9350c84d5fd62ead30d7f9598e69c8012022665d3900a9c899e4 SHA512 5b8e7ce6314cf61eaea13eb582b7e215209fc43bfd506fa1b1423873efb208ae5da8f8a9651358653bd91d436965f1582cc1bf226b0b44ec442869e66c0254e9
 AUX postfwd.service.3 572 BLAKE2B 92963bc0a479994a43556a8e1afbcca46544351ad967d448dd2255a9af13f7b1f69242421f7bc14f0ac6f0a2840b90af4d68b07eb98576bf20cff8ea3b8c6fe7 SHA512 0cc4942230d9a435cc9a49b888de95dcbe038da087eda03cc1f6347cb67e8640ab0810f55c921afdc0456c21a9cc06f562c395538b0548c492d7aadd8cdf9478
 DIST postfwd-2.02.tar.gz 265781 BLAKE2B de63bdab4f7c1b117a16ebed2248f1e89b7c973bb34cee1b3fbbceda8c9d9b92d180fb5de8a332732b69a05d1b157be1c95d81ded003641d78665064a4881432 SHA512 23b48ca7218fba46f4b1887c4c6724112866c2e22e56f749602ba74430c4cf4c8418b9effb400ea4a468a5f137c764cac9611879e37d1585cf6d0b31dd41060f
-EBUILD postfwd-2.02.ebuild 2364 BLAKE2B 43abdcb97314874953742729023cf679054d49e034f39b10ce9c491c25c0c5c813270d4cd0ce1f824efb7927247a1edbb459a649accc885451194469d603fcb5 SHA512 e42a004bce7b32f365ccd6f337f68cb5b537c295747845800c24044934877797a40e19fae977d07f19cf8e692645b1b6332f844d5a8fd1f13b76e79fa96f99d7
+DIST postfwd-2.03.tar.gz 266373 BLAKE2B d7d7ab7680ddc7640831b2216d2f1618f1b4561abed6a0c6c5edabebe205496ae41893500b09c9bd76131dbbbed1743af00156417f2fb23c23c03fdddef96e95 SHA512 1f29766e9e7aa8cfd4c86e426ca578670094eb856758bc67d0fbd98ec31f408a5797e0fd93ee81a169014b5376dfc48f71db122a4cfafe0ba757856679f5ff61
+EBUILD postfwd-2.02-r1.ebuild 2311 BLAKE2B 866daf3823bd6891edd5068c6b2199794dddcab5a73c88419ef615311de5ee3c2ecaffb109ae94360a79eae3b6d61d3377ff9d09c7b1cdc59e4cf650b103e158 SHA512 7191f652ad5661bd24dee9aeeee9f423b6d156418073173da5bedbdde293897a8c11f151f36212899a11c23957e575b70e7c77a862861be44a3a6dc1ccb3192b
+EBUILD postfwd-2.03.ebuild 2311 BLAKE2B 866daf3823bd6891edd5068c6b2199794dddcab5a73c88419ef615311de5ee3c2ecaffb109ae94360a79eae3b6d61d3377ff9d09c7b1cdc59e4cf650b103e158 SHA512 7191f652ad5661bd24dee9aeeee9f423b6d156418073173da5bedbdde293897a8c11f151f36212899a11c23957e575b70e7c77a862861be44a3a6dc1ccb3192b
 MISC metadata.xml 1165 BLAKE2B 8138b0b92b578b7f09793f69a91478da8852b8073e11f6149f6c87dc5dcbe1b8e8a8de0888819370fa002de253953facd76010b0257a7fca249b905649bfc76d SHA512 990b922de7d972da13b32174870ed963a7f2484064e2e2ee1536f43e25b219be722397b3d578ab2dded044b5cb894735eb2f66cb37ac150e08a7ba9f8fcfd3df
diff --git a/mail-filter/postfwd/files/postfwd.conf b/mail-filter/postfwd/files/postfwd.conf
deleted file mode 100644
index 2f6f537e7c8c..000000000000
--- a/mail-filter/postfwd/files/postfwd.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# /etc/conf.d/postfwd.conf
-
-# User and group to execute postfwd as
-POSTFWD_USER="postfwd"
-POSTFWD_GROUP="postfwd"
-
-# Configuration file to use
-POSTFWD_CONFIG="/etc/postfix/postfwd.cf"
-
-# The IP address postfwd will listen on
-# WARNING: You _really_ want this to be localhost for security!
-POSTFWD_LISTEN="127.0.0.1"
-
-# The port postfwd will listen on
-POSTFWD_PORT="10040"
-
-# Additional options to pass to postfwd
-POSTFWD_OPTS=""
diff --git a/mail-filter/postfwd/files/postfwd.init b/mail-filter/postfwd/files/postfwd.init
deleted file mode 100644
index b56d8b412f10..000000000000
--- a/mail-filter/postfwd/files/postfwd.init
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PIDFILE=/var/run/postfwd.pid
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting postfwd"
-		start-stop-daemon --start --quiet --background \
-		--pidfile ${PIDFILE} \
-		--exec /usr/sbin/postfwd2 -- --daemon --file ${POSTFWD_CONFIG} \
-			--interface=${POSTFWD_LISTEN} --port=${POSTFWD_PORT} \
-			--user=${POSTFWD_USER} --group=${POSTFWD_GROUP} \
-			--pidfile ${PIDFILE} \
-			${POSTFWD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping postfwd"
-		start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/mail-filter/postfwd/files/postfwd.init.3 b/mail-filter/postfwd/files/postfwd.init.3
deleted file mode 100644
index 7fc17344a31d..000000000000
--- a/mail-filter/postfwd/files/postfwd.init.3
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-PIDFILE=/var/run/postfwd.pid
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting postfwd"
-		start-stop-daemon --start --quiet --background \
-		--pidfile ${PIDFILE} \
-		--exec /usr/sbin/postfwd3 -- --daemon --file ${POSTFWD_CONFIG} \
-			--interface=${POSTFWD_LISTEN} --port=${POSTFWD_PORT} \
-			--user=${POSTFWD_USER} --group=${POSTFWD_GROUP} \
-			--pidfile ${PIDFILE} \
-			${POSTFWD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping postfwd"
-		start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/mail-filter/postfwd/files/postfwd.service b/mail-filter/postfwd/files/postfwd.service
deleted file mode 100644
index 376e8d2da320..000000000000
--- a/mail-filter/postfwd/files/postfwd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Postfix firewall daemon
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/postfwd2 --shortlog --summary=600 --cache=600 --cache-rbl-timeout=3600 --cleanup-requests=1200 --cleanup-rbls=1800 --cleanup-rates=1200 --daemon --file=/etc/postfwd/postfwd.cf --interface=127.0.0.1 --port=10040 --pidfile=/var/run/postfwd.pid --user=postfwd --group=postfwd
-ExecStop=/usr/sbin/postfwd2 --file=/etc/postfwd/postfwd.cf --pidfile=/var/run/postfwd.pid --kill
-ExecReload=/usr/sbin/postfwd2 --file=/etc/postfwd/postfwd.cf --pidfile=/var/run/postfwd.pid --reload
-
-[Install]
-WantedBy=multi-user.target
diff --git a/mail-filter/postfwd/postfwd-2.02.ebuild b/mail-filter/postfwd/postfwd-2.02-r1.ebuild
index df52b4a6f052..9c5901fcc653 100644
--- a/mail-filter/postfwd/postfwd-2.02.ebuild
+++ b/mail-filter/postfwd/postfwd-2.02-r1.ebuild
@@ -1,20 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit systemd user
+inherit systemd
 
 DESCRIPTION="Versatile Postfix policy server with a flexible ruleset based configuration"
 HOMEPAGE="https://www.postfwd.org/"
 SRC_URI="https://www.postfwd.org/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=""
-RDEPEND=">=dev-lang/perl-5.16.3
+RDEPEND="
+	acct-group/postfwd
+	acct-user/postfwd
+	dev-lang/perl
 	dev-perl/Net-CIDR-Lite
 	dev-perl/Net-DNS
 	dev-perl/Net-Server
@@ -25,13 +28,6 @@ RDEPEND=">=dev-lang/perl-5.16.3
 	virtual/perl-Time-HiRes
 "
 
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	enewgroup postfwd
-	enewuser postfwd -1 -1 -1 postfwd
-}
-
 src_install() {
 	local BIN="postfwd3"
 	# program
diff --git a/mail-filter/postfwd/postfwd-2.03.ebuild b/mail-filter/postfwd/postfwd-2.03.ebuild
new file mode 100644
index 000000000000..9c5901fcc653
--- /dev/null
+++ b/mail-filter/postfwd/postfwd-2.03.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Versatile Postfix policy server with a flexible ruleset based configuration"
+HOMEPAGE="https://www.postfwd.org/"
+SRC_URI="https://www.postfwd.org/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/postfwd
+	acct-user/postfwd
+	dev-lang/perl
+	dev-perl/Net-CIDR-Lite
+	dev-perl/Net-DNS
+	dev-perl/Net-Server
+	dev-perl/NetAddr-IP
+	virtual/perl-Digest-MD5
+	virtual/perl-Storable
+	virtual/perl-Sys-Syslog
+	virtual/perl-Time-HiRes
+"
+
+src_install() {
+	local BIN="postfwd3"
+	# program
+	dosbin sbin/${BIN}
+
+	# man pages and documentation
+	doman man/man8/${BIN}.8
+	dodoc doc/{${BIN}.CHANGELOG,${BIN}.txt}
+
+	# example configuration
+	dodoc etc/${PN}.cf.sample
+
+	# plugins and tools
+	dodoc -r plugins tools
+
+	# start scripts script and respective configuration file
+	newinitd "${FILESDIR}"/${PN}.init.3-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf.3 ${PN}
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+}
+
+pkg_postinst() {
+	einfo
+	einfo "${PN} has no default configuration for safety reasons. Every"
+	einfo "mail system is different, so you should craft a set of rules"
+	einfo "that is suitable for your environment and save it to:"
+	einfo "   ${EROOT}/etc/postfwd.cf"
+	einfo "You can find a sample configuration in:"
+	einfo "   ${EROOT}/usr/share/doc/${PF}"
+	einfo
+	einfo "If you want ${PN} to start on system boot, you have to add it your"
+	einfo "default run level if using OpenRC:"
+	einfo "   # rc-update add postfwd default"
+	einfo "Also remember to edit ${EROOT}/etc/conf.d/${PN} to your liking."
+	einfo
+	einfo "Or - if you are using systemd - enable the service:"
+	einfo "   # systemctl enable postfwd"
+	einfo
+	einfo "A plugins sample folder has been placed under:"
+	einfo
+	einfo "   ${EROOT}/usr/share/doc/${PF}/plugins"
+	einfo
+	einfo "You can find additional tools for testing ${PN} in:"
+	einfo "   ${EROOT}/usr/share/doc/${PF}/tools"
+
+	ewarn
+	ewarn "Please read the documentation carefully and properly test new"
+	ewarn "rulesets before putting them into production use. Otherwise you"
+	ewarn "risk accidental mail loss or worse."
+	ewarn
+	ewarn "Visit https://www.postfwd.org/ for more information."
+	ewarn
+}