[packages_10.03.2] lighttpd: merge r27726, r28146, r29253

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30213 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/lighttpd/Makefile b/net/lighttpd/Makefile
index 450f269..563e49d 100644 (file)
--- a/net/lighttpd/Makefile
+++ b/net/lighttpd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lighttpd
-PKG_VERSION:=1.4.28
-PKG_RELEASE:=2
+PKG_VERSION:=1.4.29
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://download.lighttpd.net/lighttpd/releases-1.4.x/
-PKG_MD5SUM:=586eb535d31ac299652495b058dd87c4
+PKG_SOURCE_URL:=http://download.lighttpd.net/lighttpd/releases-1.4.x
+PKG_MD5SUM:=e6e67b09986cb504db630b5a86b2dd76
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
@@ -252,14 +252,11 @@ endef
 
 define Package/lighttpd/conffiles
 /etc/lighttpd/lighttpd.conf
-/etc/default/lighttpd
 endef
 
 define Package/lighttpd/install
        $(INSTALL_DIR) $(1)/etc/lighttpd
        $(INSTALL_DATA) ./files/lighttpd.conf $(1)/etc/lighttpd/
-       $(INSTALL_DIR) $(1)/etc/default
-       $(INSTALL_DATA) ./files/lighttpd.default $(1)/etc/default/lighttpd
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/lighttpd.init $(1)/etc/init.d/lighttpd
        $(INSTALL_DIR) $(1)/usr/lib/lighttpd

diff --git a/net/lighttpd/files/lighttpd.default b/net/lighttpd/files/lighttpd.default
deleted file mode 100644 (file)
index 340a1d2..0000000
--- a/net/lighttpd/files/lighttpd.default
+++ /dev/null
@@ -1 +0,0 @@
-OPTIONS="-f /etc/lighttpd/lighttpd.conf"

diff --git a/net/lighttpd/files/lighttpd.init b/net/lighttpd/files/lighttpd.init
index 550d5ad..d73a5da 100644 (file)
--- a/net/lighttpd/files/lighttpd.init
+++ b/net/lighttpd/files/lighttpd.init
@@ -1,21 +1,16 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-START=50
+# Copyright (C) 2006-2011 OpenWrt.org
+
+SERVICE_USE_PID=1
 
-BIN=lighttpd
-DEFAULT=/etc/default/$BIN
-LOG_D=/var/log/$BIN
-RUN_D=/var/run
-PID_F=$RUN_D/$BIN.pid
+START=50
 
 start() {
-       [ -f $DEFAULT ] && . $DEFAULT
-       mkdir -p $LOG_D
-       mkdir -p $RUN_D
-       $BIN $OPTIONS
+       mkdir -m 0755 -p /var/log/lighttpd
+       service_start /usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf
 }
 
 stop() {
-       [ -f $PID_F ] && kill $(cat $PID_F)
+       service_stop /usr/sbin/lighttpd
 }
 

diff --git a/net/lighttpd/patches/001-no_ec.patch b/net/lighttpd/patches/001-no_ec.patch
new file mode 100644 (file)
index 0000000..45cf0ff
--- /dev/null
+++ b/net/lighttpd/patches/001-no_ec.patch
@@ -0,0 +1,14 @@
+--- a/src/network.c
++++ b/src/network.c
+@@ -480,9 +480,11 @@ int network_init(server *srv) {
+       network_backend_t backend;
+ 
+ #if OPENSSL_VERSION_NUMBER >= 0x0090800fL
++#ifndef OPENSSL_NO_ECDH
+       EC_KEY *ecdh;
+       int nid;
+ #endif
++#endif
+ 
+ #ifdef USE_OPENSSL
+       DH *dh;