gentoo resync : 18.11.2018

6 files changed, 142 insertions, 7 deletions

diff --git a/mail-filter/milter-regex/Manifest b/mail-filter/milter-regex/Manifest
index 4f337fd47857..070e281e4b14 100644
--- a/mail-filter/milter-regex/Manifest
+++ b/mail-filter/milter-regex/Manifest
@@ -1,6 +1,11 @@
 AUX milter-regex-1.9-gentoo.patch 1074 BLAKE2B 2a5d23b52327ec538ca2c59cba79569c8ba376d2ed0cf8a72bb0cda669de0db143baf59b5f62ac7d896e3e8d7158af88c47f32e09cbc454fdc4601b00c66341f SHA512 d7311e3da08aeb39b2706c110c67a1aaf3f114aeb3fe94a73f8c10a8327e1865cb911f992a887fb518a6c500a4bae5d4e8c39955820436b21dab8f3820dd27cc
+AUX milter-regex-2.2-gentoo.patch 1078 BLAKE2B 30b782e70b2b9b23d3bdfb22ac5bdecfc1af0d08b018ac9f05d3893eef7f398a47072824cf814d8bea98a148f28c054d13963a54a1b98481961e6377233ca74f SHA512 6e5af31774d7dcb9d53eb4736bf1604f1d63ac83ad4cfb28bdcef451ff932f918afbbb4f6dcc68f5a82cba84c24f15f67ddffacb05b849297a942a789568a81b
 AUX milter-regex-conf 177 BLAKE2B 9a05241608c171c8cd0ff3c34962718baa94b5f67692758b01247de2386e3142f6cb4704b32b47427f2f45b222685ec9205227b4d99dfcc0c41f82f194c3c8f9 SHA512 b4fa346684bf2184021adad76c44fbf38e3127299792d5a3b0f0052019a6046deaab19b56bee2b44b7f4fced9c309f440cf4be18f8190d661fc08bedaadbc2e8
+AUX milter-regex-conf-2.2 274 BLAKE2B 6622d3f5bee56d25a60ba2e9826bcbdf82a8ffaefab4ab94a9d45d8bb9d8d4c9dbba554589d608cf4d80d44d982f1cdd1d2edc35dccd5f7bb89f27b042aa13bb SHA512 5c16d1d121cd17b15520fb7d8bf6e06440e4b87c4214a2fc1587317d0927d96ba04d89610ee4c5db3b6fdfa2fe5ca536149e782081138e2b0b8c93826febcab5
 AUX milter-regex-init 842 BLAKE2B 052aee4916608c42f5d664a9bb46eea5c839456f69b71c6f4c9f737abd88eb86cc0a8e8814cab6391264c084967dd90c64117bbc2db55d79c82b37f79a991a89 SHA512 63ba6f37fe387179c12c6b938985cfd37d5a9ea470d90666636d14d5bac53fe42ee11e559513db6cd3f21066a9adc0ee3ef59c361bc5e65364fc9a41525ff2c8
+AUX milter-regex-init-2.2 409 BLAKE2B 16b13cdd120a283918f7b7bf7802f3114c164776760a08a03158968347a757ea6db1d18ae957c0736def7ae08a47ca3d7c4c6c36fafc4cb624ff7521fc591a5f SHA512 4cb777e506304a0460da9ed13ad94257737a1f8d7346e0d0b6dc30b496da7863861c3d3184ed10e577e1b7ab234e210da70cc42a497c0111538f5a03ac21fc98
 DIST milter-regex-1.9.tar.gz 19880 BLAKE2B 8934eb4f78f168b6f4f93b3a7e70b896c6518cd1228ea8fe387184a718a002f051f5084a7a7f4d07c9e7832fe1c9e9bc907661c4e765dde938b7c6049c8772e6 SHA512 55cb97eba01220eb57c29498a090152c05d259abbe6f771e47a67499e7c2a1d4121ec9d0bce84cc8b6490bcd20dea8eaaba753e61f1ce9002edd8440b13f7148
+DIST milter-regex-2.2.tar.gz 20496 BLAKE2B 75cd668e8f75a62bb16d1e38d089465e1e9b49a7441594cb8f77279c9e29f1b90c7b452595f8653b81167fbed8f10e8322ccec51374446938ca43b245cbfa440 SHA512 c2f94d1d9897e2a3f62639343ff9272d28c044f25c59e10f12f37250aa0e5426174cb2a74850993246628e828d21f5cba8567de65a225235eac1969836e41f28
 EBUILD milter-regex-1.9.ebuild 1629 BLAKE2B ab1894e178101a82f0770c7a55fb010c2edc07a62ade4992870be338a5e9d2b17e704e6fdb31beb3338c78013c6b6102ce813144b0de1a7d1e06d923aee25221 SHA512 f58ccd7fe3c43aaaea5508f5ef653c6a00d336cb130fef4b124d4402f1e7bf3c0e30d3720e5a2ccfabee41b8fcd21f2d302d955a74b8db75f14ce7960790dd75
-MISC metadata.xml 479 BLAKE2B 461923701b076e778c5bb13a22e9d3d1d5774439a6cf4e85066c8cb1ec47dc3dbbd07b928ae4bdc72e94ea6f4a559e46d20a6b9fcc4e3db60690cfc1f3b1dc8f SHA512 7cdb6340985723327504cc1df87cccf32813bdef5e014f2c794b50482072efc990707edc47c3818baf86c972d1032da7631e216bc47ab72ee37de0061ccf2b50
+EBUILD milter-regex-2.2.ebuild 1270 BLAKE2B bd58fe31035c9dcb7e4e2a45c28875c1acdfc532501d082148277cc5238fef566123004e5b3a95578e72e5055c08efb736d9e6669aed5690fcf60f6122238a28 SHA512 d30adc300ea4e186a202befef8cde5a22a5acbb4e9208ef4ee8abfc3353a5693b3ce33231713833a9b38ed321e5f00570da5a3d5dbfad9295e9ec35a0d869647
+MISC metadata.xml 801 BLAKE2B fecf24c1cf94b3a8435c676546684ee2804c399550a3259c0a89763a71d0077cce15e24fbeeaa5727e3f7a7eb3df97cf3ed9228bd57bf6a7916abe6c5c95e7e8 SHA512 7bd781757ba81d5dfa5cd24ec86953ddd04e6f0778d4db1bdfb3f6fe0a8bc09c64df0889687393aeadba690e0f07b88eecf6729adff754f03ed061acb549e0bf
diff --git a/mail-filter/milter-regex/files/milter-regex-2.2-gentoo.patch b/mail-filter/milter-regex/files/milter-regex-2.2-gentoo.patch
new file mode 100644
index 000000000000..14efd964f843
--- /dev/null
+++ b/mail-filter/milter-regex/files/milter-regex-2.2-gentoo.patch
@@ -0,0 +1,38 @@
+--- a/Makefile.linux	2011-07-16 16:51:34.000000000 +0300
++++ a/Makefile.linux	2012-08-05 18:15:30.906378968 +0300
+@@ -6,28 +6,27 @@
+ # see milter-regex.init for an init script for RedHat/Fedora
+ # (contributed by admin@2ka.mipt.ru)
+ 
+-CFLAGS=		-g
+-LDFLAGS=	-L/usr/lib/libmilter -lmilter -lpthread
++LIBS=  -lmilter -lpthread
+ 
+ all: milter-regex milter-regex.cat8
+ 
+ milter-regex: milter-regex.o eval.o strlcat.o strlcpy.o y.tab.o
+-	gcc -o milter-regex milter-regex.o eval.o strlcat.o strlcpy.o y.tab.o $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o milter-regex milter-regex.o eval.o strlcat.o strlcpy.o y.tab.o $(LIBS)
+ 
+ milter-regex.o: milter-regex.c eval.h
+-	gcc $(CFLAGS) -c milter-regex.c
++	$(CC) $(CFLAGS) -c milter-regex.c
+ 
+ eval.o: eval.c eval.h
+-	gcc $(CFLAGS) -c eval.c
++	$(CC) $(CFLAGS) -c eval.c
+ 
+ strlcat.o: strlcat.c
+-	gcc $(CFLAGS) -c strlcat.c
++	$(CC) $(CFLAGS) -c strlcat.c
+ 
+ strlcpy.o: strlcpy.c
+-	gcc $(CFLAGS) -c strlcpy.c
++	$(CC) $(CFLAGS) -c strlcpy.c
+ 
+ y.tab.o: y.tab.c
+-	gcc $(CFLAGS) -c y.tab.c
++	$(CC) $(CFLAGS) -c y.tab.c
+ 
+ y.tab.c: parse.y
+ 	yacc -d parse.y
diff --git a/mail-filter/milter-regex/files/milter-regex-conf-2.2 b/mail-filter/milter-regex/files/milter-regex-conf-2.2
new file mode 100644
index 000000000000..382a5fe1d978
--- /dev/null
+++ b/mail-filter/milter-regex/files/milter-regex-conf-2.2
@@ -0,0 +1,13 @@
+# Config file.
+MR_CONF="/etc/milter-regex.conf"
+
+# Process and socket owner, socket group, socket permissions.
+MR_USER="milter"
+MR_GROUP="milter"
+MR_PERM="0660"
+
+MR_RUNDIR="/run/milter-regex"
+MR_SOCKET="${MR_RUNDIR}/socket"
+
+# Additional options for logging etc.
+MR_OPTS=""
diff --git a/mail-filter/milter-regex/files/milter-regex-init-2.2 b/mail-filter/milter-regex/files/milter-regex-init-2.2
new file mode 100644
index 000000000000..57c5988babb1
--- /dev/null
+++ b/mail-filter/milter-regex/files/milter-regex-init-2.2
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/milter-regex"
+command_args="-c ${MR_CONF} -u ${MR_USER} -p unix:${MR_SOCKET} -P ${MR_PERM} -U ${MR_USER} -G ${MR_GROUP} ${MR_OPTS}"
+
+depend() {
+	before postfix sendmail
+}
+
+start_pre() {
+	checkpath --directory --mode 0755 --owner ${MR_USER}:${MR_GROUP} ${MR_RUNDIR}
+}
diff --git a/mail-filter/milter-regex/metadata.xml b/mail-filter/milter-regex/metadata.xml
index 400a0fa1ec9d..e6990e63034f 100644
--- a/mail-filter/milter-regex/metadata.xml
+++ b/mail-filter/milter-regex/metadata.xml
@@ -1,10 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
-<longdescription>milter-regex is a very simple milter-based plugin that rejects or discards messages matching
-regular expressions. It doesn't add much processing overhead, so even a busy mail server can afford to run it.</longdescription>
+	<maintainer type="person">
+		<email>gentoo@seichter.de</email>
+		<name>Ralph Seichter</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
+	<longdescription>
+		milter-regex is a very simple milter-based plugin that rejects or
+		discards messages matching regular expressions. It doesn't add much
+		processing overhead, so even a busy mail server can afford to run it.
+	</longdescription>
+	<upstream>
+		<doc>https://www.benzedrine.ch/milter-regex.html</doc>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/milter-regex/milter-regex-2.2.ebuild b/mail-filter/milter-regex/milter-regex-2.2.ebuild
new file mode 100644
index 000000000000..5b060fbb4e9a
--- /dev/null
+++ b/mail-filter/milter-regex/milter-regex-2.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs user
+
+DESCRIPTION="A milter-based regular expression filter"
+HOMEPAGE="https://www.benzedrine.ch/milter-regex.html"
+SRC_URI="https://www.benzedrine.ch/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )"
+DEPEND="${RDEPEND}
+	virtual/yacc"
+
+PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )
+
+src_compile() {
+	emake CC="$(tc-getCC)" -f Makefile.linux all
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /etc
+	newins rules ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}-conf-${PV}" ${PN}
+	newinitd "${FILESDIR}/${PN}-init-${PV}" ${PN}
+
+	doman *.8
+}
+
+pkg_preinst() {
+	# For consistency with mail-milter/spamass-milter (see bug #280571).
+	# While the milter process requires an owner, a home directory is not
+	# necessary because no data is written.
+	enewgroup milter
+	enewuser milter -1 -1 /var/lib/milter milter
+}
+
+pkg_postinst() {
+	elog "Postfix configuration example (add to main.cf or master.cf):"
+	elog "  smtpd_milters=unix:/run/milter-regex/socket"
+	elog "Sendmail configuration example:"
+	elog "  INPUT_MAIL_FILTER(\`${PN}',\`S=unix:/run/milter-regex/socket,T=S:30s;R:2m')"
+}