mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-14 08:26:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

dev-libs/libsodium: Sync with Gentoo

Browse Source 
It's from Gentoo commit 680eae567c767a6924f93029e556384443581004.
This commit is contained in:
Flatcar Buildbot 2024-07-01 07:13:31 +00:00 committed by Mathieu Tortuyaux
parent 526dbd75f9
commit b7cb6f5475
No known key found for this signature in database
GPG Key ID: AC5CCFB52545D9B8
6 changed files with 10 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdk_container/src/third_party/portage-stable/dev-libs/libsodium/Manifest vendored
View File

@ -1,6 +1,4 @@
DIST libsodium-1.0.18_p20220618.tar.gz 1869858 BLAKE2B 60d46f722c4e5c9896226e3e03c31768a2183bae80a535234b23ac5bc9a2c3632d6c891ce72cbc1d6dc633a15b539111e322c2d210f993f99d6e5bd32f8a8b63 SHA512 14d1c6109de2ac02ba6cb5541746275f6deb25302b60cb3f65a7922b34d2c3bd5f17a4d730acf77a53d5837be00228c68fa06c6a2e9095ea97f6d8c4b782ab6b
DIST libsodium-1.0.18_p20220618.tar.gz.minisig 318 BLAKE2B a2cba3c62ca5a84e7897373cdfe4033c636c652c848bf9beff15765d359f1dd2a8834dc3a4d4443d0b9418a59a94309cf9c5c917ae9c8965778411e21f98e4e6 SHA512 ca1ac892b41c5cb6dd1ba9d4bbde8e75987e66023d29cfc81839bbb3b99efa215f7db1ef903c375dd9d2d5a76f6064b3c7eab833081d21983693b7db87175160
DIST libsodium-1.0.19.tar.gz 1945523 BLAKE2B de43520150b55760142d186404cc3e49471c6e911a7a590c7ae08bc61e928c063c459555f49cd88155238fb0008ef3924b6d7c14ba9cff2f90f1e96201e1259c SHA512 8e9b6d796f6330e00921ce37f1b43545966094250938626ae227deef5fd1279f2fc18b5cd55e23484732a27df4d919cf0d2f07b9c2f1aa0c0ef689e668b0d439
DIST libsodium-1.0.19.tar.gz.minisig 318 BLAKE2B e86e653107478d9e9281894632baafda57358229f2d56fcaf55591098e38d6be72ed2f599a7f2c16d5b9978d2cbfe8e07db4e772b053a832a61fd325fc1efae4 SHA512 8b5993bd7e541a5913ea1659c1009c4edefd9b5907e0a7c9090fa604c23d77006ad9d9a897d66243162742d63ce9bc1f2c81091d50a584f1495dd3bd87d4451e
DIST libsodium-1.0.19_p20240117.tar.gz 1946650 BLAKE2B 6faa56733ed28f34d58b41a71a41d6ba6369e2f5686e01169f83d5fe955523825bd250cfd59e15515b24f67cef1610af41749b6f56bc370e7f77708a86bd7684 SHA512 2cefd883b60fba5522bf4a6f3c73f9bc54164340400377089eea8fbb01447f1137fcb7f6183845a6c5e2aad51982122a356272b4eda5452d7b550a65aa576140
DIST libsodium-1.0.19_p20240117.tar.gz.minisig 318 BLAKE2B f951b547f53b2569ed1493dcdbff1cc93519437f56cdf97a764d61a7e1fa98b383b49d4f4a9c4b7b199e2060037971f293796e641bd689c9cd6c7ae2c90b7a20 SHA512 202f9686fabcb7b362923b7f1eeac8544c5f21e7eaa0b4cdd7329733a62a5ec9efd18713bc63187055149525a066540a6904776870d718fd3b238b71ba4b9a35
DIST libsodium-1.0.20.tar.gz 1925167 BLAKE2B 2f1d8b2dc8a65f95433132b12bdccb7e0e4750326b05c4f42ddd3a74bf568faa2515384bfe94bba2ef420aff35c515d3d44945ea5a68f72e6a73b3a9b5bb234c SHA512 7ea165f3c1b1609790e30a16348b9dfdc5731302da00c07c65e125c8ab115c75419a5631876973600f8a4b560ca2c8267001770b68f2eb3eebc9ba095d312702
DIST libsodium-1.0.20.tar.gz.minisig 318 BLAKE2B b5939a9ca9b25332c39484b3ef02ced54aa75b2dc732d384d4f42daa0b6bd276f0c3359a8cbe8c97d8ab76b8c49e9f66959dcf350e3cf00fae10a279826109ae SHA512 fc5a4282093d58eb42559f88ccf75ea3788449afda9d882d313714e448e78ef11c22ff1e52091af026f6bf3ba01917d606040b1dca240dd1a32278c901b4affb

40
sdk_container/src/third_party/portage-stable/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch vendored
View File

@ -1,40 +0,0 @@
--- a/configure.ac
+++ b/configure.ac
@@ -344,6 +344,10 @@
[AC_MSG_RESULT(no)])
CFLAGS="$oldcflags"
+AC_ARG_ENABLE(sse4_1, [AS_HELP_STRING(--disable-sse4_1,Do not use sse4.1 code)],
+ AS_IF([test "x$enableval" = "xyes"], check_sse4_1="yes", check_sse4_1="no"),
+ check_sse4_1="yes")
+AS_IF([test "$check_sse4_1" = "yes"],[
oldcflags="$CFLAGS"
AX_CHECK_COMPILE_FLAG([-msse4.1], [CFLAGS="$CFLAGS -msse4.1"])
AC_MSG_CHECKING(for SSE4.1 instructions set)
@@ -356,6 +360,7 @@
AX_CHECK_COMPILE_FLAG([-msse4.1], [CFLAGS_SSE41="-msse4.1"])],
[AC_MSG_RESULT(no)])
CFLAGS="$oldcflags"
+ ])
oldcflags="$CFLAGS"
AX_CHECK_COMPILE_FLAG([-mavx], [CFLAGS="$CFLAGS -mavx"])
@@ -393,6 +398,10 @@
[AC_MSG_RESULT(no)])
CFLAGS="$oldcflags"
+AC_ARG_ENABLE(aesni, [AS_HELP_STRING(--disable-aesni,Do not use aesni code)],
+ AS_IF([test "x$enableval" = "xyes"], check_aesni="yes", check_aesni="no"),
+ check_aesni="yes")
+AS_IF([test "$check_aesni" = "yes"],[
oldcflags="$CFLAGS"
AX_CHECK_COMPILE_FLAG([-maes], [CFLAGS="$CFLAGS -maes"])
AX_CHECK_COMPILE_FLAG([-mpclmul], [CFLAGS="$CFLAGS -mpclmul"])
@@ -410,6 +419,7 @@
],
[AC_MSG_RESULT(no)])
CFLAGS="$oldcflags"
+ ])
])

74
sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild vendored
View File

@ -1,74 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libsodium.minisig
VERIFY_SIG_METHOD=minisig
inherit autotools multilib-minimal verify-sig
DESCRIPTION="Portable fork of NaCl, a higher-level cryptographic library"
HOMEPAGE="https://libsodium.org"
if [[ ${PV} == *_p* ]] ; then
MY_P=${PN}-$(ver_cut 1-3)-stable-$(ver_cut 5-)
# We use _pN to represent 'stable releases'
# These are backports from upstream to the last release branch
# See https://download.libsodium.org/libsodium/releases/README.html
SRC_URI="
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz
verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig )
"
else
SRC_URI="
https://download.libsodium.org/${PN}/releases/${P}.tar.gz
verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.minisig )
"
fi
S="${WORKDIR}"/${PN}-stable
LICENSE="ISC"
SLOT="0/23"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
IUSE="+asm minimal static-libs +urandom"
CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
IUSE+=" ${CPU_USE[@]}"
BDEPEND=" verify-sig? ( sec-keys/minisig-keys-libsodium )"
PATCHES=(
"${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
)
src_prepare() {
default
eautoreconf
}
multilib_src_configure() {
local myeconfargs=(
$(use_enable asm)
$(use_enable cpu_flags_x86_aes aesni)
$(use_enable cpu_flags_x86_sse4_1 sse4_1)
$(use_enable minimal)
$(use_enable static-libs static)
$(use_enable !urandom blocking-random)
)
# --disable-pie is needed on x86, see bug #512734
# TODO: Check if still needed?
if [[ ${ABI} == x86 ]] ; then
myeconfargs+=( --disable-pie )
fi
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
multilib_src_install_all() {
default
find "${ED}" -type f -name "*.la" -delete || die
}

74
sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild vendored
View File

@ -1,74 +0,0 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libsodium.minisig
VERIFY_SIG_METHOD=minisig
inherit autotools multilib-minimal verify-sig
DESCRIPTION="Portable fork of NaCl, a higher-level cryptographic library"
HOMEPAGE="https://libsodium.org"
if [[ ${PV} == *_p* ]] ; then
MY_P=${PN}-$(ver_cut 1-3)-stable-$(ver_cut 5-)
# We use _pN to represent 'stable releases'
# These are backports from upstream to the last release branch
# See https://download.libsodium.org/libsodium/releases/README.html
SRC_URI="
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz
verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig )
"
else
SRC_URI="
https://download.libsodium.org/${PN}/releases/${P}.tar.gz
verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.minisig )
"
fi
S="${WORKDIR}"/${PN}-stable
LICENSE="ISC"
SLOT="0/26"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
IUSE="+asm minimal static-libs +urandom"
CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
IUSE+=" ${CPU_USE[@]}"
BDEPEND=" verify-sig? ( sec-keys/minisig-keys-libsodium )"
PATCHES=(
"${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
)
src_prepare() {
default
eautoreconf
}
multilib_src_configure() {
local myeconfargs=(
$(use_enable asm)
$(use_enable cpu_flags_x86_aes aesni)
$(use_enable cpu_flags_x86_sse4_1 sse4_1)
$(use_enable minimal)
$(use_enable static-libs static)
$(use_enable !urandom blocking-random)
)
# --disable-pie is needed on x86, see bug #512734
# TODO: Check if still needed?
if [[ ${ABI} == x86 ]] ; then
myeconfargs+=( --disable-pie )
fi
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
multilib_src_install_all() {
default
find "${ED}" -type f -name "*.la" -delete || die
}

2
sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.19_p20240117.ebuild vendored
View File

@ -31,7 +31,7 @@ S="${WORKDIR}"/${PN}-stable
LICENSE="ISC"
SLOT="0/26"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
IUSE="+asm static-libs +urandom"
CPU_USE=( cpu_flags_x86_{aes,sse4_1} )

11
sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.19-r2.ebuild → sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.20.ebuild vendored
View File

@ -20,6 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz
verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig )
"
S="${WORKDIR}"/${PN}-stable
else
SRC_URI="
https://download.libsodium.org/${PN}/releases/${P}.tar.gz
@ -27,11 +28,9 @@ else
"
fi
S="${WORKDIR}"/${PN}-stable
LICENSE="ISC"
SLOT="0/26"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
IUSE="+asm static-libs +urandom"
CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
@ -39,8 +38,12 @@ IUSE+=" ${CPU_USE[@]}"
BDEPEND=" verify-sig? ( sec-keys/minisig-keys-libsodium )"
QA_CONFIG_IMPL_DECL_SKIP=(
_rdrand64_step # depends on target, bug #924154
)
PATCHES=(
"${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
"${FILESDIR}"/${PN}-1.0.19-cpuflags.patch
)
src_prepare() {