[gentoo-commits] repo/gentoo:master commit in: net-fs/s3fs/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     8765e3d0ba2ac52728ada06e260f92e9a3a1d687
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon May 22 13:41:42 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat May 27 07:49:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8765e3d0

net-fs/s3fs: add 1.92

- update the ssl REQUIRED_USE logic as suggested in #781908
- remove hardcoded -D_FORTIFY_SOURCE=2 flag
- remove unused test USE flag

Closes: https://bugs.gentoo.org/781908
Bug: https://bugs.gentoo.org/895676
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/31126
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-fs/s3fs/Manifest         |  1 +
 net-fs/s3fs/metadata.xml     |  2 +-
 net-fs/s3fs/s3fs-1.92.ebuild | 67 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/net-fs/s3fs/Manifest b/net-fs/s3fs/Manifest
index f9af151c0d1b..698cf9099571 100644
--- a/net-fs/s3fs/Manifest
+++ b/net-fs/s3fs/Manifest
@@ -1 +1,2 @@
 DIST s3fs-1.91.tar.gz 242590 BLAKE2B b65119f480b35a6325fa6d498e260309f65778abf97fc9f82bf423004e142f998a1c4b5c80c74a2932a6fa714956fd4f6a0b71e102061ff4f08ff0a82bdbb05c SHA512 5b57af18395f34885b4b8a98e93b0e3f9043c9af78e415a0a6c15489611d7e21ae619e69655737de369edee15762d8726b82bc2651b5b7f5c20e26fe866a96bc
+DIST s3fs-1.92.tar.gz 283295 BLAKE2B 7286d3c8a83d87252db1b18b063f6704b128abdd957a9baeb204834b534a16a09d60a46507ae03633ce789e8127c7a480fb1e81b1fc1a3c8c7b69a79541abf11 SHA512 375492d63626f0b71583e735e43985045dd5d4ccad2e66ae5d1c7ea9d8e5e881993bf00e31bae96d55aa441fae555bc71ebcfd47f3d189f6c322ba441853a95f

diff --git a/net-fs/s3fs/metadata.xml b/net-fs/s3fs/metadata.xml
index 7656a3f39fbb..eb7977bc87e6 100644
--- a/net-fs/s3fs/metadata.xml
+++ b/net-fs/s3fs/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
-		<flag name="openssl">Enable <pkg>dev-libs/openssl</pkg> crypto backend</flag>
+		<flag name="openssl" restrict="&lt;net-fs/s3fs-1.92">Enable <pkg>dev-libs/openssl</pkg> crypto backend</flag>
 		<flag name="nss">Enable <pkg>dev-libs/nss</pkg> crypto backend</flag>
 		<flag name="gnutls">Enable <pkg>net-libs/gnutls</pkg> crypto backend</flag>
 		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> network functions with GnuTLS.</flag>

diff --git a/net-fs/s3fs/s3fs-1.92.ebuild b/net-fs/s3fs/s3fs-1.92.ebuild
new file mode 100644
index 000000000000..8f8f4e67cd0f
--- /dev/null
+++ b/net-fs/s3fs/s3fs-1.92.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 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"
+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=2//' configure.ac
+
+	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[@]}"
+}