Attachment 163336 Details for Bug 204681 – libevhtp.diff

[patch] libevhtp.diff

libevhtp.diff (text/plain), 4.38 KB, created by Ultima on 2015-11-19 16:22:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ultima

Created: 2015-11-19 16:22:59 UTC

Size: 4.38 KB

patch

obsolete

>Index: www/libevhtp/Makefile
>===================================================================
>--- www/libevhtp/Makefile	(revision 401914)
>+++ www/libevhtp/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	libevhtp
>-PORTVERSION=	1.2.10
>+PORTVERSION=	1.2.11
> CATEGORIES=	www
> 
> MAINTAINER=	ultima1252@gmail.com
>@@ -14,16 +14,14 @@
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	ellzey
>-GH_TAGNAME=	ba4c44e
> 
> USES=		cmake:outsource
> USE_LDCONFIG=	yes
> CMAKE_ARGS=	-DCMAKE_INCLUDE_PATH:PATH=include/event2 \
> 		-DCMAKE_LIBRARY_PATH:PATH=lib/event2
>-CMAKE_BUILD_TYPE=	Release
> 
> OPTIONS_DEFINE=	EVHTP_DISABLE_SSL EVHTP_DISABLE_EVTHR EVHTP_DISABLE_REGEX \
>-				EVHTP_BUILD_SHARED EVHTP_USE_DEFER_ACCEPT
>+		EVHTP_BUILD_SHARED EVHTP_USE_DEFER_ACCEPT DEBUG
> EVHTP_DISABLE_SSL_DESC=		Disable ssl support
> 
> EVHTP_DISABLE_SSL_CMAKE_ON=	-DEVHTP_DISABLE_SSL:STRING=ON
>@@ -40,14 +38,22 @@
> EVHTP_USE_DEFER_ACCEPT_DESC=	Enable TCP_DEFER_ACCEPT
> EVHTP_USE_DEFER_ACCEPT_CMAKE_ON=	-DEVHTP_USE_DEFER_ACCEPT:STRING=ON
> EVHTP_USE_DEFER_ACCEPT_CMAKE_OFF=	-DEVHTP_USE_DEFER_ACCEPT:STRING=OFF
>+DEBUG_CMAKE_BUILD_TYPE_ON=	Debug
>+DEBUG_CMAKE_BUILD_TYPE_OFF=	Release
> 
> OPTIONS_DEFAULT=	EVHTP_BUILD_SHARED
> 
> .include <bsd.port.options.mk>
> 
>+post-patch:
>+	${REINPLACE_CMD} 's/\/evhtp//' ${WRKSRC}/evhtp.pc.in
>+	${REINPLACE_CMD} 's/INCLUDE_INSTALL_DIR}\/evhtp/INCLUDE_INSTALL_DIR}/ ; s/PATCH_VERSION [0-9]*/PATCH_VERSION ${PORTVERSION:S/1.2.//}/' \
>+		${WRKSRC}/CMakeLists.txt
>+
> PLIST_FILES=	include/evhtp.h \
> 		include/evhtp-config.h \
>-		include/htparse.h
>+		include/htparse.h \
>+		lib/pkgconfig/evhtp.pc
> 
> .if !exists(${LOCALBASE}/include/onigposix.h) && !${PORT_OPTIONS:MEVHTP_DISABLE_REGEX}
> PLIST_FILES+=	include/onigposix.h
>@@ -58,7 +64,8 @@
> .endif
> 
> .if ${PORT_OPTIONS:MEVHTP_BUILD_SHARED}
>-PLIST_FILES+=	lib/libevhtp.so
>+PLIST_FILES+=	lib/libevhtp.so \
>+		lib/libevhtp.so.${PORTVERSION}
> .else
> PLIST_FILES+=	lib/libevhtp.a
> .endif
>Index: www/libevhtp/distinfo
>===================================================================
>--- www/libevhtp/distinfo	(revision 401914)
>+++ www/libevhtp/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (ellzey-libevhtp-1.2.10-ba4c44e_GH0.tar.gz) = d5b022e2a3847ed7344bc7bca7ac7feb6b4a7e877d12452a15a96ba1c760d25a
>-SIZE (ellzey-libevhtp-1.2.10-ba4c44e_GH0.tar.gz) = 373482
>+SHA256 (ellzey-libevhtp-1.2.11_GH0.tar.gz) = 0e60ef0b75c9e0351d18e015c9a688a70d9c66d2ca3f6a44a7da7153e11e067d
>+SIZE (ellzey-libevhtp-1.2.11_GH0.tar.gz) = 429931
>Index: www/libevhtp/files/patch-evhtp.c
>===================================================================
>--- www/libevhtp/files/patch-evhtp.c	(revision 401914)
>+++ www/libevhtp/files/patch-evhtp.c	(working copy)
>@@ -1,25 +1,11 @@
>---- evhtp.c.orig	2015-02-24 07:55:55 UTC
>+--- evhtp.c.orig	2015-11-19 15:02:20 UTC
> +++ evhtp.c
>-@@ -7,6 +7,7 @@
>- #include <strings.h>
>- #include <inttypes.h>
>- #ifndef WIN32
>-+#include <sys/types.h>
>- #include <sys/socket.h>
>- #include <netinet/in.h>
>- #include <netinet/tcp.h>
>-@@ -3170,7 +3171,14 @@ evhtp_bind_sockaddr(evhtp_t * htp, struc
>+@@ -2356,7 +2356,7 @@ evhtp_connection_pause(evhtp_connection_
>  
>-         sock = evconnlistener_get_fd(htp->server);
>+     c->paused = 1;
>  
>-+#ifdef TCP_DEFER_ACCEPT
>-         setsockopt(sock, IPPROTO_TCP, TCP_DEFER_ACCEPT, &one, (ev_socklen_t)sizeof(one));
>-+#elif SO_ACCEPTFILTER
>-+        struct accept_filter_arg afa;
>-+        bzero(&afa, sizeof(afa));
>-+        strcpy(afa.af_name, "httpready");
>-+        setsockopt(sock, SOL_SOCKET, SO_ACCEPTFILTER, &afa, sizeof(afa));
>-+#endif
>-         setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &one, (ev_socklen_t)sizeof(one));
>-     }
>- #endif
>+-    bufferevent_disable(c->bev, EV_READ | EV_WRITE);
>++    bufferevent_disable(c->bev, EV_READ);
>+ 
>+     return;
>+ }
>Index: www/libevhtp/files/patch-evhtp.h
>===================================================================
>--- www/libevhtp/files/patch-evhtp.h	(revision 401914)
>+++ www/libevhtp/files/patch-evhtp.h	(working copy)
>@@ -1,11 +0,0 @@
>---- evhtp.h.orig	2015-10-29 19:51:50 UTC
>-+++ evhtp.h
>-@@ -1285,7 +1285,7 @@ EVHTP_EXPORT evhtp_connection_t *
>- evhtp_connection_new(evbase_t * evbase, const char * addr, uint16_t port);
>- 
>- #ifndef DISABLE_SSL
>--evhtp_connection_t * evhtp_connection_ssl_new(evbase_t * evbase, const char * addr, uint16_t port, evhtp_ssl_ctx_t * ctx);
>-+EVHTP_EXPORT evhtp_connection_t * evhtp_connection_ssl_new(evbase_t * evbase, const char * addr, uint16_t port, evhtp_ssl_ctx_t * ctx);
>- #endif
>- 
>-

Flags:

Ultima1252: maintainer-approval+

Actions: View | Diff

Attachments on bug 204681: 163333 | 163336 | 163431 | 163601 | 163633 | 163643