packages: php/php.spec - add suhosin patch (bcond off for now)

glen glen at pld-linux.org
Tue May 19 13:15:53 CEST 2009


Author: glen                         Date: Tue May 19 11:15:53 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add suhosin patch (bcond off for now)

---- Files affected:
packages/php:
   php.spec (1.792 -> 1.793) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.792 packages/php/php.spec:1.793
--- packages/php/php.spec:1.792	Mon May  4 11:45:49 2009
+++ packages/php/php.spec	Tue May 19 13:15:48 2009
@@ -49,6 +49,7 @@
 %bcond_without	fcgi		# disable building FCGI SAPI
 %bcond_without	zts		# disable Zend Thread Safety
 %bcond_without	fpm		# fpm patches from http://php-fpm.anight.org/
+%bcond_with	suhosin		# with suhosin patch
 %bcond_with	system_xmlrpc_epi	# use system xmlrpc-epi library (broken on 64bit arches, see http://bugs.php.net/41611)
 %bcond_with	tests		# default off; test process very often hangs on builders; perform "make test"
 %bcond_with	versioning	# build with experimental versioning (to load php4/php5 into same apache)
@@ -157,6 +158,7 @@
 Patch44:	%{name}-include_path.patch
 Patch45:	%{name}-imap-annotations.patch
 Patch46:	%{name}-imap-myrights.patch
+Patch47:	suhosin.patch
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -1683,6 +1685,9 @@
 %patch44 -p1
 %patch45 -p1
 %patch46 -p1
+%if %{with suhosin}
+%patch47 -p1
+%endif
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
@@ -1797,6 +1802,7 @@
 	--with-exec-dir=%{_bindir} \
 	--%{!?debug:dis}%{?debug:en}able-debug \
 	%{?with_zts:--enable-maintainer-zts} \
+	%{?with_suhosin:--enable-suhosin} \
 	--enable-inline-optimization \
 	--enable-bcmath=shared \
 	--enable-calendar=shared \
@@ -2887,6 +2893,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.793  2009/05/19 11:15:48  glen
+- add suhosin patch (bcond off for now)
+
 Revision 1.792  2009/05/04 09:45:49  glen
 - make our default config more secure
   http://isc.sans.org/diary.html?storyid=6139
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.792&r2=1.793&f=u



More information about the pld-cvs-commit mailing list