memcached: upgrade 1.6.9 + DSM7 support

cross/memcached/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = memcached
-PKG_VERS = 1.4.15
+PKG_VERS = 1.6.15
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = http://www.memcached.org/files
@@ -12,7 +12,7 @@ COMMENT  = Free & open source, high-performance, distributed memory object cachi
 LICENSE  = BSD
 
 PRE_CONFIGURE_TARGET = memcached_pre_configure
-CONFIGURE_ARGS = ac_cv_c_endian=little
+
 GNU_CONFIGURE = 1
 
 include ../../mk/spksrc.cross-cc.mk

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.15.tar.gz SHA1 badcfa0d65f5797cc9c2f957f3fbfedbd8c13411
+memcached-1.6.15.tar.gz SHA256 8d7abe3d649378edbba16f42ef1d66ca3f2ac075f2eb97145ce164388e6ed515
+memcached-1.6.15.tar.gz MD5 8a21ef7bc1c427e6cd88cac270394898

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/phpmemcachedadmin/Makefile

@@ -1,24 +1,29 @@
 PKG_NAME = phpMemcachedAdmin
-PKG_VERS = 1.2.2-r262
 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_DIR = $(PKG_NAME)-$(PKG_VERS)
+PKG_DOWNLOAD_METHOD = git
+PKG_GIT_HASH = aaf3d16a2a1e3dff72dd358f1758d96f0f174cb3
+PKG_DIST_SITE = https://github.com/elijaa/phpmemcachedadmin.git
+PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
+PKG_DIR = $(PKG_NAME)-git$(PKG_GIT_HASH)
+
+# Unfortunately only version 1.3.0 is officially released, but
+# we need the commit aaf3d16 of 12 Jun 2020 for memcached 1.6.x
+# Issue #19: fix mem_requested key change in Memcached 1.5.17
 
 DEPENDS =
 
 HOMEPAGE = https://github.com/elijaa/phpmemcachedadmin
-COMMENT  = Graphic stand-alone administration for memcached to monitor and debug purpose
-LICENSE  = Apache License 2.0
+COMMENT  = Graphic stand-alone administration for memcached to monitor and debug purpose.
+LICENSE  = Apache 2.0
 
-EXTRACT_PATH = $(WORK_DIR)/$(PKG_DIR)
-CONFIGURE_TARGET = nop
-COMPILE_TARGET = nop
+EXTRACT_PATH = $(WORK_DIR)
 INSTALL_TARGET = phpmemcachedadmin_install
 
-include ../../mk/spksrc.cross-cc.mk
+include ../../mk/spksrc.install-resources.mk
 
 .PHONY: phpmemcachedadmin_install
+# make a copy of the sample config as on DSM7 it is not possible to create this at installation time.
 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) . | tar -xf - -C $(STAGING_INSTALL_PREFIX)/share/$(PKG_NAME)
+	@cp -f $(STAGING_INSTALL_PREFIX)/share/$(PKG_NAME)/Config/Memcache.sample.php $(STAGING_INSTALL_PREFIX)/share/$(PKG_NAME)/Config/Memcache.php

cross/phpmemcachedadmin/PLIST

@@ -1 +1 @@
-rsc:share/phpMemcachedAdmin
+rsc:share/phpMemcachedAdmin/

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-gitaaf3d16a2a1e3dff72dd358f1758d96f0f174cb3.tar.gz SHA1 28d8c233e6e1814fd25a37a2c1f7d3ee35a94d32
+phpMemcachedAdmin-gitaaf3d16a2a1e3dff72dd358f1758d96f0f174cb3.tar.gz SHA256 1248fe1c6df610b6ea69dfba1a2774d182160a444759d3bf1b4782458d40fe00
+phpMemcachedAdmin-gitaaf3d16a2a1e3dff72dd358f1758d96f0f174cb3.tar.gz MD5 e1e846983f33fcdb480c91c365bc7cac

mk/spksrc.service.mk

@@ -7,7 +7,7 @@
 #   conf/SPK_NAME.sc       if SERVICE_PORT and DSM<7
 #   conf/resource          if SERVICE_CERT or DSM7
 #   app/SPK_NAME.sc        if SERVICE_PORT and DSM7
-#   app/config             if DSM_UI_DIR
+#   app/config             if DSM_UI_DIR (may be overwritten by DSM_UI_CONFIG)
 #
 # Targets are executed in the following order:
 #  service_msg_target
@@ -418,6 +418,9 @@ endif
 DESC=$(shell echo ${DESCRIPTION} | sed -e 's/\\//g' -e 's/"/\\"/g')
 $(STAGING_DIR)/$(DSM_UI_DIR)/config:
 	$(create_target_dir)
+ifneq ($(wildcard $(DSM_UI_CONFIG)),)
+	cat $(DSM_UI_CONFIG) > $@
+else
 	@echo '{}' | jq --arg name "${DISPLAY_NAME}" \
 		--arg desc "${DESC}" \
 		--arg id "com.synocommunity.packages.${SPK_NAME}" \
@@ -428,7 +431,7 @@ $(STAGING_DIR)/$(DSM_UI_DIR)/config:
 		--arg type "${SERVICE_TYPE}" \
 		--argjson allUsers ${SERVICE_PORT_ALL_USERS} \
 		'{".url":{($$id):{"title":$$name, "desc":$$desc, "icon":$$icon, "type":$$type, "protocol":$$prot, "port":$$port, "url":$$url, "allUsers":$$allUsers, "grantPrivilege":"all", "advanceGrantPrivilege":true}}}' > $@
-
+endif
 SERVICE_FILES += $(STAGING_DIR)/$(DSM_UI_DIR)/config
 endif
 endif

spk/memcached/Makefile

@@ -1,37 +1,40 @@
 SPK_NAME = memcached
-SPK_VERS = 1.4.15
-SPK_REV = 2
+SPK_VERS = 1.6.15
+SPK_REV = 3
 SPK_ICON = src/memcached.png
 DSM_UI_DIR = app
 
-DEPENDS = cross/busybox cross/phpmemcachedadmin cross/$(SPK_NAME)
+DEPENDS = cross/phpmemcachedadmin cross/$(SPK_NAME)
 
 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. Update memcached from v1.4.13 to v1.6.15.<br/>2. Add DSM 7 compliance."
 
 HOMEPAGE = https://memcached.org/
 LICENSE  =
 
-INSTALLER_SCRIPT = src/installer.sh
-SSS_SCRIPT       = src/dsm-control.sh
-CONF_DIR         = src/conf/
+CONF_DIR = src/conf
+
+SERVICE_USER = auto
+SERVICE_PORT = 11211
+DSM_UI_CONFIG = src/app/config
+
+# SERVICE_COMMAND is defined in service setup script
+STARTABLE = yes
+SERVICE_SETUP = src/service-setup.sh
 
 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
-ENV += BUSYBOX_CONFIG="$(BUSYBOX_CONFIG)"
-
 include ../../mk/spksrc.spk.mk
 
 .PHONY: memcached_extra_install
 memcached_extra_install:
 	install -m 755 -d $(STAGING_DIR)/app
 	install -m 644 src/app/config $(STAGING_DIR)/app/config
+	install -m 775 $(STAGING_DIR)/share/phpMemcachedAdmin/Config/Memcache.sample.php \
+				   $(STAGING_DIR)/share/phpMemcachedAdmin/Config/Memcache.php

spk/memcached/src/app/config

@@ -2,8 +2,9 @@
     ".url" : {
         "com.synocommunity.packages.memcached" : {
             "title": "phpMemcachedAdmin",
-            "desc": "phpMemcachedAdmin",
+            "desc": "PHPMemcachedAdmin - memcached admin interface",
             "icon": "images/memcached-{0}.png",
+            "protocol": "http",
             "type": "url",
             "url": "/phpMemcachedAdmin",
             "port": "80"

spk/memcached/src/conf/resource

@@ -0,0 +1,48 @@
+{
+    "port-config": {
+        "protocol-file": "app/memcached.sc"
+    },
+    "webservice": {
+        "services": [{
+            "service": "phpMemcachedAdmin",
+            "display_name": "phpMemcachedAdmin",
+            "type": "apache_php",
+            "root": "phpMemcachedAdmin",
+            "backend": 2,
+            "php": {
+                "profile_name": "php-memcached-admin",
+                "profile_desc": "PHP profile used by phpMemcachedAdmin",
+                "backend": 6,
+                "extensions": [
+                    "gd",
+                    "intl",
+                    "zip"
+                ],
+                "user": "sc-memcached",
+                "group": "http"
+            }
+        }],
+        "portals": [
+            {
+                "service": "phpMemcachedAdmin",
+                "type": "alias",
+                "name": "PHP Memcached Admin",
+                "alias": "phpMemcachedAdmin",
+                "app": "com.synocommunity.packages.memcached"
+            }
+        ],
+        "migrate": {
+            "root": [{
+                "old": "phpMemcachedAdmin",
+                "new": "phpMemcachedAdmin"
+            }]
+        },
+        "pkg_dir_prepare": [{
+            "source": "/var/packages/memcached/target/share/phpMemcachedAdmin",
+            "target": "phpMemcachedAdmin",
+            "mode": "0755",
+            "user": "sc-memcached",
+            "group": "http"
+        }]
+    }
+}