[28/28] openssl: Remove version 1.0.1e

Message ID	1b42318de62d896f460119e5aab50d92c2a2ebda.1397117164.git.christian.braunersorensen@prevas.dk
State	Accepted
Delegated to:	Esben Haabendal
Headers	show Return-Path: <dev-bounces@oe-lite.org> From: <christian.braunersorensen@prevas.dk> To: <dev@oe-lite.org> Subject: [PATCH 28/28] openssl: Remove version 1.0.1e Date: Thu, 10 Apr 2014 08:09:48 +0000 Message-ID: <1b42318de62d896f460119e5aab50d92c2a2ebda.1397117164.git.christian.braunersorensen@prevas.dk> In-Reply-To: <cover.1397117164.git.christian.braunersorensen@prevas.dk> References: <cover.1397117164.git.christian.braunersorensen@prevas.dk> MIME-Version: 1.0 Precedence: list Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org

diff --git a/recipes/openssl/openssl-1.0.1e/engines-install-in-libdir-ssl.patch b/recipes/openssl/openssl-1.0.1e/engines-install-in-libdir-ssl.patch deleted file mode 100644 index 949d6ad..0000000 --- a/recipes/openssl/openssl-1.0.1e/engines-install-in-libdir-ssl.patch +++ /dev/null @@ -1,53 +0,0 @@ -Index: openssl-1.0.0/engines/Makefile -=================================================================== ---- openssl-1.0.0.orig/engines/Makefile -+++ openssl-1.0.0/engines/Makefile -@@ -107,7 +107,7 @@ - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @if [ -n "$(SHARED_LIBS)" ]; then \ - set -e; \ -- $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines; \ -+ $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines; \ - for l in $(LIBNAMES); do \ - ( echo installing $$l; \ - pfx=lib; \ -@@ -119,13 +119,13 @@ - *DSO_WIN32*) sfx="eay32.dll"; pfx=;; \ - *) sfx=".bad";; \ - esac; \ -- cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ -+ cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new; \ - else \ - sfx=".so"; \ -- cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ -+ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new; \ - fi; \ -- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ -- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ -+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new; \ -+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx ); \ - done; \ - fi - @target=install; $(RECURSIVE_MAKE) -Index: openssl-1.0.0/engines/ccgost/Makefile -=================================================================== ---- openssl-1.0.0.orig/engines/ccgost/Makefile -+++ openssl-1.0.0/engines/ccgost/Makefile -@@ -53,13 +53,13 @@ - *DSO_WIN32*) sfx="eay32.dll"; pfx=;; \ - *) sfx=".bad";; \ - esac; \ -- cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ -+ cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new; \ - else \ - sfx=".so"; \ -- cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ -+ cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new; \ - fi; \ -- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ -- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \ -+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new; \ -+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx; \ - fi - - links: diff --git a/recipes/openssl/openssl-1.0.1e/mingw.patch b/recipes/openssl/openssl-1.0.1e/mingw.patch deleted file mode 100644 index 2b106c3..0000000 --- a/recipes/openssl/openssl-1.0.1e/mingw.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN openssl-1.0.0e/Makefile.shared openssl-1.0.0enew//Makefile.shared ---- openssl-1.0.0e/Makefile.shared 2010-08-21 13:36:49.000000000 +0200 -+++ openssl-1.0.0enew//Makefile.shared 2012-04-10 15:43:18.384797024 +0200 -@@ -293,7 +293,7 @@ - fi; \ - dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \ - $(PERL) util/mkrc.pl $$dll_name | \ -- $(CROSS_COMPILE)windres -o rc.o; \ -+ $(WINDRES) -o rc.o; \ - extras="$$extras rc.o"; \ - ALLSYMSFLAGS='-Wl,--whole-archive'; \ - NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ diff --git a/recipes/openssl/openssl-1.0.1e/no-librpath-rpath.patch b/recipes/openssl/openssl-1.0.1e/no-librpath-rpath.patch deleted file mode 100644 index 8f22a8f..0000000 --- a/recipes/openssl/openssl-1.0.1e/no-librpath-rpath.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN openssl-1.0.1e~orig/Makefile.shared openssl-1.0.1e/Makefile.shared ---- openssl-1.0.1e~orig/Makefile.shared 2013-02-11 16:26:04.000000000 +0100 -+++ openssl-1.0.1e/Makefile.shared 2013-05-23 13:19:23.825040054 +0200 -@@ -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 diff --git a/recipes/openssl/openssl-1.0.1e/oe-ldflags.patch b/recipes/openssl/openssl-1.0.1e/oe-ldflags.patch deleted file mode 100644 index 292e13d..0000000 --- a/recipes/openssl/openssl-1.0.1e/oe-ldflags.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Inappropriate [open-embedded] - -Index: openssl-1.0.0/Makefile.shared -=================================================================== ---- openssl-1.0.0.orig/Makefile.shared -+++ openssl-1.0.0/Makefile.shared -@@ -92,7 +92,7 @@ - LINK_APP= \ - ( $(SET_X); \ - LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \ -- LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \ -+ LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$(OE_LDFLAGS) $${LDFLAGS:-$(CFLAGS)}"; \ - LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ - LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ - LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ -@@ -102,7 +102,7 @@ - ( $(SET_X); \ - LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \ - SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \ -- SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ -+ SHAREDFLAGS="$(OE_LDFLAGS) $${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ - LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ - LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ - LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ diff --git a/recipes/openssl/openssl-1.0.1e/shared-libs.patch b/recipes/openssl/openssl-1.0.1e/shared-libs.patch deleted file mode 100644 index a7ca0a3..0000000 --- a/recipes/openssl/openssl-1.0.1e/shared-libs.patch +++ /dev/null @@ -1,41 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: openssl-1.0.1e/crypto/Makefile -=================================================================== ---- 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 \ -- (cd ..; $(MAKE) $(SHARED_LIB)); \ -+ (cd ..; $(MAKE) -e $(SHARED_LIB)); \ - fi - - libs: -Index: openssl-1.0.1e/Makefile.org -=================================================================== ---- 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 \ -- $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \ -+ $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \ - else \ - echo "There's no support for shared libraries on this platform" >&2; \ - exit 1; \ -Index: openssl-1.0.1e/ssl/Makefile -=================================================================== ---- 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 \ -- (cd ..; $(MAKE) $(SHARED_LIB)); \ -+ (cd ..; $(MAKE) -e $(SHARED_LIB)); \ - fi - - files: diff --git a/recipes/openssl/openssl-1.0.1e/wincrypt.patch b/recipes/openssl/openssl-1.0.1e/wincrypt.patch deleted file mode 100644 index 691f846..0000000 --- a/recipes/openssl/openssl-1.0.1e/wincrypt.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff openssl-1.0.1e/crypto/ossl_typ.h~orig openssl-1.0.1e/crypto/ossl_typ.h -index ea9227f..8e1b3cf 100644 ---- openssl-1.0.1e/crypto/ossl_typ.h~orig -+++ openssl-1.0.1e/crypto/ossl_typ.h -@@ -100,6 +100,7 @@ typedef struct ASN1_ITEM_st ASN1_ITEM; - typedef struct asn1_pctx_st ASN1_PCTX; - - #ifdef OPENSSL_SYS_WIN32 -+#include <windows.h> - #undef X509_NAME - #undef X509_EXTENSIONS - #undef X509_CERT_PAIR diff --git a/recipes/openssl/openssl_1.0.1e.oe b/recipes/openssl/openssl_1.0.1e.oe deleted file mode 100644 index f1c0bff..0000000 --- a/recipes/openssl/openssl_1.0.1e.oe +++ /dev/null @@ -1,14 +0,0 @@ -require openssl.inc - -SRC_URI += "file://engines-install-in-libdir-ssl.patch" -SRC_URI += "file://mingw.patch" - -# Parallel make is simply broken for now. -PARALLEL_MAKE = "" - -# Fixup to get openssl to respect ${LDFLAGS}. From OpenEmbedded, thanks :-) -SRC_URI += "file://oe-ldflags.patch file://shared-libs.patch" -export OE_LDFLAGS="${LDFLAGS}" -SRC_URI += "file://no-librpath-rpath.patch" - -SRC_URI += "file://wincrypt.patch" diff --git a/recipes/openssl/openssl_1.0.1e.oe.sig b/recipes/openssl/openssl_1.0.1e.oe.sig deleted file mode 100644 index d3bdd70..0000000 --- a/recipes/openssl/openssl_1.0.1e.oe.sig +++ /dev/null @@ -1 +0,0 @@ -3f1b1223c9e8189bfe4e186d86449775bd903460 openssl-1.0.1e.tar.gz

[28/28] openssl: Remove version 1.0.1e

Commit Message

Patch