aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2005-09-01 07:18:47 +0000
committerNicolas Thill <nico@openwrt.org>2005-09-01 07:18:47 +0000
commit33e07cb3ae9305b33ac14ad16f76d60cd9ab5edb (patch)
tree87ddc062c721d59f9c9c244b4ec76b30e82ffeeb /package
parent12706fb392f40c46680fdf2b021d738a18fdae59 (diff)
downloadupstream-33e07cb3ae9305b33ac14ad16f76d60cd9ab5edb.tar.gz
upstream-33e07cb3ae9305b33ac14ad16f76d60cd9ab5edb.tar.bz2
upstream-33e07cb3ae9305b33ac14ad16f76d60cd9ab5edb.zip
update to new upstream release (v1.4.2),
fix pcre detection in configure (thanks bero for reporting) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1817 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/lighttpd/Makefile4
-rw-r--r--package/lighttpd/patches/500-configure_cross.patch24
2 files changed, 26 insertions, 2 deletions
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index faf130e4bd..c047b7a661 100644
--- a/package/lighttpd/Makefile
+++ b/package/lighttpd/Makefile
@@ -3,9 +3,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=lighttpd
-PKG_VERSION:=1.3.16
+PKG_VERSION:=1.4.2
PKG_RELEASE:=1
-PKG_MD5SUM:=b73f7a7ace4901b6417b0e450aaa5df5
+PKG_MD5SUM:=c26eea734490129a45e465ac0f327e4a
PKG_SOURCE_URL:=http://www.lighttpd.net/download/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/package/lighttpd/patches/500-configure_cross.patch b/package/lighttpd/patches/500-configure_cross.patch
new file mode 100644
index 0000000000..8f8099823f
--- /dev/null
+++ b/package/lighttpd/patches/500-configure_cross.patch
@@ -0,0 +1,24 @@
+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