Updated openssh (5.4p1).

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

diff --git a/lfs/openssh b/lfs/openssh
index 1245b57d9c1b594c12f89a38040c514108b3d5c2..ffcf476818a914b8a4c2d63a827d5c7d9e07760b 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.3p2
+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 = 7e9880ac20a9b9db0d3fea30a9ff3d46
+$(DL_FILE)_MD5 = da10af8a789fa2e83e3635f3a1b76f5e
 
 install : $(TARGET)
 
@@ -70,6 +70,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ifeq "$(PADLOCK)" "1"
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssh-4.7p1-padlock.patch
+endif
        cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc/ssh \
                    --libexecdir=/usr/lib/openssh --with-md5-passwords \
@@ -87,9 +90,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
            -e 's/^#\?IgnoreUserKnownHosts .*$$/IgnoreUserKnownHosts yes/' \
            -e 's/^#\?UsePAM .*$$//' \
            -e 's/^#\?X11Forwarding .*$$/X11Forwarding no/' \
+           -e 's/^#\?SyslogFacility AUTH .*$$/SyslogFacility AUTH/' \
+           -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \
            -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \
            /etc/ssh/sshd_config
-       touch /var/ipfire/remote/enablessh
-       chown nobody:nobody /var/ipfire/remote/enablessh
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)