Gentoo Archives: gentoo-commits

From: "Ole Markus With (olemarkus)" <olemarkus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/php/files: all_strict_aliasing.patch all_mysql_socket_location-gentoo.patch
Date: Thu, 28 Mar 2013 21:41:42
Message-Id: 20130328214138.35A582171D@flycatcher.gentoo.org
1 olemarkus 13/03/28 21:41:38
2
3 Added: all_strict_aliasing.patch
4 all_mysql_socket_location-gentoo.patch
5 Log:
6 Bumping php 5.5 to beta2. Also does proper install of opcache using ext and ext-active
7
8 (Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key C4A92BF5)
9
10 Revision Changes Path
11 1.1 dev-lang/php/files/all_strict_aliasing.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/all_strict_aliasing.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/all_strict_aliasing.patch?rev=1.1&content-type=text/plain
15
16 Index: all_strict_aliasing.patch
17 ===================================================================
18 upstream bug: http://bugs.php.net/bug.php?id=46311
19 The current patch follows a suggestion from Siarhei Siamashka
20 Adapted for php 5.5
21 --- Zend/zend_execute.h.old 2013-01-01 13:49:04.587825704 +0100
22 +++ Zend/zend_execute.h 2013-01-01 13:53:28.762958578 +0100
23 @@ -293,7 +293,7 @@
24 void **end = p - (int)(zend_uintptr_t)*p;
25
26 while (p != end) {
27 - zval *q = *(zval **)(--p);
28 + zval *q = (zval *)*(--p);
29 *p = NULL;
30 i_zval_ptr_dtor(q ZEND_FILE_LINE_CC);
31 }
32
33
34
35 1.1 dev-lang/php/files/all_mysql_socket_location-gentoo.patch
36
37 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/all_mysql_socket_location-gentoo.patch?rev=1.1&view=markup
38 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/all_mysql_socket_location-gentoo.patch?rev=1.1&content-type=text/plain
39
40 Index: all_mysql_socket_location-gentoo.patch
41 ===================================================================
42 diff -u a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
43 --- a/ext/mysqlnd/mysqlnd.c 2010-10-22 17:46:26.000000000 +0200
44 +++ b/ext/mysqlnd/mysqlnd.c 2010-12-08 21:54:47.000000000 +0100
45 @@ -619,7 +619,8 @@
46 if (host_len == sizeof("localhost") - 1 && !strncasecmp(host, "localhost", host_len)) {
47 DBG_INF_FMT("socket=%s", socket_or_pipe? socket_or_pipe:"n/a");
48 if (!socket_or_pipe) {
49 - socket_or_pipe = "/tmp/mysql.sock";
50 + // gentoo mysql default socket location
51 + socket_or_pipe = "/var/run/mysqld/mysqld.sock";
52 }
53 transport_len = spprintf(&transport, 0, "unix://%s", socket_or_pipe);
54 unix_socket = TRUE;