* [gentoo-commits] repo/gentoo:master commit in: dev-libs/nettle/files/, dev-libs/nettle/
@ 2018-06-28 7:59 Alon Bar-Lev
0 siblings, 0 replies; 2+ messages in thread
From: Alon Bar-Lev @ 2018-06-28 7:59 UTC (permalink / raw
To: gentoo-commits
commit: 8c802c95eca9f85656e2c0c823466ee8ea7fc867
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 28 07:58:46 2018 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 07:58:46 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c802c95
dev-libs/nettle: cleanup old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-libs/nettle/Manifest | 1 -
dev-libs/nettle/files/nettle-3.3-ecc-add-eh.patch | 32 -----------
dev-libs/nettle/nettle-3.3-r2.ebuild | 66 -----------------------
3 files changed, 99 deletions(-)
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 2dbf9cd3960..a6f524c73a2 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,2 +1 @@
-DIST nettle-3.3.tar.gz 1887927 BLAKE2B 4bcf3c4bfb9f9dae97ea6780d146f3313e8b51182d9942e69581428d9f602d16467d37f993700a4e94e2e0dee17bdf354694c94d0383164c3de6e57e7e24de4e SHA512 271981d89766f151af3cdc4e5fc43c438222f0f6f44475bad114f4209955b5235fced6526c7abca001cca223e8cfcd2a6bf389b160b305a499e7acf52425ec70
DIST nettle-3.4.tar.gz 1935069 BLAKE2B b73c88236c8233360607a6ed65cd4f6d19bfbbf683b46149326ce3440bf0a42b8add69de5c64145720163b1095fdab3cb8bf410c2ef727d0ea4fb58391ff0f14 SHA512 3bea3aabd2c99cc42d084a94fd6b0b5dbdb24cd6c7020271a6ee87a81a904b21b21756f590cb1afdf2e85fd1cb59e5c3651c5c4032e30204e7ea6f8801d1ea3b
diff --git a/dev-libs/nettle/files/nettle-3.3-ecc-add-eh.patch b/dev-libs/nettle/files/nettle-3.3-ecc-add-eh.patch
deleted file mode 100644
index 5492997f336..00000000000
--- a/dev-libs/nettle/files/nettle-3.3-ecc-add-eh.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From dcda81d796de2f4a16fd7e9e7a5d07baa288f147 Mon Sep 17 00:00:00 2001
-From: Niels Möller <nisse@lysator.liu.se>
-Date: Tue, 18 Jul 2017 20:52:30 +0200
-Subject: [PATCH] Fix for in-place ecc_add_eh.
-
-* ecc-add-eh.c (ecc_add_eh): Fix in-place operation by reordering
-two multiplies. Previously, in-place operation resulted in an
-invalid call to mpn_mul with overlapping operands. Reported by
-Sergei Trofimovich.
----
- ChangeLog | 7 +++++++
- ecc-add-eh.c | 4 ++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/ecc-add-eh.c b/ecc-add-eh.c
-index a16be4c..c07ff49 100644
---- a/ecc-add-eh.c
-+++ b/ecc-add-eh.c
-@@ -98,8 +98,8 @@ ecc_add_eh (const struct ecc_curve *ecc,
- ecc_modp_mul (ecc, x3, B, z1);
-
- /* y3 */
-- ecc_modp_mul (ecc, B, F, C); /* ! */
-- ecc_modp_mul (ecc, y3, B, z1);
-+ ecc_modp_mul (ecc, B, F, z1); /* ! */
-+ ecc_modp_mul (ecc, y3, B, C); /* Clobbers z1 in case r == p. */
-
- /* z3 */
- ecc_modp_mul (ecc, B, F, G);
---
-libgit2 0.25.0
-
diff --git a/dev-libs/nettle/nettle-3.3-r2.ebuild b/dev-libs/nettle/nettle-3.3-r2.ebuild
deleted file mode 100644
index 678fb2445ce..00000000000
--- a/dev-libs/nettle/nettle-3.3-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-build multilib-minimal multilib toolchain-funcs
-
-DESCRIPTION="Low-level cryptographic library"
-HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-3 LGPL-2.1 )"
-SLOT="0/6.1" # subslot = libnettle soname version, .1 as broke ABI bug#601512
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
-
-DEPEND="gmp? ( >=dev-libs/gmp-5.0:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/nettle/nettle-stdint.h
- /usr/include/nettle/version.h
-)
-
-DOCS=()
-HTML_DOCS=()
-
-PATCHES=(
- "${FILESDIR}/${P}-ecc-add-eh.patch"
-)
-
-pkg_setup() {
- use doc && DOCS+=(
- nettle.pdf
- )
- use doc && HTML_DOCS+=(
- nettle.html
- )
-}
-
-src_prepare() {
- default
-
- sed -e '/CFLAGS=/s: -ggdb3::' \
- -e 's/solaris\*)/sunldsolaris*)/' \
- -i configure.ac || die
-
- # conditionally build tests and examples required by tests
- use test || sed -i '/SUBDIRS/s/testsuite examples//' Makefile.in || die
-
- eautoreconf
-}
-
-multilib_src_configure() {
- # --disable-openssl bug #427526
- ECONF_SOURCE="${S}" econf \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --disable-openssl \
- --disable-fat \
- $(use_enable gmp public-key) \
- $(use_enable static-libs static) \
- $(tc-is-static-only && echo --disable-shared) \
- $(use_enable doc documentation) \
- $(use_enable neon arm-neon) \
- $(use_enable cpu_flags_x86_aes x86-aesni)
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/nettle/files/, dev-libs/nettle/
@ 2019-04-19 8:57 Alon Bar-Lev
0 siblings, 0 replies; 2+ messages in thread
From: Alon Bar-Lev @ 2019-04-19 8:57 UTC (permalink / raw
To: gentoo-commits
commit: e066e778a6f4dc94090d03d703c29459de25d78f
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 08:56:14 2019 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 08:56:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e066e778
dev-libs/nettle: fix C89 issue
Thanks: Daniel M. Weeks
Closes: https://bugs.gentoo.org/show_bug.cgi?id=683812
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
dev-libs/nettle/files/nettle-3.4.1-build.patch | 53 ++++++++++++++++++++++++++
dev-libs/nettle/nettle-3.4.1.ebuild | 4 ++
2 files changed, 57 insertions(+)
diff --git a/dev-libs/nettle/files/nettle-3.4.1-build.patch b/dev-libs/nettle/files/nettle-3.4.1-build.patch
new file mode 100644
index 00000000000..4351dfeb5bc
--- /dev/null
+++ b/dev-libs/nettle/files/nettle-3.4.1-build.patch
@@ -0,0 +1,53 @@
+From f5a3a224bf00bef5669366d2ae23c2b2b13b8016 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
+Date: Wed, 26 Dec 2018 11:04:31 +0100
+Subject: [PATCH] Fix accidental use of C99 for loop.
+
+* rsa-sign-tr.c (sec_equal): Fix accidental use of C99 for loop.
+Reported by Andreas Gustafsson.
+* testsuite/rsa-sec-decrypt-test.c (test_main): Likewise.
+---
+ ChangeLog | 6 ++++++
+ rsa-sign-tr.c | 3 ++-
+ testsuite/rsa-sec-decrypt-test.c | 3 ++-
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/rsa-sign-tr.c b/rsa-sign-tr.c
+index 59c9bd07..f824c4ca 100644
+--- a/rsa-sign-tr.c
++++ b/rsa-sign-tr.c
+@@ -239,8 +239,9 @@ static int
+ sec_equal(const mp_limb_t *a, const mp_limb_t *b, size_t limbs)
+ {
+ volatile mp_limb_t z = 0;
++ size_t i;
+
+- for (size_t i = 0; i < limbs; i++)
++ for (i = 0; i < limbs; i++)
+ {
+ z |= (a[i] ^ b[i]);
+ }
+diff --git a/testsuite/rsa-sec-decrypt-test.c b/testsuite/rsa-sec-decrypt-test.c
+index 64f0b13c..fb0ed3a1 100644
+--- a/testsuite/rsa-sec-decrypt-test.c
++++ b/testsuite/rsa-sec-decrypt-test.c
+@@ -68,6 +68,7 @@ test_main(void)
+ unsigned n_size = 1024;
+ mpz_t gibberish;
+ mpz_t garbage;
++ size_t size;
+
+ rsa_private_key_init(&key);
+ rsa_public_key_init(&pub);
+@@ -78,7 +79,7 @@ test_main(void)
+
+ memset(verifybad, 'A', PAYLOAD_SIZE);
+
+- for (size_t size = 1; size < 51; size++)
++ for (size = 1; size < 51; size++)
+ {
+ ASSERT (rsa_generate_keypair(&pub, &key, &random_ctx,
+ (nettle_random_func *) knuth_lfib_random,
+--
+2.18.1
+
diff --git a/dev-libs/nettle/nettle-3.4.1.ebuild b/dev-libs/nettle/nettle-3.4.1.ebuild
index 6541764cd8b..2fff9c6d49a 100644
--- a/dev-libs/nettle/nettle-3.4.1.ebuild
+++ b/dev-libs/nettle/nettle-3.4.1.ebuild
@@ -25,6 +25,10 @@ MULTILIB_WRAPPED_HEADERS=(
DOCS=()
HTML_DOCS=()
+PATCHES=(
+ "${FILESDIR}/${P}-build.patch"
+)
+
pkg_setup() {
use doc && DOCS+=(
nettle.pdf
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-04-20 23:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-19 8:57 [gentoo-commits] repo/gentoo:master commit in: dev-libs/nettle/files/, dev-libs/nettle/ Alon Bar-Lev
-- strict thread matches above, loose matches on Subject: below --
2018-06-28 7:59 Alon Bar-Lev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox