From owner-svn-ports-head@freebsd.org Thu Jan 4 19:13:16 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C4052EAF7B6; Thu, 4 Jan 2018 19:13:16 +0000 (UTC) (envelope-from ultima@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9CB4F7A8A3; Thu, 4 Jan 2018 19:13:16 +0000 (UTC) (envelope-from ultima@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w04JDF1q026832; Thu, 4 Jan 2018 19:13:15 GMT (envelope-from ultima@FreeBSD.org) Received: (from ultima@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w04JDFhf026828; Thu, 4 Jan 2018 19:13:15 GMT (envelope-from ultima@FreeBSD.org) Message-Id: <201801041913.w04JDFhf026828@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ultima set sender to ultima@FreeBSD.org using -f From: Richard Gallamore Date: Thu, 4 Jan 2018 19:13:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458045 - in head/www/libevhtp: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ultima X-SVN-Commit-Paths: in head/www/libevhtp: . files X-SVN-Commit-Revision: 458045 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jan 2018 19:13:16 -0000 Author: ultima Date: Thu Jan 4 19:13:15 2018 New Revision: 458045 URL: https://svnweb.freebsd.org/changeset/ports/458045 Log: * 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 Added: head/www/libevhtp/files/patch-CMakeLists.txt (contents, props changed) Deleted: head/www/libevhtp/files/patch-evhtp.c Modified: head/www/libevhtp/Makefile head/www/libevhtp/distinfo head/www/libevhtp/pkg-plist Modified: head/www/libevhtp/Makefile ============================================================================== --- head/www/libevhtp/Makefile Thu Jan 4 19:09:13 2018 (r458044) +++ head/www/libevhtp/Makefile Thu Jan 4 19:13:15 2018 (r458045) @@ -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 +REGEX_CMAKE_BOOL_OFF= EVHTP_DISABLE_REGEX +REGEX_LIB_DEPENDS= libonig.so:devel/oniguruma -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"/ ; s//"evthr.h"/ ; s//"htparse.h"/' \ - ${WRKSRC}/evhtp.h ${WRKSRC}/evthr.h +SSL_CMAKE_BOOL_OFF= EVHTP_DISABLE_SSL +SSL_USES= ssl -post-build: - @${REINPLACE_CMD} 's//"onigposix.h"/' \ - ${WRKSRC}/evhtp.h +THREADS_CMAKE_BOOL_OFF= EVHTP_DISABLE_EVTHR + +STATIC_CMAKE_BOOL_OFF= EVHTP_BUILD_SHARED .include Modified: head/www/libevhtp/distinfo ============================================================================== --- head/www/libevhtp/distinfo Thu Jan 4 19:09:13 2018 (r458044) +++ head/www/libevhtp/distinfo Thu Jan 4 19:13:15 2018 (r458045) @@ -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 Added: head/www/libevhtp/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/libevhtp/files/patch-CMakeLists.txt Thu Jan 4 19:13:15 2018 (r458045) @@ -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) Modified: head/www/libevhtp/pkg-plist ============================================================================== --- head/www/libevhtp/pkg-plist Thu Jan 4 19:09:13 2018 (r458044) +++ head/www/libevhtp/pkg-plist Thu Jan 4 19:13:15 2018 (r458045) @@ -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