From nobody Fri Feb 28 17:50:52 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Z4G311S3Xz5npRX; Fri, 28 Feb 2025 17:50:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z4G306gbHz3Lbg; Fri, 28 Feb 2025 17:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740765053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l94tCHWMCrRD0uqqy7Yd931kUMdlOtPdjN4O/hOT6Ug=; b=m3tHrRpYe0dJuSb8KPiByQ6qAD97MOC3OoiWfKY19yYPiicmVSidIlKmyzaJVAiJS8ZvCL 8wOicw6pxpZFVwCjsShhBTXOrwbmY0sYT4Kz6hYiyyb6rUJO+sfOoIykl/p9bkgPrrnhzL /re8NZHjh7QggZN2KavDpkDp55k7iC88T0gADpNvESK9jJT1HtORUs0mMMf/2sktZEgYSE VQ035mIh4q5CgXc3YKCzr9mgKZbKa7huGLC1dLnvfs7kpH8jAgk4QSFYt4M2tszFdUX9dT WFJ7781owG1cX+HOmssVrWituYBQ93j/UL1gpv5B3+B8R/lL7WIEZ0vhpOM6RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740765053; a=rsa-sha256; cv=none; b=lMN/YthjVI2G8A/PEb4GMWRjr3jyZrWTlaS/xO1N0w9ugP1LOhcPyyCjXYm6NhNd0+C6Gw xoztKzZNvdY74qUtC2j9MQfn6tg+3baTnM+V3SuRUfoTkuE/F9FD4pDWtebJXhsPaKu8qL n/Y0l58L9+FaEXgA1be1J0qVs8A+EAUUAs1slnMEV+IraMIRYeEmG9Mn9wOkHBsKbIt0WJ 1gYGxziQWlsjHkj3ZXQVu/7M+me+xxuPLfItRCod5+5wHSE+sAKzpNsNbtoVjaZBpFOBpT R+h1H3OPbXKR6DJsMBOTlhIx8kb1GJK/WLn461PgPLQwV96M3XhKFdndevEwJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740765053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l94tCHWMCrRD0uqqy7Yd931kUMdlOtPdjN4O/hOT6Ug=; b=xgNoQa8Siiy6Y9bJIAEgo4ElIf/y91xxy0HmecoTeWYxqe8fpK8FHKWJKMKxtraWuAOOPN Wb5kcHJpvPi9sZxZ6sxwseuuNo6AcOJbMzW0hIdCW3FETrrzWAcUGRg2F3G96i1NWNDFOI Y7qGrc/HBfDvbHG5cUuhUg+WniYTeDa7DoE5zuw02zG/fR0PpzzAhT2ktaGGcUBBthLxjm UPhVGKxo2A0tsvCRK1mlIZQ0ANs4Sliw64L1hd5a9pvKW04BHd98QzdOHO6h0hbMv4h983 H0nd9QCz7DBj1VKrD/91b7772DkXsgLXSMGwkaYGfb+sixu08+eg1TfZHptDsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z4G3064fxzgH3; Fri, 28 Feb 2025 17:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51SHoqfR017020; Fri, 28 Feb 2025 17:50:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51SHoquP017017; Fri, 28 Feb 2025 17:50:52 GMT (envelope-from git) Date: Fri, 28 Feb 2025 17:50:52 GMT Message-Id: <202502281750.51SHoquP017017@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ryan Steinmetz Subject: git: 68218d4c3dd2 - main - net/pwhois: Fix perl5.36 issue, pet portlint, bump PORTREVISION List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68218d4c3dd27a83bd397f63c8a4392b4ee3dee3 Auto-Submitted: auto-generated The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=68218d4c3dd27a83bd397f63c8a4392b4ee3dee3 commit 68218d4c3dd27a83bd397f63c8a4392b4ee3dee3 Author: Ryan Steinmetz AuthorDate: 2025-02-28 17:49:20 +0000 Commit: Ryan Steinmetz CommitDate: 2025-02-28 17:49:20 +0000 net/pwhois: Fix perl5.36 issue, pet portlint, bump PORTREVISION PR: 285079 Reported by: John R --- net/pwhois/Makefile | 6 +++-- net/pwhois/files/patch-pwhois-updatedb | 41 +++++++++++++++++++++++++++++----- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/net/pwhois/Makefile b/net/pwhois/Makefile index 7484b2c25e3c..eb0a50d43b22 100644 --- a/net/pwhois/Makefile +++ b/net/pwhois/Makefile @@ -1,6 +1,6 @@ PORTNAME= pwhois PORTVERSION= 2.2.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://pwhois.org/get/ \ ZI @@ -10,6 +10,7 @@ COMMENT= Whois-compatible framework for disclosing routing data WWW= https://pwhois.org/ 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-Log-Dispatch>0:devel/p5-Log-Dispatch \ 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 \ ${DBD_MYSQL} +USES= mysql shebangfix tar:tgz + FETCH_ARGS= -p USERS= ${PORTNAME} GROUPS= ${PORTNAME} -USES= mysql shebangfix tar:tgz SHEBANG_FILES= pwhois-updatedb USE_RC_SUBR= ${PORTNAME}d SUB_FILES= pkg-message 512.pwhois-updatedb diff --git a/net/pwhois/files/patch-pwhois-updatedb b/net/pwhois/files/patch-pwhois-updatedb index a5bd3c62e5c2..5b66fd3b003f 100644 --- a/net/pwhois/files/patch-pwhois-updatedb +++ b/net/pwhois/files/patch-pwhois-updatedb @@ -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 -@@ -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; @@ -9,7 +31,7 @@ telnetmode=>0, cmd_remove_mode => 1 ); -@@ -3133,7 +3133,7 @@ sub readMRTdump +@@ -3156,7 +3157,7 @@ sub readMRTdump @st = stat($fd); @@ -18,7 +40,7 @@ { $errcode = -2; } -@@ -3763,7 +3763,7 @@ sub parseOrganisationObject +@@ -3795,7 +3796,7 @@ sub parseOrganisationObject #printMap(%obj); @@ -27,7 +49,7 @@ $country = "" if(!defined($country)); $country = substr(normalizeValue($country), 0, $fields_length{'organization.country'}); -@@ -4035,7 +4035,7 @@ sub parsePersonObject +@@ -4072,7 +4073,7 @@ sub parsePersonObject #printMap(%obj); $source = 0 if(!defined($source)); @@ -36,3 +58,12 @@ defined($mailbox) && defined($pocHandle) && defined($source))); 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++){