[arch-commits] Commit in php/trunk (PKGBUILD crypt.patch)
Pierre Schmitz
pierre at archlinux.org
Tue Aug 23 15:53:26 UTC 2011
Date: Tuesday, August 23, 2011 @ 11:53:25
Author: pierre
Revision: 136160
upgpkg: php 5.3.8-1
upstream update
Modified:
php/trunk/PKGBUILD
Deleted:
php/trunk/crypt.patch
-------------+
PKGBUILD | 17 ++++++-----------
crypt.patch | 13 -------------
2 files changed, 6 insertions(+), 24 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-08-23 08:10:02 UTC (rev 136159)
+++ PKGBUILD 2011-08-23 15:53:25 UTC (rev 136160)
@@ -22,9 +22,9 @@
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=5.3.7
-_suhosinver=${pkgver}-0.9.10
-pkgrel=3
+pkgver=5.3.8
+_suhosinver=5.3.7-0.9.10
+pkgrel=1
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
@@ -35,16 +35,14 @@
source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
"http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
- 'logrotate.d.php-fpm'
- 'crypt.patch')
-md5sums=('2d47d003c96de4e88863ff38da61af33'
+ 'logrotate.d.php-fpm')
+md5sums=('704cd414a0565d905e1074ffdc1fadfb'
'08582e502fed8221c6577042ca45ddb8'
'39eaa70d276fc3d45d6bcf6cd5ae1106'
'dec2cbaad64e3abf4f0ec70e1de4e8e9'
'b01be5f816988fcee7e78225836e5e27'
'09005dabd90c48ddd392b3dbf05f8a82'
- '07c4e412909ac65a44ec90e7a2c4bade'
- '8e079c6d9b31358d59b98aa3dbd7d692')
+ '07c4e412909ac65a44ec90e7a2c4bade')
build() {
phpconfig="--srcdir=../${pkgbase}-${pkgver} \
@@ -137,9 +135,6 @@
cd ${srcdir}/${pkgbase}-${pkgver}
- # Fix MD5 crypt(); see https://bugs.php.net/bug.php?id=55439
- patch -p0 -i ${srcdir}/crypt.patch
-
# apply suhosin patch
patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
Deleted: crypt.patch
===================================================================
--- crypt.patch 2011-08-23 08:10:02 UTC (rev 136159)
+++ crypt.patch 2011-08-23 15:53:25 UTC (rev 136160)
@@ -1,13 +0,0 @@
-Index: ext/standard/php_crypt_r.c
-===================================================================
---- ext/standard/php_crypt_r.c (Revision 315217)
-+++ ext/standard/php_crypt_r.c (Revision 315218)
-@@ -382,7 +382,7 @@
- /* Now make the output string */
- memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN);
- strlcpy(passwd + MD5_MAGIC_LEN, sp, sl + 1);
-- strlcat(passwd, "$", 1);
-+ strcat(passwd, "$");
-
- PHP_MD5Final(final, &ctx);
-
More information about the arch-commits
mailing list