diff options
| author | riggs <riggs@FreeBSD.org> | 2016-01-02 00:40:04 +0800 |
|---|---|---|
| committer | riggs <riggs@FreeBSD.org> | 2016-01-02 00:40:04 +0800 |
| commit | 7c848f604867ba14e5b0d3ede7b8c7131bd5f5e7 (patch) | |
| tree | 2775a23018742252fd985f6d42335a3fb6b57a0e /mail | |
| parent | 4d85b24dee9f3bb4b2843589cde5c373b9e06ae4 (diff) | |
| download | freebsd-ports-gnome-7c848f604867ba14e5b0d3ede7b8c7131bd5f5e7.tar.gz freebsd-ports-gnome-7c848f604867ba14e5b0d3ede7b8c7131bd5f5e7.tar.zst freebsd-ports-gnome-7c848f604867ba14e5b0d3ede7b8c7131bd5f5e7.zip | |
Fix IPv6 patch
PR: 205752
Submitted by: takefu@airport.fm
Approved by: andrey@bsdnir.info (maintainer)
Diffstat (limited to 'mail')
6 files changed, 22 insertions, 18 deletions
diff --git a/mail/dkimproxy/Makefile b/mail/dkimproxy/Makefile index f517e5ba2e14..cbbe9996b9f6 100644 --- a/mail/dkimproxy/Makefile +++ b/mail/dkimproxy/Makefile @@ -18,11 +18,12 @@ BUILD_DEPENDS= p5-Mail-DKIM>=0:${PORTSDIR}/mail/p5-Mail-DKIM \ p5-Error>=0:${PORTSDIR}/lang/p5-Error RUN_DEPENDS:= ${BUILD_DEPENDS} -OPTIONS_DEFINE= IPV6 +OPTIONS_DEFINE= IPV6 TEST +OPTIONS_SUB= yes GNU_CONFIGURE= yes USES= perl5 shebangfix -SHEBANG_FILES= scripts/* +SHEBANG_FILES= scripts/* NO_ARCH= yes USE_RC_SUBR= dkimproxy_in dkimproxy_out @@ -35,9 +36,12 @@ SUB_LIST+= PERL=${PERL} \ IPV6_RUN_DEPENDS= p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 -IPV6_EXTRA_PATCHES= ${FILESDIR}/extra-patch-lib-MSDW-SMTP-Server.pm -IPV6_EXTRA_PATCHES= ${FILESDIR}/extra-patch-scripts-dkimproxy.out -IPV6_EXTRA_PATCHES= ${FILESDIR}/extra-patch-scripts-dkimproxy_in.conf.example -IPV6_EXTRA_PATCHES= ${FILESDIR}/extra-patch-scripts-dkimproxy_out.conf.example +IPV6_EXTRA_PATCHES= ${FILESDIR}/extra-patch-lib-MSDW-SMTP-Server.pm \ + ${FILESDIR}/extra-patch-scripts-dkimproxy.out \ + ${FILESDIR}/extra-patch-scripts-dkimproxy_in.conf.example \ + ${FILESDIR}/extra-patch-scripts-dkimproxy_out.conf.example + +TEST_DESC= Use dkim_responder.pl +TEST_RUN_DEPENDS= p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools .include <bsd.port.mk> diff --git a/mail/dkimproxy/files/extra-patch-lib-MSDW-SMTP-Server.pm b/mail/dkimproxy/files/extra-patch-lib-MSDW-SMTP-Server.pm index cb89d84af408..1fc6036a8bc1 100644 --- a/mail/dkimproxy/files/extra-patch-lib-MSDW-SMTP-Server.pm +++ b/mail/dkimproxy/files/extra-patch-lib-MSDW-SMTP-Server.pm @@ -1,5 +1,5 @@ ---- lib/MSDW/SMTP/Server.pm 2014-11-05 08:28:37.163794430 +0300 -+++ lib/MSDW/SMTP/Server.pm 2014-11-05 08:34:51.757769187 +0300 +--- lib/MSDW/SMTP/Server.pm.orig 2009-07-27 13:33:29 UTC ++++ lib/MSDW/SMTP/Server.pm @@ -11,7 +11,7 @@ # Written by Bennett Todd <bet@rahul.net> @@ -9,7 +9,7 @@ use IO::File; =head1 NAME -@@ -88,15 +88,14 @@ +@@ -88,15 +88,14 @@ desired. =item new(interface => $interface, port => $port); The interface and port to listen on must be specified. The interface @@ -33,7 +33,7 @@ =item accept([debug => FD]); accept takes optional args and returns nothing. If an error occurs -@@ -154,7 +153,7 @@ +@@ -154,7 +153,7 @@ sub new { my ($this, @opts) = @_; my $class = ref($this) || $this; my $self = bless { @opts }, $class; diff --git a/mail/dkimproxy/files/extra-patch-scripts-dkimproxy.out b/mail/dkimproxy/files/extra-patch-scripts-dkimproxy.out index 57426c44614a..ae2472b9765d 100644 --- a/mail/dkimproxy/files/extra-patch-scripts-dkimproxy.out +++ b/mail/dkimproxy/files/extra-patch-scripts-dkimproxy.out @@ -1,6 +1,6 @@ ---- scripts/dkimproxy.out 2014-11-05 08:30:40.674785725 +0300 -+++ scripts/dkimproxy.out 2014-11-05 08:36:43.063761657 +0300 -@@ -314,17 +314,11 @@ +--- scripts/dkimproxy.out.orig 2010-11-15 16:54:28 UTC ++++ scripts/dkimproxy.out +@@ -314,17 +314,11 @@ sub process_request { my $self = shift; diff --git a/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_in.conf.example b/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_in.conf.example index eefff0fef272..b433bfc5680b 100644 --- a/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_in.conf.example +++ b/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_in.conf.example @@ -1,5 +1,5 @@ ---- scripts/dkimproxy_in.conf.example 2014-11-05 08:47:46.842715313 +0300 -+++ scripts/dkimproxy_in.conf.example 2014-11-05 08:48:19.031713000 +0300 +--- scripts/dkimproxy_in.conf.example.orig 2009-07-30 01:01:50 UTC ++++ scripts/dkimproxy_in.conf.example @@ -1,5 +1,5 @@ # specify what address/port DKIMproxy should listen on -listen 127.0.0.1:10025 diff --git a/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_out.conf.example b/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_out.conf.example index e1d451bf7e50..e2b36ca9ce5a 100644 --- a/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_out.conf.example +++ b/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_out.conf.example @@ -1,5 +1,5 @@ ---- scripts/dkimproxy_out.conf.example 2014-11-05 08:45:08.311726160 +0300 -+++ scripts/dkimproxy_out.conf.example 2014-11-05 08:47:29.601719665 +0300 +--- scripts/dkimproxy_out.conf.example.orig 2009-10-26 16:08:46 UTC ++++ scripts/dkimproxy_out.conf.example @@ -1,8 +1,8 @@ # specify what address/port DKIMproxy should listen on -listen 127.0.0.1:10027 diff --git a/mail/dkimproxy/pkg-plist b/mail/dkimproxy/pkg-plist index 0465dfc5d298..03bbd592b9c1 100644 --- a/mail/dkimproxy/pkg-plist +++ b/mail/dkimproxy/pkg-plist @@ -1,4 +1,4 @@ -bin/dkim_responder.pl +%%TEST%%bin/dkim_responder.pl bin/dkimproxy.in bin/dkimproxy.out etc/dkimproxy_in.conf.example |