Updated Patch 0043 - OpenSSL: Added source/old to PKG_SOURCE_URL

to match upstream.

The patch was accepted upstream in
Changeset 47860: https://dev.openwrt.org/changeset/47860
Git commit openwrt/openwrt@6117628 / 6117628240
This commit is contained in:
Ranlvor 2015-12-15 10:19:46 +01:00
parent 6b8888fe5a
commit 9bada96d41
No known key found for this signature in database
GPG Key ID: 5E12D04750EF6F8E

View File

@ -3,22 +3,36 @@ Date: Sun, 6 Dec 2015 16:12:55 +0100
Subject: OpenSSL: Added source/old to PKG_SOURCE_URL Subject: OpenSSL: Added source/old to PKG_SOURCE_URL
OpenSSL moves old versions of the library from http://www.openssl.org/source/ OpenSSL moves old versions of the library from http://www.openssl.org/source/
to http://www.openssl.org/source/old/1.0.2/ breaking the old links. That to http://www.openssl.org/source/old/$version/ breaking the old links. That
behavior breaks the OpenWRT-build every time OpenSSL releases a new version. behavior breaks the OpenWRT-build every time OpenSSL releases a new version.
This patch adds http://www.openssl.org/source/old/1.0.2/ to the PKG_SOURCE_URL This patch adds http://www.openssl.org/source/old/$version/ to the PKG_SOURCE_URL
of OpenSSL to avoid breaking the build whenever OpenSSL releases a new of OpenSSL to avoid breaking the build whenever OpenSSL releases a new
version. version.
Signed-off-by: Kevin Kirsch <ranlvor@…>
Reviewed-by: Alexander Dahl <post@…>
diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile
index 7f0da8b..039e1ab 100644 index 7f0da8b..4cee738 100644
--- a/package/libs/openssl/Makefile --- a/package/libs/openssl/Makefile
+++ b/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile
@@ -16,6 +16,7 @@ PKG_BUILD_PARALLEL:=1 @@ -8,7 +8,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=openssl
-PKG_VERSION:=1.0.2d
+PKG_BASE:=1.0.2
+PKG_BUGFIX:=d
+PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX)
PKG_RELEASE:=1
PKG_USE_MIPS16:=0
@@ -16,6 +18,7 @@ PKG_BUILD_PARALLEL:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.openssl.org/source/ \ PKG_SOURCE_URL:=http://www.openssl.org/source/ \
+ http://www.openssl.org/source/old/1.0.2/ \ + http://www.openssl.org/source/old/$(PKG_BASE)/ \
ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.openssl.org/source \ ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.openssl.org/source \
ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/
PKG_MD5SUM:=38dd619b2e77cbac69b99f52a053d25a PKG_MD5SUM:=38dd619b2e77cbac69b99f52a053d25a