X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fopenssl-compat;h=5e3c1ff706b4cef2dd24d8dda22568c9413f5983;hb=a8d9f5cec1db248c75dc991d21186da554ca48ec;hp=683d979ae04b4601e5f8f48b76c625ff02b5dc91;hpb=6e0b26ba7db9d1faa5eb564b07d617c78d8ab0ef;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/openssl-compat b/lfs/openssl-compat
index 683d979ae0..5e3c1ff706 100644
--- a/lfs/openssl-compat
+++ b/lfs/openssl-compat
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2015  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        = 0.9.8zc
+VER        = 0.9.8zf
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 1b239eea3a60d67863e7b66700e47a16
+$(DL_FILE)_MD5 = c69a4a679233f7df189e1ad6659511ec
 
 install : $(TARGET)
 
@@ -71,7 +71,11 @@ $(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.8u-cryptodev.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-disable-sslv2-sslv3.patch
+
+	# Apply our CFLAGS
+	cd $(DIR_APP) && sed -i Configure \
+		-e "s/-O3 -fomit-frame-pointer/$(CFLAGS)/g"
 
 	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
@@ -86,9 +90,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		zlib-dynamic \
 		no-engines \
 		no-asm 386 \
-		-DSSL_FORBID_ENULL \
-		-DHAVE_CRYPTODEV \
-		-DUSE_CRYPTODEV_DIGEST
+		-DSSL_FORBID_ENULL
 
 	cd $(DIR_APP) && make depend
 	cd $(DIR_APP) && make