Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 Nov 2018 14:28:49 +0000 (UTC)
From:      =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org>
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
Message-ID:  <201811271428.wARESnL1066464@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811271428.wARESnL1066464>