Attachment #159838 for bug #202302




VALGRIND_DESC=	valgrind support
WEBDAV_DESC=	WebDAV support

BZIP2_CONFIGURE_WITH=   bzip2
FAM_USES=       fam
FAM_CONFIGURE_ON=       --with-fam
FAM_CONFIGURE_ENV=      FAM_CFLAGS="-I${LOCALBASE}/include" FAM_LIBS="-L${LOCALBASE}/lib"
GDBM_LIB_DEPENDS=       libgdbm.so:${PORTSDIR}/databases/gdbm
GDBM_CONFIGURE_WITH=    gdbm
IPV6_CONFIGURE_OFF=     --disable-ipv6
LIBEV_CONFIGURE_WITH=   libev=${LOCALBASE}
LIBEV_LIB_DEPENDS=      libev.so:${PORTSDIR}/devel/libev
LUA_USES=               lua:51+
LUA_CONFIGURE_WITH=     lua
LUA_CONFIGURE_ENV=      LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
MEMCACHE_LIB_DEPENDS=   libmemcache.so:${PORTSDIR}/databases/libmemcache
MEMCACHE_CONFIGURE_WITH=memcache
SPAWNFCGI_RUN_DEPENDS=  spawn-fcgi:${PORTSDIR}/www/spawn-fcgi
VALGRIND_BUILD_DEPENDS= valgrind:${PORTSDIR}/devel/valgrind
VALGRIND_RUN_DEPENDS=   valgrind:${PORTSDIR}/devel/valgrind
VALGRIND_CONFIGURE_WITH=valgrind

LIGHTTPD_CONF_FILES=	lighttpd.conf modules.conf


			--with-openssl-libs=${OPENSSLLIB}
.endif

.if ${PORT_OPTIONS:MBZIP2}
CONFIGURE_ARGS+=	--with-bzip2
.endif

.if ${PORT_OPTIONS:MGDBM}
LIB_DEPENDS+=		libgdbm.so:${PORTSDIR}/databases/gdbm
CONFIGURE_ARGS+=	--with-gdbm
.endif

.if empty(PORT_OPTIONS:MIPV6)
CONFIGURE_ARGS+=	--disable-ipv6
.endif

.if ${PORT_OPTIONS:MLIBEV}
CONFIGURE_ARGS+=	--with-libev=${LOCALBASE}
LIB_DEPENDS+=		libev.so:${PORTSDIR}/devel/libev
.endif

.if ${PORT_OPTIONS:MLUA}
USES+=			lua:51
CONFIGURE_ARGS+=	--with-lua
CONFIGURE_ENV+=		LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
.endif

.if ${PORT_OPTIONS:MMEMCACHE}
LIB_DEPENDS+=		libmemcache.so:${PORTSDIR}/databases/libmemcache
CONFIGURE_ARGS+=	--with-memcache
.endif

.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL=		yes
CONFIGURE_ARGS+=	--with-mysql

_REQUIRE+=		slapd
.endif

.if ${PORT_OPTIONS:MSPAWNFCGI}
RUN_DEPENDS+=		spawn-fcgi:${PORTSDIR}/www/spawn-fcgi
.endif

.if ${PORT_OPTIONS:MVALGRIND}
BUILD_DEPENDS+=		valgrind:${PORTSDIR}/devel/valgrind
RUN_DEPENDS+=		valgrind:${PORTSDIR}/devel/valgrind
CONFIGURE_ARGS+=	--with-valgrind
.endif

.if ${PORT_OPTIONS:MWEBDAV}
USE_GNOME+=		libxml2
LIB_DEPENDS+=		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \




--- src/mod_cml_lua.c.orig	2015-07-26 10:36:36 UTC
+++ src/mod_cml_lua.c
@@ -28,6 +28,10 @@ typedef char HASHHEX[HASHHEXLEN+1];
 #include <lualib.h>
 #include <lauxlib.h>
 
+#if LUA_VERSION_NUM >= 502
+#define LUA_GLOBALSINDEX LUA_REGISTRYINDEX
+#endif
+
 typedef struct {
 	stream st;
 	int done;
@@ -291,7 +295,11 @@ int cache_parse_lua(server *srv, connect
 	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.orig	2015-07-26 10:36:36 UTC
+++ src/mod_magnet.c
@@ -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;

Return to bug 202302

Lines 49-57 Link Here

(-)Makefile (-42 / +18 lines)
49	VALGRIND_DESC= valgrind support	49	VALGRIND_DESC= valgrind support
50	WEBDAV_DESC= WebDAV support	50	WEBDAV_DESC= WebDAV support
51		51
52	FAM_USES= fam	52	BZIP2_CONFIGURE_WITH= bzip2
53	FAM_CONFIGURE_ON= --with-fam	53	FAM_USES= fam
54	FAM_CONFIGURE_ENV= FAM_CFLAGS="-I${LOCALBASE}/include" FAM_LIBS="-L${LOCALBASE}/lib"	54	FAM_CONFIGURE_ON= --with-fam
		55	FAM_CONFIGURE_ENV= FAM_CFLAGS="-I${LOCALBASE}/include" FAM_LIBS="-L${LOCALBASE}/lib"
		56	GDBM_LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm
		57	GDBM_CONFIGURE_WITH= gdbm
		58	IPV6_CONFIGURE_OFF= --disable-ipv6
		59	LIBEV_CONFIGURE_WITH= libev=${LOCALBASE}
		60	LIBEV_LIB_DEPENDS= libev.so:${PORTSDIR}/devel/libev
		61	LUA_USES= lua:51+
		62	LUA_CONFIGURE_WITH= lua
		63	LUA_CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
		64	MEMCACHE_LIB_DEPENDS= libmemcache.so:${PORTSDIR}/databases/libmemcache
		65	MEMCACHE_CONFIGURE_WITH=memcache
		66	SPAWNFCGI_RUN_DEPENDS= spawn-fcgi:${PORTSDIR}/www/spawn-fcgi
		67	VALGRIND_BUILD_DEPENDS= valgrind:${PORTSDIR}/devel/valgrind
		68	VALGRIND_RUN_DEPENDS= valgrind:${PORTSDIR}/devel/valgrind
		69	VALGRIND_CONFIGURE_WITH=valgrind
55		70
56	LIGHTTPD_CONF_FILES= lighttpd.conf modules.conf	71	LIGHTTPD_CONF_FILES= lighttpd.conf modules.conf
57		72
Lines 95-129 Link Here
95	--with-openssl-libs=${OPENSSLLIB}	110	--with-openssl-libs=${OPENSSLLIB}
96	.endif	111	.endif
97		112
98	.if ${PORT_OPTIONS:MBZIP2}
99	CONFIGURE_ARGS+= --with-bzip2
100	.endif
101
102	.if ${PORT_OPTIONS:MGDBM}
103	LIB_DEPENDS+= libgdbm.so:${PORTSDIR}/databases/gdbm
104	CONFIGURE_ARGS+= --with-gdbm
105	.endif
106
107	.if empty(PORT_OPTIONS:MIPV6)
108	CONFIGURE_ARGS+= --disable-ipv6
109	.endif
110
111	.if ${PORT_OPTIONS:MLIBEV}
112	CONFIGURE_ARGS+= --with-libev=${LOCALBASE}
113	LIB_DEPENDS+= libev.so:${PORTSDIR}/devel/libev
114	.endif
115
116	.if ${PORT_OPTIONS:MLUA}
117	USES+= lua:51
118	CONFIGURE_ARGS+= --with-lua
119	CONFIGURE_ENV+= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
120	.endif
121
122	.if ${PORT_OPTIONS:MMEMCACHE}
123	LIB_DEPENDS+= libmemcache.so:${PORTSDIR}/databases/libmemcache
124	CONFIGURE_ARGS+= --with-memcache
125	.endif
126
127	.if ${PORT_OPTIONS:MMYSQL}	113	.if ${PORT_OPTIONS:MMYSQL}
128	USE_MYSQL= yes	114	USE_MYSQL= yes
129	CONFIGURE_ARGS+= --with-mysql	115	CONFIGURE_ARGS+= --with-mysql
Lines 149-164 Link Here
149	_REQUIRE+= slapd	135	_REQUIRE+= slapd
150	.endif	136	.endif
151		137
152	.if ${PORT_OPTIONS:MSPAWNFCGI}
153	RUN_DEPENDS+= spawn-fcgi:${PORTSDIR}/www/spawn-fcgi
154	.endif
155
156	.if ${PORT_OPTIONS:MVALGRIND}
157	BUILD_DEPENDS+= valgrind:${PORTSDIR}/devel/valgrind
158	RUN_DEPENDS+= valgrind:${PORTSDIR}/devel/valgrind
159	CONFIGURE_ARGS+= --with-valgrind
160	.endif
161
162	.if ${PORT_OPTIONS:MWEBDAV}	138	.if ${PORT_OPTIONS:MWEBDAV}
163	USE_GNOME+= libxml2	139	USE_GNOME+= libxml2
164	LIB_DEPENDS+= libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \	140	LIB_DEPENDS+= libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \

Line 0 Link Here

(-)files/patch-src_mod__cml__lua.c (+25 lines)
	1	--- src/mod_cml_lua.c.orig 2015-07-26 10:36:36 UTC
	2	+++ src/mod_cml_lua.c
	3	@@ -28,6 +28,10 @@ typedef char HASHHEX[HASHHEXLEN+1];
	4	#include <lualib.h>
	5	#include <lauxlib.h>
	6
	7	+#if LUA_VERSION_NUM >= 502
	8	+#define LUA_GLOBALSINDEX LUA_REGISTRYINDEX
	9	+#endif
	10	+
	11	typedef struct {
	12	stream st;
	13	int done;
	14	@@ -291,7 +295,11 @@ int cache_parse_lua(server *srv, connect
	15	lua_settable(L, LUA_GLOBALSINDEX);
	16
	17	/* load lua program */
	18	+#if LUA_VERSION_NUM >= 502
	19	+ if (lua_load(L, load_file, &rm, fn->ptr, NULL) \|\| lua_pcall(L,0,1,0)) {
	20	+#else
	21	if (lua_load(L, load_file, &rm, fn->ptr) \|\| lua_pcall(L,0,1,0)) {
	22	+#endif
	23	log_error_write(srv, __FILE__, __LINE__, "s",
	24	lua_tostring(L,-1));
	25

Line 0 Link Here

(-)files/patch-src_mod__magnet.c (+13 lines)
	1	--- src/mod_magnet.c.orig 2015-07-26 10:36:36 UTC
	2	+++ src/mod_magnet.c
	3	@@ -24,6 +24,10 @@
	4	#define MAGNET_CONFIG_PHYSICAL_PATH "magnet.attract-physical-path-to"
	5	#define MAGNET_RESTART_REQUEST 99
	6
	7	+#if LUA_VERSION_NUM >= 502
	8	+#define LUA_GLOBALSINDEX LUA_REGISTRYINDEX
	9	+#endif
	10	+
	11	/* plugin config for all request/connections */
	12
	13	static jmp_buf exceptionjmp;