Asterisk aktualisiert. --> 1.4.0

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

diff --git a/lfs/openssl b/lfs/openssl
index 2ddea2142a5d8c14dfd139ef6f0b5f8945f1a182..6e6ba41d764f2ad4bf31e149f6e6790b39dd06bc 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: openssl,v 1.6.2.12 2005/11/25 22:38:42 franck78 Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 0.9.7i
+VER        = 0.9.8d
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.openssl.org/source
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f69d82b206ff8bff9d0e721f97380b9e
+$(DL_FILE)_MD5 = 8ed1853538e1d05a1f5ada61ebf8bffa
 
 install : $(TARGET)
 
@@ -78,12 +72,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       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 fips zlib-dynamic shared
-       cd $(DIR_APP) && sed -i 's%SHLIBDIRS= fips crypto ssl%SHLIBDIRS= crypto ssl%g' Makefile
-       cd $(DIR_APP) && make depend
+       @rm -rf /etc/ssl
+       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