From owner-svn-ports-all@FreeBSD.ORG Fri Feb 7 20:23:15 2014 Return-Path: Delivered-To: svn-ports-all@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 17BBE5C2; Fri, 7 Feb 2014 20:23:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 014DE15AE; Fri, 7 Feb 2014 20:23:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s17KNE8o096635; Fri, 7 Feb 2014 20:23:14 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s17KNE9e096633; Fri, 7 Feb 2014 20:23:14 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201402072023.s17KNE9e096633@svn.freebsd.org> From: Olli Hauer Date: Fri, 7 Feb 2014 20:23:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343295 - head/www/mod_security X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 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: Fri, 07 Feb 2014 20:23:15 -0000 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 (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 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 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