Version bump wrt bug 520178

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

5 files changed, 87 insertions, 18 deletions

diff --git a/dev-php/suhosin/ChangeLog b/dev-php/suhosin/ChangeLog
index b2885453cecd..87099fc37a21 100644
--- a/dev-php/suhosin/ChangeLog
+++ b/dev-php/suhosin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/suhosin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/ChangeLog,v 1.15 2014/08/10 21:06:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/ChangeLog,v 1.16 2014/10/08 13:39:30 grknight Exp $
+
+*suhosin-0.9.36 (08 Oct 2014)
+
+  08 Oct 2014;  <grknight@gentoo.org> +files/suhosin-0.9.36-libcrypt.patch,
+  +suhosin-0.9.36.ebuild, -files/suhosin-0.9.32.1-libcrypt.patch:
+  Version bump wrt bug 520178
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> suhosin-0.9.33.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-php/suhosin/Manifest b/dev-php/suhosin/Manifest
index 96841e1246f0..3b1d281ea823 100644
--- a/dev-php/suhosin/Manifest
+++ b/dev-php/suhosin/Manifest
@@ -1,17 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX suhosin-0.9.32.1-libcrypt.patch 626 SHA256 9556ee1159ed93f720c471d7121dbcaa949b153fc0372fc7ada3f8f5712d8029 SHA512 3b07fd841a5aef8a6703d354f5198c6b8b0fff019ddbca151b84f7ef4cd04d7d3584ea3747d9610b7dfc001c488cc6b89ef90193bb7107e2f3ebaf113128027f WHIRLPOOL 9e21ad194f6945c1c5ab4911672c4e88c67c78a3b8d760c7a702cf2f5b9dd6ed827cdb4eee428232d5884e8d0aa60fbca60c864a5ec0597bc717a7d29bc958ae
 AUX suhosin-0.9.33-fix-ZTS-compile-problem.patch 1660 SHA256 6ca5d401809cedf8ec06d0bdfd5fb3deacfe4b2f55804d909e23bd81bff1bac8 SHA512 a47681651ad7490cc43e409b905f7f103c28136aeb6d357ee636d7364e9338819851e52ece641987386ed6cd08018e797bc2ca491c2969566532197f7e156824 WHIRLPOOL 92800942c9236cab61daaae5142b5a221b3596e6bbcaae3d7db03aab6dba87b74a1efb2990e86893fd8aefc1bb2789b135f28a5e0465c98906f0c107f439f1a0
 AUX suhosin-0.9.33-libcrypt.patch 597 SHA256 1d752e19ff429c33ada63605f3130650273e5eeb5ddae8db3b34fb515ba2b3f1 SHA512 3cd4097df876f38210a1755b0a6f79b44ed3b045ca301f29f54e43cd960873d2280f8686144813e0ac9857a49f3fdcb2e45ae7a06fcb270dd74c186adf5a494c WHIRLPOOL 1041cf23ecafae10c10418d49df4aafcc414cdc334a968a113ac5af0f76e5e8af419ad372f08e882705f63e9748134b74d04a7acd5f4d0cd3b07b01b47d38d3b
+AUX suhosin-0.9.36-libcrypt.patch 610 SHA256 aa186babbf8e2aac78054a79a9fe2424921abcabe1698a3120177879a03eb00f SHA512 c711cc5d5af8ed778f07ad41060c741d7b7c7741291561b6f415e82ad358211e3b660b23b8691a3427c305c89d3b8b5eaedeeb94f412c3a5efb9ea941421bd33 WHIRLPOOL 0a4dc50f9ee5af85ba6d0c4f978f8e6a7815641b941971edf056653afbacbf22a42d458898e840965ef1347e60b1505314871e3e4e200daa4050cff02f9fced6
 DIST suhosin-0.9.33.tgz 104488 SHA256 865b1c72bae9a5a710fe0b07a0635556ce6c838653ec364d2a2a6e6f594529c5 SHA512 a9db84da19ae2fed29b8d3c61d253ab4f00dea986b202b45e55a9277e01e1c2037a720668dfd506b5a2a544131a006bb454b2c3c9440742f54e7371d62375dc8 WHIRLPOOL f88544b012940233cf492c8cabaeb763d288447ef3d7168360bbde180b533ff874c3d43add308fb76613893a10ac00b7f1ae1c0acb35fcfa74f70d5a43596c68
+DIST suhosin-0.9.36.tgz 132858 SHA256 3b7b8ac57a251ba0ed712d9f62b9ffdb6622c0a26b1118fd9d750744b5561596 SHA512 ff756867c3f10891b6aaeee3dd12433e9669ab1a7690089b7771120c92da8b35e0d449b742c9c7dfd2a3807ac433cf213a16dbb2da433fa90afa76866afac2ea WHIRLPOOL 2171557da8f6f018e92b49a6b1ac9d847b61ad90ca292cdadc44fca582202d8301271de042b7011331d09836352ae0cd9b14500588c46f0c8aef1c3a3e8f1ec1
 EBUILD suhosin-0.9.33.ebuild 1415 SHA256 8991f8633f1231fc39b880e9c9684f96facb86901ea6589ce9b1b3315b7f6a4a SHA512 2138acc6a5a94e1165bb3f5e198a3e990c3f8e993296f9bdd3d3f9dcb67520a76cf2720484097128fe63c4210bf2b72c89beb7242f7a17e084f8e3d63fb317f2 WHIRLPOOL e4c0887a098d6d32331c18bc521ffaf57bb212057a7f351db187345b73b3eea39c77039ed16d2c891e4ea6edd1863fb6124817fcaf4c3bbef649df139f196f8a
-MISC ChangeLog 10187 SHA256 6502b79c07933208550df133ed478039948feee7e873f87c26357ed584bc66af SHA512 97e5d0fd8cef430f3729abec4f0762e435944f660f3e30a701e0610bba76041ef16815c8976222f7b1dcdd6b07e44eddb13b416ada02c0566845180b737b5a3d WHIRLPOOL 1237d58e9fb81860d9615425b2dc4833f10c69465f5ca788f5ac6a4033f82d22c3795f7f41f4517d155b2c58cc4761f2e12ebb3436c5c702ed0ed6ff7594f4d9
+EBUILD suhosin-0.9.36.ebuild 1392 SHA256 1fcca526ebedd0236aa2b177f52b12dbabd78824b0fec3e91ce56ffd4941aa19 SHA512 a5b14b620ed47be60d202e5495af156e91d1afa538c6ab964b101e35e7677528384ac008931c78e8a3d5795f19220961a5994c67264737c5325f3c81a971e29c WHIRLPOOL 3803126cbb236f847fe6085fdc3bda9cd563fff6297d7c10d59ccf95c6994b11093faf0e3a5e90ac29a936be7bead818661ab7901d5ae0c55f4f2a0e92883458
+MISC ChangeLog 10393 SHA256 418c7fb6289b0fa61b3bbef2194a129b7029589b726c773926247586dd0e5ce2 SHA512 92aad29f95d33511bce72330bb694daf135c8a885c004191b77952626185b4974a5073421613653d07f72f62decf1fd930817388c88cea4b14520b3f4c192ecd WHIRLPOOL f5f9b5f4e32c2827300cb49549da2e9839e536aaa450ef8b859a3a45074ecf54117c4b62842af3ec987d6a7d05c0cd4ada6d8cbb6ab7d9133e4b86ca659487ad
 MISC metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 SHA512 94adacaefd7d989cc904cc3ee920b15d58fee61df13008ebcbefa66f9b5c58cab2a5fad0499d4b57cd41e5f1ae79c6cf44525d90e649d23ebacd7721466b8947 WHIRLPOOL 66f688809b11b84b1b9d782a3c03cfcefed87989862aaca20c17cb076349ec402da9eaf87f7be02f7b4de178ea42da31029baee1bcd8e563aeabe949d4ed41f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn3r0ACgkQcaHudmEf86r+pwCfSgvmtwgDwDuTe6gJ+cSIK9ZG
-0x8AnRLVapg0SewbIcjLl+uzZ2fVVJNl
-=nbTu
+iQEcBAEBCAAGBQJUNT6WAAoJEE4V4vFnx44dSEwH/RmfxsBoHzTIMkVD1m8YmuJv
+QN7Clp4MCTqRLvb0sGax5G79QWf6wM9GcnBdRYWXZ/+j2re/8SZCs8Pb4WLBVEak
+Vm/UGGzO6QU8vxLTyH8/nYUhHsue5/LIC55F1BgUfLTUH+flQyMKvb27LaHGOhiL
+sKCLGBHnpM5e1VBjKfeupBu18hbqJLyjNoc7yW71psT0XETCzGOo0xzfSDTcK75o
+nLPeYHymDI0hRgMOZKowx/iePlOhQksZ+JO7CM/5d8hz5zdRNC8A7oIEO88gJ6WW
+nPFPHDAj8FdBZxyeUwc2/vuY5qg2xGRVX85nYVi1+xi2fCad0gQdJw5d5ecK/s0=
+=ZXN/
 -----END PGP SIGNATURE-----
diff --git a/dev-php/suhosin/files/suhosin-0.9.32.1-libcrypt.patch b/dev-php/suhosin/files/suhosin-0.9.32.1-libcrypt.patch
deleted file mode 100644
index bf0d1a45f76f..000000000000
--- a/dev-php/suhosin/files/suhosin-0.9.32.1-libcrypt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: suhosin-0.9.32.1/config.m4
-===================================================================
---- suhosin-0.9.32.1.orig/config.m4
-+++ suhosin-0.9.32.1/config.m4
-@@ -6,4 +6,7 @@ PHP_ARG_ENABLE(suhosin, whether to enabl
- 
- if test "$PHP_SUHOSIN" != "no"; then
-   PHP_NEW_EXTENSION(suhosin, suhosin.c crypt.c crypt_blowfish.c sha256.c memory_limit.c treat_data.c ifilter.c post_handler.c ufilter.c rfc1867.c log.c header.c execute.c ex_imp.c session.c aes.c compat_snprintf.c, $ext_shared)
-+  PHP_CHECK_LIBRARY(crypt, crypt, 
-+    [PHP_ADD_LIBRARY(crypt,, SUHOSIN_SHARED_LIBADD)])
-+  PHP_SUBST(SUHOSIN_SHARED_LIBADD)
- fi
diff --git a/dev-php/suhosin/files/suhosin-0.9.36-libcrypt.patch b/dev-php/suhosin/files/suhosin-0.9.36-libcrypt.patch
new file mode 100644
index 000000000000..cce84c1aa364
--- /dev/null
+++ b/dev-php/suhosin/files/suhosin-0.9.36-libcrypt.patch
@@ -0,0 +1,12 @@
+Index: suhosin-0.9.32.1/config.m4
+===================================================================
+--- suhosin-0.9.33.orig/config.m4
++++ suhosin-0.9.33/config.m4
+@@ -6,4 +6,7 @@ PHP_ARG_ENABLE(suhosin, whether to enabl
+ 
+ if test "$PHP_SUHOSIN" != "no"; then
+   PHP_NEW_EXTENSION(suhosin, suhosin.c sha256.c memory_limit.c treat_data.c ifilter.c post_handler.c ufilter.c rfc1867.c rfc1867_new.c log.c header.c execute.c ex_imp.c session.c aes.c compat_snprintf.c, $ext_shared)
++  PHP_CHECK_LIBRARY(crypt, crypt,
++    [PHP_ADD_LIBRARY(crypt,, SUHOSIN_SHARED_LIBADD)])
++  PHP_SUBST(SUHOSIN_SHARED_LIBADD)
+ fi
diff --git a/dev-php/suhosin/suhosin-0.9.36.ebuild b/dev-php/suhosin/suhosin-0.9.36.ebuild
new file mode 100644
index 000000000000..6c10c78dbdc8
--- /dev/null
+++ b/dev-php/suhosin/suhosin-0.9.36.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/suhosin-0.9.36.ebuild,v 1.1 2014/10/08 13:39:30 grknight Exp $
+
+EAPI="5"
+
+PHP_EXT_NAME="suhosin"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+USE_PHP="php5-5 php5-4"
+
+inherit php-ext-source-r2
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+DESCRIPTION="Suhosin is an advanced protection system for PHP installations"
+HOMEPAGE="http://www.suhosin.org/"
+SRC_URI="http://download.suhosin.org/${P}.tgz"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-lang/php[unicode]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env ${slot}
+		epatch "${FILESDIR}"/${P}-libcrypt.patch
+	done
+	php-ext-source-r2_src_prepare
+}
+
+src_install() {
+	php-ext-source-r2_src_install
+	dodoc CREDITS
+
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env ${slot}
+		for inifile in ${PHPINIFILELIST} ; do
+			insinto "${inifile/${PHP_EXT_NAME}.ini/}"
+			insopts -m644
+			doins "suhosin.ini"
+		done
+	done
+}
+
+src_test() {
+	# Makefile passes a hard-coded -d extension_dir=./modules, we move the lib
+	# away from there in src_compile
+	for slot in `php_get_slots`; do
+		php_init_slot_env ${slot}
+		NO_INTERACTION="yes" emake test || die "emake test failed for slot ${slot}"
+	done
+}