From nobody@FreeBSD.org  Fri Feb  7 01:44:47 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id B21ABD40
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  7 Feb 2014 01:44:47 +0000 (UTC)
Received: from oldred.freebsd.org (oldred.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 9D2B21C80
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  7 Feb 2014 01:44:47 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id s171ikHE052600
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 7 Feb 2014 01:44:46 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id s171ikVQ052599;
	Fri, 7 Feb 2014 01:44:46 GMT
	(envelope-from nobody)
Message-Id: <201402070144.s171ikVQ052599@oldred.freebsd.org>
Date: Fri, 7 Feb 2014 01:44:46 GMT
From: Walter Hop <walter@lifeforms.nl>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] Update www/mod_security to 2.7.7
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         186524
>Category:       ports
>Synopsis:       [patch] Update www/mod_security to 2.7.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ohauer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 07 01:50:00 UTC 2014
>Closed-Date:    Fri Feb 07 20:30:06 UTC 2014
>Last-Modified:  Fri Feb  7 20:40:00 UTC 2014
>Originator:     Walter Hop
>Release:        
>Organization:
>Environment:
>Description:
Update ModSecurity from 2.7.4 to latest version 2.7.7 (minor bugfixes).

Port built, unit tests run, in-house stress test/regression test run.
Also running in production for some time.

Tested on:
- FreeBSD 8.4 amd64 + Apache 2.2.25
- FreeBSD 9.2 amd64 + Apache 2.4.6
- FreeBSD 10.0 amd64 + Apache 2.4.6

I'd be happy to maintain this port going forward. At times it has lagged a bit; we like to track new versions more closely.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 343179)
+++ Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mod_security
-PORTVERSION=	2.7.4
+PORTVERSION=	2.7.7
 PORTREVISION=	2
 CATEGORIES=	www security
 MASTER_SITES=	http://www.modsecurity.org/tarball/${PORTVERSION}/
Index: distinfo
===================================================================
--- distinfo	(revision 343179)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (modsecurity-apache_2.7.4.tar.gz) = 605d6f1b03e648001ef1c7db7b18d51c01edd443b57cbbd4e298770ffdcd0eb9
-SIZE (modsecurity-apache_2.7.4.tar.gz) = 1014983
+SHA256 (modsecurity-apache_2.7.7.tar.gz) = 11e05cfa6b363c2844c6412a40ff16f0021e302152b38870fd1f2f44b204379b
+SIZE (modsecurity-apache_2.7.7.tar.gz) = 1003835


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->apache 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Feb 7 01:50:08 UTC 2014 
Responsible-Changed-Why:  
apache@ wants this port PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186524 
Responsible-Changed-From-To: apache->ohauer 
Responsible-Changed-By: ohauer 
Responsible-Changed-When: Fri Feb 7 06:15:13 UTC 2014 
Responsible-Changed-Why:  
I'll take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186524 
State-Changed-From-To: open->closed 
State-Changed-By: ohauer 
State-Changed-When: Fri Feb 7 20:29:14 UTC 2014 
State-Changed-Why:  
Committed together with some Makefile cleanup 
Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186524 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/186524: commit references a PR
Date: Fri,  7 Feb 2014 20:23:22 +0000 (UTC)

 Author: ohauer
 Date: Fri Feb  7 20:23:14 2014
 New Revision: 343295
 URL: http://svnweb.freebsd.org/changeset/ports/343295
 QAT: https://qat.redports.org/buildarchive/r343295/
 
 Log:
   - update to version 2.7.7 [1]
   
   - Makefile cleanup
    - remove unused variables
    - use explicit OPTIONSFILE
    - mlogc is build and installed unless explicit disabled,
      remove useless Makefile instructions
   
   - pass MAINTAINER to submitter [1]
   
   Changelog:
   https://raw.github.com/SpiderLabs/ModSecurity/master/CHANGES
   
   PR:		ports/186524 [1]
   Submitted by:	Walter Hop <walter@lifeforms.nl> (new port maintainer)
 
 Modified:
   head/www/mod_security/Makefile
   head/www/mod_security/distinfo
 
 Modified: head/www/mod_security/Makefile
 ==============================================================================
 --- head/www/mod_security/Makefile	Fri Feb  7 20:22:00 2014	(r343294)
 +++ head/www/mod_security/Makefile	Fri Feb  7 20:23:14 2014	(r343295)
 @@ -1,14 +1,13 @@
  # $FreeBSD$
  
  PORTNAME=	mod_security
 -PORTVERSION=	2.7.4
 -PORTREVISION=	2
 +PORTVERSION=	2.7.7
  CATEGORIES=	www security
  MASTER_SITES=	http://www.modsecurity.org/tarball/${PORTVERSION}/
  PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
  DISTNAME=	${PORTNAME:S/_//:S/2//}-apache_${PORTVERSION}
  
 -MAINTAINER=	ports@FreeBSD.org
 +MAINTAINER=	walter@lifeforms.nl
  COMMENT=	Intrusion detection and prevention engine
  
  LICENSE=	APACHE20
 @@ -17,18 +16,21 @@ LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/dev
  		libapr-1.so:${PORTSDIR}/devel/apr1
  
  USE_APACHE=	22+
 +USE_GNOME=	libxml2
  GNU_CONFIGURE=	yes
 +
  AP_GENPLIST=	yes
  AP_INC=	${LOCALBASE}/include/libxml2
  AP_LIB=	${LOCALBASE}/lib
 -USE_GNOME=	libxml2
  MODULENAME=	mod_security2
  SRC_FILE=	*.c
 +
  PORTDOCS=	*
 -DOCS=		CHANGES LICENSE README.TXT modsecurity.conf-minimal
  DOCSDIR=	${PREFIX}/share/doc/${MODULENAME}
 +
  SUB_FILES+=	mod_security2.conf
  SUB_LIST+=	APACHEETCDIR="${APACHEETCDIR}"
 +
  PLIST_FILES=	etc/modsecurity.conf-example \
  		${APACHEMODDIR}/mod_security2.so \
  		bin/rules-updater.pl \
 @@ -46,28 +48,22 @@ MLOGC_CONFIGURE_OFF=	--disable-mlogc
  MLOGC_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
  MLOGC_PLIST_FILES=	bin/mlogc bin/mlogc-batch-load.pl
  
 +# ap2x- prefix OPTIONSFILE fix
 +OPTIONSFILE=	${PORT_DBDIR}/www_mod_security/options
  .include <bsd.port.options.mk>
  
  REINPLACE_ARGS=	-i ""
  AP_EXTRAS+=	-DWITH_LIBXML2
  CONFIGURE_ARGS+=	--with-apxs=${APXS} --with-pcre=${LOCALBASE}
  
 -post-build:
 -.if ${PORT_OPTIONS:MMLOGC}
 -	# XXX there is "mlogc-static" target in the Makefile, too
 -	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} mlogc
 -.endif
 -
  pre-install:
  	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
  
  post-install:
  	${INSTALL_DATA} ${WRKSRC}/modsecurity.conf-recommended \
  		${STAGEDIR}${PREFIX}/etc/modsecurity.conf-example
 +
  	@${MKDIR} ${STAGEDIR}${DOCSDIR}
  	(cd ${WRKSRC} && ${COPYTREE_SHARE} "doc" ${STAGEDIR}${DOCSDIR})
 -.if ${PORT_OPTIONS:MMLOGC}
 -	${INSTALL_PROGRAM} ${WRKSRC}/mlogc/mlogc ${STAGEDIR}${PREFIX}/bin
 -.endif
  
  .include <bsd.port.mk>
 
 Modified: head/www/mod_security/distinfo
 ==============================================================================
 --- head/www/mod_security/distinfo	Fri Feb  7 20:22:00 2014	(r343294)
 +++ head/www/mod_security/distinfo	Fri Feb  7 20:23:14 2014	(r343295)
 @@ -1,2 +1,2 @@
 -SHA256 (modsecurity-apache_2.7.4.tar.gz) = 605d6f1b03e648001ef1c7db7b18d51c01edd443b57cbbd4e298770ffdcd0eb9
 -SIZE (modsecurity-apache_2.7.4.tar.gz) = 1014983
 +SHA256 (modsecurity-apache_2.7.7.tar.gz) = 11e05cfa6b363c2844c6412a40ff16f0021e302152b38870fd1f2f44b204379b
 +SIZE (modsecurity-apache_2.7.7.tar.gz) = 1003835
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
