Re: php-memcached upload to stable-proposed-updates

[Sergey Kirpichev <skirpichev@gmail.com>]

On Sat, Mar 17, 2012 at 1:36 PM, Adam D. Barratt <adam@adam-barratt.org.uk> wrote:
> On Thu, 2012-03-15 at 13:46 +0000, Adam D. Barratt wrote:
>> After some discussion, we've come to the conclusion that adding
>> simple-patchsys is less bad than the alternatives in this case, so
>> please feel free to go ahead with your original debdiff.
>
> For the record, this was uploaded and I've just flagged it for
> acceptance; thanks.

Thank you.

What about http://bugs.debian.org/664856 ?  Debdiff attached.

diff -Nru php-memcached-1.0.2/debian/changelog php-memcached-1.0.2/debian/changelog
--- php-memcached-1.0.2/debian/changelog	2012-03-05 23:00:33.000000000 +0400
+++ php-memcached-1.0.2/debian/changelog	2012-03-23 01:08:32.000000000 +0400
@@ -1,3 +1,10 @@
+php-memcached (1.0.2-1+squeeze2) stable; urgency=low
+
+  * Apply patch from upstream to fix broken session.gc_maxlifetime
+    handling (sessions never expire).  Closes: #664856.
+
+ -- Sergey B Kirpichev <skirpichev@gmail.com>  Fri, 23 Mar 2012 01:07:16 +0400
+
 php-memcached (1.0.2-1+squeeze1) stable; urgency=low
 
   * Apply patch from upstream to fix double free in getServerByKey().
diff -Nru php-memcached-1.0.2/debian/patches/02_session.gc_maxlifetime.patch php-memcached-1.0.2/debian/patches/02_session.gc_maxlifetime.patch
--- php-memcached-1.0.2/debian/patches/02_session.gc_maxlifetime.patch	1970-01-01 03:00:00.000000000 +0300
+++ php-memcached-1.0.2/debian/patches/02_session.gc_maxlifetime.patch	2012-03-23 01:08:32.000000000 +0400
@@ -0,0 +1,25 @@
+Origin: upstream, https://bugs.php.net/bug.php?id=59641
+Bug-Debian: http://bugs.debian.org/664856
+
+Index: php_memcached.c
+===================================================================
+--- a/php_memcached.c	2012-03-23 00:56:53.000000000 +0400
++++ b/php_memcached.c	2012-03-23 00:59:16.000000000 +0400
+@@ -2417,7 +2417,7 @@
+ 	memcached_return status;
+ 	/* set max timeout for session_start = max_execution_time.  (c) Andrei Darashenka, Richter & Poweleit GmbH */
+ 
+-	lock_maxwait = zend_ini_long(ZEND_STRL("max_execution_time"), 0);
++	lock_maxwait = zend_ini_long(ZEND_STRS("max_execution_time"), 0);
+ 	if (lock_maxwait <= 0) {
+ 		lock_maxwait = MEMC_SESS_LOCK_EXPIRATION;
+ 	}
+@@ -2527,7 +2527,7 @@
+ 	memcached_st *memc_sess = PS_GET_MOD_DATA();
+ 
+ 	sess_key_len = spprintf(&sess_key, 0, "memc.sess.key.%s", key);
+-	sess_lifetime = zend_ini_long(ZEND_STRL("session.gc_maxlifetime"), 0);
++	sess_lifetime = zend_ini_long(ZEND_STRS("session.gc_maxlifetime"), 0);
+ 	if (sess_lifetime > 0) {
+ 		expiration = time(NULL) + sess_lifetime;
+ 	} else {