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

diff --git a/lfs/openssl b/lfs/openssl
index 5beb4a24ad..6e6ba41d76 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 0.9.7k
+VER        = 0.9.8d
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = be6bba1d67b26eabb48cf1774925416f
+$(DL_FILE)_MD5 = 8ed1853538e1d05a1f5ada61ebf8bffa
 
 install : $(TARGET)
 
@@ -73,12 +73,10 @@ $(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) && make depend
+	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
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_manpages-1.patch
+	cd $(DIR_APP) && ./config --openssldir=/etc/ssl --prefix=/usr shared
 	cd $(DIR_APP) && make MANDIR=/usr/share/man
 	cd $(DIR_APP) && make MANDIR=/usr/share/man install
 	rm -rf /etc/ssl/lib