slang: revert parallelized build

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

diff --git a/lfs/openssl b/lfs/openssl
index 2cc687ebd0a90369b66e2373281c44c6d2bd6fec..f8729c2de1598baaa5936ff0dbd81737e090a5a2 100644 (file)
--- 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,16 +48,13 @@ CONFIGURE_OPTIONS = \
        shared \
        zlib-dynamic \
        enable-camellia \
-       enable-md2 \
        enable-seed \
        enable-rfc3779 \
-       enable-ssl3 \
-       enable-ssl3-method \
-       no-engine \
        no-idea \
        no-mdc2 \
        no-rc5 \
        no-srp \
+       no-aria \
        $(OPENSSL_ARCH)
 
 ifeq "$(IS_64BIT)" "1"
@@ -90,7 +87,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ba5f1b8b835b88cadbce9b35ed9531a6
+$(DL_FILE)_MD5 = 4532712e7bcc9414f5bce995e4e13930
 
 install : $(TARGET)
 
@@ -120,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.1a-default-cipherlist.patch
 
        # Apply our CFLAGS
        cd $(DIR_APP) && sed -i Configure \
@@ -129,10 +126,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && find crypto/ -name Makefile -exec \
                sed 's/^ASFLAGS=/&-Wa,--noexecstack /' -i {} \;
 
-       cd $(DIR_APP) && ./Configure $(CONFIGURE_OPTIONS)
+       cd $(DIR_APP) && ./Configure $(CONFIGURE_OPTIONS) \
+               $(CFLAGS) $(LDFLAGS)
 
        cd $(DIR_APP) && make depend
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING)
 
 ifeq "$(KCFG)" "-sse2"
        -mkdir -pv /usr/lib/sse2