Index: head/www/libevhtp/Makefile =================================================================== --- head/www/libevhtp/Makefile (revision 400487) +++ head/www/libevhtp/Makefile (revision 400488) @@ -1,64 +1,66 @@ # $FreeBSD$ PORTNAME= libevhtp -PORTVERSION= 1.2.9 -PORTREVISION= 3 +PORTVERSION= 1.2.10 CATEGORIES= www MAINTAINER= ultima1252@gmail.com COMMENT= Flexible replacement for libevent httpd API LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 USE_GITHUB= yes GH_ACCOUNT= ellzey -GH_TAGNAME= 3886506 +GH_TAGNAME= ba4c44e USES= cmake:outsource -USE_LDCONFIG= YES +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_DISABLE_SSL_DESC= Disable ssl support EVHTP_DISABLE_SSL_CMAKE_ON= -DEVHTP_DISABLE_SSL:STRING=ON EVHTP_DISABLE_SSL_CMAKE_OFF= -DEVHTP_DISABLE_SSL:STRING=OFF EVHTP_DISABLE_EVTHR_DESC= Disable evthread support EVHTP_DISABLE_EVTHR_CMAKE_ON= -DEVHTP_DISABLE_EVTHR:STRING=ON EVHTP_DISABLE_EVTHR_CMAKE_OFF= -DEVHTP_DISABLE_EVTHR:STRING=OFF EVHTP_DISABLE_REGEX_DESC= Disable regex support EVHTP_DISABLE_REGEX_CMAKE_ON= -DEVHTP_DISABLE_REGEX:STRING=ON EVHTP_DISABLE_REGEX_CMAKE_OFF= -DEVHTP_DISABLE_REGEX:STRING=OFF EVHTP_BUILD_SHARED_DESC= Build shared library too EVHTP_BUILD_SHARED_CMAKE_ON= -DEVHTP_BUILD_SHARED:STRING=ON EVHTP_BUILD_SHARED_CMAKE_OFF= -DEVHTP_BUILD_SHARED:STRING=OFF 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 OPTIONS_DEFAULT= EVHTP_BUILD_SHARED .include -PLIST_FILES= include/evhtp.h\ +PLIST_FILES= include/evhtp.h \ include/evhtp-config.h \ - include/evthr.h \ include/htparse.h -.if !exists(${LOCALBASE}/include/onigposix.h) +.if !exists(${LOCALBASE}/include/onigposix.h) && !${PORT_OPTIONS:MEVHTP_DISABLE_REGEX} PLIST_FILES+= include/onigposix.h +.endif + +.if !${PORT_OPTIONS:MEVHTP_DISABLE_EVTHR} +PLIST_FILES+= include/evthr.h .endif .if ${PORT_OPTIONS:MEVHTP_BUILD_SHARED} PLIST_FILES+= lib/libevhtp.so .else PLIST_FILES+= lib/libevhtp.a .endif .include Index: head/www/libevhtp/distinfo =================================================================== --- head/www/libevhtp/distinfo (revision 400487) +++ head/www/libevhtp/distinfo (revision 400488) @@ -1,2 +1,2 @@ -SHA256 (ellzey-libevhtp-1.2.9-3886506_GH0.tar.gz) = b012587dfbf3e12fb2939d4f4856f966513c754bd6f0accffff8d8edef3b629d -SIZE (ellzey-libevhtp-1.2.9-3886506_GH0.tar.gz) = 360681 +SHA256 (ellzey-libevhtp-1.2.10-ba4c44e_GH0.tar.gz) = d5b022e2a3847ed7344bc7bca7ac7feb6b4a7e877d12452a15a96ba1c760d25a +SIZE (ellzey-libevhtp-1.2.10-ba4c44e_GH0.tar.gz) = 373482 Index: head/www/libevhtp/files/patch-evhtp.c =================================================================== --- head/www/libevhtp/files/patch-evhtp.c (revision 400487) +++ head/www/libevhtp/files/patch-evhtp.c (revision 400488) @@ -1,25 +1,25 @@ ---- evhtp.c.orig 2014-03-23 11:50:50.000000000 +0000 -+++ evhtp.c 2014-09-13 12:37:11.000000000 +0000 +--- evhtp.c.orig 2015-02-24 07:55:55 UTC ++++ evhtp.c @@ -7,6 +7,7 @@ #include #include #ifndef WIN32 +#include #include #include #include -@@ -2740,7 +2741,14 @@ +@@ -3170,7 +3171,14 @@ evhtp_bind_sockaddr(evhtp_t * htp, struc sock = evconnlistener_get_fd(htp->server); +#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 Index: head/www/libevhtp/files/patch-evhtp.h =================================================================== --- head/www/libevhtp/files/patch-evhtp.h (nonexistent) +++ head/www/libevhtp/files/patch-evhtp.h (revision 400488) @@ -0,0 +1,11 @@ +--- 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 + + Property changes on: head/www/libevhtp/files/patch-evhtp.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property