X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fopenssh;h=3d4ef2f960431b69d529ec4d27626af66137b9cd;hb=89baf6d537a92d2a4f640dba97ef387ee5511daf;hp=c975a2601b30856b9652a7eda1d33fbf96deaff1;hpb=cd1a2927226c734d96478e12bb768256fb64a06a;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/openssh b/lfs/openssh
index c975a2601..3d4ef2f96 100644
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -1,28 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# 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: openssh,v 1.7.2.5 2005/02/05 15:38:15 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,11 +24,11 @@
 
 include Config
 
-VER        = 3.9p1
+VER        = 6.2p2
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8e1774d0b52aff08f817f3987442a16e
+$(DL_FILE)_MD5 = be46174dcbb77ebb4ea88ef140685de1
 
 install : $(TARGET)
 
@@ -78,13 +70,15 @@ $(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) && ./configure --sysconfdir=/etc/ssh --disable-nls \
-	    --prefix=/usr --target=$(MACHINE) \
-	    --with-privsep-path=/var/empty \
-	    --with-ipv4-default \
-	    --with-default-path=/bin:/usr/bin \
-	    --with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin
-	cd $(DIR_APP) && make -j 3
+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 \
+		    --with-privsep-path=/var/empty --disable-nls \
+		    --with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	sed -i -e 's/^#\?Port .*$$/Port 222/' \
 	    -e 's/^#\?Protocol .*$$/Protocol 2/' \
@@ -96,6 +90,8 @@ $(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
 	@rm -rf $(DIR_APP)