Attachment 101078 Details for Bug 140463 – file.diff

[patch] file.diff

file.diff (text/plain), 7.41 KB, created by Chris Petrik on 2009-11-11 02:00:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Petrik

Created: 2009-11-11 02:00:07 UTC

Size: 7.41 KB

patch

obsolete

>Index: mod_security/Makefile
>===================================================================
>RCS file: /usr/ncvs/ports/www/mod_security/Makefile,v
>retrieving revision 1.33
>diff -u -r1.33 Makefile
>--- mod_security/Makefile	22 Aug 2009 00:38:14 -0000	1.33
>+++ mod_security/Makefile	9 Nov 2009 01:47:37 -0000
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	mod_security
>-PORTVERSION=	2.5.9
>-PORTREVISION=	1
>+PORTVERSION=	2.5.11
> CATEGORIES=	www security
> MASTER_SITES=	SF/mod-security/modsecurity-apache/${PORTVERSION}
> DISTNAME=	${PORTNAME:S/_//:S/2//}-apache_${PORTVERSION}
>@@ -46,33 +45,49 @@
> SUB_FILES+=	pkg-message.rules
> .if defined(WITH_MLOGC)
> PLIST_FILES+=	bin/mlogc
>-.if ${OSVERSION} < 700000
>-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-fix-6.x-link
>-.endif
> .endif
> PLIST_DIRS+=	${APACHEETCDIR}/Includes/mod_security2/optional_rules
>+PLIST_DIRS+=	${APACHEETCDIR}/Includes/mod_security2/base_rules
>+PLIST_DIRS+=	${APACHEETCDIR}/Includes/mod_security2/util
> PLIST_DIRS+=	${APACHEETCDIR}/Includes/mod_security2
>-
> PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2.conf
> PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/CHANGELOG
> PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/LICENSE
> PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/README
>-PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/modsecurity_crs_23_request_limits.conf
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/util/modsec-clamscan.pl
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/util/runav.pl
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/util/httpd-guardian.pl
> PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/modsecurity_crs_10_config.conf
>-PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/modsecurity_crs_20_protocol_violations.conf
>-PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/modsecurity_crs_21_protocol_anomalies.conf
>-PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/modsecurity_crs_30_http_policy.conf
>-PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/modsecurity_crs_35_bad_robots.conf
>-PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/modsecurity_crs_40_generic_attacks.conf
>-PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/modsecurity_crs_45_trojans.conf
>-PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/modsecurity_crs_50_outbound.conf
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/modsecurity_crs_10_global_config.conf
> PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/optional_rules/modsecurity_crs_20_protocol_violations.conf
> PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/optional_rules/modsecurity_crs_21_protocol_anomalies.conf
> PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/optional_rules/modsecurity_crs_40_generic_attacks.conf
> PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/optional_rules/modsecurity_crs_42_comment_spam.conf
> PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/optional_rules/modsecurity_crs_42_tight_security.conf
> PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/optional_rules/modsecurity_crs_55_marketing.conf
>-
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_crs_41_xss_attacks.conf
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_41_sql_injection_attacks.data
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_crs_45_trojans.conf
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_crs_41_phpids_filters.conf
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_50_outbound.data
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_46_et_web_rules.data
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_crs_46_et_sql_injection.conf
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_crs_47_common_exceptions.conf
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_crs_41_phpids_converter.conf
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_crs_20_protocol_violations.conf
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_crs_49_enforcement.conf
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_crs_21_protocol_anomalies.conf
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_crs_35_bad_robots.conf
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_crs_30_http_policy.conf
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_crs_46_et_web_rules.conf
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_40_generic_attacks.data
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_crs_50_outbound.conf
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_46_et_sql_injection.data
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_crs_23_request_limits.conf
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_crs_41_sql_injection_attacks.conf
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_crs_40_generic_attacks.conf
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_crs_48_local_exceptions.conf
>+PLIST_FILES+=	${APACHEETCDIR}/Includes/mod_security2/base_rules/modsecurity_crs_60_correlation.conf
> .endif
> 
> .if defined(WITH_LUA)
>Index: mod_security/distinfo
>===================================================================
>RCS file: /usr/ncvs/ports/www/mod_security/distinfo,v
>retrieving revision 1.20
>diff -u -r1.20 distinfo
>--- mod_security/distinfo	23 Apr 2009 02:34:25 -0000	1.20
>+++ mod_security/distinfo	8 Nov 2009 22:59:27 -0000
>@@ -1,3 +1,3 @@
>-MD5 (modsecurity-apache_2.5.9.tar.gz) = b7bf44a7e041b49b0da5043495660375
>-SHA256 (modsecurity-apache_2.5.9.tar.gz) = 02352221ea268f8ae9aae5b84507f51eba2a67c0f7d2efd5cc88e85f1f394056
>-SIZE (modsecurity-apache_2.5.9.tar.gz) = 1252295
>+MD5 (modsecurity-apache_2.5.11.tar.gz) = 66cd4e5eed674ac3a0013b7229a1c2bb
>+SHA256 (modsecurity-apache_2.5.11.tar.gz) = fd81a8998327ef2010426fcc2899312eddfe4dc462c417e9e7aeb64a6d4ed2bf
>+SIZE (modsecurity-apache_2.5.11.tar.gz) = 1338425
>Index: mod_security/files/extra-patch-fix-6.x-link
>===================================================================
>RCS file: mod_security/files/extra-patch-fix-6.x-link
>diff -N mod_security/files/extra-patch-fix-6.x-link
>--- mod_security/files/extra-patch-fix-6.x-link	11 Aug 2009 12:26:49 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- mlogc-src/Makefile.in.orig	2008-09-02 23:10:36.000000000 +0000
>-+++ mlogc-src/Makefile.in	2009-08-09 20:24:50.000000000 +0000
>-@@ -10,7 +10,7 @@
>- MLOGC_VERSION = `grep '^\#define *VERSION ' mlogc.c | sed 's/.*VERSION *"$[^"]*$"/\1/'`
>- 
>- APR_FLAGS = @APR_CFLAGS@
>--APR_LIBS = @APR_LINK_LD@
>-+APR_LIBS = @APR_LINK_LD@ @APR_LIBS@
>- 
>- CURL_FLAGS = @CURL_CFLAGS@
>- CURL_LIBS = @CURL_LIBS@
>Index: mod_security/files/patch-configure
>===================================================================
>RCS file: mod_security/files/patch-configure
>diff -N mod_security/files/patch-configure
>--- mod_security/files/patch-configure	20 Jul 2008 17:59:44 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- configure.orig	2008-06-04 09:32:50.000000000 +0900
>-+++ configure	2008-06-04 09:35:07.000000000 +0900
>-@@ -5132,7 +5132,7 @@
>- 
>- 
>- LUA_CONFIG="pkg-config"
>--LUA_PKGNAMES="lua5.1 lua5 lua"
>-+LUA_PKGNAMES="lua5.1 lua5 lua lua-%%LUA_VER%% "
>- LUA_CFLAGS=""
>- LUA_LIBS=""
>-

Actions: View | Diff

Attachments on bug 140463: 101078