From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 9 Mar 2010 19:37:44 +0000 (+0100)
Subject: Updated openssh (5.4p1).
X-Git-Tag: v2.9-beta1~412^2~39^2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=48cd21cdc0bf64193bfe42b4073412d510373868

Updated openssh (5.4p1).
---

diff --git a/config/rootfiles/common/openssh b/config/rootfiles/common/openssh
index e86c53b966..faae91839f 100644
--- a/config/rootfiles/common/openssh
+++ b/config/rootfiles/common/openssh
@@ -19,8 +19,8 @@ usr/bin/ssh-keyscan
 #usr/lib/openssh
 usr/lib/openssh/sftp-server
 usr/lib/openssh/ssh-keysign
+usr/lib/openssh/ssh-pkcs11-helper
 usr/sbin/sshd
-#usr/share/Ssh.bin
 #usr/share/man/man1/scp.1
 #usr/share/man/man1/sftp.1
 #usr/share/man/man1/slogin.1
@@ -34,4 +34,5 @@ usr/sbin/sshd
 #usr/share/man/man5/sshd_config.5
 #usr/share/man/man8/sftp-server.8
 #usr/share/man/man8/ssh-keysign.8
+#usr/share/man/man8/ssh-pkcs11-helper.8
 #usr/share/man/man8/sshd.8
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index d2130b6900..8f02a4c12d 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -132,7 +132,7 @@
 * hostapd-0.6.9
 * hplip-2.7.10
 * htop-0.8.1
-* httpd-2.2.14
+* httpd-2.2.15
 * hwdata
 * iana-etc-2.10
 * icecast-2.3.2
@@ -247,8 +247,8 @@
 * open-vm-tools-2009.05.22-167859
 * openldap-2.3.20
 * openmailadmin-1.0.0
-* openssh-5.3p1
-* openssl-0.9.8l
+* openssh-5.4p1
+* openssl-0.9.8m
 * openswan-2.6.24
 * openswan-2.6.24-kmod-2.6.32.9-ipfire
 * openswan-2.6.24-kmod-2.6.32.9-ipfire-xen
diff --git a/lfs/openssh b/lfs/openssh
index c64cd5692a..ffcf476818 100644
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.3p1
+VER        = 5.4p1
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 13563dbf61f36ca9a1e4254260131041
+$(DL_FILE)_MD5 = da10af8a789fa2e83e3635f3a1b76f5e
 
 install : $(TARGET)