remove Suhosin and fix SQLite supprt

apache-php/apache-php.spec

@@ -23,8 +23,6 @@
 
 #   package versions
 %define       V_php                     5.4.3
-%define       V_php_suhosin_p           5.3.9-0.9.10
-%define       V_php_suhosin_e           0.9.33
 
 #   package information
 Name:         apache-php
@@ -40,7 +38,6 @@ Version:      %{V_php}
 Release:      20120512
 
 #   package options
-%option       with_suhosin              no
 %option       with_bc                   no
 %option       with_bdb                  no
 %option       with_bzip2                no
@@ -124,11 +121,9 @@ Release:      20120512
 
 #   list of sources
 Source0:      http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.bz2
-Source1:      http://download.suhosin.org/suhosin-%{V_php_suhosin_e}.tgz
-Source2:      apache-php.ini
-Source3:      apache-php.conf
-Patch0:       http://download.suhosin.org/suhosin-patch-%{V_php_suhosin_p}.patch.gz
-Patch1:       apache-php.patch
+Source1:      apache-php.ini
+Source2:      apache-php.conf
+Patch0:       apache-php.patch
 
 #   build information
 BuildPreReq:  OpenPKG, openpkg >= 20100101, gcc, flex, bison
@@ -137,9 +132,6 @@ BuildPreReq:  apache
 PreReq:       apache
 BuildPreReq:  pcre
 PreReq:       pcre
-%if "%{with_suhosin}" == "yes"
-BuildPreReq:  autoconf
-%endif
 %if "%{with_sqlite}" == "yes"
 BuildPreReq:  sqlite
 PreReq:       sqlite
@@ -272,32 +264,9 @@ PreReq:       tidy
         url       = http://www.php.net/downloads.php
         regex     = php-(5\.\d+\.\d+)\.tar\.(bz2|gz)
     }
-    prog apache-php:suhosin-patch = {
-        version   = %{V_php_suhosin_p}
-        url       = http://www.hardened-php.net/suhosin/download.html
-        regex     = suhosin-patch-(5\.\d+\.\d+-\d+(\.\d+)+)\.patch\.gz
-    }
-    prog apache-php:suhosin-ext = {
-        version   = %{V_php_suhosin_e}
-        url       = http://www.hardened-php.net/suhosin/download.html
-        regex     = suhosin-(\d+(\.\d+)+)\.tgz
-    }
 
 %prep
     %setup -q -n php-%{V_php}
-%if "%{with_suhosin}" == "yes"
-    %setup -q -n php-%{V_php} -T -D -a 1
-    %patch -p1
-    mv suhosin-%{V_php_suhosin_e} ext/suhosin
-    rm -f package.xml
-%endif
-%if "%{with_suhosin}" == "yes"
-    #   in case we add extensions the configure script needs to be newly
-    #   generated
-    export PHP_AUTOCONF="autoconf-213"
-    rm -f configure && ./buildconf --copy --force
-    $PHP_AUTOCONF
-%endif
     %{l_shtool} subst \
         -e 's;-i -a -n php5;-i -n php5;' \
         configure
@@ -305,7 +274,7 @@ PreReq:       tidy
         -e 's;\(/include\)/freetype2;\1;' \
         configure \
         ext/gd/config.m4
-    %patch -p0 -P 1
+    %patch -p0
 
 %build
     #   configure package
@@ -360,14 +329,11 @@ PreReq:       tidy
         --enable-pdo \
         --enable-filter \
         --with-pcre-regex=%{l_prefix} \
-%if "%{with_suhosin}" == "yes"
-        --enable-suhosin \
-%endif
 %if "%{with_calendar}" == "yes"
         --enable-calendar \
 %endif
 %if "%{with_sqlite}" == "yes"
-        --with-sqlite \
+        --with-sqlite3=%{l_prefix} \
         --with-pdo-sqlite=%{l_prefix} \
 %else
         --without-pdo-sqlite \