From 60da30641ac28da667b63853902c04ef7b72d129 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Fri, 29 Jan 2016 10:51:59 +0100 Subject: [PATCH] =?UTF-8?q?openssl:=20fix=201.0.0t,=20update=201.0.1h?= =?UTF-8?q?=E2=86=921.0.1r,=20fix=201.0.2f?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dev-libs/openssl/openssl-1.0.0t.recipe | 21 +++---- ...sl-1.0.1h.recipe => openssl-1.0.1r.recipe} | 59 ++++++++----------- dev-libs/openssl/openssl-1.0.2f.recipe | 10 ++-- ...l-1.0.0t.patch => openssl-1.0.0t.patchset} | 0 ....0.1h.patchset => openssl-1.0.1r.patchset} | 46 ++++----------- ...l-1.0.2f.patch => openssl-1.0.2f.patchset} | 16 ++--- 6 files changed, 56 insertions(+), 96 deletions(-) rename dev-libs/openssl/{openssl-1.0.1h.recipe => openssl-1.0.1r.recipe} (66%) rename dev-libs/openssl/patches/{openssl-1.0.0t.patch => openssl-1.0.0t.patchset} (100%) rename dev-libs/openssl/patches/{openssl-1.0.1h.patchset => openssl-1.0.1r.patchset} (73%) rename dev-libs/openssl/patches/{openssl-1.0.2f.patch => openssl-1.0.2f.patchset} (91%) diff --git a/dev-libs/openssl/openssl-1.0.0t.recipe b/dev-libs/openssl/openssl-1.0.0t.recipe index 3518fddc9..265e1d2a4 100644 --- a/dev-libs/openssl/openssl-1.0.0t.recipe +++ b/dev-libs/openssl/openssl-1.0.0t.recipe @@ -15,18 +15,18 @@ HOMEPAGE="https://www.openssl.org/" COPYRIGHT="1995-1998 Eric Young 1998-2015 The OpenSSL Project." LICENSE="OpenSSL" -REVISION="1" +REVISION="2" SOURCE_URI="https://www.openssl.org/source/openssl-$portVersion.tar.gz" CHECKSUM_SHA256="5ab6e348c6c2a95d457e7a00e0aa653bfc7eb4df7b24e7c9ab63163ac0299097" -PATCHES="openssl-$portVersion.patch" +PATCHES="openssl-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64 arm ?ppc" -SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?x86_64 ?arm ?ppc" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - openssl$secondaryArchSuffix = $portVersion compat >= 1.0.0 - lib:libcrypto$secondaryArchSuffix = $portVersion compat >= 1.0.0 - lib:libssl$secondaryArchSuffix = $portVersion compat >= 1.0.0 + openssl$secondaryArchSuffix = $portVersion + lib:libcrypto$secondaryArchSuffix = 1.0.0 compat >= 1.0.0 + lib:libssl$secondaryArchSuffix = 1.0.0 compat >= 1.0.0 " if [ -z "$secondaryArchSuffix" ]; then PROVIDES="$PROVIDES @@ -40,16 +40,11 @@ REQUIRES=" lib:libz$secondaryArchSuffix >= 1.2.3 ca_root_certificates " -if [ -n "$secondaryArchSuffix" ]; then - REQUIRES="$REQUIRES - openssl == $portVersion base - " -fi PROVIDES_devel=" openssl${secondaryArchSuffix}_devel = $portVersion - devel:libcrypto${secondaryArchSuffix} = $portVersion compat >= 1.0.0 - devel:libssl${secondaryArchSuffix} = $portVersion compat >= 1.0.0 + devel:libcrypto${secondaryArchSuffix} = 1.0.0 compat >= 1.0.0 + devel:libssl${secondaryArchSuffix} = 1.0.0 compat >= 1.0.0 " REQUIRES_devel=" openssl${secondaryArchSuffix} == $portVersion base diff --git a/dev-libs/openssl/openssl-1.0.1h.recipe b/dev-libs/openssl/openssl-1.0.1r.recipe similarity index 66% rename from dev-libs/openssl/openssl-1.0.1h.recipe rename to dev-libs/openssl/openssl-1.0.1r.recipe index 8040454bd..4e64fc3a8 100644 --- a/dev-libs/openssl/openssl-1.0.1h.recipe +++ b/dev-libs/openssl/openssl-1.0.1r.recipe @@ -1,8 +1,7 @@ SUMMARY="Full-strength general purpose cryptography library (with SSL/TLS)" -DESCRIPTION=" -The OpenSSL Project is a collaborative effort to develop a robust, \ -commercial-grade, full-featured, and Open Source toolkit implementing the \ -Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) \ +DESCRIPTION="The OpenSSL Project is a collaborative effort to develop a \ +robust, commercial-grade, full-featured, and Open Source toolkit implementing \ +the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) \ protocols as well as a full-strength general purpose cryptography library. The \ project is managed by a worldwide community of volunteers that use the \ Internet to communicate, plan, and develop the OpenSSL toolkit and its related \ @@ -11,26 +10,23 @@ OpenSSL is based on the excellent SSLeay library developed by Eric A. Young \ and Tim J. Hudson. The OpenSSL toolkit is licensed under an Apache-style \ licence, which basically means that you are free to get and use it for \ commercial and non-commercial purposes subject to some simple license \ -conditions. -" -HOMEPAGE="http://www.openssl.org/" -SOURCE_URI="http://www.openssl.org/source/openssl-${portVersion}.tar.gz" -CHECKSUM_SHA256="9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093" +conditions." +HOMEPAGE="https://www.openssl.org/" +COPYRIGHT="1995-1998 Eric Young + 1998-2016 The OpenSSL Project." LICENSE="OpenSSL" -COPYRIGHT=" - 1995-1998 Eric Young - 1998-2013 The OpenSSL Project. - " REVISION="1" -ARCHITECTURES="?x86_gcc2 x86 ?x86_64" -SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" +SOURCE_URI="https://www.openssl.org/source/openssl-$portVersion.tar.gz" +CHECKSUM_SHA256="784bd8d355ed01ce98b812f873f8b2313da61df7c7b5677fcf2e57b0863a3346" +PATCHES="openssl-$portVersion.patchset" -PATCHES="openssl-1.0.1h.patchset" +ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - openssl$secondaryArchSuffix = $portVersion compat >= 1.0.1 - lib:libcrypto$secondaryArchSuffix = 1.0.0 compat >= 1.0 - lib:libssl$secondaryArchSuffix = 1.0.0 compat >= 1.0 + openssl$secondaryArchSuffix = $portVersion + lib:libcrypto$secondaryArchSuffix = 1.0.0 compat >= 1.0.0 + lib:libssl$secondaryArchSuffix = 1.0.0 compat >= 1.0.0 " if [ -z "$secondaryArchSuffix" ]; then PROVIDES="$PROVIDES @@ -44,11 +40,15 @@ REQUIRES=" lib:libz$secondaryArchSuffix >= 1.2.3 ca_root_certificates " -if [ -n "$secondaryArchSuffix" ]; then - REQUIRES="$REQUIRES - openssl == $portVersion base - " -fi + +PROVIDES_devel=" + openssl${secondaryArchSuffix}_devel = $portVersion + devel:libcrypto${secondaryArchSuffix} = 1.0.0 compat >= 1.0.0 + devel:libssl${secondaryArchSuffix} = 1.0.0 compat >= 1.0.0 + " +REQUIRES_devel=" + openssl${secondaryArchSuffix} == $portVersion base + " BUILD_REQUIRES=" devel:libz$secondaryArchSuffix >= 1.2.3 @@ -108,14 +108,3 @@ TEST() { make test } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - openssl${secondaryArchSuffix}_devel = $portVersion - devel:libcrypto${secondaryArchSuffix} = 1.0.0 compat >= 1.0 - devel:libssl${secondaryArchSuffix} = 1.0.0 compat >= 1.0 - " -REQUIRES_devel=" - openssl${secondaryArchSuffix} == $portVersion base - " diff --git a/dev-libs/openssl/openssl-1.0.2f.recipe b/dev-libs/openssl/openssl-1.0.2f.recipe index 5067ea429..bd7db1586 100644 --- a/dev-libs/openssl/openssl-1.0.2f.recipe +++ b/dev-libs/openssl/openssl-1.0.2f.recipe @@ -15,16 +15,16 @@ HOMEPAGE="https://www.openssl.org/" COPYRIGHT="1995-1998 Eric Young 1998-2016 The OpenSSL Project." LICENSE="OpenSSL" -REVISION="1" -SOURCE_URI="https://www.openssl.org/source/openssl-${portVersion}.tar.gz" +REVISION="2" +SOURCE_URI="https://www.openssl.org/source/openssl-$portVersion.tar.gz" CHECKSUM_SHA256="932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c" -PATCHES="openssl-$portVersion.patch" +PATCHES="openssl-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc" -SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?arm ?ppc" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - openssl$secondaryArchSuffix = $portVersion compat >= 1.0.0 + openssl$secondaryArchSuffix = $portVersion lib:libcrypto$secondaryArchSuffix = 1.0.0 compat >= 1.0.0 lib:libssl$secondaryArchSuffix = 1.0.0 compat >= 1.0.0 " diff --git a/dev-libs/openssl/patches/openssl-1.0.0t.patch b/dev-libs/openssl/patches/openssl-1.0.0t.patchset similarity index 100% rename from dev-libs/openssl/patches/openssl-1.0.0t.patch rename to dev-libs/openssl/patches/openssl-1.0.0t.patchset diff --git a/dev-libs/openssl/patches/openssl-1.0.1h.patchset b/dev-libs/openssl/patches/openssl-1.0.1r.patchset similarity index 73% rename from dev-libs/openssl/patches/openssl-1.0.1h.patchset rename to dev-libs/openssl/patches/openssl-1.0.1r.patchset index e2db3e4a1..1b876695c 100644 --- a/dev-libs/openssl/patches/openssl-1.0.1h.patchset +++ b/dev-libs/openssl/patches/openssl-1.0.1r.patchset @@ -1,19 +1,10 @@ -From ce6f8df79f78f6c533f99c44b86850c4f76a84e2 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 18 Jun 2014 02:37:21 +0000 Subject: [PATCH 1/2] Haiku: build fixes ---- - Configure | 4 ++++ - Makefile.shared | 8 ++++---- - config | 11 +++++++++++ - 3 files changed, 19 insertions(+), 4 deletions(-) - -diff --git a/Configure b/Configure -index de78469..047ce37 100755 --- a/Configure +++ b/Configure -@@ -440,6 +440,10 @@ my %table=( +@@ -447,6 +447,10 @@ my %table=( "beos-x86-r5", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lnet:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC -DPIC:-shared:.so", "beos-x86-bone", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lbind -lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC:-shared:.so", @@ -24,8 +15,6 @@ index de78469..047ce37 100755 #### SCO/Caldera targets. # # Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc. -diff --git a/Makefile.shared b/Makefile.shared -index e753f44..cce510f 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -594,10 +594,10 @@ symlink.hpux: @@ -43,11 +32,9 @@ index e753f44..cce510f 100644 link_o.bsd-shared: link_o.bsd link_a.bsd-shared: link_a.bsd link_app.bsd-shared: link_app.bsd -diff --git a/config b/config -index 41fa2a6..f390fc2 100755 --- a/config +++ b/config -@@ -134,6 +134,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in +@@ -134,6 +134,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${ echo "${MACHINE}-dg-dgux"; exit 0 ;; @@ -72,31 +59,20 @@ index 41fa2a6..f390fc2 100755 # these are all covered by the catchall below # *-dgux) OUT="dgux" ;; mips-sony-newsos4) OUT="newsos4-gcc" ;; --- -1.8.3.4 -From df9dd1aa2bf9d40613e95c5ae8fe9e5dc3e8c68f Mon Sep 17 00:00:00 2001 + From: Alexander von Gluck IV Date: Wed, 18 Jun 2014 02:39:12 +0000 Subject: [PATCH 2/2] Haiku: Modify default Root CA filename ---- - crypto/cryptlib.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h -index d26f963..96dfd07 100644 --- a/crypto/cryptlib.h +++ b/crypto/cryptlib.h @@ -82,7 +82,7 @@ extern "C" { - #ifndef OPENSSL_SYS_VMS - #define X509_CERT_AREA OPENSSLDIR - #define X509_CERT_DIR OPENSSLDIR "/certs" --#define X509_CERT_FILE OPENSSLDIR "/cert.pem" -+#define X509_CERT_FILE OPENSSLDIR "/CARootCertificates.pem" - #define X509_PRIVATE_DIR OPENSSLDIR "/private" - #else - #define X509_CERT_AREA "SSLROOT:[000000]" --- -1.8.3.4 - + # ifndef OPENSSL_SYS_VMS + # define X509_CERT_AREA OPENSSLDIR + # define X509_CERT_DIR OPENSSLDIR "/certs" +-# define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++# define X509_CERT_FILE OPENSSLDIR "/CARootCertificates.pem" + # define X509_PRIVATE_DIR OPENSSLDIR "/private" + # else + # define X509_CERT_AREA "SSLROOT:[000000]" diff --git a/dev-libs/openssl/patches/openssl-1.0.2f.patch b/dev-libs/openssl/patches/openssl-1.0.2f.patchset similarity index 91% rename from dev-libs/openssl/patches/openssl-1.0.2f.patch rename to dev-libs/openssl/patches/openssl-1.0.2f.patchset index 34a7209fd..2e1c49724 100644 --- a/dev-libs/openssl/patches/openssl-1.0.2f.patch +++ b/dev-libs/openssl/patches/openssl-1.0.2f.patchset @@ -3,7 +3,7 @@ Date: Wed, 18 Jun 2014 02:37:21 +0000 Subject: Haiku: build fixes ---- a/Configure 2016-01-28 13:56:08.000000000 +0000 +--- a/Configure +++ b/Configure @@ -502,6 +502,10 @@ my %table=( "beos-x86-r5", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lnet:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC -DPIC:-shared:.so", @@ -16,7 +16,7 @@ Subject: Haiku: build fixes #### SCO/Caldera targets. # # Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc. ---- a/Makefile.shared 2016-01-28 13:38:30.000000000 +0000 +--- a/Makefile.shared +++ b/Makefile.shared @@ -594,10 +594,10 @@ symlink.hpux: symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos: @@ -33,7 +33,7 @@ Subject: Haiku: build fixes link_o.bsd-shared: link_o.bsd link_a.bsd-shared: link_a.bsd link_app.bsd-shared: link_app.bsd ---- a/config 2016-01-28 13:56:08.000000000 +0000 +--- a/config +++ b/config @@ -134,6 +134,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${ echo "${MACHINE}-dg-dgux"; exit 0 @@ -68,7 +68,7 @@ Date: Wed, 18 Jun 2014 02:39:12 +0000 Subject: Haiku: Modify default Root CA filename ---- a/crypto/cryptlib.h 2016-01-28 13:38:30.000000000 +0000 +--- a/crypto/cryptlib.h +++ b/crypto/cryptlib.h @@ -82,7 +82,7 @@ extern "C" { # ifndef OPENSSL_SYS_VMS @@ -88,7 +88,7 @@ Subject: Do not use __INTEL__ to detect x86_64. * Haiku defines it for 32-bit x86 as well. ---- a/crypto/evp/e_aes_cbc_hmac_sha1.c 2016-01-28 13:56:08.000000000 +0000 +--- a/crypto/evp/e_aes_cbc_hmac_sha1.c +++ b/crypto/evp/e_aes_cbc_hmac_sha1.c @@ -91,8 +91,7 @@ typedef struct { @@ -109,7 +109,7 @@ Subject: more __intel__ fixes... diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c ---- a/crypto/evp/e_aes_cbc_hmac_sha256.c 2016-01-28 13:56:08.000000000 +0000 +--- a/crypto/evp/e_aes_cbc_hmac_sha256.c +++ b/crypto/evp/e_aes_cbc_hmac_sha256.c @@ -91,8 +91,7 @@ typedef struct { @@ -121,7 +121,7 @@ diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha2 extern unsigned int OPENSSL_ia32cap_P[]; # define AESNI_CAPABLE (1<<(57-32)) ---- a/crypto/evp/e_rc4_hmac_md5.c 2016-01-28 13:38:31.000000000 +0000 +--- a/crypto/evp/e_rc4_hmac_md5.c +++ b/crypto/evp/e_rc4_hmac_md5.c @@ -101,8 +101,7 @@ static int rc4_hmac_md5_init_key(EVP_CIP @@ -133,7 +133,7 @@ diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha2 !(defined(__APPLE__) && defined(__MACH__)) # define STITCHED_CALL # endif ---- a/ssl/s3_pkt.c 2016-01-28 13:56:08.000000000 +0000 +--- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -125,8 +125,7 @@ #if defined(OPENSSL_SMALL_FOOTPRINT) || \