ports/174930: commit references a PR

[dfilter service]

The following reply was made to PR ports/174930; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/174930: commit references a PR
Date: Wed,  9 Jan 2013 13:30:54 +0000 (UTC)

 Author: tobez
 Date: Wed Jan  9 13:30:46 2013
 New Revision: 310143
 URL: http://svnweb.freebsd.org/changeset/ports/310143
 
 Log:
   Fix spurious warnings triggered under certain conditions
   (see https://rt.cpan.org/Public/Bug/Display.html?id=78828).
   
   PR:	174930
   Submitted by:	Takefu <takefu at airport.fm>
 
 Added:
   head/net/p5-Net-Server/files/
   head/net/p5-Net-Server/files/patch-lib-Net-Server.pm   (contents, props changed)
 Modified:
   head/net/p5-Net-Server/Makefile
 
 Modified: head/net/p5-Net-Server/Makefile
 ==============================================================================
 --- head/net/p5-Net-Server/Makefile	Wed Jan  9 13:17:27 2013	(r310142)
 +++ head/net/p5-Net-Server/Makefile	Wed Jan  9 13:30:46 2013	(r310143)
 @@ -1,12 +1,9 @@
 -# New ports collection makefile for:	p5-Net-Server
 -# Date created:				24 Apr 2001
 -# Whom:					Jesse McConnell <jesse at gallup.com>
 -#
 +# Created by: Jesse McConnell <jesse at gallup.com>
  # $FreeBSD$
 -#
  
  PORTNAME=	Net-Server
  PORTVERSION=	2.006
 +PORTREVISION=	1
  CATEGORIES=	net perl5
  MASTER_SITES=	CPAN
  PKGNAMEPREFIX=	p5-
 @@ -46,6 +43,9 @@ 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
 
 Added: head/net/p5-Net-Server/files/patch-lib-Net-Server.pm
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/net/p5-Net-Server/files/patch-lib-Net-Server.pm	Wed Jan  9 13:30:46 2013	(r310143)
 @@ -0,0 +1,26 @@
 +--- 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'} }) {
 _______________________________________________
 svn-ports-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"