Version bump (bug 399427)

(Portage version: 2.1.10.41/cvs/Linux x86_64)

3 files changed, 77 insertions, 3 deletions

diff --git a/dev-php/suhosin/ChangeLog b/dev-php/suhosin/ChangeLog
index 32b86a7abe73..63c4b01f6a80 100644
--- a/dev-php/suhosin/ChangeLog
+++ b/dev-php/suhosin/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for dev-php5/suhosin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/ChangeLog,v 1.1 2011/09/18 10:32:18 olemarkus Exp $
+# 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.2 2012/01/26 08:10:49 olemarkus Exp $
+
+*suhosin-0.9.33 (26 Jan 2012)
+
+  26 Jan 2012; Ole Markus With <olemarkus@gentoo.org> +suhosin-0.9.33.ebuild,
+  +files/suhosin-0.9.33-libcrypt.patch:
+  Version bump (bug 399427)
 
   22 Aug 2011; Ole Markus With <olemarkus@gentoo.org> -suhosin-0.9.31.ebuild,
   -suhosin-0.9.32.1.ebuild, -suhosin-0.9.32.1-r1.ebuild:
diff --git a/dev-php/suhosin/files/suhosin-0.9.33-libcrypt.patch b/dev-php/suhosin/files/suhosin-0.9.33-libcrypt.patch
new file mode 100644
index 000000000000..19ffa153847f
--- /dev/null
+++ b/dev-php/suhosin/files/suhosin-0.9.33-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 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.33.ebuild b/dev-php/suhosin/suhosin-0.9.33.ebuild
new file mode 100644
index 000000000000..fd2cacf9011f
--- /dev/null
+++ b/dev-php/suhosin/suhosin-0.9.33.ebuild
@@ -0,0 +1,56 @@
+# 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.1 2012/01/26 08:10:49 olemarkus Exp $
+
+EAPI="2"
+
+PHP_EXT_NAME="suhosin"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+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"
+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
+}