- up to 7.8p1

diff --git a/openssh-chroot.patch b/openssh-chroot.patch
index 828de68ec749b3fb9fe88b749b73ce373a44d47b..64ea0ca06bef0f542792e625ce7d3a8e069c5d85 100644 (file)
--- 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
                                         * 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)
  {
  do_setusercontext(struct passwd *pw)
  {

-       char *chroot_path, *tmp;
+       char uidstr[32], *chroot_path, *tmp;

 +#ifdef CHROOT
 +      char *user_dir;
 +      char *new_root;
 +#ifdef CHROOT
 +      char *user_dir;
 +      char *new_root;

diff --git a/openssh-ldap.patch b/openssh-ldap.patch
index 36265580052328ced38aa56d6571e0334d72aee7..2920eabbf951856ed68404660e7550d29e1d28a7 100644 (file)
--- 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 */
 +}
 +
 +/* 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 -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 50d75fb0dd677a78ce56fe450f8d8a1ff59489d4..3fc04aeb2006122942d1076c3d85d9e5498c6b85 100644 (file)
--- 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
 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
 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
 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