From nobody Wed Jul 20 13:39:23 2022 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 4Lnxd826dpz4X3qJ; Wed, 20 Jul 2022 13:39:24 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lnxd81Mryz3Yvh; Wed, 20 Jul 2022 13:39:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658324364; 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=6ufFuXiZoTuHiN+YtBfeC/5DF//sgq/46KK9Fe49Tos=; b=n5Kbv1gcwQFpZ0/56eoHEHleBhiU7PPTf59MA8HubPv6vYsSHzrKrknj9RVd9cGNqdfLk4 A4K1XdT1sTgX5cBqc+KavVB4VEELfG4eO02SOKtiCJ+d1gtuK8T0xHzIH4aLK/rXUiXKKv SCq7ohp2ymCspxRKYuxm2hy8tGSl8giwauzwF4FH9NSdMWc25KB0eozRp4ZrO5UbnYIJ5s YtdazWlLIf1P1AL/Y2HeRZ3SjCHKUlu5ku0eH1M7klI/Tyx57eWtAXnWU5s60CHpXinowb lVzEFCYJ4Jb4gwpBbgxB0+i4WtUCa2S2IN0CIR3tjFxy9z2GFqDh1118TIDePg== 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 4Lnxd80PJ9z10cJ; Wed, 20 Jul 2022 13:39:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26KDdN0t069342; Wed, 20 Jul 2022 13:39:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26KDdNHu069341; Wed, 20 Jul 2022 13:39:23 GMT (envelope-from git) Date: Wed, 20 Jul 2022 13:39:23 GMT Message-Id: <202207201339.26KDdNHu069341@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Renato Botelho Subject: git: 5eb5735d03f9 - main - net/pear-Net_IPv6: Update to version 1.3.0b4 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: garga X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5eb5735d03f90419dba9b0daa5747dc4d42a27ba Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658324364; 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=6ufFuXiZoTuHiN+YtBfeC/5DF//sgq/46KK9Fe49Tos=; b=mjAqmkQWjEFtPsMK62gF8YLu41whv5Ffij55VXq106LzIfsUaGrKSksqoS1iUCOgRdSYXI CRgafENOSnseo1gJwmhXGVwmgO7H+EIvb0YDV7SwGQVe9Z+eS043UFBhrTQbk4syN1ZsLz WmZ12sIF+1oXxHKXq0QIFx/towWVktogUC3Uw2a2J0dcIaDw0CFWkLss+l69sReu75J2uF Ha6vAQWv89x0QAqllV0G93sEnOpHPl3fffxfMGEg28F7XK3vEvntnZaVw9B0EAa0kannQq U9Bp8V7jBs+OTNs3fvEmZ/s3ywnJLqb1oev+veD/rBqmX9oWwWJoU+wiTHM2dA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658324364; a=rsa-sha256; cv=none; b=mCNac8I+l6oF5m7Z600XzAgZKh8f+UEe0nZgRYhgtgc1hzOVi90PFDkAvWmLcHn4B6F3Cn Oxp+jMBwL9DPpjfzk2E8B4Mn4GeEFglBYFdlSdRvUXtt+6IoSxV1D686VDk+H4ytoTBr9s ewc9r2J5MVfaMUEPmSDxaSm+Cld0kMVHnDSHS8cOd1z4UfTcMD4Ipq3qYxnaPgJdUPKut0 WTVFILeeH4WyNXS26Qzp23OVs+cmWQpOF3hmj9/CiMWXis8PIh5JbF5XSx995+TqUdUZt7 AQjC7HNGH7d6AbhaATs282Qc6TKUL4Rw46FDRyvyHgSeCVtNmt4b4zKrCA+EmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=5eb5735d03f90419dba9b0daa5747dc4d42a27ba commit 5eb5735d03f90419dba9b0daa5747dc4d42a27ba Author: Reid Linnemann AuthorDate: 2022-07-20 13:34:57 +0000 Commit: Renato Botelho CommitDate: 2022-07-20 13:38:31 +0000 net/pear-Net_IPv6: Update to version 1.3.0b4 Summary: - Removed patches included in 1.3.0b4 - Added php 8 compat patch to correct curly brace array accessor syntax Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D35818 --- net/pear-Net_IPv6/Makefile | 5 ++-- net/pear-Net_IPv6/distinfo | 6 ++--- net/pear-Net_IPv6/files/patch-Net_IPv6.php | 42 ++++++++---------------------- net/pear-Net_IPv6/files/patch-fix_compress | 36 ------------------------- 4 files changed, 16 insertions(+), 73 deletions(-) diff --git a/net/pear-Net_IPv6/Makefile b/net/pear-Net_IPv6/Makefile index cec6e1bd0814..b3e5690df7fd 100644 --- a/net/pear-Net_IPv6/Makefile +++ b/net/pear-Net_IPv6/Makefile @@ -1,10 +1,9 @@ # Created by: Antonio Carlos Venancio Junior () PORTNAME= Net_IPv6 -DISTVERSION= 1.3.0.b2 -PORTREVISION= 2 +DISTVERSION= 1.3.0.b4 CATEGORIES= net pear -DISTNAME= ${PORTNAME}-1.3.0b2 +DISTNAME= ${PORTNAME}-1.3.0b4 MAINTAINER= garga@FreeBSD.org COMMENT= Check and validate IPv6 addresses diff --git a/net/pear-Net_IPv6/distinfo b/net/pear-Net_IPv6/distinfo index 53eafb309df2..303cbef6b7b2 100644 --- a/net/pear-Net_IPv6/distinfo +++ b/net/pear-Net_IPv6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1470848754 -SHA256 (PEAR/Net_IPv6-1.3.0b2.tgz) = b7748f977c2946262239cd5af76a233a235b5e4c512c2022b4b104b1498e7203 -SIZE (PEAR/Net_IPv6-1.3.0b2.tgz) = 10477 +TIMESTAMP = 1657751183 +SHA256 (PEAR/Net_IPv6-1.3.0b4.tgz) = ec676dc81c54e02f11b7162fffdf6f5211d25d5d7a00e21a7ded6b0042c9f61b +SIZE (PEAR/Net_IPv6-1.3.0b4.tgz) = 11437 diff --git a/net/pear-Net_IPv6/files/patch-Net_IPv6.php b/net/pear-Net_IPv6/files/patch-Net_IPv6.php index a49822e6149f..99517ee348f6 100644 --- a/net/pear-Net_IPv6/files/patch-Net_IPv6.php +++ b/net/pear-Net_IPv6/files/patch-Net_IPv6.php @@ -1,35 +1,15 @@ ---- Net/IPv6.php.orig 2016-08-31 14:11:53 UTC +--- Net/IPv6.php.orig 2018-07-09 11:55:41 UTC +++ Net/IPv6.php -@@ -550,7 +550,7 @@ class Net_IPv6 - - if (false !== strpos($uip, '::') ) { - -- list($ip1, $ip2) = explode('::', $uip); -+ list($ip1, $ip2) = explode('::', $uip, 2); - - if ("" == $ip1) { - -@@ -601,12 +601,12 @@ class Net_IPv6 - - } else if (-1 == $c1) { // ::xxx - -- $fill = str_repeat('0:', 7-$c2); -+ $fill = str_repeat('0:', max(1, 7-$c2)); - $uip = str_replace('::', $fill, $uip); - - } else if (-1 == $c2) { // xxx:: - -- $fill = str_repeat(':0', 7-$c1); -+ $fill = str_repeat(':0', max(1, 7-$c1)); - $uip = str_replace('::', $fill, $uip); - - } else { // xxx::xxx -@@ -912,7 +912,7 @@ class Net_IPv6 - +@@ -853,10 +853,10 @@ class Net_IPv6 + return array("", $ip); } -- if (8 == $count) { -+ if (8 == $count and empty($ipPart[1])) { - - return true; +- $ip{$pos} = '_'; ++ $ip[$pos] = '_'; + $ipPart = explode('_', $ip); + +- if ($ip{$pos-1} === ":") { ++ if ($ip[$pos-1] === ":") { + $ipPart[0] .= ":"; + } diff --git a/net/pear-Net_IPv6/files/patch-fix_compress b/net/pear-Net_IPv6/files/patch-fix_compress deleted file mode 100644 index f6768602592f..000000000000 --- a/net/pear-Net_IPv6/files/patch-fix_compress +++ /dev/null @@ -1,36 +0,0 @@ -From 638b96a253164b65c63825c38e79812b6c5f448d Mon Sep 17 00:00:00 2001 -From: Phil Davis -Date: Thu, 27 Oct 2016 13:45:38 +0930 -Subject: [PATCH] Fix compress to "::" - -Problem: -``` -Net_IPv6::compress("0:0:0:0:0:0:0:0"); -``` -returns the empty string. - -It should return double-colon "::" - -The preg_replace here are over-zealous, in the "::" case, the sring -starts and ends with ":" and so both get stripped out. ---- - Net/IPv6.php | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/Net/IPv6.php b/Net/IPv6.php -index ba77472..39949d1 100644 ---- Net/IPv6.php -+++ Net/IPv6.php -@@ -734,8 +734,10 @@ public static function compress($ip, $force = false) - - } - -- $cip = preg_replace('/((^:)|(:$))/', '', $cip); -- $cip = preg_replace('/((^:)|(:$))/', '::', $cip); -+ if ($cip != "::") { -+ $cip = preg_replace('/((^:)|(:$))/', '', $cip); -+ $cip = preg_replace('/((^:)|(:$))/', '::', $cip); -+ } - - if ('' != $netmask) { -