[arch-commits] Commit in php-memcache/trunk (2 files)
Date: Monday, April 8, 2013 @ 10:42:40
Author: foutrelis
Revision: 87835
upgpkg: php-memcache 3.0.8-1
New upstream release.
Modified:
php-memcache/trunk/PKGBUILD
Deleted:
php-memcache/trunk/php-memcache-3.0.7-fix-segfault-with-object-serialization.patch
-+
PKGBUILD| 13
php-memcache-3.0.7-fix-segfault-with-object-serialization.patch | 162
--
2 files changed, 4 insertions(+), 171 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-04-07 21:41:26 UTC (rev 87834)
+++ PKGBUILD2013-04-08 08:42:40 UTC (rev 87835)
@@ -2,8 +2,8 @@
# Maintainer: Evangelos Foutras evange...@foutrelis.com
pkgname=php-memcache
-pkgver=3.0.7
-pkgrel=2
+pkgver=3.0.8
+pkgrel=1
pkgdesc=Memcache module for PHP
arch=('i686' 'x86_64')
url=http://pecl.php.net/package/memcache;
@@ -11,17 +11,12 @@
depends=('php')
backup=('etc/php/conf.d/memcache.ini')
install=php-memcache.install
-source=(http://pecl.php.net/get/memcache-$pkgver.tgz
-php-memcache-3.0.7-fix-segfault-with-object-serialization.patch)
-sha256sums=('f34e2ef42dd8f1f7e6a2cfbb9417a9e58e3bfd7f5db7227ca5afab686cefdd1f'
-'100bffed22ad537de1cb03653e2dbb6768617ba3b8b49b1cf05c59554270c25b')
+source=(http://pecl.php.net/get/memcache-$pkgver.tgz)
+sha256sums=('2cae5b423ffbfd33a259829849f6000d4db018debe3e29ecf3056f06642e8311')
build() {
cd $srcdir/memcache-$pkgver
- # https://bugs.php.net/bug.php?id=63142
- patch -Np0 -i
$srcdir/php-memcache-3.0.7-fix-segfault-with-object-serialization.patch
-
phpize
./configure --prefix=/usr
make
Deleted: php-memcache-3.0.7-fix-segfault-with-object-serialization.patch
===
--- php-memcache-3.0.7-fix-segfault-with-object-serialization.patch
2013-04-07 21:41:26 UTC (rev 87834)
+++ php-memcache-3.0.7-fix-segfault-with-object-serialization.patch
2013-04-08 08:42:40 UTC (rev 87835)
@@ -1,162 +0,0 @@
-Index: memcache.c
-===
memcache.c (revision 329831)
-+++ memcache.c (working copy)
-@@ -1529,15 +1529,13 @@
- unsigned int flags, unsigned long cas, void *param TSRMLS_DC) /*
- receives a multiple values, param is a zval** array to store value and
flags in {{{ */
- {
-- zval *arrval, **result = (zval **)param;
-- ALLOC_ZVAL(arrval);
-- *((zval *)arrval) = *value;
-+ zval **result = (zval **)param;
-
- /* add value to result */
- if (Z_TYPE_P(result[0]) != IS_ARRAY) {
- array_init(result[0]);
- }
-- add_assoc_zval_ex(result[0], (char *)key, key_len + 1, arrval);
-+ add_assoc_zval_ex(result[0], (char *)key, key_len + 1, value);
-
- /* add flags to result */
- if (result[1] != NULL) {
-@@ -1565,7 +1563,7 @@
- receives a single value, param is a zval pointer to store value to {{{
*/
- {
- zval **result = (zval **)param;
-- *(result[0]) = *value;
-+ ZVAL_ZVAL(result[0], value, 1, 1);
-
- if (result[1] != NULL) {
- ZVAL_LONG(result[1], flags);
-Index: memcache_ascii_protocol.c
-===
memcache_ascii_protocol.c (revision 329831)
-+++ memcache_ascii_protocol.c (working copy)
-@@ -122,7 +122,7 @@
- line_len = mmc_stream_get_line(request-io, line TSRMLS_CC);
- if (line_len 0) {
- long lval;
-- zval value;
-+ zval *value;
-
- int response = mmc_request_check_response(line, line_len);
- if (response != MMC_RESPONSE_UNKNOWN) {
-@@ -132,10 +132,10 @@
- if (sscanf(line, %lu, lval) 1) {
- return mmc_server_failure(mmc, request-io, Malformed
VALUE header, 0 TSRMLS_CC);
- }
--
-- INIT_PZVAL(value);
-- ZVAL_LONG(value, lval);
-- return request-value_handler(request-key, request-key_len,
value, 0, 0, request-value_handler_param TSRMLS_CC);
-+
-+ MAKE_STD_ZVAL(value);
-+ ZVAL_LONG(value, lval);
-+ return request-value_handler(request-key, request-key_len,
value, 0, 0, request-value_handler_param TSRMLS_CC);
- }
-
- return MMC_REQUEST_MORE;
-Index: memcache_binary_protocol.c
-===
memcache_binary_protocol.c (revision 329831)
-+++ memcache_binary_protocol.c (working copy)
-@@ -225,14 +225,14 @@
- header = (mmc_mutate_response_header_t *)mmc_stream_get(request-io,
sizeof(*header) TSRMLS_CC);
- if (header != NULL) {
- int result;
-- zval *key, value;
-+ zval *key, *value;
-
- /* convert remembered key to
[arch-commits] Commit in php-memcache/trunk (2 files)
Date: Tuesday, March 19, 2013 @ 16:14:40
Author: foutrelis
Revision: 86562
upgpkg: php-memcache 3.0.7-2
Add upstream fix for PHP bug #63142: memcache 3.0.7 segfaults with object
(un)serialization.
Added:
php-memcache/trunk/php-memcache-3.0.7-fix-segfault-with-object-serialization.patch
Modified:
php-memcache/trunk/PKGBUILD
-+
PKGBUILD| 11
php-memcache-3.0.7-fix-segfault-with-object-serialization.patch | 162
++
2 files changed, 170 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-19 15:13:58 UTC (rev 86561)
+++ PKGBUILD2013-03-19 15:14:40 UTC (rev 86562)
@@ -3,7 +3,7 @@
pkgname=php-memcache
pkgver=3.0.7
-pkgrel=1
+pkgrel=2
pkgdesc=Memcache module for PHP
arch=('i686' 'x86_64')
url=http://pecl.php.net/package/memcache;
@@ -11,12 +11,17 @@
depends=('php')
backup=('etc/php/conf.d/memcache.ini')
install=php-memcache.install
-source=(http://pecl.php.net/get/memcache-$pkgver.tgz)
-sha256sums=('f34e2ef42dd8f1f7e6a2cfbb9417a9e58e3bfd7f5db7227ca5afab686cefdd1f')
+source=(http://pecl.php.net/get/memcache-$pkgver.tgz
+php-memcache-3.0.7-fix-segfault-with-object-serialization.patch)
+sha256sums=('f34e2ef42dd8f1f7e6a2cfbb9417a9e58e3bfd7f5db7227ca5afab686cefdd1f'
+'100bffed22ad537de1cb03653e2dbb6768617ba3b8b49b1cf05c59554270c25b')
build() {
cd $srcdir/memcache-$pkgver
+ # https://bugs.php.net/bug.php?id=63142
+ patch -Np0 -i
$srcdir/php-memcache-3.0.7-fix-segfault-with-object-serialization.patch
+
phpize
./configure --prefix=/usr
make
Added: php-memcache-3.0.7-fix-segfault-with-object-serialization.patch
===
--- php-memcache-3.0.7-fix-segfault-with-object-serialization.patch
(rev 0)
+++ php-memcache-3.0.7-fix-segfault-with-object-serialization.patch
2013-03-19 15:14:40 UTC (rev 86562)
@@ -0,0 +1,162 @@
+Index: memcache.c
+===
+--- memcache.c (revision 329831)
memcache.c (working copy)
+@@ -1529,15 +1529,13 @@
+ unsigned int flags, unsigned long cas, void *param TSRMLS_DC) /*
+ receives a multiple values, param is a zval** array to store value and
flags in {{{ */
+ {
+- zval *arrval, **result = (zval **)param;
+- ALLOC_ZVAL(arrval);
+- *((zval *)arrval) = *value;
++ zval **result = (zval **)param;
+
+ /* add value to result */
+ if (Z_TYPE_P(result[0]) != IS_ARRAY) {
+ array_init(result[0]);
+ }
+- add_assoc_zval_ex(result[0], (char *)key, key_len + 1, arrval);
++ add_assoc_zval_ex(result[0], (char *)key, key_len + 1, value);
+
+ /* add flags to result */
+ if (result[1] != NULL) {
+@@ -1565,7 +1563,7 @@
+ receives a single value, param is a zval pointer to store value to {{{
*/
+ {
+ zval **result = (zval **)param;
+- *(result[0]) = *value;
++ ZVAL_ZVAL(result[0], value, 1, 1);
+
+ if (result[1] != NULL) {
+ ZVAL_LONG(result[1], flags);
+Index: memcache_ascii_protocol.c
+===
+--- memcache_ascii_protocol.c (revision 329831)
memcache_ascii_protocol.c (working copy)
+@@ -122,7 +122,7 @@
+ line_len = mmc_stream_get_line(request-io, line TSRMLS_CC);
+ if (line_len 0) {
+ long lval;
+- zval value;
++ zval *value;
+
+ int response = mmc_request_check_response(line, line_len);
+ if (response != MMC_RESPONSE_UNKNOWN) {
+@@ -132,10 +132,10 @@
+ if (sscanf(line, %lu, lval) 1) {
+ return mmc_server_failure(mmc, request-io, Malformed
VALUE header, 0 TSRMLS_CC);
+ }
+-
+- INIT_PZVAL(value);
+- ZVAL_LONG(value, lval);
+- return request-value_handler(request-key, request-key_len,
value, 0, 0, request-value_handler_param TSRMLS_CC);
++
++ MAKE_STD_ZVAL(value);
++ ZVAL_LONG(value, lval);
++ return request-value_handler(request-key, request-key_len,
value, 0, 0, request-value_handler_param TSRMLS_CC);
+ }
+
+ return MMC_REQUEST_MORE;
+Index: memcache_binary_protocol.c
+===
+--- memcache_binary_protocol.c (revision 329831)
memcache_binary_protocol.c (working copy)
+@@ -225,14 +225,14 @@
+ header = (mmc_mutate_response_header_t *)mmc_stream_get(request-io,
sizeof(*header) TSRMLS_CC);
+ if (header != NULL) {
+ int result;
+- zval *key, value;
++ zval *key, *value;
+
+ /* convert remembered key to
