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

[Florian Schmaus]

commit:     6197678f3ab2b2e03bfecdb9165cef3513ad7a54
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon Feb 21 17:15:11 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Feb 26 20:26:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6197678f

net-fs/s3fs: add 1.90

It includes patch for musl support which is taken from upstream.

Upstream-commit: 4dfe2bfdd742 ("Include climits to support musl libc")
Upstream-issue: https://github.com/s3fs-fuse/s3fs-fuse/pull/1888
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/24302
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-fs/s3fs/Manifest                       |  1 +
 net-fs/s3fs/files/s3fs-1.90-musl-fix.patch | 18 +++++++++
 net-fs/s3fs/s3fs-1.90.ebuild               | 59 ++++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+)

diff --git a/net-fs/s3fs/Manifest b/net-fs/s3fs/Manifest
index b91c61d45bea..d71b218b7f9a 100644
--- a/net-fs/s3fs/Manifest
+++ b/net-fs/s3fs/Manifest
@@ -1,2 +1,3 @@
 DIST s3fs-1.86.tar.gz 183636 BLAKE2B 78996960725699fee4c0c2b131c227acc073fca407f1057ae636167a7a2313e460f1e3a89c7d8a3741987d8ba46ab1827f8f7c882261ed78bb5c5148ce935d42 SHA512 a4f79d9ae526427d5d41b5cd1519e4aac605e8bbd97079aec2a67562f0322fa5664d770d565aed4fca83ae254ab3c0454d25f4b86ec4d148a57c7745e07f5e14
 DIST s3fs-1.89.tar.gz 221263 BLAKE2B cf84709acd6820d67b2b84fba1ebb4dcbd491f30df704ff78d8967619d1b7775fc2e4c1b3eec736243f77dc8fb9f01d7d0dcefe5a521dfaeb118b006c8a2e40b SHA512 650a7ea4d9197f310d8c24d76460a47e62e1d467b68dab0c78041c8e7dbb49c3983893680e53fe5f01a578fff96d2723b547fbd62d8f3efbc5188207da9d4e97
+DIST s3fs-1.90.tar.gz 231942 BLAKE2B 3e4de5f2deda82febd7be176657e6e5ad31da90fed07c2ecf719f0f30d048d03bbcde6fe5628346ba0b4adb4a74fb0c78fbd4882a5e7d6f98fa301b32945a93c SHA512 f1b74676b9c83e5b99bdd59666eea8cdcd9a6fcd2f9237aaf33fd6e12d642f26ee11a3c3ffb0248ea7ce24ac31ae45eeb5f2bd7f04b8e91ed8a04004d59a550d

diff --git a/net-fs/s3fs/files/s3fs-1.90-musl-fix.patch b/net-fs/s3fs/files/s3fs-1.90-musl-fix.patch
new file mode 100644
index 000000000000..bb746e54aa9a
--- /dev/null
+++ b/net-fs/s3fs/files/s3fs-1.90-musl-fix.patch
@@ -0,0 +1,18 @@
+Upstream-issue: https://github.com/s3fs-fuse/s3fs-fuse/pull/1888
+Upstream-commit: 4dfe2bfdd742 ("Include climits to support musl libc")
+
+diff --git a/src/fdcache.cpp b/src/fdcache.cpp
+index 3ececd3..3ad876d 100644
+--- a/src/fdcache.cpp
++++ b/src/fdcache.cpp
+@@ -21,6 +21,7 @@
+ #include <cstdio>
+ #include <cstdlib>
+ #include <cerrno>
++#include <climits>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <dirent.h>
+-- 
+2.34.1
+

diff --git a/net-fs/s3fs/s3fs-1.90.ebuild b/net-fs/s3fs/s3fs-1.90.ebuild
new file mode 100644
index 000000000000..600ab37c4930
--- /dev/null
+++ b/net-fs/s3fs/s3fs-1.90.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 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 +openssl test"
+REQUIRED_USE="
+	^^ ( gnutls nss openssl )
+	nettle? ( gnutls )"
+
+# Requires active internet connection
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/libxml2:2
+	net-misc/curl
+	sys-fs/fuse:0
+	gnutls? ( net-libs/gnutls:= )
+	nettle? ( dev-libs/nettle:= )
+	nss? ( dev-libs/nss )
+	openssl? ( dev-libs/openssl:0= )
+"
+
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${P}-musl-fix.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with gnutls)
+		$(use_with nettle)
+		$(use_with nss)
+		$(use_with openssl)
+	)
+	econf "${myeconfargs[@]}"
+}