CVS commit: src
Module Name:src Committed By: yamaguchi Date: Thu Feb 27 06:30:56 UTC 2020 Modified Files: src/distrib/sets/lists/modules: mi src/sys/modules: Makefile Log Message: Make ixl(4) be able to build as a module To generate a diff of this commit: cvs rdiff -u -r1.132 -r1.133 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.238 -r1.239 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.132 src/distrib/sets/lists/modules/mi:1.133 --- src/distrib/sets/lists/modules/mi:1.132 Tue Feb 11 11:36:53 2020 +++ src/distrib/sets/lists/modules/mi Thu Feb 27 06:30:55 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.132 2020/02/11 11:36:53 uki Exp $ +# $NetBSD: mi,v 1.133 2020/02/27 06:30:55 yamaguchi Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -214,8 +214,8 @@ ./@MODULEDIR@/if_gre/if_gre.kmod modules-base-kernel kmod ./@MODULEDIR@/if_kuemodules-base-kernel kmod ./@MODULEDIR@/if_kue/if_kue.kmod modules-base-kernel kmod -./@MODULEDIR@/if_ixlbase-obsolete obsolete -./@MODULEDIR@/if_ixl/if_ixl.kmod base-obsolete obsolete +./@MODULEDIR@/if_ixlmodules-base-kernel kmod +./@MODULEDIR@/if_ixl/if_ixl.kmod modules-base-kernel kmod ./@MODULEDIR@/if_l2tpmodules-base-kernel kmod ./@MODULEDIR@/if_l2tp/if_l2tp.kmod modules-base-kernel kmod ./@MODULEDIR@/if_loopmodules-base-kernel kmod Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.238 src/sys/modules/Makefile:1.239 --- src/sys/modules/Makefile:1.238 Sun Feb 9 16:06:18 2020 +++ src/sys/modules/Makefile Thu Feb 27 06:30:56 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.238 2020/02/09 16:06:18 jmcneill Exp $ +# $NetBSD: Makefile,v 1.239 2020/02/27 06:30:56 yamaguchi Exp $ .include @@ -79,6 +79,7 @@ SUBDIR+= if_cue SUBDIR+= if_faith SUBDIR+= if_gif SUBDIR+= if_gre +SUBDIR+= if_ixl SUBDIR+= if_kue SUBDIR+= if_l2tp SUBDIR+= if_loop @@ -439,7 +440,6 @@ SUBDIR+= cac SUBDIR+= cac_eisa SUBDIR+= cac_pci SUBDIR+= if_aq -SUBDIR+= if_ixl SUBDIR+= if_vioif SUBDIR+= ld SUBDIR+= ld_aac
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Thu Feb 27 06:17:50 UTC 2020
Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.149 -r1.150 src/sys/dev/mii/miidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.161 src/sys/dev/mii/miidevs.h:1.162
--- src/sys/dev/mii/miidevs.h:1.161 Sat Feb 22 18:57:09 2020
+++ src/sys/dev/mii/miidevs.h Thu Feb 27 06:17:50 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.161 2020/02/22 18:57:09 jmcneill Exp $ */
+/* $NetBSD: miidevs.h,v 1.162 2020/02/27 06:17:50 msaitoh Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.163 2020/02/22 18:56:57 jmcneill Exp
+ * NetBSD: miidevs,v 1.164 2020/02/27 06:17:28 msaitoh Exp
*/
/*-
@@ -77,7 +77,6 @@
#define MII_OUI_AQUANTIA 0x0017b6 /* Aquantia Corporation */
#define MII_OUI_BROADCOM3 0x001be9 /* Broadcom Corporation */
#define MII_OUI_LEVEL1 0x00207b /* Level 1 */
-#define MII_OUI_VIA 0x004063 /* VIA Technologies */
#define MII_OUI_MARVELL 0x005043 /* Marvell Semiconductor */
#define MII_OUI_QUALSEMI 0x006051 /* Quality Semiconductor */
#define MII_OUI_AMLOGIC 0x006051 /* Amlogic */
@@ -103,6 +102,7 @@
/* Unregistered or wrong OUI */
#define MII_OUI_yyREALTEK 0x04 /* Realtek */
#define MII_OUI_yyAMD 0x58 /* Advanced Micro Devices */
+#define MII_OUI_xxVIA 0x0002c6 /* VIA Technologies */
#define MII_OUI_xxMYSON 0x00032d /* Myson Technology */
#define MII_OUI_xxTSC 0x00039c /* TDK Semiconductor */
#define MII_OUI_xxASIX 0x000674 /* Asix Semiconductor */
@@ -617,10 +617,10 @@
#define MII_STR_xxTSC_78Q2121 "78Q2121 100BASE-TX media interface"
/* VIA Technologies PHYs */
-#define MII_MODEL_VIA_VT6103 0x0032
-#define MII_STR_VIA_VT6103 "VT6103 10/100 PHY"
-#define MII_MODEL_VIA_VT6103_2 0x0034
-#define MII_STR_VIA_VT6103_2 "VT6103 10/100 PHY"
+#define MII_MODEL_xxVIA_VT6103 0x0032
+#define MII_STR_xxVIA_VT6103 "VT6103 10/100 PHY"
+#define MII_MODEL_xxVIA_VT6103_2 0x0034
+#define MII_STR_xxVIA_VT6103_2 "VT6103 10/100 PHY"
/* Vitesse PHYs (Now Microsemi) */
#define MII_MODEL_xxVITESSE_VSC8601 0x0002
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.149 src/sys/dev/mii/miidevs_data.h:1.150
--- src/sys/dev/mii/miidevs_data.h:1.149 Sat Feb 22 18:57:09 2020
+++ src/sys/dev/mii/miidevs_data.h Thu Feb 27 06:17:50 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.149 2020/02/22 18:57:09 jmcneill Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.150 2020/02/27 06:17:50 msaitoh Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.163 2020/02/22 18:56:57 jmcneill Exp
+ * NetBSD: miidevs,v 1.164 2020/02/27 06:17:28 msaitoh Exp
*/
/*-
@@ -253,8 +253,8 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_TI, MII_MODEL_TI_TNETE2101, MII_STR_TI_TNETE2101 },
{ MII_OUI_xxTSC, MII_MODEL_xxTSC_78Q2120, MII_STR_xxTSC_78Q2120 },
{ MII_OUI_xxTSC, MII_MODEL_xxTSC_78Q2121, MII_STR_xxTSC_78Q2121 },
- { MII_OUI_VIA, MII_MODEL_VIA_VT6103, MII_STR_VIA_VT6103 },
- { MII_OUI_VIA, MII_MODEL_VIA_VT6103_2, MII_STR_VIA_VT6103_2 },
+ { MII_OUI_xxVIA, MII_MODEL_xxVIA_VT6103, MII_STR_xxVIA_VT6103 },
+ { MII_OUI_xxVIA, MII_MODEL_xxVIA_VT6103_2, MII_STR_xxVIA_VT6103_2 },
{ MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8601, MII_STR_xxVITESSE_VSC8601 },
{ MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8641, MII_STR_xxVITESSE_VSC8641 },
{ MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8501, MII_STR_xxVITESSE_VSC8501 },
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Thu Feb 27 06:17:28 UTC 2020 Modified Files: src/sys/dev/mii: miidevs Log Message: Use xxVIA instead of VIA. 0x004063 is VIA's official OUI but VT6103 use 0x0002c6. 0x0002c6 is non-bitreversed value of 0x004063. Reported by Andrius V. To generate a diff of this commit: cvs rdiff -u -r1.163 -r1.164 src/sys/dev/mii/miidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.163 src/sys/dev/mii/miidevs:1.164 --- src/sys/dev/mii/miidevs:1.163 Sat Feb 22 18:56:57 2020 +++ src/sys/dev/mii/miidevs Thu Feb 27 06:17:28 2020 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.163 2020/02/22 18:56:57 jmcneill Exp $ +$NetBSD: miidevs,v 1.164 2020/02/27 06:17:28 msaitoh Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -70,7 +70,6 @@ oui RALINK2 0x0017a5 Ralink Technology oui AQUANTIA 0x0017b6 Aquantia Corporation oui BROADCOM3 0x001be9 Broadcom Corporation oui LEVEL1 0x00207b Level 1 -oui VIA0x004063 VIA Technologies oui MARVELL 0x005043 Marvell Semiconductor oui QUALSEMI 0x006051 Quality Semiconductor oui AMLOGIC 0x006051 Amlogic @@ -96,6 +95,7 @@ oui RENESAS 0x749050 Renesas /* Unregistered or wrong OUI */ oui yyREALTEK 0x04 Realtek oui yyAMD 0x58 Advanced Micro Devices +oui xxVIA 0x0002c6 VIA Technologies oui xxMYSON 0x00032d Myson Technology oui xxTSC 0x00039c TDK Semiconductor oui xxASIX 0x000674 Asix Semiconductor @@ -399,8 +399,8 @@ model xxTSC 78Q2120 0x0014 78Q2120 10/1 model xxTSC 78Q2121 0x0015 78Q2121 100BASE-TX media interface /* VIA Technologies PHYs */ -model VIA VT6103 0x0032 VT6103 10/100 PHY -model VIA VT6103_2 0x0034 VT6103 10/100 PHY +model xxVIA VT6103 0x0032 VT6103 10/100 PHY +model xxVIA VT6103_2 0x0034 VT6103 10/100 PHY /* Vitesse PHYs (Now Microsemi) */ model xxVITESSE VSC8601 0x0002 VSC8601 10/100/1000 PHY
CVS commit: src/lib/libpam/modules/pam_ssh
Module Name:src
Committed By: christos
Date: Thu Feb 27 03:25:09 UTC 2020
Modified Files:
src/lib/libpam/modules/pam_ssh: pam_ssh.c
Log Message:
This takes a provider now
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/lib/libpam/modules/pam_ssh/pam_ssh.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/modules/pam_ssh/pam_ssh.c
diff -u src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.27 src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.28
--- src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.27 Sat Jun 1 03:15:39 2019
+++ src/lib/libpam/modules/pam_ssh/pam_ssh.c Wed Feb 26 22:25:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_ssh.c,v 1.27 2019/06/01 07:15:39 mlelstv Exp $ */
+/* $NetBSD: pam_ssh.c,v 1.28 2020/02/27 03:25:08 christos Exp $ */
/*-
* Copyright (c) 2003 Networks Associates Technology, Inc.
@@ -38,7 +38,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.c,v 1.40 2004/02/10 10:13:21 des Exp $");
#else
-__RCSID("$NetBSD: pam_ssh.c,v 1.27 2019/06/01 07:15:39 mlelstv Exp $");
+__RCSID("$NetBSD: pam_ssh.c,v 1.28 2020/02/27 03:25:08 christos Exp $");
#endif
#include
@@ -68,7 +68,7 @@ __RCSID("$NetBSD: pam_ssh.c,v 1.27 2019/
#include "authfile.h"
#define ssh_add_identity(auth, key, comment) \
- ssh_add_identity_constrained(auth, key, comment, 0, 0, 0)
+ ssh_add_identity_constrained(auth, key, comment, 0, 0, 0, "pam")
extern char **environ;
CVS commit: src/lib/libpam/modules
Module Name:src
Committed By: christos
Date: Thu Feb 27 02:56:46 UTC 2020
Modified Files:
src/lib/libpam/modules: mod.mk
Log Message:
one more level down
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libpam/modules/mod.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/modules/mod.mk
diff -u src/lib/libpam/modules/mod.mk:1.14 src/lib/libpam/modules/mod.mk:1.15
--- src/lib/libpam/modules/mod.mk:1.14 Wed Feb 26 19:02:56 2020
+++ src/lib/libpam/modules/mod.mk Wed Feb 26 21:56:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mod.mk,v 1.14 2020/02/27 00:02:56 mrg Exp $
+# $NetBSD: mod.mk,v 1.15 2020/02/27 02:56:46 christos Exp $
NOLINT= # don't build a lint library
NOPROFILE= # don't build a profile library
@@ -16,7 +16,7 @@ LIBDIR=/usr/lib/security
WARNS=6
.if ${MKPIC} != "no"
-LIBDPLIBS+= pam ${NETBSDSRCDIR}/lib/libpam
+LIBDPLIBS+= pam ${NETBSDSRCDIR}/lib/libpam/libpam
.PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
.else
CVS commit: src/doc
Module Name:src Committed By: christos Date: Thu Feb 27 00:29:17 UTC 2020 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new openssh To generate a diff of this commit: cvs rdiff -u -r1.1693 -r1.1694 src/doc/3RDPARTY cvs rdiff -u -r1.2652 -r1.2653 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1693 src/doc/3RDPARTY:1.1694 --- src/doc/3RDPARTY:1.1693 Sun Feb 23 18:32:57 2020 +++ src/doc/3RDPARTY Wed Feb 26 19:29:17 2020 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1693 2020/02/23 23:32:57 sevan Exp $ +# $NetBSD: 3RDPARTY,v 1.1694 2020/02/27 00:29:17 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1044,12 +1044,12 @@ Notes: Patch applied after OpenSSH import. Package: OpenSSH -Version: 8.1 -Current Vers: 8.1 / portable 8.1p1 +Version: 8.2 +Current Vers: 8.2 / portable 8.2p1 Maintainer: OpenSSH Archive Site: http://www.openssh.com/ftp.html Home Page: http://www.openssh.com/portable.html -Date: 2019-10-09 +Date: 2020-02-26 Mailing List: openssh-unix-annou...@mindrot.org Responsible: thorpej, christos, elric License: BSD. See src/crypto/external/bsd/openssh/dist/LICENSE Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2652 src/doc/CHANGES:1.2653 --- src/doc/CHANGES:1.2652 Sat Feb 22 21:37:53 2020 +++ src/doc/CHANGES Wed Feb 26 19:29:17 2020 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2652 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2653 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -146,3 +146,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: awk(1): Import 20200218 [christos 20200218] genet(4): Add support for Broadcom GENETv5 ethernet controllers, found in the Raspberry Pi 4. [jmcneill 20200222] + OpenSSH: Import 8.2. [christos 20200226]
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: christos Date: Thu Feb 27 00:27:44 UTC 2020 Modified Files: src/crypto/external/bsd/openssh/dist: version.h Log Message: fix date To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/crypto/external/bsd/openssh/dist/version.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssh/dist/version.h diff -u src/crypto/external/bsd/openssh/dist/version.h:1.30 src/crypto/external/bsd/openssh/dist/version.h:1.31 --- src/crypto/external/bsd/openssh/dist/version.h:1.30 Wed Feb 26 19:24:40 2020 +++ src/crypto/external/bsd/openssh/dist/version.h Wed Feb 26 19:27:44 2020 @@ -1,8 +1,8 @@ -/* $NetBSD: version.h,v 1.30 2020/02/27 00:24:40 christos Exp $ */ +/* $NetBSD: version.h,v 1.31 2020/02/27 00:27:44 christos Exp $ */ /* $OpenBSD: version.h,v 1.86 2020/02/14 00:39:20 djm Exp $ */ #define __OPENSSH_VERSION "OpenSSH_8.2" -#define __NETBSDSSH_VERSION "NetBSD_Secure_Shell-2020025" +#define __NETBSDSSH_VERSION "NetBSD_Secure_Shell-20200225" #define SSH_HPN "-hpn13v14" #define SSH_LPK "-lpk" /*
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Thu Feb 27 00:25:49 UTC 2020 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: new openssh To generate a diff of this commit: cvs rdiff -u -r1.876 -r1.877 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.235 -r1.236 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.876 src/distrib/sets/lists/base/shl.mi:1.877 --- src/distrib/sets/lists/base/shl.mi:1.876 Sat Oct 12 14:34:14 2019 +++ src/distrib/sets/lists/base/shl.mi Wed Feb 26 19:25:49 2020 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.876 2019/10/12 18:34:14 christos Exp $ +# $NetBSD: shl.mi,v 1.877 2020/02/27 00:25:49 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -851,8 +851,8 @@ ./usr/lib/libsqlite3.so.1.4 base-sys-shlib compatfile ./usr/lib/libss.sobase-obsolete obsolete ./usr/lib/libssh.sobase-secsh-shlib compatfile -./usr/lib/libssh.so.35base-secsh-shlib compatfile -./usr/lib/libssh.so.35.0 base-secsh-shlib compatfile +./usr/lib/libssh.so.36base-secsh-shlib compatfile +./usr/lib/libssh.so.36.0 base-secsh-shlib compatfile ./usr/lib/libssl.sobase-crypto-shlib compatfile ./usr/lib/libssl.so.12base-crypto-shlib compatfile,openssl=10 ./usr/lib/libssl.so.12.0 base-crypto-shlib compatfile,openssl=10 Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.235 src/distrib/sets/lists/debug/shl.mi:1.236 --- src/distrib/sets/lists/debug/shl.mi:1.235 Sat Oct 12 14:34:14 2019 +++ src/distrib/sets/lists/debug/shl.mi Wed Feb 26 19:25:49 2020 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.235 2019/10/12 18:34:14 christos Exp $ +# $NetBSD: shl.mi,v 1.236 2020/02/27 00:25:49 christos Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs @@ -291,7 +291,7 @@ ./usr/libdata/debug/usr/lib/libskey.so.2.0.debug comp-sys-debug debug,compatfile,skey ./usr/libdata/debug/usr/lib/libsl.so.6.0.debug comp-krb5-debug debug,compatfile,kerberos ./usr/libdata/debug/usr/lib/libsqlite3.so.1.4.debug comp-sys-debug debug,compatfile -./usr/libdata/debug/usr/lib/libssh.so.35.0.debug comp-secsh-debug debug,compatfile +./usr/libdata/debug/usr/lib/libssh.so.36.0.debug comp-secsh-debug debug,compatfile ./usr/libdata/debug/usr/lib/libssl.so.12.0.debug comp-crypto-debug debug,compatfile,openssl=10 ./usr/libdata/debug/usr/lib/libssl.so.14.0.debug comp-crypto-debug debug,compatfile,openssl=11 ./usr/libdata/debug/usr/lib/libstdc++.so.9.0.debug comp-sys-debug debug,compatfile,gcc=7,cxx,libstdcxx
CVS commit: src/crypto/external/bsd/openssh
Module Name:src Committed By: christos Date: Thu Feb 27 00:24:41 UTC 2020 Modified Files: src/crypto/external/bsd/openssh: Makefile src/crypto/external/bsd/openssh/bin/scp: Makefile src/crypto/external/bsd/openssh/bin/sftp: Makefile src/crypto/external/bsd/openssh/bin/sftp-server: Makefile src/crypto/external/bsd/openssh/bin/ssh: Makefile src/crypto/external/bsd/openssh/bin/ssh-add: Makefile src/crypto/external/bsd/openssh/bin/ssh-agent: Makefile src/crypto/external/bsd/openssh/bin/ssh-keygen: Makefile src/crypto/external/bsd/openssh/bin/ssh-keyscan: Makefile src/crypto/external/bsd/openssh/bin/ssh-keysign: Makefile src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper: Makefile src/crypto/external/bsd/openssh/bin/sshd: Makefile src/crypto/external/bsd/openssh/dist: PROTOCOL.certkeys auth-options.c auth-options.h auth.c auth2-chall.c auth2-gss.c auth2-hostbased.c auth2-kbdint.c auth2-pubkey.c authfd.c authfd.h authfile.c authfile.h channels.c channels.h cipher.c cipher.h clientloop.c gss-serv.c hash.c hostfile.c kex.c kexgen.c kexgexc.c krl.c match.c misc.c misc.h moduli.c monitor.c monitor_wrap.c monitor_wrap.h msg.c mux.c myproposal.h packet.c pathnames.h progressmeter.c readconf.c readconf.h readpass.c scp.1 scp.c servconf.c servconf.h serverloop.c session.c sftp-glob.c sftp-realpath.c sftp-server.8 sftp.1 sftp.c sk-usbhid.c ssh-add.1 ssh-add.c ssh-agent.1 ssh-agent.c ssh-ecdsa-sk.c ssh-ed25519-sk.c ssh-keygen.1 ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8 ssh-keysign.c ssh-pkcs11-client.c ssh-pkcs11-helper.8 ssh-pkcs11-helper.c ssh-pkcs11.c ssh-pkcs11.h ssh-sk-client.c ssh-sk-helper.c ssh-sk.c ssh.1 ssh.c ssh_api.c ssh_config.5 sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-io.c sshbuf-misc.c sshbuf.c sshbuf.h sshconnect.c sshconnect.h sshconnect2.c sshd.8 sshd.c sshd_config.5 ssherr.c ssherr.h sshkey-xmss.c sshkey.c sshkey.h sshsig.c umac.c version.h xmalloc.c xmalloc.h src/crypto/external/bsd/openssh/dist/moduli-gen: moduli.2048 moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192 src/crypto/external/bsd/openssh/lib: Makefile shlib_version Added Files: src/crypto/external/bsd/openssh/libexec: Makefile Makefile.inc src/crypto/external/bsd/openssh/libexec/ssh-sk-helper: Makefile Log Message: Merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/Makefile cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/bin/scp/Makefile cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/bin/sftp/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssh/bin/sftp-server/Makefile cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/bin/ssh/Makefile cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/bin/ssh-add/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssh/bin/ssh-keysign/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/bin/sshd/Makefile cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys \ src/crypto/external/bsd/openssh/dist/auth2-kbdint.c \ src/crypto/external/bsd/openssh/dist/sftp-glob.c \ src/crypto/external/bsd/openssh/dist/sftp-server.8 \ src/crypto/external/bsd/openssh/dist/xmalloc.c \ src/crypto/external/bsd/openssh/dist/xmalloc.h cvs rdiff -u -r1.21 -r1.22 \ src/crypto/external/bsd/openssh/dist/auth-options.c \ src/crypto/external/bsd/openssh/dist/misc.c \ src/crypto/external/bsd/openssh/dist/sshd.8 \ src/crypto/external/bsd/openssh/dist/sshkey.c cvs rdiff -u -r1.12 -r1.13 \ src/crypto/external/bsd/openssh/dist/auth-options.h \ src/crypto/external/bsd/openssh/dist/match.c \ src/crypto/external/bsd/openssh/dist/progressmeter.c \ src/crypto/external/bsd/openssh/dist/ssh-keysign.8 \ src/crypto/external/bsd/openssh/dist/sshbuf.h cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/auth.c \ src/crypto/external/bsd/openssh/dist/monitor_wrap.c \ src/crypto/external/bsd/openssh/dist/serverloop.c cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/auth2-chall.c \ src/crypto/external/bsd/openssh/dist/channels.h \ src/crypto/external/bsd/openssh/dist/cipher.c cvs rdiff -u -r1.13 -r1.14
CVS import: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: christos
Date: Thu Feb 27 00:21:40 UTC 2020
Update of /cvsroot/src/crypto/external/bsd/openssh/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv13112
Log Message:
OpenSSH 8.2/8.2p1 (2020-02-14)
OpenSSH 8.2 was released on 2020-02-14. It is available from the
mirrors listed at https://www.openssh.com/.
OpenSSH is a 100% complete SSH protocol 2.0 implementation and
includes sftp client and server support.
Once again, we would like to thank the OpenSSH community for their
continued support of the project, especially those who contributed
code or patches, reported bugs, tested snapshots or donated to the
project. More information on donations may be found at:
https://www.openssh.com/donations.html
Future deprecation notice
=
It is now possible[1] to perform chosen-prefix attacks against the
SHA-1 hash algorithm for less than USD$50K. For this reason, we will
be disabling the "ssh-rsa" public key signature algorithm that depends
on SHA-1 by default in a near-future release.
This algorithm is unfortunately still used widely despite the
existence of better alternatives, being the only remaining public key
signature algorithm specified by the original SSH RFCs.
The better alternatives include:
* The RFC8332 RSA SHA-2 signature algorithms rsa-sha2-256/512. These
algorithms have the advantage of using the same key type as
"ssh-rsa" but use the safe SHA-2 hash algorithms. These have been
supported since OpenSSH 7.2 and are already used by default if the
client and server support them.
* The ssh-ed25519 signature algorithm. It has been supported in
OpenSSH since release 6.5.
* The RFC5656 ECDSA algorithms: ecdsa-sha2-nistp256/384/521. These
have been supported by OpenSSH since release 5.7.
To check whether a server is using the weak ssh-rsa public key
algorithm for host authentication, try to connect to it after
removing the ssh-rsa algorithm from ssh(1)'s allowed list:
ssh -oHostKeyAlgorithms=-ssh-rsa user@host
If the host key verification fails and no other supported host key
types are available, the server software on that host should be
upgraded.
A future release of OpenSSH will enable UpdateHostKeys by default
to allow the client to automatically migrate to better algorithms.
Users may consider enabling this option manually.
[1] "SHA-1 is a Shambles: First Chosen-Prefix Collision on SHA-1 and
Application to the PGP Web of Trust" Leurent, G and Peyrin, T
(2020) https://eprint.iacr.org/2020/014.pdf
Security
* ssh(1), sshd(8), ssh-keygen(1): this release removes the "ssh-rsa"
(RSA/SHA1) algorithm from those accepted for certificate signatures
(i.e. the client and server CASignatureAlgorithms option) and will
use the rsa-sha2-512 signature algorithm by default when the
ssh-keygen(1) CA signs new certificates.
Certificates are at special risk to the aforementioned SHA1
collision vulnerability as an attacker has effectively unlimited
time in which to craft a collision that yields them a valid
certificate, far more than the relatively brief LoginGraceTime
window that they have to forge a host key signature.
The OpenSSH certificate format includes a CA-specified (typically
random) nonce value near the start of the certificate that should
make exploitation of chosen-prefix collisions in this context
challenging, as the attacker does not have full control over the
prefix that actually gets signed. Nonetheless, SHA1 is now a
demonstrably broken algorithm and futher improvements in attacks
are highly likely.
OpenSSH releases prior to 7.2 do not support the newer RSA/SHA2
algorithms and will refuse to accept certificates signed by an
OpenSSH 8.2+ CA using RSA keys unless the unsafe algorithm is
explicitly selected during signing ("ssh-keygen -t ssh-rsa").
Older clients/servers may use another CA key type such as
ssh-ed25519 (supported since OpenSSH 6.5) or one of the
ecdsa-sha2-nistp256/384/521 types (supported since OpenSSH 5.7)
instead if they cannot be upgraded.
Potentially-incompatible changes
This release includes a number of changes that may affect existing
configurations:
* ssh(1), sshd(8): the above removal of "ssh-rsa" from the accepted
CASignatureAlgorithms list.
* ssh(1), sshd(8): this release removes diffie-hellman-group14-sha1
from the default key exchange proposal for both the client and
server.
* ssh-keygen(1): the command-line options related to the generation
and screening of safe prime numbers used by the
diffie-hellman-group-exchange-* key exchange algorithms have
changed. Most options have been folded under the -O flag.
* sshd(8): the sshd listener process title visible to ps(1) has
changed to include information about the number of connections that
are currently attempting authentication and the limits configured
by MaxStartups.
*
CVS commit: src/lib/libpam/modules
Module Name:src
Committed By: mrg
Date: Thu Feb 27 00:02:57 UTC 2020
Modified Files:
src/lib/libpam/modules: mod.mk
Log Message:
probably fix previous: it wants mod.mk's PARSEDIR/.., not ../..,
so it picks up the libpam/Makefile.inc.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libpam/modules/mod.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/modules/mod.mk
diff -u src/lib/libpam/modules/mod.mk:1.13 src/lib/libpam/modules/mod.mk:1.14
--- src/lib/libpam/modules/mod.mk:1.13 Wed Feb 26 19:33:30 2020
+++ src/lib/libpam/modules/mod.mk Thu Feb 27 00:02:56 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mod.mk,v 1.13 2020/02/26 19:33:30 christos Exp $
+# $NetBSD: mod.mk,v 1.14 2020/02/27 00:02:56 mrg Exp $
NOLINT= # don't build a lint library
NOPROFILE= # don't build a profile library
@@ -6,7 +6,7 @@ NOPICINSTALL= # don't install _pic.a lib
.include
-.include "${.PARSEDIR}/../../Makefile.inc"
+.include "${.PARSEDIR}/../Makefile.inc"
.if defined(MLIBDIR)
LIBDIR=/usr/lib/${MLIBDIR}/security
CVS commit: src/share/misc
Module Name:src Committed By: sevan Date: Wed Feb 26 23:38:09 UTC 2020 Modified Files: src/share/misc: acronyms.comp Log Message: SSTP To generate a diff of this commit: cvs rdiff -u -r1.298 -r1.299 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.298 src/share/misc/acronyms.comp:1.299 --- src/share/misc/acronyms.comp:1.298 Sat Feb 8 00:47:57 2020 +++ src/share/misc/acronyms.comp Wed Feb 26 23:38:08 2020 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.298 2020/02/08 00:47:57 sevan Exp $ +$NetBSD: acronyms.comp,v 1.299 2020/02/26 23:38:08 sevan Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -1531,6 +1531,7 @@ SSFDC solid state floppy disc card SSH secure shell SSI server side includes SSID service set identifier +SSTP secure socket tunneling protocol SSL secure sockets layer SSP stack smashing protection STC software thermal control
CVS commit: src/lib/libpam/modules
Module Name:src
Committed By: christos
Date: Wed Feb 26 19:33:30 UTC 2020
Modified Files:
src/lib/libpam/modules: mod.mk
Log Message:
Handle pam modules that are not in this subtree.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libpam/modules/mod.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/modules/mod.mk
diff -u src/lib/libpam/modules/mod.mk:1.12 src/lib/libpam/modules/mod.mk:1.13
--- src/lib/libpam/modules/mod.mk:1.12 Sat Dec 28 13:04:18 2013
+++ src/lib/libpam/modules/mod.mk Wed Feb 26 14:33:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mod.mk,v 1.12 2013/12/28 18:04:18 christos Exp $
+# $NetBSD: mod.mk,v 1.13 2020/02/26 19:33:30 christos Exp $
NOLINT= # don't build a lint library
NOPROFILE= # don't build a profile library
@@ -6,7 +6,7 @@ NOPICINSTALL= # don't install _pic.a lib
.include
-.include "${.CURDIR}/../../Makefile.inc"
+.include "${.PARSEDIR}/../../Makefile.inc"
.if defined(MLIBDIR)
LIBDIR=/usr/lib/${MLIBDIR}/security
@@ -16,7 +16,7 @@ LIBDIR=/usr/lib/security
WARNS=6
.if ${MKPIC} != "no"
-LIBDPLIBS+= pam ${.CURDIR}/../../libpam
+LIBDPLIBS+= pam ${NETBSDSRCDIR}/lib/libpam
.PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
.else
CVS commit: src/share/man/man7
Module Name:src Committed By: uwe Date: Wed Feb 26 18:39:24 UTC 2020 Modified Files: src/share/man/man7: users.7 Log Message: Make .Bl -width match the actual .It usage. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man7/users.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/users.7 diff -u src/share/man/man7/users.7:1.2 src/share/man/man7/users.7:1.3 --- src/share/man/man7/users.7:1.2 Wed Feb 26 10:04:32 2020 +++ src/share/man/man7/users.7 Wed Feb 26 18:39:24 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: users.7,v 1.2 2020/02/26 10:04:32 wiz Exp $ +.\" $NetBSD: users.7,v 1.3 2020/02/26 18:39:24 uwe Exp $ .\" .\" Copyright (c) 2020 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -38,7 +38,7 @@ A standard installation has the following user account names: .\" These are currently sorted by uid; perhaps they should be sorted .\" lexicographically by name instead. -.Bl -tag -width "_tcpdump" +.Bl -tag -width ".Em _tcpdump" .It Em root The super-user, uid 0, with the highest administrative privileges. Normally not used for login directly, only via
CVS commit: src/share/man/man7
Module Name:src Committed By: uwe Date: Wed Feb 26 18:32:57 UTC 2020 Modified Files: src/share/man/man7: groups.7 Log Message: Minor formatting tweaks. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man7/groups.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/groups.7 diff -u src/share/man/man7/groups.7:1.4 src/share/man/man7/groups.7:1.5 --- src/share/man/man7/groups.7:1.4 Wed Feb 26 18:25:39 2020 +++ src/share/man/man7/groups.7 Wed Feb 26 18:32:57 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: groups.7,v 1.4 2020/02/26 18:25:39 uwe Exp $ +.\" $NetBSD: groups.7,v 1.5 2020/02/26 18:32:57 uwe Exp $ .\" .\" Copyright (c) 2020 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -38,13 +38,13 @@ A standard installation has the following user group names: .\" These are currently sorted by gid; perhaps they should be sorted .\" lexicographically by name instead. -.Bl -tag -width "_tcpdump" +.Bl -tag -width ".Em _tcpdump" .It Em wheel Users authorized to elevate themselves to the super-user privileges of -the root user, meaning uid 0. +the root user, meaning uid\~0. Normally the .Em wheel -group has gid 0. +group has gid\~0. .Pp Users who are not in the group .Em wheel @@ -307,8 +307,7 @@ file. Some administrators may instead prefer to assign to each user a unique group with the same name as the user by passing the .So -.Fl g -.Ar "=uid" +.Fl g Cm "=uid" .Sc option to .Xr useradd 8 .
CVS commit: src/share/man/man7
Module Name:src Committed By: uwe Date: Wed Feb 26 18:25:39 UTC 2020 Modified Files: src/share/man/man7: groups.7 Log Message: Fix unedited pasto. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man7/groups.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/groups.7 diff -u src/share/man/man7/groups.7:1.3 src/share/man/man7/groups.7:1.4 --- src/share/man/man7/groups.7:1.3 Wed Feb 26 10:06:08 2020 +++ src/share/man/man7/groups.7 Wed Feb 26 18:25:39 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: groups.7,v 1.3 2020/02/26 10:06:08 wiz Exp $ +.\" $NetBSD: groups.7,v 1.4 2020/02/26 18:25:39 uwe Exp $ .\" .\" Copyright (c) 2020 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -161,7 +161,7 @@ pseudo-user used by the DNS nameserver daemon. .It Em ntpd Primary group for the -.Em named +.Em ntpd pseudo-user used by the .Xr ntpd 8 network time protocol daemon.
CVS commit: src/sys/ufs/ufs
Module Name:src Committed By: maxv Date: Wed Feb 26 18:00:12 UTC 2020 Modified Files: src/sys/ufs/ufs: ufs_vnops.c Log Message: Zero out the padding in 'd_namlen', to prevent info leaks. Same logic as ufs_makedirentry(). Found by kMSan: the unzeroed bytes of the pool_cache were getting copied to the disk via a DMA write operation, and there kMSan was noticing uninitialized memory leaving the system. Reported-by: syzbot+382c9dffc06a9683a...@syzkaller.appspotmail.com To generate a diff of this commit: cvs rdiff -u -r1.248 -r1.249 src/sys/ufs/ufs/ufs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/ufs/ufs/ufs_vnops.c diff -u src/sys/ufs/ufs/ufs_vnops.c:1.248 src/sys/ufs/ufs/ufs_vnops.c:1.249 --- src/sys/ufs/ufs/ufs_vnops.c:1.248 Wed Sep 18 17:59:15 2019 +++ src/sys/ufs/ufs/ufs_vnops.c Wed Feb 26 18:00:12 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_vnops.c,v 1.248 2019/09/18 17:59:15 christos Exp $ */ +/* $NetBSD: ufs_vnops.c,v 1.249 2020/02/26 18:00:12 maxv Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.248 2019/09/18 17:59:15 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.249 2020/02/26 18:00:12 maxv Exp $"); #if defined(_KERNEL_OPT) #include "opt_ffs.h" @@ -873,7 +873,11 @@ ufs_whiteout(void *v) newdir->d_namlen = cnp->cn_namelen; memcpy(newdir->d_name, cnp->cn_nameptr, (size_t)cnp->cn_namelen); - newdir->d_name[cnp->cn_namelen] = '\0'; + + /* NUL terminate and zero out padding */ + memset(>d_name[cnp->cn_namelen], 0, + UFS_NAMEPAD(cnp->cn_namelen)); + newdir->d_type = DT_WHT; error = ufs_direnter(dvp, ulr, NULL, newdir, cnp, NULL); pool_cache_put(ufs_direct_cache, newdir);
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: kamil Date: Wed Feb 26 16:12:44 UTC 2020 Modified Files: src/distrib/sets/lists/man: mi Log Message: Register groups.0 and users.0 in distribution sets Fixes MKCATPAGES=yes build. To generate a diff of this commit: cvs rdiff -u -r1.1681 -r1.1682 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1681 src/distrib/sets/lists/man/mi:1.1682 --- src/distrib/sets/lists/man/mi:1.1681 Wed Feb 26 07:31:51 2020 +++ src/distrib/sets/lists/man/mi Wed Feb 26 16:12:44 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1681 2020/02/26 07:31:51 riastradh Exp $ +# $NetBSD: mi,v 1.1682 2020/02/26 16:12:44 kamil Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2315,6 +2315,7 @@ ./usr/share/man/cat7/des_modes.0 man-reference-catman .cat ./usr/share/man/cat7/editline.0 man-sys-catman .cat ./usr/share/man/cat7/environ.0 man-reference-catman .cat +./usr/share/man/cat7/groups.0 man-reference-catman .cat ./usr/share/man/cat7/glob.0 man-reference-catman .cat ./usr/share/man/cat7/hier.0 man-reference-catman .cat ./usr/share/man/cat7/hostname.0 man-reference-catman .cat @@ -2353,6 +2354,7 @@ ./usr/share/man/cat7/symlink.0 man-reference-catman .cat ./usr/share/man/cat7/sysctl.0 man-reference-catman .cat ./usr/share/man/cat7/tests.0 man-reference-catman .cat +./usr/share/man/cat7/users.0 man-reference-catman .cat ./usr/share/man/cat7/zpool-features.0 man-zfs-catman zfs,.cat ./usr/share/man/cat8/MAKEDEV.0 man-sysutil-catman .cat ./usr/share/man/cat8/MAKEDEV.local.0 man-sysutil-catman .cat
CVS commit: src/distrib
Module Name:src Committed By: riastradh Date: Wed Feb 26 16:00:48 UTC 2020 Modified Files: src/distrib/amd64/cdroms: etc.rc src/distrib/amd64/installimage: etc.rc src/distrib/amd64/uefi-installimage: etc.rc src/distrib/i386/cdroms: etc.rc src/distrib/i386/installimage: etc.rc src/distrib/sparc64/cdroms/installcd: etc.rc src/distrib/sparc64/instfs: dot.profile src/distrib/vax/cdroms/installcd: etc.rc Log Message: kernfs no longer needs a hacky workaround to make rootdev appear. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/cdroms/etc.rc cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/installimage/etc.rc cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/uefi-installimage/etc.rc cvs rdiff -u -r1.2 -r1.3 src/distrib/i386/cdroms/etc.rc cvs rdiff -u -r1.1 -r1.2 src/distrib/i386/installimage/etc.rc cvs rdiff -u -r1.2 -r1.3 src/distrib/sparc64/cdroms/installcd/etc.rc cvs rdiff -u -r1.8 -r1.9 src/distrib/sparc64/instfs/dot.profile cvs rdiff -u -r1.3 -r1.4 src/distrib/vax/cdroms/installcd/etc.rc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/amd64/cdroms/etc.rc diff -u src/distrib/amd64/cdroms/etc.rc:1.2 src/distrib/amd64/cdroms/etc.rc:1.3 --- src/distrib/amd64/cdroms/etc.rc:1.2 Mon May 19 15:57:04 2014 +++ src/distrib/amd64/cdroms/etc.rc Wed Feb 26 16:00:48 2020 @@ -1,4 +1,4 @@ -# $NetBSD: etc.rc,v 1.2 2014/05/19 15:57:04 martin Exp $ +# $NetBSD: etc.rc,v 1.3 2020/02/26 16:00:48 riastradh Exp $ # # Copyright (c) 1997 Perry E. Metzger # Copyright (c) 1994 Christopher G. Demetriou @@ -36,9 +36,6 @@ PATH=/sbin:/bin:/usr/bin:/usr/sbin:/ export PATH -# hack to get around bugs in kernfs's rootdev/rrootdev lookup. -ls -l /dev/* > /dev/null 2>&1 - # mount a few tempfs to allow modifications over the CD contents mount -t tmpfs tmpfs /tmp mount -t tmpfs tmpfs /var Index: src/distrib/amd64/installimage/etc.rc diff -u src/distrib/amd64/installimage/etc.rc:1.1 src/distrib/amd64/installimage/etc.rc:1.2 --- src/distrib/amd64/installimage/etc.rc:1.1 Sun Jan 22 03:53:29 2012 +++ src/distrib/amd64/installimage/etc.rc Wed Feb 26 16:00:48 2020 @@ -1,4 +1,4 @@ -# $NetBSD: etc.rc,v 1.1 2012/01/22 03:53:29 tsutsui Exp $ +# $NetBSD: etc.rc,v 1.2 2020/02/26 16:00:48 riastradh Exp $ # # Copyright (c) 1997 Perry E. Metzger # Copyright (c) 1994 Christopher G. Demetriou @@ -36,9 +36,6 @@ PATH=/sbin:/bin:/usr/bin:/usr/sbin:/ export PATH -# hack to get around bugs in kernfs's rootdev/rrootdev lookup. -ls -l /dev/* > /dev/null 2>&1 - mount -u / mount -t tmpfs tmpfs /tmp Index: src/distrib/amd64/uefi-installimage/etc.rc diff -u src/distrib/amd64/uefi-installimage/etc.rc:1.1 src/distrib/amd64/uefi-installimage/etc.rc:1.2 --- src/distrib/amd64/uefi-installimage/etc.rc:1.1 Tue Jan 24 11:16:50 2017 +++ src/distrib/amd64/uefi-installimage/etc.rc Wed Feb 26 16:00:48 2020 @@ -1,4 +1,4 @@ -# $NetBSD: etc.rc,v 1.1 2017/01/24 11:16:50 nonaka Exp $ +# $NetBSD: etc.rc,v 1.2 2020/02/26 16:00:48 riastradh Exp $ # # Copyright (c) 1997 Perry E. Metzger # Copyright (c) 1994 Christopher G. Demetriou @@ -36,9 +36,6 @@ PATH=/sbin:/bin:/usr/bin:/usr/sbin:/ export PATH -# hack to get around bugs in kernfs's rootdev/rrootdev lookup. -ls -l /dev/* > /dev/null 2>&1 - mount -u / mount -t tmpfs tmpfs /tmp Index: src/distrib/i386/cdroms/etc.rc diff -u src/distrib/i386/cdroms/etc.rc:1.2 src/distrib/i386/cdroms/etc.rc:1.3 --- src/distrib/i386/cdroms/etc.rc:1.2 Mon May 19 15:57:05 2014 +++ src/distrib/i386/cdroms/etc.rc Wed Feb 26 16:00:48 2020 @@ -1,4 +1,4 @@ -# $NetBSD: etc.rc,v 1.2 2014/05/19 15:57:05 martin Exp $ +# $NetBSD: etc.rc,v 1.3 2020/02/26 16:00:48 riastradh Exp $ # # Copyright (c) 1997 Perry E. Metzger # Copyright (c) 1994 Christopher G. Demetriou @@ -36,9 +36,6 @@ PATH=/sbin:/bin:/usr/bin:/usr/sbin:/ export PATH -# hack to get around bugs in kernfs's rootdev/rrootdev lookup. -ls -l /dev/* > /dev/null 2>&1 - # mount a few tempfs to allow modifications over the CD contents mount -t tmpfs tmpfs /tmp mount -t tmpfs tmpfs /var Index: src/distrib/i386/installimage/etc.rc diff -u src/distrib/i386/installimage/etc.rc:1.1 src/distrib/i386/installimage/etc.rc:1.2 --- src/distrib/i386/installimage/etc.rc:1.1 Sun Jan 22 03:53:30 2012 +++ src/distrib/i386/installimage/etc.rc Wed Feb 26 16:00:48 2020 @@ -1,4 +1,4 @@ -# $NetBSD: etc.rc,v 1.1 2012/01/22 03:53:30 tsutsui Exp $ +# $NetBSD: etc.rc,v 1.2 2020/02/26 16:00:48 riastradh Exp $ # # Copyright (c) 1997 Perry E. Metzger # Copyright (c) 1994 Christopher G. Demetriou @@ -36,9 +36,6 @@ PATH=/sbin:/bin:/usr/bin:/usr/sbin:/ export PATH -# hack to get around bugs in kernfs's rootdev/rrootdev lookup. -ls -l /dev/* > /dev/null 2>&1 - mount -u / mount -t tmpfs tmpfs /tmp Index: src/distrib/sparc64/cdroms/installcd/etc.rc diff -u
CVS commit: src/libexec/getty
Module Name:src
Committed By: riastradh
Date: Wed Feb 26 15:44:57 UTC 2020
Modified Files:
src/libexec/getty: getty.8 main.c
Log Message:
uugetty is no more
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/libexec/getty/getty.8
cvs rdiff -u -r1.66 -r1.67 src/libexec/getty/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/getty/getty.8
diff -u src/libexec/getty/getty.8:1.18 src/libexec/getty/getty.8:1.19
--- src/libexec/getty/getty.8:1.18 Wed May 29 15:02:12 2013
+++ src/libexec/getty/getty.8 Wed Feb 26 15:44:57 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: getty.8,v 1.18 2013/05/29 15:02:12 wiz Exp $
+.\" $NetBSD: getty.8,v 1.19 2020/02/26 15:44:57 riastradh Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -33,8 +33,7 @@
.Dt GETTY 8
.Os
.Sh NAME
-.Nm getty ,
-.Nm uugetty
+.Nm getty
.Nd set terminal modes for system access
.Sh SYNOPSIS
.Nm
@@ -42,11 +41,6 @@
.Ar type
.Op Ar tty
.Oc
-.Nm uugetty
-.Oo
-.Ar type
-.Op Ar tty
-.Oc
.Sh DESCRIPTION
The
.Nm
@@ -133,20 +127,11 @@ The
program can be set to timeout after some interval,
which will cause dial up lines to hang up
if the login name is not entered reasonably quickly.
-.Pp
-The
-.Nm uugetty
-program is the same, except that it uses
-.Xr pidlock 3
-to respect the locks in
-.Pa /var/spool/lock
-of processes that dial out on that tty.
.Sh FILES
-.Bl -tag -width /var/spool/lock/LCK..ttyXX -compact
+.Bl -tag -width /usr/libexec/getty -compact
.It Pa /etc/gettytab
.It Pa /etc/ttys
.It Pa /usr/libexec/getty
-.It Pa /var/spool/lock/LCK..ttyXX
.El
.Sh DIAGNOSTICS
.Bl -diag
@@ -164,7 +149,6 @@ does not exist.
.Sh SEE ALSO
.Xr login 1 ,
.Xr ioctl 2 ,
-.Xr pidlock 3 ,
.Xr ttyaction 3 ,
.Xr tty 4 ,
.Xr gettytab 5 ,
Index: src/libexec/getty/main.c
diff -u src/libexec/getty/main.c:1.66 src/libexec/getty/main.c:1.67
--- src/libexec/getty/main.c:1.66 Tue Jan 10 21:08:15 2017
+++ src/libexec/getty/main.c Wed Feb 26 15:44:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.66 2017/01/10 21:08:15 christos Exp $ */
+/* $NetBSD: main.c,v 1.67 2020/02/26 15:44:57 riastradh Exp $ */
/*-
* Copyright (c) 1980, 1993
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "from: @(#)main.c 8.1 (Berkeley) 6/20/93";
#else
-__RCSID("$NetBSD: main.c,v 1.66 2017/01/10 21:08:15 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.67 2020/02/26 15:44:57 riastradh Exp $");
#endif
#endif /* not lint */
@@ -99,8 +99,7 @@ struct utsname kerninfo;
char name[LOGIN_NAME_MAX];
char dev[] = _PATH_DEV;
char ttyn[32];
-char lockfile[512];
-uid_t ttyowner;
+uid_t ttyowner = 0;
char *rawttyn;
#define OBUFSIZ 128
@@ -183,15 +182,12 @@ static void xputs(const char *);
int
main(int argc, char *argv[], char *envp[])
{
- const char *progname;
int repcnt = 0, failopenlogged = 0;
volatile int first_time = 1;
struct rlimit limit;
- struct passwd *pw;
int rval;
/* this is used past the siglongjmp, so make sure it is not cached
in registers that might become invalid. */
- volatile int uugetty = 0;
const char * volatile tname = "default";
(void)signal(SIGINT, SIG_IGN);
@@ -202,18 +198,6 @@ main(int argc, char *argv[], char *envp[
(void)strlcpy(hostname, "Amnesiac", sizeof(hostname));
(void)uname();
- progname = getprogname();
- if (progname[0] == 'u' && progname[1] == 'u')
- uugetty = 1;
-
- /*
- * Find id of uucp login (if present) so we can chown tty properly.
- */
- if (uugetty && (pw = getpwnam("uucp")))
- ttyowner = pw->pw_uid;
- else
- ttyowner = 0;
-
/*
* Limit running time to deal with broken or dead lines.
*/
@@ -238,23 +222,6 @@ main(int argc, char *argv[], char *envp[
rawttyn = argv[2];
(void)strlcpy(ttyn, dev, sizeof(ttyn));
(void)strlcat(ttyn, argv[2], sizeof(ttyn));
- if (uugetty) {
- (void)chown(ttyn, ttyowner, 0);
- (void)strlcpy(lockfile, _PATH_LOCK,
-sizeof(lockfile));
- (void)strlcat(lockfile, argv[2],
-sizeof(lockfile));
- /*
- * wait for lockfiles to go away before we try
- * to open
- */
- if (pidlock(lockfile, 0, 0, 0) != 0) {
-syslog(LOG_ERR,
- "%s: can't create lockfile", ttyn);
-exit(1);
- }
- (void)unlink(lockfile);
- }
if (strcmp(argv[0], "+") != 0) {
(void)chown(ttyn, ttyowner, 0);
(void)chmod(ttyn, 0600);
@@ -277,13 +244,6 @@ main(int argc, char *argv[], char *envp[
repcnt++;
(void)sleep(60);
}
- if (uugetty && pidlock(lockfile, 0, 0, 0) != 0) {
-syslog(LOG_ERR, "%s: can't create lockfile",
- ttyn);
-exit(1);
- }
- if (uugetty)
-(void)chown(lockfile, ttyowner, 0);
(void)login_tty(i);
}
}
@@ -441,8 +401,6 @@ main(int argc, char *argv[], char *envp[
(void)signal(SIGINT, SIG_IGN);
if (NX && *NX)
tname = NX;
- if (uugetty)
-
CVS commit: src/share/man/man7
Module Name:src Committed By: wiz Date: Wed Feb 26 10:06:08 UTC 2020 Modified Files: src/share/man/man7: groups.7 intro.7 Log Message: Minor fixes. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man7/groups.7 cvs rdiff -u -r1.27 -r1.28 src/share/man/man7/intro.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/groups.7 diff -u src/share/man/man7/groups.7:1.2 src/share/man/man7/groups.7:1.3 --- src/share/man/man7/groups.7:1.2 Wed Feb 26 10:04:32 2020 +++ src/share/man/man7/groups.7 Wed Feb 26 10:06:08 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: groups.7,v 1.2 2020/02/26 10:04:32 wiz Exp $ +.\" $NetBSD: groups.7,v 1.3 2020/02/26 10:06:08 wiz Exp $ .\" .\" Copyright (c) 2020 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -55,7 +55,7 @@ to gain root privileges. Used by the set-group-id .Pq Xr setuid 7 programs -.Xr lpq 1 +.Xr lpq 1 , .Xr lpr 1 , and .Xr lprm 1 . @@ -126,7 +126,7 @@ Historic group. Unused in modern .Nx . .\" Actually it seems to be used in the set lists somehow, but it's - \" unclear to me how what the significance is. +.\" unclear to me how what the significance is. .It Em maildrop Used by the set-group-id .Pq Xr setuid 7 Index: src/share/man/man7/intro.7 diff -u src/share/man/man7/intro.7:1.27 src/share/man/man7/intro.7:1.28 --- src/share/man/man7/intro.7:1.27 Wed Feb 26 07:31:51 2020 +++ src/share/man/man7/intro.7 Wed Feb 26 10:06:08 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: intro.7,v 1.27 2020/02/26 07:31:51 riastradh Exp $ +.\" $NetBSD: intro.7,v 1.28 2020/02/26 10:06:08 wiz Exp $ .\" .\" Copyright (c) 1983, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -121,6 +121,6 @@ user account names .El .Sh HISTORY The -.Xr intro 7 +.Nm intro manual page appeared in .Bx 4.2 .
CVS commit: src/share/man/man7
Module Name:src Committed By: wiz Date: Wed Feb 26 10:04:32 UTC 2020 Modified Files: src/share/man/man7: groups.7 users.7 Log Message: Fix Xr section numbers. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man7/groups.7 \ src/share/man/man7/users.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/groups.7 diff -u src/share/man/man7/groups.7:1.1 src/share/man/man7/groups.7:1.2 --- src/share/man/man7/groups.7:1.1 Wed Feb 26 07:31:51 2020 +++ src/share/man/man7/groups.7 Wed Feb 26 10:04:32 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: groups.7,v 1.1 2020/02/26 07:31:51 riastradh Exp $ +.\" $NetBSD: groups.7,v 1.2 2020/02/26 10:04:32 wiz Exp $ .\" .\" Copyright (c) 2020 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -49,16 +49,16 @@ group has gid 0. Users who are not in the group .Em wheel are never allowed by -.Xr su 8 +.Xr su 1 to gain root privileges. .It Em daemon Used by the set-group-id .Pq Xr setuid 7 programs -.Xr lpq 8 , -.Xr lpr 8 , +.Xr lpq 1 +.Xr lpr 1 , and -.Xr lprm 8 . +.Xr lprm 1 . .\" Unclear why. Maybe used to be used by uucp stuff too, since .\" /var/spool/lock ownership is uucp:daemon? .It Em sys @@ -69,7 +69,7 @@ Unused in modern Used by the set-group-id .Pq Xr setuid 7 programs -.Xr wall 8 +.Xr wall 1 and .Xr write 1 to allow users to send messages to another tty even if they don't own @@ -131,11 +131,11 @@ Unused in modern Used by the set-group-id .Pq Xr setuid 7 programs -.Xr postdrop 8 +.Xr postdrop 1 and -.Xr postqueue 8 +.Xr postqueue 1 to submit to and examine the -.Xr postfix 8 +.Xr postfix 1 mail queue at .Pa /var/spool/postfix/maildrop and @@ -144,7 +144,7 @@ and Primary group for the .Em postfix pseudo-user used by the -.Xr postfix 8 +.Xr postfix 1 mail transfer agent. .\" Why are various subdirectories of /var/spool/postfix owned by .\" postfix:wheel and not postfix:postfix? @@ -276,7 +276,7 @@ pseudo-user used by the authoritative DNS nameserver. .It Em nvmm Users authorized to use the -.Xr nvmm 8 +.Xr nvmm 4 .Nx Virtual Machine Monitor. .It Em nobody Index: src/share/man/man7/users.7 diff -u src/share/man/man7/users.7:1.1 src/share/man/man7/users.7:1.2 --- src/share/man/man7/users.7:1.1 Wed Feb 26 07:31:51 2020 +++ src/share/man/man7/users.7 Wed Feb 26 10:04:32 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: users.7,v 1.1 2020/02/26 07:31:51 riastradh Exp $ +.\" $NetBSD: users.7,v 1.2 2020/02/26 10:04:32 wiz Exp $ .\" .\" Copyright (c) 2020 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -42,7 +42,7 @@ installation has the following user acco .It Em root The super-user, uid 0, with the highest administrative privileges. Normally not used for login directly, only via -.Xr su 8 +.Xr su 1 or equivalent by users in the .Em wheel group; see @@ -100,7 +100,7 @@ Unused in modern Owner of high-score files and other shared files for games. .It Em postfix Pseudo-user for use by the -.Xr postfix 8 +.Xr postfix 1 mail transfer agent. .It Em named Pseudo-user for use by the
