diff options
| author | he <he@pkgsrc.org> | 2019-06-04 09:08:06 +0000 |
|---|---|---|
| committer | he <he@pkgsrc.org> | 2019-06-04 09:08:06 +0000 |
| commit | 73be0abc2a99085692c149901987700f16d3d1ba (patch) | |
| tree | 646d59c761e4abfac3315a6739df82b3c676a6b6 /security/openssh | |
| parent | c02256cc88388303a5459530f3379a85d30b96a1 (diff) | |
| download | pkgsrc-73be0abc2a99085692c149901987700f16d3d1ba.tar.gz | |
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.
Diffstat (limited to 'security/openssh')
| -rw-r--r-- | security/openssh/Makefile | 4 | ||||
| -rw-r--r-- | security/openssh/distinfo | 4 | ||||
| -rw-r--r-- | security/openssh/patches/patch-auth.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index d5a1e32e31e..e211f3e8f33 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -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/} diff --git a/security/openssh/distinfo b/security/openssh/distinfo index 237d2fd6bc4..9fc307bb7c9 100644 --- a/security/openssh/distinfo +++ b/security/openssh/distinfo @@ -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 diff --git a/security/openssh/patches/patch-auth.c b/security/openssh/patches/patch-auth.c index 4d8145b4053..c04a7ac0c31 100644 --- a/security/openssh/patches/patch-auth.c +++ b/security/openssh/patches/patch-auth.c @@ -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 17:59:56 maya Exp $ 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); } |