CVS commit: pkgsrc/security/openssh

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Tue Jun  4 09:08:06 UTC 2019

Modified Files:
        pkgsrc/security/openssh: Makefile distinfo
        pkgsrc/security/openssh/patches: patch-auth.c

Log Message:
When changing from login_getclass() to login_getpwclass(),
we also need to adjust the argument.  This failure caused
opensshd for the session to crash with a bus error.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.259 -r1.260 pkgsrc/security/openssh/Makefile
cvs rdiff -u -r1.107 -r1.108 pkgsrc/security/openssh/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/openssh/patches/patch-auth.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/openssh/Makefile
diff -u pkgsrc/security/openssh/Makefile:1.259 pkgsrc/security/openssh/Makefile:1.260
--- pkgsrc/security/openssh/Makefile:1.259      Wed May  1 17:59:56 2019
+++ pkgsrc/security/openssh/Makefile    Tue Jun  4 09:08:06 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.259 2019/05/01 17:59:56 maya Exp $
+# $NetBSD: Makefile,v 1.260 2019/06/04 09:08:06 he Exp $
 
 DISTNAME=              openssh-8.0p1
 PKGNAME=               ${DISTNAME:S/p1/.1/}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            security
 MASTER_SITES=          ${MASTER_SITE_OPENBSD:=OpenSSH/portable/}
 

Index: pkgsrc/security/openssh/distinfo
diff -u pkgsrc/security/openssh/distinfo:1.107 pkgsrc/security/openssh/distinfo:1.108
--- pkgsrc/security/openssh/distinfo:1.107      Wed May  1 17:59:56 2019
+++ pkgsrc/security/openssh/distinfo    Tue Jun  4 09:08:06 2019
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.107 2019/05/01 17:59:56 maya Exp $
+$NetBSD: distinfo,v 1.108 2019/06/04 09:08:06 he Exp $
 
 SHA1 (openssh-8.0p1.tar.gz) = 756dbb99193f9541c9206a667eaa27b0fa184a4f
 RMD160 (openssh-8.0p1.tar.gz) = 9c0d0d97a5f9f97329bf334725dfbad53576d612
 SHA512 (openssh-8.0p1.tar.gz) = e280fa2d56f550efd37c5d2477670326261aa8b94d991f9eb17aad90e0c6c9c939efa90fe87d33260d0f709485cb05c379f0fd1bd44fc0d5190298b6398c9982
 Size (openssh-8.0p1.tar.gz) = 1597697 bytes
 SHA1 (patch-Makefile.in) = 13502b825c13c98b2ba3b84ff4bae9aa664b76b1
-SHA1 (patch-auth.c) = 194e3293fdc18b93014041d379d57df172716e1c
+SHA1 (patch-auth.c) = 060a93f5264751769f2fdf98fefd154bd80c0c5f
 SHA1 (patch-clientloop.c) = 4e88fbd14db33f003eb93c30c682a017e102196e
 SHA1 (patch-config.h.in) = 7d1050743da7264763254b57938775c546c3baa5
 SHA1 (patch-configure.ac) = 321ef5ed83abe7e07d38026e096a10700b010ac8

Index: pkgsrc/security/openssh/patches/patch-auth.c
diff -u pkgsrc/security/openssh/patches/patch-auth.c:1.5 pkgsrc/security/openssh/patches/patch-auth.c:1.6
--- pkgsrc/security/openssh/patches/patch-auth.c:1.5    Wed May  1 17:59:56 2019
+++ pkgsrc/security/openssh/patches/patch-auth.c        Tue Jun  4 09:08:06 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-auth.c,v 1.5 2019/05/01 17:59:56 maya Exp $
+$NetBSD: patch-auth.c,v 1.6 2019/06/04 09:08:06 he Exp $
 
 * Use login_getpwclass() instead of login_getclass() so that the root
   vs. default login class distinction is made correctly, from FrrrBSD's
@@ -11,7 +11,7 @@ $NetBSD: patch-auth.c,v 1.5 2019/05/01 1
                return (NULL);
  #ifdef HAVE_LOGIN_CAP
 -      if ((lc = login_getclass(pw->pw_class)) == NULL) {
-+      if ((lc = login_getpwclass(pw->pw_class)) == NULL) {
++      if ((lc = login_getpwclass(pw)) == NULL) {
                debug("unable to get login class: %s", user);
                return (NULL);
        }