~/src/patches/: Clean up orphaned patches, second batch

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

diff --git a/lfs/openssl b/lfs/openssl
index 8d978f1710fd2f2098538f7953be86f7b35142f7..c56c24af04f4733c5780921aea61236f4adeff97 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  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.1d
+VER        = 1.1.1k
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -35,11 +35,6 @@ 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 = \
@@ -72,11 +67,7 @@ ifeq "$(BUILD_ARCH)" "x86_64"
 endif
 
 ifeq "$(BUILD_ARCH)" "i586"
-       OPENSSL_ARCH = linux-elf
-
-  ifneq "$(KCFG)" "-sse2"
-       OPENSSL_ARCH += no-sse2
-  endif
+       OPENSSL_ARCH = linux-elf no-sse2
 endif
 
 ###############################################################################
@@ -87,7 +78,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3be209000dbc7e1b95bcdf47980a3baa
+$(DL_FILE)_MD5 = c4e7d95f782b08116afa27b30393dd27
 
 install : $(TARGET)
 
@@ -132,15 +123,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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.
+       # Install everything
        cd $(DIR_APP) && make install
        install -m 0644 $(DIR_SRC)/config/ssl/openssl.cnf /etc/ssl
-endif
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)