From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Tue, 12 Sep 2006 20:23:29 +0000 (+0000)
Subject: Geaendert:
X-Git-Tag: v2.3-beta1~979
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=50f9633488f35a05db3b5cf3c27e01c66e44e059

Geaendert:
  * OpenSSL-Update wegen Sicherheitluecke.
  * Mache ROOTFILES passend um weniger zu aendern bei Kernelupdate.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@275 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---

diff --git a/doc/ChangeLog b/doc/ChangeLog
index e0074d5953..2293dd867d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,8 @@
 ------------------------------------------------------------------------
+r274 | ms | 2006-09-12 20:51:47 +0200 (Tue, 12 Sep 2006) | 1 line
+
+Neues Bild fuers Bootmenue!
+------------------------------------------------------------------------
 r273 | ms | 2006-09-12 19:56:44 +0200 (Tue, 12 Sep 2006) | 5 lines
 
 Hinzugefuegt:
diff --git a/lfs/cdrom b/lfs/cdrom
index 3051f2b1b2..b346f10b8e 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -87,9 +87,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Compress root filesystem
 	# Reason for this tar+untar+tar is removing of entries listed two or more in src/ROOTFILES
 	mkdir -p /install/cdrom/{doc,dosutils,images}
-	tar -c -C / --files-from=$(DIR_SRC)/src/ROOTFILES.$(MACHINE) \
+	sed -e "s/KVER/$(KVER)/g" $(DIR_SRC)/src/ROOTFILES.$(MACHINE) > /tmp/ROOTFILES
+	tar -c -C / --files-from=/tmp/ROOTFILES \
 	    -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \
 	    --exclude='proc/*'
+	rm -f /tmp/ROOTFILES
 	tar -x -C /tmp -f /$(SNAME).tar
 	rm -f /$(SNAME).tar
 	cd /tmp && tar zcf /install/cdrom/$(SNAME)-$(VERSION).tgz * && rm -rf *
diff --git a/lfs/openssl b/lfs/openssl
index 2ddea2142a..fe40b73565 100644
--- 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.7k
 
 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 = be6bba1d67b26eabb48cf1774925416f
 
 install : $(TARGET)
 
@@ -81,7 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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
+	    no-idea no-threads no-mdc2 no-rc5 no-ec zlib-dynamic shared
 	cd $(DIR_APP) && sed -i 's%SHLIBDIRS= fips crypto ssl%SHLIBDIRS= crypto ssl%g' Makefile
 	cd $(DIR_APP) && make depend
 	cd $(DIR_APP) && make MANDIR=/usr/share/man
diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386
index 40f864f40a..2f0056817d 100644
--- a/src/ROOTFILES.i386
+++ b/src/ROOTFILES.i386
@@ -19803,7 +19803,7 @@ usr/sbin/atmtcp
 #usr/share/man/man8/mpcd.8
 #usr/share/man/man8/zeppelin.8
 ##
-## openssl-0.9.7i
+## openssl-0.9.7k
 ##
 #etc/ssl
 #etc/ssl/certs
@@ -20875,6 +20875,9 @@ usr/lib/libssl.so.0.9.7
 #usr/share/man/man5/config.5
 #usr/share/man/man7/Modes_of_DES.7
 #usr/share/man/man7/des_modes.7
+#usr/bin/fipsld
+#usr/lib/fips_premain.c
+#usr/lib/fips_premain.c.sha1
 ##
 ## pciutils-2.1.11
 ##