[arch-commits] Commit in php/trunk (4 files)
Pierre Schmitz
pierre at archlinux.org
Thu Apr 26 14:01:22 UTC 2012
Date: Thursday, April 26, 2012 @ 10:01:22
Author: pierre
Revision: 157242
upgpkg: php 5.4.1-2
update to PHP 5.4.1; drop suhosin patch
Modified:
php/trunk/PKGBUILD
php/trunk/php-fpm.conf.in.patch
php/trunk/php.ini.patch
Deleted:
php/trunk/suhosin.patch
-----------------------+
PKGBUILD | 63 +++++++++++++-----------------------------------
php-fpm.conf.in.patch | 4 +--
php.ini.patch | 16 ++++--------
suhosin.patch | 13 ---------
4 files changed, 26 insertions(+), 70 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-04-26 13:40:50 UTC (rev 157241)
+++ PKGBUILD 2012-04-26 14:01:22 UTC (rev 157242)
@@ -21,44 +21,35 @@
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=5.3.11
-_suhosinver=5.3.9-0.9.10
-pkgrel=1
+pkgver=5.4.1
+pkgrel=2
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
-makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
+makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
- "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
- "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig"
'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
- 'logrotate.d.php-fpm' 'suhosin.patch')
-md5sums=('94709f6e7c920cbe26e19fa991d9975d'
- 'c099b3d7eac95018ababd41ded7f3066'
- 'c15d18f846be1d69144a5d0056ee6506'
- 'ffc338e8ce2a990f6f2a486355bbab65'
+ 'logrotate.d.php-fpm')
+md5sums=('5b9529ed89dbc48c498e9693d1af3caf'
+ '0b0bc7a917fc592bdf11dcd3c5c255e9'
'dec2cbaad64e3abf4f0ec70e1de4e8e9'
'b01be5f816988fcee7e78225836e5e27'
- '740ec5fe2ecfd9d7febd4081c90ec65b'
- '07c4e412909ac65a44ec90e7a2c4bade'
- '07ca7da608553b4cb92797e655eb94f1')
+ '59b3a25f9eb3afc02f1adf9ee699808c'
+ '07c4e412909ac65a44ec90e7a2c4bade')
build() {
phpconfig="--srcdir=../${pkgbase}-${pkgver} \
+ --config-cache \
--prefix=/usr \
--sysconfdir=/etc/php \
--localstatedir=/var \
--with-layout=GNU \
--with-config-file-path=/etc/php \
--with-config-file-scan-dir=/etc/php/conf.d \
- --enable-inline-optimization \
- --disable-debug \
--disable-rpath \
- --disable-static \
- --enable-shared \
--mandir=/usr/share/man \
--without-pear \
"
@@ -70,36 +61,31 @@
--enable-ftp=shared \
--enable-gd-native-ttf \
--enable-intl=shared \
- --enable-json=shared \
- --enable-mbregex \
--enable-mbstring \
- --enable-pdo \
--enable-phar=shared \
--enable-posix=shared \
- --enable-session \
--enable-shmop=shared \
--enable-soap=shared \
--enable-sockets=shared \
- --enable-sqlite-utf8 \
--enable-sysvmsg=shared \
--enable-sysvsem=shared \
--enable-sysvshm=shared \
- --enable-xml \
--enable-zip=shared \
--with-bz2=shared \
--with-curl=shared \
--with-db4=/usr \
--with-enchant=shared,/usr \
- --with-freetype-dir=shared,/usr \
+ --with-freetype-dir=/usr \
--with-gd=shared \
- --with-gdbm=shared \
+ --with-gdbm \
--with-gettext=shared \
--with-gmp=shared \
--with-iconv=shared \
--with-icu-dir=/usr \
- --with-imap-ssl=shared \
+ --with-imap-ssl \
--with-imap=shared \
- --with-jpeg-dir=shared,/usr \
+ --with-jpeg-dir=/usr \
+ --with-vpx-dir=/usr \
--with-ldap=shared \
--with-ldap-sasl \
--with-mcrypt=shared \
@@ -115,19 +101,15 @@
--with-pdo-pgsql=shared \
--with-pdo-sqlite=shared,/usr \
--with-pgsql=shared \
- --with-png-dir=shared,/usr \
+ --with-png-dir=/usr \
--with-pspell=shared \
- --with-regex=php \
--with-snmp=shared \
--with-sqlite3=shared,/usr \
- --with-sqlite=shared \
--with-tidy=shared \
--with-unixODBC=shared,/usr \
--with-xmlrpc=shared \
--with-xsl=shared \
--with-zlib \
- --without-db2 \
- --without-db3 \
"
EXTENSION_DIR=/usr/lib/php/modules
@@ -135,14 +117,8 @@
PEAR_INSTALLDIR=/usr/share/pear
export PEAR_INSTALLDIR
- # fix the suhosin patch
- patch -i ${srcdir}/suhosin.patch
-
cd ${srcdir}/${pkgbase}-${pkgver}
- # apply suhosin patch
- patch -F3 -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
-
# adjust paths
patch -p0 -i ${srcdir}/php.ini.patch
patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
@@ -280,11 +256,8 @@
backup=('etc/php/pear.conf')
cd ${srcdir}/build-pear
- make -j1 install-pear INSTALL_ROOT=${pkgdir}
- local i
- while read i; do
- [ ! -e "$i" ] || rm -rf "$i"
- done < <(find ${pkgdir} -name '.*')
+ make install-pear INSTALL_ROOT=${pkgdir}
+ rm -rf ${pkgdir}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry}
}
package_php-enchant() {
@@ -294,7 +267,7 @@
}
package_php-gd() {
- depends=('php' 'libpng' 'libjpeg' 'freetype2')
+ depends=('php' 'libpng' 'libjpeg' 'freetype2' 'libvpx')
pkgdesc='gd module for PHP'
install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so
}
Modified: php-fpm.conf.in.patch
===================================================================
--- php-fpm.conf.in.patch 2012-04-26 13:40:50 UTC (rev 157241)
+++ php-fpm.conf.in.patch 2012-04-26 14:01:22 UTC (rev 157242)
@@ -1,5 +1,5 @@
--- sapi/fpm/php-fpm.conf.in 2011-10-08 23:04:10.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in 2012-01-11 10:50:14.905161442 +0100
++++ sapi/fpm/php-fpm.conf.in 2012-03-01 19:50:48.549947258 +0100
@@ -12,7 +12,7 @@
; Relative path can also be used. They will be prefixed by:
; - the global prefix if it's been set (-p arguement)
@@ -26,7 +26,7 @@
+;listen = 127.0.0.1:9000
+listen = /var/run/php-fpm/php-fpm.sock
- ; Set listen(2) backlog. A value of '-1' means unlimited.
+ ; Set listen(2) backlog.
; Default Value: 128 (-1 on FreeBSD and OpenBSD)
@@ -151,9 +152,9 @@
; BSD-derived systems allow connections regardless of permissions.
Modified: php.ini.patch
===================================================================
--- php.ini.patch 2012-04-26 13:40:50 UTC (rev 157241)
+++ php.ini.patch 2012-04-26 14:01:22 UTC (rev 157242)
@@ -1,6 +1,6 @@
---- php.ini-production 2011-12-15 11:31:02.000000000 +0100
-+++ php.ini-production 2012-01-11 10:43:02.069936043 +0100
-@@ -376,7 +376,7 @@
+--- php.ini-production 2012-03-29 06:17:59.000000000 +0200
++++ php.ini-production 2012-03-30 10:46:21.181340861 +0200
+@@ -305,7 +305,7 @@
; or per-virtualhost web server configuration file. This directive is
; *NOT* affected by whether Safe Mode is turned On or Off.
; http://php.net/open-basedir
@@ -9,7 +9,7 @@
; This directive allows you to disable certain functions for security reasons.
; It receives a comma-delimited list of function names. This directive is
-@@ -793,7 +793,7 @@
+@@ -702,7 +702,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -18,7 +18,7 @@
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
-@@ -816,7 +816,7 @@
+@@ -725,7 +725,7 @@
; Directory in which the loadable extensions (modules) reside.
; http://php.net/extension-dir
@@ -27,7 +27,7 @@
; On windows:
; extension_dir = "ext"
-@@ -950,53 +950,49 @@
+@@ -859,51 +859,47 @@
; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
;
@@ -55,7 +55,6 @@
-;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client
-;extension=php_openssl.dll
-;extension=php_pdo_firebird.dll
--;extension=php_pdo_mssql.dll
-;extension=php_pdo_mysql.dll
-;extension=php_pdo_oci.dll
-;extension=php_pdo_odbc.dll
@@ -71,7 +70,6 @@
-
-;extension=php_soap.dll
-;extension=php_sockets.dll
--;extension=php_sqlite.dll
-;extension=php_sqlite3.dll
-;extension=php_sybase_ct.dll
-;extension=php_tidy.dll
@@ -92,7 +90,6 @@
+;extension=iconv.so
+;extension=imap.so
+;extension=intl.so
-+extension=json.so
+;extension=ldap.so
+;extension=mcrypt.so
+;extension=mssql.so
@@ -113,7 +110,6 @@
+;extension=soap.so
+;extension=sockets.so
+;extension=sqlite3.so
-+;extension=sqlite.so
+;extension=sysvmsg.so
+;extension=sysvsem.so
+;extension=sysvshm.so
Deleted: suhosin.patch
===================================================================
--- suhosin.patch 2012-04-26 13:40:50 UTC (rev 157241)
+++ suhosin.patch 2012-04-26 14:01:22 UTC (rev 157242)
@@ -1,13 +0,0 @@
---- suhosin-patch-5.3.9-0.9.10.patch 2012-04-01 11:55:46.699676255 +0200
-+++ suhosin-patch-5.3.9-0.9.10.patch 2012-04-01 11:56:19.322146479 +0200
-@@ -4515,8 +4515,8 @@
- +#define SUHOSIN_PATCH 1
- +EOF
-
-- echo $ac_n "checking for declared timezone""... $ac_c" 1>&6
-- echo "configure:19377: checking for declared timezone" >&5
-+ echo "$as_me:$LINENO: checking for declared timezone" >&5
-+ echo $ECHO_N "checking for declared timezone... $ECHO_C" >&6
- @@ -115830,7 +115833,7 @@
- php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
- strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
More information about the arch-commits
mailing list