gentoo resync : 31.03.2018

2 files changed, 0 insertions, 138 deletions

diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest
index 12ab97c4de24..09a7331eca8c 100644
--- a/www-apache/modsecurity-crs/Manifest
+++ b/www-apache/modsecurity-crs/Manifest
@@ -1,9 +1,7 @@
 AUX 80_mod_security-crs.conf 289 BLAKE2B 441b2f4d46e62ff24886b94dc933b08de8693ad7198cc855a8b0c322ba045e6409b7d3b7b2e2fdc0bd412ee9fdd3761987d59f405de5a84d5e8c96d2dd14ab76 SHA512 e5b86164a68e15d67a294688c993799fca10928c1265cee04555becfb17fb516314471d8c4eaea1205ac1703890cedb4647d93ce75b0a2a1ab9a401a495465dc
-DIST modsecurity-crs-2.2.6.tar.gz 291070 BLAKE2B 6bb86d3592a08c5ded133838d498ceda1955f2b82e47884b0df0c28e69a80426052019c43ca90dbf30598752c4c0df60b2348675fc0c10ebc3bb4d5b16b352de SHA512 0e6c2735814dd24ba2329bc756e382b0430937a703d492b2ac00f95af6598903961b43013e99cd49240fe6b7a5439a7b1b3e79c3b7a48828465252dafd586165
 DIST modsecurity-crs-2.2.7.tar.gz 294137 BLAKE2B 399c72d5c52f2914e8f92c813b6ac346bbd2858d34b61ff4845dbbc7671ff7ffa906b43e2d8e3283a5f30b2fec59395b81239c121c953d51d736b009bc86f4bb SHA512 d0d3dac1b391c8ab730cc16546c9508d93c85dd674b2750d12fff99c17e5575b36bea0cf00e06fdd20c2db5dfdbdc3fd7bbaa26502988617632acfde1ee88927
 DIST modsecurity-crs-2.2.9.tar.gz 279898 BLAKE2B 75e9c5c9fb0fdf3957b17926b923d1d26b44677fc30556bf58d0b44d73918f7f65052714a7c67c53fc312f81a28422025303674f934f085929e8f4b9ea9fc063 SHA512 fc95cfff9d4ba9a4478c704e5d16e4054e514eb3ffb6343706840aad76607f997b4cc4b8b148adc5cb83743ea7996328d35b8556115de29d6a0e034b67591a09
 DIST modsecurity-crs-3.0.2.tar.gz 156751 BLAKE2B 111a330b6081d476899be321e15d74379b3c3db23f429a4a4ef1900c87e4b29229638acf3bb367745446ef97ccba4679db91b0d84bae93f2c127bbb6e8031851 SHA512 ae8fe9a0f00a57708c8680cb76882214e4f5ff647e13087aaf1bfc7382cefb38d2f3a88eb1f210031b553f56d3e44c12dbdc68f8b0d09fb4a9e2f15a70d885aa
-EBUILD modsecurity-crs-2.2.6-r1.ebuild 4139 BLAKE2B 20a1b0a271d6cb73ea49d2e08c992e0ba78792d7c5543cd3c4b3b45240a4a6f9ae0a09d98c55446329d07096476d9fae6a646f1f1aa5ba27f277cf430c6d5817 SHA512 d05973d37550531e6dcc6c73d2d1ae4e2ca874f87f3b6773be13a3a3e7afd1a790e7be7daf694b8a0a187e78e342dff54760bc028cdb2258c823e699fcb81db5
 EBUILD modsecurity-crs-2.2.7.ebuild 4071 BLAKE2B 6c8831153ed31180e48ecb9ba05de5f58dbe38d9415f137484cea026c074b1d20f6c2aa79db619977d4124e2ccab29cbcce9aa300a49cce8665db01dc12e2c21 SHA512 9e876a537185a2acf610bf0873ea9bbcd9c078884f5f4e3a6c40d71488417fa03993fe9fad309b72c1a5b7427d2c9e201e2a1e9dd0d56ff8343a5e4019f60a5f
 EBUILD modsecurity-crs-2.2.9.ebuild 4162 BLAKE2B 12e50701df749e76d7e705da5241f4b954c38f7a174b7bed9477df9462ada0e74ab63fc60d41635d30efd27455b1f0df1f2b7f167b8c2fcbf3d748ca1ab48204 SHA512 68d0bc9a0f02ee6451ea2efb47c6db7f950917a0beb8628aa43e6f11ae639fb8bb91b38becab4b4a9cbda9e7ca70a71ff8034180b85a2f20bbf49afce1c37278
 EBUILD modsecurity-crs-3.0.2.ebuild 1452 BLAKE2B bfecfa797608b97d4817e726b7f8c45ac45cf05c397bf04fa4ae8ae5507a40bb2ef79173142b8b689a2951bcbdce907659db7a184c92cda2e60300e4bc2e1f6a SHA512 8627119dcf5338c33e6c7ffa24c69ed43102252d71c511f0c2466785f50d45c794183957efaa49c32af54b2881415ebab561aaf169d7e0b0550802ba9c82dccc
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-2.2.6-r1.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-2.2.6-r1.ebuild
deleted file mode 100644
index ca7ba53a426e..000000000000
--- a/www-apache/modsecurity-crs/modsecurity-crs-2.2.6-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-GITHUB_USER=SpiderLabs
-GITHUB_PROJECT=owasp-${PN}
-
-DESCRIPTION="Core Rule Set for ModSecurity"
-HOMEPAGE="http://www.owasp.org/index.php/Category:OWASP_ModSecurity_Core_Rule_Set_Project"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="lua geoip"
-
-RDEPEND=">=www-apache/mod_security-2.7[lua?,geoip?]"
-DEPEND=""
-
-S="${WORKDIR}/${P}"
-
-RULESDIR=/etc/modsecurity
-LUADIR=/usr/share/${PN}/lua
-
-src_unpack() {
-	default
-	mv "${WORKDIR}/${GITHUB_USER}-${GITHUB_PROJECT}-"* "${P}" || die
-}
-
-src_prepare() {
-	if ! use lua; then
-		# comment out this since it's in the same file as another one we want to keep
-		sed -i -e "/id:'96000[456]'/s:^:#:" \
-			experimental_rules/modsecurity_crs_61_ip_forensics.conf || die
-
-		# remove these that rely on the presence of the lua files
-		rm \
-			experimental_rules/modsecurity_crs_16_scanner_integration.conf \
-			experimental_rules/modsecurity_crs_40_appsensor_detection_point_2.1_request_exception.conf \
-			experimental_rules/modsecurity_crs_41_advanced_filters.conf \
-			experimental_rules/modsecurity_crs_55_response_profiling.conf \
-			experimental_rules/modsecurity_crs_56_pvi_checks.conf \
-			|| die
-	else
-		# fix up the path to the scripts; there seems to be no
-		# consistency at all on how the rules are loaded.
-		sed -i \
-			-e "s:/etc/apache2/modsecurity-crs/lua/:${LUADIR}/:" \
-			-e "s:profile_page_scripts.lua:${LUADIR}/\0:" \
-			-e "s:/usr/local/apache/conf/crs/lua/:${LUADIR}/:" \
-			-e "s:/usr/local/apache/conf/modsec_current/base_rules/:${LUADIR}/:" \
-			-e "s:/etc/apache2/modsecurity-crs/lua/:${LUADIR}/:" \
-			-e "s:\.\./lua/:${LUADIR}/:" \
-			*_rules/*.conf || die
-
-		# fix up the shebang on the scripts
-		sed -i -e "s:/opt/local/bin/lua:/usr/bin/lua:" \
-			lua/*.lua || die
-	fi
-
-	sed -i \
-		-e '/SecGeoLookupDb/s:^:#:' \
-		-e '/SecGeoLookupDb/a# Gentoo already defines it in 79_modsecurity.conf' \
-		experimental_rules/modsecurity_crs_61_ip_forensics.conf || die
-
-	if ! use geoip; then
-		if use lua; then
-			# only comment this out as the file is going to be used for other things
-			sed -i -e "/id:'960007'/,+1 s:^:#:" \
-				experimental_rules/modsecurity_crs_61_ip_forensics.conf || die
-		else
-			rm experimental_rules/modsecurity_crs_61_ip_forensics.conf || die
-		fi
-	fi
-}
-
-src_install() {
-	insinto "${RULESDIR}"
-	# slr_rules as of 2.2.6 have broken IDs that don't work with
-	# ModSecurity 2.7, but the rules require 2.7 to begin with.
-	doins -r base_rules optional_rules experimental_rules #slr_rules
-
-	insinto "${LUADIR}"
-	doins lua/*.lua
-
-	dodoc CHANGELOG README.md
-
-	(
-		cat - <<EOF
-<IfDefine SECURITY>
-EOF
-
-		cat modsecurity_crs_10_setup.conf.example
-
-		cat - <<EOF
-
-Include /etc/modsecurity/base_rules/*.conf
-
-# Include Trustwave SpiderLabs Research Team rules
-# Include /etc/modsecurity/slr_rules/*.conf
-# Not installed yet as of 2.2.6
-
-# Optionally use the other rules as well
-# Include /etc/modsecurity/optional_rules/*.conf
-# Include /etc/modsecurity/experimental_rules/*.conf
-</IfDefine>
-
-# -*- apache -*-
-# vim: ts=4 filetype=apache
-
-EOF
-	) > "${T}"/"80_${PN}.conf"
-
-	insinto /etc/apache2/modules.d/
-	doins "${T}"/"80_${PN}.conf"
-}
-
-pkg_postinst() {
-	elog
-	elog "If you want to enable further rules, check the following directories:"
-	elog "	${RULESDIR}/optional_rules"
-	elog "	${RULESDIR}/experimental_rules"
-	elog ""
-	elog "Starting from version 2.0.9, the default for the Core Rule Set is again to block"
-	elog "when rules hit. If you wish to go back to the 2.0.8 method of anomaly scoring, you"
-	elog "should change 80_${PN}.conf so that you have these settings enabled:"
-	elog ""
-	elog "    #SecDefaultAction \"phase:2,deny,log\""
-	elog "    SecAction \"phase:1,t:none,nolog,pass,setvar:tx.anomaly_score_blocking=on\""
-	elog ""
-	elog "Starting from version 2.1.2 rules are installed, for consistency, under"
-	elog "/etc/modsecurity, and can be configured with the following file:"
-	elog "  /etc/apache2/modules.d/80_${PN}.conf"
-	elog ""
-}