Author: oden
Date: Sun Nov 12 18:01:45 2006
New Revision: 83443
Added:
packages/cooker/php/current/SOURCES/suhosin-patch-5.2.0-0.9.6.2.patch.gz
(contents, props changed)
packages/cooker/php/current/SOURCES/suhosin-patch-5.2.0-0.9.6.2.patch.gz.sig
(contents, props changed)
Removed:
packages/cooker/php/current/SOURCES/suhosin-patch-5.2.0-0.9.6.1.patch.gz
packages/cooker/php/current/SOURCES/suhosin-patch-5.2.0-0.9.6.1.patch.gz.sig
Modified:
packages/cooker/php/current/SOURCES/php-5.1.2-phpize.diff
packages/cooker/php/current/SPECS/php.spec
Log:
- suhosin patch 0.9.6.2
- revert to the predictable automake version
Modified: packages/cooker/php/current/SOURCES/php-5.1.2-phpize.diff
==============================================================================
--- packages/cooker/php/current/SOURCES/php-5.1.2-phpize.diff (original)
+++ packages/cooker/php/current/SOURCES/php-5.1.2-phpize.diff Sun Nov 12
18:01:45 2006
@@ -5,7 +5,7 @@
PHP_AUTOCONF ?= 'autoconf'
PHP_AUTOHEADER ?= 'autoheader'
-+PHP_ACLOCAL ?= 'aclocal-1.9'
++PHP_ACLOCAL ?= 'aclocal-1.7'
SUPPRESS_WARNINGS ?= 2>&1 | (egrep -v '(AC_TRY_RUN called without default to
allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in
acinclude.m4 but never used|AC_PROG_LEX invoked multiple times|AC_DECL_YYTEXT
is expanded from...|the top level)'||true)
@@ -29,7 +29,7 @@
{
test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf
test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader
-+ test -z "$PHP_ACLOCAL" && PHP_ACLOCAL=aclocal-1.9
++ test -z "$PHP_ACLOCAL" && PHP_ACLOCAL=aclocal-1.7
if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then
cat <<EOF
Added: packages/cooker/php/current/SOURCES/suhosin-patch-5.2.0-0.9.6.2.patch.gz
==============================================================================
Binary file. No diff available.
Added:
packages/cooker/php/current/SOURCES/suhosin-patch-5.2.0-0.9.6.2.patch.gz.sig
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/php/current/SPECS/php.spec
==============================================================================
--- packages/cooker/php/current/SPECS/php.spec (original)
+++ packages/cooker/php/current/SPECS/php.spec Sun Nov 12 18:01:45 2006
@@ -4,12 +4,12 @@
%define major 5
%define libname %mklibname php5_common %{major}
-%define suhosin_version 0.9.6.1
+%define suhosin_version 0.9.6.2
Summary: The PHP5 scripting language
Name: php
Version: 5.2.0
-Release: %mkrel 2
+Release: %mkrel 3
Group: Development/PHP
License: PHP License
URL: http://www.php.net
@@ -72,7 +72,7 @@
# http://www.suhosin.org/
Patch300: suhosin-patch-%{version}-%{suhosin_version}.patch.gz
Source4: suhosin-patch-%{version}-%{suhosin_version}.patch.gz.sig
-BuildRequires: apache-devel >= 2.0.54, autoconf2.5, automake1.9, bison, byacc,
flex, libtool, libxml2-devel, libxslt-devel
+BuildRequires: apache-devel >= 2.0.54, autoconf2.5, automake1.7, bison, byacc,
flex, libtool, libxml2-devel, libxslt-devel
BuildRequires: openssl >= 0.9.7, openssl-devel >= 0.9.7, pcre-devel >= 5.0,
pam-devel, dos2unix, re2c >= 0.9.11
BuildRequires: multiarch-utils >= 1.0.3
Epoch: %{epoch}
@@ -344,7 +344,7 @@
Requires(post): %{libname} >= %{version}
Requires(preun): %{libname} >= %{version}
Requires: %{libname} >= %{version}
-Requires: autoconf2.5, automake1.9, bison, byacc, flex, libtool,
libxml2-devel, libxslt-devel, apache-base >= 2.0.54-5mdk
+Requires: autoconf2.5, automake1.7, bison, byacc, flex, libtool,
libxml2-devel, libxslt-devel, apache-base >= 2.0.54-5mdk
Requires: openssl >= 0.9.7, openssl-devel >= 0.9.7, pcre-devel >= 5.0,
pam-devel, dos2unix, chrpath, re2c >= 0.9.11
Epoch: %{epoch}
@@ -494,10 +494,8 @@
# this _has_ to be executed!
#export WANT_AUTOCONF_2_5=1
-%define __libtoolize /bin/true
-
-#rm -f configure; libtoolize --copy --force; aclocal-1.9; autoconf --force;
autoheader
-./buildconf --force
+rm -f configure; libtoolize --copy --force; aclocal-1.7; autoconf --force;
autoheader
+#./buildconf --force
export oldstyleextdir=yes
export EXTENSION_DIR="%{_libdir}/php/extensions"
@@ -512,9 +510,7 @@
`[ $i = apxs ] && echo --with-apxs2=%{_sbindir}/apxs` \
`[ $i = cli ] && echo --disable-cgi --enable-cli` \
--cache-file=config.cache \
- --host=%{_host} \
--build=%{_build} \
- --target=%{_target_platform} \
--prefix=%{_prefix} \
--exec-prefix=%{_prefix} \
--bindir=%{_bindir} \
@@ -567,6 +563,9 @@
%make libphp5_common.la
+# fix install paths, avoid evil rpaths
+%{__perl} -pi -e "s|^libdir=.*|libdir='%{_libdir}'|" libphp5_common.la
+
# make php-fcgi
cp -af php_config.h.fcgi main/php_config.h
%make -f Makefile.fcgi sapi/cgi/php
