Permalink
Browse files

FL-618: php update

  • Loading branch information...
1 parent 7e982f5 commit 66395eb61878e0d4bb958b0a0c1449c3e6944ec8 @angryvincent angryvincent committed Jul 12, 2013
View
@@ -2,11 +2,12 @@ DIST php-5.3.18.tar.bz2 11335289 SHA256 f065deecb78abb8ef101e1098866024af4ca10cb
DIST php-5.3.20.tar.bz2 11358034 SHA256 578c26e6932dd7a37ff14e4e2237bc3235386fe897ba2e456e937e647727cd07 SHA512 1f3282cef5d553f28324b8f011acef59319441a8a258355b908fb6f69eaad8f1d736dc03259ddc168c20332510b7c73b5afb21934d3d14cb4f893f5cee59bd9b WHIRLPOOL 7e41bea91aec20a371b1e5a0de7e76f3e34d2b51c0378e76155c101297ac3811c9f0ced43abe911e64f812ca8130dd9cfc27090f29beb5cfaec1957de0f3d38e
DIST php-5.3.21.tar.bz2 11362683 SHA256 9bd914cb01fc78c06ec5fe7e31100f000cc03325e042fd5a829d8ce80e4478c3 SHA512 e6896a1646d9c6cd40446ec4c374c948120ed38e9bfc067354f342888b29cfe794e689ef56aaa714ea469061915bf78507c3adb6d69057132b9baaf44443a09f WHIRLPOOL c9e7bdf3744d22498e8deb014bd51ea76c897d7acf3735fc8fc7f8c0ef64994f66459461650562b2b15c7fc8534f70c6805b5e5226a9c3da359b0b7418623350
DIST php-5.3.23.tar.bz2 11410987 SHA256 69473eae7c752987a8fc7619bae9f7121cfe7c6603a2ebf13c8e036dff6a4944 SHA512 6d6579c0c67d75cd3cbc182609fb231cbda486722f47e01b78d50d93072720f37ee74eba8d8cc42308c297009fb3af31f9d2092869a4e78bbd957504cbb4858b WHIRLPOOL f3de62fb73af532811fbe2491442182297d8213ca621a9c0e3e6fdb3d8878982e81d18554457d5fb1726fe477c16077d1d4fb720a8195a02186cc9bf9e5e019b
+DIST php-5.3.26.tar.bz2 11430170 SHA256 a36c9ed855e58da163868790695e722b782b1afc6f131be84182e8d73dcbf2a3 SHA512 10ab7e53ea14f0a43d6a91822bbfaf4189a5c2def1a0f3e660e6dbd685247e4f7c5087d7e996e1057990a06b4fa42b7c4ae6ec547d6eec80bc8231dbf8fd108b WHIRLPOOL fe2440a6c4f4f8618007c7f596f4d7e33830e92f6ef4304ca2215ed68ea32e87e1fc3186d150b24dbb7b3dcb7426af4635b4c666a9194bf2e5d49f936c3e84a9
DIST php-5.4.13.tar.bz2 11545777 SHA256 f80c9452f63a6d259d4edd5228be2136da98122ffb79cb1d9d6b7f9026e84f00 SHA512 477adf82fcd0ef8c4911e811da25e7d091753289f7887ee76c7f790394497bb71d5e84172d4711888f0194960b3bafc2bcbfb252842cfc4059eb0692e382d6b1 WHIRLPOOL a3a489261f343dd71b6de37c7e3aaa92f5344ca2fc34fdff1f5b08499fa719af7321f5ae6b583aab2be38d9f6c605bc54c435ca341742f1be7ea7f36bee0b6cd
+DIST php-5.4.17.tar.bz2 11697434 SHA256 dc49935387a5d1f6ac798a3bb4902ca5020f3aa74117ea848b58d1bb61327eb4 SHA512 b35ab1d815bb56247c5f8842967859bfdf37ede5e4c5da4496e4f1540b2412ecb08028ed29a3cb5b79204cddc8c2f5f50a1a0dd1484ed449503945f2ec3f817a WHIRLPOOL 3fcb8094ef8e2123cb7a620df17d1e900b61765bb8127f93edcc5b124fc4233c02467e8d202bcec9a72b45347597a978b33b5323c3c5666da99987ebe2dc5994
DIST php-5.4.8.tar.bz2 11056057 SHA256 d02810b7949938ee7190116e7483e1a06b3fa8373d3bbc0ea65a41265afce79f SHA512 e04ee08e7d1b6f80183846206d02576ad22ea3f41e956bab970344b195f1d2267f1ff69439988cea7084c18576d7855383e48094bdb7684d43cb0f78e4a5e7b8 WHIRLPOOL 963153d85236bd105cbf11a89dd0db11e590cc292bb499abaa9271dbb47eeb124ef011af9561cb5569840d32130934c70cd8ebb4d619147892044ab8c3be09bd
-DIST php-5.5.0alpha2.tar.bz2 11572909 SHA256 d618f8f570e3d29fff8f581a1e4228e9c0e3e51ecc6a295621863181822d913c SHA512 24dc24998aa8ecd29075f0c7b8f67b732e9b1aa7a36576a0b1536ff479679e8fb8c78681644be42d5ca948b20ec0a58a14c57f30c888a432daf7a0f5ab582e78 WHIRLPOOL e962d168091c65c957fb1df75cd64349a74e9cab7fc66efa2ab514d44b49bd5a7e28152c9c4e189390dfaff0925ab75583cf0c0286aa14397b8dabc1ced75848
+DIST php-5.5.0.tar.bz2 12256814 SHA256 29bb5ea45256f3983fab95af1f18d76dcc045565b2f175f11817069cefcf6cd1 SHA512 eaf64042313ad1c642f06436fd297b536cf12cbb0fa56f87fecfbc579831f357329613e6c4bae65be243493f27e7e0c213acdc1d9b0b9ddf2ef438412b484b5d WHIRLPOOL fdd0c1d65e77fc318c87671af636d8a0480316546bd0d92841629fecaaecfda229f883ecf190b6214dd59f2dccf4cc8ba612dd90a3597ebd903d14c6b65912b6
DIST php-patchset-5.3-r0.tar.bz2 7368 SHA256 1a67b34a681dea33ea38f0ffc32b70a78b4c5dc1c3603d1bba31bb130d803ef7 SHA512 765b0cf56a3e63ded4ad1d1ba67567881ad06bdc2814cc07004fa338f38fd69078819c7463d2c55e00805c8f33fa925b94228bf7bc3d223acc33c6cff540024c WHIRLPOOL 59e18b33e11d968fac2a4571173121bf8141bb2f1eab62192e15bc59e351d3ab973f04343b447681d8a2adddf0844edb8a481d027bfc14c7e1fd8222169094ec
DIST php-patchset-5.3.18-r0.tar.bz2 7360 SHA256 8e7d449a4ab50dd8da241f2992fdaee012eafe4da6c66609231cff68d84c5c9f SHA512 625f456649964a959c7aa399c6c4fbeff8dd0b45372153819d42b447069e78cce99b4b6c30d89a64b211d230e17ef28e99d5e3b9055dd59e19b8103337de8d09 WHIRLPOOL cb1ae11173fa6d0a0f26a313d036f6f2109bc704531c5db76a584cc243b5f16ccff3c5e0c943196b5f13a7603e222c2f2c0eb393d754faf66fa5d54e5f627fde
DIST php-patchset-5.4-2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
-DIST php-patchset-5.5-r0.tar.bz2 7407 SHA256 8e7f36c6d625b5d66bc9e61ad20abbea0b58470cfac5605704c281947f9d52fd SHA512 8bac862f53a1ba21d5acc3cbe68d11b55cb75eed841e840a49ab5769cbc1595f2f487c9fabb3c1183916b2911ecefe710625aca83382f4871593cac8cbc5301a WHIRLPOOL 9d0b0a4603d46edcd5bbc98a89eb36ed5310e56f97960e1fe4283258c4d3ac2d15b93c2287e351ae2359bf661f2d131d4176e92e7d078582b4bfa1af37a40c81
@@ -0,0 +1,13 @@
+diff -u a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
+--- a/ext/mysqlnd/mysqlnd.c 2010-10-22 17:46:26.000000000 +0200
++++ b/ext/mysqlnd/mysqlnd.c 2010-12-08 21:54:47.000000000 +0100
+@@ -619,7 +619,8 @@
+ if (host_len == sizeof("localhost") - 1 && !strncasecmp(host, "localhost", host_len)) {
+ DBG_INF_FMT("socket=%s", socket_or_pipe? socket_or_pipe:"n/a");
+ if (!socket_or_pipe) {
+- socket_or_pipe = "/tmp/mysql.sock";
++ // gentoo mysql default socket location
++ socket_or_pipe = "/var/run/mysqld/mysqld.sock";
+ }
+ transport_len = spprintf(&transport, 0, "unix://%s", socket_or_pipe);
+ unix_socket = TRUE;
@@ -0,0 +1,14 @@
+upstream bug: http://bugs.php.net/bug.php?id=46311
+The current patch follows a suggestion from Siarhei Siamashka
+Adapted for php 5.5
+--- Zend/zend_execute.h.old 2013-01-01 13:49:04.587825704 +0100
++++ Zend/zend_execute.h 2013-01-01 13:53:28.762958578 +0100
+@@ -293,7 +293,7 @@
+ void **end = p - (int)(zend_uintptr_t)*p;
+
+ while (p != end) {
+- zval *q = *(zval **)(--p);
++ zval *q = (zval *)*(--p);
+ *p = NULL;
+ i_zval_ptr_dtor(q ZEND_FILE_LINE_CC);
+ }
@@ -0,0 +1,10 @@
+--- acinclude.m4 2013-04-02 09:58:33.069274096 +0200
++++ acinclude.m4.new 2013-04-02 09:58:25.221240142 +0200
+@@ -762,6 +762,7 @@
+ if test -z "$php_cxx_done"; then
+ AC_PROG_CXX
+ AC_PROG_CXXCPP
++ PHP_ADD_LIBRARY(stdc++)
+ php_cxx_done=yes
+ fi
+ ])
@@ -0,0 +1,52 @@
+--- ext/odbc/config.m4.old 2013-04-06 11:26:04.047017826 +0200
++++ ext/odbc/config.m4 2013-04-06 12:29:47.180617161 +0200
+@@ -366,22 +366,37 @@
+
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(iodbc,,
+-[ --with-iodbc[=DIR] Include iODBC support [/usr/local]])
++[ --with-iodbc[=DIR] Include iODBC support])
+
+ if test "$PHP_IODBC" != "no"; then
+ AC_MSG_CHECKING(for iODBC support)
+- if test "$PHP_IODBC" = "yes"; then
+- PHP_IODBC=/usr/local
++ if test -z "$PKG_CONFIG"; then
++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++ fi
++ if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
++ ODBC_TYPE=iodbc
++ ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
++ ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
++ ODBC_LIBS=`$PKG_CONFIG --libs-only-l libiodbc`
++ PHP_EVAL_INCLINE($ODBC_INCLUDE)
++ AC_DEFINE(HAVE_IODBC,1,[ ])
++ AC_DEFINE(HAVE_ODBC2,1,[ ])
++ AC_MSG_RESULT([$ext_output])
++ else
++ if test "$PHP_IODBC" = "yes"; then
++ PHP_IODBC=/usr/local
++ fi
++ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
++ PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
++ ODBC_TYPE=iodbc
++ ODBC_INCLUDE=-I$PHP_IODBC/include
++ ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
++ ODBC_LIBS=-liodbc
++ AC_DEFINE(HAVE_IODBC,1,[ ])
++ AC_DEFINE(HAVE_ODBC2,1,[ ])
++ AC_MSG_RESULT([$ext_output])
+ fi
+- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
+- PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
+- ODBC_TYPE=iodbc
+- ODBC_INCLUDE=-I$PHP_IODBC/include
+- ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
+- ODBC_LIBS=-liodbc
+- AC_DEFINE(HAVE_IODBC,1,[ ])
+- AC_DEFINE(HAVE_ODBC2,1,[ ])
+- AC_MSG_RESULT([$ext_output])
+ fi
+ fi
+
@@ -0,0 +1,15 @@
+Gentoo bugs: 88944 463800
+--- ext/imap/config.m4 2013-03-27 19:31:13.000000000 +0100
++++ ext/imap/config.m4.new 2013-03-30 18:34:17.581557062 +0100
+@@ -198,9 +198,9 @@
+ AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
+ fi
+
+- if test -r "$IMAP_DIR/c-client/c-client.a"; then
++ if test ! -r "$IMAP_DIR/c-client/libc-client.a" && -r "$IMAP_DIR/c-client/c-client.a" ; then
+ ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
+- elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
++ elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
+ ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1
+ fi
+
Oops, something went wrong.

0 comments on commit 66395eb

Please sign in to comment.