* [Buildroot] svn commit: trunk/buildroot/package/lighttpd
@ 2007-02-11 18:08 aldot at uclibc.org
0 siblings, 0 replies; 12+ messages in thread
From: aldot at uclibc.org @ 2007-02-11 18:08 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-02-11 10:08:24 -0800 (Sun, 11 Feb 2007)
New Revision: 17855
Log:
- bump version. Closes #1206
Modified:
trunk/buildroot/package/lighttpd/lighttpd.mk
Changeset:
Modified: trunk/buildroot/package/lighttpd/lighttpd.mk
===================================================================
--- trunk/buildroot/package/lighttpd/lighttpd.mk 2007-02-11 16:19:28 UTC (rev 17854)
+++ trunk/buildroot/package/lighttpd/lighttpd.mk 2007-02-11 18:08:24 UTC (rev 17855)
@@ -3,7 +3,7 @@
# lighttpd
#
#############################################################
-LIGHTTPD_VER:=1.4.3
+LIGHTTPD_VER:=1.4.13
LIGHTTPD_SOURCE:=lighttpd-$(LIGHTTPD_VER).tar.gz
LIGHTTPD_SITE:=http://www.lighttpd.net/download
LIGHTTPD_DIR:=$(BUILD_DIR)/lighttpd-$(LIGHTTPD_VER)
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/lighttpd
@ 2008-12-13 10:55 tpetazzoni at uclibc.org
0 siblings, 0 replies; 12+ messages in thread
From: tpetazzoni at uclibc.org @ 2008-12-13 10:55 UTC (permalink / raw)
To: buildroot
Author: tpetazzoni
Date: 2008-12-13 02:55:48 -0800 (Sat, 13 Dec 2008)
New Revision: 24401
Log:
Bump lighttpd to 1.4.20.
Initial patch provided by Gustavo Zacarias <gustavo@zacarias.com.ar>.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Added:
trunk/buildroot/package/lighttpd/lighttpd-1.4.20-configure.patch
Removed:
trunk/buildroot/package/lighttpd/lighttpd-1.4.19-configure.patch
Modified:
trunk/buildroot/package/lighttpd/lighttpd.mk
Changeset:
Deleted: trunk/buildroot/package/lighttpd/lighttpd-1.4.19-configure.patch
===================================================================
--- trunk/buildroot/package/lighttpd/lighttpd-1.4.19-configure.patch 2008-12-13 03:34:47 UTC (rev 24400)
+++ trunk/buildroot/package/lighttpd/lighttpd-1.4.19-configure.patch 2008-12-13 10:55:48 UTC (rev 24401)
@@ -1,11 +0,0 @@
---- lighttpd-1.4.19-org/configure 2008-03-10 21:46:12.000000000 +0000
-+++ lighttpd-1.4.19/configure 2008-03-31 06:58:41.000000000 +0000
-@@ -23971,7 +23971,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
Copied: trunk/buildroot/package/lighttpd/lighttpd-1.4.20-configure.patch (from rev 24400, trunk/buildroot/package/lighttpd/lighttpd-1.4.19-configure.patch)
===================================================================
--- trunk/buildroot/package/lighttpd/lighttpd-1.4.20-configure.patch (rev 0)
+++ trunk/buildroot/package/lighttpd/lighttpd-1.4.20-configure.patch 2008-12-13 10:55:48 UTC (rev 24401)
@@ -0,0 +1,11 @@
+--- lighttpd-1.4.19-org/configure 2008-03-10 21:46:12.000000000 +0000
++++ lighttpd-1.4.19/configure 2008-03-31 06:58:41.000000000 +0000
+@@ -23971,7 +23971,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
Property changes on: trunk/buildroot/package/lighttpd/lighttpd-1.4.20-configure.patch
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/buildroot/package/lighttpd/lighttpd.mk
===================================================================
--- trunk/buildroot/package/lighttpd/lighttpd.mk 2008-12-13 03:34:47 UTC (rev 24400)
+++ trunk/buildroot/package/lighttpd/lighttpd.mk 2008-12-13 10:55:48 UTC (rev 24401)
@@ -3,7 +3,7 @@
# lighttpd
#
#############################################################
-LIGHTTPD_VERSION:=1.4.19
+LIGHTTPD_VERSION:=1.4.20
LIGHTTPD_SOURCE:=lighttpd-$(LIGHTTPD_VERSION).tar.bz2
LIGHTTPD_SITE:=http://www.lighttpd.net/download
LIGHTTPD_INSTALL_STAGING = NO
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/lighttpd
@ 2008-09-17 21:36 jacmet at uclibc.org
0 siblings, 0 replies; 12+ messages in thread
From: jacmet at uclibc.org @ 2008-09-17 21:36 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-09-17 14:36:21 -0700 (Wed, 17 Sep 2008)
New Revision: 23418
Log:
lighttpd: don't enable openssl support by default
Modified:
trunk/buildroot/package/lighttpd/Config.in
Changeset:
Modified: trunk/buildroot/package/lighttpd/Config.in
===================================================================
--- trunk/buildroot/package/lighttpd/Config.in 2008-09-17 21:35:51 UTC (rev 23417)
+++ trunk/buildroot/package/lighttpd/Config.in 2008-09-17 21:36:21 UTC (rev 23418)
@@ -8,7 +8,7 @@
Auth, Output-Compression, URL-Rewriting and many more) make
lighttpd the perfect webserver-software for every server that
is suffering load problems.
-
+
http://www.lighttpd.net/
if BR2_PACKAGE_LIGHTTPD
@@ -16,7 +16,6 @@
config BR2_PACKAGE_LIGHTTPD_OPENSSL
bool "lighttpd openssl support"
- default y
depends on BR2_PACKAGE_LIGHTTPD
select BR2_PACKAGE_OPENSSL
help
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/lighttpd
@ 2008-09-17 21:35 jacmet at uclibc.org
0 siblings, 0 replies; 12+ messages in thread
From: jacmet at uclibc.org @ 2008-09-17 21:35 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-09-17 14:35:51 -0700 (Wed, 17 Sep 2008)
New Revision: 23417
Log:
lighttpd: fix compilation without largefile support
lighttpd uses --disable-lfs instead of --disable-largefile.
Remove redundant configure args while we're at it.
Modified:
trunk/buildroot/package/lighttpd/lighttpd.mk
Changeset:
Modified: trunk/buildroot/package/lighttpd/lighttpd.mk
===================================================================
--- trunk/buildroot/package/lighttpd/lighttpd.mk 2008-09-17 21:33:19 UTC (rev 23416)
+++ trunk/buildroot/package/lighttpd/lighttpd.mk 2008-09-17 21:35:51 UTC (rev 23417)
@@ -10,18 +10,18 @@
LIGHTTPD_INSTALL_TARGET = YES
LIGHTTPD_DEPENDENCIES = uclibc
LIGHTTPD_CONF_ENV =
+
+ifneq ($(BR2_LARGEFILE),y)
+LIGHTTPD_LFS:=$(DISABLE_LARGEFILE) --disable-lfs
+endif
+
LIGHTTPD_CONF_OPT = \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
--libdir=/usr/lib/lighttpd \
--libexecdir=/usr/lib \
- --sysconfdir=/etc \
--localstatedir=/var \
--program-prefix="" \
$(DISABLE_IPV6) \
- $(DISABLE_LARGEFILE)
+ $(LIGHTTPD_LFS)
ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD_OPENSSL)),y)
LIGHTTPD_DEPENDENCIES += openssl
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/lighttpd
@ 2008-04-24 13:18 ninevoltz at uclibc.org
0 siblings, 0 replies; 12+ messages in thread
From: ninevoltz at uclibc.org @ 2008-04-24 13:18 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-04-24 06:18:50 -0700 (Thu, 24 Apr 2008)
New Revision: 21835
Log:
update lighttpd
Added:
trunk/buildroot/package/lighttpd/lighttpd-1.4.19-configure.patch
Removed:
trunk/buildroot/package/lighttpd/rc.lighttpd
Modified:
trunk/buildroot/package/lighttpd/Config.in
trunk/buildroot/package/lighttpd/lighttpd.mk
Changeset:
Modified: trunk/buildroot/package/lighttpd/Config.in
===================================================================
--- trunk/buildroot/package/lighttpd/Config.in 2008-04-24 13:18:03 UTC (rev 21834)
+++ trunk/buildroot/package/lighttpd/Config.in 2008-04-24 13:18:50 UTC (rev 21835)
@@ -12,10 +12,24 @@
http://www.lighttpd.net/
+if BR2_PACKAGE_LIGHTTPD
+menu "lighttpd packages"
+
config BR2_PACKAGE_LIGHTTPD_OPENSSL
- bool "lighttpd-openssl"
+ bool "openssl"
default y
depends on BR2_PACKAGE_LIGHTTPD
select BR2_PACKAGE_OPENSSL
help
Enable OpenSSL support for lighttpd.
+
+config BR2_PACKAGE_LIGHTTPD_PCRE
+ bool "pcre"
+ default n
+ depends on BR2_PACKAGE_LIGHTTPD
+ select BR2_PACKAGE_PCRE
+ help
+ Enable PCRE support. Needed to support mod_rewrite
+
+endmenu
+endif
Added: trunk/buildroot/package/lighttpd/lighttpd-1.4.19-configure.patch
===================================================================
--- trunk/buildroot/package/lighttpd/lighttpd-1.4.19-configure.patch (rev 0)
+++ trunk/buildroot/package/lighttpd/lighttpd-1.4.19-configure.patch 2008-04-24 13:18:50 UTC (rev 21835)
@@ -0,0 +1,11 @@
+--- lighttpd-1.4.19-org/configure 2008-03-10 21:46:12.000000000 +0000
++++ lighttpd-1.4.19/configure 2008-03-31 06:58:41.000000000 +0000
+@@ -23971,7 +23971,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
Modified: trunk/buildroot/package/lighttpd/lighttpd.mk
===================================================================
--- trunk/buildroot/package/lighttpd/lighttpd.mk 2008-04-24 13:18:03 UTC (rev 21834)
+++ trunk/buildroot/package/lighttpd/lighttpd.mk 2008-04-24 13:18:50 UTC (rev 21835)
@@ -3,106 +3,39 @@
# lighttpd
#
#############################################################
-LIGHTTPD_VERSION:=1.4.18
-LIGHTTPD_SOURCE:=lighttpd_$(LIGHTTPD_VERSION).orig.tar.gz
-LIGHTTPD_PATCH:=lighttpd_$(LIGHTTPD_VERSION)-1.diff.gz
-LIGHTTPD_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/l/lighttpd
-LIGHTTPD_DIR:=$(BUILD_DIR)/lighttpd-$(LIGHTTPD_VERSION)
-LIGHTTPD_CAT:=$(ZCAT)
-LIGHTTPD_BINARY:=src/lighttpd
-LIGHTTPD_TARGET_BINARY:=usr/sbin/lighttpd
+LIGHTTPD_VERSION:=1.4.19
+LIGHTTPD_SOURCE:=lighttpd-$(LIGHTTPD_VERSION).tar.bz2
+LIGHTTPD_SITE:=http://www.lighttpd.net/download
+LIGHTTPD_INSTALL_STAGING = NO
+LIGHTTPD_INSTALL_TARGET = YES
+LIGHTTPD_DEPENDENCIES = uclibc
+LIGHTTPD_CONF_ENV =
+LIGHTTPD_CONF_OPT = \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=/usr \
+ --libdir=/usr/lib/lighttpd \
+ --libexecdir=/usr/lib \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --program-prefix="" \
+ $(DISABLE_IPV6) \
+ $(DISABLE_LARGEFILE)
-$(DL_DIR)/$(LIGHTTPD_SOURCE):
- $(WGET) -P $(DL_DIR) $(LIGHTTPD_SITE)/$(LIGHTTPD_SOURCE)
-
-ifneq ($(LIGHTTPD_PATCH),)
-LIGHTTPD_PATCH_FILE:=$(DL_DIR)/$(LIGHTTPD_PATCH)
-$(LIGHTTPD_PATCH_FILE):
- $(WGET) -P $(DL_DIR) $(LIGHTTPD_SITE)/$(LIGHTTPD_PATCH)
-endif
-
-lighttpd-source: $(DL_DIR)/$(LIGHTTPD_SOURCE) $(LIGHTTPD_PATCH_FILE)
-
-$(LIGHTTPD_DIR)/.unpacked: $(DL_DIR)/$(LIGHTTPD_SOURCE)
- $(LIGHTTPD_CAT) $(DL_DIR)/$(LIGHTTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(LIGHTTPD_DIR) package/lighttpd/ lighttpd\*.patch
-ifneq ($(LIGHTTPD_PATCH),)
- (cd $(LIGHTTPD_DIR)&&$(LIGHTTPD_CAT) $(LIGHTTPD_PATCH_FILE)|patch -p1)
-endif
- if [ -d $(LIGHTTPD_DIR)/debian/patches ]; then \
- toolchain/patch-kernel.sh $(LIGHTTPD_DIR) $(LIGHTTPD_DIR)/debian/patches \*.dpatch; \
- fi
- $(CONFIG_UPDATE) $(@D)
- $(SED) 's/-lfs/-largefile/g;s/_lfs/_largefile/g' $(LIGHTTPD_DIR)/configure
- touch $@
-
ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD_OPENSSL)),y)
-LIGHTTPD_OPENSSL:=--with-openssl
+LIGHTTPD_DEPENDENCIES += openssl
+LIGHTTPD_CONF_OPT += --with-openssl
else
-LIGHTTPD_OPENSSL:=--without-openssl
+LIGHTTPD_CONF_OPT += --without-openssl
endif
-$(LIGHTTPD_DIR)/.configured: $(LIGHTTPD_DIR)/.unpacked
- (cd $(LIGHTTPD_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --libdir=/usr/lib/lighttpd \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --localstatedir=/var \
- $(LIGHTTPD_OPENSSL) \
- --without-pcre \
- --program-prefix="" \
- $(DISABLE_IPV6) \
- $(DISABLE_LARGEFILE) \
- )
- touch $@
-
-$(LIGHTTPD_DIR)/$(LIGHTTPD_BINARY): $(LIGHTTPD_DIR)/.configured
- $(MAKE) -C $(LIGHTTPD_DIR)
-
-$(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY): $(LIGHTTPD_DIR)/$(LIGHTTPD_BINARY)
- $(MAKE) DESTDIR=$(TARGET_DIR) -C $(LIGHTTPD_DIR) install
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/man
-endif
- @rm -rf $(TARGET_DIR)/usr/lib/lighttpd/*.la
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/lighttpd/*.so
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY)
- @if [ ! -f $(TARGET_DIR)/etc/lighttpd/lighttpd.conf ]; then \
- $(INSTALL) -m 0644 -D $(LIGHTTPD_DIR)/doc/lighttpd.conf \
- $(TARGET_DIR)/etc/lighttpd/lighttpd.conf; \
- fi
- $(INSTALL) -m 0755 -D package/lighttpd/rc.lighttpd \
- $(TARGET_DIR)/etc/init.d/S99lighttpd
-
-ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD_OPENSSL)),y)
-lighttpd: uclibc openssl $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY)
+ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD_PCRE)),y)
+LIGHTTPD_CONF_ENV += PCRE_LIB="-lpcre"
+LIGHTTPD_DEPENDENCIES += pcre
+LIGHTTPD_CONF_OPT += --with-pcre
else
-lighttpd: uclibc $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY)
+LIGHTTPD_CONF_OPT += --without-pcre
endif
-lighttpd-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(LIGHTTPD_DIR) uninstall
- @rm -rf $(TARGET_DIR)/usr/lib/lighttpd
- @rm -f $(TARGET_DIR)/etc/init.d/S99lighttpd
- @rm -f $(TARGET_DIR)/etc/lighttpd/lighttpd.conf
- @rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/etc/lighttpd
- -$(MAKE) -C $(LIGHTTPD_DIR) clean
-
-lighttpd-dirclean:
- rm -rf $(LIGHTTPD_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD)),y)
-TARGETS+=lighttpd
-endif
+$(eval $(call AUTOTARGETS,package,lighttpd))
Deleted: trunk/buildroot/package/lighttpd/rc.lighttpd
===================================================================
--- trunk/buildroot/package/lighttpd/rc.lighttpd 2008-04-24 13:18:03 UTC (rev 21834)
+++ trunk/buildroot/package/lighttpd/rc.lighttpd 2008-04-24 13:18:50 UTC (rev 21835)
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# Starts lighttpd
-#
-
-umask 077
-
-start() {
- echo -n "Starting lighttpd: "
- start-stop-daemon -S -q -m -p /var/run/lighttpd.pid -b -x /usr/sbin/lighttpd -- -f /etc/lighttpd/lighttpd.conf -D
- echo "OK"
-}
-stop() {
- echo -n "Stopping lighttpd: "
- start-stop-daemon -K -q -p /var/run/lighttpd.pid
- echo "OK"
-}
-restart() {
- stop
- start
-}
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart|reload)
- restart
- ;;
- *)
- echo "Usage: $0 {start|stop|restart}"
- exit 1
-esac
-
-exit $?
-
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/lighttpd
@ 2007-11-30 12:35 ulf at uclibc.org
0 siblings, 0 replies; 12+ messages in thread
From: ulf at uclibc.org @ 2007-11-30 12:35 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-11-30 04:35:55 -0800 (Fri, 30 Nov 2007)
New Revision: 20599
Log:
Fix spelling error in lighttpd
Modified:
trunk/buildroot/package/lighttpd/Config.in
Changeset:
Modified: trunk/buildroot/package/lighttpd/Config.in
===================================================================
--- trunk/buildroot/package/lighttpd/Config.in 2007-11-30 12:34:54 UTC (rev 20598)
+++ trunk/buildroot/package/lighttpd/Config.in 2007-11-30 12:35:55 UTC (rev 20599)
@@ -18,4 +18,4 @@
depends on BR2_PACKAGE_LIGHTTPD
select BR2_PACKAGE_OPENSSL
help
- Enable OpenSSL support for libghttpd.
+ Enable OpenSSL support for lighttpd.
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/lighttpd
@ 2007-09-19 14:02 aldot at uclibc.org
0 siblings, 0 replies; 12+ messages in thread
From: aldot at uclibc.org @ 2007-09-19 14:02 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-09-19 07:02:53 -0700 (Wed, 19 Sep 2007)
New Revision: 19891
Log:
- bump version. Closes #1502
Modified:
trunk/buildroot/package/lighttpd/lighttpd.mk
Changeset:
Modified: trunk/buildroot/package/lighttpd/lighttpd.mk
===================================================================
--- trunk/buildroot/package/lighttpd/lighttpd.mk 2007-09-19 12:28:48 UTC (rev 19890)
+++ trunk/buildroot/package/lighttpd/lighttpd.mk 2007-09-19 14:02:53 UTC (rev 19891)
@@ -3,7 +3,7 @@
# lighttpd
#
#############################################################
-LIGHTTPD_VERSION:=1.4.16
+LIGHTTPD_VERSION:=1.4.18
LIGHTTPD_SOURCE:=lighttpd_$(LIGHTTPD_VERSION).orig.tar.gz
LIGHTTPD_PATCH:=lighttpd_$(LIGHTTPD_VERSION)-1.diff.gz
LIGHTTPD_SITE:=http://ftp.debian.org/debian/pool/main/l/lighttpd
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/lighttpd
@ 2007-08-11 23:35 ulf at uclibc.org
0 siblings, 0 replies; 12+ messages in thread
From: ulf at uclibc.org @ 2007-08-11 23:35 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-11 16:35:07 -0700 (Sat, 11 Aug 2007)
New Revision: 19450
Log:
Use a valid script file for lighttpd in target
Added:
trunk/buildroot/package/lighttpd/rc.lighttpd
Modified:
trunk/buildroot/package/lighttpd/lighttpd.mk
Changeset:
Modified: trunk/buildroot/package/lighttpd/lighttpd.mk
===================================================================
--- trunk/buildroot/package/lighttpd/lighttpd.mk 2007-08-11 23:33:22 UTC (rev 19449)
+++ trunk/buildroot/package/lighttpd/lighttpd.mk 2007-08-11 23:35:07 UTC (rev 19450)
@@ -3,7 +3,7 @@
# lighttpd
#
#############################################################
-LIGHTTPD_VERSION:=1.4.15
+LIGHTTPD_VERSION:=1.4.16
LIGHTTPD_SOURCE:=lighttpd_$(LIGHTTPD_VERSION).orig.tar.gz
LIGHTTPD_PATCH:=lighttpd_$(LIGHTTPD_VERSION)-1.diff.gz
LIGHTTPD_SITE:=http://ftp.debian.org/debian/pool/main/l/lighttpd
@@ -73,7 +73,7 @@
@if [ ! -f $(TARGET_DIR)/etc/lighttpd/lighttpd.conf ] ; then \
$(INSTALL) -m 0644 -D $(LIGHTTPD_DIR)/doc/lighttpd.conf $(TARGET_DIR)/etc/lighttpd/lighttpd.conf; \
fi;
- $(INSTALL) -m 0755 -D $(LIGHTTPD_DIR)/openwrt/S51lighttpd $(TARGET_DIR)/etc/init.d/S99lighttpd
+ $(INSTALL) -m 0755 -D package/lighttpd/rc.lighttpd $(TARGET_DIR)/etc/init.d/S99lighttpd
ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD_OPENSSL)),y)
lighttpd: uclibc openssl $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY)
Added: trunk/buildroot/package/lighttpd/rc.lighttpd
===================================================================
--- trunk/buildroot/package/lighttpd/rc.lighttpd (rev 0)
+++ trunk/buildroot/package/lighttpd/rc.lighttpd 2007-08-11 23:35:07 UTC (rev 19450)
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# Starts lighttpd
+#
+
+umask 077
+
+start() {
+ echo -n "Starting lighttpd: "
+ start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/lighttpd.pid -b --exec /usr/sbin/lighttpd -- -f /etc/lighttpd/lighttpd.conf -D
+ echo "OK"
+}
+stop() {
+ echo -n "Stopping lighttpd: "
+ start-stop-daemon --stop --quiet --pidfile /var/run/lighttpd.pid
+ echo "OK"
+}
+restart() {
+ stop
+ start
+}
+
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart|reload)
+ restart
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart}"
+ exit 1
+esac
+
+exit $?
+
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/lighttpd
@ 2007-07-17 0:27 sjhill at uclibc.org
0 siblings, 0 replies; 12+ messages in thread
From: sjhill at uclibc.org @ 2007-07-17 0:27 UTC (permalink / raw)
To: buildroot
Author: sjhill
Date: 2007-07-16 17:27:10 -0700 (Mon, 16 Jul 2007)
New Revision: 19125
Log:
Make OpenSSL support to be configurable and get the install target footprint to be as small as possible. Also clean up the clean target. "Clean up, clean up, everybody lend a hand! Clean up, clean up, you can do it, yes you can."
Modified:
trunk/buildroot/package/lighttpd/Config.in
trunk/buildroot/package/lighttpd/lighttpd.mk
Changeset:
Modified: trunk/buildroot/package/lighttpd/Config.in
===================================================================
--- trunk/buildroot/package/lighttpd/Config.in 2007-07-17 00:25:31 UTC (rev 19124)
+++ trunk/buildroot/package/lighttpd/Config.in 2007-07-17 00:27:10 UTC (rev 19125)
@@ -1,13 +1,21 @@
config BR2_PACKAGE_LIGHTTPD
bool "lighttpd"
default n
- select BR2_PACKAGE_OPENSSL
help
lighttpd a secure, fast, compliant and very flexible web-server
- which has been optimized for high-performance environments. It has a very
- low memory footprint compared to other webservers and takes care of cpu-load.
- Its advanced feature-set (FastCGI, CGI, Auth, Output-Compression,
- URL-Rewriting and many more) make lighttpd the perfect webserver-software
- for every server that is suffering load problems.
+ which has been optimized for high-performance environments. It
+ has a very low memory footprint compared to other webservers and
+ takes care of cpu-load. Its advanced feature-set (FastCGI, CGI,
+ Auth, Output-Compression, URL-Rewriting and many more) make
+ lighttpd the perfect webserver-software for every server that
+ is suffering load problems.
http://www.lighttpd.net/
+
+config BR2_PACKAGE_LIGHTTPD_OPENSSL
+ bool "lighttpd-openssl"
+ default y
+ depends on BR2_PACKAGE_LIGHTTPD
+ select BR2_PACKAGE_OPENSSL
+ help
+ Enable OpenSSL support for libghttpd.
Modified: trunk/buildroot/package/lighttpd/lighttpd.mk
===================================================================
--- trunk/buildroot/package/lighttpd/lighttpd.mk 2007-07-17 00:25:31 UTC (rev 19124)
+++ trunk/buildroot/package/lighttpd/lighttpd.mk 2007-07-17 00:27:10 UTC (rev 19125)
@@ -13,11 +13,11 @@
LIGHTTPD_TARGET_BINARY:=usr/sbin/lighttpd
$(DL_DIR)/$(LIGHTTPD_SOURCE):
- $(WGET) -P $(DL_DIR) $(LIGHTTPD_SITE)/$(LIGHTTPD_SOURCE)
+ $(WGET) -P $(DL_DIR) $(LIGHTTPD_SITE)/$(LIGHTTPD_SOURCE)
ifneq ($(LIGHTTPD_PATCH),)
LIGHTTPD_PATCH_FILE:=$(DL_DIR)/$(LIGHTTPD_PATCH)
$(LIGHTTPD_PATCH_FILE):
- $(WGET) -P $(DL_DIR) $(LIGHTTPD_SITE)/$(LIGHTTPD_PATCH)
+ $(WGET) -P $(DL_DIR) $(LIGHTTPD_SITE)/$(LIGHTTPD_PATCH)
endif
lighttpd-source: $(DL_DIR)/$(LIGHTTPD_SOURCE) $(LIGHTTPD_PATCH_FILE)
@@ -34,6 +34,12 @@
$(SED) 's/-lfs/-largefile/g;s/_lfs/_largefile/g' $(LIGHTTPD_DIR)/configure
touch $@
+ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD_OPENSSL)),y)
+LIGHTTPD_OPENSSL:=--with-openssl
+else
+LIGHTTPD_OPENSSL:=--without-openssl
+endif
+
$(LIGHTTPD_DIR)/.configured: $(LIGHTTPD_DIR)/.unpacked
(cd $(LIGHTTPD_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
@@ -43,11 +49,11 @@
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
- --libdir=/lib \
+ --libdir=/usr/lib/lighttpd \
--libexecdir=/usr/lib \
--sysconfdir=/etc \
--localstatedir=/var \
- --with-openssl \
+ $(LIGHTTPD_OPENSSL) \
--without-pcre \
--program-prefix="" \
$(DISABLE_IPV6) \
@@ -60,12 +66,27 @@
$(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY): $(LIGHTTPD_DIR)/$(LIGHTTPD_BINARY)
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(LIGHTTPD_DIR) install
+ @rm -rf $(TARGET_DIR)/usr/share/man $(TARGET_DIR)/usr/man
+ @rm -rf $(TARGET_DIR)/usr/lib/lighttpd/*.la
+ $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/lighttpd/*.so
+ $(STRIP) --strip-unneeded $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY)
+ @if [ ! -f $(TARGET_DIR)/etc/lighttpd/lighttpd.conf ] ; then \
+ $(INSTALL) -m 0644 -D $(LIGHTTPD_DIR)/doc/lighttpd.conf $(TARGET_DIR)/etc/lighttpd/lighttpd.conf; \
+ fi;
$(INSTALL) -m 0755 -D $(LIGHTTPD_DIR)/openwrt/S51lighttpd $(TARGET_DIR)/etc/init.d/S99lighttpd
+ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD_OPENSSL)),y)
lighttpd: uclibc openssl $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY)
+else
+lighttpd: uclibc $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY)
+endif
lighttpd-clean:
$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(LIGHTTPD_DIR) uninstall
+ @rm -rf $(TARGET_DIR)/usr/lib/lighttpd
+ @rm -f $(TARGET_DIR)/etc/init.d/S99lighttpd
+ @rm -f $(TARGET_DIR)/etc/lighttpd/lighttpd.conf
+ @rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/etc/lighttpd
-$(MAKE) -C $(LIGHTTPD_DIR) clean
lighttpd-dirclean:
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/lighttpd
@ 2007-07-15 23:35 ulf at uclibc.org
0 siblings, 0 replies; 12+ messages in thread
From: ulf at uclibc.org @ 2007-07-15 23:35 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-15 16:35:31 -0700 (Sun, 15 Jul 2007)
New Revision: 19104
Log:
Use correct script to init lighttpd
Modified:
trunk/buildroot/package/lighttpd/lighttpd.mk
Changeset:
Modified: trunk/buildroot/package/lighttpd/lighttpd.mk
===================================================================
--- trunk/buildroot/package/lighttpd/lighttpd.mk 2007-07-15 22:01:33 UTC (rev 19103)
+++ trunk/buildroot/package/lighttpd/lighttpd.mk 2007-07-15 23:35:31 UTC (rev 19104)
@@ -60,7 +60,7 @@
$(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY): $(LIGHTTPD_DIR)/$(LIGHTTPD_BINARY)
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(LIGHTTPD_DIR) install
- $(INSTALL) -m 0755 -D $(LIGHTTPD_DIR)/debian/init.d $(TARGET_DIR)/etc/init.d/S99lighttpd
+ $(INSTALL) -m 0755 -D $(LIGHTTPD_DIR)/openwrt/S51lighttpd $(TARGET_DIR)/etc/init.d/S99lighttpd
lighttpd: uclibc openssl $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY)
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/lighttpd
@ 2007-07-08 18:16 aldot at uclibc.org
0 siblings, 0 replies; 12+ messages in thread
From: aldot at uclibc.org @ 2007-07-08 18:16 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-07-08 11:16:12 -0700 (Sun, 08 Jul 2007)
New Revision: 19042
Log:
- remove cruft
Modified:
trunk/buildroot/package/lighttpd/lighttpd.mk
Changeset:
Modified: trunk/buildroot/package/lighttpd/lighttpd.mk
===================================================================
--- trunk/buildroot/package/lighttpd/lighttpd.mk 2007-07-08 18:14:51 UTC (rev 19041)
+++ trunk/buildroot/package/lighttpd/lighttpd.mk 2007-07-08 18:16:12 UTC (rev 19042)
@@ -12,10 +12,6 @@
LIGHTTPD_BINARY:=src/lighttpd
LIGHTTPD_TARGET_BINARY:=usr/sbin/lighttpd
-ifneq ($(BR2_LARGEFILE),y)
-LIGHTTPD_LFS:=--disable-lfs
-endif
-
$(DL_DIR)/$(LIGHTTPD_SOURCE):
$(WGET) -P $(DL_DIR) $(LIGHTTPD_SITE)/$(LIGHTTPD_SOURCE)
ifneq ($(LIGHTTPD_PATCH),)
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/lighttpd
@ 2007-07-08 18:14 aldot at uclibc.org
0 siblings, 0 replies; 12+ messages in thread
From: aldot at uclibc.org @ 2007-07-08 18:14 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-07-08 11:14:51 -0700 (Sun, 08 Jul 2007)
New Revision: 19041
Log:
- bump version and make it compile
Modified:
trunk/buildroot/package/lighttpd/lighttpd.mk
Changeset:
Modified: trunk/buildroot/package/lighttpd/lighttpd.mk
===================================================================
--- trunk/buildroot/package/lighttpd/lighttpd.mk 2007-07-08 16:28:54 UTC (rev 19040)
+++ trunk/buildroot/package/lighttpd/lighttpd.mk 2007-07-08 18:14:51 UTC (rev 19041)
@@ -3,28 +3,40 @@
# lighttpd
#
#############################################################
-LIGHTTPD_VER:=1.4.13
-LIGHTTPD_SOURCE:=lighttpd-$(LIGHTTPD_VER).tar.gz
-LIGHTTPD_SITE:=http://www.lighttpd.net/download
-LIGHTTPD_DIR:=$(BUILD_DIR)/lighttpd-$(LIGHTTPD_VER)
+LIGHTTPD_VERSION:=1.4.15
+LIGHTTPD_SOURCE:=lighttpd_$(LIGHTTPD_VERSION).orig.tar.gz
+LIGHTTPD_PATCH:=lighttpd_$(LIGHTTPD_VERSION)-1.diff.gz
+LIGHTTPD_SITE:=http://ftp.debian.org/debian/pool/main/l/lighttpd
+LIGHTTPD_DIR:=$(BUILD_DIR)/lighttpd-$(LIGHTTPD_VERSION)
LIGHTTPD_CAT:=$(ZCAT)
LIGHTTPD_BINARY:=src/lighttpd
LIGHTTPD_TARGET_BINARY:=usr/sbin/lighttpd
+ifneq ($(BR2_LARGEFILE),y)
+LIGHTTPD_LFS:=--disable-lfs
+endif
+
$(DL_DIR)/$(LIGHTTPD_SOURCE):
$(WGET) -P $(DL_DIR) $(LIGHTTPD_SITE)/$(LIGHTTPD_SOURCE)
+ifneq ($(LIGHTTPD_PATCH),)
+LIGHTTPD_PATCH_FILE:=$(DL_DIR)/$(LIGHTTPD_PATCH)
+$(LIGHTTPD_PATCH_FILE):
+ $(WGET) -P $(DL_DIR) $(LIGHTTPD_SITE)/$(LIGHTTPD_PATCH)
+endif
+lighttpd-source: $(DL_DIR)/$(LIGHTTPD_SOURCE) $(LIGHTTPD_PATCH_FILE)
-lighttpd-source: $(DL_DIR)/$(LIGHTTPD_SOURCE)
-
-#############################################################
-#
-# build lighttpd for use on the target system
-#
-#############################################################
$(LIGHTTPD_DIR)/.unpacked: $(DL_DIR)/$(LIGHTTPD_SOURCE)
$(LIGHTTPD_CAT) $(DL_DIR)/$(LIGHTTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LIGHTTPD_DIR) package/lighttpd/ lighttpd\*.patch
- touch $(LIGHTTPD_DIR)/.unpacked
+ifneq ($(LIGHTTPD_PATCH),)
+ (cd $(LIGHTTPD_DIR)&&$(LIGHTTPD_CAT) $(LIGHTTPD_PATCH_FILE)|patch -p1)
+endif
+ if [ -d $(LIGHTTPD_DIR)/debian/patches ]; then \
+ toolchain/patch-kernel.sh $(LIGHTTPD_DIR) $(LIGHTTPD_DIR)/debian/patches \*.dpatch ; \
+ fi
+ $(CONFIG_UPDATE) $(@D)
+ $(SED) 's/-lfs/-largefile/g;s/_lfs/_largefile/g' $(LIGHTTPD_DIR)/configure
+ touch $@
$(LIGHTTPD_DIR)/.configured: $(LIGHTTPD_DIR)/.unpacked
(cd $(LIGHTTPD_DIR); rm -rf config.cache; \
@@ -42,8 +54,10 @@
--with-openssl \
--without-pcre \
--program-prefix="" \
+ $(DISABLE_IPV6) \
+ $(DISABLE_LARGEFILE) \
);
- touch $(LIGHTTPD_DIR)/.configured
+ touch $@
$(LIGHTTPD_DIR)/$(LIGHTTPD_BINARY): $(LIGHTTPD_DIR)/.configured
$(MAKE) -C $(LIGHTTPD_DIR)
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2008-12-13 10:55 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-11 18:08 [Buildroot] svn commit: trunk/buildroot/package/lighttpd aldot at uclibc.org
2007-07-08 18:14 aldot at uclibc.org
2007-07-08 18:16 aldot at uclibc.org
2007-07-15 23:35 ulf at uclibc.org
2007-07-17 0:27 sjhill at uclibc.org
2007-08-11 23:35 ulf at uclibc.org
2007-09-19 14:02 aldot at uclibc.org
2007-11-30 12:35 ulf at uclibc.org
2008-04-24 13:18 ninevoltz at uclibc.org
2008-09-17 21:35 jacmet at uclibc.org
2008-09-17 21:36 jacmet at uclibc.org
2008-12-13 10:55 tpetazzoni at uclibc.org
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.