net-misc/memcached: clean up bug 598836

Package-Manager: portage-2.3.0

2 files changed, 0 insertions, 118 deletions

diff --git a/net-misc/memcached/files/memcached-1.3.3-gcc4-slab-fixup.patch b/net-misc/memcached/files/memcached-1.3.3-gcc4-slab-fixup.patch
deleted file mode 100644
index 5b703502e73c..000000000000
--- a/net-misc/memcached/files/memcached-1.3.3-gcc4-slab-fixup.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Compile fix for illegal syntax to make GCC4 happy.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar -Nuar memcached-1.3.3.orig/slabs.c memcached-1.3.3/slabs.c
---- memcached-1.3.3.orig/slabs.c	2009-04-02 12:29:32.000000000 -0700
-+++ memcached-1.3.3/slabs.c	2009-06-03 14:11:04.134757232 -0700
-@@ -419,7 +419,7 @@
-     slab = p->slab_list[p->killing - 1];
-     slab_end = (char*)slab + POWER_BLOCK;
- 
--    for (iter = slab; iter < slab_end; (char*)iter += p->size) {
-+    for (iter = slab; iter < slab_end; iter = (char*)iter + p->size) {
-         item *it = (item *)iter;
-         if (it->slabs_clsid) {
-             if (it->refcount) was_busy = true;
-@@ -449,7 +449,7 @@
-     dp->end_page_free = dp->perslab;
-     /* this isn't too critical, but other parts of the code do asserts to
-        make sure this field is always 0.  */
--    for (iter = slab; iter < slab_end; (char*)iter += dp->size) {
-+    for (iter = slab; iter < slab_end; iter = (char*)iter + dp->size) {
-         ((item *)iter)->slabs_clsid = 0;
-     }
-     return 1;
diff --git a/net-misc/memcached/files/memcached.init b/net-misc/memcached/files/memcached.init
deleted file mode 100644
index 2321a44e1240..000000000000
--- a/net-misc/memcached/files/memcached.init
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/sbin/openrc-run
-
-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() {
-    if [ -z "${SOCKET}" ]; then
-        need net
-    fi
-    # 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 $?
-}