4 files changed, 88 insertions, 0 deletions

diff --git a/mail/dkimproxy/files/extra-patch-lib-MSDW-SMTP-Server.pm b/mail/dkimproxy/files/extra-patch-lib-MSDW-SMTP-Server.pm
new file mode 100644
index 000000000000..cb89d84af408
--- /dev/null
+++ b/mail/dkimproxy/files/extra-patch-lib-MSDW-SMTP-Server.pm
@@ -0,0 +1,44 @@
+--- 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
+@@ -11,7 +11,7 @@
+ # Written by Bennett Todd <bet@rahul.net>
+ 
+ package MSDW::SMTP::Server;
+-use IO::Socket;
++use IO::Socket::INET6;
+ use IO::File;
+ 
+ =head1 NAME
+@@ -88,15 +88,14 @@
+ =item new(interface => $interface, port => $port);
+ 
+ The interface and port to listen on must be specified. The interface
+-must be a valid numeric IP address (0.0.0.0 to listen on all
+-interfaces, as usual); the port must be numeric. If this call
+-succeeds, it returns a server structure with an open
+-IO::Socket::INET in it, ready to listen on. If it fails it dies, so
+-if you want anything other than an exit with an explanatory error
+-message, wrap the constructor call in an eval block and pull the
+-error out of $@ as usual. This is also the case for all other
+-methods; they succeed or they die.
+-
++must be a valid numeric IPv4 or IPv6 address (0.0.0.0 or :: to listen
++on all interfaces, as usual); the port must be numeric. If this call
++succeeds, it returns a server structure with an open IO::Socket::INET6
++in it, ready to listen on. If it fails it dies, so if you want
++anything other than an exit with an explanatory error message, wrap
++the constructor call in an eval block and pull the error out of $@ as
++usual. This is also the case for all other methods; they succeed or
++they die.
+ =item accept([debug => FD]);
+ 
+ accept takes optional args and returns nothing. If an error occurs
+@@ -154,7 +153,7 @@
+     my ($this, @opts) = @_;
+     my $class = ref($this) || $this;
+     my $self = bless { @opts }, $class;
+-    $self->{sock} = IO::Socket::INET->new(
++    $self->{sock} = IO::Socket::INET6->new(
+ 	LocalAddr => $self->{interface},
+ 	LocalPort => $self->{port},
+ 	Proto => 'tcp',
diff --git a/mail/dkimproxy/files/extra-patch-scripts-dkimproxy.out b/mail/dkimproxy/files/extra-patch-scripts-dkimproxy.out
new file mode 100644
index 000000000000..57426c44614a
--- /dev/null
+++ b/mail/dkimproxy/files/extra-patch-scripts-dkimproxy.out
@@ -0,0 +1,21 @@
+--- 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 @@
+ {
+ 	my $self = shift;
+ 
+-	# try to determine peer's address
+-	use Socket;
+-	my $peersockaddr = getpeername(STDOUT);
+-	my ($port, $iaddr) = sockaddr_in($peersockaddr);
+-	$ENV{REMOTE_ADDR} = inet_ntoa($iaddr);
+-
+ 	# initialize syslog
+ 	eval
+ 	{
+ 		openlog("dkimproxy.out", "perror,pid,ndelay", "mail");
+-		syslog("debug", '%s', "connect from $ENV{REMOTE_ADDR}");
++		syslog("debug", '%s', "connect from $self->{server}->{peeraddr}");
+ 	};
+ 	if (my $E = $@)
+ 	{
diff --git a/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_in.conf.example b/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_in.conf.example
new file mode 100644
index 000000000000..eefff0fef272
--- /dev/null
+++ b/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_in.conf.example
@@ -0,0 +1,10 @@
+--- 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
+@@ -1,5 +1,5 @@
+ # specify what address/port DKIMproxy should listen on
+-listen    127.0.0.1:10025
++listen    host.name:10025
+ 
+ # specify what address/port DKIMproxy forwards mail to
+-relay     127.0.0.1:10026
++relay     host.name:10026
diff --git a/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_out.conf.example b/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_out.conf.example
new file mode 100644
index 000000000000..e1d451bf7e50
--- /dev/null
+++ b/mail/dkimproxy/files/extra-patch-scripts-dkimproxy_out.conf.example
@@ -0,0 +1,13 @@
+--- 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
+@@ -1,8 +1,8 @@
+ # specify what address/port DKIMproxy should listen on
+-listen    127.0.0.1:10027
++listen    host.name:10027
+ 
+ # specify what address/port DKIMproxy forwards mail to
+-relay     127.0.0.1:10028
++relay     host.name:10028
+ 
+ # specify what domains DKIMproxy can sign for (comma-separated, no spaces)
+ domain    example.org