diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-05 12:15:12 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-05 12:15:12 +0100 |
| commit | 65b27b644c5817eb63fe7b8392236c37e0386f9b (patch) | |
| tree | 31dcf3f300443fae37ed57c6c86fec960e3de9da /package/lighttpd | |
| parent | 9230fde0381a7dcc7e3d86e954382a01a8fcfd63 (diff) | |
update some packages to latest upstream
- openssh, aircrack-ng, autoconf, lighttpd
- use mplayer svn version
Diffstat (limited to 'package/lighttpd')
| -rw-r--r-- | package/lighttpd/Makefile | 12 | ||||
| -rw-r--r-- | package/lighttpd/patches/500-configure_cross.patch | 24 |
2 files changed, 6 insertions, 30 deletions
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index 69d8e8432..b20841a24 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -4,14 +4,14 @@ 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/ +PKG_SITES:= http://download.lighttpd.net/lighttpd/releases-1.4.x/ include $(TOPDIR)/mk/package.mk @@ -65,7 +65,7 @@ $(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_STYLE:= gnu CONFIGURE_ENV+= PCRE_LIB="-lpcre" CONFIGURE_ARGS+= --without-openssl \ --libdir=/usr/lib/lighttpd \ @@ -81,8 +81,8 @@ CONFIGURE_ARGS+= --without-openssl \ --with-pcre \ --without-valgrind \ --with-webdav-props -BUILD_STYLE= auto -INSTALL_STYLE= auto +BUILD_STYLE:= auto +INSTALL_STYLE:= auto ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y) CONFIGURE_ARGS+= --with-openssl='${STAGING_DIR}/usr' endif 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 |