From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- net-fs/s3fs/Manifest | 9 ++++- net-fs/s3fs/files/s3fs-1.90-musl-fix.patch | 18 +++++++++ net-fs/s3fs/metadata.xml | 9 +---- net-fs/s3fs/s3fs-1.89.ebuild | 4 +- net-fs/s3fs/s3fs-1.90.ebuild | 59 ++++++++++++++++++++++++++++++ net-fs/s3fs/s3fs-1.91.ebuild | 57 +++++++++++++++++++++++++++++ 6 files changed, 144 insertions(+), 12 deletions(-) create mode 100644 net-fs/s3fs/files/s3fs-1.90-musl-fix.patch create mode 100644 net-fs/s3fs/s3fs-1.90.ebuild create mode 100644 net-fs/s3fs/s3fs-1.91.ebuild (limited to 'net-fs/s3fs') diff --git a/net-fs/s3fs/Manifest b/net-fs/s3fs/Manifest index 8c447bf4710a..b9f3565274c1 100644 --- a/net-fs/s3fs/Manifest +++ b/net-fs/s3fs/Manifest @@ -1,5 +1,10 @@ +AUX s3fs-1.90-musl-fix.patch 432 BLAKE2B de9ed5d6950149ac83d8dcb3bd0fa567a81b6dd256f53f3a50b533d133642a93b2e07d06da484e8b9b681c57cb2bcecc48011694674c0de60c6e178635f64b72 SHA512 96402a3894d4b3ec886fb839d527f3f4927cf3b802e50e49bdee580d8eb82c663828ca24464a9f9e6419893aea4801fc6b652684523d0d8c1e49f4a398eebb34 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 +DIST s3fs-1.91.tar.gz 242590 BLAKE2B b65119f480b35a6325fa6d498e260309f65778abf97fc9f82bf423004e142f998a1c4b5c80c74a2932a6fa714956fd4f6a0b71e102061ff4f08ff0a82bdbb05c SHA512 5b57af18395f34885b4b8a98e93b0e3f9043c9af78e415a0a6c15489611d7e21ae619e69655737de369edee15762d8726b82bc2651b5b7f5c20e26fe866a96bc EBUILD s3fs-1.86.ebuild 1024 BLAKE2B 8d887d990ef79f356ba1809a21c2f001f92a80963f0b83f8423ee6e9e5dceb5b1bf6a545efb6e006d19c21b9051090176281f9cde9af82a6911f423c1aefa1b5 SHA512 71d89d945b64bb46ea29ec07ddab19a73c01d89284492f32a11877eb0d41bd314d8b3d441e78897d9fff36d93c52ff7b4cea2bb4d7b52b06ceee61615095f3ad -EBUILD s3fs-1.89.ebuild 1026 BLAKE2B b7c3a1c12aa97e757161b0e635c87aefb6bcd466139751aa42ec1862722c300f9f361bbe1214b9ff92a51eef9dd81e9d5978547ffed8607a7713c85fdd87e76f SHA512 509dabfdc51dc12145945caa154985590152bd6f4948c5e7bd7f0e7f5913c4025c1ab5dd1973d5c15f955b1348c54e5f0c5b6118e1e33e8c25adf0addf341a31 -MISC metadata.xml 812 BLAKE2B eebdbe425ffbd4c3782b8eaae9743dca971cd3fc8d41a715fc9daca3fe1ac79b2c4554ac9772526870bd5de85030733a53bf7816b0d58bbce2e95b759b284d29 SHA512 81eeb95a4dad3ba3f0cc06ad5a1523105eacd0a614793dcd84a16228c8ac373fbd54ae4a9ca386425f1b6da645933db501bb8dcf3e42a69c2b3648b821367d23 +EBUILD s3fs-1.89.ebuild 1031 BLAKE2B b6a341a0e0bff4535c8a16218acba969dfd7e00efb5f26f98776f81ed3cec3a5dc6d6ac2d82c32bc8480cee0281f5a6892c7e24634d403fad30ebe2fd828859e SHA512 19b8cbcd4f5e39e5a0afa6930b8dc1c6c2d502c1b417139b1149a4a2a0439458a4e6b43528085a6764da6d67465f46cc7825565a3eb2805d636564b5ade63ae9 +EBUILD s3fs-1.90.ebuild 1080 BLAKE2B cbcefa5faac92370056408572729410a5f8c66dc75ab09ee41b67ff63ae1b914dd1da0d099cffe0808d134c6d599bc50e4597964fb7c66d8324c53cc53d2530f SHA512 590ee5a625b59e1d45bb8273d61b5614cd3eb1b344e7369f989b8788e2f56f26653c03e6e48717e9dccc1ac1d8e9e68bf6f85da7fd982171c83a853ceb690a5b +EBUILD s3fs-1.91.ebuild 1033 BLAKE2B fbe0fae0e9865e96996a259252e0c7c1d1e4d7155e3aa45a417b993e2e8fde0c1c398387a88981390e6450424c8a5cd673dcbdcdf8a91cf880c00a472a3fb49d SHA512 587857a4c10c03691712dcf1629e5bf184cbbf9e9490f941429ecc79fec03280a20ae6b61e63bfb41a405679e23a10801f87920b7bcb65c47e16ee353fe2b275 +MISC metadata.xml 588 BLAKE2B 5786ae816ac924f7c8e8044b7f48fa96648b00d3d177a0edfbbb40baa6f260fd93414184c37a73a49f97f0e139d38835da9e41e413208f11550f9fa287488275 SHA512 318c4d450f9d58836982c90e048c57635e855df10712d77d54ddb8e0d0fff297ba92b7f0469987258ce39aba6e3dbe714d49f881048ddd6a840b5de1f16b7216 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 + #include + #include ++#include + #include + #include + #include +-- +2.34.1 + diff --git a/net-fs/s3fs/metadata.xml b/net-fs/s3fs/metadata.xml index 6d9323ed63db..7656a3f39fbb 100644 --- a/net-fs/s3fs/metadata.xml +++ b/net-fs/s3fs/metadata.xml @@ -1,14 +1,7 @@ - - rini17@gmail.com - Juraj Variny - - - proxy-maint@gentoo.org - Proxy Maintainers - + Enable dev-libs/openssl crypto backend Enable dev-libs/nss crypto backend diff --git a/net-fs/s3fs/s3fs-1.89.ebuild b/net-fs/s3fs/s3fs-1.89.ebuild index 97358dee5fea..1c9d0aa1a8ea 100644 --- a/net-fs/s3fs/s3fs-1.89.ebuild +++ b/net-fs/s3fs/s3fs-1.89.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~riscv x86" IUSE="gnutls nettle nss +openssl test" REQUIRED_USE=" ^^ ( gnutls nss openssl ) 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[@]}" +} diff --git a/net-fs/s3fs/s3fs-1.91.ebuild b/net-fs/s3fs/s3fs-1.91.ebuild new file mode 100644 index 000000000000..9f4f765d87a1 --- /dev/null +++ b/net-fs/s3fs/s3fs-1.91.ebuild @@ -0,0 +1,57 @@ +# 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}" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_with gnutls) + $(use_with nettle) + $(use_with nss) + $(use_with openssl) + ) + econf "${myeconfargs[@]}" +} -- cgit v1.2.3