* Updated to 1.2.15

* Uses system oniguruma when REGEX option is enabled, default on

Reviewed by:	mat
MFH:		2018Q1
Security:	https://vuxml.freebsd.org/freebsd/b396cf6c-62e6-11e7-9def-b499baebfeaf.html
Differential Revision:	https://reviews.freebsd.org/D13742

5 files changed, 35 insertions, 59 deletions

diff --git a/www/libevhtp/Makefile b/www/libevhtp/Makefile
index a56fb9183db..344f7e04cc3 100644
--- a/www/libevhtp/Makefile
+++ b/www/libevhtp/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libevhtp
-PORTVERSION=	1.2.11
-PORTREVISION=	4
+PORTVERSION=	1.2.15
 CATEGORIES=	www
 
 MAINTAINER=	ultima@FreeBSD.org
@@ -13,35 +12,28 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	ellzey
-
 USES=		cmake:outsource
 USE_LDCONFIG=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	criticalstack
+
 CMAKE_ARGS=	-DCMAKE_INCLUDE_PATH:PATH=include/event2 \
 		-DCMAKE_LIBRARY_PATH:PATH=lib/event2
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-OPTIONS_DEFINE=	SSL THREADS STATIC DEBUG
-OPTIONS_DEFAULT=SSL THREADS
+OPTIONS_DEFINE=	REGEX SSL THREADS STATIC DEBUG
+OPTIONS_DEFAULT=REGEX SSL THREADS
 OPTIONS_SUB=	yes
 
-SSL_CMAKE_ON=		-DEVHTP_DISABLE_SSL:STRING=OFF
-SSL_CMAKE_OFF=		-DEVHTP_DISABLE_SSL:STRING=ON
-THREADS_CMAKE_ON=	-DEVHTP_DISABLE_EVTHR:STRING=OFF
-THREADS_CMAKE_OFF=	-DEVHTP_DISABLE_EVTHR:STRING=ON
-STATIC_CMAKE_ON=	-DEVHTP_BUILD_SHARED:STRING=OFF
-STATIC_CMAKE_OFF=	-DEVHTP_BUILD_SHARED:STRING=ON
-
-post-patch:
-	@${REINPLACE_CMD} '/HAS_SYS_ONIG onig/d ; s/lib\/pkgconfig/libdata\/pkgconfig/ ; s/PATCH_VERSION [0-9]*/PATCH_VERSION ${PORTVERSION:S/1.2.//}/' \
-		${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} 's/<evhtp-config.h>/"evhtp-config.h"/ ; s/<evthr.h>/"evthr.h"/ ; s/<htparse.h>/"htparse.h"/' \
-	 ${WRKSRC}/evhtp.h ${WRKSRC}/evthr.h
-
-post-build:
-	@${REINPLACE_CMD} 's/<onigposix.h>/"onigposix.h"/' \
-		${WRKSRC}/evhtp.h
+REGEX_CMAKE_BOOL_OFF=	EVHTP_DISABLE_REGEX
+REGEX_LIB_DEPENDS=	libonig.so:devel/oniguruma
+
+SSL_CMAKE_BOOL_OFF=	EVHTP_DISABLE_SSL
+SSL_USES=		ssl
+
+THREADS_CMAKE_BOOL_OFF=	EVHTP_DISABLE_EVTHR
+
+STATIC_CMAKE_BOOL_OFF=	EVHTP_BUILD_SHARED
 
 .include <bsd.port.mk>
diff --git a/www/libevhtp/distinfo b/www/libevhtp/distinfo
index a8843f109c1..84630a1ba02 100644
--- a/www/libevhtp/distinfo
+++ b/www/libevhtp/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ellzey-libevhtp-1.2.11_GH0.tar.gz) = 0e60ef0b75c9e0351d18e015c9a688a70d9c66d2ca3f6a44a7da7153e11e067d
-SIZE (ellzey-libevhtp-1.2.11_GH0.tar.gz) = 429931
+TIMESTAMP = 1514908590
+SHA256 (criticalstack-libevhtp-1.2.15_GH0.tar.gz) = f78ee8a34492e266fc1b6b9d4003825659df672da1cf918120217a0ee0d14ed3
+SIZE (criticalstack-libevhtp-1.2.15_GH0.tar.gz) = 171933
diff --git a/www/libevhtp/files/patch-CMakeLists.txt b/www/libevhtp/files/patch-CMakeLists.txt
new file mode 100644
index 00000000000..424edb036f4
--- /dev/null
+++ b/www/libevhtp/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2018-01-02 16:30:26 UTC
++++ CMakeLists.txt
+@@ -196,7 +196,7 @@ add_library           (evhtp ${EVHTP_LIBTYPE} ${LIBEVH
+ target_link_libraries (evhtp ${LIBEVHTP_EXTERNAL_LIBS})
+ 
+ if (EVHTP_BUILD_SHARED)
+-        set_target_properties(evhtp PROPERTIES VERSION "${PROJECT_VERSION}" 0 OUTPUT_NAME "evhtp")
++        set_target_properties(evhtp PROPERTIES VERSION "${PROJECT_VERSION}" SOVERSION 0 OUTPUT_NAME "evhtp")
+ endif()
+ 
+ add_subdirectory(examples)
diff --git a/www/libevhtp/files/patch-evhtp.c b/www/libevhtp/files/patch-evhtp.c
deleted file mode 100644
index e7fa521a7a9..00000000000
--- a/www/libevhtp/files/patch-evhtp.c
+++ /dev/null
@@ -1,29 +0,0 @@
-### Description: Commit 67ed0bc caused ports to break, this
-### patch will revert the commits until a proper fix is created.
-### Issue ID: https://github.com/ellzey/libevhtp/issues/201
-### https://github.com/ellzey/libevhtp/commit/67ed0bce433655dfeab65b797279dd167b394feb
---- evhtp.c.orig	2015-11-02 23:01:53 UTC
-+++ evhtp.c
-@@ -1673,12 +1673,10 @@ check_proto:
-                                          evhtp_header_new("Connection", "close", 0, 0));
-             }
- 
--#if 0
--            if (!out_len && !evhtp_header_find(request->headers_out, "Content-Length")) {
-+            if (!evhtp_header_find(request->headers_out, "Content-Length")) {
-                 evhtp_headers_add_header(request->headers_out,
-                                          evhtp_header_new("Content-Length", "0", 0, 0));
-             }
--#endif
- 
-             break;
-         case EVHTP_PROTO_10:
-@@ -2356,7 +2354,7 @@ evhtp_connection_pause(evhtp_connection_
- 
-     c->paused = 1;
- 
--    bufferevent_disable(c->bev, EV_READ | EV_WRITE);
-+    bufferevent_disable(c->bev, EV_READ);
- 
-     return;
- }
diff --git a/www/libevhtp/pkg-plist b/www/libevhtp/pkg-plist
index ec47131ac1d..09a50e696ec 100644
--- a/www/libevhtp/pkg-plist
+++ b/www/libevhtp/pkg-plist
@@ -1,9 +1,10 @@
+include/evhtp.h
+include/evhtp/config.h
 include/evhtp/evhtp.h
-include/evhtp/evhtp-config.h
-include/evhtp/htparse.h
-libdata/pkgconfig/evhtp.pc
+include/evhtp/parser.h
+%%THREADS%%include/evhtp/thread.h
 %%NO_STATIC%%lib/libevhtp.so
+%%NO_STATIC%%lib/libevhtp.so.0
 %%NO_STATIC%%lib/libevhtp.so.%%PORTVERSION%%
-include/evhtp/onigposix.h
-%%THREADS%%include/evhtp/evthr.h
 %%STATIC%%lib/libevhtp.a
+libdata/pkgconfig/evhtp.pc