Attachment 168797 Details for Bug 208144 – improved diff

[patch] improved diff

mod_security.2.9.1.diff (text/plain), 3.31 KB, created by Walter Hop on 2016-03-30 19:26:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Hop

Created: 2016-03-30 19:26:40 UTC

Size: 3.31 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 412188)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mod_security
>-PORTVERSION=	2.9.0
>+PORTVERSION=	2.9.1
> CATEGORIES=	www security
> MASTER_SITES=	http://www.modsecurity.org/tarball/${PORTVERSION}/
> PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
>@@ -45,7 +45,7 @@
> 
> LUA_CONFIGURE_ON=	--with-lua=${LOCALBASE}
> LUA_CONFIGURE_OFF+=	--without-lua
>-LUA_USES=		lua:51
>+LUA_USES=		lua:51+
> 
> MLOGC_DESC=		Build ModSecurity Log Collector
> MLOGC_CONFIGURE_ON=	--disable-errors
>Index: distinfo
>===================================================================
>--- distinfo	(revision 412188)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (modsecurity-2.9.0.tar.gz) = e2bbf789966c1f80094d88d9085a81bde082b2054f8e38e0db571ca49208f434
>-SIZE (modsecurity-2.9.0.tar.gz) = 4246467
>+SHA256 (modsecurity-2.9.1.tar.gz) = 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24
>+SIZE (modsecurity-2.9.1.tar.gz) = 4261212
>Index: files/README.in
>===================================================================
>--- files/README.in	(revision 412188)
>+++ files/README.in	(working copy)
>@@ -3,9 +3,13 @@
> 
> To enable ModSecurity in Apache, add the following to your httpd.conf:
> 
>+  LoadModule unique_id_module %%APACHEMODDIR%%/mod_unique_id.so
>   LoadModule security2_module %%APACHEMODDIR%%/mod_security2.so
>-  Include etc/modsecurity/*.conf
>+  Include %%ETCDIR%%/*.conf
> 
>+ModSecurity has various configuration options.
>+To change them, edit modsecurity/modsecurity.conf.
>+
> Getting the Core Rule Set
> -------------------------
> 
>@@ -16,11 +20,13 @@
> under it.
> 
>   pkg install git
>-  cd /usr/local/etc/modsecurity
>+  cd %%ETCDIR%%
>   git clone https://github.com/SpiderLabs/owasp-modsecurity-crs
>   cp owasp-modsecurity-crs/modsecurity_crs_10_setup.conf.example \
>     crs.conf
> 
>+The CRS has various config options. To change them, edit crs.conf.
>+
> To activate the CRS base rules, add the following to your httpd.conf:
> 
>   Include etc/modsecurity/owasp-modsecurity-crs/base_rules/*.conf
>@@ -78,6 +84,6 @@
> You probably want to keep the CRS updated from time to time. You can
> do this with Git:
> 
>-  cd /usr/local/etc/modsecurity/owasp-modsecurity-crs
>+  cd %%ETCDIR%%/owasp-modsecurity-crs
>   git pull
>   apachectl restart
>Index: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(revision 412188)
>+++ files/pkg-message.in	(working copy)
>@@ -2,8 +2,9 @@
> You have installed ModSecurity.
> To enable ModSecurity in Apache, add the following to your httpd.conf:
> 
>+  LoadModule unique_id_module %%APACHEMODDIR%%/mod_unique_id.so
>   LoadModule security2_module %%APACHEMODDIR%%/mod_security2.so
>-  Include etc/modsecurity/*.conf
>+  Include %%ETCDIR%%/*.conf
> 
> Most users will use the signatures from the OWASP Core Rule Set (CRS).
> For configuration instructions, see %%DOCSDIR%%/README.
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 412188)
>+++ pkg-plist	(working copy)
>@@ -1,7 +1,6 @@
> bin/rules-updater.pl
> lib/mod_security2.so
> %%APACHEMODDIR%%/mod_security2.so
>-@comment @exec %%APXS%% -e -n unique_id -a %%APACHEMODDIR%%/mod_unique_id.so
> @sample %%ETCDIR%%/modsecurity.conf.sample
> %%ETCDIR%%/unicode.mapping
> %%MLOGC%%bin/mlogc

Flags:

walter: maintainer-approval+

Actions: View | Diff

Attachments on bug 208144: 168395 | 168396 | 168797 | 168798 | 169078 | 169368