gentoo auto-resync : 01:10:2022 - 07:10:12

6 files changed, 61 insertions, 2 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 1559dd05a099..1d7c61b525bd 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/milter-regex/Manifest b/mail-filter/milter-regex/Manifest
index c8d58f9e685b..8fc2d7edae51 100644
--- a/mail-filter/milter-regex/Manifest
+++ b/mail-filter/milter-regex/Manifest
@@ -1,7 +1,9 @@
 AUX milter-regex-2.6-gentoo.patch 1078 BLAKE2B 30b782e70b2b9b23d3bdfb22ac5bdecfc1af0d08b018ac9f05d3893eef7f398a47072824cf814d8bea98a148f28c054d13963a54a1b98481961e6377233ca74f SHA512 6e5af31774d7dcb9d53eb4736bf1604f1d63ac83ad4cfb28bdcef451ff932f918afbbb4f6dcc68f5a82cba84c24f15f67ddffacb05b849297a942a789568a81b
+AUX milter-regex-2.7-implicit-func-decl.patch 257 BLAKE2B 68b6d03f3f8bb1a154f9a0014554168e712e4d5df458129626a82126783f0df29508e6d4b06bccce21d68f83d9a33c9aa091ad17944b15a8c6549f6dfe81cd8f SHA512 7702692424435c233c4022099ae6b214580af1411ff1b7e38fa26141fa9b70ee6431c725cd25f1d06709901d89f0102522b5340357cac3f3fa9646785c4ede20
 AUX milter-regex-conf-2.6 459 BLAKE2B d15f232945a919e49f26df7a5489701b1a13567fca10d877e93943e2ac31865bdf6af26a10da196a64ce0d42238e58631b041e2b846187e82dff0ff38e8aac83 SHA512 2178c0b11ca6fca9121da66a2b4c828105efe9e94ba4b4b6dd56b235dfe3b3ab14a6f7ac9004d7a1fb2b50ff4730f875e85afa0d11c72ab2949aa150b28f1c8c
 AUX milter-regex-init 818 BLAKE2B 9130db7e295262a02cfc61464945029810f61fba4947e422fca9820d0d58762db228bcc760bc8e1f55aaa61cff9455abed19f66ff7bd910aecd9a969eaa3c12d SHA512 04549ec85a8b3c9fe4e65bcfe903aefbd9019b8324041448586bb3ed3bada20c0bf60fbe485e90bb1cf777703c696d2a0c9b3630c218d7037e1c6b2680eace75
 DIST milter-regex-2.7.tar.gz 20579 BLAKE2B e48c5747537d439372d8f473d9b39e337501c24b46d52e13f727b32ee29bb58f266e45ecabad01937f5e56a4a773659daf34d12c6728b6700679b04a2cb595d0 SHA512 d698a7c35768846bcc87a31167cf9a5c41c99d8fa3f3cb5c231e100a7e149d9bca6fc689ece805bd80688787b6d3fa0d9ace49592e1d6c53a25fc2086ebf9962
 EBUILD milter-regex-2.7-r1.ebuild 1110 BLAKE2B 8e3ce76e1d1db9231bd6bb2454219a85e598e4c6daee7bce7213fdfa5638db11e4a18faf2f838f528786d49005aa78de1dd0e6d48548006ae426fa11b7e85446 SHA512 2972ee083e31f5cb884ade0d0834f5610d319dca7faecef679996dbe96a32b418fbe9e4e4683e780817c7c4f66b6d0e0e849f0210f62216d54bc816c70432aa2
+EBUILD milter-regex-2.7-r2.ebuild 1176 BLAKE2B a302cbefb618972091575323ad8ac5c1d7333d80aa2c11fbb7013a186b4815aea689084e10cbb34c088ba683b2627b753f7d1b8c2c01b13b7f3995624c82193d SHA512 609ea6c034114c64a3f7909dc8addc37f09f477d6b5311876e16ddb43b00f6a2f44c0da0caf5ef2bda7c6a1a24c18c145322bf52ecbc3fc7e4312843ab26f03f
 EBUILD milter-regex-2.7.ebuild 1122 BLAKE2B 7974a8b954484fabec28215b75101f07a71ba4cee8228f2ab9c0b99123ff265bba062fd8ef62be5e0e06f5931f402daff79429a77baa5e987dd935fe3256c182 SHA512 d5d0a071a6c461186c14fc0416f4bd6290e0057290fc1e027bf93fc9855b654a8acd4060aa1aa02c4820701973c3cb55f3c6982e47d11fbff5d914fa4b217177
 MISC metadata.xml 727 BLAKE2B 46c3ce4f04ed4db2d8ce595744c16f46a0270186c4620d5245db9b0aedf4867bbd04c2b44e59591def9a01da8b5387baeaf77aae32dd9f7a18267ff2984ccc21 SHA512 a13def0da2410e52c7c63ec9cf1b72c304652e9f7ddce89cadec60285794dc70fc90c714e8a5860525426fd3768ce31a82375059c12ae42528fef57854cad282
diff --git a/mail-filter/milter-regex/files/milter-regex-2.7-implicit-func-decl.patch b/mail-filter/milter-regex/files/milter-regex-2.7-implicit-func-decl.patch
new file mode 100644
index 000000000000..c2edaa8e0b8f
--- /dev/null
+++ b/mail-filter/milter-regex/files/milter-regex-2.7-implicit-func-decl.patch
@@ -0,0 +1,10 @@
+https://bugs.gentoo.org/871366
+--- a/eval.h
++++ b/eval.h
+@@ -107,4 +107,6 @@ struct action	*eval_end(struct ruleset *, int *, int, int);
+ void		 eval_clear(struct ruleset *, int *, int);
+ void		 free_ruleset(struct ruleset *);
+ 
++int yylex(void);
++
+ #endif
diff --git a/mail-filter/milter-regex/milter-regex-2.7-r2.ebuild b/mail-filter/milter-regex/milter-regex-2.7-r2.ebuild
new file mode 100644
index 000000000000..1e21636dfdff
--- /dev/null
+++ b/mail-filter/milter-regex/milter-regex-2.7-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+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="acct-user/milter-regex
+	>=mail-filter/libmilter-1.0.2_p2:="
+DEPEND="${RDEPEND}
+	virtual/yacc"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.6-gentoo.patch"
+	eapply "${FILESDIR}"/milter-regex-2.7-implicit-func-decl.patch
+	eapply_user
+	# Change default user
+	sed -i -e 's/_\(milter-regex\)/\1/g' ${PN}.[8c] || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" -f Makefile.linux all
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /etc
+	newins rules ${PN}.conf
+	newconfd "${FILESDIR}/${PN}-conf-2.6" ${PN}
+	newinitd "${FILESDIR}/${PN}-init" ${PN}
+	doman *.8
+}
+
+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')"
+}
diff --git a/mail-filter/policyd/Manifest b/mail-filter/policyd/Manifest
index 0a33d0cf989e..e40a411fb09e 100644
--- a/mail-filter/policyd/Manifest
+++ b/mail-filter/policyd/Manifest
@@ -4,5 +4,5 @@ AUX policyd-post182.patch 1567 BLAKE2B 7019004993501396bada4754b40dbbf09e507220d
 AUX policyd.confd 61 BLAKE2B d39d4e5894dbc1164d29bf7e3fccc19c4247fd6a0f09c09f07e6f57ed531fc8aa5c22ea05ce63767e011754d1fc4aeed03b1d0cb1ef07705bf734c4e1f3b5f53 SHA512 6fbac91a71bd556e864b70534a57fcc60bf4a838ff780ee878b257313e12205ae95402c591cc62604dad8d1ee349ecea74c1646429c39587dc0ba13a697ca68f
 AUX policyd.rc 443 BLAKE2B 1135a6ab78cda5cb03cbed9d18773ab91237db217feaa0867dc0a9793f44f72d97033f77c78f94eb58b11a7f42071f59705088bf0b8e21cb8c8020a1bf6cf05b SHA512 32f2dec8b9067bcf219ee4edec2b36d010cadc34a018e6597339b238b21db7782975d12098d1232854b70e19bbdbe355bc8c4f23a5675ecc6171eeca81bfa69c
 DIST policyd-1.82.tar.gz 68372 BLAKE2B 39603b025235d3a68401e8cf9b357d224515f5308f1b86bf84d1231157ac2d5c2ca4dc00cc9deefdd03cdb4ffc214a8ebe5582e299f05b79a471e93238e36cff SHA512 08de114736620d5f1c11f7183135ecf4589c2d6258dee486b5f4f5a9156e4feabd7eaf19fa09428e79d5d5c72ac4757c83af86f43a7547030b1a59cb368e82a8
-EBUILD policyd-1.82-r4.ebuild 1966 BLAKE2B fd7c704f56a1dfe7b6fe8046a44305c38c1e19a96bdb764f9be27364a070d32bc84f4e710cbf644100361d524fb979229eba967f2df4f2c6727bfd73110a29e4 SHA512 3d0a926457a954917b76d3fa051979a1fa7ed75844ef9b0ba69c8f39a6569bd3af5c45553ea20bece45f3aad9675f572ccb7802a6e35e4ff8e905cb50118e944
+EBUILD policyd-1.82-r4.ebuild 1967 BLAKE2B 0ac173e33d2076194c9c12a837dab08624136db5a403f292e0b5a583e6f7eae597a81669343a6a6dce751887ce70436f7335634421f7a529878cd5833fef64bb SHA512 907d95d13188c8be9b489829d3b207fb54365d57c8c4ee55159b1ac26dafb931b16e324cf00c8794dd31223667d1440a1acbd900ae2058a0ee7323eb1513aa09
 MISC metadata.xml 245 BLAKE2B c594b1d103dfa62ae03d12242e3049b561db4cfed14b245169aaec7a17dfe574ef4a13cb8312eb2dd2f73eea00f0669cb90ac33f63d0500c532c336b8886bf61 SHA512 6c705301f1a41672e4d0ffc98e85f59544216548b22ef1c969a1ee390282f285338e3300a78299857aa111b0fb44c13e2098fd16a51606237ca9bb0f034cbc94
diff --git a/mail-filter/policyd/policyd-1.82-r4.ebuild b/mail-filter/policyd/policyd-1.82-r4.ebuild
index c4c0e75853d5..a589b431e0d4 100644
--- a/mail-filter/policyd/policyd-1.82-r4.ebuild
+++ b/mail-filter/policyd/policyd-1.82-r4.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Policy daemon for postfix and other MTAs"
 HOMEPAGE="https://wiki.policyd.org"
-SRC_URI="https://download.policyd.org/v1.82/${P}.tar.gz"
+SRC_URI="https://download.policyd.org/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"