Skip to contentSkip to conversation

openssl: Upgrade to v1.0.1e

PATCH Superseded Radu Moisan 3 participants 4 messages Apr 8, 2013

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 openssl: Upgrade to v1.0.1e

Dropped obolete patches and pulled updates for debian patches

---
 .../configure-targets.patch                        |   20 +-
 .../debian/c_rehash-compat.patch                   |   14 +-
 .../debian/ca.patch                                |    0
 .../debian/debian-targets.patch                    |   96 +++++----
 .../debian/make-targets.patch                      |   12 +-
 .../debian/man-dir.patch                           |    0
 .../debian/man-section.patch                       |    0
 .../debian/no-rpath.patch                          |    0
 .../debian/no-symbolic.patch                       |    0
 .../debian/pic.patch                               |  217 +++++++-------------
 .../debian/version-script.patch                    |  207 ++++++++++++++++---
 .../engines-install-in-libdir-ssl.patch            |    0
 .../{openssl-1.0.0j => openssl-1.0.1e}/find.pl     |    0
 .../oe-ldflags.patch                               |    0
 .../openssl-fix-link.patch                         |    0
 .../openssl_fix_for_x32.patch                      |   38 ++--
 .../shared-libs.patch                              |   33 ++-
 .../{openssl_1.0.0j.bb => openssl_1.0.1e.bb}       |    6 +-
 18 files changed, 369 insertions(+), 274 deletions(-)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.0j => openssl-1.0.1e}/configure-targets.patch (63%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.0j => openssl-1.0.1e}/debian/c_rehash-compat.patch (80%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.0j => openssl-1.0.1e}/debian/ca.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.0j => openssl-1.0.1e}/debian/debian-targets.patch (10%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.0j => openssl-1.0.1e}/debian/make-targets.patch (51%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.0j => openssl-1.0.1e}/debian/man-dir.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.0j => openssl-1.0.1e}/debian/man-section.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.0j => openssl-1.0.1e}/debian/no-rpath.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.0j => openssl-1.0.1e}/debian/no-symbolic.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.0j => openssl-1.0.1e}/debian/pic.patch (37%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.0j => openssl-1.0.1e}/debian/version-script.patch (95%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.0j => openssl-1.0.1e}/engines-install-in-libdir-ssl.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.0j => openssl-1.0.1e}/find.pl (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.0j => openssl-1.0.1e}/oe-ldflags.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.0j => openssl-1.0.1e}/openssl-fix-link.patch (100%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.0j => openssl-1.0.1e}/openssl_fix_for_x32.patch (70%)
 rename meta/recipes-connectivity/openssl/{openssl-1.0.0j => openssl-1.0.1e}/shared-libs.patch (57%)
 rename meta/recipes-connectivity/openssl/{openssl_1.0.0j.bb => openssl_1.0.1e.bb} (89%)
meta/recipes-connectivity/openssl/openssl-1.0.1e/configure-targets.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0j/configure-targets.patch +9 -11
similarity index 63%
rename from meta/recipes-connectivity/openssl/openssl-1.0.0j/configure-targets.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.1e/configure-targets.patch
index e273ab4..8c638b4 100644
@@ -7,11 +7,11 @@ The number of colons are important :)
  Configure |   17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
---- openssl-1.0.0j.orig/Configure
-+++ openssl-1.0.0j/Configure
-@@ -378,10 +378,27 @@ my %table=(
- "linux-alpha-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+Index: openssl-1.0.1e/Configure
+===================================================================
+--- openssl-1.0.1e.orig/Configure
++++ openssl-1.0.1e/Configure
+@@ -403,6 +403,23 @@ 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}",
  
@@ -22,7 +22,7 @@ The number of colons are important :)
 +"linux-gnueabi-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-uclibceabi-arm","$ENV{'CC'}:-DL_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-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-aarch64","$ENV{'CC'}:-DL_ENDIAN 	-DTERMIO -O2 -pipe -g -feliminate-unused-debug-types -Wall -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS::-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)",
++"linux-aarch64","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O2 -pipe -g -feliminate-unused-debug-types -Wall -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS::-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)",
 +
 +"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).",
 +
@@ -32,8 +32,6 @@ The number of colons are important :)
 +"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:${no_asm}: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:${no_asm}: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)",
- "BSD-x86",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "BSD-x86-elf",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "debug-BSD-x86-elf",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ # Android: linux-* but without -DTERMIO and pointers to headers and libs.
+ "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "android-x86","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:".eval{my $asm=${x86_elf_asm};$asm=~s/:elf/:android/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/c_rehash-compat.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/c_rehash-compat.patch +7 -7
similarity index 80%
rename from meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/c_rehash-compat.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/c_rehash-compat.patch
index 8f9a034..ac1b19b 100644
@@ -9,19 +9,19 @@ Subject: [PATCH] also create old hash for compatibility
  tools/c_rehash.in |    8 +++++++-
  1 files changed, 7 insertions(+), 1 deletions(-)
 
-Index: openssl-1.0.0c/tools/c_rehash.in
+Index: openssl-1.0.0d/tools/c_rehash.in
 ===================================================================
---- openssl-1.0.0c.orig/tools/c_rehash.in	2010-04-14 16:07:28.000000000 -0700
-+++ openssl-1.0.0c/tools/c_rehash.in	2011-08-12 23:06:41.976664773 -0700
-@@ -83,6 +83,7 @@
- 			next;
+--- openssl-1.0.0d.orig/tools/c_rehash.in	2011-04-13 20:41:28.000000000 +0000
++++ openssl-1.0.0d/tools/c_rehash.in	2011-04-13 20:41:28.000000000 +0000
+@@ -86,6 +86,7 @@
+ 			}
  		}
  		link_hash_cert($fname) if($cert);
 +		link_hash_cert_old($fname) if($cert);
  		link_hash_crl($fname) if($crl);
  	}
  }
-@@ -116,8 +117,9 @@
+@@ -119,8 +120,9 @@
  
  sub link_hash_cert {
  		my $fname = $_[0];
@@ -32,7 +32,7 @@ Index: openssl-1.0.0c/tools/c_rehash.in
  		chomp $hash;
  		chomp $fprint;
  		$fprint =~ s/^.*=//;
-@@ -147,6 +149,10 @@
+@@ -150,6 +152,10 @@
  		$hashlist{$hash} = $fprint;
  }
  
meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/ca.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/ca.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/ca.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/ca.patch
meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/debian-targets.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/debian-targets.patch +54 -42

107 lines not on this page · raw message

meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/make-targets.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/make-targets.patch +6 -6
similarity index 51%
rename from meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/make-targets.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/make-targets.patch
index f7a6dfd..ee0a62c 100644
@@ -1,12 +1,12 @@
 Upstream-Status: Backport [debian]
 
-Index: openssl-1.0.0c/Makefile.org
+Index: openssl-1.0.1/Makefile.org
 ===================================================================
---- openssl-1.0.0c.orig/Makefile.org	2010-12-12 16:10:12.000000000 +0100
-+++ openssl-1.0.0c/Makefile.org	2010-12-12 16:11:27.000000000 +0100
-@@ -109,7 +109,7 @@
- ZLIB_INCLUDE=
- LIBZLIB=
+--- openssl-1.0.1.orig/Makefile.org	2012-03-17 09:41:07.000000000 +0000
++++ openssl-1.0.1/Makefile.org	2012-03-17 09:41:21.000000000 +0000
+@@ -135,7 +135,7 @@
+ 
+ BASEADDR=
  
 -DIRS=   crypto ssl engines apps test tools
 +DIRS=   crypto ssl engines apps tools
meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/man-dir.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/man-dir.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/man-dir.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/man-dir.patch
meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/man-section.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/man-section.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/man-section.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/man-section.patch
meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/no-rpath.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/no-rpath.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/no-rpath.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/no-rpath.patch
meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/no-symbolic.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/no-symbolic.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/no-symbolic.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/no-symbolic.patch
meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/pic.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/pic.patch +76 -141

262 lines not on this page · raw message

meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/version-script.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/version-script.patch +183 -24

250 lines not on this page · raw message

meta/recipes-connectivity/openssl/openssl-1.0.1e/engines-install-in-libdir-ssl.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0j/engines-install-in-libdir-ssl.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.0j/engines-install-in-libdir-ssl.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.1e/engines-install-in-libdir-ssl.patch
meta/recipes-connectivity/openssl/openssl-1.0.1e/find.pl renamed from meta/recipes-connectivity/openssl/openssl-1.0.0j/find.pl +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.0j/find.pl
rename to meta/recipes-connectivity/openssl/openssl-1.0.1e/find.pl
meta/recipes-connectivity/openssl/openssl-1.0.1e/oe-ldflags.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0j/oe-ldflags.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.0j/oe-ldflags.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.1e/oe-ldflags.patch
meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-fix-link.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0j/openssl-fix-link.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.0j/openssl-fix-link.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-fix-link.patch
meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl_fix_for_x32.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0j/openssl_fix_for_x32.patch +19 -19
similarity index 70%
rename from meta/recipes-connectivity/openssl/openssl-1.0.0j/openssl_fix_for_x32.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl_fix_for_x32.patch
index 3191ce9..93ce034 100644
@@ -6,22 +6,22 @@ Signed-Off-By: Nitin A Kamble <[email protected]> 2011/07/13
 
 ported the patch to the 1.0.0e version
 Signed-Off-By: Nitin A Kamble <[email protected]> 2011/12/01
-Index: openssl-1.0.0e/Configure
+Index: openssl-1.0.1e/Configure
 ===================================================================
---- openssl-1.0.0e.orig/Configure
-+++ openssl-1.0.0e/Configure
-@@ -393,6 +393,7 @@ my %table=(
+--- openssl-1.0.1e.orig/Configure
++++ openssl-1.0.1e/Configure
+@@ -402,6 +402,7 @@ my %table=(
  "linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-x86_64",	"gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -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):::64",
+ "linux-x86_64",	"gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall::-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):::64",
 +"linux-x32", "gcc:-mx32 -DL_ENDIAN -DTERMIO -O3 -Wall -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",
- "linux-s390x",	"gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
- #### SPARC Linux setups
- # Ray Miller <[email protected]> has patiently
-Index: openssl-1.0.0e/crypto/bn/asm/x86_64-gcc.c
+ "linux64-s390x",	"gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+ #### So called "highgprs" target for z/Architecture CPUs
+ # "Highgprs" is kernel feature first implemented in Linux 2.6.32, see
+Index: openssl-1.0.1e/crypto/bn/asm/x86_64-gcc.c
 ===================================================================
---- openssl-1.0.0e.orig/crypto/bn/asm/x86_64-gcc.c
-+++ openssl-1.0.0e/crypto/bn/asm/x86_64-gcc.c
+--- openssl-1.0.1e.orig/crypto/bn/asm/x86_64-gcc.c
++++ openssl-1.0.1e/crypto/bn/asm/x86_64-gcc.c
 @@ -55,7 +55,7 @@
   *    machine.
   */
@@ -57,10 +57,10 @@ Index: openssl-1.0.0e/crypto/bn/asm/x86_64-gcc.c
  	"	leaq	1(%2),%2	\n"
  	"	loop	1b		\n"
  	"	sbbq	%0,%0		\n"
-Index: openssl-1.0.0e/crypto/bn/bn.h
+Index: openssl-1.0.1e/crypto/bn/bn.h
 ===================================================================
---- openssl-1.0.0e.orig/crypto/bn/bn.h
-+++ openssl-1.0.0e/crypto/bn/bn.h
+--- openssl-1.0.1e.orig/crypto/bn/bn.h
++++ openssl-1.0.1e/crypto/bn/bn.h
 @@ -172,6 +172,13 @@ extern "C" {
  # endif
  #endif
@@ -75,15 +75,15 @@ Index: openssl-1.0.0e/crypto/bn/bn.h
  /* assuming long is 64bit - this is the DEC Alpha
   * unsigned long long is only 64 bits :-(, don't define
   * BN_LLONG for the DEC Alpha */
-Index: openssl-1.0.0e/crypto/bn/bn_exp.c
+Index: openssl-1.0.1e/crypto/bn/bn_exp.c
 ===================================================================
---- openssl-1.0.0e.orig/crypto/bn/bn_exp.c
-+++ openssl-1.0.0e/crypto/bn/bn_exp.c
-@@ -561,7 +561,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBU
+--- openssl-1.0.1e.orig/crypto/bn/bn_exp.c
++++ openssl-1.0.1e/crypto/bn/bn_exp.c
+@@ -567,7 +567,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBU
  
  /* Given a pointer value, compute the next address that is a cache line multiple. */
  #define MOD_EXP_CTIME_ALIGN(x_) \
--	((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((BN_ULONG)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK))))
+-	((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((size_t)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK))))
 +	((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((BN_ADDR)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK))))
  
  /* This variant of BN_mod_exp_mont() uses fixed windows and the special
meta/recipes-connectivity/openssl/openssl-1.0.1e/shared-libs.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0j/shared-libs.patch +12 -21
similarity index 57%
rename from meta/recipes-connectivity/openssl/openssl-1.0.0j/shared-libs.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.1e/shared-libs.patch
index 0998673..a7ca0a3 100644
@@ -1,10 +1,10 @@
 Upstream-Status: Inappropriate [configuration]
 
-Index: openssl-1.0.0/crypto/Makefile
+Index: openssl-1.0.1e/crypto/Makefile
 ===================================================================
---- openssl-1.0.0.orig/crypto/Makefile
-+++ openssl-1.0.0/crypto/Makefile
-@@ -104,7 +104,7 @@
+--- openssl-1.0.1e.orig/crypto/Makefile
++++ openssl-1.0.1e/crypto/Makefile
+@@ -108,7 +108,7 @@ $(LIB):	$(LIBOBJ)
  
  shared: buildinf.h lib subdirs
  	if [ -n "$(SHARED_LIBS)" ]; then \
@@ -13,20 +13,11 @@ Index: openssl-1.0.0/crypto/Makefile
  	fi
  
  libs:
-Index: openssl-1.0.0/Makefile.org
+Index: openssl-1.0.1e/Makefile.org
 ===================================================================
---- openssl-1.0.0.orig/Makefile.org
-+++ openssl-1.0.0/Makefile.org
-@@ -260,7 +260,7 @@
- 
- libcrypto$(SHLIB_EXT): libcrypto.a
- 	@if [ "$(SHLIB_TARGET)" != "" ]; then \
--		$(MAKE) SHLIBDIRS=crypto build-shared; \
-+		$(MAKE) -e SHLIBDIRS=crypto build-shared; \
- 	else \
- 		echo "There's no support for shared libraries on this platform" >&2; \
- 		exit 1; \
-@@ -268,7 +268,7 @@
+--- openssl-1.0.1e.orig/Makefile.org
++++ openssl-1.0.1e/Makefile.org
+@@ -310,7 +310,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a fips_
  
  libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
  	@if [ "$(SHLIB_TARGET)" != "" ]; then \
@@ -35,11 +26,11 @@ Index: openssl-1.0.0/Makefile.org
  	else \
  		echo "There's no support for shared libraries on this platform" >&2; \
  		exit 1; \
-Index: openssl-1.0.0/ssl/Makefile
+Index: openssl-1.0.1e/ssl/Makefile
 ===================================================================
---- openssl-1.0.0.orig/ssl/Makefile
-+++ openssl-1.0.0/ssl/Makefile
-@@ -62,7 +62,7 @@
+--- openssl-1.0.1e.orig/ssl/Makefile
++++ openssl-1.0.1e/ssl/Makefile
+@@ -62,7 +62,7 @@ lib:	$(LIBOBJ)
  
  shared: lib
  	if [ -n "$(SHARED_LIBS)" ]; then \
meta/recipes-connectivity/openssl/openssl_1.0.1e.bb renamed from meta/recipes-connectivity/openssl/openssl_1.0.0j.bb +3 -3
similarity index 89%
rename from meta/recipes-connectivity/openssl/openssl_1.0.0j.bb
rename to meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
index 8c0166a..47c13a4 100644
@@ -6,7 +6,7 @@ DEPENDS += "ocf-linux"
 
 CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
 
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.0"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
 
@@ -32,8 +32,8 @@ SRC_URI += "file://configure-targets.patch \
             file://find.pl \
            "
 
-SRC_URI[md5sum] = "cbe4ac0d8f598680f68a951e04b0996b"
-SRC_URI[sha256sum] = "626fb8fcb3eb7e966edbe71553ff993d137f6e8a87b05051a3695e621098b8af"
+SRC_URI[md5sum] = "66bf6f10f060d561929de96f9dfe5b8c"
+SRC_URI[sha256sum] = "f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3"
 
 PACKAGES =+ " \
 	${PN}-engines \
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 1 line · Radu Moisan

Dropped obolete patches and pulled updates for debian patches

Isn't there some CVE this upgrade fixes which would be worth a mention in here?

Cheers,

Richard

#2 lore raw
Quoted 4 lines · Richard Purdie
Quoted 1 line · Radu Moisan

Dropped obolete patches and pulled updates for debian patches

Isn't there some CVE this upgrade fixes which would be worth a mention in here?

With respect to what we had (1.0.0j) Scott pointed out the following

http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-2686
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-0166
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-0169

Yocto #3965 <https://bugzilla.yoctoproject.org/show_bug.cgi?id=3965>

Radu

#3 lore raw
Quoted 7 lines · Radu Moisan
Quoted 4 lines · Richard Purdie
Quoted 1 line · Radu Moisan

Dropped obolete patches and pulled updates for debian patches

Isn't there some CVE this upgrade fixes which would be worth a mention in here?

Quoted 9 lines

With respect to what we had (1.0.0j) Scott pointed out the following

http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-2686
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-0166
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-0169

Yocto #3965 <https://bugzilla.yoctoproject.org/show_bug.cgi?id=3965>

Please put this in the commit message is what RP is getting after here.

Thanks
Sau!

Quoted 8 lines

Radu

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core