openssl-1.x.x: Backport patches from OE-Core
PATCH 1/3 openssl-1.x.x: Backport patches from OE-Core
These patches are needed for getting 2011.03
branch building on ubuntu 12.04 LTS
--- .../openssl/openssl-1.0.0d/configure-targets.patch | 17 +- recipes/openssl/openssl-1.0.0d/debian.patch | 515 --- .../openssl-1.0.0d/debian/c_rehash-compat.patch | 45 + recipes/openssl/openssl-1.0.0d/debian/ca.patch | 22 + .../openssl-1.0.0d/debian/debian-targets.patch | 54 + .../openssl-1.0.0d/debian/make-targets.patch | 15 + .../openssl/openssl-1.0.0d/debian/man-dir.patch | 15 + .../openssl-1.0.0d/debian/man-section.patch | 34 + .../openssl/openssl-1.0.0d/debian/no-rpath.patch | 15 + .../openssl-1.0.0d/debian/no-symbolic.patch | 15 + recipes/openssl/openssl-1.0.0d/debian/pic.patch | 242 ++ .../openssl-1.0.0d/debian/version-script.patch | 4511 ++++++++++++++++++++ .../engines-install-in-libdir-ssl.patch | 3 + recipes/openssl/openssl-1.0.0d/libdeps-first.patch | 27 - recipes/openssl/openssl-1.0.0d/oe-ldflags.patch | 2 + .../openssl/openssl-1.0.0d/openssl-fix-link.patch | 35 + recipes/openssl/openssl-1.0.0d/shared-libs.patch | 2 + recipes/openssl/openssl-native_1.0.0d.bb | 19 +- recipes/openssl/openssl_1.0.0d.bb | 21 +- 19 files changed, 5048 insertions(+), 561 deletions(-) delete mode 100644 recipes/openssl/openssl-1.0.0d/debian.patch create mode 100644 recipes/openssl/openssl-1.0.0d/debian/c_rehash-compat.patch create mode 100644 recipes/openssl/openssl-1.0.0d/debian/ca.patch create mode 100644 recipes/openssl/openssl-1.0.0d/debian/debian-targets.patch create mode 100644 recipes/openssl/openssl-1.0.0d/debian/make-targets.patch create mode 100644 recipes/openssl/openssl-1.0.0d/debian/man-dir.patch create mode 100644 recipes/openssl/openssl-1.0.0d/debian/man-section.patch create mode 100644 recipes/openssl/openssl-1.0.0d/debian/no-rpath.patch create mode 100644 recipes/openssl/openssl-1.0.0d/debian/no-symbolic.patch create mode 100644 recipes/openssl/openssl-1.0.0d/debian/pic.patch create mode 100644 recipes/openssl/openssl-1.0.0d/debian/version-script.patch delete mode 100644 recipes/openssl/openssl-1.0.0d/libdeps-first.patch create mode 100644 recipes/openssl/openssl-1.0.0d/openssl-fix-link.patch
recipes/openssl/openssl-1.0.0d/configure-targets.patch +9 -8
@@ -1,12 +1,13 @@ +Upstream-Status: Inappropriate [embedded specific] The number of colons are important :) -Index: openssl-1.0.0a/Configure +Index: openssl-1.0.0h/Configure =================================================================== ---- openssl-1.0.0a.orig/Configure -+++ openssl-1.0.0a/Configure -@@ -380,6 +380,22 @@ my %table=( +--- openssl-1.0.0h.orig/Configure 2012-04-23 09:16:09.521511921 -0700 ++++ openssl-1.0.0h/Configure 2012-04-23 09:17:41.829516389 -0700 +@@ -380,6 +380,22 @@ "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}",
@@ -21,10 +22,10 @@ Index: openssl-1.0.0a/Configure +"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)", ++"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:${no_asm}: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:${no_asm}: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:${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)",
recipes/openssl/openssl-1.0.0d/debian.patch deleted +0 -515
515 lines not on this page · raw message
recipes/openssl/openssl-1.0.0d/debian/c_rehash-compat.patch new file +45 -0
45 lines not on this page · raw message
recipes/openssl/openssl-1.0.0d/debian/ca.patch new file +22 -0
@@ -0,0 +1,22 @@ +Upstream-Status: Backport [debian] + +Index: openssl-0.9.8m/apps/CA.pl.in +=================================================================== +--- openssl-0.9.8m.orig/apps/CA.pl.in 2006-04-28 00:28:51.000000000 +0000 ++++ openssl-0.9.8m/apps/CA.pl.in 2010-02-27 00:36:51.000000000 +0000 +@@ -65,6 +65,7 @@ + foreach (@ARGV) { + if ( /^(-\?|-h|-help)$/ ) { + print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n"; ++ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n"; + exit 0; + } elsif (/^-newcert$/) { + # create a certificate +@@ -165,6 +166,7 @@ + } else { + print STDERR "Unknown arg $_\n"; + print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n"; ++ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n"; + exit 1; + } + }
recipes/openssl/openssl-1.0.0d/debian/debian-targets.patch new file +54 -0
54 lines not on this page · raw message
recipes/openssl/openssl-1.0.0d/debian/make-targets.patch new file +15 -0
@@ -0,0 +1,15 @@ +Upstream-Status: Backport [debian] + +Index: openssl-1.0.0c/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= + +-DIRS= crypto ssl engines apps test tools ++DIRS= crypto ssl engines apps tools + ENGDIRS= ccgost + SHLIBDIRS= crypto ssl +
recipes/openssl/openssl-1.0.0d/debian/man-dir.patch new file +15 -0
@@ -0,0 +1,15 @@ +Upstream-Status: Backport [debian] + +Index: openssl-1.0.0c/Makefile.org +=================================================================== +--- openssl-1.0.0c.orig/Makefile.org 2010-12-12 16:11:27.000000000 +0100 ++++ openssl-1.0.0c/Makefile.org 2010-12-12 16:11:37.000000000 +0100 +@@ -131,7 +131,7 @@ + + MAKEFILE= Makefile + +-MANDIR=$(OPENSSLDIR)/man ++MANDIR=/usr/share/man + MAN1=1 + MAN3=3 + MANSUFFIX=
recipes/openssl/openssl-1.0.0d/debian/man-section.patch new file +34 -0
@@ -0,0 +1,34 @@ +Upstream-Status: Backport [debian] + +Index: openssl-1.0.0c/Makefile.org +=================================================================== +--- openssl-1.0.0c.orig/Makefile.org 2010-12-12 16:11:37.000000000 +0100 ++++ openssl-1.0.0c/Makefile.org 2010-12-12 16:13:28.000000000 +0100 +@@ -134,7 +134,8 @@ + MANDIR=/usr/share/man + MAN1=1 + MAN3=3 +-MANSUFFIX= ++MANSUFFIX=ssl ++MANSECTION=SSL + HTMLSUFFIX=html + HTMLDIR=$(OPENSSLDIR)/html + SHELL=/bin/sh +@@ -606,7 +607,7 @@ + echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ + (cd `$(PERL) util/dirname.pl $$i`; \ + sh -c "$$pod2man \ +- --section=$$sec --center=OpenSSL \ ++ --section=$${sec}$(MANSECTION) --center=OpenSSL \ + --release=$(VERSION) `basename $$i`") \ + > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ + $(PERL) util/extract-names.pl < $$i | \ +@@ -623,7 +624,7 @@ + echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ + (cd `$(PERL) util/dirname.pl $$i`; \ + sh -c "$$pod2man \ +- --section=$$sec --center=OpenSSL \ ++ --section=$${sec}$(MANSECTION) --center=OpenSSL \ + --release=$(VERSION) `basename $$i`") \ + > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ + $(PERL) util/extract-names.pl < $$i | \
recipes/openssl/openssl-1.0.0d/debian/no-rpath.patch new file +15 -0
@@ -0,0 +1,15 @@ +Upstream-Status: Backport [debian] + +Index: openssl-1.0.0c/Makefile.shared +=================================================================== +--- openssl-1.0.0c.orig/Makefile.shared 2010-08-21 13:36:49.000000000 +0200 ++++ openssl-1.0.0c/Makefile.shared 2010-12-12 16:13:36.000000000 +0100 +@@ -153,7 +153,7 @@ + NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" + +-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" ++DO_GNU_APP=LDFLAGS="$(CFLAGS)" + + #This is rather special. It's a special target with which one can link + #applications without bothering with any features that have anything to
recipes/openssl/openssl-1.0.0d/debian/no-symbolic.patch new file +15 -0
@@ -0,0 +1,15 @@ +Upstream-Status: Backport [debian] + +Index: openssl-1.0.0c/Makefile.shared +=================================================================== +--- openssl-1.0.0c.orig/Makefile.shared 2010-12-12 16:13:36.000000000 +0100 ++++ openssl-1.0.0c/Makefile.shared 2010-12-12 16:13:44.000000000 +0100 +@@ -151,7 +151,7 @@ + SHLIB_SUFFIX=; \ + ALLSYMSFLAGS='-Wl,--whole-archive'; \ + NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ +- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" ++ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" + + DO_GNU_APP=LDFLAGS="$(CFLAGS)" +
recipes/openssl/openssl-1.0.0d/debian/pic.patch new file +242 -0
242 lines not on this page · raw message
recipes/openssl/openssl-1.0.0d/debian/version-script.patch new file +4511 -0
1,997 lines not on this page · raw message
recipes/openssl/openssl-1.0.0d/engines-install-in-libdir-ssl.patch +3 -0
Lines of this file are not shown. View the raw message.
recipes/openssl/openssl-1.0.0d/libdeps-first.patch deleted +0 -27
Lines of this file are not shown. View the raw message.
recipes/openssl/openssl-1.0.0d/oe-ldflags.patch +2 -0
Lines of this file are not shown. View the raw message.
recipes/openssl/openssl-1.0.0d/openssl-fix-link.patch new file +35 -0
Lines of this file are not shown. View the raw message.
recipes/openssl/openssl-1.0.0d/shared-libs.patch +2 -0
Lines of this file are not shown. View the raw message.
recipes/openssl/openssl-native_1.0.0d.bb +15 -4
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.9.5
Part of the diff is not shown here. View the raw message.
PATCH 2/3 qt4-x11-free_4.5.2.bb: Fix build break
It does not compile with gcc 4.3+ without
this patch.
--- recipes/qt4/qt4-x11-free/openssl-1.0.patch | 172 ++++++++++++++++++++++++++++ recipes/qt4/qt4-x11-free_4.5.2.bb | 6 +- 2 files changed, 176 insertions(+), 2 deletions(-) create mode 100644 recipes/qt4/qt4-x11-free/openssl-1.0.patch
recipes/qt4/qt4-x11-free/openssl-1.0.patch new file +172 -0
@@ -0,0 +1,172 @@ +backported from fedora 10 + +Fixes compile error with openssl-1.x.x + +| ssl/qsslsocket_openssl_symbols_p.h:257: error: variable or field 'q_sk_free' declared void +| ssl/qsslsocket_openssl_symbols_p.h:257: error: 'STACK' was not declared in this scope +| ssl/qsslsocket_openssl_symbols_p.h:257: error: 'a' was not declared in this scope + + +Signed-off-by: Khem Raj <[email protected]> + +Index: qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp +=================================================================== +--- qt-x11-opensource-src-4.5.2.orig/src/network/ssl/qsslcertificate.cpp ++++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslcertificate.cpp +@@ -362,7 +362,7 @@ QMultiMap<QSsl::AlternateNameEntryType, + if (!d->x509) + return result; + +- STACK *altNames = (STACK *)q_X509_get_ext_d2i(d->x509, NID_subject_alt_name, 0, 0); ++ STACK_OF(GENERAL_NAME) *altNames = (STACK_OF(GENERAL_NAME) *)q_X509_get_ext_d2i(d->x509, NID_subject_alt_name, 0, 0); + + if (altNames) { + for (int i = 0; i < q_sk_GENERAL_NAME_num(altNames); ++i) { +@@ -383,7 +383,7 @@ QMultiMap<QSsl::AlternateNameEntryType, + else if (genName->type == GEN_EMAIL) + result.insert(QSsl::EmailEntry, altName); + } +- q_sk_free(altNames); ++ q_sk_free((STACK *)altNames); + } + + return result; +Index: qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp +=================================================================== +--- qt-x11-opensource-src-4.5.2.orig/src/network/ssl/qsslsocket_openssl.cpp ++++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl.cpp +@@ -911,7 +911,7 @@ QSslCipher QSslSocketBackendPrivate::ses + { + if (!ssl || !ctx) + return QSslCipher(); +- SSL_CIPHER *sessionCipher = q_SSL_get_current_cipher(ssl); ++ SSL_CIPHER *sessionCipher = (SSL_CIPHER *)q_SSL_get_current_cipher(ssl); + return sessionCipher ? QSslCipher_from_SSL_CIPHER(sessionCipher) : QSslCipher(); + } + +Index: qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl_symbols.cpp +=================================================================== +--- qt-x11-opensource-src-4.5.2.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp ++++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -144,10 +144,10 @@ DEFINEFUNC(int, RAND_status, void, DUMMY + DEFINEFUNC(void, RSA_free, RSA *a, a, return, DUMMYARG) + DEFINEFUNC(void, sk_free, STACK *a, a, return, DUMMYARG) + DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) +-DEFINEFUNC2(char *, sk_value, STACK *a, a, int b, b, return 0, return) ++DEFINEFUNC2(OSSL_SKVALUE_RTYPE *, sk_value, STACK *a, a, int b, b, return 0, return) + DEFINEFUNC(int, SSL_accept, SSL *a, a, return -1, return) + DEFINEFUNC(int, SSL_clear, SSL *a, a, return -1, return) +-DEFINEFUNC3(char *, SSL_CIPHER_description, SSL_CIPHER *a, a, char *b, b, int c, c, return 0, return) ++DEFINEFUNC3(char *, SSL_CIPHER_description, OSSL_MORECONST SSL_CIPHER *a, a, char *b, b, int c, c, return 0, return) + DEFINEFUNC(int, SSL_connect, SSL *a, a, return -1, return) + #if OPENSSL_VERSION_NUMBER >= 0x00908000L + // 0.9.8 broke SC and BC by changing this function's signature. +@@ -157,7 +157,7 @@ DEFINEFUNC(int, SSL_CTX_check_private_ke + #endif + DEFINEFUNC4(long, SSL_CTX_ctrl, SSL_CTX *a, a, int b, b, long c, c, void *d, d, return -1, return) + DEFINEFUNC(void, SSL_CTX_free, SSL_CTX *a, a, return, DUMMYARG) +-DEFINEFUNC(SSL_CTX *, SSL_CTX_new, SSL_METHOD *a, a, return 0, return) ++DEFINEFUNC(SSL_CTX *, SSL_CTX_new, OSSL_MORECONST SSL_METHOD *a, a, return 0, return) + DEFINEFUNC2(int, SSL_CTX_set_cipher_list, SSL_CTX *a, a, const char *b, b, return -1, return) + DEFINEFUNC(int, SSL_CTX_set_default_verify_paths, SSL_CTX *a, a, return -1, return) + DEFINEFUNC3(void, SSL_CTX_set_verify, SSL_CTX *a, a, int b, b, int (*c)(int, X509_STORE_CTX *), c, return, DUMMYARG) +@@ -174,7 +174,7 @@ DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_g + #else + DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, SSL *a, a, return 0, return) + #endif +-DEFINEFUNC(SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return 0, return) ++DEFINEFUNC(OSSL_MORECONST SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return 0, return) + DEFINEFUNC2(int, SSL_get_error, SSL *a, a, int b, b, return -1, return) + DEFINEFUNC(STACK_OF(X509) *, SSL_get_peer_cert_chain, SSL *a, a, return 0, return) + DEFINEFUNC(X509 *, SSL_get_peer_certificate, SSL *a, a, return 0, return) +@@ -192,14 +192,14 @@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a + DEFINEFUNC(void, SSL_set_accept_state, SSL *a, a, return, DUMMYARG) + DEFINEFUNC(void, SSL_set_connect_state, SSL *a, a, return, DUMMYARG) + DEFINEFUNC(int, SSL_shutdown, SSL *a, a, return -1, return) +-DEFINEFUNC(SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) +-DEFINEFUNC(SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) +-DEFINEFUNC(SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) +-DEFINEFUNC(SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) +-DEFINEFUNC(SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) +-DEFINEFUNC(SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) +-DEFINEFUNC(SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) +-DEFINEFUNC(SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(OSSL_MORECONST SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(OSSL_MORECONST SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(OSSL_MORECONST SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(OSSL_MORECONST SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(OSSL_MORECONST SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(OSSL_MORECONST SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(OSSL_MORECONST SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) ++DEFINEFUNC(OSSL_MORECONST SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC3(int, SSL_write, SSL *a, a, const void *b, b, int c, c, return -1, return) + DEFINEFUNC2(int, X509_cmp, X509 *a, a, X509 *b, b, return -1, return) + #ifndef SSLEAY_MACROS +Index: qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl_symbols_p.h +=================================================================== +--- qt-x11-opensource-src-4.5.2.orig/src/network/ssl/qsslsocket_openssl_symbols_p.h ++++ qt-x11-opensource-src-4.5.2/src/network/ssl/qsslsocket_openssl_symbols_p.h +@@ -254,12 +254,20 @@ int q_PEM_write_bio_RSA_PUBKEY(BIO *a, R + void q_RAND_seed(const void *a, int b); + int q_RAND_status(); + void q_RSA_free(RSA *a); ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++#define STACK _STACK ++#define OSSL_SKVALUE_RTYPE void ++#define OSSL_MORECONST const ++#else ++#define OSSL_SKVALUE_RTYPE char ++#define OSSL_MORECONST ++#endif + void q_sk_free(STACK *a); + int q_sk_num(STACK *a); +-char * q_sk_value(STACK *a, int b); ++OSSL_SKVALUE_RTYPE * q_sk_value(STACK *a, int b); + int q_SSL_accept(SSL *a); + int q_SSL_clear(SSL *a); +-char *q_SSL_CIPHER_description(SSL_CIPHER *a, char *b, int c); ++char *q_SSL_CIPHER_description(OSSL_MORECONST SSL_CIPHER *a, char *b, int c); + int q_SSL_connect(SSL *a); + #if OPENSSL_VERSION_NUMBER >= 0x00908000L + // 0.9.8 broke SC and BC by changing this function's signature. +@@ -269,7 +277,7 @@ int q_SSL_CTX_check_private_key(SSL_CTX + #endif + long q_SSL_CTX_ctrl(SSL_CTX *a, int b, long c, void *d); + void q_SSL_CTX_free(SSL_CTX *a); +-SSL_CTX *q_SSL_CTX_new(SSL_METHOD *a); ++SSL_CTX *q_SSL_CTX_new(OSSL_MORECONST SSL_METHOD *a); + int q_SSL_CTX_set_cipher_list(SSL_CTX *a, const char *b); + int q_SSL_CTX_set_default_verify_paths(SSL_CTX *a); + void q_SSL_CTX_set_verify(SSL_CTX *a, int b, int (*c)(int, X509_STORE_CTX *)); +@@ -286,7 +294,7 @@ STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers( + #else + STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(SSL *a); + #endif +-SSL_CIPHER *q_SSL_get_current_cipher(SSL *a); ++OSSL_MORECONST SSL_CIPHER *q_SSL_get_current_cipher(SSL *a); + int q_SSL_get_error(SSL *a, int b); + STACK_OF(X509) *q_SSL_get_peer_cert_chain(SSL *a); + X509 *q_SSL_get_peer_certificate(SSL *a); +@@ -304,14 +312,14 @@ void q_SSL_set_bio(SSL *a, BIO *b, BIO * + void q_SSL_set_accept_state(SSL *a); + void q_SSL_set_connect_state(SSL *a); + int q_SSL_shutdown(SSL *a); +-SSL_METHOD *q_SSLv2_client_method(); +-SSL_METHOD *q_SSLv3_client_method(); +-SSL_METHOD *q_SSLv23_client_method(); +-SSL_METHOD *q_TLSv1_client_method(); +-SSL_METHOD *q_SSLv2_server_method(); +-SSL_METHOD *q_SSLv3_server_method(); +-SSL_METHOD *q_SSLv23_server_method(); +-SSL_METHOD *q_TLSv1_server_method(); ++OSSL_MORECONST SSL_METHOD *q_SSLv2_client_method(); ++OSSL_MORECONST SSL_METHOD *q_SSLv3_client_method(); ++OSSL_MORECONST SSL_METHOD *q_SSLv23_client_method(); ++OSSL_MORECONST SSL_METHOD *q_TLSv1_client_method(); ++OSSL_MORECONST SSL_METHOD *q_SSLv2_server_method(); ++OSSL_MORECONST SSL_METHOD *q_SSLv3_server_method(); ++OSSL_MORECONST SSL_METHOD *q_SSLv23_server_method(); ++OSSL_MORECONST SSL_METHOD *q_TLSv1_server_method(); + int q_SSL_write(SSL *a, const void *b, int c); + int q_X509_cmp(X509 *a, X509 *b); + #ifdef SSLEAY_MACROS
recipes/qt4/qt4-x11-free_4.5.2.bb +4 -2
@@ -1,8 +1,10 @@ require qt4-x11-free.inc LICENSE = "LGPLv2.1 GPLv3" -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" -SRC_URI += "file://hack-out-pg_config.patch" +SRC_URI += "file://hack-out-pg_config.patch \ + file://openssl-1.0.patch \ + " SRC_URI[md5sum] = "d8bcc070a58db25c228b7729ffad4550" SRC_URI[sha256sum] = "4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2"
Signature · 1 line
1.7.9.5
PATCH 3/3 classes/mirrors.bbclass: update debian snapshot mirror url
In reply to Khem Raj--- classes/mirrors.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
classes/mirrors.bbclass +1 -1
@@ -1,6 +1,6 @@ MIRRORS[func] = "0" MIRRORS () { -${DEBIAN_MIRROR}/main http://snapshot.debian.net/archive/pool +${DEBIAN_MIRROR}/main http://snapshot.debian.org/archive/debian-archive/20120328T092752Z/debian/pool ${DEBIAN_MIRROR} ftp://ftp.de.debian.org/debian/pool ${DEBIAN_MIRROR} ftp://ftp.au.debian.org/debian/pool ${DEBIAN_MIRROR} ftp://ftp.cl.debian.org/debian/pool
Signature · 1 line
1.7.9.5
Quoted 2 lines · Khem Raj
These patches are needed for getting 2011.03
branch building on ubuntu 12.04 LTS
Sorry for the delay, this (along with 2 and 3) are now applied, thanks.
Signature · 1 line
Tom