# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1431676550 -7200
# Node ID 7ef2138f26672fd95967867cf025e39684b739ce
# Parent  ab7d43a22a722ddbd86438960646a0ea1ed2096b
Up openssh (6.8p1)

diff -r ab7d43a22a72 -r 7ef2138f2667 openssh-pam/receipt
--- a/openssh-pam/receipt	Fri May 15 04:39:10 2015 +0300
+++ b/openssh-pam/receipt	Fri May 15 09:55:50 2015 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="openssh-pam"
-VERSION="6.7p1"
+VERSION="6.8p1"
 CATEGORY="security"
 SHORT_DESC="Openbsd Secure Shell using PAM."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -11,23 +11,29 @@
 WEB_SITE="http://www.openssh.org/"
 WGET_URL="ftp://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/$TARBALL"
 CONFIG_FILES="/etc/ssh /etc/inetd.conf"
-TAZPANEL_DAEMON="man::sshd|edit::/etc/ssh/sshd_config|options::OPENSSH_OPTIONS|web::$WEB_SITE"
+TAGS="ssh security"
+
 PROVIDE="openssh:pam ssh:pam"
-TAGS="ssh"
-
 DEPENDS="sftp-server libcrypto zlib pam"
 BUILD_DEPENDS="libcrypto-dev zlib-dev openssl-dev pam pam-dev"
+TAZPANEL_DAEMON="man::sshd|edit::/etc/ssh/sshd_config|options::OPENSSH_OPTIONS|web::$WEB_SITE"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	./configure --prefix=/usr --sysconfdir=/etc/ssh --with-pam \
-		--with-privsep-user=nobody --with-privsep-path=/var/run/sshd \
+	unset LD # for cross compiling with --disable-strip
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc/ssh \
+		--libexecdir=/usr/sbin \
+		--with-privsep-user=nobody \
 		--with-xauth=/usr/bin/xauth \
-		--libexecdir=/usr/sbin \
+		--with-privsep-path=/var/run/sshd \
+		--without-ssh1 \
+		--with-pam \
+		--disable-strip \
 		$CONFIGURE_ARGS &&
-	make &&
+	make STRIP_OPT="" &&
 	make DESTDIR=$DESTDIR install
 }
 
@@ -40,6 +46,8 @@
 	cp -a $install/etc $fs
 	cp ../$SOURCE/stuff/openssh $fs/etc/init.d
 	sed -i 's/.*UsePAM.*/UsePAM yes/' $fs/etc/ssh/sshd_config
+	sed -i 's|/usr/libexec/sftp-server|/usr/sbin/sftp-server|' \
+		$fs/etc/ssh/sshd_config
 }
 
 post_install()
diff -r ab7d43a22a72 -r 7ef2138f2667 openssh/receipt
--- a/openssh/receipt	Fri May 15 04:39:10 2015 +0300
+++ b/openssh/receipt	Fri May 15 09:55:50 2015 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="openssh"
-VERSION="6.7p1"
+VERSION="6.8p1"
 CATEGORY="security"
 SHORT_DESC="Openbsd Secure Shell."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -29,6 +29,7 @@
 		--with-privsep-user=nobody \
 		--with-xauth=/usr/bin/xauth \
 		--with-privsep-path=/var/run/sshd \
+		--without-ssh1 \
 		--without-pam \
 		--disable-strip \
 		$CONFIGURE_ARGS &&
diff -r ab7d43a22a72 -r 7ef2138f2667 sftp-server/receipt
--- a/sftp-server/receipt	Fri May 15 04:39:10 2015 +0300
+++ b/sftp-server/receipt	Fri May 15 09:55:50 2015 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="sftp-server"
-VERSION="6.7p1"
+VERSION="6.8p1"
 CATEGORY="security"
 SHORT_DESC="Openbsd Secure FTP server."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -19,4 +19,3 @@
 	mkdir -p $fs/usr/sbin
 	cp -a $install/usr/sbin/sftp-server $fs/usr/sbin
 }
-