diff options
author | Andrej Valek <andrej.valek@siemens.com> | 2018-08-16 14:27:56 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-29 15:23:51 +0100 |
commit | 205a56fcfafb3bd3b94712e03640f42c707a00da (patch) | |
tree | 02cda321e028a54d35776090a02adbce523db406 /meta/recipes-connectivity/openssl/openssl-1.0.2p/debian | |
parent | 45e1ed092d94ad474c533ec8daae6a55ed98eff1 (diff) | |
download | poky-205a56fcfafb3bd3b94712e03640f42c707a00da.tar.gz |
openssl: update 1.0.2o -> 1.0.2p
Please see this security advisory:
https://www.openssl.org/news/secadv/20180612.txt
Refresh patches
(From OE-Core rev: ff3db93e53c4f9d56807d3755c799459944e9a87)
(From OE-Core rev: 84233553e963e26ca5f9f983662d4bd133176bb9)
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-1.0.2p/debian')
7 files changed, 400 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/c_rehash-compat.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/c_rehash-compat.patch new file mode 100644 index 0000000000..3820e3e306 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/c_rehash-compat.patch | |||
@@ -0,0 +1,71 @@ | |||
1 | From 83f318d68bbdab1ca898c94576a838cc97df4700 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ludwig Nussel <ludwig.nussel@suse.de> | ||
3 | Date: Wed, 21 Apr 2010 15:52:10 +0200 | ||
4 | Subject: [PATCH] also create old hash for compatibility | ||
5 | |||
6 | Upstream-Status: Backport [debian] | ||
7 | |||
8 | Index: openssl-1.0.2n/tools/c_rehash.in | ||
9 | =================================================================== | ||
10 | --- openssl-1.0.2n.orig/tools/c_rehash.in | ||
11 | +++ openssl-1.0.2n/tools/c_rehash.in | ||
12 | @@ -8,8 +8,6 @@ my $prefix; | ||
13 | |||
14 | my $openssl = $ENV{OPENSSL} || "openssl"; | ||
15 | my $pwd; | ||
16 | -my $x509hash = "-subject_hash"; | ||
17 | -my $crlhash = "-hash"; | ||
18 | my $verbose = 0; | ||
19 | my $symlink_exists=eval {symlink("",""); 1}; | ||
20 | my $removelinks = 1; | ||
21 | @@ -18,10 +16,7 @@ my $removelinks = 1; | ||
22 | while ( $ARGV[0] =~ /^-/ ) { | ||
23 | my $flag = shift @ARGV; | ||
24 | last if ( $flag eq '--'); | ||
25 | - if ( $flag eq '-old') { | ||
26 | - $x509hash = "-subject_hash_old"; | ||
27 | - $crlhash = "-hash_old"; | ||
28 | - } elsif ( $flag eq '-h') { | ||
29 | + if ( $flag eq '-h') { | ||
30 | help(); | ||
31 | } elsif ( $flag eq '-n' ) { | ||
32 | $removelinks = 0; | ||
33 | @@ -113,7 +108,9 @@ sub hash_dir { | ||
34 | next; | ||
35 | } | ||
36 | link_hash_cert($fname) if($cert); | ||
37 | + link_hash_cert_old($fname) if($cert); | ||
38 | link_hash_crl($fname) if($crl); | ||
39 | + link_hash_crl_old($fname) if($crl); | ||
40 | } | ||
41 | } | ||
42 | |||
43 | @@ -146,6 +143,7 @@ sub check_file { | ||
44 | |||
45 | sub link_hash_cert { | ||
46 | my $fname = $_[0]; | ||
47 | + my $x509hash = $_[1] || '-subject_hash'; | ||
48 | $fname =~ s/'/'\\''/g; | ||
49 | my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`; | ||
50 | chomp $hash; | ||
51 | @@ -177,10 +175,20 @@ sub link_hash_cert { | ||
52 | $hashlist{$hash} = $fprint; | ||
53 | } | ||
54 | |||
55 | +sub link_hash_cert_old { | ||
56 | + link_hash_cert($_[0], '-subject_hash_old'); | ||
57 | +} | ||
58 | + | ||
59 | +sub link_hash_crl_old { | ||
60 | + link_hash_crl($_[0], '-hash_old'); | ||
61 | +} | ||
62 | + | ||
63 | + | ||
64 | # Same as above except for a CRL. CRL links are of the form <hash>.r<n> | ||
65 | |||
66 | sub link_hash_crl { | ||
67 | my $fname = $_[0]; | ||
68 | + my $crlhash = $_[1] || "-hash"; | ||
69 | $fname =~ s/'/'\\''/g; | ||
70 | my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fname'`; | ||
71 | chomp $hash; | ||
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/debian-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/debian-targets.patch new file mode 100644 index 0000000000..35d92bedb7 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/debian-targets.patch | |||
@@ -0,0 +1,73 @@ | |||
1 | Upstream-Status: Backport [debian] | ||
2 | |||
3 | Index: openssl-1.0.2n/Configure | ||
4 | =================================================================== | ||
5 | --- openssl-1.0.2n.orig/Configure | ||
6 | +++ openssl-1.0.2n/Configure | ||
7 | @@ -133,6 +133,10 @@ my $clang_devteam_warn = "-Wno-unused-pa | ||
8 | # Warn that "make depend" should be run? | ||
9 | my $warn_make_depend = 0; | ||
10 | |||
11 | +# There are no separate CFLAGS/CPPFLAGS/LDFLAGS, set everything in CFLAGS | ||
12 | +my $debian_cflags = `dpkg-buildflags --get CFLAGS` . `dpkg-buildflags --get CPPFLAGS` . `dpkg-buildflags --get LDFLAGS` . "-Wa,--noexecstack -Wall"; | ||
13 | +$debian_cflags =~ s/\n/ /g; | ||
14 | + | ||
15 | my $strict_warnings = 0; | ||
16 | |||
17 | my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL"; | ||
18 | @@ -369,6 +373,55 @@ my %table=( | ||
19 | "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so", | ||
20 | "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so", | ||
21 | |||
22 | +# Debian GNU/* (various architectures) | ||
23 | +"debian-alpha","gcc:-DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
24 | +"debian-alpha-ev4","gcc:-DTERMIO ${debian_cflags} -mcpu=ev4::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
25 | +"debian-alpha-ev5","gcc:-DTERMIO ${debian_cflags} -mcpu=ev5::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
26 | +"debian-arm64","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
27 | +"debian-armel","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
28 | +"debian-armhf","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
29 | +"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::", | ||
30 | +"debian-avr32", "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags} -fomit-frame-pointer::-D_REENTRANT::-ldl:BN_LLONG_BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
31 | +"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
32 | +"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS ${debian_cflags} -march=i486::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
33 | +"debian-hppa","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
34 | +"debian-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mtune=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
35 | +"debian-ia64","gcc:-DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
36 | +"debian-i386","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
37 | +"debian-i386-i486","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags} -march=i486::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
38 | +"debian-i386-i586","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags} -march=i586::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
39 | +"debian-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags} -march=i686::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
40 | +"debian-m68k","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
41 | +"debian-mips", "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
42 | +"debian-mipsel", "gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
43 | +"debian-mipsn32", "mips64-linux-gnuabin32-gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
44 | +"debian-mipsn32el", "mips64el-linux-gnuabin32-gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
45 | +"debian-mips64", "mips64-linux-gnuabi64-gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
46 | +"debian-mips64el", "mips64el-linux-gnuabi64-gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
47 | +"debian-netbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS ${debian_cflags} -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
48 | +"debian-netbsd-m68k", "gcc:-DB_ENDIAN -DTERMIOS ${debian_cflags}::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
49 | +"debian-netbsd-sparc", "gcc:-DB_ENDIAN -DTERMIOS ${debian_cflags} -mv8::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
50 | +"debian-openbsd-alpha","gcc:-DTERMIOS ${debian_cflags}::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
51 | +"debian-openbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS ${debian_cflags} -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
52 | +"debian-openbsd-mips","gcc:-DL_ENDIAN ${debian_cflags}::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
53 | +"debian-or1k", "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
54 | +"debian-powerpc","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
55 | +"debian-powerpcspe","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
56 | +"debian-ppc64","gcc:-m64 -DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
57 | +"debian-ppc64el","gcc:-m64 -DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64le:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
58 | +"debian-s390","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
59 | +"debian-s390x","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
60 | +"debian-sh3", "gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
61 | +"debian-sh4", "gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
62 | +"debian-sh3eb", "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
63 | +"debian-sh4eb", "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
64 | +"debian-m32r","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
65 | +"debian-sparc","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
66 | +"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags} -mcpu=v8 -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
67 | +"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags} -mcpu=v9 -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
68 | +"debian-sparc64","gcc:-m64 -DB_ENDIAN -DTERMIO ${debian_cflags} -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
69 | +"debian-x32","gcc:-mx32 -DL_ENDIAN -DTERMIO ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32", | ||
70 | + | ||
71 | #### | ||
72 | #### Variety of LINUX:-) | ||
73 | #### | ||
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/man-dir.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/man-dir.patch new file mode 100644 index 0000000000..4085e3b1d7 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/man-dir.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Upstream-Status: Backport [debian] | ||
2 | |||
3 | Index: openssl-1.0.0c/Makefile.org | ||
4 | =================================================================== | ||
5 | --- openssl-1.0.0c.orig/Makefile.org 2010-12-12 16:11:27.000000000 +0100 | ||
6 | +++ openssl-1.0.0c/Makefile.org 2010-12-12 16:11:37.000000000 +0100 | ||
7 | @@ -131,7 +131,7 @@ | ||
8 | |||
9 | MAKEFILE= Makefile | ||
10 | |||
11 | -MANDIR=$(OPENSSLDIR)/man | ||
12 | +MANDIR=/usr/share/man | ||
13 | MAN1=1 | ||
14 | MAN3=3 | ||
15 | MANSUFFIX= | ||
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/man-section.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/man-section.patch new file mode 100644 index 0000000000..21c1d1a4eb --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/man-section.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | Upstream-Status: Backport [debian] | ||
2 | |||
3 | Index: openssl-1.0.0c/Makefile.org | ||
4 | =================================================================== | ||
5 | --- openssl-1.0.0c.orig/Makefile.org 2010-12-12 16:11:37.000000000 +0100 | ||
6 | +++ openssl-1.0.0c/Makefile.org 2010-12-12 16:13:28.000000000 +0100 | ||
7 | @@ -160,7 +160,8 @@ | ||
8 | MANDIR=/usr/share/man | ||
9 | MAN1=1 | ||
10 | MAN3=3 | ||
11 | -MANSUFFIX= | ||
12 | +MANSUFFIX=ssl | ||
13 | +MANSECTION=SSL | ||
14 | HTMLSUFFIX=html | ||
15 | HTMLDIR=$(OPENSSLDIR)/html | ||
16 | SHELL=/bin/sh | ||
17 | @@ -651,7 +652,7 @@ | ||
18 | echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ | ||
19 | (cd `$(PERL) util/dirname.pl $$i`; \ | ||
20 | sh -c "$$pod2man \ | ||
21 | - --section=$$sec --center=OpenSSL \ | ||
22 | + --section=$${sec}$(MANSECTION) --center=OpenSSL \ | ||
23 | --release=$(VERSION) `basename $$i`") \ | ||
24 | > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ | ||
25 | $(PERL) util/extract-names.pl < $$i | \ | ||
26 | @@ -668,7 +669,7 @@ | ||
27 | echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ | ||
28 | (cd `$(PERL) util/dirname.pl $$i`; \ | ||
29 | sh -c "$$pod2man \ | ||
30 | - --section=$$sec --center=OpenSSL \ | ||
31 | + --section=$${sec}$(MANSECTION) --center=OpenSSL \ | ||
32 | --release=$(VERSION) `basename $$i`") \ | ||
33 | > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ | ||
34 | $(PERL) util/extract-names.pl < $$i | \ | ||
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/no-rpath.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/no-rpath.patch new file mode 100644 index 0000000000..1ccb3b86ee --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/no-rpath.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Upstream-Status: Backport [debian] | ||
2 | |||
3 | Index: openssl-1.0.0c/Makefile.shared | ||
4 | =================================================================== | ||
5 | --- openssl-1.0.0c.orig/Makefile.shared 2010-08-21 13:36:49.000000000 +0200 | ||
6 | +++ openssl-1.0.0c/Makefile.shared 2010-12-12 16:13:36.000000000 +0100 | ||
7 | @@ -153,7 +153,7 @@ | ||
8 | NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ | ||
9 | SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" | ||
10 | |||
11 | -DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" | ||
12 | +DO_GNU_APP=LDFLAGS="$(CFLAGS)" | ||
13 | |||
14 | #This is rather special. It's a special target with which one can link | ||
15 | #applications without bothering with any features that have anything to | ||
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/no-symbolic.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/no-symbolic.patch new file mode 100644 index 0000000000..cc4408ab7d --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/no-symbolic.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Upstream-Status: Backport [debian] | ||
2 | |||
3 | Index: openssl-1.0.0c/Makefile.shared | ||
4 | =================================================================== | ||
5 | --- openssl-1.0.0c.orig/Makefile.shared 2010-12-12 16:13:36.000000000 +0100 | ||
6 | +++ openssl-1.0.0c/Makefile.shared 2010-12-12 16:13:44.000000000 +0100 | ||
7 | @@ -151,7 +151,7 @@ | ||
8 | SHLIB_SUFFIX=; \ | ||
9 | ALLSYMSFLAGS='-Wl,--whole-archive'; \ | ||
10 | NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ | ||
11 | - SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" | ||
12 | + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" | ||
13 | |||
14 | DO_GNU_APP=LDFLAGS="$(CFLAGS)" | ||
15 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/pic.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/pic.patch new file mode 100644 index 0000000000..bfda3888bf --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/pic.patch | |||
@@ -0,0 +1,177 @@ | |||
1 | Upstream-Status: Backport [debian] | ||
2 | |||
3 | Index: openssl-1.0.1c/crypto/des/asm/desboth.pl | ||
4 | =================================================================== | ||
5 | --- openssl-1.0.1c.orig/crypto/des/asm/desboth.pl 2001-10-24 23:20:56.000000000 +0200 | ||
6 | +++ openssl-1.0.1c/crypto/des/asm/desboth.pl 2012-07-29 14:15:26.000000000 +0200 | ||
7 | @@ -16,6 +16,11 @@ | ||
8 | |||
9 | &push("edi"); | ||
10 | |||
11 | + &call (&label("pic_point0")); | ||
12 | + &set_label("pic_point0"); | ||
13 | + &blindpop("ebp"); | ||
14 | + &add ("ebp", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]"); | ||
15 | + | ||
16 | &comment(""); | ||
17 | &comment("Load the data words"); | ||
18 | &mov($L,&DWP(0,"ebx","",0)); | ||
19 | @@ -47,15 +52,21 @@ | ||
20 | &mov(&swtmp(2), (DWC(($enc)?"1":"0"))); | ||
21 | &mov(&swtmp(1), "eax"); | ||
22 | &mov(&swtmp(0), "ebx"); | ||
23 | - &call("DES_encrypt2"); | ||
24 | + &exch("ebx", "ebp"); | ||
25 | + &call("DES_encrypt2\@PLT"); | ||
26 | + &exch("ebx", "ebp"); | ||
27 | &mov(&swtmp(2), (DWC(($enc)?"0":"1"))); | ||
28 | &mov(&swtmp(1), "edi"); | ||
29 | &mov(&swtmp(0), "ebx"); | ||
30 | - &call("DES_encrypt2"); | ||
31 | + &exch("ebx", "ebp"); | ||
32 | + &call("DES_encrypt2\@PLT"); | ||
33 | + &exch("ebx", "ebp"); | ||
34 | &mov(&swtmp(2), (DWC(($enc)?"1":"0"))); | ||
35 | &mov(&swtmp(1), "esi"); | ||
36 | &mov(&swtmp(0), "ebx"); | ||
37 | - &call("DES_encrypt2"); | ||
38 | + &exch("ebx", "ebp"); | ||
39 | + &call("DES_encrypt2\@PLT"); | ||
40 | + &exch("ebx", "ebp"); | ||
41 | |||
42 | &stack_pop(3); | ||
43 | &mov($L,&DWP(0,"ebx","",0)); | ||
44 | Index: openssl-1.0.1c/crypto/perlasm/cbc.pl | ||
45 | =================================================================== | ||
46 | --- openssl-1.0.1c.orig/crypto/perlasm/cbc.pl 2011-07-13 08:22:46.000000000 +0200 | ||
47 | +++ openssl-1.0.1c/crypto/perlasm/cbc.pl 2012-07-29 14:15:26.000000000 +0200 | ||
48 | @@ -122,7 +122,11 @@ | ||
49 | &mov(&DWP($data_off,"esp","",0), "eax"); # put in array for call | ||
50 | &mov(&DWP($data_off+4,"esp","",0), "ebx"); # | ||
51 | |||
52 | - &call($enc_func); | ||
53 | + &call (&label("pic_point0")); | ||
54 | + &set_label("pic_point0"); | ||
55 | + &blindpop("ebx"); | ||
56 | + &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]"); | ||
57 | + &call("$enc_func\@PLT"); | ||
58 | |||
59 | &mov("eax", &DWP($data_off,"esp","",0)); | ||
60 | &mov("ebx", &DWP($data_off+4,"esp","",0)); | ||
61 | @@ -185,7 +189,11 @@ | ||
62 | &mov(&DWP($data_off,"esp","",0), "eax"); # put in array for call | ||
63 | &mov(&DWP($data_off+4,"esp","",0), "ebx"); # | ||
64 | |||
65 | - &call($enc_func); | ||
66 | + &call (&label("pic_point1")); | ||
67 | + &set_label("pic_point1"); | ||
68 | + &blindpop("ebx"); | ||
69 | + &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point1") . "]"); | ||
70 | + &call("$enc_func\@PLT"); | ||
71 | |||
72 | &mov("eax", &DWP($data_off,"esp","",0)); | ||
73 | &mov("ebx", &DWP($data_off+4,"esp","",0)); | ||
74 | @@ -218,7 +226,11 @@ | ||
75 | &mov(&DWP($data_off,"esp","",0), "eax"); # put back | ||
76 | &mov(&DWP($data_off+4,"esp","",0), "ebx"); # | ||
77 | |||
78 | - &call($dec_func); | ||
79 | + &call (&label("pic_point2")); | ||
80 | + &set_label("pic_point2"); | ||
81 | + &blindpop("ebx"); | ||
82 | + &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point2") . "]"); | ||
83 | + &call("$dec_func\@PLT"); | ||
84 | |||
85 | &mov("eax", &DWP($data_off,"esp","",0)); # get return | ||
86 | &mov("ebx", &DWP($data_off+4,"esp","",0)); # | ||
87 | @@ -261,7 +273,11 @@ | ||
88 | &mov(&DWP($data_off,"esp","",0), "eax"); # put back | ||
89 | &mov(&DWP($data_off+4,"esp","",0), "ebx"); # | ||
90 | |||
91 | - &call($dec_func); | ||
92 | + &call (&label("pic_point3")); | ||
93 | + &set_label("pic_point3"); | ||
94 | + &blindpop("ebx"); | ||
95 | + &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point3") . "]"); | ||
96 | + &call("$dec_func\@PLT"); | ||
97 | |||
98 | &mov("eax", &DWP($data_off,"esp","",0)); # get return | ||
99 | &mov("ebx", &DWP($data_off+4,"esp","",0)); # | ||
100 | Index: openssl-1.0.1c/crypto/perlasm/x86gas.pl | ||
101 | =================================================================== | ||
102 | --- openssl-1.0.1c.orig/crypto/perlasm/x86gas.pl 2011-12-09 20:16:35.000000000 +0100 | ||
103 | +++ openssl-1.0.1c/crypto/perlasm/x86gas.pl 2012-07-29 14:15:26.000000000 +0200 | ||
104 | @@ -161,6 +161,7 @@ | ||
105 | if ($::macosx) { push (@out,"$tmp,2\n"); } | ||
106 | elsif ($::elf) { push (@out,"$tmp,4\n"); } | ||
107 | else { push (@out,"$tmp\n"); } | ||
108 | + if ($::elf) { push (@out,".hidden\tOPENSSL_ia32cap_P\n"); } | ||
109 | } | ||
110 | push(@out,$initseg) if ($initseg); | ||
111 | } | ||
112 | @@ -218,8 +219,23 @@ | ||
113 | elsif ($::elf) | ||
114 | { $initseg.=<<___; | ||
115 | .section .init | ||
116 | +___ | ||
117 | + if ($::pic) | ||
118 | + { $initseg.=<<___; | ||
119 | + pushl %ebx | ||
120 | + call .pic_point0 | ||
121 | +.pic_point0: | ||
122 | + popl %ebx | ||
123 | + addl \$_GLOBAL_OFFSET_TABLE_+[.-.pic_point0],%ebx | ||
124 | + call $f\@PLT | ||
125 | + popl %ebx | ||
126 | +___ | ||
127 | + } | ||
128 | + else | ||
129 | + { $initseg.=<<___; | ||
130 | call $f | ||
131 | ___ | ||
132 | + } | ||
133 | } | ||
134 | elsif ($::coff) | ||
135 | { $initseg.=<<___; # applies to both Cygwin and Mingw | ||
136 | Index: openssl-1.0.1c/crypto/x86cpuid.pl | ||
137 | =================================================================== | ||
138 | --- openssl-1.0.1c.orig/crypto/x86cpuid.pl 2012-02-28 15:20:34.000000000 +0100 | ||
139 | +++ openssl-1.0.1c/crypto/x86cpuid.pl 2012-07-29 14:15:26.000000000 +0200 | ||
140 | @@ -8,6 +8,8 @@ | ||
141 | |||
142 | for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } | ||
143 | |||
144 | +push(@out, ".hidden OPENSSL_ia32cap_P\n"); | ||
145 | + | ||
146 | &function_begin("OPENSSL_ia32_cpuid"); | ||
147 | &xor ("edx","edx"); | ||
148 | &pushf (); | ||
149 | @@ -139,9 +141,7 @@ | ||
150 | &set_label("nocpuid"); | ||
151 | &function_end("OPENSSL_ia32_cpuid"); | ||
152 | |||
153 | -&external_label("OPENSSL_ia32cap_P"); | ||
154 | - | ||
155 | -&function_begin_B("OPENSSL_rdtsc","EXTRN\t_OPENSSL_ia32cap_P:DWORD"); | ||
156 | +&function_begin_B("OPENSSL_rdtsc"); | ||
157 | &xor ("eax","eax"); | ||
158 | &xor ("edx","edx"); | ||
159 | &picmeup("ecx","OPENSSL_ia32cap_P"); | ||
160 | @@ -155,7 +155,7 @@ | ||
161 | # This works in Ring 0 only [read DJGPP+MS-DOS+privileged DPMI host], | ||
162 | # but it's safe to call it on any [supported] 32-bit platform... | ||
163 | # Just check for [non-]zero return value... | ||
164 | -&function_begin_B("OPENSSL_instrument_halt","EXTRN\t_OPENSSL_ia32cap_P:DWORD"); | ||
165 | +&function_begin_B("OPENSSL_instrument_halt"); | ||
166 | &picmeup("ecx","OPENSSL_ia32cap_P"); | ||
167 | &bt (&DWP(0,"ecx"),4); | ||
168 | &jnc (&label("nohalt")); # no TSC | ||
169 | @@ -222,7 +222,7 @@ | ||
170 | &ret (); | ||
171 | &function_end_B("OPENSSL_far_spin"); | ||
172 | |||
173 | -&function_begin_B("OPENSSL_wipe_cpu","EXTRN\t_OPENSSL_ia32cap_P:DWORD"); | ||
174 | +&function_begin_B("OPENSSL_wipe_cpu"); | ||
175 | &xor ("eax","eax"); | ||
176 | &xor ("edx","edx"); | ||
177 | &picmeup("ecx","OPENSSL_ia32cap_P"); | ||