taken some comments from stuart: uses its own uers (memcached), and will now just warn the user when they start the daemon without a -l listen address

Package-Manager: portage-2.0.53

6 files changed, 90 insertions, 18 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index 4df7537eea99..96f0798f4a70 100644
--- a/net-misc/memcached/ChangeLog
+++ b/net-misc/memcached/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/memcached
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.17 2005/12/17 21:38:32 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.18 2005/12/29 11:55:01 lisa Exp $
+
+*memcached-1.1.12-r2 (29 Dec 2005)
+
+  29 Dec 2005; Lisa Seelye <lisa@gentoo.org> files/1.1.12/conf,
+  files/1.1.12/init, +memcached-1.1.12-r2.ebuild:
+  taken some comments from stuart: uses its own uers (memcached), and will now
+  just warn the user when they start the daemon without a -l listen address
 
   17 Dec 2005; Markus Rothe <corsair@gentoo.org> memcached-1.1.12-r1.ebuild:
   Added ~ppc64
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 2d19475c7356..1c505eadac5b 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -1,12 +1,14 @@
-MD5 0da4a10fb234bf2d4ce05c00874a2b3d ChangeLog 4472
-MD5 5727d73671db85103fad1163f2bb1070 memcached-1.1.11.ebuild 1355
-MD5 1c617e0c159fc8f89cc69b80ec380acf memcached-1.1.12.ebuild 1381
-MD5 0f18e4c1a9a4b09570cfc7719b927e83 metadata.xml 220
-MD5 85bdd6bc525bd3cf2c1bdccfd2b32a20 memcached-1.1.12-r1.ebuild 1503
+MD5 33e00c04ee3bc488274297b1657e5577 ChangeLog 4775
+MD5 f838206eac3e3420d7ad751024f64eea files/1.1.12/conf 636
+MD5 48aa3c67b8c13598a3a4880bdced44ac files/1.1.12/init 1284
 MD5 7d313d0464bf2dcec9d83b20646b0a95 files/conf 537
-MD5 a513989dda7189a51c6d117b5c997223 files/init 532
 MD5 66a850e16ef028f59367429466d54cc3 files/digest-memcached-1.1.11 68
 MD5 dc66dcc94aa25e2392e3c6575324ee56 files/digest-memcached-1.1.12 68
 MD5 dc66dcc94aa25e2392e3c6575324ee56 files/digest-memcached-1.1.12-r1 68
-MD5 922da24bcde2c72796d05ed8f646c41b files/1.1.12/conf 633
-MD5 17e7e298333aedfb13faba2da8d243e4 files/1.1.12/init 1095
+MD5 dc66dcc94aa25e2392e3c6575324ee56 files/digest-memcached-1.1.12-r2 68
+MD5 a513989dda7189a51c6d117b5c997223 files/init 532
+MD5 5727d73671db85103fad1163f2bb1070 memcached-1.1.11.ebuild 1355
+MD5 85bdd6bc525bd3cf2c1bdccfd2b32a20 memcached-1.1.12-r1.ebuild 1503
+MD5 92807d881fd61046a698aa6ad17ef0b5 memcached-1.1.12-r2.ebuild 1567
+MD5 1c617e0c159fc8f89cc69b80ec380acf memcached-1.1.12.ebuild 1381
+MD5 0f18e4c1a9a4b09570cfc7719b927e83 metadata.xml 220
diff --git a/net-misc/memcached/files/1.1.12/conf b/net-misc/memcached/files/1.1.12/conf
index 4497c1c3e09b..4b9367b3fae1 100644
--- a/net-misc/memcached/files/1.1.12/conf
+++ b/net-misc/memcached/files/1.1.12/conf
@@ -1,5 +1,5 @@
 # Copyright 2003 Gentoo Technologies, Inc
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.1.12/conf,v 1.2 2005/12/07 13:12:41 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.1.12/conf,v 1.3 2005/12/29 11:55:01 lisa Exp $
 # memcached config file
 
 MEMCACHED_BINARY="/usr/bin/memcached"
@@ -9,7 +9,7 @@ MEMCACHED_BINARY="/usr/bin/memcached"
 MEMUSAGE="64"
 
 #User to run as
-MEMCACHED_RUNAS="nobody"
+MEMCACHED_RUNAS="memcached"
 
 #Specify maximum number of concurrent connections
 #1024 is default
diff --git a/net-misc/memcached/files/1.1.12/init b/net-misc/memcached/files/1.1.12/init
index 1e24d7e87296..28f339521c46 100644
--- a/net-misc/memcached/files/1.1.12/init
+++ b/net-misc/memcached/files/1.1.12/init
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.1.12/init,v 1.2 2005/12/07 13:12:41 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.1.12/init,v 1.3 2005/12/29 11:55:01 lisa Exp $
 
 depend() {
 	need net
@@ -7,29 +7,35 @@ depend() {
 
 checkconfig() {
         if [ -z "${LISTENON}" ]; then
-          eerror "Edit /etc/conf.d/memcached and specify an address to listen on."
-          return 1
+          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 || return 1
+        checkconfig
         local dir="$(dirname ${PIDFILE})"
         if [ ! -d "${dir}" ]; then
           einfo " Creating ${dir}"
-          mkdir "${dir}"
-          chown ${MEMCACHED_RUNAS} "${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 \
 	        --exec ${MEMCACHED_BINARY} --startas ${MEMCACHED_BINARY} -- \
-	        -d -p ${PORT} -l ${LISTENON} -m ${MEMUSAGE} \
+	        -d -p ${PORT} ${c_LISTENON} -m ${MEMUSAGE} \
 		-c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P ${PIDFILE} ${MISC_OPTS}
 	eend $?
 }
diff --git a/net-misc/memcached/files/digest-memcached-1.1.12-r2 b/net-misc/memcached/files/digest-memcached-1.1.12-r2
new file mode 100644
index 000000000000..e93e168d1a03
--- /dev/null
+++ b/net-misc/memcached/files/digest-memcached-1.1.12-r2
@@ -0,0 +1 @@
+MD5 a1236dad33e9ac6c36d53faa8da61780 memcached-1.1.12.tar.gz 114103
diff --git a/net-misc/memcached/memcached-1.1.12-r2.ebuild b/net-misc/memcached/memcached-1.1.12-r2.ebuild
new file mode 100644
index 000000000000..ad24750e3ea5
--- /dev/null
+++ b/net-misc/memcached/memcached-1.1.12-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.1.12-r2.ebuild,v 1.1 2005/12/29 11:55:01 lisa 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/"
+
+SRC_URI="http://www.danga.com/memcached/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~mips ~ppc ~ppc64 sparc x86"
+IUSE="static perl php doc"
+
+DEPEND=">=dev-libs/libevent-0.6
+	perl? ( dev-perl/Cache-Memcached )
+	php? ( dev-libs/memcached-api-php )"
+
+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}
+
+	insinto /etc/conf.d
+	newins "${FILESDIR}/${PV}/conf" memcached
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/${PV}/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 /bin/false /dev/null daemon
+	if ! use php; then
+		ewarn "This package uses a special \"php\" USE flag to include the PHP"
+		ewarn "API. If you emerged this without setting that USE flag, you can"
+		ewarn "still get the API by doing:"
+		einfo "   emerge dev-libs/memcached-api-php"
+		echo
+	fi
+}