-
-
Notifications
You must be signed in to change notification settings - Fork 195
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bumped lighttpd version to latest 1.4.50 to fix certain important bug…
…s (see #332) and to get rid of a required bugfix patch.
- Loading branch information
Showing
8 changed files
with
234 additions
and
42 deletions.
There are no files selected for viewing
37 changes: 0 additions & 37 deletions
37
buildroot-external/patches/lighttpd/0001-fix-server-maxworker.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| --- buildroot/package/lighttpd/lighttpd.hash.orig | ||
| +++ buildroot/package/lighttpd/lighttpd.hash | ||
| @@ -1,4 +1,4 @@ | ||
| # From http://www.lighttpd.net/ | ||
| -sha256 0f8ad5aac7529d7b948b9d7e8cd0b4a9e177309d85d6bf6516e28e6e40d74f36 lighttpd-1.4.48.tar.xz | ||
| +sha256 29378312d8887cbc14ffe8a7fadef2d5a08c7e7e1be942795142346ad95629eb lighttpd-1.4.50.tar.xz | ||
| # Locally calculated | ||
| sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING | ||
| --- buildroot/package/lighttpd/lighttpd.mk.orig | ||
| +++ buildroot/package/lighttpd/lighttpd.mk | ||
| @@ -5,7 +5,7 @@ | ||
| ################################################################################ | ||
|
|
||
| LIGHTTPD_VERSION_MAJOR = 1.4 | ||
| -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).48 | ||
| +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).50 | ||
| LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz | ||
| LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x | ||
| LIGHTTPD_LICENSE = BSD-3-Clause |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| # From http://www.lighttpd.net/ | ||
| sha256 29378312d8887cbc14ffe8a7fadef2d5a08c7e7e1be942795142346ad95629eb lighttpd-1.4.50.tar.xz | ||
| # Locally calculated | ||
| sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING |
4 changes: 4 additions & 0 deletions
4
buildroot-patches/buildroot/package/lighttpd/lighttpd.hash.orig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| # From http://www.lighttpd.net/ | ||
| sha256 0f8ad5aac7529d7b948b9d7e8cd0b4a9e177309d85d6bf6516e28e6e40d74f36 lighttpd-1.4.48.tar.xz | ||
| # Locally calculated | ||
| sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING |
101 changes: 101 additions & 0 deletions
101
buildroot-patches/buildroot/package/lighttpd/lighttpd.mk
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| ################################################################################ | ||
| # | ||
| # lighttpd | ||
| # | ||
| ################################################################################ | ||
|
|
||
| LIGHTTPD_VERSION_MAJOR = 1.4 | ||
| LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).50 | ||
| LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz | ||
| LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x | ||
| LIGHTTPD_LICENSE = BSD-3-Clause | ||
| LIGHTTPD_LICENSE_FILES = COPYING | ||
| LIGHTTPD_DEPENDENCIES = host-pkgconf | ||
| LIGHTTPD_CONF_OPTS = \ | ||
| --libdir=/usr/lib/lighttpd \ | ||
| --libexecdir=/usr/lib | ||
|
|
||
| ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) | ||
| LIGHTTPD_DEPENDENCIES += openssl | ||
| LIGHTTPD_CONF_OPTS += --with-openssl | ||
| else | ||
| LIGHTTPD_CONF_OPTS += --without-openssl | ||
| endif | ||
|
|
||
| ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) | ||
| LIGHTTPD_DEPENDENCIES += zlib | ||
| LIGHTTPD_CONF_OPTS += --with-zlib | ||
| else | ||
| LIGHTTPD_CONF_OPTS += --without-zlib | ||
| endif | ||
|
|
||
| ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) | ||
| LIGHTTPD_DEPENDENCIES += bzip2 | ||
| LIGHTTPD_CONF_OPTS += --with-bzip2 | ||
| else | ||
| LIGHTTPD_CONF_OPTS += --without-bzip2 | ||
| endif | ||
|
|
||
| ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) | ||
| LIGHTTPD_CONF_ENV = PCRECONFIG=$(STAGING_DIR)/usr/bin/pcre-config | ||
| LIGHTTPD_DEPENDENCIES += pcre | ||
| LIGHTTPD_CONF_OPTS += --with-pcre | ||
| else | ||
| LIGHTTPD_CONF_OPTS += --without-pcre | ||
| endif | ||
|
|
||
| ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) | ||
| LIGHTTPD_DEPENDENCIES += libxml2 sqlite | ||
| LIGHTTPD_CONF_OPTS += --with-webdav-props | ||
| ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) | ||
| LIGHTTPD_CONF_OPTS += --with-webdav-locks | ||
| LIGHTTPD_DEPENDENCIES += util-linux | ||
| else | ||
| LIGHTTPD_CONF_OPTS += --without-webdav-locks | ||
| endif | ||
| else | ||
| LIGHTTPD_CONF_OPTS += --without-webdav-props --without-webdav-locks | ||
| endif | ||
|
|
||
| ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) | ||
| LIGHTTPD_DEPENDENCIES += lua | ||
| LIGHTTPD_CONF_OPTS += --with-lua | ||
| else | ||
| LIGHTTPD_CONF_OPTS += --without-lua | ||
| endif | ||
|
|
||
| define LIGHTTPD_INSTALL_CONFIG | ||
| $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/lighttpd/conf.d | ||
| $(INSTALL) -d -m 0755 $(TARGET_DIR)/var/www | ||
| $(INSTALL) -D -m 0644 $(@D)/doc/config/lighttpd.conf \ | ||
| $(TARGET_DIR)/etc/lighttpd/lighttpd.conf | ||
| $(INSTALL) -D -m 0644 $(@D)/doc/config/modules.conf \ | ||
| $(TARGET_DIR)/etc/lighttpd/modules.conf | ||
| $(INSTALL) -D -m 0644 $(@D)/doc/config/conf.d/access_log.conf \ | ||
| $(TARGET_DIR)/etc/lighttpd/conf.d/access_log.conf | ||
| $(INSTALL) -D -m 0644 $(@D)/doc/config/conf.d/debug.conf \ | ||
| $(TARGET_DIR)/etc/lighttpd/conf.d/debug.conf | ||
| $(INSTALL) -D -m 0644 $(@D)/doc/config/conf.d/dirlisting.conf \ | ||
| $(TARGET_DIR)/etc/lighttpd/conf.d/dirlisting.conf | ||
| $(INSTALL) -D -m 0644 $(@D)/doc/config/conf.d/mime.conf \ | ||
| $(TARGET_DIR)/etc/lighttpd/conf.d/mime.conf | ||
| endef | ||
|
|
||
| LIGHTTPD_POST_INSTALL_TARGET_HOOKS += LIGHTTPD_INSTALL_CONFIG | ||
|
|
||
| define LIGHTTPD_INSTALL_INIT_SYSV | ||
| $(INSTALL) -D -m 0755 package/lighttpd/S50lighttpd \ | ||
| $(TARGET_DIR)/etc/init.d/S50lighttpd | ||
| endef | ||
|
|
||
| define LIGHTTPD_INSTALL_INIT_SYSTEMD | ||
| $(INSTALL) -D -m 0644 $(@D)/doc/systemd/lighttpd.service \ | ||
| $(TARGET_DIR)/usr/lib/systemd/system/lighttpd.service | ||
|
|
||
| mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants | ||
|
|
||
| ln -fs ../../../../usr/lib/systemd/system/lighttpd.service \ | ||
| $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/lighttpd.service | ||
| endef | ||
|
|
||
| $(eval $(autotools-package)) |
101 changes: 101 additions & 0 deletions
101
buildroot-patches/buildroot/package/lighttpd/lighttpd.mk.orig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| ################################################################################ | ||
| # | ||
| # lighttpd | ||
| # | ||
| ################################################################################ | ||
|
|
||
| LIGHTTPD_VERSION_MAJOR = 1.4 | ||
| LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).48 | ||
| LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz | ||
| LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x | ||
| LIGHTTPD_LICENSE = BSD-3-Clause | ||
| LIGHTTPD_LICENSE_FILES = COPYING | ||
| LIGHTTPD_DEPENDENCIES = host-pkgconf | ||
| LIGHTTPD_CONF_OPTS = \ | ||
| --libdir=/usr/lib/lighttpd \ | ||
| --libexecdir=/usr/lib | ||
|
|
||
| ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) | ||
| LIGHTTPD_DEPENDENCIES += openssl | ||
| LIGHTTPD_CONF_OPTS += --with-openssl | ||
| else | ||
| LIGHTTPD_CONF_OPTS += --without-openssl | ||
| endif | ||
|
|
||
| ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) | ||
| LIGHTTPD_DEPENDENCIES += zlib | ||
| LIGHTTPD_CONF_OPTS += --with-zlib | ||
| else | ||
| LIGHTTPD_CONF_OPTS += --without-zlib | ||
| endif | ||
|
|
||
| ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) | ||
| LIGHTTPD_DEPENDENCIES += bzip2 | ||
| LIGHTTPD_CONF_OPTS += --with-bzip2 | ||
| else | ||
| LIGHTTPD_CONF_OPTS += --without-bzip2 | ||
| endif | ||
|
|
||
| ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) | ||
| LIGHTTPD_CONF_ENV = PCRECONFIG=$(STAGING_DIR)/usr/bin/pcre-config | ||
| LIGHTTPD_DEPENDENCIES += pcre | ||
| LIGHTTPD_CONF_OPTS += --with-pcre | ||
| else | ||
| LIGHTTPD_CONF_OPTS += --without-pcre | ||
| endif | ||
|
|
||
| ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) | ||
| LIGHTTPD_DEPENDENCIES += libxml2 sqlite | ||
| LIGHTTPD_CONF_OPTS += --with-webdav-props | ||
| ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) | ||
| LIGHTTPD_CONF_OPTS += --with-webdav-locks | ||
| LIGHTTPD_DEPENDENCIES += util-linux | ||
| else | ||
| LIGHTTPD_CONF_OPTS += --without-webdav-locks | ||
| endif | ||
| else | ||
| LIGHTTPD_CONF_OPTS += --without-webdav-props --without-webdav-locks | ||
| endif | ||
|
|
||
| ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) | ||
| LIGHTTPD_DEPENDENCIES += lua | ||
| LIGHTTPD_CONF_OPTS += --with-lua | ||
| else | ||
| LIGHTTPD_CONF_OPTS += --without-lua | ||
| endif | ||
|
|
||
| define LIGHTTPD_INSTALL_CONFIG | ||
| $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/lighttpd/conf.d | ||
| $(INSTALL) -d -m 0755 $(TARGET_DIR)/var/www | ||
| $(INSTALL) -D -m 0644 $(@D)/doc/config/lighttpd.conf \ | ||
| $(TARGET_DIR)/etc/lighttpd/lighttpd.conf | ||
| $(INSTALL) -D -m 0644 $(@D)/doc/config/modules.conf \ | ||
| $(TARGET_DIR)/etc/lighttpd/modules.conf | ||
| $(INSTALL) -D -m 0644 $(@D)/doc/config/conf.d/access_log.conf \ | ||
| $(TARGET_DIR)/etc/lighttpd/conf.d/access_log.conf | ||
| $(INSTALL) -D -m 0644 $(@D)/doc/config/conf.d/debug.conf \ | ||
| $(TARGET_DIR)/etc/lighttpd/conf.d/debug.conf | ||
| $(INSTALL) -D -m 0644 $(@D)/doc/config/conf.d/dirlisting.conf \ | ||
| $(TARGET_DIR)/etc/lighttpd/conf.d/dirlisting.conf | ||
| $(INSTALL) -D -m 0644 $(@D)/doc/config/conf.d/mime.conf \ | ||
| $(TARGET_DIR)/etc/lighttpd/conf.d/mime.conf | ||
| endef | ||
|
|
||
| LIGHTTPD_POST_INSTALL_TARGET_HOOKS += LIGHTTPD_INSTALL_CONFIG | ||
|
|
||
| define LIGHTTPD_INSTALL_INIT_SYSV | ||
| $(INSTALL) -D -m 0755 package/lighttpd/S50lighttpd \ | ||
| $(TARGET_DIR)/etc/init.d/S50lighttpd | ||
| endef | ||
|
|
||
| define LIGHTTPD_INSTALL_INIT_SYSTEMD | ||
| $(INSTALL) -D -m 0644 $(@D)/doc/systemd/lighttpd.service \ | ||
| $(TARGET_DIR)/usr/lib/systemd/system/lighttpd.service | ||
|
|
||
| mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants | ||
|
|
||
| ln -fs ../../../../usr/lib/systemd/system/lighttpd.service \ | ||
| $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/lighttpd.service | ||
| endef | ||
|
|
||
| $(eval $(autotools-package)) |