slang: revert parallelized build

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

diff --git a/lfs/openssl b/lfs/openssl
index 6e6ba41d764f2ad4bf31e149f6e6790b39dd06bc..f8729c2de1598baaa5936ff0dbd81737e090a5a2 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,13 +24,60 @@
 
 include Config
 
-VER        = 0.9.8d
+VER        = 1.1.1b
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+
+TARGET = $(DIR_INFO)/$(THISAPP)$(KCFG)
+
+CFLAGS += -DPURIFY -Wa,--noexecstack
+
+# Enable SSE2 for this build
+ifeq "$(KCFG)" "-sse2"
+  CFLAGS+= -march=i686 -mmmx -msse -msse2 -mfpmath=sse
+endif
+
+export RPM_OPT_FLAGS = $(CFLAGS)
+
+CONFIGURE_OPTIONS = \
+       --prefix=/usr \
+       --openssldir=/etc/ssl \
+       shared \
+       zlib-dynamic \
+       enable-camellia \
+       enable-seed \
+       enable-rfc3779 \
+       no-idea \
+       no-mdc2 \
+       no-rc5 \
+       no-srp \
+       no-aria \
+       $(OPENSSL_ARCH)
+
+ifeq "$(IS_64BIT)" "1"
+       OPENSSL_ARCH = linux-generic64
+else
+       OPENSSL_ARCH = linux-generic32
+endif
+
+ifeq "$(BUILD_ARCH)" "aarch64"
+       OPENSSL_ARCH = linux-aarch64
+endif
+
+ifeq "$(BUILD_ARCH)" "x86_64"
+       OPENSSL_ARCH = linux-x86_64
+endif
+
+ifeq "$(BUILD_ARCH)" "i586"
+       OPENSSL_ARCH = linux-elf
+
+  ifneq "$(KCFG)" "-sse2"
+       OPENSSL_ARCH += no-sse2
+  endif
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +87,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8ed1853538e1d05a1f5ada61ebf8bffa
+$(DL_FILE)_MD5 = 4532712e7bcc9414f5bce995e4e13930
 
 install : $(TARGET)
 
@@ -72,14 +117,30 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       @rm -rf /etc/ssl
-       cd $(DIR_APP) && sed -i -e 's/mcpu/march/' config
-       cd $(DIR_APP) && sed -i -e 's/-O3/-O2/' -e 's/-march=i486/-march=i586/' Configure
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_manpages-1.patch
-       cd $(DIR_APP) && ./config --openssldir=/etc/ssl --prefix=/usr shared
-       cd $(DIR_APP) && make MANDIR=/usr/share/man
-       cd $(DIR_APP) && make MANDIR=/usr/share/man install
-       rm -rf /etc/ssl/lib
+       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 \
+               -e "s/-O3 -fomit-frame-pointer/$(CFLAGS)/g"
+
+       cd $(DIR_APP) && find crypto/ -name Makefile -exec \
+               sed 's/^ASFLAGS=/&-Wa,--noexecstack /' -i {} \;
+
+       cd $(DIR_APP) && ./Configure $(CONFIGURE_OPTIONS) \
+               $(CFLAGS) $(LDFLAGS)
+
+       cd $(DIR_APP) && make depend
+       cd $(DIR_APP) && make $(MAKETUNING)
+
+ifeq "$(KCFG)" "-sse2"
+       -mkdir -pv /usr/lib/sse2
+       cd $(DIR_APP) && install -m 755 \
+               libcrypto.so.1.1 /usr/lib/sse2
+else
+       # Install everything.
+       cd $(DIR_APP) && make install
        install -m 0644 $(DIR_SRC)/config/ssl/openssl.cnf /etc/ssl
+endif
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)