diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/lighttpd/Makefile | 103 | ||||
| -rw-r--r-- | package/lighttpd/files/lighttpd.conf | 8 | ||||
| -rw-r--r-- | package/lighttpd/patches/patch-src_configfile_c | 16 |
3 files changed, 97 insertions, 30 deletions
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index 5c476b2b8..1b99fb2e4 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -9,17 +9,42 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 7907b7167d639b8a8daab97e223249d5 PKG_DESCR:= a lightweight web server PKG_SECTION:= www -PKG_DEPENDS:= libpcre libxml2 libsqlite libopenssl -PKG_BUILDDEP:= pcre libxml2 sqlite openssl +PKG_DEPENDS:= libgcc PKG_URL:= http://www.lighttpd.net/ PKG_SITES:= http://download.lighttpd.net/lighttpd/releases-1.4.x/ PKG_MULTI:= 1 -PKG_SUBPKGS:= LIGHTTPD LIGHTTPD_MOD_ACCESSLOG LIGHTTPD_MOD_ALIAS LIGHTTPD_MOD_AUTH -PKG_SUBPKGS+= LIGHTTPD_MOD_CGI LIGHTTPD_MOD_EVASIVE LIGHTTPD_MOD_EXPIRE LIGHTTPD_MOD_FASTCGI +PKG_FLAVOURS_LIGHTTPD:= WITH_IPV6 WITH_SSL +PKGFD_WITH_IPV6:= enable IPv6 support +PKGFD_WITH_SSL:= enable SSL support +PKGFB_WITH_SSL:= openssl +PKGFS_WITH_SSL:= libopenssl + +PKG_SUBPKGS:= LIGHTTPD LIGHTTPD_MOD_ALIAS LIGHTTPD_MOD_AUTH +PKG_SUBPKGS+= LIGHTTPD_MOD_CGI LIGHTTPD_MOD_DIRLISTING LIGHTTPD_MOD_EVASIVE LIGHTTPD_MOD_EXPIRE LIGHTTPD_MOD_FASTCGI PKG_SUBPKGS+= LIGHTTPD_MOD_PROXY LIGHTTPD_MOD_REDIRECT LIGHTTPD_MOD_REWRITE LIGHTTPD_MOD_SETENV PKG_SUBPKGS+= LIGHTTPD_MOD_SIMPLE_VHOST LIGHTTPD_MOD_SSI LIGHTTPD_MOD_STATUS LIGHTTPD_MOD_USERTRACK PKG_SUBPKGS+= LIGHTTPD_MOD_WEBDAV +PKGSD_LIGHTTPD_MOD_ALIAS:= alias support +PKGSD_LIGHTTPD_MOD_AUTH:= authentication support +PKGSD_LIGHTTPD_MOD_CGI:= CGI support +PKGSD_LIGHTTPD_MOD_DIRLISTING:= Dirlisting support +PKGSB_LIGHTTPD_MOD_DIRLISTING:= pcre +PKGSS_LIGHTTPD_MOD_DIRLISTING:= libpcre +PKGSD_LIGHTTPD_MOD_EVASIVE:= Evasive support +PKGSD_LIGHTTPD_MOD_EXPIRE:= Expire support +PKGSD_LIGHTTPD_MOD_FASTCGI:= FastCGI support +PKGSD_LIGHTTPD_MOD_PROXY:= Proxy support +PKGSD_LIGHTTPD_MOD_REDIRECT:= Redirect support +PKGSD_LIGHTTPD_MOD_REWRITE:= Rewrite support +PKGSD_LIGHTTPD_MOD_SETENV:= Setenv support +PKGSD_LIGHTTPD_MOD_SIMPLE_VHOST:= Simple Vhost support +PKGSD_LIGHTTPD_MOD_SSI:= SSI support +PKGSD_LIGHTTPD_MOD_STATUS:= Status support +PKGSD_LIGHTTPD_MOD_USERTRACK:= Usertracking support +PKGSD_LIGHTTPD_MOD_WEBDAV:= Webdav support +PKGSB_LIGHTTPD_MOD_WEBDAV:= libxml2 sqlite +PKGSS_LIGHTTPD_MOD_WEBDAV:= libxml2 libsqlite include $(TOPDIR)/mk/package.mk @@ -34,25 +59,27 @@ ${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},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_AUTH,lighttpd-mod-auth,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_CGI,lighttpd-mod-cgi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_EVASIVE,lighttpd-mod-evasive,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_EXPIRE,lighttpd-mod-expire,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_FASTCGI,lighttpd-mod-fastcgi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_PROXY,lighttpd-mod-proxy,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_REDIRECT,lighttpd-mod-redirect,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_REWRITE,lighttpd-mod-rewrite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_SETENV,lighttpd-mod-setenv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_SIMPLE_VHOST,lighttpd-mod-simple-vhost,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_SSI,lighttpd-mod-ssi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_STATUS,lighttpd-mod-status,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_USERTRACK,lighttpd-mod-usertrack,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIGHTTPD_MOD_WEBDAV,lighttpd-mod-webdav,$(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_DIRLISTING,lighttpd-mod-dirlisting,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_DIRLISTING},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_EVASIVE,lighttpd-mod-evasive,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_EVASIVE},${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_SIMPLE_VHOST,lighttpd-mod-simple-vhost,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_SIMPLE_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_template,LIGHTTPD_MOD_USERTRACK,lighttpd-mod-usertrack,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_USERTRACK},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_WEBDAV,lighttpd-mod-webdav,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_WEBDAV},${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_DIRLISTING,dirlisting)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_EVASIVE,evasive)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_EXPIRE,expire)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_FASTCGI,fastcgi)) @@ -66,11 +93,11 @@ $(eval $(call PKG_mod_template,LIGHTTPD_MOD_STATUS,status)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_USERTRACK,usertrack)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_WEBDAV,webdav)) -TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/libxml2 -CONFIGURE_ENV+= PCRE_LIB="-lpcre" +#TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/libxml2 CONFIGURE_ARGS+= --libdir=/usr/lib/lighttpd \ --sysconfdir=/etc/lighttpd \ --without-attr \ + --without-zlib \ --without-bzip2 \ --without-fam \ --without-gdbm \ @@ -78,10 +105,34 @@ CONFIGURE_ARGS+= --libdir=/usr/lib/lighttpd \ --without-lua \ --without-memcache \ --without-mysql \ - --without-valgrind \ - --with-pcre \ - --with-webdav-props \ - --with-openssl='${STAGING_TARGET_DIR}/usr' + --without-valgrind + +ifneq ($(ADK_PACKAGE_LIGHTTPD_MOD_WEBDAV),) +CONFIGURE_ARGS+= --with-webdav-props \ + --with-webdav-locks +else +CONFIGURE_ARGS+= --without-webdav-props \ + --without-webdav-locks +endif + +ifneq ($(ADK_PACKAGE_LIGHTTPD_MOD_SSI)$(ADK_PACKAGE_LIGHTTPD_MOD_DIRLISTING)$(ADK_PACKAGE_LIGHTTPD_MOD_REWRITE)$(ADK_PACKAGE_LIGHTTPD_MOD_REDIRECT),) +CONFIGURE_ARGS+= --with-pcre +CONFIGURE_ENV+= PCRE_LIB="-lpcre" +else +CONFIGURE_ARGS+= --without-pcre +endif + +ifneq ($(ADK_PACKAGE_LIGHTTPD_WITH_IPV6),) +CONFIGURE_ARGS+= --enable-ipv6 +else +CONFIGURE_ARGS+= --disable-ipv6 +endif +ifneq ($(ADK_PACKAGE_LIGHTTPD_WITH_SSL),) +CONFIGURE_ARGS+= --with-openssl +else +CONFIGURE_ARGS+= --without-openssl +endif + post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} $(IDIR_LIGHTTPD)/etc/lighttpd/conf.d @@ -90,7 +141,7 @@ post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${CP} ${WRKBUILD}/doc/config/conf.d/*.conf \ $(IDIR_LIGHTTPD)/etc/lighttpd/conf.d ${INSTALL_DIR} $(IDIR_LIGHTTPD)/usr/lib/lighttpd - for m in dirlisting indexfile staticfile accesslog; do \ + for m in indexfile staticfile accesslog; do \ $(CP) $(WRKINST)/usr/lib/lighttpd/mod_$$m.so $(IDIR_LIGHTTPD)/usr/lib/lighttpd/ ; \ done ${INSTALL_DIR} $(IDIR_LIGHTTPD)/usr/sbin diff --git a/package/lighttpd/files/lighttpd.conf b/package/lighttpd/files/lighttpd.conf index 3c114d35f..ba28d2ab7 100644 --- a/package/lighttpd/files/lighttpd.conf +++ b/package/lighttpd/files/lighttpd.conf @@ -311,9 +311,9 @@ index-file.names += ( ## disable range requests for pdf files ## workaround for a bug in the Acrobat Reader plugin. ## -$HTTP["url"] =~ "\.pdf$" { - server.range-requests = "disable" -} +#$HTTP["url"] =~ "\.pdf$" { +# server.range-requests = "disable" +#} ## ## url handling modules (rewrite, redirect) @@ -355,7 +355,7 @@ include "conf.d/mime.conf" ## ## directory listing configuration ## -include "conf.d/dirlisting.conf" +# include "conf.d/dirlisting.conf" ## ## Should lighttpd follow symlinks? diff --git a/package/lighttpd/patches/patch-src_configfile_c b/package/lighttpd/patches/patch-src_configfile_c new file mode 100644 index 000000000..51e88094f --- /dev/null +++ b/package/lighttpd/patches/patch-src_configfile_c @@ -0,0 +1,16 @@ +--- lighttpd-1.4.31.orig/src/configfile.c 2011-12-06 21:01:49.000000000 +0100 ++++ lighttpd-1.4.31/src/configfile.c 2012-10-14 12:48:45.000000000 +0200 +@@ -1159,11 +1159,13 @@ int config_read(server *srv, const char + modules = prepends; + + /* append default modules */ ++ /* disable mod_dirlisting, needs pcre bloat + if (NULL == array_get_element(modules->value, "mod_dirlisting")) { + ds = data_string_init(); + buffer_copy_string_len(ds->value, CONST_STR_LEN("mod_dirlisting")); + array_insert_unique(modules->value, (data_unset *)ds); + } ++ */ + + if (NULL == array_get_element(modules->value, "mod_staticfile")) { + ds = data_string_init(); |