Bug #266061: --enable-threads is obsolete. It is now always used by upstream and no longer an option. Bug #269022: Start memcached after system time is accurate. Bug #270838: Specify UDP port to listen on.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 190 insertions, 2 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index 9f8e0b1b8133..79423bc77e01 100644
--- a/net-misc/memcached/ChangeLog
+++ b/net-misc/memcached/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/memcached
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.83 2009/05/14 23:14:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.84 2009/05/26 00:03:08 robbat2 Exp $
+
+*memcached-1.3.3-r2 (26 May 2009)
+
+  26 May 2009; Robin H. Johnson <robbat2@gentoo.org> +files/1.3.3/conf,
+  +memcached-1.3.3-r2.ebuild, +files/1.3.3/init:
+  Bug #266061: --enable-threads is obsolete. It is now always used by
+  upstream and no longer an option. Bug #269022: Start memcached after
+  system time is accurate. Bug #270838: Specify UDP port to listen on.
 
 *memcached-1.3.3-r1 (14 May 2009)
 
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 9f4ffb71ea39..26d65a829bad 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -8,6 +8,8 @@ AUX 1.2.5/conf 811 RMD160 816215be39e3bdb3163df90c88e864337d47e37a SHA1 8a38d032
 AUX 1.2.5/init 2122 RMD160 5fd5deba348febbf2d5396404225486d0d0edb41 SHA1 2a0309dbdaed5ce2aef09fe8ab9e5125ee98e9b2 SHA256 27cfbb1be26725327bd3abc9e7702ff34b805c6361221ecb4d21b51f037db4c0
 AUX 1.2.6/conf 811 RMD160 2c8c13c4f2d112e4c1925ae87d50be50cfb29351 SHA1 3c0cb7c59553bf05952341feccd11f1dcdccc149 SHA256 7afc0dfb7fb8dbc47c6b41f56fa62f90fec53bef1b3049d3b2a307856bdb984a
 AUX 1.2.6/init 2122 RMD160 187519a373a768deec455775d073b8d3b704a1c4 SHA1 2bddef6ebc95c07b04d4f67c3070393f52961fa4 SHA256 d1f3485e52ed27b766acecfd21028ff4c1c202d06a3403a9625e3441b2071563
+AUX 1.3.3/conf 896 RMD160 19e6a55b77c9e9b48dec0185e70015ed63809bbf SHA1 287af1e355054c3ef53041ac5196e771caf97dd0 SHA256 d8648ea385035632b209acfae27b0a46ec446e58d37de43874d2a41ba13b6923
+AUX 1.3.3/init 2320 RMD160 d4faf07df1939a1f79189c67cc45daedc38e6a07 SHA1 a07e8aa811914ef86577caebd245d69bbe82defd SHA256 e4b6415c5501963d2ce421aab9d595736091bc895b8f3762e746593f7d736792
 AUX conf 537 RMD160 5de199b3d9a76ef0efed7ee6105594e904e9f8ad SHA1 5213df426a6bb9f19893fdbc77a5e060dc3ab8b4 SHA256 c93f522dd0fdcdd8c92c34114bc830b66edbd612f464a648c313ddc3f1ec00dd
 AUX init 571 RMD160 ddaa6e2e9464618920cc3b6cb02d7ded1d164bdb SHA1 db92dc23707f261bdaa23b692a22b1495c3195fd SHA256 8ae8fa692c9dec80403840205cfb16295b843392f446bd8dc7715607bc43d31f
 AUX memcached-1.2.2-fbsd.patch 328 RMD160 669542854d9cbca5495db2ac2fe280502dbe96e6 SHA1 c783c1f1b89da8f61f170641dcf4d0987b9c3b08 SHA256 a0e91bd63a01a1a3361b0465fb9c63d091627d8714f3f64c853723b31da54b2f
@@ -31,6 +33,7 @@ EBUILD memcached-1.2.6.ebuild 1615 RMD160 6f27c376b744894cbc7e45469840c182d4e8b4
 EBUILD memcached-1.2.8.ebuild 1714 RMD160 9b8acae6b66b89f2e6e7360c959bd4ff951a5565 SHA1 17f502f2b3133be369eaada8f89b61ab6c5c0fa2 SHA256 6cc8ce18ec6cf69c2577647ffadcdab626d1260879cf4ba60461cedaeb65ff78
 EBUILD memcached-1.3.0.ebuild 1626 RMD160 58827e010e169540c96b81deacc37e5a0aab2043 SHA1 6b1cf11ad8c2b6f619ace2689e26f8ec0cff5ecb SHA256 fc15c447bf031d1acf246b28d98460ada9cf52b6d9d7b82e55391c19ad052f79
 EBUILD memcached-1.3.3-r1.ebuild 1806 RMD160 65cb1604dd20ad81104d196bfb6ead0d57ff5cee SHA1 4cd2a308cf9b91dde4668a521bd7858165dad00a SHA256 983eef21af6d44b2685df6413e92a2c508422a6ce1e71aae203329b21dd65cd3
+EBUILD memcached-1.3.3-r2.ebuild 1774 RMD160 f8fd51604044d75a8d78137baec7ae0ae103473f SHA1 f84d7e4162fc49133ab19c10f897b466ba207371 SHA256 f5af25d74fe4a67f78f73307fb439685b18c9a46d6dcb636c282fac0e0784ba1
 EBUILD memcached-1.3.3.ebuild 1714 RMD160 70359cf49548ad62315ed217c56f0987eb71c48c SHA1 eb8a43677aee0bf9623b997362e436ad2e1005e8 SHA256 e1d10d1c532cb9833248dd8fea30f029025092da83896b9d20298b333f22dd62
-MISC ChangeLog 14559 RMD160 a842bff595cafdafe3492c72aad0d81b681c6531 SHA1 dc71477597007395c49b57160ec99f81a133638d SHA256 52bf2c123be32a9a130b07395cf81f07f4d166371a5414487320e62e41a3f77b
+MISC ChangeLog 14928 RMD160 8d9f7acd5ffa38d0039421e04bf0e695366e35c7 SHA1 447647f0c7b94da853e72a7819e48db92fa90143 SHA256 90f9e67ce8d992469031e48940a7e61b8af156a751dcc0cc3c9bcd94e142d9db
 MISC metadata.xml 966 RMD160 9da6a32f068f21da2b93ad45b4bba6147644e20a SHA1 a7080fc08dde81c21554beeb89b201d16efe08c1 SHA256 ce8186d4b0926cdc2ac0dcc49a737359b3f08a13396b5dc2cf05bf4a366b242b
diff --git a/net-misc/memcached/files/1.3.3/conf b/net-misc/memcached/files/1.3.3/conf
new file mode 100644
index 000000000000..7acf662a8429
--- /dev/null
+++ b/net-misc/memcached/files/1.3.3/conf
@@ -0,0 +1,35 @@
+# Copyright 2003 Gentoo Technologies, Inc
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.3.3/conf,v 1.1 2009/05/26 00:03:09 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?
+# If this is empty, memcached will listen on 0.0.0.0
+# be sure you have a firewall in place!
+LISTENON=""
+
+#Listen for connections on what port?
+PORT="11211"
+
+# Listen for UDP connecitons on what port? 0 means turn off UDP
+UDPPORT="${PORT}"
+
+#PID file location
+# '-${PORT}.${CONF}.pid' will be appended to this!
+# You do not normally need to change this.
+PIDBASE="/var/run/memcached/memcached"
+
+#Other Options
+MISC_OPTS=""
diff --git a/net-misc/memcached/files/1.3.3/init b/net-misc/memcached/files/1.3.3/init
new file mode 100644
index 000000000000..74b2c60918ca
--- /dev/null
+++ b/net-misc/memcached/files/1.3.3/init
@@ -0,0 +1,80 @@
+#!/sbin/runscript
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.3.3/init,v 1.1 2009/05/26 00:03:09 robbat2 Exp $
+
+CONF="${SVCNAME#*.}"
+CONFBASE="/etc/conf.d/memcached"
+
+[ -z "${PIDBASE}" ] && PIDBASE="/var/run/memcached/memcached"
+[ "${CONF}" == "memcached" ] && CONF=''
+
+if [ -n "${CONF}" ]; then
+        PIDFILE="${PIDBASE}-${PORT}.${CONF}.pid"
+        CONFSRC="${CONFBASE}.${CONF}"
+        if [ -f "${CONFSRC}" ]; then
+         source "${CONFSRC}"
+        else
+         eerror "The configuration file $CONFSRC was not found!"
+        fi
+else
+        PIDFILE="${PIDBASE}-${PORT}.pid"
+        CONFSRC="${CONFBASE}"
+fi
+
+depend() {
+        need net
+		# per bug #269022, accurate time is important for memcached!
+		# We include the full list of ways it might be set on boot.
+		after ntp-client ntpd rdate openrdate adjtimex hwclock
+}
+
+checkconfig() {
+        if [ -z "${LISTENON}" ]; then
+          ewarn "You should edit $CONFSRC and specify an address to listen on."
+          ewarn "Listening on any address (check your firewall!)"
+        fi
+
+}
+
+start() {
+        if [ -n "${CONF}" ]; then
+                ebegin "Starting memcached (${CONF})"
+        else
+                ebegin "Starting memcached"
+        fi
+        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} -U ${UDPPORT} ${c_LISTENON} -m ${MEMUSAGE} \
+                -c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P "${PIDFILE}" \
+				${MISC_OPTS}
+        eend $?
+}
+
+stop() {
+        if [ -n "${CONF}" ]; then
+                ebegin "Stopping memcached (${CONF})"
+        else
+                ebegin "Stopping memcached"
+        fi
+        start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
+        rm -f "${PIDFILE}"
+        eend $?
+}
diff --git a/net-misc/memcached/memcached-1.3.3-r2.ebuild b/net-misc/memcached/memcached-1.3.3-r2.ebuild
new file mode 100644
index 000000000000..3e4ccaa6c803
--- /dev/null
+++ b/net-misc/memcached/memcached-1.3.3-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.3.3-r2.ebuild,v 1.1 2009/05/26 00:03:08 robbat2 Exp $
+
+inherit eutils autotools flag-o-matic
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://code.google.com/p/memcached/"
+SRC_URI="http://memcached.googlecode.com/files/${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="test slabs-reassign"
+
+RDEPEND=">=dev-libs/libevent-1.4
+		 dev-lang/perl"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die "sed failed"
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+}
+
+src_compile() {
+	econf
+	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.3.3/conf memcached
+	newinitd "${FILESDIR}"/1.3.3/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 should 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"
+}
+
+src_test() {
+	emake -j1 test || die "Failed testing"
+}