Attachment #192164 for bug #227245

Lines 1-8 Link Here

(-)www/mod_security3/Makefile (working copy) (-3 / +3 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2	PORTNAME= mod_security	2	PORTNAME= mod_security
3	DISTVERSION= 3.0.0	3	DISTVERSION= 3.0.1
4	PORTREVISION= 1
5	CATEGORIES= www security	4	CATEGORIES= www security
6	PKGNAMESUFFIX= 3	5	PKGNAMESUFFIX= 3
Lines 16-21 Link Here
16	libyajl.so:devel/yajl \	15	libyajl.so:devel/yajl \
17	libGeoIP.so:net/GeoIP	16	libGeoIP.so:net/GeoIP
		17	DISTVERSIONPREFIX= v
		18
18	USES= gmake autoreconf libtool pkgconfig:build	19	USES= gmake autoreconf libtool pkgconfig:build
19	USE_GNOME= libxml2	20	USE_GNOME= libxml2
20	# GCC because of https://github.com/SpiderLabs/ModSecurity/issues/1411	21	# GCC because of https://github.com/SpiderLabs/ModSecurity/issues/1411
Lines 26-32 Link Here
26	USE_GITHUB= yes	27	USE_GITHUB= yes
27	GH_ACCOUNT= SpiderLabs	28	GH_ACCOUNT= SpiderLabs
28	GH_PROJECT= ModSecurity	29	GH_PROJECT= ModSecurity
29	GH_TAGNAME= 0508395
30	GH_TUPLE+= SpiderLabs:secrules-language-tests:add8f63:secrules_language_tests/test/test-cases/secrules-language-tests	30	GH_TUPLE+= SpiderLabs:secrules-language-tests:add8f63:secrules_language_tests/test/test-cases/secrules-language-tests
31	GH_TUPLE+= client9:libinjection:da027ab:libinjection/others/libinjection	31	GH_TUPLE+= client9:libinjection:da027ab:libinjection/others/libinjection

Lines 1-6 Link Here

(-)www/mod_security3/distinfo (working copy) (-3 / +3 lines)
1	TIMESTAMP = 1518389737	1	TIMESTAMP = 1522743768
2	SHA256 (SpiderLabs-ModSecurity-3.0.0-0508395_GH0.tar.gz) = 21ff4e8efe57afce03af1bdf2394be59a66056a6322a419f923b0a07439c103f	2	SHA256 (SpiderLabs-ModSecurity-v3.0.1_GH0.tar.gz) = 578cff1de67213c858fdae9596dd13084ac970323b135ac5961be81d1f04491d
3	SIZE (SpiderLabs-ModSecurity-3.0.0-0508395_GH0.tar.gz) = 497929	3	SIZE (SpiderLabs-ModSecurity-v3.0.1_GH0.tar.gz) = 550815
4	SHA256 (SpiderLabs-secrules-language-tests-add8f63_GH0.tar.gz) = 18894cf90d6a1ade441053b2aa89fff495a50eec0c632d346cc223c692973cba	4	SHA256 (SpiderLabs-secrules-language-tests-add8f63_GH0.tar.gz) = 18894cf90d6a1ade441053b2aa89fff495a50eec0c632d346cc223c692973cba
5	SIZE (SpiderLabs-secrules-language-tests-add8f63_GH0.tar.gz) = 58901	5	SIZE (SpiderLabs-secrules-language-tests-add8f63_GH0.tar.gz) = 58901
6	SHA256 (client9-libinjection-da027ab_GH0.tar.gz) = 7eaa6306d13427e002f976d4ce1bf3aaa3f94e7dd4ada02a69354fa482e6afca	6	SHA256 (client9-libinjection-da027ab_GH0.tar.gz) = 7eaa6306d13427e002f976d4ce1bf3aaa3f94e7dd4ada02a69354fa482e6afca




--- configure.ac.orig  2018-04-02 00:23:25 UTC
+++ configure.ac
@@ -16,6 +16,9 @@ m4_define([msc_version_major], [MSC_MAJO
 m4_define([msc_version_minor], [MSC_MINOR])
 m4_define([msc_version_patchlevel], [MSC_PATCHLEVEL])

+m4_define([msc_version_c_plus_a], [m4_eval(msc_version_major + msc_version_minor)])
+
+
 m4_define([msc_version],
     [msc_version_major.msc_version_minor])

@@ -23,7 +26,7 @@ m4_define([msc_version_git],
     [m4_esyscmd_s(git describe)])

 m4_define([msc_version_info],
-    [msc_version_major:msc_version_minor:msc_version_patchlevel])
+    [msc_version_c_plus_a:msc_version_patchlevel:msc_version_minor])


 # Project Information




include/modsecurity/audit_log.h
include/modsecurity/collection/collection.h
include/modsecurity/collection/collections.h
include/modsecurity/collection/variable.h
include/modsecurity/debug_log.h
include/modsecurity/intervention.h
include/modsecurity/modsecurity.h

include/modsecurity/rules_properties.h
include/modsecurity/transaction.h
include/modsecurity/variable_origin.h
include/modsecurity/variable_value.h
lib/libmodsecurity.a
lib/libmodsecurity.so
lib/libmodsecurity.so.3
lib/libmodsecurity.so.3.0.1
@sample %%ETCDIR%%/modsecurity.conf.sample

Return to bug 227245

Line 0 Link Here

(-)www/mod_security3/files/patch-configure.ac (working copy) (+21 lines)
	1	--- configure.ac.orig 2018-04-02 00:23:25 UTC
	2	+++ configure.ac
	3	@@ -16,6 +16,9 @@ m4_define([msc_version_major], [MSC_MAJO
	4	m4_define([msc_version_minor], [MSC_MINOR])
	5	m4_define([msc_version_patchlevel], [MSC_PATCHLEVEL])
	6
	7	+m4_define([msc_version_c_plus_a], [m4_eval(msc_version_major + msc_version_minor)])
	8	+
	9	+
	10	m4_define([msc_version],
	11	[msc_version_major.msc_version_minor])
	12
	13	@@ -23,7 +26,7 @@ m4_define([msc_version_git],
	14	[m4_esyscmd_s(git describe)])
	15
	16	m4_define([msc_version_info],
	17	- [msc_version_major:msc_version_minor:msc_version_patchlevel])
	18	+ [msc_version_c_plus_a:msc_version_patchlevel:msc_version_minor])
	19
	20
	21	# Project Information

Lines 5-11 Link Here

(-)www/mod_security3/pkg-plist (working copy) (-2 / +2 lines)
5	include/modsecurity/audit_log.h	5	include/modsecurity/audit_log.h
6	include/modsecurity/collection/collection.h	6	include/modsecurity/collection/collection.h
7	include/modsecurity/collection/collections.h	7	include/modsecurity/collection/collections.h
8	include/modsecurity/collection/variable.h
9	include/modsecurity/debug_log.h	8	include/modsecurity/debug_log.h
10	include/modsecurity/intervention.h	9	include/modsecurity/intervention.h
11	include/modsecurity/modsecurity.h	10	include/modsecurity/modsecurity.h
Lines 17-24 Link Here
17	include/modsecurity/rules_properties.h	16	include/modsecurity/rules_properties.h
18	include/modsecurity/transaction.h	17	include/modsecurity/transaction.h
19	include/modsecurity/variable_origin.h	18	include/modsecurity/variable_origin.h
		19	include/modsecurity/variable_value.h
20	lib/libmodsecurity.a	20	lib/libmodsecurity.a
21	lib/libmodsecurity.so	21	lib/libmodsecurity.so
22	lib/libmodsecurity.so.3	22	lib/libmodsecurity.so.3
23	lib/libmodsecurity.so.3.0.0	23	lib/libmodsecurity.so.3.0.1
24	@sample %%ETCDIR%%/modsecurity.conf.sample	24	@sample %%ETCDIR%%/modsecurity.conf.sample