X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fopenssl;h=b613ed76ec6edd3f0ab9b533c774d40b9839edfd;hb=9dcfcb003985d3296473aee9032a324bba9d94dc;hp=eb7352f8cb222fd8672156d68be8ed6bd05eb2a9;hpb=75ad2e4e885992c9b17c2d7b722dd3ac3875a7f0;p=ipfire-2.x.git

diff --git a/lfs/openssl b/lfs/openssl
index eb7352f8cb..b613ed76ec 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.2g
+VER        = 1.0.2l
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -53,7 +53,7 @@ CONFIGURE_OPTIONS = \
 	zlib-dynamic \
 	enable-camellia \
 	enable-md2 \
-	enable-ssl2 \
+	disable-ssl2 \
 	enable-seed \
 	enable-tlsext \
 	enable-rfc3779 \
@@ -61,22 +61,29 @@ CONFIGURE_OPTIONS = \
 	no-mdc2 \
 	no-rc5 \
 	no-srp \
-	-DSSL_FORBID_ENULL
+	-DSSL_FORBID_ENULL \
+	$(OPENSSL_ARCH)
 
-ifeq "$(MACHINE)" "x86_64"
-	CONFIGURE_OPTIONS += linux-x86_64
+ifeq "$(IS_64BIT)" "1"
+	OPENSSL_ARCH = linux-generic64
+else
+	OPENSSL_ARCH = linux-generic32
 endif
 
-ifeq "$(MACHINE)" "i586"
-	CONFIGURE_OPTIONS += linux-elf
-
-ifneq "$(KCFG)" "-sse2"
-	CONFIGURE_OPTIONS += no-sse2
+ifeq "$(BUILD_ARCH)" "aarch64"
+	OPENSSL_ARCH = linux-aarch64
 endif
+
+ifeq "$(BUILD_ARCH)" "x86_64"
+	OPENSSL_ARCH = linux-x86_64
 endif
 
-ifeq "$(MACHINE)" "armv5tel"
-	CONFIGURE_OPTIONS += linux-generic32
+ifeq "$(BUILD_ARCH)" "i586"
+	OPENSSL_ARCH = linux-elf
+
+  ifneq "$(KCFG)" "-sse2"
+	OPENSSL_ARCH += no-sse2
+  endif
 endif
 
 ###############################################################################
@@ -87,7 +94,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f3c710c045cdee5fd114feb69feba7aa
+$(DL_FILE)_MD5 = f85123cd390e864dfbe517e7616e6566
 
 install : $(TARGET)
 
@@ -119,11 +126,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.0-beta5-enginesdir.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2a-rpmbuild.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1m-weak-ciphers.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2h-weak-ciphers.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2g-disable-sslv2v3.patch
 
 	# i586 specific patches
-ifeq "$(MACHINE)" "i586"
+ifeq "$(BUILD_ARCH)" "i586"
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2a_auto_enable_padlock.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2a_disable_ssse3_for_amd.patch
 endif