diff options
Diffstat (limited to 'net/p5-Net-Server')
| -rw-r--r-- | net/p5-Net-Server/Makefile | 6 | ||||
| -rw-r--r-- | net/p5-Net-Server/distinfo | 4 | ||||
| -rw-r--r-- | net/p5-Net-Server/files/patch-lib-Net-Server.pm | 26 |
3 files changed, 3 insertions, 33 deletions
diff --git a/net/p5-Net-Server/Makefile b/net/p5-Net-Server/Makefile index 503b0d931799..06bba3e6ceaf 100644 --- a/net/p5-Net-Server/Makefile +++ b/net/p5-Net-Server/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= Net-Server -PORTVERSION= 2.006 -PORTREVISION= 1 +PORTVERSION= 2.007 CATEGORIES= net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -43,9 +42,6 @@ MAN3= Net::Server.3 \ .include <bsd.port.options.mk> -post-patch: - ${RM} ${WRKSRC}/lib/Net/Server.pm.orig - .if ${PORT_OPTIONS:MIPV6} BUILD_DEPENDS+= p5-Socket6>=0.23:${PORTSDIR}/net/p5-Socket6 RUN_DEPENDS+= p5-Socket6>=0.23:${PORTSDIR}/net/p5-Socket6 diff --git a/net/p5-Net-Server/distinfo b/net/p5-Net-Server/distinfo index 52906be2b8f8..cc3498274936 100644 --- a/net/p5-Net-Server/distinfo +++ b/net/p5-Net-Server/distinfo @@ -1,2 +1,2 @@ -SHA256 (Net-Server-2.006.tar.gz) = 730f1a29c084c4791a9f4f9e2c6375efe14dbcb2bccd4a0f170e401ffa238a0d -SIZE (Net-Server-2.006.tar.gz) = 132015 +SHA256 (Net-Server-2.007.tar.gz) = 1c6fd3145b1bb796e28ebf74c181e4a7bbf5c412b37b51f72ad2707686a80328 +SIZE (Net-Server-2.007.tar.gz) = 133765 diff --git a/net/p5-Net-Server/files/patch-lib-Net-Server.pm b/net/p5-Net-Server/files/patch-lib-Net-Server.pm deleted file mode 100644 index 4f3e1742d8f2..000000000000 --- a/net/p5-Net-Server/files/patch-lib-Net-Server.pm +++ /dev/null @@ -1,26 +0,0 @@ ---- lib/Net/Server.pm.orig 2012-06-21 07:44:58.000000000 +0900 -+++ lib/Net/Server.pm 2013-01-03 16:13:30.000000000 +0900 -@@ -587,7 +587,10 @@ - - # if the addr or host matches a deny, reject it immediately - foreach (@{ $prop->{'deny'} }) { -- return 0 if $prop->{'peerhost'} =~ /^$_$/ && defined $prop->{'reverse_lookups'}; -+ return 0 -+ if defined($prop->{'reverse_lookups'}) -+ && defined($prop->{peerhost}) -+ && $prop->{'peerhost'} =~ /^$_$/; - return 0 if $peeraddr =~ /^$_$/; - } - if (@{ $prop->{'cidr_deny'} }) { -@@ -597,7 +600,10 @@ - - # if the addr or host isn't blocked yet, allow it if it is allowed - foreach (@{ $prop->{'allow'} }) { -- return 1 if $prop->{'peerhost'} =~ /^$_$/ && defined $prop->{'reverse_lookups'}; -+ return 1 -+ if defined($prop->{'reverse_lookups'}) -+ && defined($prop->{peerhost}) -+ && $prop->{'peerhost'} =~ /^$_$/; - return 1 if $peeraddr =~ /^$_$/; - } - if (@{ $prop->{'cidr_allow'} }) { |