Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --cc lfs/openssl-compat
index ad5d6649f1cfd3a438f801b2b16fa8f662b40491,a722f592b4c31e68a117ac42dbfcf7e5d7b9aa69..d2f52ae2a5d7dfe3d86a453370d75138863b093c
--- 1/lfs/openssl-compat
--- 2/lfs/openssl-compat
+++ b/lfs/openssl-compat
@@@ -71,11 -71,8 +71,7 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
  
-       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) && 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
  
        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