View | Details | Raw Unified | Return to bug 211163 | Differences between
and this patch

Collapse All | Expand All

(-)lighttpd/Makefile (-11 / +5 lines)
Lines 2-13 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME?=	lighttpd
4
PORTNAME?=	lighttpd
5
PORTVERSION=	1.4.39
5
PORTVERSION=	1.4.40
6
PORTREVISION=	1
7
CATEGORIES?=	www
6
CATEGORIES?=	www
8
MASTER_SITES?=	http://download.lighttpd.net/lighttpd/releases-1.4.x/
7
MASTER_SITES?=	http://download.lighttpd.net/lighttpd/releases-1.4.x/
9
8
10
MAINTAINER=	pkubaj@riseup.net
9
MAINTAINER=	pkubaj@anongoth.pl
11
COMMENT?=	Secure, fast, compliant, and flexible Web Server
10
COMMENT?=	Secure, fast, compliant, and flexible Web Server
12
11
13
.if !defined(_BUILDING_LIGHTTPD_MODULE)
12
.if !defined(_BUILDING_LIGHTTPD_MODULE)
Lines 34-40 Link Here
34
USE_RC_SUBR=	lighttpd
33
USE_RC_SUBR=	lighttpd
35
34
36
OPTIONS_DEFINE=	ATTR BZIP2 DOCS FAM GDBM IPV6 LIBEV LUA MEMCACHE MYSQL MYSQLAUTH \
35
OPTIONS_DEFINE=	ATTR BZIP2 DOCS FAM GDBM IPV6 LIBEV LUA MEMCACHE MYSQL MYSQLAUTH \
37
		NODELAY LDAP OPENSSL SPAWNFCGI VALGRIND WEBDAV
36
		LDAP OPENSSL SPAWNFCGI VALGRIND WEBDAV
38
37
39
OPTIONS_DEFAULT=	OPENSSL
38
OPTIONS_DEFAULT=	OPENSSL
40
39
Lines 47-53 Link Here
47
MEMCACHE_DESC=	memcached storage (mod_trigger_b4_dl)
46
MEMCACHE_DESC=	memcached storage (mod_trigger_b4_dl)
48
MYSQL_DESC=	MySQL support (mod_mysql_vhost)
47
MYSQL_DESC=	MySQL support (mod_mysql_vhost)
49
MYSQLAUTH_DESC=	MySQL authentication (requires WITH_MYSQL)
48
MYSQLAUTH_DESC=	MySQL authentication (requires WITH_MYSQL)
50
NODELAY_DESC=	Set TCP_NODELAY on listening sockets
51
SPAWNFCGI_DESC=	Depend on spawn-fcgi utility
49
SPAWNFCGI_DESC=	Depend on spawn-fcgi utility
52
VALGRIND_DESC=	valgrind support
50
VALGRIND_DESC=	valgrind support
53
WEBDAV_DESC=	WebDAV support
51
WEBDAV_DESC=	WebDAV support
Lines 62-68 Link Here
62
IPV6_CONFIGURE_OFF=	--disable-ipv6
60
IPV6_CONFIGURE_OFF=	--disable-ipv6
63
LIBEV_CONFIGURE_WITH=	libev=${LOCALBASE}
61
LIBEV_CONFIGURE_WITH=	libev=${LOCALBASE}
64
LIBEV_LIB_DEPENDS=	libev.so:devel/libev
62
LIBEV_LIB_DEPENDS=	libev.so:devel/libev
65
LUA_USES=		lua:51+
63
LUA_USES=		lua
66
LUA_CONFIGURE_WITH=	lua
64
LUA_CONFIGURE_WITH=	lua
67
LUA_CONFIGURE_ENV=	LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
65
LUA_CONFIGURE_ENV=	LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
68
MEMCACHE_LIB_DEPENDS=	libmemcache.so:databases/libmemcache
66
MEMCACHE_LIB_DEPENDS=	libmemcache.so:databases/libmemcache
Lines 109-115 Link Here
109
.endif
107
.endif
110
108
111
.if ${PORT_OPTIONS:MOPENSSL}
109
.if ${PORT_OPTIONS:MOPENSSL}
112
USE_OPENSSL=		yes
110
USES+=			ssl
113
CONFIGURE_ARGS+=	--with-openssl \
111
CONFIGURE_ARGS+=	--with-openssl \
114
			--with-openssl-includes=${OPENSSLINC} \
112
			--with-openssl-includes=${OPENSSLINC} \
115
			--with-openssl-libs=${OPENSSLLIB}
113
			--with-openssl-libs=${OPENSSLLIB}
Lines 130-139 Link Here
130
PORTDOCS+=		README.mysqlauth mysql_auth.sql
128
PORTDOCS+=		README.mysqlauth mysql_auth.sql
131
.endif
129
.endif
132
130
133
.if ${PORT_OPTIONS:MNODELAY}
134
EXTRA_PATCHES+=		${FILESDIR}/extra-patch-nodelay
135
.endif
136
137
.if ${PORT_OPTIONS:MLDAP}
131
.if ${PORT_OPTIONS:MLDAP}
138
USE_OPENLDAP=		yes
132
USE_OPENLDAP=		yes
139
CONFIGURE_ARGS+=	--with-ldap
133
CONFIGURE_ARGS+=	--with-ldap
(-)lighttpd/distinfo (-4 / +5 lines)
Lines 1-6 Link Here
1
SHA256 (lighttpd-1.4.39.tar.xz) = 7eb9a1853c3d6dd5851682b0733a729ba4158d6bdff80974d5ef5f1f6887365b
1
TIMESTAMP = 1468715038
2
SIZE (lighttpd-1.4.39.tar.xz) = 579180
2
SHA256 (lighttpd-1.4.40.tar.xz) = 80450dfcf7604d6c516a00a0ce750937074ef844bbdee3b3f23384187b9d4f8d
3
SIZE (lighttpd-1.4.40.tar.xz) = 621448
4
SHA256 (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 4e6768af32ce16033fcb0c70b12c55b40082ca105a36f258b0bbf30d64e9dad3
5
SIZE (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 242458
3
SHA256 (lighttpd-1.4.26_mod_geoip.patch) = 2858036310b778852d9f039a81629902edffc368658e13bf4779f3642ee1a5ba
6
SHA256 (lighttpd-1.4.26_mod_geoip.patch) = 2858036310b778852d9f039a81629902edffc368658e13bf4779f3642ee1a5ba
4
SIZE (lighttpd-1.4.26_mod_geoip.patch) = 15173
7
SIZE (lighttpd-1.4.26_mod_geoip.patch) = 15173
5
SHA256 (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = bc0e1b97289a89b827ea84e64b614933cc14d67c64d6b727e4928aeec516489c
6
SIZE (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 242421
(-)lighttpd/files/extra-patch-nodelay (-15 lines)
Lines 1-15 Link Here
1
--- src/network.c.orig	Tue Jan 26 14:33:01 2010
2
+++ src/network.c	Tue Jan 26 14:37:39 2010
3
@@ -226,6 +226,12 @@
4
 		log_error_write(srv, __FILE__, __LINE__, "ss", "socketsockopt failed:", strerror(errno));
5
 		goto error_free_socket;
6
 	}
7
+	if(srv_socket->addr.plain.sa_family == AF_INET || srv_socket->addr.plain.sa_family == AF_INET6 ) {
8
+		if (setsockopt(srv_socket->fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val)) < 0) {
9
+			log_error_write(srv, __FILE__, __LINE__, "ss", "socketsockopt failed:", strerror(errno));
10
+			goto error_free_socket;
11
+		}
12
+	}
13
 
14
 	switch(srv_socket->addr.plain.sa_family) {
15
 #ifdef HAVE_IPV6
(-)lighttpd/files/patch-configure.ac (-22 lines)
Lines 1-22 Link Here
1
--- configure.ac.orig	2015-07-26 10:36:36 UTC
2
+++ configure.ac
3
@@ -46,6 +46,7 @@ AC_DEFUN([TRY_CFLAGS],
4
 dnl Checks for programs.
5
 AC_PROG_CC
6
 AM_PROG_CC_C_O
7
+AM_PROG_AR
8
 AC_PROG_LD
9
 AC_PROG_INSTALL
10
 AC_PROG_AWK
11
@@ -60,11 +61,6 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC
12
 dnl AM_PROG_AR requires automake 1.11 (and uses AC_COMPILE_IFELSE which wants AC_USE_SYSTEM_EXTENSIONS)
13
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
14
 
15
-dnl check environment
16
-AC_AIX
17
-AC_ISC_POSIX
18
-AC_MINIX
19
-
20
 dnl AC_CANONICAL_HOST
21
 case $host_os in
22
 	*darwin*|*cygwin*|*aix*|*mingw* ) NO_RDYNAMIC=yes;;
(-)lighttpd/files/patch-src-fdevent.h (-11 lines)
Lines 1-11 Link Here
1
--- src/fdevent.h.orig	2015-07-26 10:36:36 UTC
2
+++ src/fdevent.h
3
@@ -46,7 +46,7 @@
4
 # include <port.h>
5
 #endif
6
 
7
-#if defined HAVE_SYS_EVENT_H && defined HAVE_KQUEUE
8
+#if defined HAVE_SYS_EVENT_H && defined HAVE_KQUEUE && !defined HAVE_LIBEV
9
 # define USE_FREEBSD_KQUEUE
10
 #endif
11
 
(-)lighttpd/files/patch-src_mod__cml__lua.c (-25 lines)
Lines 1-25 Link Here
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
 
(-)lighttpd/files/patch-src_mod__magnet.c (-13 lines)
Lines 1-13 Link Here
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;
(-)lighttpd/files/patch-src_network.c (-23 lines)
Lines 1-23 Link Here
1
Cherry-picked from upstream
2
https://redmine.lighttpd.net/projects/lighttpd/repository/revisions/1ca52fdce3b87f7748dd5db6f59d738ed7a9efe1/diff
3
4
--- src/network.c.orig	2015-12-04 21:13:47 UTC
5
+++ src/network.c
6
@@ -769,7 +769,7 @@ int network_init(server *srv) {
7
 
8
 		if (!s->ssl_use_sslv2) {
9
 			/* disable SSLv2 */
10
-			if (!(SSL_OP_NO_SSLv2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2))) {
11
+			if ((SSL_OP_NO_SSLv2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) != SSL_OP_NO_SSLv2) {
12
 				log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
13
 						ERR_error_string(ERR_get_error(), NULL));
14
 				return -1;
15
@@ -778,7 +778,7 @@ int network_init(server *srv) {
16
 
17
 		if (!s->ssl_use_sslv3) {
18
 			/* disable SSLv3 */
19
-			if (!(SSL_OP_NO_SSLv3 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv3))) {
20
+			if ((SSL_OP_NO_SSLv3 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv3)) != SSL_OP_NO_SSLv3) {
21
 				log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
22
 						ERR_error_string(ERR_get_error(), NULL));
23
 				return -1;
(-)lighttpd-mod_geoip/Makefile (-2 / +2 lines)
Lines 26-35 Link Here
26
26
27
do-install:
27
do-install:
28
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/lighttpd
28
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/lighttpd
29
	@${INSTALL_LIB} ${WRKSRC}/src/.libs/${PORTNAME}.so \
29
	${INSTALL_LIB} ${WRKSRC}/src/.libs/${PORTNAME}.so \
30
		${STAGEDIR}${PREFIX}/lib/lighttpd
30
		${STAGEDIR}${PREFIX}/lib/lighttpd
31
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d
31
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d
32
	@${INSTALL_DATA} ${WRKSRC}/doc/config/conf.d/geoip.conf \
32
	${INSTALL_DATA} ${WRKSRC}/doc/config/conf.d/geoip.conf \
33
		${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d/geoip.conf.sample
33
		${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d/geoip.conf.sample
34
34
35
.include "${MASTERDIR}/Makefile"
35
.include "${MASTERDIR}/Makefile"
(-)lighttpd-mod_h264_streaming/Makefile (-6 / +6 lines)
Lines 8-23 Link Here
8
8
9
COMMENT=	H264 streaming module for lighttpd
9
COMMENT=	H264 streaming module for lighttpd
10
10
11
BUILD_DEPENDS=	${LOCALBASE}/sbin/lighttpd:www/lighttpd
12
RUN_DEPENDS=	${LOCALBASE}/sbin/lighttpd:www/lighttpd
13
14
LICENSE=	CCPL.BY-NC-SA.30
11
LICENSE=	CCPL.BY-NC-SA.30
15
LICENSE_NAME=	Creative Commons Attribution-NonCommercial-ShareAlike 3.0 \
12
LICENSE_NAME=	Creative Commons Attribution-NonCommercial-ShareAlike 3.0 \
16
		Unported License
13
		Unported License
17
LICENSE_FILE=	${FILESDIR}/COPYING.mod_h264_streaming
14
LICENSE_FILE=	${FILESDIR}/COPYING.mod_h264_streaming
15
LICENSE_PERMS=	dist-mirror pkg-mirror
18
LICENSE_DISTFILES=	${PATCHFILES}
16
LICENSE_DISTFILES=	${PATCHFILES}
19
LICENSE_PERMS=	dist-mirror pkg-mirror
20
17
18
BUILD_DEPENDS=	${LOCALBASE}/sbin/lighttpd:www/lighttpd
19
RUN_DEPENDS=	${LOCALBASE}/sbin/lighttpd:www/lighttpd
20
21
MASTERDIR=	${.CURDIR}/../lighttpd
21
MASTERDIR=	${.CURDIR}/../lighttpd
22
DESCR=		${.CURDIR}/pkg-descr
22
DESCR=		${.CURDIR}/pkg-descr
23
PLIST=		${.CURDIR}/pkg-plist
23
PLIST=		${.CURDIR}/pkg-plist
Lines 34-43 Link Here
34
34
35
do-install:
35
do-install:
36
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/lighttpd
36
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/lighttpd
37
	@${INSTALL_LIB} ${WRKSRC}/src/.libs/${PORTNAME}.so \
37
	${INSTALL_LIB} ${WRKSRC}/src/.libs/${PORTNAME}.so \
38
		${STAGEDIR}${PREFIX}/lib/lighttpd
38
		${STAGEDIR}${PREFIX}/lib/lighttpd
39
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d
39
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d
40
	@${INSTALL_DATA} ${FILESDIR}/h264_streaming.conf \
40
	${INSTALL_DATA} ${FILESDIR}/h264_streaming.conf \
41
		${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d/h264_streaming.conf.sample
41
		${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d/h264_streaming.conf.sample
42
42
43
.include "${MASTERDIR}/Makefile"
43
.include "${MASTERDIR}/Makefile"

Return to bug 211163