Skip to content

Commit da8abee

Browse files
hgy59hgy59
committed
memcached: rework
- update memcached to v1.6.15 - aarch64 patch is not required (memcached/memcached#743 is not an issue) - update phpMemcachedAdmin to include fix for 1.6.x - fix service user
1 parent 3a62fea commit da8abee

File tree

7 files changed

+32
-68
lines changed

7 files changed

+32
-68
lines changed

‎cross/memcached/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = memcached
2-
PKG_VERS = 1.6.9
2+
PKG_VERS = 1.6.15
33
PKG_EXT = tar.gz
44
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = http://www.memcached.org/files

‎cross/memcached/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
memcached-1.6.9.tar.gz SHA1 42ae062094fdf083cfe7b21ff377c781011c2be1
2-
memcached-1.6.9.tar.gz SHA256 d5a62ce377314dbffdb37c4467e7763e3abae376a16171e613cbe69956f092d1
3-
memcached-1.6.9.tar.gz MD5 ee802a316d7d622aaaec22382ca65004
1+
memcached-1.6.15.tar.gz SHA1 badcfa0d65f5797cc9c2f957f3fbfedbd8c13411
2+
memcached-1.6.15.tar.gz SHA256 8d7abe3d649378edbba16f42ef1d66ca3f2ac075f2eb97145ce164388e6ed515
3+
memcached-1.6.15.tar.gz MD5 8a21ef7bc1c427e6cd88cac270394898

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

-36
This file was deleted.

‎cross/phpmemcachedadmin/Makefile

+17-13
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
11
PKG_NAME = phpMemcachedAdmin
2-
PKG_VERS = 1.3.0
32
PKG_EXT = tar.gz
4-
PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
5-
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
6-
PKG_DIST_SITE = https://github.com/elijaa/phpmemcachedadmin/archive/refs/tags
7-
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
3+
PKG_DOWNLOAD_METHOD = git
4+
PKG_GIT_HASH = aaf3d16a2a1e3dff72dd358f1758d96f0f174cb3
5+
PKG_DIST_SITE = https://github.com/elijaa/phpmemcachedadmin.git
6+
PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
7+
PKG_DIR = $(PKG_NAME)-git$(PKG_GIT_HASH)
8+
9+
# Unfortunately only version 1.3.0 is officially released, but
10+
# we need the commit aaf3d16 of 12 Jun 2020 for memcached 1.6.x
11+
# Issue #19: fix mem_requested key change in Memcached 1.5.17
812

913
DEPENDS =
1014

1115
HOMEPAGE = https://github.com/elijaa/phpmemcachedadmin
12-
COMMENT = Graphic stand-alone administration for memcached to monitor and debug purpose
13-
LICENSE = Apache License 2.0
16+
COMMENT = Graphic stand-alone administration for memcached to monitor and debug purpose.
17+
LICENSE = Apache 2.0
1418

15-
EXTRACT_PATH = $(WORK_DIR)/$(PKG_DIR)
16-
CONFIGURE_TARGET = nop
17-
COMPILE_TARGET = nop
19+
EXTRACT_PATH = $(WORK_DIR)
1820
INSTALL_TARGET = phpmemcachedadmin_install
1921

20-
include ../../mk/spksrc.cross-cc.mk
22+
include ../../mk/spksrc.install-resources.mk
2123

2224
.PHONY: phpmemcachedadmin_install
25+
# make a copy of the sample config as on DSM7 it is not possible to create this at installation time.
2326
phpmemcachedadmin_install:
24-
mkdir -p $(STAGING_INSTALL_PREFIX)/share/$(PKG_NAME)
25-
tar -cf - -C $(WORK_DIR)/$(PKG_DIR)/phpmemcachedadmin-$(PKG_VERS) . | tar -xf - -C $(STAGING_INSTALL_PREFIX)/share/$(PKG_NAME)
27+
@mkdir -p $(STAGING_INSTALL_PREFIX)/share/$(PKG_NAME)
28+
@tar -cf - -C $(WORK_DIR)/$(PKG_DIR) . | tar -xf - -C $(STAGING_INSTALL_PREFIX)/share/$(PKG_NAME)
29+
@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
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
rsc:share/phpMemcachedAdmin
1+
rsc:share/phpMemcachedAdmin/

‎cross/phpmemcachedadmin/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
phpMemcachedAdmin-1.3.0.tar.gz SHA1 101fcae71834c466e51950e02bcaa6998ecbc4bc
2-
phpMemcachedAdmin-1.3.0.tar.gz SHA256 9afae91888c991ad11a3d0433dc86720b4b08cf1320391cffb471f24bdabda2c
3-
phpMemcachedAdmin-1.3.0.tar.gz MD5 195eb5e718be44c4e2c7b82c3dff6693
1+
phpMemcachedAdmin-gitaaf3d16a2a1e3dff72dd358f1758d96f0f174cb3.tar.gz SHA1 28d8c233e6e1814fd25a37a2c1f7d3ee35a94d32
2+
phpMemcachedAdmin-gitaaf3d16a2a1e3dff72dd358f1758d96f0f174cb3.tar.gz SHA256 1248fe1c6df610b6ea69dfba1a2774d182160a444759d3bf1b4782458d40fe00
3+
phpMemcachedAdmin-gitaaf3d16a2a1e3dff72dd358f1758d96f0f174cb3.tar.gz MD5 e1e846983f33fcdb480c91c365bc7cac

‎spk/memcached/Makefile

+7-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SPK_NAME = memcached
2-
SPK_VERS = 1.6.9
2+
SPK_VERS = 1.6.15
33
SPK_REV = 3
44
SPK_ICON = src/memcached.png
55
DSM_UI_DIR = app
@@ -10,23 +10,19 @@ MAINTAINER = Diaoul
1010
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.
1111
ADMIN_URL = /phpMemcachedAdmin/
1212
DISPLAY_NAME = Memcached
13-
CHANGELOG = "1. Bump 1.4.13 -> 1.6.9 <br />2. Add DSM 7 compliance"
13+
CHANGELOG = "1. Update memcached from v1.4.13 to v1.6.15.<br/>2. Add DSM 7 compliance."
14+
1415
HOMEPAGE = https://memcached.org/
1516
LICENSE =
1617

1718
CONF_DIR = src/conf
1819

19-
SPK_USER = auto
20-
SYSTEM_GROUP = http
21-
20+
SERVICE_USER = auto
2221
SERVICE_PORT = 11211
23-
SERVICE_PORT_TITLE = $(DISPLAY_NAME)
24-
NO_SERVICE_SHORTCUT = yes
2522

26-
SERVICE_SETUP = src/service-setup.sh
27-
# This is a bogus value to ensure that everything is tailored for a SERVICE_COMMAND
28-
# The real value is defined by the setup file
29-
SERVICE_COMMAND = memcached
23+
# SERVICE_COMMAND is defined in service setup script
24+
STARTABLE = yes
25+
SERVICE_SETUP = src/service-setup.sh
3026

3127
INSTALL_DEP_SERVICES = apache-web
3228
START_DEP_SERVICES = apache-web

0 commit comments

Comments
 (0)