[ptxdist] [PATCH 0/4] lighttpd: Update and suggestions from last year

[ptxdist] [PATCH 0/4] lighttpd: Update and suggestions from last year

[Alexander Dahl]

Hi,

in late 2016 there was a patch posted for upgrading lighttpd from
1.4.39 to a newer version. Nothing happened since then and we are
still on this old version. Meanwhile upstream is at 1.4.45 with some
new features and lots of fixes, including serious security fixes.

I took all the suggestions from the old thread and made a patch
series. The first is the upgrade only, the following cover suggestions
from the old thread and use a new feature from 1.4.40 for simplifying
the config file. You may take all of the patches, but I also would be
happy if just the upgrade makes it.

Please have a look and test, as you can read in the News section on
https://www.lighttpd.net/ quite some things changed, although I
suppose almost every config out there should still run.

Greets
Alex

Alexander Dahl (4):
  lighttpd: Ugprade from 1.4.39 to 1.4.45
  lighttpd: Rename memcache option to memcached
  lighttpd: Simplify additional config include
  lighttpd: Install mime.conf and remove hardcoded values

 projectroot/etc/lighttpd/lighttpd.conf | 57 +---------------------------------
 rules/lighttpd.in                      |  6 ++--
 rules/lighttpd.make                    | 29 ++++++++++++++---
 scripts/migrate/migrate_ptx            |  8 +++++
 4 files changed, 36 insertions(+), 64 deletions(-)

-- 
2.1.4


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 1/4] lighttpd: Ugprade from 1.4.39 to 1.4.45

[Alexander Dahl]

* webdav support was improved in 1.4.40, we switch on the additional
    webdav related configure options, if webdav is selected
* auth framework was rewritten in 1.4.42, while all other auth backends
    (krb5, ldap, mysql) are disabled in ptxdist by configure, the basic
    file backend is active and another module has to be loaded for it

For removal of the runstatedir configure option see the discussion on
the proposed patch 1.4.39 -> 1.4.42 from October 2016.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/lighttpd.make | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/rules/lighttpd.make b/rules/lighttpd.make
index aa0849a..fd6e1cf 100644
--- a/rules/lighttpd.make
+++ b/rules/lighttpd.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
 #
 # Paths and names
 #
-LIGHTTPD_VERSION	:= 1.4.39
-LIGHTTPD_MD5		:= 63c7563be1c7a7a9819a51f07f1af8b2
+LIGHTTPD_VERSION	:= 1.4.45
+LIGHTTPD_MD5		:= a128e1eda76899ce3fd115efae5fe631
 LIGHTTPD		:= lighttpd-$(LIGHTTPD_VERSION)
 LIGHTTPD_SUFFIX		:= tar.xz
 LIGHTTPD_URL		:= http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
@@ -36,27 +36,31 @@ LIGHTTPD_LICENSE	:= BSD-3-Clause
 LIGHTTPD_CONF_TOOL	:= autoconf
 LIGHTTPD_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	--runstatedir=/run \
 	--libdir=/usr/lib/lighttpd \
 	--$(call ptx/endis, PTXCONF_GLOBAL_LARGE_FILE)-lfs \
 	$(GLOBAL_IPV6_OPTION) \
 	--disable-mmap \
+	--enable-extra-warnings \
 	--without-libev \
 	--without-mysql \
 	--without-ldap \
 	--$(call ptx/wwo, PTXCONF_LIGHTTPD_ATTR)-attr \
 	--without-valgrind \
 	--without-libunwind \
+	--without-krb5 \
 	--$(call ptx/wwo, PTXCONF_LIGHTTPD_OPENSSL)-openssl \
-	--without-kerberos5 \
 	--$(call ptx/wwo, PTXCONF_LIGHTTPD_PCRE)-pcre \
 	--$(call ptx/wwo, PTXCONF_LIGHTTPD_ZLIB)-zlib \
 	--$(call ptx/wwo, PTXCONF_LIGHTTPD_BZ2LIB)-bzip2 \
 	--$(call ptx/wwo, PTXCONF_LIGHTTPD_FAM)-fam \
 	--$(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-gdbm \
-	--$(call ptx/wwo, PTXCONF_LIGHTTPD_MEMCACHE)-memcache \
+	--without-geoip \
+	--$(call ptx/wwo, PTXCONF_LIGHTTPD_MEMCACHE)-memcached \
 	--$(call ptx/wwo, PTXCONF_LIGHTTPD_LUA)-lua
 
 # ----------------------------------------------------------------------------
@@ -68,6 +72,7 @@ LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ACCESS)		+= mod_access
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ACCESSLOG)	+= mod_accesslog
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ALIAS)		+= mod_alias
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH)		+= mod_auth
+LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH)		+= mod_authn_file
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_CML)		+= mod_cml
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_COMPRESS)	+= mod_compress
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_FASTCGI)	+= mod_fastcgi
-- 
2.1.4


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/4] lighttpd: Rename memcache option to memcached

[Alexander Dahl]

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 <Andreas.Geisenhainer@atsonline.de>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 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
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/4] lighttpd: Simplify additional config include

[Alexander Dahl]

Since version 1.4.40 lighttpd supports file globs for includes.

See announcement: https://www.lighttpd.net/2016/7/16/1.4.40/

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 projectroot/etc/lighttpd/lighttpd.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/projectroot/etc/lighttpd/lighttpd.conf b/projectroot/etc/lighttpd/lighttpd.conf
index 86048f0..c6f1e64 100644
--- a/projectroot/etc/lighttpd/lighttpd.conf
+++ b/projectroot/etc/lighttpd/lighttpd.conf
@@ -69,5 +69,4 @@ mimetype.assign		= (
 
 index-file.names = ( "index.html" )
 
-include_shell "[ \"$(ls -A conf.d/)\" ] && cat conf.d/*.conf"
-
+include "conf.d/*.conf"
-- 
2.1.4


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 4/4] lighttpd: Install mime.conf and remove hardcoded values

[Alexander Dahl]

As suggested on the mailing list back in late 2016 this removes the
hardcoded mimetype values from lighttpd.conf and installs mime.conf
provided by upstream instead. You can still have your own mime.conf by
putting it in projectroot/etc/lighttpd/conf.d of course.

Suggested-by: Clemens Gruber <clemens.gruber@pqgruber.com>
Suggested-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 projectroot/etc/lighttpd/lighttpd.conf | 54 ----------------------------------
 rules/lighttpd.make                    | 14 +++++++++
 2 files changed, 14 insertions(+), 54 deletions(-)

diff --git a/projectroot/etc/lighttpd/lighttpd.conf b/projectroot/etc/lighttpd/lighttpd.conf
index c6f1e64..fa2f60e 100644
--- a/projectroot/etc/lighttpd/lighttpd.conf
+++ b/projectroot/etc/lighttpd/lighttpd.conf
@@ -13,60 +13,6 @@ server.modules		= (
 	@MODULES@
 )
 
-# mimetype mapping
-mimetype.assign		= (
-	".pdf"		=>	"application/pdf",
-	".sig"		=>	"application/pgp-signature",
-	".spl"		=>	"application/futuresplash",
-	".class"	=>	"application/octet-stream",
-	".ps"		=>	"application/postscript",
-	".torrent"	=>	"application/x-bittorrent",
-	".dvi"		=>	"application/x-dvi",
-	".gz"		=>	"application/x-gzip",
-	".pac"		=>	"application/x-ns-proxy-autoconfig",
-	".swf"		=>	"application/x-shockwave-flash",
-	".tar.gz"	=>	"application/x-tgz",
-	".tgz"		=>	"application/x-tgz",
-	".tar"		=>	"application/x-tar",
-	".zip"		=>	"application/zip",
-	".mp3"		=>	"audio/mpeg",
-	".m3u"		=>	"audio/x-mpegurl",
-	".wma"		=>	"audio/x-ms-wma",
-	".wax"		=>	"audio/x-ms-wax",
-	".ogg"		=>	"audio/x-wav",
-	".wav"		=>	"audio/x-wav",
-	".gif"		=>	"image/gif",
-	".jpg"		=>	"image/jpeg",
-	".jpeg"		=>	"image/jpeg",
-	".png"		=>	"image/png",
-	".svg"		=>	"image/svg+xml",
-	".xbm"		=>	"image/x-xbitmap",
-	".xpm"		=>	"image/x-xpixmap",
-	".xwd"		=>	"image/x-xwindowdump",
-	".css"		=>	"text/css",
-	".html"		=>	"text/html",
-	".htm"		=>	"text/html",
-	".js"		=>	"text/javascript",
-	".asc"		=>	"text/plain",
-	".c"		=>	"text/plain",
-	".conf"		=>	"text/plain",
-	".text"		=>	"text/plain",
-	".txt"		=>	"text/plain",
-	".dtd"		=>	"text/xml",
-	".xml"		=>	"text/xml",
-	".mpeg"		=>	"video/mpeg",
-	".mpg"		=>	"video/mpeg",
-	".mov"		=>	"video/quicktime",
-	".qt"		=>	"video/quicktime",
-	".avi"		=>	"video/x-msvideo",
-	".asf"		=>	"video/x-ms-asf",
-	".asx"		=>	"video/x-ms-asf",
-	".wmv"		=>	"video/x-ms-wmv",
-	".bz2"		=>	"application/x-bzip",
-	".tbz"		=>	"application/x-bzip-compressed-tar",
-	".tar.bz2"	=>	"application/x-bzip-compressed-tar"
-)
-
 index-file.names = ( "index.html" )
 
 include "conf.d/*.conf"
diff --git a/rules/lighttpd.make b/rules/lighttpd.make
index 8b52267..0e3f20d 100644
--- a/rules/lighttpd.make
+++ b/rules/lighttpd.make
@@ -64,6 +64,18 @@ LIGHTTPD_CONF_OPT	:= \
 	--$(call ptx/wwo, PTXCONF_LIGHTTPD_LUA)-lua
 
 # ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+$(STATEDIR)/lighttpd.install:
+	@$(call targetinfo)
+	@cd $(LIGHTTPD_DIR) && \
+		$(LIGHTTPD_PATH) $(LIGHTTPD_MAKE_ENV) \
+		$(MAKE) $(LIGHTTPD_INSTALL_OPT)
+	install -D -m 644 "$(LIGHTTPD_DIR)/doc/config/conf.d/mime.conf" \
+		"$(LIGHTTPD_PKGDIR)/etc/lighttpd/conf.d/mime.conf"
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
@@ -118,6 +130,8 @@ endif
 	@$(call install_copy, lighttpd, 0, 0, 0755, /etc/lighttpd/conf.d)
 	@$(call install_replace, lighttpd, /etc/lighttpd/lighttpd.conf, \
 		@MODULES@, $(LIGHTTPD_MODULE_STRING))
+	@$(call install_alternative, lighttpd, 0, 0, 0644, \
+		/etc/lighttpd/conf.d/mime.conf)
 
 ifdef PTXCONF_LIGHTTPD_MOD_FASTCGI_PHP
 	@$(call install_alternative, lighttpd, 0, 0, 0644, \
-- 
2.1.4


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 4/4] lighttpd: Install mime.conf and remove hardcoded values

[Alexander Dahl]

Hi,

Am Freitag, 11. August 2017, 10:04:02 schrieb Alexander Dahl:
> +	@$(call targetinfo)
> +	@cd $(LIGHTTPD_DIR) && \
> +		$(LIGHTTPD_PATH) $(LIGHTTPD_MAKE_ENV) \
> +		$(MAKE) $(LIGHTTPD_INSTALL_OPT)
> +	install -D -m 644 "$(LIGHTTPD_DIR)/doc/config/conf.d/mime.conf" \
> +		"$(LIGHTTPD_PKGDIR)/etc/lighttpd/conf.d/mime.conf"
> +	@$(call touch)

This does not work as expected. I took this from the 
documentation/ref_manual. Removing the @ before cd I get this:

cd /home/adahl/Work/bsp/foo/platform-bar/build-target/lighttpd-1.4.45 && 
\
          \
        make 

Seems like those note in the documentation is misleading? When playing 
with ptxdist print I get something for LIGHTTPD_DIR, which is defined in 
rules/lighttpd.make and for LIGHTTPD_PKGDIR, which is probably defined 
somewhere outside. LIGHTTPD_PATH, LIGHTTPD_MAKE_ENV, and 
LIGHTTPD_INSTALL_OPT however are empty, so no `make install` is called 
here.

I tried to find out how other rules do this, and could just find usb-
modeswitch.make and qt4.make doing something like this:

	@$(call install, QT4)

or 

	@$(call world/install, USB_MODESWITCH)

I assume this can be used to replace the failing three lines, but what's 
the difference? This is not in the manual, is it? Some other packages 
use $(call install, …) and yet other packages $(call world/install, …) 
but none of those autoconf and @package@_INSTALL_OPT?

If somebody points me to a solution, I'll send a v2.

Greets
Alex



_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 4/4] lighttpd: Install mime.conf and remove hardcoded values

[Michael Olbrich]

On Fri, Aug 11, 2017 at 12:00:26PM +0200, Alexander Dahl wrote:
> Hi,
> 
> Am Freitag, 11. August 2017, 10:04:02 schrieb Alexander Dahl:
> > +	@$(call targetinfo)
> > +	@cd $(LIGHTTPD_DIR) && \
> > +		$(LIGHTTPD_PATH) $(LIGHTTPD_MAKE_ENV) \
> > +		$(MAKE) $(LIGHTTPD_INSTALL_OPT)
> > +	install -D -m 644 "$(LIGHTTPD_DIR)/doc/config/conf.d/mime.conf" \
> > +		"$(LIGHTTPD_PKGDIR)/etc/lighttpd/conf.d/mime.conf"
> > +	@$(call touch)
> 
> This does not work as expected. I took this from the 
> documentation/ref_manual.

This needs updating. :-/

> Removing the @ before cd I get this:
> 
> cd /home/adahl/Work/bsp/foo/platform-bar/build-target/lighttpd-1.4.45 && 
> \
>           \
>         make 

This only works if the variables are actually set to something useful...

> Seems like those note in the documentation is misleading? When playing 
> with ptxdist print I get something for LIGHTTPD_DIR, which is defined in 
> rules/lighttpd.make and for LIGHTTPD_PKGDIR, which is probably defined 
> somewhere outside. LIGHTTPD_PATH, LIGHTTPD_MAKE_ENV, and 
> LIGHTTPD_INSTALL_OPT however are empty, so no `make install` is called 
> here.
> 
> I tried to find out how other rules do this, and could just find usb-
> modeswitch.make and qt4.make doing something like this:
> 
> 	@$(call install, QT4)

This should be world/install too...

> or 
> 
> 	@$(call world/install, USB_MODESWITCH)

This is correct.

> I assume this can be used to replace the failing three lines, but what's 
> the difference? This is not in the manual, is it? Some other packages 
> use $(call install, …) and yet other packages $(call world/install, …) 
> but none of those autoconf and @package@_INSTALL_OPT?

'install' should not be used. That's old compatibility stuff.
'world/install' uses @package@_INSTALL_OPT if set. If not, "install" is used
as make argument.

> If somebody points me to a solution, I'll send a v2.

Make sure 'world/install' is the first command. It will remove the pkgdir.

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de