Page MenuHomeFreeBSD
Files F167814856

D35818.id108364.diff
No OneTemporary
Actions

D35818.id108364.diff
View Options

diff --git a/net/pear-Net_IPv6/Makefile b/net/pear-Net_IPv6/Makefile
--- a/net/pear-Net_IPv6/Makefile
+++ b/net/pear-Net_IPv6/Makefile
@@ -1,10 +1,9 @@
# Created by: Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
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
--- 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
--- 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
--- 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 <phil.davis@inf.org>
-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) {
-

File Metadata

Mime Type
text/plain
Expires
Tue, Aug 25, 6:19 PM (20 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37225761
Default Alt Text
D35818.id108364.diff (3 KB)

Event Timeline