From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 28 Feb 2018 11:49:47 +0000 (+0000)
Subject: openssl: Apply ciphers patch before running Configure
X-Git-Tag: v2.19-core120~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=263d1e6484ad61711f07cad35057c324db28b480;p=ipfire-2.x.git

openssl: Apply ciphers patch before running Configure

This works just fine here.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/openssl b/lfs/openssl
index 6e17e79e69..7a39f14de6 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -120,6 +120,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.1.0-disable-ssl3.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.1.0g-weak-ciphers.patch
 
 	# Apply our CFLAGS
 	cd $(DIR_APP) && sed -i Configure \
@@ -131,9 +132,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && ./Configure $(CONFIGURE_OPTIONS) \
 		$(CFLAGS) $(LDFLAGS)
 
-	# Apply patch for changing DEFAULT cipher list (needed after configure)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.1.0g-weak-ciphers.patch
-
 	cd $(DIR_APP) && make depend
 	cd $(DIR_APP) && make