Thanks, applied as 9b17a224c7591ba41c8274c94d481d8b4112a2b3. Michael
[sent from post-receive hook] On Tue, 19 Mar 2024 07:44:45 +0100, Andreas Helmcke <ahelm...@ela-soft.com> wrote: > Mainly Bugfixes > > Link: https://www.lighttpd.net/2024/2/19/1.4.74/ > Link: https://www.lighttpd.net/2023/10/30/1.4.73/ > > Removed no longer needed option LIGHTTPD_WEDAV_LOCKS > > Signed-off-by: Andreas Helmcke <ahelm...@ela-soft.com> > Tested-by: Alexander Dahl <a...@thorsis.com> > Message-Id: <20240312105407.23541-1-ahelm...@ela-soft.com> > Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> > > diff --git a/rules/lighttpd.in b/rules/lighttpd.in > index 18dd8ab4efde..b782307f45ff 100644 > --- a/rules/lighttpd.in > +++ b/rules/lighttpd.in > @@ -13,7 +13,6 @@ menuconfig LIGHTTPD > select LIBPCRE if LIGHTTPD_PCRE > select LIBXML2 if LIGHTTPD_WEBDAV_PROPS > select SQLITE if LIGHTTPD_WEBDAV_PROPS > - select LIBUUID if LIGHTTPD_WEBDAV_LOCKS > select OPENSSL if LIGHTTPD_OPENSSL > select LUA if LIGHTTPD_LUA > select LUA_INSTALL_LIBLUA if LIGHTTPD_LUA > @@ -159,12 +158,6 @@ config LIGHTTPD_WEBDAV_PROPS > help > properties in mod_webdav > > -config LIGHTTPD_WEBDAV_LOCKS > - bool > - select LIGHTTPD_WEBDAV_PROPS > - prompt "locks in mod_webdav" > - help > - locks in mod_webdav > endif > > config LIGHTTPD_MOD_EXTRA > diff --git a/rules/lighttpd.make b/rules/lighttpd.make > index 40d59c346f75..96382b86af5b 100644 > --- a/rules/lighttpd.make > +++ b/rules/lighttpd.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd > # > # Paths and names > # > -LIGHTTPD_VERSION := 1.4.72 > -LIGHTTPD_MD5 := 466f9fe131cd7d38d0fe47d2e6a2939d > +LIGHTTPD_VERSION := 1.4.74 > +LIGHTTPD_MD5 := f38c400232151c69cc608fca35e593a9 > LIGHTTPD := lighttpd-$(LIGHTTPD_VERSION) > LIGHTTPD_SUFFIX := tar.xz > LIGHTTPD_URL := > http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX) > @@ -72,8 +72,7 @@ LIGHTTPD_CONF_OPT := \ > --$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_PROPS)-webdav-props \ > --$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_PROPS)-libxml \ > --$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_PROPS)-sqlite \ > - --$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_LOCKS)-webdav-locks \ > - --$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_LOCKS)-uuid \ > + --without-webdav-locks \ > --without-xxhash \ > --without-maxminddb \ > --$(call ptx/wwo, PTXCONF_LIGHTTPD_LUA)-lua
