Merge remote-tracking branch 'stevee/next-cgi-geoip' into next

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

diff --git a/lfs/openssl b/lfs/openssl
index d8925d7d18538532a19c2706e4f448ffa3675147..455dcf15cbdeef2044a879e477f3e6baa44fb0a9 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -117,9 +117,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1m-weak-ciphers.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-disable-sslv2-sslv3.patch
 
-       # Enable Padlock in i586
+       # i586 specific patches
 ifeq "$(MACHINE)" "i586"
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2a_auto_enable_padlock.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2a_disable_ssse3_for_amd.patch
 endif
 
        # Apply our CFLAGS