From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1212666-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 0F9DD138359
	for <garchives@archives.gentoo.org>; Wed,  7 Oct 2020 18:58:27 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 61F09E0843;
	Wed,  7 Oct 2020 18:58:26 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 37AEFE0843
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Oct 2020 18:58:26 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 2705C340C80
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Oct 2020 18:58:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id C86AB332
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Oct 2020 18:58:23 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1602097097.df0f81ee11f036df6b46f5b6d968295335ef532d.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apache/modsecurity-crs/
X-VCS-Repository: repo/gentoo
X-VCS-Files: www-apache/modsecurity-crs/Manifest www-apache/modsecurity-crs/metadata.xml www-apache/modsecurity-crs/modsecurity-crs-3.3.0.ebuild
X-VCS-Directories: www-apache/modsecurity-crs/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: df0f81ee11f036df6b46f5b6d968295335ef532d
X-VCS-Branch: master
Date: Wed,  7 Oct 2020 18:58:23 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: bc3c2082-f9c0-4769-8078-347f40106611
X-Archives-Hash: 1c04dc6d83a992ac9816c078295ef23d

commit:     df0f81ee11f036df6b46f5b6d968295335ef532d
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu Oct  1 18:39:07 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct  7 18:58:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df0f81ee

www-apache/modsecurity-crs: bump to 3.3.0

Closes: https://bugs.gentoo.org/706148
Bug: https://bugs.gentoo.org/719250
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17741
Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-apache/modsecurity-crs/Manifest                |  1 +
 www-apache/modsecurity-crs/metadata.xml            |  2 +-
 .../modsecurity-crs/modsecurity-crs-3.3.0.ebuild   | 33 ++++++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest
index 869ccd079b4..06878bd7d39 100644
--- a/www-apache/modsecurity-crs/Manifest
+++ b/www-apache/modsecurity-crs/Manifest
@@ -1,2 +1,3 @@
 DIST modsecurity-crs-3.0.2.tar.gz 156751 BLAKE2B 111a330b6081d476899be321e15d74379b3c3db23f429a4a4ef1900c87e4b29229638acf3bb367745446ef97ccba4679db91b0d84bae93f2c127bbb6e8031851 SHA512 ae8fe9a0f00a57708c8680cb76882214e4f5ff647e13087aaf1bfc7382cefb38d2f3a88eb1f210031b553f56d3e44c12dbdc68f8b0d09fb4a9e2f15a70d885aa
 DIST modsecurity-crs-3.1.0.tar.gz 250617 BLAKE2B 6081d09e90f3c18435e046264ff8c0b700fd0c8c2b6377f44517fce3ad74dcf1d6a8cf7eaf055b85040b21196b603bcb762f5a7ed237d14b6a05f1febd623cda SHA512 d613d2af8248424ac5d4d006a9f221b07c714fb47f84e6ec237b1389379b50dce984f51121cc22b69d148910169b5257b11558656640bc8349d0b09d9e70bb11
+DIST modsecurity-crs-3.3.0.tar.gz 290379 BLAKE2B 557a41e937564698809ecca40d4e76e5c1d3617b62189b7ca230ac7533cba14fdf619bef81c1e40a996dd260d2eb52c27563437dd795c2412bf38715f026f300 SHA512 12043aae12b5e01455e229136411e1fdef3a14318aff191d190b567463b63efb72630a695449b56f1d654ed1cfc0b4eb452a64502c35337d37cce920d5fa4ea4

diff --git a/www-apache/modsecurity-crs/metadata.xml b/www-apache/modsecurity-crs/metadata.xml
index 3947bbf17be..64361f081f7 100644
--- a/www-apache/modsecurity-crs/metadata.xml
+++ b/www-apache/modsecurity-crs/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
   <!--maintainer-needed-->
   <upstream>
-    <remote-id type="github">SpiderLabs/owasp-modsecurity-crs</remote-id>
+    <remote-id type="github">coreruleset/coreruleset</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/www-apache/modsecurity-crs/modsecurity-crs-3.3.0.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-3.3.0.ebuild
new file mode 100644
index 00000000000..985caa85072
--- /dev/null
+++ b/www-apache/modsecurity-crs/modsecurity-crs-3.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="OWASP ModSecurity Core Rule Set"
+HOMEPAGE="https://coreruleset.org/"
+SRC_URI="https://github.com/coreruleset/coreruleset/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=www-apache/mod_security-2.9.1"
+
+S="${WORKDIR}/coreruleset-${PV}"
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r rules
+
+	dodoc CHANGES CONTRIBUTORS.md KNOWN_BUGS README.md crs-setup.conf.example
+
+	# I don't think it's worth pulling in apache-module.eclass just for
+	# this path...
+	insinto /etc/apache2/modules.d
+	doins "${FILESDIR}/80_mod_security-crs.conf"
+}
+
+pkg_postinst() {
+	einfo "The CRS configuration file has been installed to:"
+	einfo "  ${ROOT}/etc/apache2/modules.d/80_mod_security-crs.conf"
+}