From 4b3010827037ccdab7ee1d97fef41dba156e02d8 Mon Sep 17 00:00:00 2001 From: Sijmen Apers Date: Thu, 27 Dec 2018 15:51:14 +0100 Subject: [PATCH 1/3] Update openssl to 1.0.2q --- cross/openssl/Makefile | 2 +- cross/openssl/digests | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cross/openssl/Makefile b/cross/openssl/Makefile index b34175e65ab..c4f275159d0 100644 --- a/cross/openssl/Makefile +++ b/cross/openssl/Makefile @@ -1,5 +1,5 @@ PKG_NAME = openssl -PKG_VERS = 1.0.2n +PKG_VERS = 1.0.2q PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.openssl.org/source diff --git a/cross/openssl/digests b/cross/openssl/digests index 253ad66df76..2bca4759b64 100644 --- a/cross/openssl/digests +++ b/cross/openssl/digests @@ -1,3 +1,3 @@ -openssl-1.0.2n.tar.gz SHA1 0ca2957869206de193603eca6d89f532f61680b1 -openssl-1.0.2n.tar.gz SHA256 370babb75f278c39e0c50e8c4e7493bc0f18db6867478341a832a982fd15a8fe -openssl-1.0.2n.tar.gz MD5 13bdc1b1d1ff39b6fd42a255e74676a4 +openssl-1.0.2q.tar.gz SHA1 692f5f2f1b114f8adaadaa3e7be8cce1907f38c5 +openssl-1.0.2q.tar.gz SHA256 5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684 +openssl-1.0.2q.tar.gz MD5 7563e1ce046cb21948eeb6ba1a0eb71c From b8307db61faefa79c05279de5e217ca6bcecbcef Mon Sep 17 00:00:00 2001 From: Sijmen Apers Date: Thu, 27 Dec 2018 16:46:49 +0100 Subject: [PATCH 2/3] OpenSSL 1.1.0 series OpenSSL 1.1.0j --- cross/openssl-1.1.0/Makefile | 57 ++++++++++++++++++++++++++++++++++++ cross/openssl-1.1.0/digests | 3 ++ 2 files changed, 60 insertions(+) create mode 100644 cross/openssl-1.1.0/Makefile create mode 100644 cross/openssl-1.1.0/digests diff --git a/cross/openssl-1.1.0/Makefile b/cross/openssl-1.1.0/Makefile new file mode 100644 index 00000000000..bdcf76f6ad8 --- /dev/null +++ b/cross/openssl-1.1.0/Makefile @@ -0,0 +1,57 @@ +PKG_NAME = openssl-1.1.0 +PKG_VERS = j +PKG_EXT = tar.gz +PKG_DIST_NAME = openssl-1.1.0$(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://www.openssl.org/source +PKG_DIR = $(PKG_NAME)$(PKG_VERS) + +DEPENDS = cross/zlib + +HOMEPAGE = http://www.openssl.org +COMMENT = Compression Library +LICENSE = http://www.openssl.org/source/license.html + +CONFIGURE_TARGET = myConfigure + +INSTALL_TARGET = myInstall + +STAGING_INSTALL_PREFIX := $(INSTALL_DIR) + +include ../../mk/spksrc.cross-cc.mk + +OPENSSL_ARCH = +ifeq ($(findstring $(ARCH),$(x64_ARCHES)),$(ARCH)) +OPENSSL_ARCH = linux-x86_64 +endif +ifeq ($(findstring $(ARCH),$(x86_ARCHES)),$(ARCH)) +OPENSSL_ARCH = linux-generic32 +endif +ifeq ($(findstring $(ARCH),$(ARM5_ARCHES)),$(ARCH)) +OPENSSL_ARCH = synology-armle +endif +ifeq ($(findstring $(ARCH),$(ARM7_ARCHES)),$(ARCH)) +OPENSSL_ARCH = linux-generic32 +endif +ifeq ($(findstring $(ARCH),$(ARM8_ARCHES)),$(ARCH)) +OPENSSL_ARCH = linux-aarch64 +endif +ifeq ($(findstring $(ARCH), powerpc),$(ARCH)) +OPENSSL_ARCH = synology-ppc +endif +# TODO: validate the best OPENSSL_ARCH for the following archs: +ifeq ($(findstring $(ARCH), ppc824x ppc853x ppc854x qoriq),$(ARCH)) +OPENSSL_ARCH = linux-generic32 +endif +ifeq ($(strip $(OPENSSL_ARCH)),) +# unexpected arch. Please add arch to mk/spksrc.common.mk +$(error Arch $(ARCH) not expected yet) +endif + + +.PHONY: myConfigure +myConfigure: + $(RUN) ./Configure --openssldir=$(INSTALL_PREFIX) $(OPENSSL_ARCH) zlib-dynamic shared threads + +.PHONY: myInstall +myInstall: + $(RUN) $(MAKE) install_sw INSTALL_PREFIX=$(INSTALL_DIR) diff --git a/cross/openssl-1.1.0/digests b/cross/openssl-1.1.0/digests new file mode 100644 index 00000000000..baea98cb670 --- /dev/null +++ b/cross/openssl-1.1.0/digests @@ -0,0 +1,3 @@ +openssl-1.1.0j.tar.gz SHA1 dcad1efbacd9a4ed67d4514470af12bbe2a1d60a +openssl-1.1.0j.tar.gz SHA256 31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246 +openssl-1.1.0j.tar.gz MD5 b4ca5b78ae6ae79da80790b30dbedbdc From a2439b08e129640098d5e607ef3fde6514f238ca Mon Sep 17 00:00:00 2001 From: STemplar Date: Thu, 27 Dec 2018 19:03:06 +0100 Subject: [PATCH 3/3] Revert "OpenSSL 1.1.0 series" This reverts commit b8307db61faefa79c05279de5e217ca6bcecbcef. --- cross/openssl-1.1.0/Makefile | 57 ------------------------------------ cross/openssl-1.1.0/digests | 3 -- 2 files changed, 60 deletions(-) delete mode 100644 cross/openssl-1.1.0/Makefile delete mode 100644 cross/openssl-1.1.0/digests diff --git a/cross/openssl-1.1.0/Makefile b/cross/openssl-1.1.0/Makefile deleted file mode 100644 index bdcf76f6ad8..00000000000 --- a/cross/openssl-1.1.0/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -PKG_NAME = openssl-1.1.0 -PKG_VERS = j -PKG_EXT = tar.gz -PKG_DIST_NAME = openssl-1.1.0$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://www.openssl.org/source -PKG_DIR = $(PKG_NAME)$(PKG_VERS) - -DEPENDS = cross/zlib - -HOMEPAGE = http://www.openssl.org -COMMENT = Compression Library -LICENSE = http://www.openssl.org/source/license.html - -CONFIGURE_TARGET = myConfigure - -INSTALL_TARGET = myInstall - -STAGING_INSTALL_PREFIX := $(INSTALL_DIR) - -include ../../mk/spksrc.cross-cc.mk - -OPENSSL_ARCH = -ifeq ($(findstring $(ARCH),$(x64_ARCHES)),$(ARCH)) -OPENSSL_ARCH = linux-x86_64 -endif -ifeq ($(findstring $(ARCH),$(x86_ARCHES)),$(ARCH)) -OPENSSL_ARCH = linux-generic32 -endif -ifeq ($(findstring $(ARCH),$(ARM5_ARCHES)),$(ARCH)) -OPENSSL_ARCH = synology-armle -endif -ifeq ($(findstring $(ARCH),$(ARM7_ARCHES)),$(ARCH)) -OPENSSL_ARCH = linux-generic32 -endif -ifeq ($(findstring $(ARCH),$(ARM8_ARCHES)),$(ARCH)) -OPENSSL_ARCH = linux-aarch64 -endif -ifeq ($(findstring $(ARCH), powerpc),$(ARCH)) -OPENSSL_ARCH = synology-ppc -endif -# TODO: validate the best OPENSSL_ARCH for the following archs: -ifeq ($(findstring $(ARCH), ppc824x ppc853x ppc854x qoriq),$(ARCH)) -OPENSSL_ARCH = linux-generic32 -endif -ifeq ($(strip $(OPENSSL_ARCH)),) -# unexpected arch. Please add arch to mk/spksrc.common.mk -$(error Arch $(ARCH) not expected yet) -endif - - -.PHONY: myConfigure -myConfigure: - $(RUN) ./Configure --openssldir=$(INSTALL_PREFIX) $(OPENSSL_ARCH) zlib-dynamic shared threads - -.PHONY: myInstall -myInstall: - $(RUN) $(MAKE) install_sw INSTALL_PREFIX=$(INSTALL_DIR) diff --git a/cross/openssl-1.1.0/digests b/cross/openssl-1.1.0/digests deleted file mode 100644 index baea98cb670..00000000000 --- a/cross/openssl-1.1.0/digests +++ /dev/null @@ -1,3 +0,0 @@ -openssl-1.1.0j.tar.gz SHA1 dcad1efbacd9a4ed67d4514470af12bbe2a1d60a -openssl-1.1.0j.tar.gz SHA256 31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246 -openssl-1.1.0j.tar.gz MD5 b4ca5b78ae6ae79da80790b30dbedbdc