X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fopenssl;h=0f0b823a947acddbfada70d00dc6cfb39eb63e1f;hb=9445ab4accc481844fa136e6bc30698e4121cdce;hp=5beb4a24ad86467ea64f1ea6dac3d6343ddb9794;hpb=90c973a6a7ce2efae9f96d7bde8f7c438ab52602;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/openssl b/lfs/openssl
index 5beb4a24ad..0f0b823a94 100644
--- 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-2014  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,7 +24,7 @@
 
 include Config
 
-VER        = 0.9.7k
+VER        = 1.0.1i
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,6 +32,17 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+ifeq "$(MACHINE)" "i586"
+	CONFIGURE_ARGS = linux-elf no-asm 386
+endif
+
+ifeq "$(MACHINE)" "armv5tel"
+	CONFIGURE_ARGS = linux-generic32
+endif
+
+CFLAGS += -DPURIFY
+export RPM_OPT_FLAGS = $(CFLAGS)
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -42,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = be6bba1d67b26eabb48cf1774925416f
+$(DL_FILE)_MD5 = c8dc151a671b9b92ff3e4c118b174972
 
 install : $(TARGET)
 
@@ -72,16 +81,49 @@ $(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/-O3/-O2/' -e 's/-m486/-mcpu=i386/' Configure
-	cd $(DIR_APP) && chmod 755 Configure
-	cd $(DIR_APP) && ./config --openssldir=/etc/ssl --prefix=/usr 386 \
-	    no-idea no-threads no-mdc2 no-rc5 no-ec zlib-dynamic shared
-	cd $(DIR_APP) && sed -i 's/^PROCESSOR= 386/PROCESSOR=386/g' Makefile
+	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.1-beta2-build.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1e-cryptodev.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1e-fix_parallel_build-1.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1e-weak-ciphers.patch
+
+	cd $(DIR_APP) && find crypto/ -name Makefile -exec \
+		sed 's/^ASFLAGS=/&-Wa,--noexecstack /' -i {} \;
+
+	cd $(DIR_APP) && ./Configure \
+		--prefix=/usr \
+		--openssldir=/etc/ssl \
+		--enginesdir=/usr/lib/openssl/engines \
+		shared \
+		zlib-dynamic \
+		enable-camellia \
+		enable-md2 \
+		enable-seed \
+		enable-tlsext \
+		enable-rfc3779 \
+		no-idea \
+		no-mdc2 \
+		no-rc5 \
+		no-srp \
+		$(CONFIGURE_ARGS) \
+		-DSSL_FORBID_ENULL \
+		-DHAVE_CRYPTODEV \
+		-DUSE_CRYPTODEV_DIGEST
+
 	cd $(DIR_APP) && make depend
-	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) && make
+
+	# Install everything.
+	cd $(DIR_APP) && make install
 	install -m 0644 $(DIR_SRC)/config/ssl/openssl.cnf /etc/ssl
+
+	# Remove man pages.
+	-rm -vfr /etc/ssl/man
+
+	# Move engines to the right place.
+	-mkdir -pv /usr/lib/openssl
+	rm -vfr /usr/lib/openssl/engines
+	mv -v /usr/lib/engines /usr/lib/openssl
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)