diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-08-13 09:45:15 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-08-13 11:21:26 +0000 |
| commit | 318308ffa6409539cb17100a132b8b6ca3b67c1b (patch) | |
| tree | 5657be0139ef2b5a12fc9a6ab673885cbfeb5507 /main/php | |
| parent | bccebb56e4fa0fcc9428ad1c6711e126b80e419b (diff) | |
| download | aports-318308ffa6409539cb17100a132b8b6ca3b67c1b.tar.bz2 aports-318308ffa6409539cb17100a132b8b6ca3b67c1b.tar.xz | |
main/php: fix detection of support for sha256/512 in crypt(3)
https://bugs.php.net/bug.php?id=67827
Diffstat (limited to 'main/php')
| -rw-r--r-- | main/php/APKBUILD | 12 | ||||
| -rw-r--r-- | main/php/fix-crypt-sha.patch | 20 |
2 files changed, 28 insertions, 4 deletions
diff --git a/main/php/APKBUILD b/main/php/APKBUILD index 2bba2bafe6..ca9cdebdde 100644 --- a/main/php/APKBUILD +++ b/main/php/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Matt Smith <mcs@darkregion.net> pkgname=php pkgver=5.5.15 -pkgrel=0 +pkgrel=1 pkgdesc="The PHP language runtime engine" url="http://www.php.net/" arch="all" @@ -109,6 +109,7 @@ source="http://php.net/distributions/php-$pkgver.tar.bz2 php-install-pear-xml.patch gd-iconv.patch php-fix-crypt.patch + fix-crypt-sha.patch " _apiver="20121113" @@ -491,16 +492,19 @@ md5sums="5cb5f2ed9099299f8a4c952d59d93812 php-5.5.15.tar.bz2 67719f428f44ec004da18705cbabe2ee php5-module.conf 483bc0a85c50a9a9aedbe14a19ed4526 php-install-pear-xml.patch 162d8d079944387eab2bc80edab347ae gd-iconv.patch -36862b64aa9d2c527ef634610644aa66 php-fix-crypt.patch" +36862b64aa9d2c527ef634610644aa66 php-fix-crypt.patch +cb10034c525c6544890f1a1839837e38 fix-crypt-sha.patch" sha256sums="00f24226b12fee27e332383b6304f1b9ed3f4d9173dd728a68c5c3f5a59b8ba7 php-5.5.15.tar.bz2 375892c6997f48659f7087ccb7fac039e4bb2f375453247295caa7858b9e15b9 php-fpm.initd ceec4d5b2a128c6a97e49830af604f0bb555bca1a86a9cd0366b828ba392257f php5-module.conf f739ca427a1dd53a388bad0823565299c5d4a5796b1171b892884e4d7d099bab php-install-pear-xml.patch 6122bf279cdb7c387dd000761b2426969a73cf63a10a132aa98a79eb1dd259b2 gd-iconv.patch -bd44019db3c36d09502a4f869b4824364375df460aceef2d2b0a1956dc75e7cb php-fix-crypt.patch" +bd44019db3c36d09502a4f869b4824364375df460aceef2d2b0a1956dc75e7cb php-fix-crypt.patch +a5db307ad2638e7e609b450abce19c98c23de54be96619b46adb69f2c5e11fa2 fix-crypt-sha.patch" sha512sums="0a6a0c17c59a782f07639382263db10968e1f540f53f15c6b49c3bf7d953f8887dd16e3da838f863324c85aaf38655be499148d4998e0efda723b5cc587961eb php-5.5.15.tar.bz2 2d294022f2c45b2f3229655e5883b8ccab6852ed0378df682b9dd85a31038666ad3a622580861ce2d26dedf187326727ecf93694eb716271e9be25f79daddae9 php-fpm.initd 895e94c791bd82060ad820fef049d366a09c932097faa6b7b9a2c2e9e00a18cb7c0f9b128679c7659b404379266fd0f95dba5c0333f626194cf60f7bf6044102 php5-module.conf f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c939768584f3e4edbe52e8bd6103fb6777462326a9d94e8ab1f505 php-install-pear-xml.patch 59443fb464f49ff7d9b64739df982e7240f9d4792226d96ad1538286945125fc7eb6f0cab88b64d5c81ee3679fd89bffdca59ebd20eca2778ab801ee54529028 gd-iconv.patch -278b629ffd0796c85799e7a047c5d50c4186e81f68265247d1fb688431b303351feec519ef1b3318d7f1b15cf3e75e0f745aeb84218ada2a0a94777d57f4cf2c php-fix-crypt.patch" +278b629ffd0796c85799e7a047c5d50c4186e81f68265247d1fb688431b303351feec519ef1b3318d7f1b15cf3e75e0f745aeb84218ada2a0a94777d57f4cf2c php-fix-crypt.patch +d3b156dc7fca33c5634ace04bc7b7f27174d58d09455adf5bcdafd748a6aab1b1c97dce588d218b95d5fde3f6c2dd9202f4d7ea1c3b323be400f4d990c39290b fix-crypt-sha.patch" diff --git a/main/php/fix-crypt-sha.patch b/main/php/fix-crypt-sha.patch new file mode 100644 index 0000000000..db05584ead --- /dev/null +++ b/main/php/fix-crypt-sha.patch @@ -0,0 +1,20 @@ +--- ./ext/standard/config.m4.orig ++++ ./ext/standard/config.m4 +@@ -314,7 +314,7 @@ + fi + AC_DEFINE_UNQUOTED(PHP_MD5_CRYPT, $ac_result, [Whether the system supports MD5 salt]) + +- if test "$ac_cv_crypt_sha512" = "yes"; then ++ if test "$ac_cv_crypt_SHA512" = "yes"; then + ac_result=1 + ac_crypt_sha512=1 + else +@@ -323,7 +323,7 @@ + fi + AC_DEFINE_UNQUOTED(PHP_SHA512_CRYPT, $ac_result, [Whether the system supports SHA512 salt]) + +- if test "$ac_cv_crypt_sha256" = "yes"; then ++ if test "$ac_cv_crypt_SHA256" = "yes"; then + ac_result=1 + ac_crypt_sha256=1 + else |