From 1702f7912bf8474005fab962e43ca92c9db581ce Mon Sep 17 00:00:00 2001
From: Gerben Jan Dijkman <gjdijkman@gjdwebserver.nl>
Date: Sat, 23 Mar 2024 22:49:05 +0100
Subject: [PATCH] Version bumps

---
 net-fs/s3fs/Manifest                          |  1 +
 net-fs/s3fs/s3fs-1.94.ebuild                  | 67 +++++++++++++++++++
 www-apache/modsecurity-crs/Manifest           |  3 +-
 .../modsecurity-crs-4.0.0.ebuild              | 45 +++++++++++++
 4 files changed, 115 insertions(+), 1 deletion(-)
 create mode 100644 net-fs/s3fs/s3fs-1.94.ebuild
 create mode 100644 www-apache/modsecurity-crs/modsecurity-crs-4.0.0.ebuild

diff --git a/net-fs/s3fs/Manifest b/net-fs/s3fs/Manifest
index 3d9e249..bf655a3 100644
--- a/net-fs/s3fs/Manifest
+++ b/net-fs/s3fs/Manifest
@@ -1 +1,2 @@
 DIST s3fs-1.93.tar.gz 284353 BLAKE2B bae0d850f69f04b18327790406260721a0a2d981f5b2cbc8e6ebc059f4db83bd0810780b68d334a50cbba4654301a395683a778567ce3f08d4b9f69fef5ed282 SHA512 613ad713ac426236b471aa4b2f8292ee0558017f149bfe51aa7fad1bacd60fccf00c31404ebc14b692787e524704e9cd9111b84540f1309ba99900d42d03dc5d
+DIST s3fs-1.94.tar.gz 291170 BLAKE2B 86a0271cfedc38778b4e8a50cb4515a3b921e0c69618ff7b2db411a95c3ed37e43f5e394c47937fd9072530177faf4f014e395feb519e995bf386d538318d3bf SHA512 1a29d4f0b73f844ea1d4ad6e0b36d601fb7ab5818af0a90564b77182564c04fbef308362a9a749038b17f28f07f79b6debb661610f69c039a405b931361abe9c
diff --git a/net-fs/s3fs/s3fs-1.94.ebuild b/net-fs/s3fs/s3fs-1.94.ebuild
new file mode 100644
index 0000000..008ac85
--- /dev/null
+++ b/net-fs/s3fs/s3fs-1.94.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_PN=${PN}-fuse
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Amazon S3 mounting via fuse"
+HOMEPAGE="https://github.com/s3fs-fuse/s3fs-fuse/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86 ~arm ~arm64"
+IUSE="gnutls nettle nss"
+REQUIRED_USE="nettle? ( gnutls !nss )"
+
+# Requires active internet connection and it tries to download some binaries for later execution
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/libxml2:2
+	net-misc/curl
+	sys-fs/fuse:0
+	nss? ( dev-libs/nss )
+	!nss? (
+		gnutls? (
+			net-libs/gnutls:=
+			nettle? ( dev-libs/nettle:= )
+		)
+		!gnutls? ( dev-libs/openssl:0= )
+	)
+"
+
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	sed -i 's/ -D_FORTIFY_SOURCE=3//' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with nettle)
+	)
+	if use nss; then
+		myeconfargs+=( $(use_with nss) )
+	elif use gnutls; then
+		myeconfargs+=( $(use_with gnutls) )
+	else
+		myeconfargs+=( --with-openssl )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest
index 5f0b906..42d6a88 100644
--- a/www-apache/modsecurity-crs/Manifest
+++ b/www-apache/modsecurity-crs/Manifest
@@ -1,2 +1,3 @@
-DIST modsecurity-crs-3.3.4.tar.gz 301112 BLAKE2B 0df4b70c5ecc1852fe3cde74783494636c530cc8a2b8ddc0269da25703521532ee3ed6ba1e572b854fe6912f31d2ed1fe4c917b13dc22b37763dbe73ef8c7b72 SHA512 a8b8b210054a9a4e3f8e45a5a9428110bb4075e40430e3fc16f4717e363af141265b1fb5c173ff96abeff0ac61ef5eef667a4b9cb703f8edc15e48deb3342827
 DIST modsecurity-crs-3.3.5.tar.gz 299458 BLAKE2B b8617de77cf5168c7b95fab46eae45e2101b4ec7a537d8d471b9b1b27a856b1d370a9de43ee262c07dc9371b3ff79cd86b7328b171fde003da9110897206e91e SHA512 001f9afe25f479dd988aaec1a4a2c0197b2d27e00d2cd10b70892e4889b399259cd0655f42a96965ae655855abdb7f9d8295c225ae17bf1e47361b70232633e5
+DIST modsecurity-crs-4.0.0.tar.gz 504720 BLAKE2B e6da0268ae9209179d1f6cefba34e097b614dd4659a4b4df2ef3e6a0b32be7be9d825beaf6d8ca1fbef0dd27217b4707090844e59eaa817111be4a6f8333e205 SHA512 c25bfd6de772815977783e78d7afd388d60bbba151762a38c7050fd5ecde6a48baa0a850028a24d42855ae4a788404ad1ee0f7a4ad2d94d53a46e261a00f7224
+DIST modsecurity-crs-4.0.0_rc2.tar.gz 491479 BLAKE2B 71a016b7e45a991373357ece9cc7a59afe54daf91ffa826b76fd4a986b6e8989efb54ca3b83fac9307cf6ede1e1f7a78f9534cc5682e63ea3d75b9092c295d30 SHA512 302129aa3c476afd84b41bfdf73afaa1561f300ecad6ea3540d977639dc3c2167169298fbbe453ceb108d10dee3835b2e4f30f0c12cc413d3acd530906123021
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-4.0.0.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-4.0.0.ebuild
new file mode 100644
index 0000000..1a0a134
--- /dev/null
+++ b/www-apache/modsecurity-crs/modsecurity-crs-4.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="OWASP ModSecurity Core Rule Set"
+HOMEPAGE="https://coreruleset.org/"
+SRC_URI="https://github.com/coreruleset/coreruleset/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/coreruleset-${MY_PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+apache2"
+
+RDEPEND="apache2? ( >=www-apache/mod_security-2.9.6 )"
+
+DOCS=( CHANGES.md CONTRIBUTORS.md crs-setup.conf.example KNOWN_BUGS.md README.md )
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r plugins rules
+
+	einstalldocs
+
+	if use apache2; then
+		# 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"
+	fi
+}
+
+pkg_postinst() {
+	if use apache2; then
+		einfo "The CRS configuration file has been installed to:"
+		einfo "  ${ROOT}/etc/apache2/modules.d/80_mod_security-crs.conf"
+	fi
+
+	optfeature "apache-less installations, e.g. nginx" dev-libs/modsecurity
+}