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

[Michael Olbrich <m.olbrich@pengutronix.de>]

Hallo,

On Wed, Oct 18, 2023 at 02:38:56PM +0200, Alexander Dahl wrote:
> Am Wed, Oct 18, 2023 at 02:25:03PM +0200 schrieb Andreas Helmcke:
> > Am 18.10.23 um 13:38 schrieb Alexander Dahl:
> > > Am Wed, Oct 18, 2023 at 12:53:58PM +0200 schrieb Andreas Helmcke:
> > >> Am 18.10.23 um 07:54 schrieb Michael Olbrich:
> > >>> On Tue, Oct 17, 2023 at 08:05:11AM +0200, Alexander Dahl wrote:
> > >>>> Hello Andreas,
> > >>>>
> > >>>> first of all, thanks for taking care of this, my remarks below.
> > >>>>
> > >>>> Am Mon, Oct 16, 2023 at 07:07:34PM +0200 schrieb Andreas Helmcke:
> > >>>>> Bugfixes and several changes. e.g.
> > >>>>> - Stronger TLS defaults
> > >>>>> - HTTP/2 Support now as optional module
> > >>>>>
> > >>>>> see: https://www.lighttpd.net/releases/
> > >>>>
> > >>>> Link: https://www.lighttpd.net/2023/1/3/1.4.68/
> > >>>> Link: https://www.lighttpd.net/2023/2/10/1.4.69/
> > >>>> Link: https://www.lighttpd.net/2023/5/10/1.4.70/
> > >>>> Link: https://www.lighttpd.net/2023/5/27/1.4.71/
> > >>>> Link: https://www.lighttpd.net/2023/10/6/1.4.72/
> > >>
> > >> thanks, changed that
> > >>
> > >>>>> Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
> > >>>>> ---
> > >>>>>  rules/lighttpd.make | 4 ++--
> > >>>>>  1 file changed, 2 insertions(+), 2 deletions(-)
> > >>>>>
> > >>>>> diff --git a/rules/lighttpd.make b/rules/lighttpd.make
> > >>>>> index 3aa54a1fb..7b7abf7d2 100644
> > >>>>> --- a/rules/lighttpd.make
> > >>>>> +++ b/rules/lighttpd.make
> > >>>>> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
> > >>>>>  #
> > >>>>>  # Paths and names
> > >>>>>  #
> > >>>>> -LIGHTTPD_VERSION	:= 1.4.67
> > >>>>> -LIGHTTPD_MD5		:= 64822c5061001673162cf9775d91a80b
> > >>>>> +LIGHTTPD_VERSION	:= 1.4.72
> > >>>>> +LIGHTTPD_MD5		:= 466f9fe131cd7d38d0fe47d2e6a2939d
> > >>>>
> > >>>> Builds fine, but …
> > >>>>
> > >>>> That 1.4.70 in particular needs a little more work on the ptxdist
> > >>>> package, because several modules are not built separate anymore, but
> > >>>> built-in now.  This makes some of the LIGHTTPD_MOD_* options in menu
> > >>>> not necessary anymore, and breaks targetinstall if those should have
> > >>>> been installed before, e.g. like this:
> > >>>>
> > >>>>     Error: ptxd_lib_install: cannot find library 'lighttpd/mod_indexfile'!
> > >>
> > >> I can not (re)produce your error, but ...
> > > 
> > > Interesting.  It's one of the modules always installed.  Maybe we have
> > > different options set?  Comes from these lines:
> > > 
> > >     111 # add modules that are always loaded
> > >     112 LIGHTTPD_MODULES_INSTALL := mod_indexfile mod_dirlisting mod_staticfile $(LIGHTTPD_MODULES-y)
> > > 
> > > Please test with PTXCONF_LIGHTTPD_INSTALL_SELECTED_MODULES set and
> > > not set, and compare.  I guess you will also find 'mod_staticfile'?
> > 
> > Yes, you are right. I didn't use the option "Only install selected modules".
> > If I fix this by removing mod_indexfile and mod_staticfile (which works) only 
> > mod_dirlisting remains in the list of always loaded modules.
> 
> Yes.
> 
> > So it might be a good idea to completely do without a static list of always loaded 
> > modules and also make mod_dirlist configurable.
> > Any objections?
> 
> Fine with me, if the module is installed by default as before.
> 
> Michael added this with c37f05122341 ("lighttpd: rework options and
> configuration") back in 2013 for ptxdist-2013.03.0 when reworking the
> lighttpd package.  Maybe he has an opinion?

I'm fine with an option but make that one 'default y'. I had the fixed list
because I considered those modules as essential. I guess upstream agreed
with that for two of those, since they are now builtin :-).
An option for the last one is fine.

Michael

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |