gentoo auto-resync : 25:10:2022 - 09:53:29

7 files changed, 80 insertions, 19 deletions

diff --git a/mail-filter/mimedefang/Manifest b/mail-filter/mimedefang/Manifest
index 7c685fee7c47..b06b6e1b0528 100644
--- a/mail-filter/mimedefang/Manifest
+++ b/mail-filter/mimedefang/Manifest
@@ -1,8 +1,11 @@
 AUX mimedefang-2.72-ldflags.patch 2458 BLAKE2B 3d78cfee8b7bfe87c57390045919511ee11548bc0279316b54c63a428e04d4d168b1d5cd430600e17fa63c5ca2770756bfdf8f681025dff08a600629af3eb9d6 SHA512 a84ff0cefc9dc56b348b8fe6715e9669af43a25d20867b63c63a3006565edd6fb40d2f27b8ddcfd8dd5bb9a4f023e23ae4d258da70df53e3309d680fac4b0aef
-AUX mimedefang-tests.patch 327 BLAKE2B 1bf56e641b0094c9ff32c8e61d8ce751383e7aa084469f32a5ccd72fab970524723882e979394913c24d0d8211344d0ac5cb6df32996826facba4d09d4847b41 SHA512 d04f81edafb569adbe98ee6cd20793c657b098d3d29aec84af9be3bf61cbba592cdd4adda314ad28e2e559ca00979b24ec7783849d11bc4e213f54ab305b69f7
-AUX mimedefang.conf 4760 BLAKE2B 14457894f4f42557ee06aca1454a85978fee1d0dd21dca7cfcf17a2526473212e7813079af4ea949cef398ee3caecc2ce505c254c66209899a64fc7728ef0ff1 SHA512 7f0c8700a48fcbf8e9539a5e34e9b59288ecabe53a1651f6e4b6e01a6bd71475dd5e6417ef966868b6d8b16e36946cde04e31f1ef634abd7b40f3f2f2f55d594
-AUX mimedefang.init 1740 BLAKE2B bf00f5797e2dd72a29dc5b955a18a7faff1e9fd2b82d011f0628222ebc2b4117e1a9262d096706b83729c4e3851a09a65a0d1c0ee57d68c155c9136c63b569a2 SHA512 f45b3ce8a085b3559c80e4bf361ecf3cc16c360322986ac5381a1707e217a282fec4a9bec7856dd153107557911bd6eb9a9ec66b160c0b6bfec3e783aaef321a
+AUX mimedefang-tests.patch 255 BLAKE2B c922cc096e4364cdd601c2f4746f5c71393d0c94a32f7141d439c9a5995977cfec52a40722f9fa11a91bc00df1833b89371f5c470134bf3953cca8ed7e84967b SHA512 90d86b05a50746064f281bc2a812f167a6ec2ac019c2fd9eb863e4a09f54648d8e1ed14345f949d2666d2bbee23e89c02cfabd8d3d96ac4aa1bcd8e8851be516
+AUX mimedefang-tests2.patch 630 BLAKE2B 7e7e07d27c8bc21ea2382895b9f3207850de25c096ad1891d0e32c556c76be78a0d8ddd1b07bd0598f2df36e32d9072b3d7bc14a9786238558dd72360b2a7e22 SHA512 23c8b20696ec6217ba69d7105f3947d71f819d703b0be759dcacbf996b07ce9797c568fa9c5598402298d1fda58dc07c6b0d84d7a630fc625ca72a54b1dded91
+AUX mimedefang-vendor.patch 1161 BLAKE2B dd3db311d749c7655dfccaa791e64179db0ae5317a6bc21ddb88d9bba95606576a5e70276ba5e7aaf63599d2b79a428a09a4b5ccd8e9145e96864687d2277dab SHA512 cefcd2afdc9f4013705eea09401b6ebe60f1f9649456d082d7e8aa79ab6ee9e289c4fda20a224846fbb49db20e16f5e47d572f44daf69064b8eafbac450adaf3
+AUX mimedefang.conf 4802 BLAKE2B a4b1961b2309b85abb6ff607b6044e9cd9e0938ef740504c2d3d09bc60df9bb56ccbbab78009246637e6b914a6a51d9b61527f721369ea89c8d56b0ede04a51c SHA512 a087fa75169e2e23ab6e6ec7fabbc965a5585bea9731b2bf1d3612185e6314b4bbe7d4d23dd8adfc3b904bd9b957f9dafe5a9eb139a7f2df4ad86197993c79e8
+AUX mimedefang.init 1799 BLAKE2B 96da24cc26a5b10358a8c993cce9a2a329d2b38df92571af38ea193285e67369ee5d333558c1c8eb0c0ca90709b8b860e119d9146d6639346a85a7ffe50f822c SHA512 1fe4d534063b771b9ef0838fe54c7138e398d11569a2f1880ba41d03d28831cce59bda80cc4eaa1e6564c360638aad82da3f12666dbcc2ff69ddf4370e93b539
 DIST mimedefang-2.84.tar.gz 371596 BLAKE2B b9b871d6a438792afbcebfcd99a77a1f9bb2c0dc7826abea74db913c6dc154403753a3016dc0647e9873256fe354649dea096c0e50d54f8db16ff8d2b91f54f4 SHA512 ffe039654d2e3f649219efc559380e39b21ce910becc36e262356d59d50129f8683ee2e59dd9680aff46478ccebd6b3d9c4567f85ade9a8464077350f4e52f48
-EBUILD mimedefang-2.84-r1.ebuild 1795 BLAKE2B 8f9134d7f5c9236e294a09d2bc8a8126b18d0de1a3f6b8587bf82f1631feb1814d36f46e781b881bbfa47526edec916779684582c4af997897d9cf5df209995b SHA512 dc0e51681879d2fbb00979e035f9e7ef8e9af99b91ecc0b94a52714850afee97b6391b88a327da79fb05184cde3e3d0d97833ef1a74fa8ae171b2913ef2c5b56
+DIST mimedefang-3.1.tar.gz 494467 BLAKE2B 4b1f9156c606b83bf9895ab76c4929fa37c2e0bd4454cb7177f1a2b8e8bfcac1b0eedfaefd1c32ceb29d9e0425ab09fb22c552ebe37a587f517d073dd46e16f6 SHA512 392c2bfa1f4e6bb2503ba6887d79696ccc861ded17a780d3ff44bd12c14ae248536aa8f056ec4679bf9c76b6a82d0357d5fdfe467b664b8992a0c11056c5180f
 EBUILD mimedefang-2.84-r2.ebuild 1772 BLAKE2B 0adfb92ea77a804bbdba8148e98dc5de53141edaa5ebaf750c77e774349cba136fad5989ec325150d6da8b9fee9cdf0b0da8d2081dbdf27b6cf5528f829df439 SHA512 51934b795a546a48f2bfc021db0dfd69ad284ab9cb4444d782777ad7635fc054e50b4f5656e3e0bb9c719ca5b6c61c4484f3ffa942e4e7b1b4e1497ac32cc413
+EBUILD mimedefang-3.1.ebuild 1817 BLAKE2B e408c8f046664acb16660f5d89ef536344c3a12c0d5d8357809b13eeec2154cadb33684461d0863c5d11392153b9f1f93df61f6b90520e6af4ac9e33bd0b18e5 SHA512 5c40ffe318784f74ed62b3f086461470adf903e93948ef67dcdb7d2bdc201b0241cf25540856e679fff60cc0aedb75aca06932258350c05abfbdb1e7f78d8d60
 MISC metadata.xml 749 BLAKE2B 52dd0d19fc548cc9f40f105b079b3507236d85384ac9375155e5f0080b5de0481c129c644dc9c40d7b819fae8134ddae24cdfc13f9842e4056362e3055eabcf9 SHA512 f9757c87d51c72ab8523ffd138478e34b6b7aa7e7b0c26ee84671e15f4e76519cd7493eafc85fa8b3006dbec49e048619121fdca6cea8c78a0d34fe824cd7d34
diff --git a/mail-filter/mimedefang/files/mimedefang-tests.patch b/mail-filter/mimedefang/files/mimedefang-tests.patch
index 82f8b9b56160..a6bb02e85ae7 100644
--- a/mail-filter/mimedefang/files/mimedefang-tests.patch
+++ b/mail-filter/mimedefang/files/mimedefang-tests.patch
@@ -1,5 +1,5 @@
---- a/t/lib/MIMEDefang/Unit.pm.ori	2010-05-13 23:12:23.000000000 +0200
-+++ b/t/lib/MIMEDefang/Unit.pm	2019-07-10 15:08:35.190824853 +0200
+--- a/t/lib/MIMEDefang/Unit.pm.ori
++++ b/t/lib/MIMEDefang/Unit.pm
 @@ -12,7 +12,7 @@
  	no warnings 'redefine';
  	local *CORE::GLOBAL::exit = sub { };
diff --git a/mail-filter/mimedefang/files/mimedefang-tests2.patch b/mail-filter/mimedefang/files/mimedefang-tests2.patch
new file mode 100644
index 000000000000..90753ef40680
--- /dev/null
+++ b/mail-filter/mimedefang/files/mimedefang-tests2.patch
@@ -0,0 +1,21 @@
+--- a/t/net.t
++++ b/t/net.t
+@@ -54,9 +54,15 @@
+   my @rbl;
+   $rbl[0] = "dnsbltest.spamassassin.org";
+   my $relayip = "144.137.3.98";
+-  detect_and_load_perl_modules();
+-  my $res = relay_is_blacklisted_multi($relayip, 10, 1, \@rbl);
+-  is($res->{"dnsbltest.spamassassin.org"}[0], "127.0.0.2");
++
++  SKIP: {
++    if ( (not defined $ENV{'NET_TEST'}) or ($ENV{'NET_TEST'} ne 'yes' )) {
++      skip "Net test disabled", 1
++    }
++    detect_and_load_perl_modules();
++    my $res = relay_is_blacklisted_multi($relayip, 10, 1, \@rbl);
++    is($res->{"dnsbltest.spamassassin.org"}[0], "127.0.0.2");
++  }
+ }
+ 
+ __PACKAGE__->runtests();
diff --git a/mail-filter/mimedefang/files/mimedefang-vendor.patch b/mail-filter/mimedefang/files/mimedefang-vendor.patch
new file mode 100644
index 000000000000..a66bd66046f5
--- /dev/null
+++ b/mail-filter/mimedefang/files/mimedefang-vendor.patch
@@ -0,0 +1,30 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -42,7 +42,7 @@
+ PERLINSTALLSITELIB=@PERLINSTALLSITELIB@
+ PERLINSTALLPRIVLIB=@PERLINSTALLPRIVLIB@
+ PERLVENDORPREFIX=@PERLVENDORPREFIX@
+-PERLVENDORLIB=@PERLINSTALLPRIVLIB@/vendor_perl
++PERLVENDORLIB=@PERLVENDORLIB@
+ LDFLAGS=@LDFLAGS@
+ IP_HEADER=@IP_HEADER@
+ SPOOLDIR=@SPOOLDIR@
+--- a/configure
++++ b/configure
+@@ -662,6 +662,7 @@
+ PERLINSTALLPRIVLIB
+ PERLINSTALLARCHLIB
+ PERLVENDORPREFIX
++PERLVENDORLIB
+ PERLSITEPREFIX
+ PERLPREFIX
+ CONFDIR_EVAL
+@@ -3962,7 +3963,7 @@
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ 
+-for thing in prefix siteprefix vendorprefix installarchlib installprivlib installbin installman1dir installman3dir installscript installsitearch installsitelib; do
++for thing in prefix siteprefix vendorprefix vendorlib installarchlib installprivlib installbin installman1dir installman3dir installscript installsitearch installsitelib; do
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Perl installation variable $thing" >&5
+ printf %s "checking for Perl installation variable $thing... " >&6; }
+     val=`$PERL -V:$thing | sed -e "s/^.*='//" -e "s/';$//"`
diff --git a/mail-filter/mimedefang/files/mimedefang.conf b/mail-filter/mimedefang/files/mimedefang.conf
index 5deb1401d5ef..051ffb1823b3 100644
--- a/mail-filter/mimedefang/files/mimedefang.conf
+++ b/mail-filter/mimedefang/files/mimedefang.conf
@@ -2,6 +2,9 @@
 # Mandatory options for MIMEDefang #
 ####################################
 
+# PID directory
+PIDDIR='/run/MIMEDefang'
+
 # spool directory
 SPOOLDIR='/var/spool/MIMEDefang'
 
diff --git a/mail-filter/mimedefang/files/mimedefang.init b/mail-filter/mimedefang/files/mimedefang.init
index 931f47bf5919..4d9624a93ce6 100644
--- a/mail-filter/mimedefang/files/mimedefang.init
+++ b/mail-filter/mimedefang/files/mimedefang.init
@@ -1,10 +1,12 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+PIDDIR="${PIDDIR:-/run/MIMEDefang}"
+PID="${PIDDIR}/mimedefang.pid"
+MXPID="${PIDDIR}/mimedefang-multiplexor.pid"
+
 SPOOLDIR="${SPOOLDIR:-/var/spool/MIMEDefang}"
-PID="${SPOOLDIR}/mimedefang.pid"
-MXPID="${SPOOLDIR}/mimedefang-multiplexor.pid"
 LOCK="${SPOOLDIR}/mimedefang.lock"
 MXLOCK="${SPOOLDIR}/mimedefang-multiplexor.lock"
 
@@ -21,6 +23,7 @@ depend() {
 }
 
 checkconfig() {
+	checkpath -d "${PIDDIR}"
 	checkpath -d "${SPOOLDIR}"
 	einfo "multiplexor socket: ${MX_SOCKET}"
 	einfo "sendmail socket: ${SOCKET}"
diff --git a/mail-filter/mimedefang/mimedefang-2.84-r1.ebuild b/mail-filter/mimedefang/mimedefang-3.1.ebuild
index e916663dfa66..80c4242a862d 100644
--- a/mail-filter/mimedefang/mimedefang-2.84-r1.ebuild
+++ b/mail-filter/mimedefang/mimedefang-3.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Antispam, antivirus and other customizable filters for MTAs with Milter support"
-HOMEPAGE="http://www.mimedefang.org/"
-SRC_URI="http://www.mimedefang.org/static/${P}.tar.gz"
+HOMEPAGE="https://www.mimedefang.org/"
+SRC_URI="https://mimedefang.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -14,6 +14,7 @@ IUSE="clamav +poll test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	|| ( mail-mta/sendmail mail-mta/postfix )
 	acct-group/defang
 	acct-user/defang
 	dev-perl/Digest-SHA1
@@ -21,7 +22,7 @@ RDEPEND="
 	dev-perl/MailTools
 	dev-perl/MIME-tools
 	dev-perl/Unix-Syslog
-	|| ( mail-filter/libmilter mail-mta/sendmail )
+	mail-filter/libmilter:=
 	virtual/perl-MIME-Base64
 	clamav? ( app-antivirus/clamav )
 "
@@ -34,11 +35,11 @@ DEPEND="
 	)
 "
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.72-ldflags.patch"
-	eapply "${FILESDIR}/${PN}-tests.patch"
-	eapply_user
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-2.72-ldflags.patch"
+	"${FILESDIR}/${PN}-vendor.patch"
+	"${FILESDIR}/${PN}-tests2.patch"
+)
 
 src_configure() {
 	local myeconfargs=(