[gentoo-commits] repo/gentoo:master commit in: mail-filter/mimedefang/files/, mail-filter/mimedefang/
commit: bb2427ffa72ef11c0589318af1f4ac51861dae95
Author: Vieri Di Paola yahoo com>
AuthorDate: Mon Aug 29 09:48:00 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Oct 25 05:51:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb2427ff
mail-filter/mimedefang: version bump to 3.1 and several fixes
* PID dir according to upstream changelog (2017)
* Perl vendor path
* Unit test
* Postfix and sendmail dependencies (virtual/mta too broad)
Closes: https://bugs.gentoo.org/801646
Closes: https://bugs.gentoo.org/82
Signed-off-by: Vieri Di Paola yahoo.com>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Sam James gentoo.org>
mail-filter/mimedefang/Manifest| 1 +
.../mimedefang/files/mimedefang-tests2.patch | 22 ++
.../mimedefang/files/mimedefang-vendor.patch | 32 +
mail-filter/mimedefang/files/mimedefang.conf | 3 +
mail-filter/mimedefang/files/mimedefang.init | 9 ++-
mail-filter/mimedefang/mimedefang-3.1.ebuild | 79 ++
6 files changed, 143 insertions(+), 3 deletions(-)
diff --git a/mail-filter/mimedefang/Manifest b/mail-filter/mimedefang/Manifest
index 2e890f20fb13..93ea29b20981 100644
--- a/mail-filter/mimedefang/Manifest
+++ b/mail-filter/mimedefang/Manifest
@@ -1 +1,2 @@
DIST mimedefang-2.84.tar.gz 371596 BLAKE2B
b9b871d6a438792afbcebfcd99a77a1f9bb2c0dc7826abea74db913c6dc154403753a3016dc0647e9873256fe354649dea096c0e50d54f8db16ff8d2b91f54f4
SHA512
ffe039654d2e3f649219efc559380e39b21ce910becc36e262356d59d50129f8683ee2e59dd9680aff46478ccebd6b3d9c4567f85ade9a8464077350f4e52f48
+DIST mimedefang-3.1.tar.gz 494467 BLAKE2B
4b1f9156c606b83bf9895ab76c4929fa37c2e0bd4454cb7177f1a2b8e8bfcac1b0eedfaefd1c32ceb29d9e0425ab09fb22c552ebe37a587f517d073dd46e16f6
SHA512
392c2bfa1f4e6bb2503ba6887d79696ccc861ded17a780d3ff44bd12c14ae248536aa8f056ec4679bf9c76b6a82d0357d5fdfe467b664b8992a0c11056c5180f
diff --git a/mail-filter/mimedefang/files/mimedefang-tests2.patch
b/mail-filter/mimedefang/files/mimedefang-tests2.patch
new file mode 100644
index ..7b0842b74c89
--- /dev/null
+++ b/mail-filter/mimedefang/files/mimedefang-tests2.patch
@@ -0,0 +1,22 @@
+diff -ruN a/t/net.t b/t/net.t
+--- a/t/net.t 2022-08-16 15:55:29.0 +0200
b/t/net.t 2022-09-14 14:22:52.954918347 +0200
+@@ -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 ..2313d0562e2c
--- /dev/null
+++ b/mail-filter/mimedefang/files/mimedefang-vendor.patch
@@ -0,0 +1,32 @@
+diff -ruN a/Makefile.in b/Makefile.in
+--- a/Makefile.in 2022-05-19 09:31:36.0 +0200
b/Makefile.in 2022-08-28 02:54:01.337116642 +0200
+@@ -42,7 +42,7 @@
+ PERLINSTALLSITELIB=@PERLINSTALLSITELIB@
+ PERLINSTALLPRIVLIB=@PERLINSTALLPRIVLIB@
+ PERLVENDORPREFIX=@PERLVENDORPREFIX@
+-PERLVENDORLIB=@PERLINSTALLPRIVLIB@/vendor_perl
++PERLVENDORLIB=@PERLVENDORLIB@
+ LDFLAGS=@LDFLAGS@
+ IP_HEADER=@IP_HEADER@
+ SPOOLDIR=@SPOOLDIR@
+diff -ruN a/configure b/configure
+--- a/configure2022-08-06 10:43:38.0 +0200
b/configure2022-08-28 02:53:17.006104021 +0200
+@@ -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
[gentoo-commits] repo/gentoo:master commit in: mail-filter/mimedefang/files/, mail-filter/mimedefang/
commit: fe699000ab8a8d1dfbab923acb8093f64558fb4f Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Jun 16 14:08:12 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sun Jun 16 14:08:12 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe699000 mail-filter/mimedefang: remove last-rited package, bug 629450 Bug: https://bugs.gentoo.org/629450 Signed-off-by: Andreas K. Hüttel gentoo.org> mail-filter/mimedefang/Manifest| 3 - .../mimedefang/files/mimedefang-2.72-ldflags.patch | 38 -- mail-filter/mimedefang/files/mimedefang.conf | 131 - mail-filter/mimedefang/files/mimedefang.init | 102 mail-filter/mimedefang/metadata.xml| 9 -- mail-filter/mimedefang/mimedefang-2.73.ebuild | 64 -- mail-filter/mimedefang/mimedefang-2.74.ebuild | 62 -- mail-filter/mimedefang/mimedefang-2.75.ebuild | 62 -- 8 files changed, 471 deletions(-) diff --git a/mail-filter/mimedefang/Manifest b/mail-filter/mimedefang/Manifest deleted file mode 100644 index c3246e65d14..000 --- a/mail-filter/mimedefang/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST mimedefang-2.73.tar.gz 356601 BLAKE2B 75d945f549e4e60c17c2de33de2bab27d93a62e150a60abcec5f45aeab7fc0c37cbf9875f088bf4d07a399ac305e08ff1bda43b6f440fc648233939ec8e2aa5e SHA512 c20ee35235107342d4bce5a95cca01fc6c45365bf270b11c2bfe44a614ec39bcdd2a7b71836a092d6df88519194dbb3e93e293144b740e95e9846ebe0302cf5e -DIST mimedefang-2.74.tar.gz 362500 BLAKE2B 745536aeb511f8025e738443b18b2922666af417ed8c6ac0a62096ef8c1b01b532dfad4984bae18b33fecc890bd264695190cb44a10ffd6f7df33c0a89b1b9a9 SHA512 0168c4e664fcd2df7f08e4f7d110114d907f8f37d50986c89b33f5a575c87291574d0b5dff0197fb5666281f4fe1b67a61e8719a470bd01c5b7f2fc354f066b4 -DIST mimedefang-2.75.tar.gz 363535 BLAKE2B 7ede4ca1c2797630672adc00f7cfc8dd1daa0a2756b6c8fe24c4b6bce382fe713a21be90ef6b5f0cedfa4c1f46109b4011ccf6f862f2f3b7ea1cf29b656393b6 SHA512 a8b5c83116d973ea8971df8682d4ba26a37a47fd58cf740eecc1b70aa68a8aa765f7fa2415542d54f147990310b68e64d1e949d3b988cee24c4c2c5194123d98 diff --git a/mail-filter/mimedefang/files/mimedefang-2.72-ldflags.patch b/mail-filter/mimedefang/files/mimedefang-2.72-ldflags.patch deleted file mode 100644 index 998b3183e66..000 --- a/mail-filter/mimedefang/files/mimedefang-2.72-ldflags.patch +++ /dev/null @@ -1,38 +0,0 @@ mimedefang-2.72/Makefile.in.orig -+++ mimedefang-2.72/Makefile.in -@@ -52,7 +52,7 @@ - all: mimedefang mimedefang-multiplexor md-mx-ctrl pod2man - - mimedefang-multiplexor: mimedefang-multiplexor.o event.o event_tcp.o drop_privs_nothread.o notifier.o syslog-fac.o utils.o $(EMBPERLOBJS) -- $(CC) $(CFLAGS) -o mimedefang-multiplexor mimedefang-multiplexor.o event.o event_tcp.o drop_privs_nothread.o syslog-fac.o notifier.o utils.o $(EMBPERLOBJS) $(LIBS_WITHOUT_PTHREAD) $(EMBPERLLDFLAGS) $(EMBPERLLIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o mimedefang-multiplexor mimedefang-multiplexor.o event.o event_tcp.o drop_privs_nothread.o syslog-fac.o notifier.o utils.o $(EMBPERLOBJS) $(LIBS_WITHOUT_PTHREAD) $(EMBPERLLDFLAGS) $(EMBPERLLIBS) - - embperl.o: embperl.c - $(CC) $(CFLAGS) $(EMBPERLCFLAGS) $(PTHREAD_FLAG) $(DEFS) $(MINCLUDE) -c -o embperl.o $(srcdir)/embperl.c -@@ -67,7 +67,7 @@ - $(CC) $(CFLAGS) $(EMBPERLCFLAGS) $(PTHREAD_FLAG) $(DEFS) $(MINCLUDE) -c -o test-embed-perl.o $(srcdir)/test-embed-perl.c - - te: test-embed-perl.o -- $(CC) $(CFLAGS) -o te test-embed-perl.o $(LIBS_WITHOUT_PTHREAD) $(EMBPERLLDFLAGS) $(EMBPERLLIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o te test-embed-perl.o $(LIBS_WITHOUT_PTHREAD) $(EMBPERLLDFLAGS) $(EMBPERLLIBS) - rm_r.o: rm_r.c - $(CC) $(CFLAGS) $(PTHREAD_FLAG) $(DEFS) $(MINCLUDE) -c -o rm_r.o $(srcdir)/rm_r.c - -@@ -75,7 +75,7 @@ - $(CC) $(CFLAGS) $(PTHREAD_FLAG) $(DEFS) $(MINCLUDE) -c -o syslog-fac.o $(srcdir)/syslog-fac.c - - md-mx-ctrl: md-mx-ctrl.o -- $(CC) $(CFLAGS) -o md-mx-ctrl md-mx-ctrl.o $(LIBS_WITHOUT_PTHREAD) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o md-mx-ctrl md-mx-ctrl.o $(LIBS_WITHOUT_PTHREAD) - - md-mx-ctrl.o: md-mx-ctrl.c - $(CC) $(CFLAGS) $(DEFS) $(MINCLUDE) -c -o md-mx-ctrl.o $(srcdir)/md-mx-ctrl.c -@@ -99,7 +99,7 @@ - $(CC) $(CFLAGS) $(DEFS) $(MINCLUDE) -c -o mimedefang-multiplexor.o $(srcdir)/mimedefang-multiplexor.c - - mimedefang: mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o dynbuf.o milter_cap.o gen_id.o -- $(CC) $(CFLAGS) $(PTHREAD_FLAG) -o mimedefang mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o dynbuf.o milter_cap.o gen_id.o $(LDFLAGS) -lmilter $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(PTHREAD_FLAG) -o mimedefang mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o dynbuf.o milter_cap.o gen_id.o $(LDFLAGS) -lmilter $(LIBS) - - mimedefang.o: mimedefang.c mimedefang.h - $(CC) $(CFLAGS) $(PTHREAD_FLAG) $(DEFS)
