Skip to content

Commit aa3fb08

Browse files
committed
libgcrypt 1.8.6 -> 1.10.1
562.01 -> 783.14 kB
1 parent 5d9e70d commit aa3fb08

File tree

2 files changed

+6
-21
lines changed

2 files changed

+6
-21
lines changed

modules/libgcrypt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
modules-$(CONFIG_GPG2) += libgcrypt
22

3-
libgcrypt_version := 1.8.6
3+
libgcrypt_version := 1.10.1
44
libgcrypt_dir := libgcrypt-$(libgcrypt_version)
55
libgcrypt_tar := libgcrypt-$(libgcrypt_version).tar.bz2
66
libgcrypt_url := https://gnupg.org/ftp/gcrypt/libgcrypt/$(libgcrypt_tar)
7-
libgcrypt_hash := 0cba2700617b99fc33864a0c16b1fa7fdf9781d9ed3509f5d767178e5fd7b975
7+
libgcrypt_hash := ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de
88

99
libgcrypt_configure := \
1010
$(CROSS_TOOLS) \
@@ -15,6 +15,7 @@ libgcrypt_configure := \
1515
--disable-static \
1616
--with-gpg-error-prefix="$(INSTALL)" \
1717
--disable-asm \
18+
--disable-doc \
1819

1920
libgcrypt_target := $(MAKE_JOBS) \
2021
DESTDIR="$(INSTALL)" \

patches/libgcrypt-1.8.6.patch renamed to patches/libgcrypt-1.10.1.patch

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff -u -r libgcrypt-1.8.3-clean/configure libgcrypt-1.8.3/configure
2-
--- libgcrypt-1.8.3-clean/configure 2018-06-13 00:39:33.000000000 -0700
3-
+++ libgcrypt-1.8.3/configure 2020-01-12 13:32:34.840010800 -0800
1+
diff -u -r libgcrypt-1.8.10-clean/configure libgcrypt-1.8.10/configure
2+
--- libgcrypt-1.8.10-clean/configure 2018-06-13 00:39:33.000000000 -0700
3+
+++ libgcrypt-1.8.10/configure 2020-01-12 13:32:34.840010800 -0800
44
@@ -11292,7 +11292,7 @@
55
version_type=linux # correct to gnu/linux during the next big refactor
66
need_lib_prefix=no
@@ -174,19 +174,3 @@ diff -u -r libgcrypt-1.8.3-clean/configure libgcrypt-1.8.3/configure
174174

175175
# Compile-time system search path for libraries.
176176
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
177-
diff --git a/random/jitterentropy-base-user.h b/random/jitterentropy-base-user.h
178-
index 75dd768..8a8dbd5 100644
179-
--- a/random/jitterentropy-base-user.h
180-
+++ b/random/jitterentropy-base-user.h
181-
@@ -86,9 +86,9 @@ jent_get_nstime(u64 *out)
182-
* not rely on that extra little entropy. */
183-
if (!clock_gettime (CLOCK_REALTIME, &tv))
184-
{
185-
- tmp = time.tv_sec;
186-
+ tmp = tv.tv_sec;
187-
tmp = tmp << 32;
188-
- tmp = tmp | time.tv_nsec;
189-
+ tmp = tmp | tv.tv_nsec;
190-
}
191-
else
192-
tmp = 0;

0 commit comments

Comments
 (0)