diff options
Diffstat (limited to 'package/lighttpd')
| -rw-r--r-- | package/lighttpd/Config.in | 113 | ||||
| -rw-r--r-- | package/lighttpd/Makefile | 23 | ||||
| -rw-r--r-- | package/lighttpd/files/lighttpd.init | 2 | ||||
| -rw-r--r-- | package/lighttpd/patches/500-configure_cross.patch | 24 |
4 files changed, 13 insertions, 149 deletions
diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in deleted file mode 100644 index b56fa8bff..000000000 --- a/package/lighttpd/Config.in +++ /dev/null @@ -1,113 +0,0 @@ -config ADK_PACKAGE_LIGHTTPD - prompt "lighttpd.......................... Flexible and lightweight web server" - tristate - default n - select ADK_PACKAGE_LIBPCRE - select ADK_COMPILE_SQLITE - select ADK_PACKAGE_LIBXML2 - help - A flexible and lightweight web server. - - http://www.lighttpd.net/ - -config ADK_COMPILE_LIGHTTPD_WITH_OPENSSL - bool "Use OpenSSL for https support" - default y - depends on ADK_PACKAGE_LIGHTTPD - select ADK_PACKAGE_LIBOPENSSL - -config ADK_PACKAGE_LIGHTTPD_MOD_ACCESSLOG - prompt "lighttpd-mod-accesslog........ Access logging module" - tristate - default n - depends on ADK_PACKAGE_LIGHTTPD - -config ADK_PACKAGE_LIGHTTPD_MOD_ALIAS - prompt "lighttpd-mod-alias............ Directory alias module" - tristate - default n - depends on ADK_PACKAGE_LIGHTTPD - -config ADK_PACKAGE_LIGHTTPD_MOD_AUTH - prompt "lighttpd-mod-auth............. Authentication module" - tristate - default n - depends on ADK_PACKAGE_LIGHTTPD - -config ADK_PACKAGE_LIGHTTPD_MOD_CGI - prompt "lighttpd-mod-cgi.............. CGI module" - tristate - default n - depends on ADK_PACKAGE_LIGHTTPD - -config ADK_PACKAGE_LIGHTTPD_MOD_EVASIVE - prompt "lighttpd-mod-evasive.......... Evasive module" - tristate - default n - depends on ADK_PACKAGE_LIGHTTPD - -config ADK_PACKAGE_LIGHTTPD_MOD_EXPIRE - prompt "lighttpd-mod-expire........... Expire module" - tristate - default n - depends on ADK_PACKAGE_LIGHTTPD - -config ADK_PACKAGE_LIGHTTPD_MOD_FASTCGI - prompt "lighttpd-mod-fastcgi.......... FastCGI module" - tristate - default n - depends on ADK_PACKAGE_LIGHTTPD - -config ADK_PACKAGE_LIGHTTPD_MOD_PROXY - prompt "lighttpd-mod-proxy............ Proxy module" - tristate - default n - depends on ADK_PACKAGE_LIGHTTPD - -config ADK_PACKAGE_LIGHTTPD_MOD_REDIRECT - prompt "lighttpd-mod-redirect......... URL redirection module" - tristate - default n - depends on ADK_PACKAGE_LIGHTTPD - -config ADK_PACKAGE_LIGHTTPD_MOD_REWRITE - prompt "lighttpd-mod-rewrite.......... URL rewriting module" - tristate - default n - depends on ADK_PACKAGE_LIGHTTPD - -config ADK_PACKAGE_LIGHTTPD_MOD_SETENV - prompt "lighttpd-mod-setenv........... Environment variable setting module" - tristate - default n - depends on ADK_PACKAGE_LIGHTTPD - -config ADK_PACKAGE_LIGHTTPD_MOD_SIMPLE_VHOST - prompt "lighttpd-mod-simple-vhost..... Simple virtual hosting module" - tristate - default n - depends on ADK_PACKAGE_LIGHTTPD - -config ADK_PACKAGE_LIGHTTPD_MOD_SSI - prompt "lighttpd-mod-ssi.............. SSI module" - tristate - default n - depends on ADK_PACKAGE_LIGHTTPD - -config ADK_PACKAGE_LIGHTTPD_MOD_STATUS - prompt "lighttpd-mod-status........... Server status display module" - tristate - default n - depends on ADK_PACKAGE_LIGHTTPD - -config ADK_PACKAGE_LIGHTTPD_MOD_USERTRACK - prompt "lighttpd-mod-usertrack........ User tracking module" - tristate - default n - depends on ADK_PACKAGE_LIGHTTPD - -config ADK_PACKAGE_LIGHTTPD_MOD_WEBDAV - prompt "lighttpd-mod-webdav........... webdav module" - tristate - default n - depends on ADK_PACKAGE_LIGHTTPD diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index 69d8e8432..0c6954ba2 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -4,20 +4,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:= lighttpd -PKG_VERSION:= 1.4.22 +PKG_VERSION:= 1.4.25 PKG_RELEASE:= 1 -PKG_MD5SUM:= 949c33a81e83f7718a47280bef21b90c +PKG_MD5SUM:= 87e936ec272ddaba8a2fdfecd8c6b704 PKG_DESCR:= a flexible and lightweight web server PKG_SECTION:= net PKG_DEPENDS:= libxml2 libsqlite libpcre -PKG_URL:= http://www.lighttpd.net -PKG_SITES:= http://www.lighttpd.net/download/ - -include $(TOPDIR)/mk/package.mk - +PKG_BUILDDEP+= pcre libxml2 sqlite ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y) PKG_DEPENDS+= libopenssl +PKG_BUILDDEP+= openssl endif +PKG_URL:= http://www.lighttpd.net +PKG_SITES:= http://download.lighttpd.net/lighttpd/releases-1.4.x/ +PKG_MULTI:= 1 + +include $(TOPDIR)/mk/package.mk define PKG_mod_template @@ -65,9 +67,8 @@ $(eval $(call PKG_mod_template,LIGHTTPD_MOD_USERTRACK,usertrack)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_WEBDAV,webdav)) TCPPFLAGS+= -I$(STAGING_DIR)/usr/include/libxml2 -CONFIGURE_STYLE= gnu CONFIGURE_ENV+= PCRE_LIB="-lpcre" -CONFIGURE_ARGS+= --without-openssl \ +CONFIGURE_ARGS+= \ --libdir=/usr/lib/lighttpd \ --sysconfdir=/etc/lighttpd \ --without-attr \ @@ -81,10 +82,10 @@ CONFIGURE_ARGS+= --without-openssl \ --with-pcre \ --without-valgrind \ --with-webdav-props -BUILD_STYLE= auto -INSTALL_STYLE= auto ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y) CONFIGURE_ARGS+= --with-openssl='${STAGING_DIR}/usr' +else +CONFIGURE_ARGS+= --without-openssl endif post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} diff --git a/package/lighttpd/files/lighttpd.init b/package/lighttpd/files/lighttpd.init index cdfd3183d..37b543fd2 100644 --- a/package/lighttpd/files/lighttpd.init +++ b/package/lighttpd/files/lighttpd.init @@ -14,7 +14,7 @@ start) lighttpd $lighttpd_flags ;; stop) - killall lighttpd + pkill lighttpd ;; restart) sh $0 stop diff --git a/package/lighttpd/patches/500-configure_cross.patch b/package/lighttpd/patches/500-configure_cross.patch deleted file mode 100644 index 8f8099823..000000000 --- a/package/lighttpd/patches/500-configure_cross.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN lighttpd-1.4.2-old/configure lighttpd-1.4.2-new/configure ---- lighttpd-1.4.2-old/configure 2005-08-29 14:18:11.000000000 +0200 -+++ lighttpd-1.4.2-new/configure 2005-09-01 09:06:29.000000000 +0200 -@@ -23849,7 +23849,7 @@ - echo "$as_me:$LINENO: result: $WITH_PCRE" >&5 - echo "${ECHO_T}$WITH_PCRE" >&6 - --if test "x$cross_compiling" = xno -a "$WITH_PCRE" != "no"; then -+if test "$WITH_PCRE" != "no"; then - # Extract the first word of "pcre-config", so it can be a program name with args. - set dummy pcre-config; ac_word=$2 - echo "$as_me:$LINENO: checking for $ac_word" >&5 -diff -ruN lighttpd-1.4.2-old/configure.in lighttpd-1.4.2-new/configure.in ---- lighttpd-1.4.2-old/configure.in 2005-08-29 14:06:03.000000000 +0200 -+++ lighttpd-1.4.2-new/configure.in 2005-09-01 09:05:39.000000000 +0200 -@@ -222,7 +222,7 @@ - [WITH_PCRE=$withval],[WITH_PCRE=yes]) - AC_MSG_RESULT([$WITH_PCRE]) - --if test "x$cross_compiling" = xno -a "$WITH_PCRE" != "no"; then -+if test "$WITH_PCRE" != "no"; then - AC_PATH_PROG(PCRECONFIG, pcre-config) - - if test x"$PCRECONFIG" != x; then |