From a93d3ef8e5d733e698f146e88b43a4356ba6000e Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 14 Aug 2016 16:30:56 -0400 Subject: [PATCH 1/1] lighttpd: Update from 1.4.39 to 1.4.41 --- packages/lighttpd/build.sh | 7 +++---- packages/lighttpd/src-plugin.c.patch | 16 ---------------- 2 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 packages/lighttpd/src-plugin.c.patch diff --git a/packages/lighttpd/build.sh b/packages/lighttpd/build.sh index 77aa662f..27081756 100644 --- a/packages/lighttpd/build.sh +++ b/packages/lighttpd/build.sh @@ -1,10 +1,9 @@ TERMUX_PKG_HOMEPAGE=http://www.lighttpd.net TERMUX_PKG_DESCRIPTION="Web server optimized for speed-critical environments while remaining standards-compliant, secure and flexible" -TERMUX_PKG_VERSION=1.4.39 -TERMUX_PKG_BUILD_REVISION=2 +TERMUX_PKG_VERSION=1.4.41 TERMUX_PKG_SRCURL=http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-bzip2 --with-openssl --with-pcre --with-zlib" -TERMUX_PKG_DEPENDS="libbz2, openssl, pcre, libcrypt" +TERMUX_PKG_DEPENDS="libbz2, openssl, pcre, libcrypt, libandroid-glob" TERMUX_PKG_RM_AFTER_INSTALL="bin/lighttpd-angel" # liblog for syslog: -LDFLAGS="$LDFLAGS -llog" +LDFLAGS="$LDFLAGS -llog -landroid-glob" diff --git a/packages/lighttpd/src-plugin.c.patch b/packages/lighttpd/src-plugin.c.patch deleted file mode 100644 index 3b81a925..00000000 --- a/packages/lighttpd/src-plugin.c.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -u -r ../lighttpd-1.4.39/src/plugin.c ./src/plugin.c ---- ../lighttpd-1.4.39/src/plugin.c 2015-11-22 13:59:02.000000000 -0500 -+++ ./src/plugin.c 2016-01-19 17:43:51.306199574 -0500 -@@ -259,7 +259,11 @@ - #else - *(void **)(&init) = dlsym(p->lib, srv->tmp_buf->ptr); - #endif -- if ((error = dlerror()) != NULL) { -+ /* Do not call dlerror() when dlsym() has found a handle, since there may have -+ been a (recoverable) error during loading of the shared library. This seems -+ to happen on (some?) cyanogenmod devices trying to dlopen("libvendorconn.so") -+ from NetdClient.cpp and failing due to no such file. */ -+ if (init == NULL && (error = dlerror()) != NULL) { - log_error_write(srv, __FILE__, __LINE__, "s", error); - - plugin_free(p); -- 2.11.0