net/pwhois: Fix perl5.36 issue, pet portlint, bump PORTREVISION

PR:		285079
Reported by:	John R <gamer@ryppn.com>
This commit is contained in:
Ryan Steinmetz 2025-02-28 12:49:20 -05:00
parent 935b3690cd
commit 68218d4c3d
No known key found for this signature in database
GPG key ID: 1EF8BA6BD02846D7
2 changed files with 40 additions and 7 deletions

View file

@ -1,6 +1,6 @@
PORTNAME= pwhois PORTNAME= pwhois
PORTVERSION= 2.2.1.0 PORTVERSION= 2.2.1.0
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= net CATEGORIES= net
MASTER_SITES= http://pwhois.org/get/ \ MASTER_SITES= http://pwhois.org/get/ \
ZI ZI
@ -10,6 +10,7 @@ COMMENT= Whois-compatible framework for disclosing routing data
WWW= https://pwhois.org/ WWW= https://pwhois.org/
RUN_DEPENDS= p5-DBI>0:databases/p5-DBI \ RUN_DEPENDS= p5-DBI>0:databases/p5-DBI \
p5-File-Temp>0:devel/p5-File-Temp \
p5-Time-Format>0:devel/p5-Time-Format \ p5-Time-Format>0:devel/p5-Time-Format \
p5-Log-Dispatch>0:devel/p5-Log-Dispatch \ p5-Log-Dispatch>0:devel/p5-Log-Dispatch \
p5-Net-DNS>0:dns/p5-Net-DNS \ p5-Net-DNS>0:dns/p5-Net-DNS \
@ -18,12 +19,13 @@ RUN_DEPENDS= p5-DBI>0:databases/p5-DBI \
p5-RPSL-Parser>0:devel/p5-RPSL-Parser \ p5-RPSL-Parser>0:devel/p5-RPSL-Parser \
${DBD_MYSQL} ${DBD_MYSQL}
USES= mysql shebangfix tar:tgz
FETCH_ARGS= -p FETCH_ARGS= -p
USERS= ${PORTNAME} USERS= ${PORTNAME}
GROUPS= ${PORTNAME} GROUPS= ${PORTNAME}
USES= mysql shebangfix tar:tgz
SHEBANG_FILES= pwhois-updatedb SHEBANG_FILES= pwhois-updatedb
USE_RC_SUBR= ${PORTNAME}d USE_RC_SUBR= ${PORTNAME}d
SUB_FILES= pkg-message 512.pwhois-updatedb SUB_FILES= pkg-message 512.pwhois-updatedb

View file

@ -1,6 +1,28 @@
--- pwhois-updatedb.orig 2013-10-08 18:59:42 UTC --- pwhois-updatedb.orig 2025-02-28 17:42:32 UTC
+++ pwhois-updatedb +++ pwhois-updatedb
@@ -975,7 +975,7 @@ sub connect @@ -9,7 +9,8 @@ use Getopt::Long;
use strict;
use DBI;
use Getopt::Long;
-use POSIX qw(strftime tmpnam O_RDWR O_CREAT O_EXCL);
+use POSIX qw(strftime O_RDWR O_CREAT O_EXCL);
+use File::Temp qw/ :POSIX /;
use Fcntl qw(:DEFAULT :flock);
use Log::Dispatch;
use Log::Dispatch::Screen;
@@ -112,9 +113,9 @@ my $current_registry = -1;
my $current_registry = -1;
# DO NOT MODIFY UNLESS YOU KNOW WHAT YOU ARE DOING: EDIT THE CONFIG FILE IF POSSIBLE
-# See: /etc/pwhois/pwhoisd.conf or -c option to specify a different config file
+# See: /usr/local/etc/pwhois/pwhoisd.conf or -c option to specify a different config file
-my $DEFAULT_CONFIG = '/etc/pwhois/pwhoisd.conf';
+my $DEFAULT_CONFIG = '/usr/local/etc/pwhois/pwhoisd.conf';
my $DEFAULT_PIDFILE='/var/run/pwhoisd.pid';
my $DEFAULT_DATABASE_TYPE = 'mysql';
my $DEFAULT_DATABASE_SERVER = '';
@@ -989,7 +990,7 @@ sub connect
my $passwd = shift; my $passwd = shift;
@ -9,7 +31,7 @@
telnetmode=>0, telnetmode=>0,
cmd_remove_mode => 1 cmd_remove_mode => 1
); );
@@ -3133,7 +3133,7 @@ sub readMRTdump @@ -3156,7 +3157,7 @@ sub readMRTdump
@st = stat($fd); @st = stat($fd);
@ -18,7 +40,7 @@
{ {
$errcode = -2; $errcode = -2;
} }
@@ -3763,7 +3763,7 @@ sub parseOrganisationObject @@ -3795,7 +3796,7 @@ sub parseOrganisationObject
#printMap(%obj); #printMap(%obj);
@ -27,7 +49,7 @@
$country = "" if(!defined($country)); $country = "" if(!defined($country));
$country = substr(normalizeValue($country), 0, $fields_length{'organization.country'}); $country = substr(normalizeValue($country), 0, $fields_length{'organization.country'});
@@ -4035,7 +4035,7 @@ sub parsePersonObject @@ -4072,7 +4073,7 @@ sub parsePersonObject
#printMap(%obj); #printMap(%obj);
$source = 0 if(!defined($source)); $source = 0 if(!defined($source));
@ -36,3 +58,12 @@
defined($mailbox) && defined($pocHandle) && defined($source))); defined($mailbox) && defined($pocHandle) && defined($source)));
for($j1 = 0; $j1 < 6; $j1++){ for($j1 = 0; $j1 < 6; $j1++){
@@ -4156,7 +4157,7 @@ sub parseRoleObject
$source = 0 if(!defined($source));
$mailbox = $obj{'notify'} if (!defined($mailbox) || "unread@" eq substr($mailbox, 0, 7));
$mailbox = $obj{'abuse-mailbox'} if (!defined($mailbox) || "unread@" eq substr($mailbox, 0, 7));
- return -$numlines if(!(defined($role) && defined(@addrs) &&
+ return -$numlines if(!(defined($role) && (@addrs) &&
defined($mailbox) && defined($pocHandle) && defined($source)));
($mailbox) = $mailbox =~ m/^\s*([^\s]+)/;
for($j1 = 0; $j1 < 6; $j1++){