| 1 |
commit: 922dbe6f4480345a53ea02ab58e93520618bf0cc |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 4 19:02:54 2017 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 4 19:02:54 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=922dbe6f |
| 7 |
|
| 8 |
dev-php/PEAR-Net_IPv4: Add upstream patch to remove globals |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 11 |
|
| 12 |
.../PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild | 2 + |
| 13 |
dev-php/PEAR-Net_IPv4/files/remove_globals.patch | 96 ++++++++++++++++++++++ |
| 14 |
2 files changed, 98 insertions(+) |
| 15 |
|
| 16 |
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 |
| 17 |
index 79a5e32a440..02a62c1efdb 100644 |
| 18 |
--- a/dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild |
| 19 |
+++ b/dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild |
| 20 |
@@ -11,3 +11,5 @@ LICENSE="PHP-3.01" |
| 21 |
SLOT="0" |
| 22 |
KEYWORDS="~amd64 ~x86" |
| 23 |
IUSE="" |
| 24 |
+ |
| 25 |
+PATCHES=( "${FILESDIR}/remove_globals.patch" ) |
| 26 |
|
| 27 |
diff --git a/dev-php/PEAR-Net_IPv4/files/remove_globals.patch b/dev-php/PEAR-Net_IPv4/files/remove_globals.patch |
| 28 |
new file mode 100644 |
| 29 |
index 00000000000..2403deb0b4a |
| 30 |
--- /dev/null |
| 31 |
+++ b/dev-php/PEAR-Net_IPv4/files/remove_globals.patch |
| 32 |
@@ -0,0 +1,96 @@ |
| 33 |
+diff -aurN a/Net/IPv4.php b/Net/IPv4.php |
| 34 |
+--- a/Net/IPv4.php 2010-09-08 06:31:50.000000000 -0400 |
| 35 |
++++ b/Net/IPv4.php 2017-08-04 14:57:52.872878217 -0400 |
| 36 |
+@@ -32,7 +32,37 @@ |
| 37 |
+ * |
| 38 |
+ * @global array $GLOBALS['Net_IPv4_Netmask_Map'] |
| 39 |
+ */ |
| 40 |
+-$GLOBALS['Net_IPv4_Netmask_Map'] = array( |
| 41 |
++$GLOBALS['Net_IPv4_Netmask_Map'] = Net_IPv4::$Net_IPv4_Netmask_Map; |
| 42 |
++// }}} |
| 43 |
++// {{{ Net_IPv4 |
| 44 |
++ |
| 45 |
++/** |
| 46 |
++* Class to provide IPv4 calculations |
| 47 |
++* |
| 48 |
++* Provides methods for validating IP addresses, calculating netmasks, |
| 49 |
++* broadcast addresses, network addresses, conversion routines, etc. |
| 50 |
++* |
| 51 |
++* @category Net |
| 52 |
++* @package Net_IPv4 |
| 53 |
++* @author Eric Kilfoil <edk@×××××.net> |
| 54 |
++* @author Marco Kaiser <bate@×××.net> |
| 55 |
++* @author Florian Anderiasch <fa@×××.net> |
| 56 |
++* @copyright 1997-2005 The PHP Group |
| 57 |
++* @license http://www.php.net/license/3_01.txt PHP License 3.01 |
| 58 |
++* @version CVS: @package_version@ |
| 59 |
++* @link http://pear.php.net/package/Net_IPv4 |
| 60 |
++* @access public |
| 61 |
++*/ |
| 62 |
++class Net_IPv4 |
| 63 |
++{ |
| 64 |
++ // {{{ properties |
| 65 |
++ var $ip = ""; |
| 66 |
++ var $bitmask = false; |
| 67 |
++ var $netmask = ""; |
| 68 |
++ var $network = ""; |
| 69 |
++ var $broadcast = ""; |
| 70 |
++ var $long = 0; |
| 71 |
++public static $Net_IPv4_Netmask_Map = array( |
| 72 |
+ 0 => "0.0.0.0", |
| 73 |
+ 1 => "128.0.0.0", |
| 74 |
+ 2 => "192.0.0.0", |
| 75 |
+@@ -67,35 +97,6 @@ |
| 76 |
+ 31 => "255.255.255.254", |
| 77 |
+ 32 => "255.255.255.255" |
| 78 |
+ ); |
| 79 |
+-// }}} |
| 80 |
+-// {{{ Net_IPv4 |
| 81 |
+- |
| 82 |
+-/** |
| 83 |
+-* Class to provide IPv4 calculations |
| 84 |
+-* |
| 85 |
+-* Provides methods for validating IP addresses, calculating netmasks, |
| 86 |
+-* broadcast addresses, network addresses, conversion routines, etc. |
| 87 |
+-* |
| 88 |
+-* @category Net |
| 89 |
+-* @package Net_IPv4 |
| 90 |
+-* @author Eric Kilfoil <edk@×××××.net> |
| 91 |
+-* @author Marco Kaiser <bate@×××.net> |
| 92 |
+-* @author Florian Anderiasch <fa@×××.net> |
| 93 |
+-* @copyright 1997-2005 The PHP Group |
| 94 |
+-* @license http://www.php.net/license/3_01.txt PHP License 3.01 |
| 95 |
+-* @version CVS: @package_version@ |
| 96 |
+-* @link http://pear.php.net/package/Net_IPv4 |
| 97 |
+-* @access public |
| 98 |
+-*/ |
| 99 |
+-class Net_IPv4 |
| 100 |
+-{ |
| 101 |
+- // {{{ properties |
| 102 |
+- var $ip = ""; |
| 103 |
+- var $bitmask = false; |
| 104 |
+- var $netmask = ""; |
| 105 |
+- var $network = ""; |
| 106 |
+- var $broadcast = ""; |
| 107 |
+- var $long = 0; |
| 108 |
+ |
| 109 |
+ // }}} |
| 110 |
+ // {{{ validateIP() |
| 111 |
+@@ -154,7 +155,7 @@ |
| 112 |
+ */ |
| 113 |
+ function validateNetmask($netmask) |
| 114 |
+ { |
| 115 |
+- if (! in_array($netmask, $GLOBALS['Net_IPv4_Netmask_Map'])) { |
| 116 |
++ if (! in_array($netmask, self::$Net_IPv4_Netmask_Map)) { |
| 117 |
+ return false; |
| 118 |
+ } |
| 119 |
+ return true; |
| 120 |
+@@ -264,7 +265,7 @@ |
| 121 |
+ */ |
| 122 |
+ function calculate() |
| 123 |
+ { |
| 124 |
+- $validNM = $GLOBALS['Net_IPv4_Netmask_Map']; |
| 125 |
++ $validNM = self::$Net_IPv4_Netmask_Map; |
| 126 |
+ |
| 127 |
+ if (! is_a($this, "net_ipv4")) { |
| 128 |
+ $myself = new Net_IPv4; |
Archives