Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 Jan 2016 16:40:05 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r405008 - in head/mail/dkimproxy: . files
Message-ID:  <201601011640.u01Ge5eY003507@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Fri Jan  1 16:40:04 2016
New Revision: 405008
URL: https://svnweb.freebsd.org/changeset/ports/405008

Log:
  Fix IPv6 patch
  
  PR:		205752
  Submitted by:	takefu@airport.fm
  Approved by:	andrey@bsdnir.info (maintainer)

Modified:
  head/mail/dkimproxy/Makefile
  head/mail/dkimproxy/files/extra-patch-lib-MSDW-SMTP-Server.pm
  head/mail/dkimproxy/files/extra-patch-scripts-dkimproxy.out
  head/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_in.conf.example
  head/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_out.conf.example
  head/mail/dkimproxy/pkg-plist

Modified: head/mail/dkimproxy/Makefile
==============================================================================
--- head/mail/dkimproxy/Makefile	Fri Jan  1 16:21:45 2016	(r405007)
+++ head/mail/dkimproxy/Makefile	Fri Jan  1 16:40:04 2016	(r405008)
@@ -18,11 +18,12 @@ BUILD_DEPENDS=	p5-Mail-DKIM>=0:${PORTSDI
 		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>

Modified: head/mail/dkimproxy/files/extra-patch-lib-MSDW-SMTP-Server.pm
==============================================================================
--- head/mail/dkimproxy/files/extra-patch-lib-MSDW-SMTP-Server.pm	Fri Jan  1 16:21:45 2016	(r405007)
+++ head/mail/dkimproxy/files/extra-patch-lib-MSDW-SMTP-Server.pm	Fri Jan  1 16:40:04 2016	(r405008)
@@ -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;

Modified: head/mail/dkimproxy/files/extra-patch-scripts-dkimproxy.out
==============================================================================
--- head/mail/dkimproxy/files/extra-patch-scripts-dkimproxy.out	Fri Jan  1 16:21:45 2016	(r405007)
+++ head/mail/dkimproxy/files/extra-patch-scripts-dkimproxy.out	Fri Jan  1 16:40:04 2016	(r405008)
@@ -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;
  

Modified: head/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_in.conf.example
==============================================================================
--- head/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_in.conf.example	Fri Jan  1 16:21:45 2016	(r405007)
+++ head/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_in.conf.example	Fri Jan  1 16:40:04 2016	(r405008)
@@ -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

Modified: head/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_out.conf.example
==============================================================================
--- head/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_out.conf.example	Fri Jan  1 16:21:45 2016	(r405007)
+++ head/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_out.conf.example	Fri Jan  1 16:40:04 2016	(r405008)
@@ -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

Modified: head/mail/dkimproxy/pkg-plist
==============================================================================
--- head/mail/dkimproxy/pkg-plist	Fri Jan  1 16:21:45 2016	(r405007)
+++ head/mail/dkimproxy/pkg-plist	Fri Jan  1 16:40:04 2016	(r405008)
@@ -1,4 +1,4 @@
-bin/dkim_responder.pl
+%%TEST%%bin/dkim_responder.pl
 bin/dkimproxy.in
 bin/dkimproxy.out
 etc/dkimproxy_in.conf.example



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601011640.u01Ge5eY003507>