Add bugfix for -P + thread usage segfault per bug 195248.

(Portage version: 2.1.3.19)

4 files changed, 85 insertions, 0 deletions

diff --git a/net-misc/memcached/files/digest-memcached-1.2.2-r2 b/net-misc/memcached/files/digest-memcached-1.2.2-r2
new file mode 100644
index 000000000000..577508393a9d
--- /dev/null
+++ b/net-misc/memcached/files/digest-memcached-1.2.2-r2
@@ -0,0 +1,3 @@
+MD5 a08851f7fa7b15e92ee6320b7a79c321 memcached-1.2.2.tar.gz 166201
+RMD160 78dd094efb9b17a5e80a631690b929b3a4427854 memcached-1.2.2.tar.gz 166201
+SHA256 8dbaedb88b8f9c61b977cf6e670bb3b0f172c357169ccba1c8362230bfdc7cf7 memcached-1.2.2.tar.gz 166201
diff --git a/net-misc/memcached/files/memcached-1.2.2-p-threads.patch b/net-misc/memcached/files/memcached-1.2.2-p-threads.patch
new file mode 100644
index 000000000000..20646abb75b8
--- /dev/null
+++ b/net-misc/memcached/files/memcached-1.2.2-p-threads.patch
@@ -0,0 +1,21 @@
+http://lists.danga.com/pipermail/memcached/2007-October/005415.html
+http://bugs.gentoo.org/show_bug.cgi?id=195248 
+Index: /trunk/server/memcached.c
+===================================================================
+--- /trunk/server/memcached.c (revision 595)
++++ /trunk/server/memcached.c (revision 604)
+@@ -2698,9 +2698,10 @@
+         exit(EXIT_FAILURE);
+     }
+-    /* save the PID in if we're a daemon */
++    /* start up worker threads if MT mode */
++    thread_init(settings.num_threads, main_base);
++    /* save the PID in if we're a daemon, do this after thread_init due to
++       a file descriptor handling bug somewhere in libevent */
+     if (daemonize)
+         save_pid(getpid(), pid_file);
+-    /* start up worker threads if MT mode */
+-    thread_init(settings.num_threads, main_base);
+     /* initialise clock event */
+     clock_handler(0, 0, 0);
+
diff --git a/net-misc/memcached/memcached-1.2.2-r2.ebuild b/net-misc/memcached/memcached-1.2.2-r2.ebuild
new file mode 100644
index 000000000000..ce69e0273799
--- /dev/null
+++ b/net-misc/memcached/memcached-1.2.2-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.2.2-r2.ebuild,v 1.1 2007/11/27 00:04:37 robbat2 Exp $
+
+inherit eutils
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://www.danga.com/memcached/"
+SRC_URI="http://www.danga.com/memcached/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="nptl"
+
+RDEPEND=">=dev-libs/libevent-0.6
+		>=dev-perl/Cache-Memcached-1.24"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-fbsd.patch"
+	epatch "${FILESDIR}/${P}-p-threads.patch"
+}
+
+src_compile() {
+	econf $(use_enable nptl threads)
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin scripts/memcached-tool
+
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}"/1.1.13/conf memcached
+	newinitd "${FILESDIR}"/1.1.13/init memcached
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you must create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
diff --git a/net-misc/memcached/metadata.xml b/net-misc/memcached/metadata.xml
index 5d9f5be9d49d..500bbbb53818 100644
--- a/net-misc/memcached/metadata.xml
+++ b/net-misc/memcached/metadata.xml
@@ -5,4 +5,15 @@
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
+<longdescription>
+High-performance, distributed memory object caching system, generic in nature,
+but intended for use in speeding up dynamic web applications by alleviating
+database load.
+Danga Interactive developed memcached to enhance the speed of LiveJournal.com, a
+site which was already doing 20 million+ dynamic page views per day for 1
+million users with a bunch of webservers and a bunch of database servers.
+memcached dropped the database load to almost nothing, yielding faster page load
+times for users, better resource utilization, and faster access to the databases
+on a memcache miss.
+</longdescription>
 </pkgmetadata>