function_entry -> zend_function_entry (bug #522444).

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 27 insertions, 19 deletions

diff --git a/net-fs/ncpfs/ChangeLog b/net-fs/ncpfs/ChangeLog
index b307fd835782..316ee166d913 100644
--- a/net-fs/ncpfs/ChangeLog
+++ b/net-fs/ncpfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/ncpfs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/ncpfs/ChangeLog,v 1.34 2014/08/13 07:01:46 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/ncpfs/ChangeLog,v 1.35 2014/09/09 16:54:17 jer Exp $
+
+  09 Sep 2014; Jeroen Roovers <jer@gentoo.org> ncpfs-2.2.6-r3.ebuild,
+  +files/ncpfs-2.2.6-zend_function_entry.patch:
+  function_entry -> zend_function_entry (bug #522444).
 
   13 Aug 2014; Joshua Kinard <kumba@gentoo.org> ncpfs-2.2.6-r3.ebuild,
   -files/ncpfs-2.2.6-cve-2011-1679-1680.patch,
diff --git a/net-fs/ncpfs/Manifest b/net-fs/ncpfs/Manifest
index 4fe55ca6af24..09436b634b3d 100644
--- a/net-fs/ncpfs/Manifest
+++ b/net-fs/ncpfs/Manifest
@@ -19,25 +19,16 @@ AUX ncpfs-2.2.6-pie-fix.patch 1528 SHA256 9c6a81bbd69b8534f31f930996925a5c4d734b
 AUX ncpfs-2.2.6-remove-libncp_atomic-header.patch 572 SHA256 881a5c6ebe5bed2563a69bec90c2bf19c4fbc14a7e0fb972ce44917610d5d946 SHA512 07689c979e8e6a40aca410ac8211c6af9fa640679c34ab3431e70c849e9f3c42d26b204310a697ef1494f33b5296e642b977dfc56453f680527ee54d697abe1c WHIRLPOOL 1cd8e5a1eddddbf4a370f1864b5a4294268dc609035ff6ab6451247d1c20287a2e2afbc4ad11c7d225b98cb30d7688f1a3c2e59d5b802ed79de6bb79806fbd83
 AUX ncpfs-2.2.6-remove-packed-attrib.patch 10312 SHA256 f1c587b329224f34f351e08b32333e854539223d337e6bb2fdadf28c2130673b SHA512 efd11c2cf08f3b7b1458b836ee863f31e3ae470986a02a3d2db0ec6fbb7a984e2d33643765d7223b797732d80187412a907a9ca971233eb0f95ed4744ef6f44a WHIRLPOOL 187d2c71547de0de2007f872a53a7c4545a2ace4d258fc93802283278202eb0db7fbef70c7a6f7210e8f037e65399c76fa57def0fe73591d8d24967432be9a4c
 AUX ncpfs-2.2.6-servername-array-fix.patch 523 SHA256 8dd6be08b94259051c9cb8158a8375c4a7e35c5fc32301073ec174399458812c SHA512 10c8a0b7c6d715018acf77ea3bcca2e50add48d479cc0ee07035f3f8fb910069c2c508a25ab3de945ef19c78add6d8192f0cb484e756d9a15ceb3afcd8195a69 WHIRLPOOL ae9799b79681c8eadb5e5dc6c4c0f4e7fd4c5040fbaa84a166bf09d24e1e1fb6cdb0842acafefa3b6a9f0f6cb3e2ed1593898beb79fcee329b6a5e8f266b5d6c
+AUX ncpfs-2.2.6-zend_function_entry.patch 296 SHA256 8b598b730a313181e7d1c3f26b3daf7342ff74f0a8ba1ad4dd8f7628047fe1e2 SHA512 c96723a840cb1b0cdddb91ebe74620b87a32350be084f21b741bda4e399a7648fd00522e9f2ec8404d5a98835d3f5a343dd588f4279848cc031de5bed01680e0 WHIRLPOOL 1c7ebde603741a0d157c7d8cbf4d0910758105cdff5a00074c6161983835f91b134a5bdb94782232a82403bc76e8ac67df145529352e162e10524782d1447e8c
 DIST ncpfs-2.2.6.tar.gz 2100545 SHA256 2837046046bcdb46d77a80c1d17dbfd15e878700e879edab4cda9f080e0337f9 SHA512 51f85eaae85deb66cea2ff434974699f6aa45ed1ed75217ef6176ac0b7d0f9f1c4fb186afc64c1b495474d5bad9ac7614033128c0bec39c05de723a9b29c8602 WHIRLPOOL c0d4cca71fb3921e39fc6def9932d5a2500a65c7ca60f15ee09eef25637f7653df489c1947b9880f5c4eb3fab11cba663b8604fad8989170b3a74994cd4eb847
 EBUILD ncpfs-2.2.6-r2.ebuild 1953 SHA256 87189dbf1a8aff59d015f5a1f69bb1b09cdf98460211c1f314f4e6e558d912df SHA512 87457ae2c185aee7194fcec8d34d46632f7557ab10c7064b93ae696e81de75d028e9c3dacf35fbbfd57437fad6f013efb3bb09ea9b8d01353400ddbcca634a7b WHIRLPOOL 5b425c50791d4977706485db5a2dca90bc4c5d19c842b8a622b8d3c6084710f1e7c4039a233fc3595b17982ef29eec9bc20e4d7d6c4e79ca63cac736cb6bac84
-EBUILD ncpfs-2.2.6-r3.ebuild 2651 SHA256 7f0804792dac160051411e467bbafc0087f7d0dd95f839f195d9ca5b4f44c941 SHA512 13457640bfeb720d98e3dd9fbea72ea1282ccf83ed16488ad3497498fee16e37143747bb8a14e9067ef2adf4177ac5c3f86fc1164f74273924d89b9906768170 WHIRLPOOL 450ea9ac92c7f5fba11b4de71aebc9cd32317418a855b5c7520ea632f53462e8ea70c4a4035ac63d465bc742dfd5c73fa771805e18e74b365c643f291e965f39
-MISC ChangeLog 5922 SHA256 358cdcb8ed31b9e23ff3b64ef050170b8f4ebe0a6c2f2018ad282e8b9f8a0177 SHA512 ea962bae4b5f7da7c5b9511e53a182c276db46d67878b48b68acd79958b7657335fb47bc8d94532460be1139e810f41afebae543ac827c3f10f0bc3809874ba2 WHIRLPOOL c555fb679fce494c09911ed434680b646f3c084e65137040b039f0204cc6dd45428acd427c368e4b21d6f3b87f2970cb1db6b3cc2270ea5d00ab7e1f08442a8d
+EBUILD ncpfs-2.2.6-r3.ebuild 2714 SHA256 62d8eaa65829fb6d3523853c2567feb0fd13b00bd97121b06d1cf75760a65a98 SHA512 5a3f798fdf3772e80d795b3dbc10ea7456f129ff967e1c3a0415216d1f47d167c0dc1ceadf4f0bda6a0b74052ef349e44ba4798711536170ce701b54aaeaaec0 WHIRLPOOL 67e4dc5edeac38261b79d5a5a333f7decd4cbb136941c3e4a05392c9fc99761531e0ed637c4f387522950cd04ba8c8a73dca22f840c785320695ffd9790aba56
+MISC ChangeLog 6094 SHA256 929702ce249132efeb46cc17ef781c23d0d964070d530951a11d3ba2d3ec71ad SHA512 226539ed8d4e6b5eeb9a27fb2260b75680200872a49f86403ef070cd1a62bc2e7be0cce7f6bfcd80b9de2b41f388670411a58e04fcd47561f6313467c2e0bcfa WHIRLPOOL 7ea1c0bce4e8be8017435e04f24625bfdd927a60d5b97326073e57c1fcb00fa72777f26974fd78e63b3aee6c4168a009aa3f37e7e67f44abfd3b535d25f317a6
 MISC metadata.xml 290 SHA256 bc04d955fed7a177f63051b016c7f24451c30200e8608b70f8e63e25176a0348 SHA512 52de55e9486be04762f7ddc2dfe231e3c409ec63d3ec39dcf252540add9165a14c968fa90e281575982229791bf4a070f2285d857ca589c63e499e66e1c58d64 WHIRLPOOL a67855c335e629d78f0d54430450565c4dc3ac97184b42bcf0cbe15dfb23bdaca234feeee15773216a5243c18dd141ad9dfcc6dc0b2b95b48944ae549674545d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT6w1hAAoJENsjoH7SXZXj3V8P/A5wDgcNmDJHbtV9RjlaJfly
-paW2+LM1KKbH8VOnrk7UDVQUU070fGkzUg5nzonq7s9WOV6MIi4yFSXIjsO0YzC9
-8fZfJufRk/8xhP7PwhyxFyzCd7iJJFKCY5JQhu0KUkoXwc7uc/NGqF7ceWS9tsQs
-/ReviOAjAL+fj3flnXnacgYQSAPcHHPikDMgmmCGmnl4oSW6Zjjc45L7O1wSx5dY
-gycSn4sjgREs56C1bOgQzPtDXqJ9mLi874mvthxiuJbbgZGyD4w9AGKo3tsU/xBI
-3Y3hE3gPPZOvObc2BN9N7tCUD4m7onQq3Duq8oXWvk/p5y3NhOfqVawzIsHBXGEa
-dKY5oc+88eygf4OEMIM5MIHgApMio6gjygPqrHC9ZcR0FPoPiavRxaLA9givSpwj
-tIofLIZI1e5Hu2yi8RCE9X/zowXhT3qmp7a1lY85SVEjd/V4pnWERqo5jD27KzS1
-xNtmWdJKGVslyL//Wtu60QLEvINn3Tgy+h6xnIC/VmCVWqBxSHvn+nBCBCu/FiSZ
-tTAlz8YA7gFriGW32l5EsOi2oJR5rlXorQ+nItf8/m2PCqQuK4WkfddedILzKM6M
-MLe53aP4nWNgQOD0hl8HDD/wPVV53rTfIM1gBE3qzT8H1KTNPo2Kqnu+ttVnvzLg
-obKSyvwXUOs1mArFI7m2
-=ZYn3
+iEYEAREIAAYFAlQPMLoACgkQVWmRsqeSphM2igCeNNAtk21739meOfnXMqar5vrL
+8rwAn0OeBJWPJbVJvXGIHJOE2v5zHqzU
+=Yndg
 -----END PGP SIGNATURE-----
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-zend_function_entry.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-zend_function_entry.patch
new file mode 100644
index 000000000000..648cb8f7f770
--- /dev/null
+++ b/net-fs/ncpfs/files/ncpfs-2.2.6-zend_function_entry.patch
@@ -0,0 +1,11 @@
+--- a/contrib/php/php_auth_nds.c
++++ b/contrib/php/php_auth_nds.c
+@@ -1102,7 +1102,7 @@
+ 	php_info_print_table_end();
+ }
+ 
+-function_entry auth_nds_functions[] = {
++zend_function_entry auth_nds_functions[] = {
+ 	PHP_FE(auth_bindery,			NULL)
+ 	PHP_FE(auth_nds,			NULL)
+ 	PHP_FE(auth_tree,			NULL)
diff --git a/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild b/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild
index 8404435696a5..8a210374e3ad 100644
--- a/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild
+++ b/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild,v 1.2 2014/08/13 07:01:46 kumba Exp $
-
-EAPI="5"
+# $Header: /var/cvsroot/gentoo-x86/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild,v 1.3 2014/09/09 16:54:17 jer Exp $
 
+EAPI=5
 inherit eutils pam
 
 DESCRIPTION="Provides Access to Netware services using the NCP protocol"
@@ -60,6 +59,9 @@ src_prepare() {
 	# Bug 446696.  This might need re-diffing if additional Makefile
 	# fixes are added.
 	epatch "${FILESDIR}"/${P}-makefile-fix-soname-link.patch
+
+	# bug 522444
+	epatch "${FILESDIR}"/${P}-zend_function_entry.patch
 }
 
 src_configure() {