openssl: bump to 1.0.1t and 1.0.2h.

Also add cmd:cmp to BUILD_PREREQUIRES since "make test" needs it.
This commit is contained in:
fbrosson
2016-05-05 19:53:44 +00:00
committed by Jérôme Duval
parent b10377b53e
commit 2de99196b7
4 changed files with 10 additions and 8 deletions

View File

@@ -17,7 +17,7 @@ COPYRIGHT="1995-1998 Eric Young
LICENSE="OpenSSL"
REVISION="1"
SOURCE_URI="https://www.openssl.org/source/openssl-$portVersion.tar.gz"
CHECKSUM_SHA256="e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511"
CHECKSUM_SHA256="4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088"
PATCHES="openssl-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc"
@@ -55,6 +55,7 @@ BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
cmd:cmp
cmd:gcc${secondaryArchSuffix}
cmd:ld${secondaryArchSuffix}
cmd:make

View File

@@ -17,7 +17,7 @@ COPYRIGHT="1995-1998 Eric Young
LICENSE="OpenSSL"
REVISION="1"
SOURCE_URI="https://www.openssl.org/source/openssl-$portVersion.tar.gz"
CHECKSUM_SHA256="b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33"
CHECKSUM_SHA256="1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919"
PATCHES="openssl-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc"
@@ -55,6 +55,7 @@ BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
cmd:cmp
cmd:gcc${secondaryArchSuffix}
cmd:ld${secondaryArchSuffix}
cmd:make

View File

@@ -102,10 +102,10 @@ Subject: Do not use __INTEL__ to detect x86_64.
* Haiku defines it for 32-bit x86 as well.
diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c
index d1f5928..55d8b8e 100644
index 1d598db..04fd1a5 100644
--- a/crypto/evp/e_aes_cbc_hmac_sha1.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha1.c
@@ -86,8 +86,7 @@ typedef struct {
@@ -87,8 +87,7 @@ typedef struct {
# if defined(AES_ASM) && ( \
defined(__x86_64) || defined(__x86_64__) || \

View File

@@ -102,10 +102,10 @@ Subject: Do not use __INTEL__ to detect x86_64.
* Haiku defines it for 32-bit x86 as well.
diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c
index 8330964..8980582 100644
index 6dfd590..bc571e5 100644
--- a/crypto/evp/e_aes_cbc_hmac_sha1.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha1.c
@@ -91,8 +91,7 @@ typedef struct {
@@ -92,8 +92,7 @@ typedef struct {
# if defined(AES_ASM) && ( \
defined(__x86_64) || defined(__x86_64__) || \
@@ -126,10 +126,10 @@ Subject: more __intel__ fixes...
diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c
index 3780021..fff6e0c 100644
index 46c9d03..4a9ad27 100644
--- a/crypto/evp/e_aes_cbc_hmac_sha256.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha256.c
@@ -91,8 +91,7 @@ typedef struct {
@@ -92,8 +92,7 @@ typedef struct {
# if defined(AES_ASM) && ( \
defined(__x86_64) || defined(__x86_64__) || \