X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fopenssl;h=f8729c2de1598baaa5936ff0dbd81737e090a5a2;hb=0f75603f23bbf4f00bf87fd74c2fc35a7c9c9edd;hp=7a39f14de610a2af7d1ced3ca2e30fd09cb20645;hpb=263d1e6484ad61711f07cad35057c324db28b480;p=ipfire-2.x.git

diff --git a/lfs/openssl b/lfs/openssl
index 7a39f14de6..f8729c2de1 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.1.0g
+VER        = 1.1.1b
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -48,15 +48,13 @@ CONFIGURE_OPTIONS = \
 	shared \
 	zlib-dynamic \
 	enable-camellia \
-	enable-md2 \
 	enable-seed \
 	enable-rfc3779 \
-	enable-ssl3 \
-	enable-ssl3-method \
 	no-idea \
 	no-mdc2 \
 	no-rc5 \
 	no-srp \
+	no-aria \
 	$(OPENSSL_ARCH)
 
 ifeq "$(IS_64BIT)" "1"
@@ -89,7 +87,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ba5f1b8b835b88cadbce9b35ed9531a6
+$(DL_FILE)_MD5 = 4532712e7bcc9414f5bce995e4e13930
 
 install : $(TARGET)
 
@@ -119,8 +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
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.1.1a-default-cipherlist.patch
 
 	# Apply our CFLAGS
 	cd $(DIR_APP) && sed -i Configure \
@@ -133,7 +130,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		$(CFLAGS) $(LDFLAGS)
 
 	cd $(DIR_APP) && make depend
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING)
 
 ifeq "$(KCFG)" "-sse2"
 	-mkdir -pv /usr/lib/sse2