toolchain: update to gcc-7.3.0 and enable retpolines on x86_64 and i586

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

diff --git a/lfs/openssl b/lfs/openssl
index 814c1e301a369df0cb2ef729c12621059a53651f..7239a98f472d02c7841c3690e1cd67d1a3df2802 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  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.0.2a
+VER        = 1.0.2n
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -37,6 +37,7 @@ ifneq "$(KCFG)" "-sse2"
 CFLAGS += -DPURIFY
 else
 CFLAGS =-O2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fPIC
+CFLAGS+= -mindirect-branch=thunk -mfunction-return=thunk
 CFLAGS+= -fstack-protector-all --param=ssp-buffer-size=4
 CFLAGS+= -march=i686 -mmmx -msse -msse2 -mfpmath=sse
 CFLAGS+= -fomit-frame-pointer -DPURIFY
@@ -53,6 +54,7 @@ CONFIGURE_OPTIONS = \
        zlib-dynamic \
        enable-camellia \
        enable-md2 \
+       disable-ssl2 \
        enable-seed \
        enable-tlsext \
        enable-rfc3779 \
@@ -60,18 +62,29 @@ CONFIGURE_OPTIONS = \
        no-mdc2 \
        no-rc5 \
        no-srp \
-       -DSSL_FORBID_ENULL
+       -DSSL_FORBID_ENULL \
+       $(OPENSSL_ARCH)
 
-ifeq "$(MACHINE)" "i586"
-       CONFIGURE_OPTIONS += linux-elf
+ifeq "$(IS_64BIT)" "1"
+       OPENSSL_ARCH = linux-generic64
+else
+       OPENSSL_ARCH = linux-generic32
+endif
 
-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
 
 ###############################################################################
@@ -82,7 +95,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a06c547dac9044161a477211049f60ef
+$(DL_FILE)_MD5 = 13bdc1b1d1ff39b6fd42a255e74676a4
 
 install : $(TARGET)
 
@@ -114,8 +127,18 @@ $(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-disable-sslv2-sslv3.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 "$(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
+
+       # With openssl 1.0.2e, pod2mantest is missing
+       echo -e "#!/bin/bash\necho \$$(which pod2man)" > $(DIR_APP)/util/pod2mantest
+       chmod a+x $(DIR_APP)/util/pod2mantest
 
        # Apply our CFLAGS
        cd $(DIR_APP) && sed -i Configure \
@@ -132,7 +155,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 ifeq "$(KCFG)" "-sse2"
        -mkdir -pv /usr/lib/sse2
        cd $(DIR_APP) && install -m 755 \
-               libcrypto.so.10 libssl.so.10 /usr/lib/sse2
+               libcrypto.so.10 /usr/lib/sse2
 else
        # Install everything.
        cd $(DIR_APP) && make install