Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update libgcrypt-version to 1.10.3 from 1.10.2 #6

Merged
merged 2 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildenv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# bump: libgcrypt-version /LIBGCRYPT_VERSION="(.*)"/ https://gnupg.org/ftp/gcrypt/libgcrypt/|re:/libgcrypt-([\d.]+).tar.bz2/$1/|semver:*
LIBGCRYPT_VERSION="1.10.2"
LIBGCRYPT_VERSION="1.10.3"

export ZOPEN_STABLE_URL="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${LIBGCRYPT_VERSION}.tar.bz2"
export ZOPEN_STABLE_DEPS="make bzip2 tar curl perl automake autoconf m4 sed gettext zoslib diffutils libgpgerror"
Expand Down
19 changes: 9 additions & 10 deletions patches/rndgetentropy.c.patch
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
diff --git a/random/rndgetentropy.c b/random/rndgetentropy.c
index 513da0b..6382f52 100644
index a6f3c4a..941e0f6 100644
--- a/random/rndgetentropy.c
+++ b/random/rndgetentropy.c
@@ -95,8 +95,13 @@ _gcry_rndgetentropy_gather_random (void (*add)(const void*, size_t,
@@ -96,7 +96,11 @@ _gcry_rndgetentropy_gather_random (void (*add)(const void*, size_t,
* RHEL kernel.
*/
nbytes = length < 32 ? length : 32;
+ #ifdef __MVS__
+ ret = getentropy (buffer, nbytes);
+ #else
ret = getrandom (buffer, nbytes, GRND_RANDOM);
+ #endif
- ret = getrandom (buffer, nbytes, GRND_RANDOM);
+ #ifdef __MVS__
+ ret = getentropy (buffer, nbytes);
+ #else
+ ret = getrandom (buffer, nbytes, GRND_RANDOM);
+ #endif
}
+
else
{
nbytes = length < sizeof (buffer) ? length : sizeof (buffer);
#endif