diff options
| -rw-r--r-- | rules/lighttpd.in | 10 | ||||
| -rw-r--r-- | rules/lighttpd.make | 2 | ||||
| -rwxr-xr-x | scripts/migrate/migrate_ptx | 8 |
3 files changed, 16 insertions, 4 deletions
diff --git a/rules/lighttpd.in b/rules/lighttpd.in index d53539408..3e7e0ed69 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 LIBMEMCACHED if LIGHTTPD_MEMCACHED select LUA if LIGHTTPD_LUA select LUA_INSTALL_LIBLUA if LIGHTTPD_LUA select PHP5 if LIGHTTPD_MOD_FASTCGI_PHP && RUNTIME @@ -60,9 +60,11 @@ config LIGHTTPD_LUA help lua engine for mod_cml and mod_magnet -config LIGHTTPD_MEMCACHE +config LIGHTTPD_MEMCACHED bool prompt "memcached storage" + # fails to build with current libmemcached version + depends on BROKEN help memcached storage for mod_trigger_b4_dl and mod_cml @@ -171,8 +173,10 @@ config LIGHTTPD_MOD_REWRITE config LIGHTTPD_MOD_TRIGGER_B4_DL bool - select LIGHTTPD_MEMCACHE + select LIGHTTPD_MEMCACHED select LIGHTTPD_PCRE + # needs (currently broken) LIGHTTPD_MEMCACHED + depends on BROKEN prompt "mod_trigger_b4_dl" help Module for Anti Hotlinking diff --git a/rules/lighttpd.make b/rules/lighttpd.make index fd6e1cf84..8b522670a 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 d684137aa..d92beb54e 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/ |