* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libsodium/files/, dev-libs/libsodium/
@ 2018-10-05 4:15 Thomas Deutschmann
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Deutschmann @ 2018-10-05 4:15 UTC (permalink / raw
To: gentoo-commits
commit: 74578f0ade346915d1586d0a3dbe2a8aa5a383c6
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 5 04:15:36 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Oct 5 04:15:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74578f0a
dev-libs/libsodium: fix AES-NI support
Closes: https://bugs.gentoo.org/637070
Package-Manager: Portage-2.3.50, Repoman-2.3.11
RepoMan-Options: --force
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
dev-libs/libsodium/Manifest | 1 -
.../files/libsodium-1.0.10-cpuflags.patch | 2 +-
...um-1.0.11.ebuild => libsodium-1.0.11-r1.ebuild} | 2 +-
dev-libs/libsodium/libsodium-1.0.13.ebuild | 43 ----------------------
...um-1.0.14.ebuild => libsodium-1.0.14-r1.ebuild} | 2 +-
...um-1.0.15.ebuild => libsodium-1.0.15-r1.ebuild} | 2 +-
...1.0.16-r1.ebuild => libsodium-1.0.16-r2.ebuild} | 2 +-
dev-libs/libsodium/libsodium-1.0.16.ebuild | 43 ----------------------
8 files changed, 5 insertions(+), 92 deletions(-)
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 6afe1b80fb4..fb94526e0e5 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -1,5 +1,4 @@
DIST libsodium-1.0.11.tar.gz 1846782 BLAKE2B aadab6c89d11740dca72d7686d06cfeca6c504fca9e78108778817da4071d9e7bb6115df42e9509cd872ae7a5489ef15c099cabaf564f28e90b7f74a63bae140 SHA512 4b1293c4d0e52264beecdd05833857bc4d77d1c2a97eea0138fe04df383b9a2dfcad4a79ccd9aed8f6c0047ba67c49292b0d2ccf987ab0b5046b46b1586ccbd7
-DIST libsodium-1.0.13.tar.gz 1895139 BLAKE2B cc59f58f0bcd3c7d69a32a401063f8514289a3bf655ccea303f37ec9c08ad16c8780981999f99efe8257180ef45d86af8f512271eb4e1232eefe6e5baaf300b2 SHA512 c619b12fdf0b2e59174b6e383a62d5499ebcd720fdbb2c1a41a98a46c285df075202423454b294fefee185432441e943805397d7656f7cd7837de425da623929
DIST libsodium-1.0.14.tar.gz 1876526 BLAKE2B 37e9b785cc397f58ab07e38eef9e6f3ed8a2dbfbfd1c865b64d8d9b9440db3f8aa32671065cebf4f73d449889e7abfacf63910add08f0e27582cd6fb32bfbacd SHA512 46663b05aab13ec4003ecc32c89bdaedf60824703be522661eeaa3db8013140bda434c19a759dc38bcbce757e9673a03e701c0eac1526a31a4b7a15608ae8696
DIST libsodium-1.0.15.tar.gz 1866057 BLAKE2B 220e327f7803c6cf0b1260b313a225d7cc7a965b36920c744379c5939643e588687032478e3d7a79b4614c5fa57b0dd2afd216b2e23ca69ad16ea67764a840ca SHA512 299a208f8342793d13498e95b23f1749f5b5b13ec276db3ec401130615e837ef475b6a1283b6e87a5f8227d23e70e38ca721073dadd5dc88fe4aff342aa64adc
DIST libsodium-1.0.16.tar.gz 1910835 BLAKE2B d0d83730cfdb64a928c4597a3bcf4ae179d74bb9f850364bf0670547a12842009c0ca32d36d06053906fb649497406b1d7988e167772d5f1138d23798d8775f7 SHA512 eab917d599c9c1fe971a6ecf915b9a6476ccec2d46cf23cbfbf06dd3833089b422f192de4d55f17b93362f1251ba8d5ddeb95ced1a422a3a2631b4b82553907f
diff --git a/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch b/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
index 09e5c01618c..544c283d850 100644
--- a/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
+++ b/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
@@ -24,7 +24,7 @@
CFLAGS="$oldcflags"
+AC_ARG_ENABLE(aesni, [AS_HELP_STRING(--disable-aesni,Do not use aesni code)],
-+ AS_IF([test "x$enableval" = "xyes"], check_aeni="yes", check_aesni="no"),
++ AS_IF([test "x$enableval" = "xyes"], check_aesni="yes", check_aesni="no"),
+ check_aesni="yes")
+AS_IF([test "$check_aesni" = "yes"],[
oldcflags="$CFLAGS"
diff --git a/dev-libs/libsodium/libsodium-1.0.11.ebuild b/dev-libs/libsodium/libsodium-1.0.11-r1.ebuild
similarity index 96%
rename from dev-libs/libsodium/libsodium-1.0.11.ebuild
rename to dev-libs/libsodium/libsodium-1.0.11-r1.ebuild
index 0ee03ff8535..fe9bd6598f3 100644
--- a/dev-libs/libsodium/libsodium-1.0.11.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/dev-libs/libsodium/libsodium-1.0.13.ebuild b/dev-libs/libsodium/libsodium-1.0.13.ebuild
deleted file mode 100644
index 2b80cec2ea2..00000000000
--- a/dev-libs/libsodium/libsodium-1.0.13.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/18"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- # --disable-pie needed on x86, bug #512734
- use x86 && myconf="${myconf} --disable-pie"
-
- econf \
- $(use_enable asm) \
- $(use_enable minimal) \
- $(use_enable !urandom blocking-random) \
- $(use_enable static-libs static) \
- $(use_enable cpu_flags_x86_sse4_1 sse4_1) \
- $(use_enable cpu_flags_x86_aes aesni) \
- ${myconf}
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/dev-libs/libsodium/libsodium-1.0.14.ebuild b/dev-libs/libsodium/libsodium-1.0.14-r1.ebuild
similarity index 96%
rename from dev-libs/libsodium/libsodium-1.0.14.ebuild
rename to dev-libs/libsodium/libsodium-1.0.14-r1.ebuild
index 2b80cec2ea2..6d9c86e10fa 100644
--- a/dev-libs/libsodium/libsodium-1.0.14.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/dev-libs/libsodium/libsodium-1.0.15.ebuild b/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild
similarity index 96%
rename from dev-libs/libsodium/libsodium-1.0.15.ebuild
rename to dev-libs/libsodium/libsodium-1.0.15-r1.ebuild
index cfce5ad6f4c..cbf53540a9c 100644
--- a/dev-libs/libsodium/libsodium-1.0.15.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/dev-libs/libsodium/libsodium-1.0.16-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
similarity index 96%
rename from dev-libs/libsodium/libsodium-1.0.16-r1.ebuild
rename to dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
index dd260ff32ea..c52a78d1555 100644
--- a/dev-libs/libsodium/libsodium-1.0.16-r1.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/dev-libs/libsodium/libsodium-1.0.16.ebuild b/dev-libs/libsodium/libsodium-1.0.16.ebuild
deleted file mode 100644
index 6144b166e52..00000000000
--- a/dev-libs/libsodium/libsodium-1.0.16.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- # --disable-pie needed on x86, bug #512734
- use x86 && myconf="${myconf} --disable-pie"
-
- econf \
- $(use_enable asm) \
- $(use_enable minimal) \
- $(use_enable !urandom blocking-random) \
- $(use_enable static-libs static) \
- $(use_enable cpu_flags_x86_sse4_1 sse4_1) \
- $(use_enable cpu_flags_x86_aes aesni) \
- ${myconf}
-}
-
-src_install() {
- default
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libsodium/files/, dev-libs/libsodium/
@ 2024-02-15 21:15 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-02-15 21:15 UTC (permalink / raw
To: gentoo-commits
commit: 2d40ce3072c987da8bcee68f17755c27beaa8a3c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 15 21:00:53 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 15 21:01:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d40ce30
dev-libs/libsodium: add 1.0.19_p20240117
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/libsodium/Manifest | 2 +
.../files/libsodium-1.0.19-cpuflags.patch | 40 +++++++++++
.../libsodium/libsodium-1.0.19_p20240117.ebuild | 77 ++++++++++++++++++++++
3 files changed, 119 insertions(+)
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 35b788ea8cb1..e2368db28f37 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -2,3 +2,5 @@ DIST libsodium-1.0.18_p20220618.tar.gz 1869858 BLAKE2B 60d46f722c4e5c9896226e3e0
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
diff --git a/dev-libs/libsodium/files/libsodium-1.0.19-cpuflags.patch b/dev-libs/libsodium/files/libsodium-1.0.19-cpuflags.patch
new file mode 100644
index 000000000000..a2fa6a42df38
--- /dev/null
+++ b/dev-libs/libsodium/files/libsodium-1.0.19-cpuflags.patch
@@ -0,0 +1,40 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -524,6 +524,10 @@ AS_IF([test "x$EMSCRIPTEN" = "x"], [
+ [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)
+@@ -536,6 +540,7 @@ AS_IF([test "x$EMSCRIPTEN" = "x"], [
+ 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"])
+@@ -609,6 +614,10 @@ __m512i y = _mm512_permutexvar_epi64(_mm512_setr_epi64(0, 1, 4, 5, 2, 3, 6, 7),
+ ])
+ 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"])
+@@ -640,6 +649,7 @@ __m512i y = _mm512_permutexvar_epi64(_mm512_setr_epi64(0, 1, 4, 5, 2, 3, 6, 7),
+ ],
+ [AC_MSG_RESULT(no)])
+ CFLAGS="$oldcflags"
++ ])
+
+ ])
+
diff --git a/dev-libs/libsodium/libsodium-1.0.19_p20240117.ebuild b/dev-libs/libsodium/libsodium-1.0.19_p20240117.ebuild
new file mode 100644
index 000000000000..bb62d58a0e8c
--- /dev/null
+++ b/dev-libs/libsodium/libsodium-1.0.19_p20240117.ebuild
@@ -0,0 +1,77 @@
+# 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 static-libs +urandom"
+
+CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
+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.19-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 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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libsodium/files/, dev-libs/libsodium/
@ 2024-06-02 5:46 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-06-02 5:46 UTC (permalink / raw
To: gentoo-commits
commit: dafbb877a97063e3ecdefa5428a714f69243a9f8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 2 05:40:06 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 2 05:46:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dafbb877
dev-libs/libsodium: drop 1.0.18_p20220618, 1.0.19-r1, 1.0.19-r2
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/libsodium/Manifest | 4 --
.../files/libsodium-1.0.10-cpuflags.patch | 40 ------------
.../libsodium/libsodium-1.0.18_p20220618.ebuild | 74 ----------------------
dev-libs/libsodium/libsodium-1.0.19-r1.ebuild | 74 ----------------------
dev-libs/libsodium/libsodium-1.0.19-r2.ebuild | 73 ---------------------
5 files changed, 265 deletions(-)
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index e2368db28f37..1a72bfad8c56 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -1,6 +1,2 @@
-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
diff --git a/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch b/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
deleted file mode 100644
index e03a703d7fae..000000000000
--- a/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
+++ /dev/null
@@ -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"
-+ ])
-
- ])
-
diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild
deleted file mode 100644
index bcd05ad21ed0..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild
deleted file mode 100644
index 575daa8a5059..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/dev-libs/libsodium/libsodium-1.0.19-r2.ebuild b/dev-libs/libsodium/libsodium-1.0.19-r2.ebuild
deleted file mode 100644
index eebd3c520e94..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.19-r2.ebuild
+++ /dev/null
@@ -1,73 +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 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 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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-06-02 5:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-15 21:15 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libsodium/files/, dev-libs/libsodium/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-06-02 5:46 Sam James
2018-10-05 4:15 Thomas Deutschmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox