From owner-svn-ports-all@freebsd.org Tue Nov 27 14:28:52 2018 Return-Path: Delivered-To: svn-ports-all@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 444C0114E3A8; Tue, 27 Nov 2018 14:28:52 +0000 (UTC) (envelope-from des@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 D4A7B7DD33; Tue, 27 Nov 2018 14:28:51 +0000 (UTC) (envelope-from des@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 B170C1C7DB; Tue, 27 Nov 2018 14:28:51 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wARESp6B066474; Tue, 27 Nov 2018 14:28:51 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wARESnL1066464; Tue, 27 Nov 2018 14:28:49 GMT (envelope-from des@FreeBSD.org) Message-Id: <201811271428.wARESnL1066464@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Tue, 27 Nov 2018 14:28:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486012 - in head: . security security/modsecurity3 www www/mod_security3 www/nginx www/nginx-devel X-SVN-Group: ports-head X-SVN-Commit-Author: des X-SVN-Commit-Paths: in head: . security security/modsecurity3 www www/mod_security3 www/nginx www/nginx-devel X-SVN-Commit-Revision: 486012 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D4A7B7DD33 X-Spamd-Result: default: False [1.76 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.57)[0.566,0]; NEURAL_SPAM_MEDIUM(0.69)[0.687,0]; NEURAL_SPAM_LONG(0.51)[0.511,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2018 14:28:52 -0000 Author: des Date: Tue Nov 27 14:28:49 2018 New Revision: 486012 URL: https://svnweb.freebsd.org/changeset/ports/486012 Log: Rename www/mod_security3 to security/modsecurity3. It is not an Apache module, and the upstream name is ModSecurity in a single word. PR: 233351 Submitted by: Marie Helene Kvello-Aune, Marius Halden (maintainer) Differential Revision: https://reviews.freebsd.org/D18353 Added: head/security/modsecurity3/ - copied from r486011, head/www/mod_security3/ Deleted: head/www/mod_security3/ Modified: head/MOVED head/security/Makefile head/security/modsecurity3/Makefile head/www/Makefile head/www/nginx-devel/Makefile head/www/nginx-devel/Makefile.extmod head/www/nginx-devel/Makefile.options.desc head/www/nginx/Makefile head/www/nginx/Makefile.extmod head/www/nginx/Makefile.options.desc Modified: head/MOVED ============================================================================== --- head/MOVED Tue Nov 27 14:02:33 2018 (r486011) +++ head/MOVED Tue Nov 27 14:28:49 2018 (r486012) @@ -10642,3 +10642,4 @@ devel/giggle|devel/gitg|2018-11-23|Has expired: Develo net/rubygem-gitaly-proto094|net/rubygem-gitaly-proto|2018-11-24|Use net/rubygem-gitaly-proto instead www/rubygem-toml-rb03|www/rubygem-toml-rb|2018-11-25|Has expired: Obsoleted by update of www/gitlab. Please use www/rubygem-tom-rb instead. dns/dnscheck||2018-11-27|Unmaintained upstream over a decade +www/mod_security3|security/modsecurity3|2018-11-27|Not an Apache module, use correct upstream name Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Tue Nov 27 14:02:33 2018 (r486011) +++ head/security/Makefile Tue Nov 27 14:28:49 2018 (r486012) @@ -423,6 +423,7 @@ SUBDIR += mhash SUBDIR += mindterm-binary SUBDIR += minisign + SUBDIR += modsecurity3 SUBDIR += monkeysphere SUBDIR += morphis SUBDIR += munge Modified: head/security/modsecurity3/Makefile ============================================================================== --- head/www/mod_security3/Makefile Tue Nov 27 14:02:33 2018 (r486011) +++ head/security/modsecurity3/Makefile Tue Nov 27 14:28:49 2018 (r486012) @@ -1,10 +1,10 @@ # $FreeBSD$ -PORTNAME= mod_security +PORTNAME= modsecurity DISTVERSIONPREFIX= v DISTVERSION= 3.0.2 -PORTREVISION= 1 -CATEGORIES= www security +PORTREVISION= 2 +CATEGORIES= security www PKGNAMESUFFIX= 3 MAINTAINER= marius.halden@modirum.com @@ -17,7 +17,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libyajl.so:devel/yajl \ libGeoIP.so:net/GeoIP -USES= autoreconf compiler:c++11-lang gmake libtool pkgconfig:build +USES= autoreconf compiler:c++11-lang gmake gnome libtool pkgconfig:build USE_GNOME= libxml2 # GCC because of https://github.com/SpiderLabs/ModSecurity/issues/1411 USE_GCC= yes @@ -33,6 +33,8 @@ GH_TUPLE+= client9:libinjection:da027ab:libinjection/o GH_TUPLE+= SpiderLabs:ModSecurity-Python-bindings:bc625d5:modsecurity_python_bindings/bindings/python ETCDIR= ${PREFIX}/etc/modsecurity + +CONFLICTS_INSTALL= ap??-mod_security mod_security3 post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Tue Nov 27 14:02:33 2018 (r486011) +++ head/www/Makefile Tue Nov 27 14:28:49 2018 (r486012) @@ -476,7 +476,6 @@ SUBDIR += mod_rpaf2 SUBDIR += mod_scgi SUBDIR += mod_security - SUBDIR += mod_security3 SUBDIR += mod_setenvifplus SUBDIR += mod_tidy SUBDIR += mod_tsa Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Tue Nov 27 14:02:33 2018 (r486011) +++ head/www/nginx-devel/Makefile Tue Nov 27 14:28:49 2018 (r486012) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.15.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ \ LOCAL/osa Modified: head/www/nginx-devel/Makefile.extmod ============================================================================== --- head/www/nginx-devel/Makefile.extmod Tue Nov 27 14:02:33 2018 (r486011) +++ head/www/nginx-devel/Makefile.extmod Tue Nov 27 14:28:49 2018 (r486012) @@ -211,7 +211,7 @@ MODSECURITY_DISTFILES= modsecurity-2.9.2.tar.gz:modse 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_LIB_DEPENDS= libmodsecurity.so:security/modsecurity3 MODSECURITY3_GH_TUPLE= SpiderLabs:ModSecurity-nginx:4cde86b:modsec MODSECURITY3_CONFIGURE_ON= --add-module=${WRKSRC_modsec} Modified: head/www/nginx-devel/Makefile.options.desc ============================================================================== --- head/www/nginx-devel/Makefile.options.desc Tue Nov 27 14:02:33 2018 (r486011) +++ head/www/nginx-devel/Makefile.options.desc Tue Nov 27 14:28:49 2018 (r486012) @@ -84,7 +84,7 @@ MAIL_POP3_DESC= Enable POP3 proxy module MAIL_SMTP_DESC= Enable SMTP proxy module MAIL_SSL_DESC= Enable mail_ssl module MEMC_DESC= 3rd party memc (memcached) module -MODSECURITY3_DESC= 3rd party mod_security v3 module +MODSECURITY3_DESC= 3rd party modsecurity3 module MODSECURITY_DESC= 3rd party mod_security module NAXSI_DESC= 3rd party naxsi module NJS_DESC= Enable http_javascript module Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Tue Nov 27 14:02:33 2018 (r486011) +++ head/www/nginx/Makefile Tue Nov 27 14:28:49 2018 (r486012) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.14.1 -PORTREVISION?= 2 +PORTREVISION?= 3 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ \ Modified: head/www/nginx/Makefile.extmod ============================================================================== --- head/www/nginx/Makefile.extmod Tue Nov 27 14:02:33 2018 (r486011) +++ head/www/nginx/Makefile.extmod Tue Nov 27 14:28:49 2018 (r486012) @@ -215,7 +215,7 @@ MODSECURITY_DISTFILES= modsecurity-2.9.2.tar.gz:modse 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_LIB_DEPENDS= libmodsecurity.so:security/modsecurity3 MODSECURITY3_GH_TUPLE= SpiderLabs:ModSecurity-nginx:e4df1aa:modsec MODSECURITY3_CONFIGURE_ON= --add-module=${WRKSRC_modsec} Modified: head/www/nginx/Makefile.options.desc ============================================================================== --- head/www/nginx/Makefile.options.desc Tue Nov 27 14:02:33 2018 (r486011) +++ head/www/nginx/Makefile.options.desc Tue Nov 27 14:28:49 2018 (r486012) @@ -84,7 +84,7 @@ MAIL_POP3_DESC= Enable POP3 proxy module MAIL_SMTP_DESC= Enable SMTP proxy module MAIL_SSL_DESC= Enable mail_ssl module MEMC_DESC= 3rd party memc (memcached) module -MODSECURITY3_DESC= 3rd party mod_security v3 module +MODSECURITY3_DESC= 3rd party modsecurity3 module MODSECURITY_DESC= 3rd party mod_security module NAXSI_DESC= 3rd party naxsi module NJS_DESC= Enable http_javascript module