memcached: bump 1.4.13 -> 1.6.9

+ reworked to use standard "framework"

Author: smaarn

cross/memcached/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = memcached
-PKG_VERS = 1.4.15
+PKG_VERS = 1.6.9
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = http://www.memcached.org/files

cross/memcached/digests

@@ -1,3 +1,3 @@
-memcached-1.4.15.tar.gz SHA1 12ec84011f408846250a462ab9e8e967a2e8cbbc
-memcached-1.4.15.tar.gz SHA256 169721ab7a7531add6ae9f6b14b6b5641725fe0b1f0bdf5c3a4327725901e2b4
-memcached-1.4.15.tar.gz MD5 36ea966f5a29655be1746bf4949f7f69
+memcached-1.6.9.tar.gz SHA1 42ae062094fdf083cfe7b21ff377c781011c2be1
+memcached-1.6.9.tar.gz SHA256 d5a62ce377314dbffdb37c4467e7763e3abae376a16171e613cbe69956f092d1
+memcached-1.6.9.tar.gz MD5 ee802a316d7d622aaaec22382ca65004

cross/memcached/patches/001-remove-werror.patch

@@ -1,17 +1,17 @@
 --- configure.ac.orig	2012-09-03 09:35:54.000000000 +0200
 +++ configure.ac	2012-12-08 00:31:35.000000000 +0100
-@@ -534,12 +534,12 @@
+@@ -788,12 +788,12 @@
  if test "$ICC" = "yes"
  then
     dnl ICC trying to be gcc.
 -   CFLAGS="$CFLAGS -diag-disable 187 -Wall -Werror"
 +   CFLAGS="$CFLAGS -diag-disable 187 -Wall"
-    AC_DEFINE([_GNU_SOURCE],[1],[find sigignore on Linux])
+    AC_DEFINE([_GNU_SOURCE],[1],[make sure IOV_MAX is defined])
  elif test "$GCC" = "yes"
  then
    GCC_VERSION=`$CC -dumpversion`
 -  CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
 +  CFLAGS="$CFLAGS -Wall -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
-   case $GCC_VERSION in
-     4.4.*)
-     CFLAGS="$CFLAGS -fno-strict-aliasing"
+   if test "x$enable_asan" = "xyes"; then
+     CFLAGS="$CFLAGS -fsanitize=address"
+   fi

cross/memcached/patches/aarch64/001-crc32-support.patch

@@ -0,0 +1,36 @@
+From 0548859b47a90fcbe5da97ed2a71e2660384cc48 Mon Sep 17 00:00:00 2001
+From: Sergey Dryabzhinsky <[email protected]>
+Date: Tue, 24 Nov 2020 22:16:56 +0300
+Subject: [PATCH] For issue #743 - Fix missing hw crc32 capability check on
+ arm64 for old gcc/libc
+
+---
+ crc32c.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/crc32c.c b/crc32c.c
+index 916e0e67e..d2e359826 100644
+--- crc32c.c
++++ crc32c.c
+@@ -275,7 +275,7 @@ void crc32c_init(void) {
+
+ #elif defined(__aarch64__) && defined(__linux__)
+ #include <sys/auxv.h>
+-
++#if defined(HWCAP_CRC32)
+ static inline uint32_t crc32cx(uint32_t crc, const uint64_t data)
+ {
+         asm(".arch_extension crc\n"
+@@ -336,6 +336,12 @@ void crc32c_init(void) {
+     if (auxv & HWCAP_CRC32)
+         crc32c = crc32c_hw;
+ }
++#else /* no hw crc32 on arm64 system supported? old compiler/libc/kernel? */
++void crc32c_init(void) {
++    crc32c = crc32c_sw;
++}
++#endif
++
+ #else /* !__x86_64__i && !__aarch64__ */
+ void crc32c_init(void) {
+     crc32c = crc32c_sw;

cross/phpmemcachedadmin/Makefile

@@ -1,8 +1,9 @@
 PKG_NAME = phpMemcachedAdmin
-PKG_VERS = 1.2.2-r262
+PKG_VERS = 1.3.0
 PKG_EXT = tar.gz
-PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/phpmemcacheadmin
+PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/elijaa/phpmemcachedadmin/archive/refs/tags
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS =
@@ -20,5 +21,5 @@ include ../../mk/spksrc.cross-cc.mk
 
 .PHONY: phpmemcachedadmin_install
 phpmemcachedadmin_install:
-	mkdir -p $(STAGING_INSTALL_PREFIX)/share/phpMemcachedAdmin
-	tar -cf - -C $(WORK_DIR)/$(PKG_DIR) . | tar -xf - -C $(STAGING_INSTALL_PREFIX)/share/phpMemcachedAdmin
+	mkdir -p $(STAGING_INSTALL_PREFIX)/share/$(PKG_NAME)
+	tar -cf - -C $(WORK_DIR)/$(PKG_DIR)/phpmemcachedadmin-$(PKG_VERS) . | tar -xf - -C $(STAGING_INSTALL_PREFIX)/share/$(PKG_NAME)

cross/phpmemcachedadmin/digests

@@ -1,3 +1,3 @@
-phpMemcachedAdmin-1.2.2-r262.tar.gz SHA1 616d33deeb54c7bb0b894b23589afc81aa3f67f5
-phpMemcachedAdmin-1.2.2-r262.tar.gz SHA256 10022211593c78b4eaaec16054843979f0b98ed72e86ee93e4fe79bf35c383e3
-phpMemcachedAdmin-1.2.2-r262.tar.gz MD5 93ce23bc02f8f262d55d749d40058388
+phpMemcachedAdmin-1.3.0.tar.gz SHA1 101fcae71834c466e51950e02bcaa6998ecbc4bc
+phpMemcachedAdmin-1.3.0.tar.gz SHA256 9afae91888c991ad11a3d0433dc86720b4b08cf1320391cffb471f24bdabda2c
+phpMemcachedAdmin-1.3.0.tar.gz MD5 195eb5e718be44c4e2c7b82c3dff6693

spk/memcached/Makefile

@@ -1,6 +1,6 @@
 SPK_NAME = memcached
-SPK_VERS = 1.4.15
-SPK_REV = 2
+SPK_VERS = 1.6.9
+SPK_REV = 3
 SPK_ICON = src/memcached.png
 DSM_UI_DIR = app
 
@@ -10,20 +10,21 @@ MAINTAINER = Diaoul
 DESCRIPTION = Free \& open source, high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load. It comes with phpMemcachedAdmin, a graphic stand-alone administration for memcached to monitor and debug purpose.
 ADMIN_URL = /phpMemcachedAdmin/
 DISPLAY_NAME = Memcached
-CHANGELOG = "1. Use 64-bit toolchains for bromolow, cedarview and x86"
+CHANGELOG = "1. Bump 1.4.13 -> 1.6.9"
 
 HOMEPAGE = https://memcached.org/
 LICENSE  =
 
-INSTALLER_SCRIPT = src/installer.sh
-SSS_SCRIPT       = src/dsm-control.sh
-CONF_DIR         = src/conf/
+SPK_USER = auto
+
+SERVICE_SETUP    = src/service-setup.sh
+# This is a bogus value to ensure that everything is tailored for a SERVICE_COMMAND
+# The real value is defined by the setup file
+SERVICE_COMMAND  = memcached
 
 INSTALL_DEP_SERVICES = apache-web
 START_DEP_SERVICES = apache-web
 
-INSTALL_PREFIX = /usr/local/$(SPK_NAME)
-
 POST_STRIP_TARGET = memcached_extra_install
 
 BUSYBOX_CONFIG = usrmng

spk/memcached/src/app/config

@@ -4,6 +4,7 @@
             "title": "phpMemcachedAdmin",
             "desc": "phpMemcachedAdmin",
             "icon": "images/memcached-{0}.png",
+            "protocol": "http",
             "type": "url",
             "url": "/phpMemcachedAdmin",
             "port": "80"