openssl: bump version.

This commit is contained in:
Jerome Duval
2020-03-20 17:30:11 +01:00
parent 35d12cb498
commit 34aabf4e57
2 changed files with 12 additions and 18 deletions

View File

@@ -17,7 +17,7 @@ COPYRIGHT="1995-1998 Eric Young
LICENSE="Apache v2"
REVISION="1"
SOURCE_URI="https://www.openssl.org/source/openssl-$portVersion.tar.gz"
CHECKSUM_SHA256="1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2"
CHECKSUM_SHA256="694f61ac11cb51c9bf73f54e771ff6022b0327a43bbdfa1b2f19de1662a6dcbe"
SOURCE_DIR="openssl-$portVersion"
PATCHES="openssl-$portVersion.patchset"

View File

@@ -1,29 +1,23 @@
From a9e6542372db001292e65c3acfde4868824c6760 Mon Sep 17 00:00:00 2001
From b6f59fe55a17125da8a3fd5dc9020c306cd038c6 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Sat, 14 Mar 2020 19:20:45 -0400
Subject: [PATCH] Small changes for Haiku.
Subject: Small changes for Haiku.
---
config | 4 ++--
crypto/rand/rand_unix.c | 2 ++
include/internal/cryptlib.h | 2 +-
os-dep/haiku.h | 2 ++
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/config b/config
index c1a94d4..c080208 100755
index f28828d..2cf58af 100755
--- a/config
+++ b/config
@@ -911,7 +911,7 @@ OUT="$OUT"
$PERL $THERE/Configure LIST | grep "$OUT" > /dev/null
if [ $? = "0" ]; then
@@ -912,7 +912,7 @@ fi
if $PERL $THERE/Configure LIST | grep "$OUT" > /dev/null; then
if [ "$VERBOSE" = "true" ]; then
- echo /usr/bin/env \
+ echo /bin/env \
__CNF_CPPDEFINES="'$__CNF_CPPDEFINES'" \
__CNF_CPPINCLUDES="'$__CNF_CPPINCLUDES'" \
__CNF_CPPFLAGS="'$__CNF_CPPFLAGS'" \
@@ -924,7 +924,7 @@ if [ $? = "0" ]; then
@@ -925,7 +925,7 @@ if $PERL $THERE/Configure LIST | grep "$OUT" > /dev/null; then
if [ "$DRYRUN" = "false" ]; then
# eval to make sure quoted options, possibly with spaces inside,
# are treated right
@@ -33,10 +27,10 @@ index c1a94d4..c080208 100755
__CNF_CPPINCLUDES="'$__CNF_CPPINCLUDES'" \
__CNF_CPPFLAGS="'$__CNF_CPPFLAGS'" \
diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
index 69efcde..a3ce11a 100644
index fe457ca..6389c6d 100644
--- a/crypto/rand/rand_unix.c
+++ b/crypto/rand/rand_unix.c
@@ -216,7 +216,9 @@ void rand_pool_keep_random_devices_open(int keep)
@@ -217,7 +217,9 @@ void rand_pool_keep_random_devices_open(int keep)
# if !defined(DEVRANDOM)
# error "OS seeding requires DEVRANDOM to be configured"
# endif
@@ -47,7 +41,7 @@ index 69efcde..a3ce11a 100644
# endif
diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h
index 23e17e5..e6b6aed 100644
index 6e7291a..7542308 100644
--- a/include/internal/cryptlib.h
+++ b/include/internal/cryptlib.h
@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM);
@@ -69,5 +63,5 @@ index 7e908ef..7735f6d 100644
+
+#define OPENSSL_NO_SECURE_MEMORY
--
2.24.1
2.24.0