The memcached ./configure option for lighttpd changed, better reflecting a daemon for memory caching should be used (see previous patch). For making this consistent, the menu variable is also renamed here.
Took this from a not applied patch from 2016, and added the necessary migration helper suggested by Michael Olbrich. Suggested-by: Andreas Geisenhainer <[email protected]> Signed-off-by: Alexander Dahl <[email protected]> --- rules/lighttpd.in | 6 +++--- rules/lighttpd.make | 2 +- scripts/migrate/migrate_ptx | 8 ++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/rules/lighttpd.in b/rules/lighttpd.in index d535394..dd761df 100644 --- a/rules/lighttpd.in +++ b/rules/lighttpd.in @@ -16,7 +16,7 @@ menuconfig LIGHTTPD select SQLITE if LIGHTTPD_WEBDAV_PROPS select LIBUUID if LIGHTTPD_WEBDAV_LOCKS select OPENSSL if LIGHTTPD_OPENSSL - select LIBMEMCACHE if LIGHTTPD_MEMCACHE + select LIBMEMCACHE if LIGHTTPD_MEMCACHED select LUA if LIGHTTPD_LUA select LUA_INSTALL_LIBLUA if LIGHTTPD_LUA select PHP5 if LIGHTTPD_MOD_FASTCGI_PHP && RUNTIME @@ -60,7 +60,7 @@ config LIGHTTPD_LUA help lua engine for mod_cml and mod_magnet -config LIGHTTPD_MEMCACHE +config LIGHTTPD_MEMCACHED bool prompt "memcached storage" help @@ -171,7 +171,7 @@ config LIGHTTPD_MOD_REWRITE config LIGHTTPD_MOD_TRIGGER_B4_DL bool - select LIGHTTPD_MEMCACHE + select LIGHTTPD_MEMCACHED select LIGHTTPD_PCRE prompt "mod_trigger_b4_dl" help diff --git a/rules/lighttpd.make b/rules/lighttpd.make index fd6e1cf..8b52267 100644 --- a/rules/lighttpd.make +++ b/rules/lighttpd.make @@ -60,7 +60,7 @@ LIGHTTPD_CONF_OPT := \ --$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_LOCKS)-uuid \ --without-gdbm \ --without-geoip \ - --$(call ptx/wwo, PTXCONF_LIGHTTPD_MEMCACHE)-memcached \ + --$(call ptx/wwo, PTXCONF_LIGHTTPD_MEMCACHED)-memcached \ --$(call ptx/wwo, PTXCONF_LIGHTTPD_LUA)-lua # ---------------------------------------------------------------------------- diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx index d684137..d92beb5 100755 --- a/scripts/migrate/migrate_ptx +++ b/scripts/migrate/migrate_ptx @@ -290,3 +290,11 @@ s/^\(\(# \)\?PTXCONF_\)DOSFSTOOLS_DOSFSCK_MSDOS/\1DOSFSTOOLS_FSCK_FAT_MSDOS/ s/^\(\(# \)\?PTXCONF_\)DOSFSTOOLS_DOSFSCK_VFAT/\1DOSFSTOOLS_FSCK_FAT_VFAT/ s/^\(\(# \)\?PTXCONF_\)DOSFSTOOLS_DOSFSCK/\1DOSFSTOOLS_FSCK_FAT/ s/^\(\(# \)\?PTXCONF_\)DOSFSTOOLS_DOSFSLABEL/\1DOSFSTOOLS_FATLABEL/ + +# +# from : ptxdist-2017.07.0 +# to : ptxdist-2017.08.0 +# symbol : LIGHTTPD_MEMCACHE -> LIGHTTPD_MEMCACHED +# reason : option renamed +# +s/^\(\(# \)\?PTXCONF_\)LIGHTTPD_MEMCACHE/\1LIGHTTPD_MEMCACHED/ -- 2.1.4 _______________________________________________ ptxdist mailing list [email protected]
