Attachment 172596 Details for Bug 211163 – lighttpd* patch

[patch] lighttpd* patch

lighttpd.patch (text/plain), 9.92 KB, created by Piotr Kubaj on 2016-07-16 22:39:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2016-07-16 22:39:36 UTC

Size: 9.92 KB

patch

obsolete

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

Flags:

pkubaj: maintainer-approval+

Actions: View | Diff

Attachments on bug 211163: 172596 | 172763 | 172764 | 172781 | 172789 | 172790 | 172794