Dear Release Team, I would like to make an upload [1] to stable in order to fix bug #662662 (segfault, double free in getServerByKey()) in php-memcached package (and include maintainer change too, see #620030). The full patch between this new package version and the version 1.0.2-1 currently in Squeeze is attached. [1] See files in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662662#14
diff --git a/debian/changelog b/debian/changelog index b4919bf..6762dde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +php-memcached (1.0.2-1+squeeze1) stable; urgency=low + + * Apply patch from upstream to fix double free in getServerByKey(). + Closes: #662662. + * New maintainer (See: #620030) + + -- Sergey B Kirpichev <skirpichev@gmail.com> Mon, 05 Mar 2012 22:56:33 +0400 + php-memcached (1.0.2-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index f74aabd..2ae9041 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: php-memcached Section: php Priority: optional -Maintainer: Ivan Borzenkov <ivan1986@list.ru> +Maintainer: Sergey B Kirpichev <skirpichev@gmail.com> Build-Depends: debhelper (>= 7), php5-dev(>= 5.3.1), cdbs, libmemcached-dev (>= 0.39) Standards-Version: 3.8.4 Homepage: http://pecl.php.net/package/memcached diff --git a/debian/patches/01_fix_double_free_in_getServerByKey.patch b/debian/patches/01_fix_double_free_in_getServerByKey.patch new file mode 100644 index 0000000..eeac370 --- /dev/null +++ b/debian/patches/01_fix_double_free_in_getServerByKey.patch @@ -0,0 +1,21 @@ +Origin: upstream, https://github.com/php-memcached-dev/php-memcached/commit/dc47bf7092e9d02930acc11d3ebeb8e0808ca4fd +Bug-Debian: http://bugs.debian.org/662662 + +Index: php_memcached.c +=================================================================== +--- a/php_memcached.c 2012-03-05 22:45:20.000000000 +0400 ++++ b/php_memcached.c 2012-03-05 22:47:39.000000000 +0400 +@@ -1537,7 +1537,12 @@ + add_assoc_string(return_value, "host", server->hostname, 1); + add_assoc_long(return_value, "port", server->port); + add_assoc_long(return_value, "weight", server->weight); +- memcached_server_free(server); ++ ++ /* memcached_server_add(3) states that the server instance is cloned. */ ++ /* In actuality it is not, possibly a bug in libmemcached 0.40. */ ++ /* remove server freeing */ ++ ++ /* memcached_server_free(server); */ + } + /* }}} */ + diff --git a/debian/rules b/debian/rules index 63337cc..6698659 100755 --- a/debian/rules +++ b/debian/rules @@ -4,12 +4,14 @@ DEB_TAR_SRCDIR := $(shell basename $(wildcard *.tgz) .tgz) include /usr/share/cdbs/1/rules/tarball.mk include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk PHP_EX5=$(shell /usr/bin/php-config5 --extension-dir) # # local hacks # +patch: apply-patches clean:: rm -f php[5]-memcached.postrm php[5]-memcached.postinst
Attachment:
signature.asc
Description: Digital signature