Fix start-stop-daemon looking at the binary instead of the pidfile when using multiple instances of memcached.

Package-Manager: portage-2.1.2.3

8 files changed, 220 insertions, 15 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index 4fd94da77c35..2d13b3b9cfaf 100644
--- a/net-misc/memcached/ChangeLog
+++ b/net-misc/memcached/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/memcached
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.39 2007/03/22 18:32:06 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.40 2007/03/31 19:03:18 robbat2 Exp $
+
+*memcached-1.2.1-r1 (31 Mar 2007)
+*memcached-1.1.13-r1 (31 Mar 2007)
+
+  31 Mar 2007; Robin H. Johnson <robbat2@gentoo.org> +files/1.1.13/conf,
+  +files/1.1.13/init, +memcached-1.1.13-r1.ebuild,
+  +memcached-1.2.1-r1.ebuild:
+  Fix start-stop-daemon looking at the binary instead of the pidfile when
+  using multiple instances of memcached.
 
   22 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   memcached-1.2.1.ebuild:
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index f1827360148b..758ac8ecf5f3 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.1.12/conf 636 RMD160 4bae6b67ae0941e74f6f494568ae026949ebd6fa SHA1 5d78a2ff7709510c9b6920bd1bf7e044708063b4 SHA256 0a5b83267788e429c2be0c4af1ef6a30320e96becab78aaba5af8d7eb8ff3ee2
 MD5 f838206eac3e3420d7ad751024f64eea files/1.1.12/conf 636
 RMD160 4bae6b67ae0941e74f6f494568ae026949ebd6fa files/1.1.12/conf 636
@@ -9,6 +6,14 @@ AUX 1.1.12/init 1284 RMD160 c3456498f58e7d20e1eecd764b5b10000ab034f5 SHA1 bad69e
 MD5 48aa3c67b8c13598a3a4880bdced44ac files/1.1.12/init 1284
 RMD160 c3456498f58e7d20e1eecd764b5b10000ab034f5 files/1.1.12/init 1284
 SHA256 3981a78a1a77297f882163cf3e8c8352eb96afaf0820797ff12a40b90e23eef7 files/1.1.12/init 1284
+AUX 1.1.13/conf 639 RMD160 1ef3957a92d2e894c6ee533fde289b1b866d1387 SHA1 711cf870976c33b5bebb521abd46ca10b36be82c SHA256 883921447c65b5bb627df3ec330fe61f1ba93c96b63398990da953dc0da0114f
+MD5 5f69d66163df51d87046b2846c235c57 files/1.1.13/conf 639
+RMD160 1ef3957a92d2e894c6ee533fde289b1b866d1387 files/1.1.13/conf 639
+SHA256 883921447c65b5bb627df3ec330fe61f1ba93c96b63398990da953dc0da0114f files/1.1.13/conf 639
+AUX 1.1.13/init 1307 RMD160 9c9f260b60dc89b06a365ca9a694669679dfe423 SHA1 b6d64c68edc856643a7e54b227b6ef3176f9a184 SHA256 abea96e396dd47c46cdb79ae6339d00a2af549016c02135e889df055633c52cc
+MD5 3a7413a6e9b3d71e9ec18edc4abb03c8 files/1.1.13/init 1307
+RMD160 9c9f260b60dc89b06a365ca9a694669679dfe423 files/1.1.13/init 1307
+SHA256 abea96e396dd47c46cdb79ae6339d00a2af549016c02135e889df055633c52cc files/1.1.13/init 1307
 AUX conf 537 RMD160 5de199b3d9a76ef0efed7ee6105594e904e9f8ad SHA1 5213df426a6bb9f19893fdbc77a5e060dc3ab8b4 SHA256 c93f522dd0fdcdd8c92c34114bc830b66edbd612f464a648c313ddc3f1ec00dd
 MD5 7d313d0464bf2dcec9d83b20646b0a95 files/conf 537
 RMD160 5de199b3d9a76ef0efed7ee6105594e904e9f8ad files/conf 537
@@ -42,6 +47,10 @@ EBUILD memcached-1.1.12.ebuild 1054 RMD160 98caf28e9bd14b478cfc4fc665aa8bf43a581
 MD5 aaefa2ae771cffd672aa6c46f30e7d50 memcached-1.1.12.ebuild 1054
 RMD160 98caf28e9bd14b478cfc4fc665aa8bf43a581ff6 memcached-1.1.12.ebuild 1054
 SHA256 efe4d348ff42eb2bc0070ec3b5c33db7e8c47e493d34c859b57b9bd7450ba3da memcached-1.1.12.ebuild 1054
+EBUILD memcached-1.1.13-r1.ebuild 1629 RMD160 a0fcb7e9fc53e313f7b2889b9c9d5a19313aff05 SHA1 244e884586e024f8156b51261ef126afc3a7a918 SHA256 f41bb49a26adaced4ce0b887377dd69daa6221796e25038241064daf45c46053
+MD5 284c1a562c043a2a134443cdf08bfbe0 memcached-1.1.13-r1.ebuild 1629
+RMD160 a0fcb7e9fc53e313f7b2889b9c9d5a19313aff05 memcached-1.1.13-r1.ebuild 1629
+SHA256 f41bb49a26adaced4ce0b887377dd69daa6221796e25038241064daf45c46053 memcached-1.1.13-r1.ebuild 1629
 EBUILD memcached-1.1.13.ebuild 1658 RMD160 21f77fd5a74401cb45c601d634ec619b496dffb2 SHA1 607b848fc695cfd5df60e5120ee7950ae5147b00 SHA256 c61d5c4df6333d155801288133e908db912e912bf54cdd53b52de6f2a01aeecc
 MD5 1ab5f7afaeaf9d76619bb8bc4e183491 memcached-1.1.13.ebuild 1658
 RMD160 21f77fd5a74401cb45c601d634ec619b496dffb2 memcached-1.1.13.ebuild 1658
@@ -50,14 +59,18 @@ EBUILD memcached-1.1.13_pre.ebuild 1668 RMD160 96e947540fb70c8eeb9e5477a88c1d108
 MD5 60bffbc6394b382b22e37a8ee4c6315f memcached-1.1.13_pre.ebuild 1668
 RMD160 96e947540fb70c8eeb9e5477a88c1d108cf9ee4c memcached-1.1.13_pre.ebuild 1668
 SHA256 a6d9f19c6e388f01a69ae65b9ed35c4c073b5f599e20722ee32002678d5a76d4 memcached-1.1.13_pre.ebuild 1668
+EBUILD memcached-1.2.1-r1.ebuild 1620 RMD160 5eb70406f61af880ed52841883212fde438f97c0 SHA1 5469eb2bb473bbc27a8ce28f423b008ffeee9228 SHA256 f6f505ebd12363a8d59260bf65c64c9f462dec91d9c62563c4ee2c49965f8803
+MD5 38bf85c140f3cc293ef8ababb31cd43d memcached-1.2.1-r1.ebuild 1620
+RMD160 5eb70406f61af880ed52841883212fde438f97c0 memcached-1.2.1-r1.ebuild 1620
+SHA256 f6f505ebd12363a8d59260bf65c64c9f462dec91d9c62563c4ee2c49965f8803 memcached-1.2.1-r1.ebuild 1620
 EBUILD memcached-1.2.1.ebuild 1655 RMD160 3c8e207e25fb9329c4b32d7801bc8a90a51cca41 SHA1 07e687a053130bddc0abe427f65ce59bf79be277 SHA256 ff8388cb3f9c627822caab5e4d6466b6c640592fdf19b74a8c3b700ee3cbcb02
 MD5 5003b2d382007d2ae14ff8c6f8a60733 memcached-1.2.1.ebuild 1655
 RMD160 3c8e207e25fb9329c4b32d7801bc8a90a51cca41 memcached-1.2.1.ebuild 1655
 SHA256 ff8388cb3f9c627822caab5e4d6466b6c640592fdf19b74a8c3b700ee3cbcb02 memcached-1.2.1.ebuild 1655
-MISC ChangeLog 7662 RMD160 db8c66344cf6aae70146ab439ac14f94a9362ae7 SHA1 0e48dd4fdcbf8f4c415d6bb46a68cee69e393b03 SHA256 1584ab35af91d20d8ce968645475be506df14463f9109293bf6f5a9e19b0851f
-MD5 f29092d0d6a5c52f9efdceeee440b40b ChangeLog 7662
-RMD160 db8c66344cf6aae70146ab439ac14f94a9362ae7 ChangeLog 7662
-SHA256 1584ab35af91d20d8ce968645475be506df14463f9109293bf6f5a9e19b0851f ChangeLog 7662
+MISC ChangeLog 8001 RMD160 db2ef0b088f2e839b685b024ffe52c79407aa9ab SHA1 6f53be48193c162bcafd4c5d0998dddf8967c866 SHA256 f54bdd87ed8203dbc8fcc31432acf6434e8c54864993669ff98263e07652a076
+MD5 37db3628b86ab7eb9d5671cf2984fea5 ChangeLog 8001
+RMD160 db2ef0b088f2e839b685b024ffe52c79407aa9ab ChangeLog 8001
+SHA256 f54bdd87ed8203dbc8fcc31432acf6434e8c54864993669ff98263e07652a076 ChangeLog 8001
 MISC metadata.xml 220 RMD160 adeee6d24269e2c36fa264eb0f5d3105cbcf0c5f SHA1 6bede79555a57b50e9b78c8869866db9d3c76366 SHA256 6d5549afe8cd878ebb18c6e97ad3b486283e14e0fb5ad2e5e0ea413e17e36fbb
 MD5 0f18e4c1a9a4b09570cfc7719b927e83 metadata.xml 220
 RMD160 adeee6d24269e2c36fa264eb0f5d3105cbcf0c5f metadata.xml 220
@@ -80,16 +93,15 @@ SHA256 72403c674c80ca566f7a66f9981ab113e455ab425a1657df640ca46b8ca2662a files/di
 MD5 9d7f34c01ef9d6b94a6d0027f4c2b868 files/digest-memcached-1.1.13 250
 RMD160 85ade76aa67c00ded1390480709e28c0350d4c13 files/digest-memcached-1.1.13 250
 SHA256 312714d9a03fb4cb23e91ceec68f7a8440ad55054b5d8ddadb44b594c3663fbd files/digest-memcached-1.1.13 250
+MD5 9d7f34c01ef9d6b94a6d0027f4c2b868 files/digest-memcached-1.1.13-r1 250
+RMD160 85ade76aa67c00ded1390480709e28c0350d4c13 files/digest-memcached-1.1.13-r1 250
+SHA256 312714d9a03fb4cb23e91ceec68f7a8440ad55054b5d8ddadb44b594c3663fbd files/digest-memcached-1.1.13-r1 250
 MD5 9aa1864ef0cbdee77c19ab464042635b files/digest-memcached-1.1.13_pre 262
 RMD160 6964297b766f07cebf9c0b3e65c9524e739a6b19 files/digest-memcached-1.1.13_pre 262
 SHA256 ee11b10acd23b1eee1f095b4a5ea4c48b510a2789fc65b0a085dfb816847ba5e files/digest-memcached-1.1.13_pre 262
 MD5 32583300835b7f2b710706c8ce960359 files/digest-memcached-1.2.1 247
 RMD160 1390b3a0350d188d49327f6df9c02c5a449525d2 files/digest-memcached-1.2.1 247
 SHA256 421b6f7d5281d150930d0841cb467ddfeb6374768815147e6c675009fac587aa files/digest-memcached-1.2.1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
-
-iD8DBQFGAsuwKRy60XGEcJIRAhQHAKCUTkjd1jOnWKj0v1Fl4YG/IZlargCfRRbc
-NYoRGbr8SVys7GywTm38Zdo=
-=qaDc
------END PGP SIGNATURE-----
+MD5 32583300835b7f2b710706c8ce960359 files/digest-memcached-1.2.1-r1 247
+RMD160 1390b3a0350d188d49327f6df9c02c5a449525d2 files/digest-memcached-1.2.1-r1 247
+SHA256 421b6f7d5281d150930d0841cb467ddfeb6374768815147e6c675009fac587aa files/digest-memcached-1.2.1-r1 247
diff --git a/net-misc/memcached/files/1.1.13/conf b/net-misc/memcached/files/1.1.13/conf
new file mode 100644
index 000000000000..7b2229e53c50
--- /dev/null
+++ b/net-misc/memcached/files/1.1.13/conf
@@ -0,0 +1,28 @@
+# Copyright 2003 Gentoo Technologies, Inc
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.1.13/conf,v 1.1 2007/03/31 19:03:18 robbat2 Exp $
+# memcached config file
+
+MEMCACHED_BINARY="/usr/bin/memcached"
+
+#Specify memory usage in megabytes (do not use letters)
+#64MB is default
+MEMUSAGE="64"
+
+#User to run as
+MEMCACHED_RUNAS="memcached"
+
+#Specify maximum number of concurrent connections
+#1024 is default
+MAXCONN="1024"
+
+#Listen for connections on what address?
+LISTENON=""
+
+#Listen for connections on what port?
+PORT="11211"
+
+#PID file location
+PIDFILE="/var/run/memcached/memcached-${PORT}.pid"
+
+#Other Options
+MISC_OPTS=""
diff --git a/net-misc/memcached/files/1.1.13/init b/net-misc/memcached/files/1.1.13/init
new file mode 100644
index 000000000000..662d6488d284
--- /dev/null
+++ b/net-misc/memcached/files/1.1.13/init
@@ -0,0 +1,48 @@
+#!/sbin/runscript
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.1.13/init,v 1.1 2007/03/31 19:03:18 robbat2 Exp $
+
+depend() {
+	need net
+}
+
+checkconfig() {
+        if [ -z "${LISTENON}" ]; then
+          ewarn "You should edit /etc/conf.d/memcached and specify an address to listen on."
+          ewarn "Listening on any address (I hope your firewall is set up properly)"
+        fi
+
+}
+
+start() {
+	ebegin "Starting memcached"
+        checkconfig
+        local dir="$(dirname ${PIDFILE})"
+        if [ ! -d "${dir}" ]; then
+          einfo " Creating ${dir}"
+          mkdir -p "${dir}"
+        fi
+        chown ${MEMCACHED_RUNAS} "${dir}"
+        if [ -f ${PIDFILE} ]; then
+          einfo "  Removing stale pidfile ${PIDFILE}"
+          rm -f ${PIDFILE} 1>/dev/null
+        fi
+
+        if [ -z "${LISTENON}" ]; then
+          c_LISTENON=""
+        else
+          c_LISTENON="-l ${LISTENON}"
+        fi
+        
+	/sbin/start-stop-daemon --start --pidfile ${PIDFILE} \
+	        --exec ${MEMCACHED_BINARY} --startas ${MEMCACHED_BINARY} -- \
+	        -d -p ${PORT} ${c_LISTENON} -m ${MEMUSAGE} \
+		-c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P ${PIDFILE} ${MISC_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping memcached"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+	rm -f ${PIDFILE}
+	eend $?
+}
diff --git a/net-misc/memcached/files/digest-memcached-1.1.13-r1 b/net-misc/memcached/files/digest-memcached-1.1.13-r1
new file mode 100644
index 000000000000..ce14edb8722e
--- /dev/null
+++ b/net-misc/memcached/files/digest-memcached-1.1.13-r1
@@ -0,0 +1,3 @@
+MD5 b1e7e2374698b59e3467262b56451312 memcached-1.1.13.tar.gz 133734
+RMD160 57b6da75e45af66f5d2a0c4a7a2a22a256cfb209 memcached-1.1.13.tar.gz 133734
+SHA256 cb46911afde64f627af277b46b879b4a66d0653c22b9e6ccd31392a9a4ebbe5f memcached-1.1.13.tar.gz 133734
diff --git a/net-misc/memcached/files/digest-memcached-1.2.1-r1 b/net-misc/memcached/files/digest-memcached-1.2.1-r1
new file mode 100644
index 000000000000..61fcae98edfe
--- /dev/null
+++ b/net-misc/memcached/files/digest-memcached-1.2.1-r1
@@ -0,0 +1,3 @@
+MD5 6ff64fb974d131fdb7f9d5fdf955dc9a memcached-1.2.1.tar.gz 148755
+RMD160 0b275591af74440f3de22946fb7ccc658f6578af memcached-1.2.1.tar.gz 148755
+SHA256 d489c1e8f9b149d7cde2bb1cb2c509ca6acedc32baed4e9b5f9e17d722c78c86 memcached-1.2.1.tar.gz 148755
diff --git a/net-misc/memcached/memcached-1.1.13-r1.ebuild b/net-misc/memcached/memcached-1.1.13-r1.ebuild
new file mode 100644
index 000000000000..01b50f769a3d
--- /dev/null
+++ b/net-misc/memcached/memcached-1.1.13-r1.ebuild
@@ -0,0 +1,52 @@
+# 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.1.13-r1.ebuild,v 1.1 2007/03/31 19:03:18 robbat2 Exp $
+
+inherit eutils
+
+DESCRIPTION="memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load."
+
+HOMEPAGE="http://www.danga.com/memcached/"
+
+MY_PV="${PV/_pre/-pre}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="static perl doc"
+
+DEPEND=">=dev-libs/libevent-0.6
+	perl? ( dev-perl/Cache-Memcached )"
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	local myconf=""
+	use static || myconf="--disable-static ${myconf}"
+	econf ${myconf} || die "econf failed"
+	emake || die
+}
+
+src_install() {
+	dobin ${S}/memcached
+	dodoc ${S}/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
+
+	newconfd "${FILESDIR}/1.1.13/conf" memcached
+	newinitd "${FILESDIR}/1.1.13/init" memcached
+
+	doman ${S}/doc/memcached.1
+
+	if use doc; then
+	  dodoc ${S}/doc/{memory_management.txt,protocol.txt}
+	fi
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+	einfo "With this version of Memcached Gentoo now supporst multiple instances."
+	einfo "To enable this you must create a symlink in /etc/init.d/ for each instance"
+	einfo "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	einfo "Please see Gentoo bug #122246 for more info"
+}
diff --git a/net-misc/memcached/memcached-1.2.1-r1.ebuild b/net-misc/memcached/memcached-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..72c9dcf57abb
--- /dev/null
+++ b/net-misc/memcached/memcached-1.2.1-r1.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.1-r1.ebuild,v 1.1 2007/03/31 19:03:18 robbat2 Exp $
+
+inherit eutils
+
+MY_PV="${PV/_pre/-pre}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load"
+HOMEPAGE="http://www.danga.com/memcached/"
+SRC_URI="http://www.danga.com/memcached/dist/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="static perl doc"
+
+DEPEND=">=dev-libs/libevent-0.6
+	perl? ( dev-perl/Cache-Memcached )"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	local myconf=""
+	use static || myconf="--disable-static ${myconf}"
+	econf ${myconf} || die "econf failed"
+	emake || die
+}
+
+src_install() {
+	dobin ${S}/memcached
+	dodoc ${S}/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
+
+	newconfd "${FILESDIR}/1.1.13/conf" memcached
+	newinitd "${FILESDIR}/1.1.13/init" memcached
+
+	doman ${S}/doc/memcached.1
+
+	if use doc; then
+	  dodoc ${S}/doc/{memory_management.txt,protocol.txt}
+	fi
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+	einfo "With this version of Memcached Gentoo now supporst multiple instances."
+	einfo "To enable this you must create a symlink in /etc/init.d/ for each instance"
+	einfo "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	einfo "Please see Gentoo bug #122246 for more info"
+}