summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2009-11-09 16:51:17 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2009-11-09 16:51:17 +0100
commit7ad1fdc5d5b6580daf0ef7460a5e2104bb9b5ff8 (patch)
tree5910e442a4fbc663d5d869cbcaacf2028232659a
parentf09acb9c106766e335e4d2ae39617708ece68efd (diff)
downloadptxdist-7ad1fdc5d5b6580daf0ef7460a5e2104bb9b5ff8.tar.gz
ptxdist-7ad1fdc5d5b6580daf0ef7460a5e2104bb9b5ff8.tar.xz
[lighttpd] version bump 1.4.22 -> 1.4.24
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
l---------patches/lighttpd-1.4.22/autogen.sh1
-rw-r--r--patches/lighttpd-1.4.22/enable-pcre.diff26
-rw-r--r--patches/lighttpd-1.4.22/series2
-rw-r--r--rules/lighttpd.make4
4 files changed, 1 insertions, 32 deletions
diff --git a/patches/lighttpd-1.4.22/autogen.sh b/patches/lighttpd-1.4.22/autogen.sh
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/lighttpd-1.4.22/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh \ No newline at end of file
diff --git a/patches/lighttpd-1.4.22/enable-pcre.diff b/patches/lighttpd-1.4.22/enable-pcre.diff
deleted file mode 100644
index 8d36297e4..000000000
--- a/patches/lighttpd-1.4.22/enable-pcre.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Subject: Enable use of pcre even if cross compiling
-From: Marc Kleine-Budde <mkl@penutronix.de>
-
-lighttpd thinks that pcre-config cannot be used when cross-compiling,
-but lfu fixed pcre-config up, so that we can use it.
-
-This patch enables pcre in lighttpd.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: lighttpd-1.4.20/configure.in
-===================================================================
---- lighttpd-1.4.20.orig/configure.in
-+++ lighttpd-1.4.20/configure.in
-@@ -252,7 +252,7 @@ AC_ARG_WITH(pcre, AC_HELP_STRING([--with
- [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
diff --git a/patches/lighttpd-1.4.22/series b/patches/lighttpd-1.4.22/series
deleted file mode 100644
index 8a27a9cad..000000000
--- a/patches/lighttpd-1.4.22/series
+++ /dev/null
@@ -1,2 +0,0 @@
-enable-pcre.diff
-
diff --git a/rules/lighttpd.make b/rules/lighttpd.make
index c6080b68a..95290c708 100644
--- a/rules/lighttpd.make
+++ b/rules/lighttpd.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
#
# Paths and names
#
-LIGHTTPD_VERSION := 1.4.22
+LIGHTTPD_VERSION := 1.4.24
LIGHTTPD := lighttpd-$(LIGHTTPD_VERSION)
LIGHTTPD_SUFFIX := tar.bz2
LIGHTTPD_URL := http://www.lighttpd.net/download/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
@@ -162,8 +162,6 @@ $(STATEDIR)/lighttpd.targetinstall:
/usr/sbin/lighttpd)
@$(call install_copy, lighttpd, 0, 0, 0755, -, \
/usr/sbin/lighttpd-angel)
- @$(call install_copy, lighttpd, 0, 0, 0755, -, \
- /usr/bin/spawn-fcgi)
@cd $(LIGHTTPD_PKGDIR) && \
find ./usr/lib -name "*.so" | \