dev-php/PEAR-Net_IPv4: Add upstream patch to remove globals

Package-Manager: Portage-2.3.6, Repoman-2.3.3

diff --git a/dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild b/dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild
index 79a5e32a4408368c1471f44aface6bf2c8330728..02a62c1efdb88eed257ddcda7f31e76198d9592c 100644 (file)
--- a/dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild
+++ b/dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild
@@ -11,3 +11,5 @@ LICENSE="PHP-3.01"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+
+PATCHES=( "${FILESDIR}/remove_globals.patch" )

diff --git a/dev-php/PEAR-Net_IPv4/files/remove_globals.patch b/dev-php/PEAR-Net_IPv4/files/remove_globals.patch
new file mode 100644 (file)
index 0000000..2403deb
--- /dev/null
+++ b/dev-php/PEAR-Net_IPv4/files/remove_globals.patch
@@ -0,0 +1,96 @@
+diff -aurN a/Net/IPv4.php b/Net/IPv4.php
+--- a/Net/IPv4.php     2010-09-08 06:31:50.000000000 -0400
++++ b/Net/IPv4.php     2017-08-04 14:57:52.872878217 -0400
+@@ -32,7 +32,37 @@
+  *\r
+  * @global array $GLOBALS['Net_IPv4_Netmask_Map']\r
+  */\r
+-$GLOBALS['Net_IPv4_Netmask_Map'] = array(\r
++$GLOBALS['Net_IPv4_Netmask_Map'] = Net_IPv4::$Net_IPv4_Netmask_Map;\r
++// }}}\r
++// {{{ Net_IPv4\r
++\r
++/**\r
++* Class to provide IPv4 calculations\r
++*\r
++* Provides methods for validating IP addresses, calculating netmasks,\r
++* broadcast addresses, network addresses, conversion routines, etc.\r
++*\r
++* @category   Net\r
++* @package    Net_IPv4\r
++* @author     Eric Kilfoil <edk@ypass.net>\r
++* @author     Marco Kaiser <bate@php.net>\r
++* @author     Florian Anderiasch <fa@php.net>\r
++* @copyright  1997-2005 The PHP Group\r
++* @license    http://www.php.net/license/3_01.txt  PHP License 3.01\r
++* @version    CVS: @package_version@\r
++* @link       http://pear.php.net/package/Net_IPv4\r
++* @access  public\r
++*/\r
++class Net_IPv4\r
++{\r
++    // {{{ properties\r
++    var $ip = "";\r
++    var $bitmask = false;\r
++    var $netmask = "";\r
++    var $network = "";\r
++    var $broadcast = "";\r
++    var $long = 0;\r
++public static $Net_IPv4_Netmask_Map = array(\r
+             0 => "0.0.0.0",\r
+             1 => "128.0.0.0",\r
+             2 => "192.0.0.0",\r
+@@ -67,35 +97,6 @@
+             31 => "255.255.255.254",\r
+             32 => "255.255.255.255"\r
+         );\r
+-// }}}\r
+-// {{{ Net_IPv4\r
+-\r
+-/**\r
+-* Class to provide IPv4 calculations\r
+-*\r
+-* Provides methods for validating IP addresses, calculating netmasks,\r
+-* broadcast addresses, network addresses, conversion routines, etc.\r
+-*\r
+-* @category   Net\r
+-* @package    Net_IPv4\r
+-* @author     Eric Kilfoil <edk@ypass.net>\r
+-* @author     Marco Kaiser <bate@php.net>\r
+-* @author     Florian Anderiasch <fa@php.net>\r
+-* @copyright  1997-2005 The PHP Group\r
+-* @license    http://www.php.net/license/3_01.txt  PHP License 3.01\r
+-* @version    CVS: @package_version@\r
+-* @link       http://pear.php.net/package/Net_IPv4\r
+-* @access  public\r
+-*/\r
+-class Net_IPv4\r
+-{\r
+-    // {{{ properties\r
+-    var $ip = "";\r
+-    var $bitmask = false;\r
+-    var $netmask = "";\r
+-    var $network = "";\r
+-    var $broadcast = "";\r
+-    var $long = 0;\r
+ \r
+     // }}}\r
+     // {{{ validateIP()\r
+@@ -154,7 +155,7 @@
+      */\r
+     function validateNetmask($netmask)\r
+     {\r
+-        if (! in_array($netmask, $GLOBALS['Net_IPv4_Netmask_Map'])) {\r
++        if (! in_array($netmask, self::$Net_IPv4_Netmask_Map)) {\r
+             return false;\r
+         }\r
+         return true;\r
+@@ -264,7 +265,7 @@
+      */\r
+     function calculate()\r
+     {\r
+-        $validNM = $GLOBALS['Net_IPv4_Netmask_Map'];\r
++        $validNM = self::$Net_IPv4_Netmask_Map;\r
+ \r
+         if (! is_a($this, "net_ipv4")) {\r
+             $myself = new Net_IPv4;\r