lighttpd: update to 1.4.82, some modules are now builtin

package/lighttpd/Makefile

@@ -4,11 +4,13 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		lighttpd
-PKG_VERSION:=		1.4.68
+PKG_VERSION:=		1.4.82
 PKG_RELEASE:=		1
-PKG_HASH:=		e56f37ae52b63e1ada4d76ce78005affb6e56eea2f6bdb0ce17d6d36e9583384
+PKG_HASH:=		abfe74391f9cbd66ab154ea07e64f194dbe7e906ef4ed47eb3b0f3b46246c962
 PKG_DESCR:=		lightweight web server
 PKG_SECTION:=		net/http
+PKG_DEPENDS:=		pcre2
+PKG_BUILDDEP:=		pcre2
 PKG_URL:=		http://www.lighttpd.net/
 PKG_SITES:=		http://download.lighttpd.net/lighttpd/releases-1.4.x/
 
@@ -21,12 +23,10 @@ PKGCB_WITH_OPENSSL:=	openssl
 PKGCS_WITH_OPENSSL:=	libopenssl ca-certificates
 PKGCD_WITHOUT_SSL:=	use no ssl
 
-PKG_SUBPKGS:=		LIGHTTPD LIGHTTPD_MOD_ALIAS LIGHTTPD_MOD_AUTH
-PKG_SUBPKGS+=		LIGHTTPD_MOD_CGI LIGHTTPD_MOD_DIRLIST LIGHTTPD_MOD_EXPIRE LIGHTTPD_MOD_FASTCGI
-PKG_SUBPKGS+=		LIGHTTPD_MOD_PROXY LIGHTTPD_MOD_REDIRECT LIGHTTPD_MOD_REWRITE LIGHTTPD_MOD_SETENV
-PKG_SUBPKGS+=		LIGHTTPD_MOD_VHOST LIGHTTPD_MOD_SSI LIGHTTPD_MOD_STATUS
-PKGSD_LIGHTTPD_MOD_ALIAS:=	alias support
-PKGSN_LIGHTTPD_MOD_ALIAS:=	lighttpd
+PKG_SUBPKGS:=		LIGHTTPD LIGHTTPD_MOD_AUTH
+PKG_SUBPKGS+=		LIGHTTPD_MOD_CGI LIGHTTPD_MOD_DIRLIST
+PKG_SUBPKGS+=		LIGHTTPD_MOD_PROXY
+PKG_SUBPKGS+=		LIGHTTPD_MOD_SSI LIGHTTPD_MOD_STATUS
 PKGSD_LIGHTTPD_MOD_AUTH:=	authentication support
 PKGSN_LIGHTTPD_MOD_AUTH:=	lighttpd
 PKGSD_LIGHTTPD_MOD_CGI:=	CGI support
@@ -35,20 +35,8 @@ PKGSD_LIGHTTPD_MOD_DIRLIST:=	Dirlisting support
 PKGSB_LIGHTTPD_MOD_DIRLIST:=	pcre
 PKGSS_LIGHTTPD_MOD_DIRLIST:=	libpcre
 PKGSN_LIGHTTPD_MOD_DIRLIST:=	lighttpd
-PKGSD_LIGHTTPD_MOD_EXPIRE:=	Expire support
-PKGSN_LIGHTTPD_MOD_EXPIRE:=	lighttpd
-PKGSD_LIGHTTPD_MOD_FASTCGI:=	FastCGI support
-PKGSN_LIGHTTPD_MOD_FASTCGI:=	lighttpd
 PKGSD_LIGHTTPD_MOD_PROXY:=	Proxy support
 PKGSN_LIGHTTPD_MOD_PROXY:=	lighttpd
-PKGSD_LIGHTTPD_MOD_REDIRECT:=	Redirect support
-PKGSN_LIGHTTPD_MOD_REDIRECT:=	lighttpd
-PKGSD_LIGHTTPD_MOD_REWRITE:=	Rewrite support
-PKGSN_LIGHTTPD_MOD_REWRITE:=	lighttpd
-PKGSD_LIGHTTPD_MOD_SETENV:=	Setenv support
-PKGSN_LIGHTTPD_MOD_SETENV:=	lighttpd
-PKGSD_LIGHTTPD_MOD_VHOST:=	Simple Vhost support
-PKGSN_LIGHTTPD_MOD_VHOST:=	lighttpd
 PKGSD_LIGHTTPD_MOD_SSI:=	SSI support
 PKGSN_LIGHTTPD_MOD_SSI:=	lighttpd
 PKGSD_LIGHTTPD_MOD_STATUS:=	Status support
@@ -71,34 +59,21 @@ ${2}-install:
 endef
 
 $(eval $(call PKG_template,LIGHTTPD,lighttpd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIGHTTPD_MOD_ALIAS,lighttpd-mod-alias,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_ALIAS},${PKG_SECTION}))
 $(eval $(call PKG_template,LIGHTTPD_MOD_AUTH,lighttpd-mod-auth,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_AUTH},${PKG_SECTION}))
 $(eval $(call PKG_template,LIGHTTPD_MOD_CGI,lighttpd-mod-cgi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_CGI},${PKG_SECTION}))
 $(eval $(call PKG_template,LIGHTTPD_MOD_DIRLIST,lighttpd-mod-dirlist,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_DIRLIST},${PKG_SECTION}))
-$(eval $(call PKG_template,LIGHTTPD_MOD_EXPIRE,lighttpd-mod-expire,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_EXPIRE},${PKG_SECTION}))
-$(eval $(call PKG_template,LIGHTTPD_MOD_FASTCGI,lighttpd-mod-fastcgi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_FASTCGI},${PKG_SECTION}))
 $(eval $(call PKG_template,LIGHTTPD_MOD_PROXY,lighttpd-mod-proxy,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_PROXY},${PKG_SECTION}))
-$(eval $(call PKG_template,LIGHTTPD_MOD_REDIRECT,lighttpd-mod-redirect,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_REDIRECT},${PKG_SECTION}))
-$(eval $(call PKG_template,LIGHTTPD_MOD_REWRITE,lighttpd-mod-rewrite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_REWRITE},${PKG_SECTION}))
-$(eval $(call PKG_template,LIGHTTPD_MOD_SETENV,lighttpd-mod-setenv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_SETENV},${PKG_SECTION}))
-$(eval $(call PKG_template,LIGHTTPD_MOD_VHOST,lighttpd-mod-vhost,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_VHOST},${PKG_SECTION}))
 $(eval $(call PKG_template,LIGHTTPD_MOD_SSI,lighttpd-mod-ssi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_SSI},${PKG_SECTION}))
 $(eval $(call PKG_template,LIGHTTPD_MOD_STATUS,lighttpd-mod-status,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_STATUS},${PKG_SECTION}))
 
-$(eval $(call PKG_mod_template,LIGHTTPD_MOD_ALIAS,alias))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_AUTH,auth))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_CGI,cgi))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_DIRLIST,dirlisting))
-$(eval $(call PKG_mod_template,LIGHTTPD_MOD_EXPIRE,expire))
-$(eval $(call PKG_mod_template,LIGHTTPD_MOD_FASTCGI,fastcgi))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_PROXY,proxy))
-$(eval $(call PKG_mod_template,LIGHTTPD_MOD_REDIRECT,redirect))
-$(eval $(call PKG_mod_template,LIGHTTPD_MOD_REWRITE,rewrite))
-$(eval $(call PKG_mod_template,LIGHTTPD_MOD_SETENV,setenv))
-$(eval $(call PKG_mod_template,LIGHTTPD_MOD_VHOST,simple_vhost))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_SSI,ssi))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_STATUS,status))
 
+AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ARGS+=	--libdir=/usr/lib/lighttpd \
 			--sysconfdir=/etc/lighttpd \
 			--without-attr \
@@ -113,10 +88,10 @@ CONFIGURE_ARGS+=	--libdir=/usr/lib/lighttpd \
 			--without-valgrind
 
 ifneq ($(ADK_PACKAGE_LIGHTTPD_MOD_SSI)$(ADK_PACKAGE_LIGHTTPD_MOD_DIRLIST)$(ADK_PACKAGE_LIGHTTPD_MOD_REWRITE)$(ADK_PACKAGE_LIGHTTPD_MOD_REDIRECT),)
-CONFIGURE_ARGS+=	--with-pcre
-CONFIGURE_ENV+=		PCRE_LIB="-lpcre"
+CONFIGURE_ARGS+=	--with-pcre2
+CONFIGURE_ENV+=		PCRE_LIB="-lpcre2"
 else
-CONFIGURE_ARGS+=	--without-pcre
+CONFIGURE_ARGS+=	--without-pcre2
 endif
 
 ifneq ($(ADK_PACKAGE_LIGHTTPD_WITH_IPV6),)

package/lighttpd/files/lighttpd.init

@@ -12,7 +12,7 @@ autostart)
 	;;
 start)
 	[ ! -d /srv/www ] && echo "You need to create /srv/www/htdocs" && exit 1
-	mkdir -p /var/log/lighttpd && chown lighttpd.lighttpd /var/log/lighttpd
+	mkdir -p /var/log/lighttpd && chown lighttpd:lighttpd /var/log/lighttpd
 	/usr/sbin/lighttpd $lighttpd_flags
 	;;
 stop)