openssl: 1.0.2e→1.0.2f & reformat recipe

dev-libs/openssl/openssl-1.0.2f.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,21 +10,18 @@ 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="e23ccafdb75cfcde782da0151731aa2185195ac745eea3846133f2e05c0e0bff"
+conditions."
+HOMEPAGE="https://www.openssl.org/"
+COPYRIGHT="1995-1998 Eric Young
+	1998-2016 The OpenSSL Project."
 LICENSE="OpenSSL"
-COPYRIGHT="
-	1995-1998 Eric Young
-	1998-2015 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="932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c"
+PATCHES="openssl-$portVersion.patch"
 
-PATCHES="openssl-$portVersion.patchset"
+ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?arm ?ppc"
 
 PROVIDES="
 	openssl$secondaryArchSuffix = $portVersion compat >= 1.0.0
@@ -45,6 +41,15 @@ REQUIRES="
 	ca_root_certificates
 	"
 
+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
 	"
@@ -103,14 +108,3 @@ TEST()
 {
 	make test
 }
-
-# ----- devel package -------------------------------------------------------
-
-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
-	"

dev-libs/openssl/patches/openssl-1.0.2f.patch

@@ -1,14 +1,11 @@
-From a04261aa0fa37e850a29526769fa48c81c4a3b54 Mon Sep 17 00:00:00 2001
 From: Alexander von Gluck IV <kallisti5@unixzen.com>
 Date: Wed, 18 Jun 2014 02:37:21 +0000
 Subject: Haiku: build fixes
 
 
-diff --git a/Configure b/Configure
-index d99eed7..b52eba7 100755
---- a/Configure
+--- a/Configure	2016-01-28 13:56:08.000000000 +0000
 +++ b/Configure
-@@ -498,6 +498,10 @@ my %table=(
+@@ -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",
  "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",
  
@@ -19,9 +16,7 @@ index d99eed7..b52eba7 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
+--- a/Makefile.shared	2016-01-28 13:38:30.000000000 +0000
 +++ b/Makefile.shared
 @@ -594,10 +594,10 @@ symlink.hpux:
  symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos:
@@ -38,11 +33,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 77f730f..d2a0c95 100755
---- a/config
+--- a/config	2016-01-28 13:56:08.000000000 +0000
 +++ 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
  	;;
  
@@ -67,19 +60,15 @@ index 77f730f..d2a0c95 100755
    # these are all covered by the catchall below
    # *-dgux) OUT="dgux" ;;
    mips-sony-newsos4) OUT="newsos4-gcc" ;;
--- 
-2.2.2
 
 
-From 3db79f59be0febb0db6060dbdf6ac106c1abc692 Mon Sep 17 00:00:00 2001
+
 From: Alexander von Gluck IV <kallisti5@unixzen.com>
 Date: Wed, 18 Jun 2014 02:39:12 +0000
 Subject: Haiku: Modify default Root CA filename
 
 
-diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h
-index fba180a..40c32df 100644
---- a/crypto/cryptlib.h
+--- a/crypto/cryptlib.h	2016-01-28 13:38:30.000000000 +0000
 +++ b/crypto/cryptlib.h
 @@ -82,7 +82,7 @@ extern "C" {
  # ifndef OPENSSL_SYS_VMS
@@ -90,20 +79,16 @@ index fba180a..40c32df 100644
  #  define X509_PRIVATE_DIR        OPENSSLDIR "/private"
  # else
  #  define X509_CERT_AREA          "SSLROOT:[000000]"
--- 
-2.2.2
 
 
-From f3427de441d7d0444bdb5347df3bc46bcfec5bef Mon Sep 17 00:00:00 2001
+
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Mon, 9 Nov 2015 19:44:10 +0100
 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
---- a/crypto/evp/e_aes_cbc_hmac_sha1.c
+--- a/crypto/evp/e_aes_cbc_hmac_sha1.c	2016-01-28 13:56:08.000000000 +0000
 +++ b/crypto/evp/e_aes_cbc_hmac_sha1.c
 @@ -91,8 +91,7 @@ typedef struct {
  
@@ -115,19 +100,16 @@ index 8330964..8980582 100644
  
  extern unsigned int OPENSSL_ia32cap_P[];
  #  define AESNI_CAPABLE   (1<<(57-32))
--- 
-2.2.2
 
 
-From be8424d5e95e856981decedec9e0d4127920c1b0 Mon Sep 17 00:00:00 2001
+
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Mon, 9 Nov 2015 20:32:09 +0100
 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 b1c586e..63bc0e8 100644
---- a/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
 +++ b/crypto/evp/e_aes_cbc_hmac_sha256.c
 @@ -91,8 +91,7 @@ typedef struct {
  
@@ -139,11 +121,9 @@ index b1c586e..63bc0e8 100644
  
  extern unsigned int OPENSSL_ia32cap_P[];
  #  define AESNI_CAPABLE   (1<<(57-32))
-diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c
-index 2da1117..d41ba7f 100644
---- a/crypto/evp/e_rc4_hmac_md5.c
+--- a/crypto/evp/e_rc4_hmac_md5.c	2016-01-28 13:38:31.000000000 +0000
 +++ b/crypto/evp/e_rc4_hmac_md5.c
-@@ -101,8 +101,7 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx,
+@@ -101,8 +101,7 @@ static int rc4_hmac_md5_init_key(EVP_CIP
  
  # if     !defined(OPENSSL_NO_ASM) &&     ( \
          defined(__x86_64)       || defined(__x86_64__)  || \
@@ -153,9 +133,7 @@ index 2da1117..d41ba7f 100644
          !(defined(__APPLE__) && defined(__MACH__))
  #  define STITCHED_CALL
  # endif
-diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
-index 603c285..fac5d3c 100644
---- a/ssl/s3_pkt.c
+--- a/ssl/s3_pkt.c	2016-01-28 13:56:08.000000000 +0000
 +++ b/ssl/s3_pkt.c
 @@ -125,8 +125,7 @@
  #if     defined(OPENSSL_SMALL_FOOTPRINT) || \
@@ -167,6 +145,3 @@ index 603c285..fac5d3c 100644
          )
  # undef EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK
  # define EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0
--- 
-2.2.2
-