From patchwork Mon Sep 22 06:09:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Kim_B=C3=B8ndergaard?= X-Patchwork-Id: 391789 X-Patchwork-Delegate: kiho@prevas.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id E66CE140174 for ; Mon, 22 Sep 2014 16:10:04 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id EA2843FF81 for ; Mon, 22 Sep 2014 08:09:58 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id 515813FDD2 for ; Mon, 22 Sep 2014 08:09:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=7589; q=dns/txt; s=ironport1; t=1411366197; x=1442902197; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sUYzjQwqvwoBTQ+yK5EgT3brLGDmJUsoPzjwFhgLunQ=; b=zUn3cVduC09KRnOM+GfvtlxKrs5SuSI+AVB9l+FkcRCmvjmfdPI9qyMH ztOIiYDGFgWSDUmGB0Eck31w1iVT3w2qI4hDKOfQss74V35bggxvJZ3WJ 4ChT2R5mSkf93sXkNz1nWpg3hnv9aKaEjPMU3iasD0nP1HB09HpI58acG 8=; X-IronPort-AV: E=Sophos;i="5.04,570,1406584800"; d="scan'208";a="5106683" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 22 Sep 2014 08:09:57 +0200 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.347.0; Mon, 22 Sep 2014 08:09:56 +0200 Received: by localhost (Postfix, from userid 30019) id CA1CD681EE0; Mon, 22 Sep 2014 06:09:55 +0000 (UTC) From: =?UTF-8?q?Kim=20B=C3=B8ndergaard?= To: Subject: [PATCH 3/7] openssl: Version 1.0.1i Date: Mon, 22 Sep 2014 06:09:50 +0000 Message-ID: <1fe6a684c7b792df691ea2ced3efdccefa53a229.1411365801.git.kibo@prevas.dk> X-Mailer: git-send-email 1.8.4 In-Reply-To: References: MIME-Version: 1.0 Cc: =?UTF-8?q?Kim=20B=C3=B8ndergaard?= X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Kim Bøndergaard --- .../engines-install-in-libdir-ssl.patch | 53 ++++++++++++++++++++++ recipes/openssl/openssl-1.0.1i/find.pl.patch | 15 ++++++ recipes/openssl/openssl-1.0.1i/mingw.patch | 12 +++++ recipes/openssl/openssl-1.0.1i/parallel-make.patch | 28 ++++++++++++ recipes/openssl/openssl_1.0.1i.oe | 13 ++++++ recipes/openssl/openssl_1.0.1i.oe.sig | 1 + 6 files changed, 122 insertions(+) create mode 100644 recipes/openssl/openssl-1.0.1i/engines-install-in-libdir-ssl.patch create mode 100644 recipes/openssl/openssl-1.0.1i/find.pl.patch create mode 100644 recipes/openssl/openssl-1.0.1i/mingw.patch create mode 100644 recipes/openssl/openssl-1.0.1i/parallel-make.patch create mode 100644 recipes/openssl/openssl_1.0.1i.oe create mode 100644 recipes/openssl/openssl_1.0.1i.oe.sig diff --git a/recipes/openssl/openssl-1.0.1i/engines-install-in-libdir-ssl.patch b/recipes/openssl/openssl-1.0.1i/engines-install-in-libdir-ssl.patch new file mode 100644 index 0000000..949d6ad --- /dev/null +++ b/recipes/openssl/openssl-1.0.1i/engines-install-in-libdir-ssl.patch @@ -0,0 +1,53 @@ +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.1i/find.pl.patch b/recipes/openssl/openssl-1.0.1i/find.pl.patch new file mode 100644 index 0000000..0f608ab --- /dev/null +++ b/recipes/openssl/openssl-1.0.1i/find.pl.patch @@ -0,0 +1,15 @@ +--- openssl-1.0.1e/util/perlpath.pl.orig 2014-08-23 23:07:42.375451908 +0200 ++++ openssl-1.0.1e/util/perlpath.pl 2014-08-23 23:09:19.531451897 +0200 +@@ -4,10 +4,10 @@ + # line in all scripts that rely on perl. + # + +-require "find.pl"; ++use File::Find; + + $#ARGV == 0 || print STDERR "usage: perlpath newpath (eg /usr/bin)\n"; +-&find("."); ++&find(\&wanted, "."); + + sub wanted + { diff --git a/recipes/openssl/openssl-1.0.1i/mingw.patch b/recipes/openssl/openssl-1.0.1i/mingw.patch new file mode 100644 index 0000000..2b106c3 --- /dev/null +++ b/recipes/openssl/openssl-1.0.1i/mingw.patch @@ -0,0 +1,12 @@ +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.1i/parallel-make.patch b/recipes/openssl/openssl-1.0.1i/parallel-make.patch new file mode 100644 index 0000000..e12bb28 --- /dev/null +++ b/recipes/openssl/openssl-1.0.1i/parallel-make.patch @@ -0,0 +1,28 @@ +Additional dependencies, which unfortunately is not enough to get +parallel builds to work. Tested with -j12 which breaks :-( + +Esben Haabendal + +--- openssl-1.0.0c/Makefile.orig 2011-02-02 13:43:18.626143389 +0100 ++++ openssl-1.0.0c/Makefile 2011-02-02 13:44:21.129322066 +0100 +@@ -245,15 +245,15 @@ + + build_crypto: + @dir=crypto; target=all; $(BUILD_ONE_CMD) +-build_ssl: ++build_ssl: build_crypto + @dir=ssl; target=all; $(BUILD_ONE_CMD) +-build_engines: ++build_engines: build_crypto + @dir=engines; target=all; $(BUILD_ONE_CMD) +-build_apps: ++build_apps: build_libs + @dir=apps; target=all; $(BUILD_ONE_CMD) +-build_tests: ++build_tests: build_libs + @dir=test; target=all; $(BUILD_ONE_CMD) +-build_tools: ++build_tools: build_libs + @dir=tools; target=all; $(BUILD_ONE_CMD) + + all_testapps: build_libs build_testapps diff --git a/recipes/openssl/openssl_1.0.1i.oe b/recipes/openssl/openssl_1.0.1i.oe new file mode 100644 index 0000000..5fe8a0e --- /dev/null +++ b/recipes/openssl/openssl_1.0.1i.oe @@ -0,0 +1,13 @@ +require openssl.inc + +SRC_URI += "file://engines-install-in-libdir-ssl.patch" + +SRC_URI += "file://parallel-make.patch" + +SRC_URI += "file://mingw.patch" + +SRC_URI += "file://find.pl.patch" + +# above patch should be a step in the right direction, but not enough +PARALLEL_MAKE = "" + diff --git a/recipes/openssl/openssl_1.0.1i.oe.sig b/recipes/openssl/openssl_1.0.1i.oe.sig new file mode 100644 index 0000000..b32a977 --- /dev/null +++ b/recipes/openssl/openssl_1.0.1i.oe.sig @@ -0,0 +1 @@ +74eed314fa2c93006df8d26cd9fc630a101abd76 openssl-1.0.1i.tar.gz