- up to 5.3.17

diff --git a/php-litespeed.patch b/php-litespeed.patch
new file mode 100644 (file)
index 0000000..5e61311
--- /dev/null
+++ b/php-litespeed.patch
@@ -0,0 +1,11 @@
+--- php-5.3.17/sapi/litespeed/lsapi_main.c~    2010-11-20 00:24:12.000000000 +0100
++++ php-5.3.17/sapi/litespeed/lsapi_main.c     2012-09-15 20:58:09.482395102 +0200
+@@ -635,7 +635,7 @@
+         "  args...    Arguments passed to script.\n";
+     php_output_startup();
+     php_output_activate(TSRMLS_C);
+-    php_printf( usage );
++    php_printf( "%s", usage );
+ #ifdef PHP_OUTPUT_NEWAPI
+     php_output_end_all(TSRMLS_C);
+ #else

diff --git a/php.spec b/php.spec
index e3882240f2680133aefff7577fa3df0212ab62b9..d87667e140434c14a757a177d89853434114f228 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -117,7 +117,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %define                php_suffix %{nil}
 %endif
 
-%define                rel     5
+%define                rel     1
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP
@@ -125,13 +125,13 @@ Summary(pt_BR.UTF-8):     A linguagem de script PHP
 Summary(ru.UTF-8):     PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):     PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          %{orgname}%{php_suffix}
-Version:       5.3.16
+Version:       5.3.17
 Release:       %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
 Epoch:         4
 License:       PHP
 Group:         Libraries
 Source0:       http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2
-# Source0-md5: 99cfd78531643027f60c900e792d21be
+# Source0-md5: 29ee79c941ee85d6c1555c176f12f7ef
 Source2:       %{orgname}-mod_%{orgname}.conf
 Source3:       %{orgname}-cgi-fcgi.ini
 Source4:       %{orgname}-apache.ini
@@ -201,6 +201,7 @@ Patch64:    %{orgname}-m4.patch
 # http://spot.fedorapeople.org/php-5.3.6-libzip.patch
 Patch65:       system-libzip.patch
 Patch66:       %{orgname}-db.patch
+Patch67:       php-litespeed.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}
@@ -1950,6 +1951,7 @@ cp -p php.ini-production php.ini
 %patch66 -p1
 %{__rm} -r sapi/litespeed
 gzip -dc %{SOURCE15} | tar xf - -C sapi/
+%patch67 -p1
 
 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4