MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-01-06 01:05:42 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

openssl: import 1.0.0c from OE, drop 1.0.0a

Browse Source 
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi 2011-01-07 12:08:20 +01:00
parent ee3afcda72
commit fb874704c3
12 changed files with 79 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
recipes-connectivity/openssl/ocf-linux.inc Normal file
View File

@ -0,0 +1,23 @@
DESCRIPTION = "Install required headers to enable OCF Linux support"
LICENSE = "BSD"
INC_PR = "r0"
SRC_URI = "http://sourceforge.net/projects/ocf-linux/files/ocf-linux/${PV}/ocf-linux-${PV}.tar.gz"
S = "${WORKDIR}/ocf-linux-${PV}"
# Need to unpack the the ocf-linux.tar.gz file contained inside the
# downloaded tarball
do_install_prepend() {
cd ${S}
tar xzf ocf-linux.tar.gz
}
# Install the OCF Linux headers so that other packages such as openssl
# can find them. The headers must be in a crypto directory according to
# the README file.
do_install() {
install -d ${D}${includedir}/crypto
install -m 0644 ${S}/ocf/*.h ${D}${includedir}/crypto/
}

6
recipes-connectivity/openssl/ocf-linux_20100325.bb Normal file
View File

@ -0,0 +1,6 @@
require ocf-linux.inc
PR = "${INC_PR}.0"
SRC_URI[md5sum] = "ce5ad54aa94226d496df1f0f3cf0c11f"
SRC_URI[sha256sum] = "9d17cbd13849939c70699b520280e3b94cf77401cdc131108d4aeaaeea587f6b"

12
recipes-connectivity/openssl/openssl-1.0.0a/openssl-fix-ssl3_get_key_exchange-double-free.patch
View File

@ -1,12 +0,0 @@
Index: openssl-1.0.0a/ssl/s3_clnt.c
===================================================================
--- openssl-1.0.0a.orig/ssl/s3_clnt.c 2010-09-13 18:38:01.000000000 +0400
+++ openssl-1.0.0a/ssl/s3_clnt.c 2010-09-13 18:38:35.000000000 +0400
@@ -1508,6 +1508,7 @@
s->session->sess_cert->peer_ecdh_tmp=ecdh;
ecdh=NULL;
BN_CTX_free(bn_ctx);
+ bn_ctx = NULL;
EC_POINT_free(srvr_ecpoint);
srvr_ecpoint = NULL;
}

14
recipes-connectivity/openssl/openssl-1.0.0a/configure-targets.patch → recipes-connectivity/openssl/openssl-1.0.0c/configure-targets.patch
View File

@ -2,11 +2,11 @@
The number of colons are important :)
Index: openssl-1.0.0/Configure
Index: openssl-1.0.0a/Configure
===================================================================
--- openssl-1.0.0.orig/Configure 2010-01-19 13:40:54.000000000 -0800
+++ openssl-1.0.0/Configure 2010-05-26 22:58:01.238104854 -0700
@@ -380,6 +380,16 @@ my %table=(
--- openssl-1.0.0a.orig/Configure
+++ openssl-1.0.0a/Configure
@@ -380,6 +380,22 @@ my %table=(
"linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
"linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
@ -19,6 +19,12 @@ Index: openssl-1.0.0/Configure
+"linux-uclibceabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
+"linux-avr32","$ENV{'CC'}:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
+
+#### Linux on MIPS/MIPS64
+"linux-mips","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-mips64","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -mabi=64 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-mips64el","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -mabi=64 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-mipsel","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
#### *BSD [do see comment about ${BSDthreads} above!]
"BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

0
recipes-connectivity/openssl/openssl-1.0.0a/debian.patch → recipes-connectivity/openssl/openssl-1.0.0c/debian.patch
View File

0
recipes-connectivity/openssl/openssl-1.0.0a/engines-install-in-libdir-ssl.patch → recipes-connectivity/openssl/openssl-1.0.0c/engines-install-in-libdir-ssl.patch
View File

0
recipes-connectivity/openssl/openssl-1.0.0a/libdeps-first.patch → recipes-connectivity/openssl/openssl-1.0.0c/libdeps-first.patch
View File

0
recipes-connectivity/openssl/openssl-1.0.0a/oe-ldflags.patch → recipes-connectivity/openssl/openssl-1.0.0c/oe-ldflags.patch
View File

0
recipes-connectivity/openssl/openssl-1.0.0a/shared-libs.patch → recipes-connectivity/openssl/openssl-1.0.0c/shared-libs.patch
View File

27
recipes-connectivity/openssl/openssl-native_1.0.0c.bb Normal file
View File

@ -0,0 +1,27 @@
require openssl.inc
inherit pkgconfig native
SRC_URI[src.md5sum] = "ff8fb85610aef328315a9decbb2712e4"
SRC_URI[src.sha256sum] = "f731b36de3edaa361179ae6f449668b248a360e34e31e92902d976e9b9d604eb"
PR = "${INC_PR}.0"
DEFAULT_PREFERENCE = "-1"
export DIRS = "crypto ssl apps engines"
# This flag can contain target options (e.g -mfpu=neon for armv7-a systems)
export FULL_OPTIMIZATION = " "
export BUILD_OPTIMIZATION = " "
SRC_URI += "file://configure-targets.patch \
file://shared-libs.patch \
file://debian.patch \
file://libdeps-first.patch \
"
PARALLEL_MAKE = ""
CFLAG += " -Wa,--noexecstack "
NATIVE_INSTALL_WORKS = "1"

5
recipes-connectivity/openssl/openssl.inc
View File

@ -1,8 +1,11 @@
DESCRIPTION = "Secure Socket Layer (SSL) binary and related cryptographic tools."
HOMEPAGE = "http://www.openssl.org/"
LICENSE = "openssl"
SECTION = "libs/network"
# "openssl | SSLeay" dual license
LICENSE = "openssl"
LIC_FILES_CHKSUM = "file://LICENSE;md5=83d26c69f6f0172ee7f795790424b453"
SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz;name=src"
S = "${WORKDIR}/openssl-${PV}"

13
recipes-connectivity/openssl/openssl_1.0.0a.bb → recipes-connectivity/openssl/openssl_1.0.0c.bb
View File

@ -1,10 +1,16 @@
inherit pkgconfig
require openssl.inc
SRC_URI[src.md5sum] = "e3873edfffc783624cfbdb65e2249cbd"
SRC_URI[src.sha256sum] = "18a9bd1fc02b8ef90dded34fafaa9089baaafef278a19fc4e89c2ab0dcf70f63"
PR = "${INC_PR}.1"
# For target side versions of openssl enable support for OCF Linux driver
# if they are available.
DEPENDS += "ocf-linux"
CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
SRC_URI[src.md5sum] = "ff8fb85610aef328315a9decbb2712e4"
SRC_URI[src.sha256sum] = "f731b36de3edaa361179ae6f449668b248a360e34e31e92902d976e9b9d604eb"
PR = "${INC_PR}.2"
DEFAULT_PREFERENCE = "-1"
@ -17,7 +23,6 @@ SRC_URI += "file://configure-targets.patch \
file://oe-ldflags.patch \
file://libdeps-first.patch \
file://engines-install-in-libdir-ssl.patch \
file://openssl-fix-ssl3_get_key_exchange-double-free.patch \
"
PARALLEL_MAKE = ""