openssl: Update to 1.1.0j

[people/pmueller/ipfire-2.x.git] / lfs / openssl

diff --git a/lfs/openssl b/lfs/openssl
index 6e17e79e69fc32a2a30c4b72bd27aec280d871bd..d7a616ff240ef45718148a2e5b45ee8f2b9b562d 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.1.0g
+VER        = 1.1.0j
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -51,8 +51,6 @@ CONFIGURE_OPTIONS = \
        enable-md2 \
        enable-seed \
        enable-rfc3779 \
-       enable-ssl3 \
-       enable-ssl3-method \
        no-idea \
        no-mdc2 \
        no-rc5 \
@@ -89,7 +87,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ba5f1b8b835b88cadbce9b35ed9531a6
+$(DL_FILE)_MD5 = b4ca5b78ae6ae79da80790b30dbedbdc
 
 install : $(TARGET)
 
@@ -119,7 +117,7 @@ $(subst %,%_MD5,$(objects)) :
 $(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 +129,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