From c4f5c632463faec224322a515e384ae6615939f5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Fri, 24 Aug 2018 22:36:52 +0200
Subject: [PATCH] - up to 7.8p1

---
 openssh-chroot.patch | 4 ++--
 openssh-ldap.patch   | 4 ++--
 openssh.spec         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openssh-chroot.patch b/openssh-chroot.patch
index 828de68..64ea0ca 100644
--- a/openssh-chroot.patch
+++ b/openssh-chroot.patch
@@ -64,10 +64,10 @@
  					 * poke the client this often to
 --- openssh-7.2p1/session.c.orig	2016-03-05 10:24:44.227756638 +0100
 +++ openssh-7.2p1/session.c	2016-03-05 10:24:50.237756386 +0100
-@@ -1492,6 +1492,10 @@ do_setusercontext(struct passwd *pw)
+@@ -1381,6 +1381,10 @@ void
  do_setusercontext(struct passwd *pw)
  {
- 	char *chroot_path, *tmp;
+ 	char uidstr[32], *chroot_path, *tmp;
 +#ifdef CHROOT
 +	char *user_dir;
 +	char *new_root;
diff --git a/openssh-ldap.patch b/openssh-ldap.patch
index 3626558..2920eab 100644
--- a/openssh-ldap.patch
+++ b/openssh-ldap.patch
@@ -1778,8 +1778,8 @@ diff -up openssh-6.2p1/ldap-helper.c.ldap openssh-6.2p1/ldap-helper.c
 +}
 +
 +/* Ugly hack */
-+void   *buffer_get_string(Buffer *b, u_int *l) { return NULL; }
-+void    buffer_put_string(Buffer *b, const void *f, u_int l) {}
++void   *buffer_get_string(struct sshbuf *b, u_int *l) { return NULL; }
++void    buffer_put_string(struct sshbuf *b, const void *f, u_int l) {}
 +
 diff -up openssh-6.2p1/ldap-helper.h.ldap openssh-6.2p1/ldap-helper.h
 --- openssh-6.2p1/ldap-helper.h.ldap	2013-03-25 21:27:15.892248097 +0100
diff --git a/openssh.spec b/openssh.spec
index 50d75fb..3fc04ae 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -46,13 +46,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:	7.7p1
+Version:	7.8p1
 Release:	1
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
 Source0:	http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5:	68ba883aff6958297432e5877e9a0fe2
+# Source0-md5:	ce1d090fa6239fd38eb989d5e983b074
 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
-- 
2.43.0