fixing bug 525412 and bug 525404

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

4 files changed, 202 insertions, 2 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index 8795071914d9..9838fb7ac9ce 100644
--- a/net-misc/memcached/ChangeLog
+++ b/net-misc/memcached/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/memcached
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.151 2014/05/26 06:46:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.152 2014/10/17 02:29:40 prometheanfire Exp $
+
+*memcached-1.4.20-r1 (17 Oct 2014)
+
+  17 Oct 2014; Matthew Thode <prometheanfire@gentoo.org> +files/memcached.init2,
+  +memcached-1.4.20-r1.ebuild:
+  fixing bug 525412 and bug 525404
 
 *memcached-1.4.20 (26 May 2014)
 
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 51eb08972129..8219e8852831 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.1.12/conf 636 SHA256 0a5b83267788e429c2be0c4af1ef6a30320e96becab78aaba5af8d7eb8ff3ee2 SHA512 f863a285802a926e01b1c7680f0d76b59b5ffd8dd629de0ad9f560cd6a7fa0b888a5276caf7af55a1aa0181ff7ab2eae7c60e0226c1aee9078ab17b06ca5fb96 WHIRLPOOL f9d78c529755da2936bcc0f386b6a662d58c76d8d874e9e476b92384aef1e901e339ae12939ceb5f29917a8b7759655d9813d2cb8fee6d1b956693232797166d
 AUX 1.1.12/init 1246 SHA256 21f2c89bd15508d82f9230cd96a3bbf6bd7fd9378668e67fe07e3c787ba81972 SHA512 9f4baf3bdb3b38e0018170343934935b5cc5131fc438bf9175b8c244598afe9554dbcf00f618d96074b0d96fdbf56b15b1795fe8224f11ff079c79a366d94a95 WHIRLPOOL a40107f30cb06a3037315c5b916b452f6da3746d18923493ab814a7c89f1573fe1a54d3652093eba7f1e52b7fb75b5ded2d556982913aa5fa7f32964e4298897
 AUX 1.1.13/conf 639 SHA256 883921447c65b5bb627df3ec330fe61f1ba93c96b63398990da953dc0da0114f SHA512 338ff2f2421fda432b57f3c755611bd0f01f9110e19b52fcf314e73af4cd66b5cc5025cf404e50f7ea6232fecc6c9e3586e91df46c210cba95c089342e320e07 WHIRLPOOL f650c2df92e5345e017de1b5aa77979094ef99d99e3d35bbccea9643567c93c0f88437217885a36925c82e3e17e76555224f622bfefb4ee013998be7755813cb
@@ -13,6 +16,7 @@ AUX memcached-1.4.17-EWOULDBLOCK.patch 506 SHA256 c0f2be207fd5a6185c70d16482d1d2
 AUX memcached-1.4.4-as-needed.patch 1135 SHA256 4b08e69c7a3f97e6add4fb337b095b7b0aba55c3d62ed793858cbf1dad036421 SHA512 16f1ebae169d47836a83857e9da1ba4498b061367979d2ec5d271b91c939b1b5655ced68f37653c8996e41266e2daa64c2ae63d787b54d221ce92d544cea722e WHIRLPOOL baf83fc9213b04f35e6c503606f6b6b386ce0b5c50ba173a0cb48e8b7aa5576361b541d9a2af0da34795b64d5d58cbcee62bcb8d50e5695d8fb4ccd0b23137e3
 AUX memcached.confd 872 SHA256 700e2d718cb9d15de92a334cd8fe5f966bc3a34bba32878c1b95b5ce7696963b SHA512 77dd11565172336c3db24663510ab15ce3c919a656d1c7a12b0bae830c1576247844f84e6b4fe10c96a54f2e64ae8f6c502eee3d84d68ea1d370fea99a586f63 WHIRLPOOL 07465aef2fdc867a2e2c4dbad801715f65030ee5d83bc73a38ff887c2cc022ea7b299564b560a315db9ee2bc441cab3d732453c591ca32e82042edcc6ebe4032
 AUX memcached.init 2261 SHA256 e06423a32d23c7c3231f186d1ff89e0e3d92612c81168db7bf23e69926aebdee SHA512 66b6bfea619cdb0d6d118bcfcff06139f9f01d0ef5d01394234c3aab474beca2aab8a749541dd83f4d01d6e725e2d9ce415a5c39f87e316270939f844f845705 WHIRLPOOL e7eac88553c144d95918f64087bbe493540dc5531fe80fc9ef504abbb21a3875c423d5bbccd87015042d46bc6922701fe8d1023256c3b18ca024d6c5be3ae77e
+AUX memcached.init2 2204 SHA256 0157ebdc97203b2a043c297fbb47dbb3eb582351a52d34950e0651521e33838f SHA512 3e6d877f99d7331819d0ef737c6bb5aacebc80e1081e397249072d18185dab749d127264dcd6fbe99974c1defa1fb0507e2c70a32dda7c203b0993f777fd1824 WHIRLPOOL 6032de2ffd2e34b94a580d8988bea464c5c9df77e991eeba5fa4e9ff6b0123ecc79fc8fdb3a5a0ee5924a35265863c8e4f8497c03068cc798f359b3628d40c85
 AUX memcached.service 273 SHA256 ac7b65867203f195ed1aa2064072869a75f2a7c652de5a404f9b936a78a4180f SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95 WHIRLPOOL cca378cb72a08b6b5177434ec1add5edd3d6a744b0999226fe22628b29edf31e7aadedfa6721a706bf7d4122bdf2a3953cdfeb3f0c2c8dfccb97372d9fb8737f
 DIST memcached-1.1.13.tar.gz 133734 SHA256 cb46911afde64f627af277b46b879b4a66d0653c22b9e6ccd31392a9a4ebbe5f SHA512 f7136c5d728eee71cd74bb32583567a3e6178db19a94608115d12e207a4bd801c942d220fe5d2f37bf61b89f6e14377806598bc2ea9b4992ab6de5b13b6d8072 WHIRLPOOL c379623888b6cba1c2687f90e75b0957f043b3c64c43d161dc6bc074cd2730324e3cbc945ceb2b8e5f253539b31018f7ee53490b9ff47fa81ea96ccd1e4f2425
 DIST memcached-1.2.6.tar.gz 217651 SHA256 365c5719997af9477aedf4ff0435fbd83aadf5fa9b1c7a2e0d744f865aac578e SHA512 0e492c0dbd84321533588b9373827c41e90b6ef0ce233e5849c3291c25179947e4e332c7e972285c6899e45317edfcc718e558bf63ce1f2d00180dd95b927c63 WHIRLPOOL 0b08ff9534ac983bbc7f4ec5190d61f7f55d217080d18f406bb655fc6c202ef162a91043070b18875b80af28e5ce5c5ae15cfcbda18044de5f85c9701f3f9b9a
@@ -27,6 +31,24 @@ EBUILD memcached-1.2.8-r1.ebuild 1720 SHA256 fdafda09b3b89f1a09c9072a2030e594c9f
 EBUILD memcached-1.3.3-r5.ebuild 1824 SHA256 e66192d4a4e10fa382a587f6aff61ece0da3651cc576e90433a045bfa91fbb03 SHA512 89ad0576342f26d6328958ebf94e4195c27fa93b317a969055a770e719cac4a3876e0628de395166b0e29384ea98bbd2f24e11adfdcc9e075bdd6d9fbdac152a WHIRLPOOL 05a45c917cb2d7eecff54527fd48183afa16e179e9317ca85410814e7f66563078cd117088ed9dd8c80558e3b5b604be8ff34b8c37ec6ae0e16f29d6375f90c0
 EBUILD memcached-1.4.17-r3.ebuild 2672 SHA256 eddc8fb776f74ebc6c1629d72ab86788c37e09a6c94c14c1f9d287d99e4bb01d SHA512 7cf7571a92fdbeb58188be3cbcc4a4eabe0589b8ed0edb180674d89e06e7e56e4674c6c4c9a927f0ae8b4dbbd1672e7291273d4b216e2701242f6b22cf7a7205 WHIRLPOOL 692016a37a818c44dce469f4b9a6bcaa378ec6d374b6b477dd5042da070f13b83adb6a5441bc081484442ed0a41f898d6dec9195cdd9a5db3fa4c9ab8122921e
 EBUILD memcached-1.4.17.ebuild 2483 SHA256 aac261b7f4f0264213aa00df9df1670ab36993694e67d80a4849957f6d4e07fc SHA512 687b0d0ef109e81eb1c4133b78801bb4986b566b75165a6fb7655a3f16b4e3c42aa698d6750f4c95e686536d78a934104700bb10adbc35281f1ad8bbe0f7c3fe WHIRLPOOL 119bbde87a5edaf53e91277645b2df9b9e56958bc78b224e13006c5478b3aa8db086e7de372eb78d593a702b6f9125c90be63b37aff59975361019af496c2c20
+EBUILD memcached-1.4.20-r1.ebuild 2673 SHA256 99c4c0b1ae9bb6fb8a29b520869eb992fb3a3ff60fdf783ec88a8430842707ca SHA512 785982487eb07887ebfbfb8764f858277d2e98c667cd613901cfb5d3d9643a626fd88153305b291f283f8fb1c4fcdbc18a16e7aecf9703a2cdc077578af063ec WHIRLPOOL 98085813bc3825971960a0c6f3248e2fc04e78d16a01f25a7b04ec0b6035fc1334bef71a9a352a20505dade2e85a5ac304e24db0c5186900c4913de5df4d1cd2
 EBUILD memcached-1.4.20.ebuild 2662 SHA256 63e4ec799049a50e910a49be8887e722b557f74623384fdb6ca48899b19df0f0 SHA512 d2c978d4971a951b43f55725b147ab7035f3fb52d44cd4c3f2b6087822a35937b2dbfb6c240e01fedbfb9b6fe8ec129aaffcbbfa73c8f0c5aebdc9f105677897 WHIRLPOOL fe164e48ccbc6af7b51b6f7687bfd8441d8563195f001d51761b3ab7530d0c08e3a54d411a28e7e756e1a5a9939a3ec7b813a146293d83e815fbddc1a07f8442
-MISC ChangeLog 27342 SHA256 002272a16556ea77500bfeaa4ba5145ab3a96ff703526e45a09c06a8d5973c40 SHA512 494f7c15c610e8b2071dddad8e7aefb306dc8ff2c39c18ab49f99f1b129e0cf407db42613e76e9387d29922332c57127dbf402d6aaff9708bfc2033c7587b1a0 WHIRLPOOL 627b9d2f63c06c256d9c3e5a9d150d0c3b195013d97751a9789e8f3a2987ac3df48a86aed79b405ea814b253f98828d01c7e81c7f1a085574731d4927b3be806
+MISC ChangeLog 27533 SHA256 b2c92d655b3bd5bacf4cd22d1b0d1957c1aef17a7db5d08198ace08b5a435c2a SHA512 b5f09b40ba352a3645304a48a28b1fc62e0630d46886eec06b2dfa70ad077c29df60796009f8e6d69de602cb0514840fb451007901e6ab012ac2d93069c3e623 WHIRLPOOL 5d79b9115a46935ac10f032b711c09c6d6a3980568f9024bc0d408c0999c39e3401a1e87fd288492fa4eb668bc09a35b7d304d7b495b65c00677f4251740d8ba
 MISC metadata.xml 1101 SHA256 a99106f3b0f91f0cc6e24f72d60af090d308ae02cffe19b05dc082e26578e253 SHA512 071d36e1df0e820b4c2c536a00e9a69ec7c37269030a516e15f361c28457318f8de8e2e077e3f3ffa8de024d4427a3caa1e0c40ba3527b5205bc1a33d6dc4b94 WHIRLPOOL 0c3fab47e7802256a9960e9380b752c9aab1ee026e4743f0d0d64a4ca97b48b181ec148914f6663cbf903336974ae9ed9cc9acf26eb85d8efb93fc86229ec0f3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJUQH8sAAoJECRx6z5ArFrDM/0QAKajcxhTJi63I3GtZSA3IxcG
+bx5yH3H6GdkN6b1/S43nkmNCPk7EYmsIf3y2XzWQVsntnFIvbjzEIEMwxi9wj7k8
+0dt/TqaSaYjc2YF8MiPgwfoCTPNqs5Y1VtGxNXd0Tk2VA4saKKXzj9tZDy+MsLYy
+vLmuzBszGtMRFytCTNMWq31dF2ZHEtHbKrzpqVV5NOyTKn8JlL2TxJDDbMjTDFP8
+UwK617BQ2NPoJZZd0P05JbX68IO3VYum+aU7wCqhhx6H5lco6P6XHm3G87PyfQG+
+5H+VfDK1dOw7DdP0lv8w6tRbkax/C9NMR3UQCG7QxzTyI9bD++Vv5NYhY+u+7ExJ
+p5JTL3c8lAPWroQh3z4je+6DzMMUmoeaybRsRtxJSFlgGFwXFr1KW1RBUy6f83bf
++g1gaoHsIcstXuZI61qFGfzqmWh7GeOAXqmyd2NkbluFk+Z9D+R4C6YBiE24kU9s
+pEYxd6fGzHpAcy9eNSC5FsekGVBslvBEiKHuPE+fev+44AhHdhurjxVHqgdC4lVj
+86Z4YzgZDwUlRSnf6PdQC+qez+NAunqVg/m0hCrnwFDGhKy9TqAYu3S9wtTxp7u8
+4ZP6t73LAqP6qhzaFa4N+Da3IomHmphF+UHIj+cLep5t8vB5fVLgcYK65fblkyFb
+AMVqBI2Vafr3Qzj43oXv
+=fkKa
+-----END PGP SIGNATURE-----
diff --git a/net-misc/memcached/files/memcached.init2 b/net-misc/memcached/files/memcached.init2
new file mode 100644
index 000000000000..929378100305
--- /dev/null
+++ b/net-misc/memcached/files/memcached.init2
@@ -0,0 +1,90 @@
+#!/sbin/runscript
+
+CONF="${SVCNAME#*.}"
+CONFBASE="/etc/conf.d/memcached"
+
+[ -z "${PIDBASE}" ] && PIDBASE="/run/memcached/memcached"
+[ "${CONF}" = "memcached" ] && CONF=''
+
+if [ -n "${CONF}" ]; then
+    PIDFILE="${PIDBASE}.${CONF}.pid"
+    CONFSRC="${CONFBASE}.${CONF}"
+    if [ -f "${CONFSRC}" ]; then
+        source "${CONFSRC}"
+    else
+        eerror "The configuration file $CONFSRC was not found!"
+    fi
+else
+    PIDFILE="${PIDBASE}.pid"
+    CONFSRC="${CONFBASE}"
+fi
+
+depend() {
+    # 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}" ] && [ -z "${SOCKET}" ]; then
+        ewarn "You should edit $CONFSRC and specify an address or socket 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 [ -n "${SOCKET}" ]; then
+        CONNECTION="-s ${SOCKET}"
+
+        if [ -n "${SOCKET_MASK}" ]; then
+            CONNECTION="${CONNECTION} -a ${SOCKET_MASK}"
+        fi
+    else
+        CONNECTION="-p ${PORT} -U ${UDPPORT}"
+
+        if [ -n "${LISTENON}" ]; then
+            CONNECTION="${CONNECTION} -l ${LISTENON}"
+        fi
+    fi
+
+    /sbin/start-stop-daemon --start --pidfile "${PIDFILE}" \
+        --exec "${MEMCACHED_BINARY}" -- \
+        -d ${CONNECTION} -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.4.20-r1.ebuild b/net-misc/memcached/memcached-1.4.20-r1.ebuild
new file mode 100644
index 000000000000..698e324bdf1c
--- /dev/null
+++ b/net-misc/memcached/memcached-1.4.20-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.20-r1.ebuild,v 1.1 2014/10/17 02:29:40 prometheanfire Exp $
+
+EAPI=5
+inherit autotools eutils flag-o-matic systemd user
+
+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://www.memcached.org/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test slabs-reassign debug sasl" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4
+		 dev-lang/perl
+		 sasl? ( dev-libs/cyrus-sasl )"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	# Handled different upstream
+	#epatch "${FILESDIR}/${PN}-1.3.3-gcc4-slab-fixup.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${FILESDIR}/memcached.service"
+}
+
+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
+}