From 0b820ef0d1e79b8471c5a01192c618f883f6bfa3 Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Wed, 8 Oct 2014 07:08:06 +0000
Subject: [PATCH] - merged 6.7p1 from PLD

---
 openssh-chroot.patch | 23 ++++++++++-------------
 openssh.spec         |  9 ++++-----
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/openssh-chroot.patch b/openssh-chroot.patch
index 5dda773..3c93ac0 100644
--- a/openssh-chroot.patch
+++ b/openssh-chroot.patch
@@ -64,21 +64,21 @@
  					 * poke the client this often to
 --- ./session.c.org	2008-05-05 16:22:11.935003283 +0200
 +++ ./session.c	2008-05-05 16:32:50.025507650 +0200
-@@ -1345,6 +1345,10 @@ void
- do_setusercontext(struct passwd *pw)
- {
- 	char *chroot_path, *tmp;
+@@ -1492,6 +1492,10 @@ do_setusercontext(struct passwd *pw)
+ #ifdef USE_LIBIAF
+ 	int doing_chroot = 0;
+ #endif
 +#ifdef CHROOT
 +	char *user_dir;
 +	char *new_root;
 +#endif /* CHROOT */
  
- #ifdef WITH_SELINUX
- 	/* Cache selinux status for later use */
-@@ -1425,8 +1429,28 @@ do_setusercontext(struct passwd *pw)
- 			/* Make sure we don't attempt to chroot again */
- 			free(options.chroot_directory);
- 			options.chroot_directory = NULL;
+ 	platform_setusercontext(pw);
+ 
+@@ -1534,6 +1538,25 @@ do_setusercontext(struct passwd *pw)
+ #ifdef USE_LIBIAF
+ 			doing_chroot = 1;
+ #endif
 +#ifdef CHROOT
 +		} else if (options.use_chroot) {
 +			user_dir = xstrdup(pw->pw_dir);
@@ -100,10 +100,7 @@
 +#endif /* CHROOT */
  		}
  
-+
  #ifdef HAVE_LOGIN_CAP
- 		if (setusercontext(lc, pw, pw->pw_uid, LOGIN_SETUSER) < 0) {
- 			perror("unable to set user context (setuser)");
 --- openssh-3.7.1p2/sshd_config	2003-09-02 14:51:18.000000000 +0200
 +++ openssh-3.7.1p2.pius/sshd_config	2003-10-07 20:49:08.000000000 +0200
 @@ -91,6 +91,10 @@
diff --git a/openssh.spec b/openssh.spec
index 8f3996a..c0463b1 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -29,13 +29,13 @@ Summary(pt_BR.UTF-8):	Implementação livre do SSH
 Summary(ru.UTF-8):	OpenSSH - свободная реализация протокола Secure Shell (SSH)
 Summary(uk.UTF-8):	OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:		openssh
-Version:	6.6p1
-Release:	3
+Version:	6.7p1
+Release:	1
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
 Source0:	ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5:	3e9800e6bca1fbac0eea4d41baa7f239
+# Source0-md5:	3246aa79317b1d23cae783a3bf8275d6
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	66943d481cc422512b537bcc2c7400d1
 Source2:	%{name}d.init
@@ -82,7 +82,7 @@ BuildRequires:	automake
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	libwrap-devel
 %{?with_ldap:BuildRequires:	openldap-devel}
-BuildRequires:	openssl-devel >= 0.9.7d
+BuildRequires:	openssl-devel >= 0.9.8f
 BuildRequires:	pam-devel
 %{?with_gtk:BuildRequires:	pkgconfig}
 BuildRequires:	rpm >= 4.4.9-56
@@ -568,7 +568,6 @@ CPPFLAGS="-DCHROOT"
 	--with-privsep-path=%{_privsepdir} \
 	--with-sandbox=seccomp_filter \
 	%{?with_selinux:--with-selinux} \
-	--with-tcp-wrappers \
 	--with-xauth=%{_bindir}/xauth
 
 echo '#define LOGIN_PROGRAM		   "/bin/login"' >>config.h
-- 
2.52.0