diff options
| author | Reid Linnemann <rlinnemann@netgate.com> | 2022-07-20 10:34:57 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2022-07-20 10:38:31 -0300 |
| commit | 5eb5735d03f90419dba9b0daa5747dc4d42a27ba (patch) | |
| tree | a26a922c47a84d292eff31c199fb6809213e2fa5 /net/pear-Net_IPv6/files/patch-fix_compress | |
| parent | x11/libxcvt: update to 0.1.2 (diff) | |
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
Diffstat (limited to 'net/pear-Net_IPv6/files/patch-fix_compress')
| -rw-r--r-- | net/pear-Net_IPv6/files/patch-fix_compress | 36 |
1 files changed, 0 insertions, 36 deletions
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 <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) { - |