Patchwork [meta-oe] openssl: Upgrade 1.0.0d -> 1.0.0e

login
register
mail settings
Submitter Khem Raj
Date Sept. 9, 2011, 3:24 p.m.
Message ID <1315581847-21074-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/11271/
State New, archived
Headers show

Comments

Khem Raj - Sept. 9, 2011, 3:24 p.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../configure-targets.patch                        |    0
 .../debian/c_rehash-compat.patch                   |    0
 .../debian/ca.patch                                |    0
 .../debian/debian-targets.patch                    |    0
 .../debian/make-targets.patch                      |    0
 .../debian/man-dir.patch                           |    0
 .../debian/man-section.patch                       |    0
 .../debian/no-rpath.patch                          |    0
 .../debian/no-symbolic.patch                       |    0
 .../debian/pic.patch                               |    0
 .../debian/pkg-config.patch                        |    0
 .../debian/version-script.patch                    |    0
 .../engines-install-in-libdir-ssl.patch            |    0
 .../oe-ldflags.patch                               |    0
 .../openssl-fix-link.patch                         |    0
 .../parallel-make-fix.patch                        |    0
 .../shared-libs.patch                              |    0
 .../{openssl_1.0.0d.bb => openssl_1.0.0e.bb}       |    8 ++++----
 18 files changed, 4 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/configure-targets.patch (100%)
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/c_rehash-compat.patch (100%)
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/ca.patch (100%)
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/debian-targets.patch (100%)
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/make-targets.patch (100%)
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/man-dir.patch (100%)
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/man-section.patch (100%)
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/no-rpath.patch (100%)
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/no-symbolic.patch (100%)
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/pic.patch (100%)
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/pkg-config.patch (100%)
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/version-script.patch (100%)
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/engines-install-in-libdir-ssl.patch (100%)
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/oe-ldflags.patch (100%)
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/openssl-fix-link.patch (100%)
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/parallel-make-fix.patch (100%)
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/shared-libs.patch (100%)
 rename meta-oe/recipes-connectivity/openssl/{openssl_1.0.0d.bb => openssl_1.0.0e.bb} (88%)
Martin Jansa - Sept. 14, 2011, 1:53 p.m.
On Fri, Sep 9, 2011 at 5:24 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../configure-targets.patch                        |    0
>  .../debian/c_rehash-compat.patch                   |    0
>  .../debian/ca.patch                                |    0
>  .../debian/debian-targets.patch                    |    0
>  .../debian/make-targets.patch                      |    0
>  .../debian/man-dir.patch                           |    0
>  .../debian/man-section.patch                       |    0
>  .../debian/no-rpath.patch                          |    0
>  .../debian/no-symbolic.patch                       |    0
>  .../debian/pic.patch                               |    0
>  .../debian/pkg-config.patch                        |    0
>  .../debian/version-script.patch                    |    0
>  .../engines-install-in-libdir-ssl.patch            |    0
>  .../oe-ldflags.patch                               |    0
>  .../openssl-fix-link.patch                         |    0
>  .../parallel-make-fix.patch                        |    0
>  .../shared-libs.patch                              |    0
>  .../{openssl_1.0.0d.bb => openssl_1.0.0e.bb}       |    8 ++++----
>  18 files changed, 4 insertions(+), 4 deletions(-)
>  rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/configure-targets.patch (100%)
>  rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/c_rehash-compat.patch (100%)
>  rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/ca.patch (100%)
>  rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/debian-targets.patch (100%)
>  rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/make-targets.patch (100%)
>  rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/man-dir.patch (100%)
>  rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/man-section.patch (100%)
>  rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/no-rpath.patch (100%)
>  rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/no-symbolic.patch (100%)
>  rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/pic.patch (100%)
>  rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/pkg-config.patch (100%)
>  rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/debian/version-script.patch (100%)
>  rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/engines-install-in-libdir-ssl.patch (100%)
>  rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/oe-ldflags.patch (100%)
>  rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/openssl-fix-link.patch (100%)
>  rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/parallel-make-fix.patch (100%)
>  rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0d => openssl-1.0.0e}/shared-libs.patch (100%)
>  rename meta-oe/recipes-connectivity/openssl/{openssl_1.0.0d.bb => openssl_1.0.0e.bb} (88%)

Hi,

1.0.0d was building fine, but 1.0.0e fails with:

| making all in crypto/modes...
| make[2]: Entering directory
`/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/openssl-1.0.0e-r13.0/openssl-1.0.0e/crypto/modes'
| arm-oe-linux-gnueabi-gcc  -march=armv4t -mthumb -mthumb-interwork
-mtune=arm920t --sysroot=/OE/shr-core/tmp/sysroots/om-gta02 -I..
-I../.. -I../asn1 -I../evp -I../../include  -fPIC -DOPENSSL_PIC
-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DL_ENDIAN
 -DTERMIO -O2 -pipe -g -feliminate-unused-debug-types -Wall
-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS   -c -o cbc128.o cbc128.c
| arm-oe-linux-gnueabi-gcc  -march=armv4t -mthumb -mthumb-interwork
-mtune=arm920t --sysroot=/OE/shr-core/tmp/sysroots/om-gta02 -I..
-I../.. -I../asn1 -I../evp -I../../include  -fPIC -DOPENSSL_PIC
-DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DL_ENDIAN
 -DTERMIO -O2 -pipe -g -feliminate-unused-debug-types -Wall
-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS   -c -o ctr128.o ctr128.c
| /OE/shr-core/tmp/sysroots/x86_64-linux/usr/libexec/armv4t-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.6.1/ld:
libcrypto.a(cryptlib.o): invalid string offset 2288 >= 1268 for
section `.strtab'
| /OE/shr-core/tmp/sysroots/x86_64-linux/usr/libexec/armv4t-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.6.1/ld:
final link failed: Nonrepresentable section on output
| collect2: ld returned 1 exit status
| make[4]: *** [link_a.gnu] Error 1
| make[4]: Leaving directory
`/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/openssl-1.0.0e-r13.0/openssl-1.0.0e'

have you seen this error? any hint?

Thanks,

Regards,

Patch

diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/configure-targets.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/configure-targets.patch
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/configure-targets.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/configure-targets.patch
diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/c_rehash-compat.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/c_rehash-compat.patch
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/c_rehash-compat.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/c_rehash-compat.patch
diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/ca.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/ca.patch
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/ca.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/ca.patch
diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/debian-targets.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/debian-targets.patch
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/debian-targets.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/debian-targets.patch
diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/make-targets.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/make-targets.patch
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/make-targets.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/make-targets.patch
diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/man-dir.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/man-dir.patch
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/man-dir.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/man-dir.patch
diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/man-section.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/man-section.patch
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/man-section.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/man-section.patch
diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/no-rpath.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/no-rpath.patch
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/no-rpath.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/no-rpath.patch
diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/no-symbolic.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/no-symbolic.patch
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/no-symbolic.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/no-symbolic.patch
diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/pic.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/pic.patch
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/pic.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/pic.patch
diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/pkg-config.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/pkg-config.patch
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/pkg-config.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/pkg-config.patch
diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/version-script.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/version-script.patch
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/version-script.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/version-script.patch
diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/engines-install-in-libdir-ssl.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/engines-install-in-libdir-ssl.patch
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/engines-install-in-libdir-ssl.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/engines-install-in-libdir-ssl.patch
diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/oe-ldflags.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/oe-ldflags.patch
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/oe-ldflags.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/oe-ldflags.patch
diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/openssl-fix-link.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/openssl-fix-link.patch
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/openssl-fix-link.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/openssl-fix-link.patch
diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/parallel-make-fix.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/parallel-make-fix.patch
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/parallel-make-fix.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/parallel-make-fix.patch
diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/shared-libs.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/shared-libs.patch
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/shared-libs.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/shared-libs.patch
diff --git a/meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb b/meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb
similarity index 88%
rename from meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb
rename to meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb
index 63b5460..28039ca 100644
--- a/meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb
+++ b/meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb
@@ -6,13 +6,10 @@  DEPENDS += "ocf-linux"
 
 CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
 
-SRC_URI[src.md5sum] = "40b6ea380cc8a5bf9734c2f8bf7e701e"
-SRC_URI[src.sha256sum] = "92511d1f0caaa298dba250426f8e7d5d00b271847886d1adc62422778d6320db"
-
 DEFAULT_PREFERENCE = "-1"
 
 export DIRS = "crypto ssl apps engines"
@@ -36,6 +33,9 @@  SRC_URI += "file://configure-targets.patch \
             file://debian/debian-targets.patch \
            "
 
+SRC_URI[src.md5sum] = "7040b89c4c58c7a1016c0dfa6e821c86"
+SRC_URI[src.sha256sum] = "e361dc2775733fb84de7b5bf7b504778b772869e8f7bfac0b28b935cbf7380f7"
+
 PACKAGES += " \
 	${PN}-engines \
 	${PN}-engines-dbg \