From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B868615806E for ; Sat, 27 May 2023 07:49:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9381E0867; Sat, 27 May 2023 07:49:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A81D2E0867 for ; Sat, 27 May 2023 07:49:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6D6A534107F for ; Sat, 27 May 2023 07:49:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D1A91A86 for ; Sat, 27 May 2023 07:49:30 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1685173760.8765e3d0ba2ac52728ada06e260f92e9a3a1d687.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/s3fs/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/s3fs/Manifest net-fs/s3fs/metadata.xml net-fs/s3fs/s3fs-1.92.ebuild X-VCS-Directories: net-fs/s3fs/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 8765e3d0ba2ac52728ada06e260f92e9a3a1d687 X-VCS-Branch: master Date: Sat, 27 May 2023 07:49:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bbce04a1-dc60-4e94-a4e7-c9d43316ffea X-Archives-Hash: 9f822e9193fc965da1e497e71adb70ea commit: 8765e3d0ba2ac52728ada06e260f92e9a3a1d687 Author: Petr Vaněk atlas cz> AuthorDate: Mon May 22 13:41:42 2023 +0000 Commit: Joonas Niilola gentoo 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 atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/31126 Signed-off-by: Joonas Niilola 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 @@ - Enable dev-libs/openssl crypto backend + Enable dev-libs/openssl crypto backend Enable dev-libs/nss crypto backend Enable net-libs/gnutls crypto backend Use dev-libs/nettle network functions with GnuTLS. 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[@]}" +}