From owner-svn-ports-head@freebsd.org Wed Jul 18 08:41:26 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E7918103EF9F; Wed, 18 Jul 2018 08:41:25 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9D83B8F92E; Wed, 18 Jul 2018 08:41:25 +0000 (UTC) (envelope-from joneum@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7F81E17D92; Wed, 18 Jul 2018 08:41:25 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6I8fPxf038352; Wed, 18 Jul 2018 08:41:25 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6I8fOJk038349; Wed, 18 Jul 2018 08:41:24 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201807180841.w6I8fOJk038349@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Wed, 18 Jul 2018 08:41:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474841 - in head/www/nginx: . files X-SVN-Group: ports-head X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in head/www/nginx: . files X-SVN-Commit-Revision: 474841 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.27 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: Wed, 18 Jul 2018 08:41:26 -0000 Author: joneum Date: Wed Jul 18 08:41:24 2018 New Revision: 474841 URL: https://svnweb.freebsd.org/changeset/ports/474841 Log: Update third-party-module: - modsecurity from 2.9.1 to 2.9.2 - remove needless patch Update LOCAL Mastersite Deleted: head/www/nginx/files/extra-patch-ngx_http_modsecurity.c Modified: head/www/nginx/Makefile head/www/nginx/Makefile.extmod head/www/nginx/distinfo head/www/nginx/files/extra-patch-nginx-modsecurity-configure Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Wed Jul 18 08:12:40 2018 (r474840) +++ head/www/nginx/Makefile Wed Jul 18 08:41:24 2018 (r474841) @@ -3,11 +3,11 @@ PORTNAME= nginx PORTVERSION= 1.14.0 -PORTREVISION?= 7 +PORTREVISION?= 8 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ \ - LOCAL/osa + LOCAL/joneum DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER?= joneum@FreeBSD.org Modified: head/www/nginx/Makefile.extmod ============================================================================== --- head/www/nginx/Makefile.extmod Wed Jul 18 08:12:40 2018 (r474840) +++ head/www/nginx/Makefile.extmod Wed Jul 18 08:41:24 2018 (r474841) @@ -211,11 +211,10 @@ MODSECURITY_LIB_DEPENDS= libapr-1.so:devel/apr1 \ libyajl.so:devel/yajl MODSECURITY_USE= GNOME=libxml2 MODSECURITY_USES= apache:2.2+ pkgconfig shebangfix -MODSECURITY_MASTER_SITES= http://www.modsecurity.org/tarball/2.9.1S/RC/rc/:modsecurity -MODSECURITY_DISTFILES= modsecurity-2.9.1.tar.gz:modsecurity -MODSECURITY_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-modsecurity-configure \ - ${PATCHDIR}/extra-patch-ngx_http_modsecurity.c -MODSECURITY_VARS= WRKSRC_modsecurity=${WRKDIR}/modsecurity-2.9.1 +MODSECURITY_MASTER_SITES= http://www.modsecurity.org/tarball/2.9.2S/RC/rc/:modsecurity +MODSECURITY_DISTFILES= modsecurity-2.9.2.tar.gz:modsecurity +MODSECURITY_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-modsecurity-configure +MODSECURITY_VARS= WRKSRC_modsecurity=${WRKDIR}/modsecurity-2.9.2 MODSECURITY3_LIB_DEPENDS= libmodsecurity.so:www/mod_security3 MODSECURITY3_GH_TUPLE= SpiderLabs:ModSecurity-nginx:4cde86b:modsec Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Wed Jul 18 08:12:40 2018 (r474840) +++ head/www/nginx/distinfo Wed Jul 18 08:41:24 2018 (r474841) @@ -13,8 +13,8 @@ SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053 SIZE (ngx_http_response-0.3.tar.gz) = 2244 SHA256 (08a395c66e42.tar.gz) = 53e440737ed1aff1f09fae150219a45f16add0c8d6e84546cb7d80f73ebffd90 SIZE (08a395c66e42.tar.gz) = 120603 -SHA256 (modsecurity-2.9.1.tar.gz) = 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24 -SIZE (modsecurity-2.9.1.tar.gz) = 4261212 +SHA256 (modsecurity-2.9.2.tar.gz) = 41a8f73476ec891f3a9e8736b98b64ea5c2105f1ce15ea57a1f05b4bf2ffaeb5 +SIZE (modsecurity-2.9.2.tar.gz) = 4298993 SHA256 (passenger-5.3.3.tar.gz) = 97c4f023894215ac672cc6515cc22a74167a2ee4937709e267065a80c716c90f SIZE (passenger-5.3.3.tar.gz) = 7040055 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1 Modified: head/www/nginx/files/extra-patch-nginx-modsecurity-configure ============================================================================== --- head/www/nginx/files/extra-patch-nginx-modsecurity-configure Wed Jul 18 08:12:40 2018 (r474840) +++ head/www/nginx/files/extra-patch-nginx-modsecurity-configure Wed Jul 18 08:41:24 2018 (r474841) @@ -1,6 +1,6 @@ ---- ../modsecurity-2.9.1/configure.orig 2016-02-07 12:45:53.346098000 -0500 -+++ ../modsecurity-2.9.1/configure 2016-02-07 12:47:50.081558000 -0500 -@@ -14949,7 +14949,7 @@ +--- ../modsecurity-2.9.2/configure.orig 2018-07-17 14:12:34.223173000 +0200 ++++ ../modsecurity-2.9.2/configure 2018-07-17 14:16:23.284534000 +0200 +@@ -15715,7 +15715,7 @@ LUA_CPPFLAGS="" LUA_LDADD="" LUA_LDFLAGS="" LUA_CONFIG=${PKG_CONFIG} @@ -9,7 +9,7 @@ LUA_SONAMES="so la sl dll dylib a" -@@ -14965,7 +14965,7 @@ +@@ -15731,7 +15731,7 @@ case "${with_lua}" in #( no) : test_paths= ;; #( yes) : @@ -18,7 +18,7 @@ *) : test_paths="${with_lua}" ;; esac -@@ -15019,7 +15019,7 @@ +@@ -15785,7 +15785,7 @@ $as_echo "$as_me: lua CFLAGS: $LUA_CFLAG LUA_LDADD="`${LUA_CONFIG} ${LUA_PKGNAME} --libs-only-l`" if test "$verbose_output" -eq 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: lua LDADD: $LUA_LDADD" >&5 $as_echo "$as_me: lua LDADD: $LUA_LDADD" >&6;}; fi