Merge branch 'kernel-test' into seventeen

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

diff --git a/lfs/openssl-compat b/lfs/openssl-compat
index 75dd4a2fca4285463557c4c14e1df8c1e7399f98..683d979ae04b4601e5f8f48b76c625ff02b5dc91 100644 (file)
--- a/lfs/openssl-compat
+++ b/lfs/openssl-compat
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# 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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.9.8y
+VER        = 0.9.8zc
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 47c7fb37f78c970f1d30aa2f9e9e26d8
+$(DL_FILE)_MD5 = 1b239eea3a60d67863e7b66700e47a16
 
 install : $(TARGET)
 
@@ -71,6 +71,8 @@ $(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) && sed -i -e 's/mcpu/march/' config
        cd $(DIR_APP) && sed -i -e 's/-O3/-O2/' -e 's/-march=i486/-march=i586/' Configure
 
@@ -83,7 +85,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                shared linux-elf \
                zlib-dynamic \
                no-engines \
-               no-asm 386
+               no-asm 386 \
+               -DSSL_FORBID_ENULL \
+               -DHAVE_CRYPTODEV \
+               -DUSE_CRYPTODEV_DIGEST
 
        cd $(DIR_APP) && make depend
        cd $(DIR_APP) && make