lighttpd: update to 1.4.40.

This commit is contained in:
Juan RP 2016-07-17 07:07:00 +02:00
parent cc0e842f2a
commit cf8af473db
2 changed files with 5 additions and 43 deletions

View file

@ -1,38 +0,0 @@
--- src/mod_cml_lua.c.orig 2012-10-22 06:17:17.418886286 -0700
+++ src/mod_cml_lua.c 2012-10-22 06:25:50.289753316 -0700
@@ -28,6 +28,10 @@
#include <lualib.h>
#include <lauxlib.h>
+#if LUA_VERSION_NUM >= 502
+#define LUA_GLOBALSINDEX LUA_REGISTRYINDEX
+#endif
+
typedef struct {
stream st;
int done;
@@ -285,7 +285,11 @@
lua_settable(L, LUA_GLOBALSINDEX);
/* load lua program */
+#if LUA_VERSION_NUM >= 502
+ if (lua_load(L, load_file, &rm, fn->ptr, NULL) || lua_pcall(L,0,1,0)) {
+#else
if (lua_load(L, load_file, &rm, fn->ptr) || lua_pcall(L,0,1,0)) {
+#endif
log_error_write(srv, __FILE__, __LINE__, "s",
lua_tostring(L,-1));
--- src/mod_magnet.c 2011-06-13 04:17:01.000000000 -0700
+++ src/mod_magnet.c2 2013-10-01 06:39:18.771549986 -0700
@@ -24,6 +24,10 @@
#define MAGNET_CONFIG_PHYSICAL_PATH "magnet.attract-physical-path-to"
#define MAGNET_RESTART_REQUEST 99
+#if LUA_VERSION_NUM >= 502
+#define LUA_GLOBALSINDEX LUA_REGISTRYINDEX
+#endif
+
/* plugin config for all request/connections */
static jmp_buf exceptionjmp;

View file

@ -1,9 +1,9 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.39
revision=4
makedepends="libmysqlclient-devel lua-devel libxml2-devel sqlite-devel gdbm-devel pcre-devel libressl-devel fcgi-devel"
hostmakedepends="automake pkg-config pcre-devel libtool"
version=1.4.40
revision=1
makedepends="libuuid-devel libmysqlclient-devel lua-devel libxml2-devel sqlite-devel gdbm-devel pcre-devel libressl-devel fcgi-devel"
hostmakedepends="automake pkg-config libtool"
conf_files="/etc/lighttpd/lighttpd.conf"
system_accounts="_${pkgname}"
_lighttpd_homedir="/srv/www/${pkgname}"
@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.eu>"
license="2-clause-BSD"
homepage="http://lighttpd.net"
distfiles="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${version}.tar.xz"
checksum=7eb9a1853c3d6dd5851682b0733a729ba4158d6bdff80974d5ef5f1f6887365b
checksum=80450dfcf7604d6c516a00a0ce750937074ef844bbdee3b3f23384187b9d4f8d
build_style=gnu-configure
configure_args="
--sbindir=/usr/bin \