X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fopenssl;h=f8729c2de1598baaa5936ff0dbd81737e090a5a2;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hp=dc65ef5bc1960449cca36e0507ae6bf9f5d53271;hpb=20651e22d4df1e8c5f38a1be63d3fb3826c27dcc;p=ipfire-2.x.git

diff --git a/lfs/openssl b/lfs/openssl
index dc65ef5bc1..f8729c2de1 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  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,13 +24,60 @@
 
 include Config
 
-VER        = 0.9.8q
+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
@@ -40,7 +87,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 80e67291bec9230f03eefb5cfe858998
+$(DL_FILE)_MD5 = 4532712e7bcc9414f5bce995e4e13930
 
 install : $(TARGET)
 
@@ -70,18 +117,30 @@ $(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-0.9.8n-cryptodev.diff
-ifeq "$(PADLOCK)" "1"
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8g-engine-padlock.patch
-endif
-	@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) && ./Configure --openssldir=/etc/ssl --prefix=/usr shared linux-elf \
-		zlib-dynamic no-asm 386
-	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)