diff options
| -rw-r--r-- | dev-php/suhosin/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-php/suhosin/Manifest | 21 | ||||
| -rw-r--r-- | dev-php/suhosin/files/suhosin-0.9.33-fix-ZTS-compile-problem.patch | 54 | ||||
| -rw-r--r-- | dev-php/suhosin/suhosin-0.9.33.ebuild | 3 |
4 files changed, 72 insertions, 12 deletions
diff --git a/dev-php/suhosin/ChangeLog b/dev-php/suhosin/ChangeLog index 774bcd0634b4..24b727bdb5f7 100644 --- a/dev-php/suhosin/ChangeLog +++ b/dev-php/suhosin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-php/suhosin # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/ChangeLog,v 1.3 2012/01/27 13:30:25 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/ChangeLog,v 1.4 2012/02/12 19:13:00 olemarkus Exp $ + + 12 Feb 2012; Ole Markus With <olemarkus@gentoo.org> + +files/suhosin-0.9.33-fix-ZTS-compile-problem.patch, suhosin-0.9.33.ebuild: + Added patch that makes suhosin build with php[threads]. Bug 400889 27 Jan 2012; Agostino Sarubbo <ago@gentoo.org> suhosin-0.9.33.ebuild: Stable for AMD64, wrt security bug #399427 diff --git a/dev-php/suhosin/Manifest b/dev-php/suhosin/Manifest index 76ca96bb5abb..780ac1a3d650 100644 --- a/dev-php/suhosin/Manifest +++ b/dev-php/suhosin/Manifest @@ -1,22 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 AUX suhosin-0.9.32.1-libcrypt.patch 626 RMD160 4a0cf0bb547e793217a844f7ee5a1624ba5cb202 SHA1 9f1940e17c3bc3d995dcc835f69c1b78dfa4a563 SHA256 9556ee1159ed93f720c471d7121dbcaa949b153fc0372fc7ada3f8f5712d8029 +AUX suhosin-0.9.33-fix-ZTS-compile-problem.patch 1660 RMD160 969d20177fab0679df0cd64ddfd900dae8a4f200 SHA1 6886401840a6b7965d24e60308e42c23d2e587e7 SHA256 6ca5d401809cedf8ec06d0bdfd5fb3deacfe4b2f55804d909e23bd81bff1bac8 AUX suhosin-0.9.33-libcrypt.patch 597 RMD160 d30acf57c81b3ec4978c2ace74b5083216daaa4f SHA1 b7d43da56c692d5f2999d236e8a258479ab933f0 SHA256 1d752e19ff429c33ada63605f3130650273e5eeb5ddae8db3b34fb515ba2b3f1 DIST suhosin-0.9.32.1.tar.gz 119117 RMD160 6184eef336b9d3d5c885a7d1dcbf20d97b055e8d SHA1 93fcb1d5f96691c4c50808a14dd3d6d4bbfea451 SHA256 d283abcbd1803eaa11bbd91cb5aae727b2bbab3a00a1de8510f85d8cc598e490 DIST suhosin-0.9.33.tgz 104488 RMD160 9c60b695b226ddcbe5562b1576228780123eb372 SHA1 abb30c22e7fe341955b42ec71ed597c43439e2b8 SHA256 865b1c72bae9a5a710fe0b07a0635556ce6c838653ec364d2a2a6e6f594529c5 EBUILD suhosin-0.9.32.1-r2.ebuild 1366 RMD160 fa2814b60212a693b75cd9f1869676041d35b189 SHA1 6c543de5676cdf99febfd22d80393c1c8c32fad3 SHA256 b499b60723fcd8ee7bcbcab1e9dc42374af18b7c96dbf38f4fec8fc381b76b04 -EBUILD suhosin-0.9.33.ebuild 1360 RMD160 646f1870ccd97a95a54ddc5b8406da81b67d1491 SHA1 95903899988d64975d0e8bf00d8e8ba8b07bea00 SHA256 ab6791fd6b150f05b513be213bffbb4091364a5975355e7fd56b9931c8a38753 -MISC ChangeLog 8702 RMD160 2d79ba4267329a71961778ce633930517a0e2007 SHA1 9c79a895f65acfd52d438e04c2b7b70026119ab5 SHA256 31a668479bf6df639f3dc5b044558c036f69ed5c82adca7491cd4941d777f796 +EBUILD suhosin-0.9.33.ebuild 1424 RMD160 b95fee6ed41b90ce0fc938f42a5ca6d6bf4a2126 SHA1 85030c30d416d590ff333ddc8daa9a16f634b9bf SHA256 4642bf95a024edcf39fa3e48b25f9994343bba2e9d59f8c8ac5dc60b209f54e4 +MISC ChangeLog 8910 RMD160 4e205066030c085751fe557210fec05f8ee595d5 SHA1 3d404efdab63d5eacec892bc181c7c5e44071251 SHA256 5409e1d005f9f2d7643b5ceb82633cb034d59d99c33e5718c01bf6bc79a517b2 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBCgAGBQJPIqb3AAoJEOTDgjZ80txdqygH/R6fvAtVdr/HUTSowvlbz0IB -IKFW2XgCoAsKb9NQ0GBKFPU37SRcWPahbldKscUXTipnf//ZRQ7LKF5caAA8VaCb -CNDqkrC/dyTXpRG23oo5KgTKMbt9VQxf/Vp30IEj7Thv2oOfWPeSV4QWQREOWQWb -lpEToNBuF0C1yDQA/ZYiDFZ2+AS4DCl+/xwhfn4NFIFkg/rVQeNkEf3C2koVbwhz -Rc986q5mIPNpa6Ee+USoy6qnhKGhWjRHSY8Z3DET7PPQt9jlNPSMxDPsQjTLEbng -EaZuoWuVnRqJjSiaK4gOmDh4KdteXlltQ8F6JSDxQtVx/NiJlV5HArfFgFx3Ev8= -=spz3 +iQEcBAEBAgAGBQJPOA9GAAoJEGurSuXEqSv1teYIAIzv1SE/RpFycHFM6S62/wrm +KleV9RG/TonOzTw4cFlnM+IB2HpQPtXAf2jE6eVZW/D9+duTiJRaj4GVgWkaTun1 +uvdsi5h/Z+NdfFPc4ApRNAJs78ALFV6jPg2Oz4bIFpK1gc1Kw2q680F+It/KdEn+ +mXqxwfdXPuaRoX+wKTmkxVAlKG5iD7jtJsi1g1wC8V97vBSXsqQxuZ+bwNEH29VM +VqlBhtj8PhOhcOIMrapZewEbHCF/68hZb3sdgBgUm6q9hK8dtVJF0aNyeoqyIeDl +UZYpZc1BCKDE4Re1L2knc+lMk2eOjJ+jJiP+XX7pK5LJHmS5MpWo0J+v1eo/xBc= +=LEuH -----END PGP SIGNATURE----- diff --git a/dev-php/suhosin/files/suhosin-0.9.33-fix-ZTS-compile-problem.patch b/dev-php/suhosin/files/suhosin-0.9.33-fix-ZTS-compile-problem.patch new file mode 100644 index 000000000000..361d6f2091e6 --- /dev/null +++ b/dev-php/suhosin/files/suhosin-0.9.33-fix-ZTS-compile-problem.patch @@ -0,0 +1,54 @@ +From af51a7f576f0cec1d2c94b9bbb3dfb46dd466a66 Mon Sep 17 00:00:00 2001 +From: Stefan Esser <stefan@nopiracy.de> +Date: Sun, 12 Feb 2012 10:47:10 +0100 +Subject: [PATCH] Fix ZTS compile problem + +--- + php_suhosin.h | 2 +- + post_handler.c | 2 +- + suhosin.c | 4 +++- + 3 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/php_suhosin.h b/php_suhosin.h +index 7d0a286..c3491d0 100644 +--- a/php_suhosin.h ++++ b/php_suhosin.h +@@ -308,7 +308,7 @@ + char *suhosin_cookie_decryptor(TSRMLS_D); + char *suhosin_getenv(char *name, size_t name_len TSRMLS_DC); + void suhosin_hook_post_handlers(TSRMLS_D); +-void suhosin_unhook_post_handlers(); ++void suhosin_unhook_post_handlers(TSRMLS_D); + void suhosin_hook_register_server_variables(); + void suhosin_hook_header_handler(); + void suhosin_unhook_header_handler(); +diff --git a/post_handler.c b/post_handler.c +index b405ae2..96f4b4a 100644 +--- a/post_handler.c ++++ b/post_handler.c +@@ -162,7 +162,7 @@ void suhosin_hook_post_handlers(TSRMLS_D) + ini_entry->on_modify = suhosin_OnUpdate_mbstring_encoding_translation; + } + +-void suhosin_unhook_post_handlers() ++void suhosin_unhook_post_handlers(TSRMLS_D) + { + zend_ini_entry *ini_entry; + +diff --git a/suhosin.c b/suhosin.c +index 9829896..01f987c 100644 +--- a/suhosin.c ++++ b/suhosin.c +@@ -189,9 +189,11 @@ static int suhosin_module_startup(zend_extension *extension) + + static void suhosin_shutdown(zend_extension *extension) + { ++ TSRMLS_FETCH(); ++ + suhosin_unhook_execute(); + suhosin_unhook_header_handler(); +- suhosin_unhook_post_handlers(); ++ suhosin_unhook_post_handlers(TSRMLS_C); + + if (ze != NULL) { + ze->startup = orig_module_startup; diff --git a/dev-php/suhosin/suhosin-0.9.33.ebuild b/dev-php/suhosin/suhosin-0.9.33.ebuild index d04eba1b6d49..70822835df41 100644 --- a/dev-php/suhosin/suhosin-0.9.33.ebuild +++ b/dev-php/suhosin/suhosin-0.9.33.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/suhosin-0.9.33.ebuild,v 1.2 2012/01/27 13:30:25 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/suhosin-0.9.33.ebuild,v 1.3 2012/02/12 19:13:00 olemarkus Exp $ EAPI="2" @@ -27,6 +27,7 @@ src_prepare() { for slot in $(php_get_slots); do php_init_slot_env ${slot} epatch "${FILESDIR}"/${P}-libcrypt.patch + epatch "${FILESDIR}"/${P}-fix-ZTS-compile-problem.patch done php-ext-source-r2_src_prepare } |