From: Markham <markham001@gmx.de>
Date: Thu, 26 Jan 2017 10:31:17 +0000 (+0100)
Subject: bump version openssl-1.0.2j
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=0289cb8efb785df39ade4d1d25714fbc9e1a5174;p=bs-cst-neutrino-hd.git

bump version openssl-1.0.2j
---

diff --git a/make/libraries.mk b/make/libraries.mk
index f44e66d..b23994a 100755
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -127,13 +127,14 @@ $(D)/openssl: $(ARCHIVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz | $(TARG
 	$(UNTAR)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz
 	pushd $(BUILD_TMP)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER) && \
 		CC=$(TARGET)-gcc \
-		./Configure shared no-hw linux-generic32 --prefix=/ --openssldir=/.remove && \
+		./Configure shared no-hw no-engine linux-generic32 --prefix=/ --openssldir=/.remove && \
+		$(MAKE) depend && \
 		$(MAKE) all && \
 		$(MAKE) install_sw INSTALL_PREFIX=$(TARGETPREFIX)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/openssl.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libcrypto.pc
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libssl.pc
-	rm -r $(TARGETPREFIX)/.remove $(TARGETPREFIX)/bin/openssl $(TARGETPREFIX)/bin/c_rehash
+	rm -r $(TARGETPREFIX)/.remove $(TARGETPREFIX)/bin/openssl $(TARGETPREFIX)/bin/c_rehash $(TARGETPREFIX)/lib/engines
 	$(REMOVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER)
 	pushd $(TARGETPREFIX)/lib && \
 		if [ "$(OPENSSL_VER)" = "1.0.1" -o "$(OPENSSL_VER)" = "1.0.2" ]; then \
diff --git a/make/versions.mk b/make/versions.mk
index e1f40de..16fb2b8 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -94,11 +94,13 @@ NTP_VER=4.2.8p6
 
 # openssl; toolkit for the SSL v2/v3 and TLS v1 protocol
 ifeq ($(PLATFORM), nevis)
-OPENSSL_VER=0.9.8
-OPENSSL_SUBVER=zh
+OPENSSL_VER=1.0.2
+OPENSSL_SUBVER=j
+#OPENSSL_VER=0.9.8
+#OPENSSL_SUBVER=zh
 else
 OPENSSL_VER=1.0.2
-OPENSSL_SUBVER=f
+OPENSSL_SUBVER=j
 endif
 
 # pkg-config; a helper tool used when compiling applications and libraries to insert the correct compiler options