Re: [ptxdist] [PATCH v2] lighttpd: Version bump, 1.4.72 -> 1.4.74

[Alexander Dahl <ada@thorsis.com>]

Hello Andreas,

Am Fri, Mar 08, 2024 at 01:09:33PM +0100 schrieb Andreas Helmcke:
> 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 <ahelmcke@ela-soft.com>
> ---
>  v2: removed LIGHTTPD_WEDAV_LOCKS
> 
>  rules/lighttpd.in   | 7 -------
>  rules/lighttpd.make | 7 +++----
>  2 files changed, 3 insertions(+), 11 deletions(-)
> 
> diff --git a/rules/lighttpd.in b/rules/lighttpd.in
> index 18dd8ab4e..b782307f4 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

Patch does not apply on master here, it looks like there are some
empty lines missing here?  At least there are empty lines around those
blocks in rules/lighttpd.in but not in your diff.  Strange.

> diff --git a/rules/lighttpd.make b/rules/lighttpd.make
> index 40d59c346..96382b86a 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

When applying those changes manually, build and run on armv5te target
works fine on first sight, so you might add my

Tested-by: Alexander Dahl <ada@thorsis.com>

Greets
Alex