Module Name: src
Committed By: jdolecek
Date: Sat Apr 4 15:39:16 UTC 2020
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/misc: mi
src/distrib/sets/lists/modules: mi
src/distrib/sets/lists/rescue: mi
src/external/bsd: Makefile
src/rescue: list
src/share/man/man4: Makefile
Removed Files:
src/external/bsd/smbfs: Makefile Makefile.inc
src/external/bsd/smbfs/dist: COPYRIGHT CREDITS HISTORY INSTALL Makefile
Makefile.inc README config.mk.in configure
src/external/bsd/smbfs/dist/examples: dot.nsmbrc smbfs.sh.sample
src/external/bsd/smbfs/dist/examples/print: lj6l ljspool
printcap.sample tolj
src/external/bsd/smbfs/dist/include: cflib.h smb_kernelops.h
src/external/bsd/smbfs/dist/include/netsmb: nb_lib.h smb_lib.h
smb_rap.h
src/external/bsd/smbfs/dist/lib: Makefile Makefile.inc
src/external/bsd/smbfs/dist/lib/smb: Makefile cfopt.c ctx.c file.c
kiconv.c mbuf.c nb.c nb_name.c nb_net.c nbns_rq.c nls.c print.c
rap.c rcfile.c rcfile_priv.h rq.c smb_kernelops.c subr.c
src/external/bsd/smbfs/dist/mount_smbfs: Makefile mount_smbfs.8
mount_smbfs.c mount_smbfs.h
src/external/bsd/smbfs/dist/smbutil: Makefile common.h dumptree.c
login.c lookup.c print.c smbutil.1 smbutil.c view.c
src/external/bsd/smbfs/lib: Makefile
src/external/bsd/smbfs/lib/libsmb: Makefile
src/external/bsd/smbfs/sbin: Makefile
src/external/bsd/smbfs/sbin/mount_smbfs: Makefile
src/external/bsd/smbfs/usr.bin: Makefile
src/external/bsd/smbfs/usr.bin/smbutil: Makefile
src/share/man/man4: nsmb.4
Log Message:
remove SMBFS and nsmb/netsmb - userland part
To generate a diff of this commit:
cvs rdiff -u -r1.1237 -r1.1238 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.2317 -r1.2318 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.299 -r1.300 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.1685 -r1.1686 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.217 -r1.218 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.134 -r1.135 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/rescue/mi
cvs rdiff -u -r1.69 -r1.70 src/external/bsd/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/smbfs/Makefile \
src/external/bsd/smbfs/Makefile.inc
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/smbfs/dist/COPYRIGHT \
src/external/bsd/smbfs/dist/CREDITS src/external/bsd/smbfs/dist/HISTORY \
src/external/bsd/smbfs/dist/INSTALL src/external/bsd/smbfs/dist/Makefile \
src/external/bsd/smbfs/dist/Makefile.inc \
src/external/bsd/smbfs/dist/README \
src/external/bsd/smbfs/dist/config.mk.in \
src/external/bsd/smbfs/dist/configure
cvs rdiff -u -r1.2 -r0 src/external/bsd/smbfs/dist/examples/dot.nsmbrc
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/smbfs/dist/examples/smbfs.sh.sample
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/smbfs/dist/examples/print/lj6l \
src/external/bsd/smbfs/dist/examples/print/ljspool \
src/external/bsd/smbfs/dist/examples/print/printcap.sample \
src/external/bsd/smbfs/dist/examples/print/tolj
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/smbfs/dist/include/cflib.h
cvs rdiff -u -r1.1 -r0 src/external/bsd/smbfs/dist/include/smb_kernelops.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/smbfs/dist/include/netsmb/nb_lib.h \
src/external/bsd/smbfs/dist/include/netsmb/smb_rap.h
cvs rdiff -u -r1.2 -r0 src/external/bsd/smbfs/dist/include/netsmb/smb_lib.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/smbfs/dist/lib/Makefile \
src/external/bsd/smbfs/dist/lib/Makefile.inc
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/smbfs/dist/lib/smb/Makefile \
src/external/bsd/smbfs/dist/lib/smb/rcfile_priv.h
cvs rdiff -u -r1.2 -r0 src/external/bsd/smbfs/dist/lib/smb/cfopt.c \
src/external/bsd/smbfs/dist/lib/smb/file.c \
src/external/bsd/smbfs/dist/lib/smb/kiconv.c \
src/external/bsd/smbfs/dist/lib/smb/mbuf.c \
src/external/bsd/smbfs/dist/lib/smb/nb.c \
src/external/bsd/smbfs/dist/lib/smb/nb_name.c \
src/external/bsd/smbfs/dist/lib/smb/nb_net.c \
src/external/bsd/smbfs/dist/lib/smb/nbns_rq.c \
src/external/bsd/smbfs/dist/lib/smb/print.c \
src/external/bsd/smbfs/dist/lib/smb/rap.c \
src/external/bsd/smbfs/dist/lib/smb/rcfile.c \
src/external/bsd/smbfs/dist/lib/smb/rq.c \
src/external/bsd/smbfs/dist/lib/smb/subr.c
cvs rdiff -u -r1.3 -r0 src/external/bsd/smbfs/dist/lib/smb/ctx.c \
src/external/bsd/smbfs/dist/lib/smb/nls.c
cvs rdiff -u -r1.1 -r0 src/external/bsd/smbfs/dist/lib/smb/smb_kernelops.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/smbfs/dist/mount_smbfs/Makefile
cvs rdiff -u -r1.4 -r0 src/external/bsd/smbfs/dist/mount_smbfs/mount_smbfs.8 \
src/external/bsd/smbfs/dist/mount_smbfs/mount_smbfs.c
cvs rdiff -u -r1.1 -r0 src/external/bsd/smbfs/dist/mount_smbfs/mount_smbfs.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/smbfs/dist/smbutil/Makefile
cvs rdiff -u -r1.3 -r0 src/external/bsd/smbfs/dist/smbutil/common.h \
src/external/bsd/smbfs/dist/smbutil/print.c \
src/external/bsd/smbfs/dist/smbutil/smbutil.1 \
src/external/bsd/smbfs/dist/smbutil/smbutil.c \
src/external/bsd/smbfs/dist/smbutil/view.c
cvs rdiff -u -r1.2 -r0 src/external/bsd/smbfs/dist/smbutil/dumptree.c \
src/external/bsd/smbfs/dist/smbutil/lookup.c
cvs rdiff -u -r1.4 -r0 src/external/bsd/smbfs/dist/smbutil/login.c
cvs rdiff -u -r1.1 -r0 src/external/bsd/smbfs/lib/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/smbfs/lib/libsmb/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/smbfs/sbin/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/smbfs/sbin/mount_smbfs/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/smbfs/usr.bin/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/smbfs/usr.bin/smbutil/Makefile
cvs rdiff -u -r1.52 -r1.53 src/rescue/list
cvs rdiff -u -r1.702 -r1.703 src/share/man/man4/Makefile
cvs rdiff -u -r1.9 -r0 src/share/man/man4/nsmb.4
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/mi
diff -u src/distrib/sets/lists/base/mi:1.1237 src/distrib/sets/lists/base/mi:1.1238
--- src/distrib/sets/lists/base/mi:1.1237 Thu Apr 2 13:03:22 2020
+++ src/distrib/sets/lists/base/mi Sat Apr 4 15:39:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1237 2020/04/02 13:03:22 roy Exp $
+# $NetBSD: mi,v 1.1238 2020/04/04 15:39:15 jdolecek Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -579,7 +579,7 @@
./sbin/mount_ptyfs base-miscfs-root
./sbin/mount_puffs base-sysutil-root
./sbin/mount_qemufwcfg base-sysutil-root
-./sbin/mount_smbfs base-smbfs-root
+./sbin/mount_smbfs base-obsolete obsolete
./sbin/mount_sysvbfs base-sysutil-root
./sbin/mount_tmpfs base-miscfs-root
./sbin/mount_udf base-sysutil-root
@@ -984,7 +984,7 @@
./usr/bin/skeyinfo base-util-bin skey
./usr/bin/skeyinit base-util-bin skey
./usr/bin/slogin base-secsh-bin
-./usr/bin/smbutil base-util-bin
+./usr/bin/smbutil base-obsolete obsolete
./usr/bin/sockstat base-util-bin
./usr/bin/sort base-util-bin
./usr/bin/spell base-util-bin
@@ -1174,7 +1174,7 @@
./usr/include/fs/nilfs base-c-usr
./usr/include/fs/ptyfs base-c-usr
./usr/include/fs/puffs base-puffs-usr
-./usr/include/fs/smbfs base-c-usr
+./usr/include/fs/smbfs base-obsolete obsolete
./usr/include/fs/sysvbfs base-c-usr
./usr/include/fs/tmpfs base-c-usr
./usr/include/fs/udf base-c-usr
@@ -1272,7 +1272,7 @@
./usr/include/netnatm base-obsolete obsolete
./usr/include/netns base-obsolete obsolete
./usr/include/netpgp base-c-usr
-./usr/include/netsmb base-c-usr
+./usr/include/netsmb base-obsolete obsolete
./usr/include/nfs base-c-usr
./usr/include/ntfs base-c-usr
./usr/include/objc base-objc-usr
@@ -1995,7 +1995,7 @@
./usr/sbin/rump_msdos base-puffs-bin rump
./usr/sbin/rump_nfs base-puffs-bin rump
./usr/sbin/rump_ntfs base-puffs-bin rump
-./usr/sbin/rump_smbfs base-puffs-bin rump
+./usr/sbin/rump_smbfs base-obsolete obsolete
./usr/sbin/rump_syspuffs base-puffs-bin rump
./usr/sbin/rump_sysvbfs base-puffs-bin rump
./usr/sbin/rump_tmpfs base-puffs-bin rump
@@ -2319,7 +2319,7 @@
./usr/share/examples/rpcapd base-netutil-examples
./usr/share/examples/rtadvd base-router-examples
./usr/share/examples/slip base-slip-examples
-./usr/share/examples/smbfs base-sysutil-examples
+./usr/share/examples/smbfs base-obsolete obsolete
./usr/share/examples/supfiles base-obsolete obsolete
./usr/share/examples/syslogd base-sysutil-examples
./usr/share/examples/unbound base-netutil-examples share
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2317 src/distrib/sets/lists/comp/mi:1.2318
--- src/distrib/sets/lists/comp/mi:1.2317 Tue Mar 31 16:28:28 2020
+++ src/distrib/sets/lists/comp/mi Sat Apr 4 15:39:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2317 2020/03/31 16:28:28 maxv Exp $
+# $NetBSD: mi,v 1.2318 2020/04/04 15:39:15 jdolecek Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -873,7 +873,7 @@
./usr/include/fs/nilfs/nilfs_mount.h comp-c-include
./usr/include/fs/ptyfs/ptyfs.h comp-c-include
./usr/include/fs/puffs/puffs_msgif.h comp-puffs-include
-./usr/include/fs/smbfs/smbfs.h comp-c-include
+./usr/include/fs/smbfs/smbfs.h comp-obsolete obsolete
./usr/include/fs/sysvbfs/bfs.h comp-c-include
./usr/include/fs/sysvbfs/sysvbfs_args.h comp-c-include
./usr/include/fs/tmpfs/tmpfs_args.h comp-c-include
@@ -2601,11 +2601,11 @@
./usr/include/netns/spp_var.h comp-obsolete obsolete
./usr/include/netpgp.h comp-c-include
./usr/include/netpgp/verify.h comp-c-include
-./usr/include/netsmb/iconv.h comp-c-include
-./usr/include/netsmb/netbios.h comp-c-include
-./usr/include/netsmb/smb.h comp-c-include
-./usr/include/netsmb/smb_conn.h comp-c-include
-./usr/include/netsmb/smb_dev.h comp-c-include
+./usr/include/netsmb/iconv.h comp-obsolete obsolete
+./usr/include/netsmb/netbios.h comp-obsolete obsolete
+./usr/include/netsmb/smb.h comp-obsolete obsolete
+./usr/include/netsmb/smb_conn.h comp-obsolete obsolete
+./usr/include/netsmb/smb_dev.h comp-obsolete obsolete
./usr/include/nfs/krpc.h comp-c-include
./usr/include/nfs/nfs.h comp-c-include
./usr/include/nfs/nfs_var.h comp-obsolete obsolete
@@ -3690,8 +3690,8 @@
./usr/lib/librumpdev_fss_p.a comp-c-proflib rump,profile
./usr/lib/librumpdev_md.a comp-c-lib rump
./usr/lib/librumpdev_md_p.a comp-c-proflib rump,profile
-./usr/lib/librumpdev_netsmb.a comp-c-lib rump
-./usr/lib/librumpdev_netsmb_p.a comp-c-proflib rump,profile
+./usr/lib/librumpdev_netsmb.a comp-obsolete obsolete
+./usr/lib/librumpdev_netsmb_p.a comp-obsolete obsolete
./usr/lib/librumpdev_opencrypto.a comp-c-lib rump
./usr/lib/librumpdev_opencrypto_p.a comp-c-proflib rump,profile
./usr/lib/librumpdev_p.a comp-c-proflib compatfile,rump,profile
@@ -3763,8 +3763,8 @@
./usr/lib/librumpfs_nullfs_p.a comp-obsolete obsolete
./usr/lib/librumpfs_ptyfs.a comp-c-lib rump
./usr/lib/librumpfs_ptyfs_p.a comp-c-proflib rump,profile
-./usr/lib/librumpfs_smbfs.a comp-c-lib rump
-./usr/lib/librumpfs_smbfs_p.a comp-c-proflib rump,profile
+./usr/lib/librumpfs_smbfs.a comp-obsolete obsolete
+./usr/lib/librumpfs_smbfs_p.a comp-obsolete obsolete
./usr/lib/librumpfs_syspuffs.a comp-c-lib rump
./usr/lib/librumpfs_syspuffs_p.a comp-c-proflib rump,profile
./usr/lib/librumpfs_sysvbfs.a comp-c-lib rump
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.299 src/distrib/sets/lists/debug/mi:1.300
--- src/distrib/sets/lists/debug/mi:1.299 Mon Mar 30 02:12:38 2020
+++ src/distrib/sets/lists/debug/mi Sat Apr 4 15:39:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.299 2020/03/30 02:12:38 christos Exp $
+# $NetBSD: mi,v 1.300 2020/04/04 15:39:16 jdolecek Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -190,7 +190,7 @@
./usr/lib/librumpfs_null_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpfs_nullfs_g.a comp-obsolete obsolete,compatfile
./usr/lib/librumpfs_ptyfs_g.a comp-c-debuglib debuglib,rump
-./usr/lib/librumpfs_smbfs_g.a comp-c-debuglib debuglib,rump
+./usr/lib/librumpfs_smbfs_g.a comp-obsolete obsolete
./usr/lib/librumpfs_syspuffs_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpfs_sysvbfs_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpfs_tmpfs_g.a comp-c-debuglib debuglib,rump
@@ -380,7 +380,7 @@
./usr/libdata/debug/sbin/mount_ptyfs.debug comp-miscfs-debug debug
./usr/libdata/debug/sbin/mount_puffs.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/mount_qemufwcfg.debug comp-sysutil-debug debug
-./usr/libdata/debug/sbin/mount_smbfs.debug comp-smbfs-debug debug
+./usr/libdata/debug/sbin/mount_smbfs.debug comp-obsolete obsolete
./usr/libdata/debug/sbin/mount_sysvbfs.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/mount_tmpfs.debug comp-miscfs-debug debug
./usr/libdata/debug/sbin/mount_udf.debug comp-sysutil-debug debug
@@ -1265,7 +1265,7 @@
./usr/libdata/debug/usr/sbin/rump_msdos.debug comp-puffs-debug debug,rump
./usr/libdata/debug/usr/sbin/rump_nfs.debug comp-puffs-debug debug,rump
./usr/libdata/debug/usr/sbin/rump_ntfs.debug comp-puffs-debug debug,rump
-./usr/libdata/debug/usr/sbin/rump_smbfs.debug comp-puffs-debug debug,rump
+./usr/libdata/debug/usr/sbin/rump_smbfs.debug comp-obsolete obsolete
./usr/libdata/debug/usr/sbin/rump_syspuffs.debug comp-puffs-debug debug,rump
./usr/libdata/debug/usr/sbin/rump_sysvbfs.debug comp-puffs-debug debug,rump
./usr/libdata/debug/usr/sbin/rump_tmpfs.debug comp-puffs-debug debug,rump
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1685 src/distrib/sets/lists/man/mi:1.1686
--- src/distrib/sets/lists/man/mi:1.1685 Thu Apr 2 03:32:46 2020
+++ src/distrib/sets/lists/man/mi Sat Apr 4 15:39:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1685 2020/04/02 03:32:46 kamil Exp $
+# $NetBSD: mi,v 1.1686 2020/04/04 15:39:16 jdolecek Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -536,7 +536,7 @@
./usr/share/man/cat1/skeyinit.0 man-util-catman skey,.cat
./usr/share/man/cat1/sleep.0 man-util-catman .cat
./usr/share/man/cat1/slogin.0 man-secsh-catman .cat
-./usr/share/man/cat1/smbutil.0 man-util-catman .cat
+./usr/share/man/cat1/smbutil.0 man-obsolete obsolete
./usr/share/man/cat1/sntp.0 man-ntp-catman .cat
./usr/share/man/cat1/sockstat.0 man-util-catman .cat
./usr/share/man/cat1/sort.0 man-util-catman .cat
@@ -1534,7 +1534,7 @@
./usr/share/man/cat4/nele.0 man-sys-catman .cat
./usr/share/man/cat4/neo.0 man-sys-catman .cat
./usr/share/man/cat4/netintro.0 man-sys-catman .cat
-./usr/share/man/cat4/netsmb.0 man-sys-catman .cat
+./usr/share/man/cat4/netsmb.0 man-obsolete obsolete
./usr/share/man/cat4/networking.0 man-sys-catman .cat
./usr/share/man/cat4/nfe.0 man-sys-catman .cat
./usr/share/man/cat4/nfsmb.0 man-sys-catman .cat
@@ -1545,7 +1545,7 @@
./usr/share/man/cat4/nsclpcsio.0 man-sys-catman .cat
./usr/share/man/cat4/nside.0 man-sys-catman .cat
./usr/share/man/cat4/nsip.0 man-obsolete obsolete
-./usr/share/man/cat4/nsmb.0 man-sys-catman .cat
+./usr/share/man/cat4/nsmb.0 man-obsolete obsolete
./usr/share/man/cat4/nsp.0 man-obsolete obsolete
./usr/share/man/cat4/nsphy.0 man-sys-catman .cat
./usr/share/man/cat4/nsphyter.0 man-sys-catman .cat
@@ -2831,7 +2831,7 @@
./usr/share/man/cat8/mount_ptyfs.0 man-sysutil-catman .cat
./usr/share/man/cat8/mount_puffs.0 man-sysutil-catman .cat
./usr/share/man/cat8/mount_qemufwcfg.0 man-sysutil-catman .cat
-./usr/share/man/cat8/mount_smbfs.0 man-smbfs-catman .cat
+./usr/share/man/cat8/mount_smbfs.0 man-obsolete obsolete
./usr/share/man/cat8/mount_sysctlfs.0 man-puffs-catman .cat
./usr/share/man/cat8/mount_sysvbfs.0 man-sysutil-catman .cat
./usr/share/man/cat8/mount_tmpfs.0 man-sysutil-catman .cat
@@ -3080,7 +3080,7 @@
./usr/share/man/cat8/rump_msdos.0 man-puffs-catman .cat,rump
./usr/share/man/cat8/rump_nfs.0 man-puffs-catman .cat,rump
./usr/share/man/cat8/rump_ntfs.0 man-puffs-catman .cat,rump
-./usr/share/man/cat8/rump_smbfs.0 man-puffs-catman .cat,rump
+./usr/share/man/cat8/rump_smbfs.0 man-obsolete obsolete
./usr/share/man/cat8/rump_syspuffs.0 man-puffs-catman .cat,rump
./usr/share/man/cat8/rump_sysvbfs.0 man-puffs-catman .cat,rump
./usr/share/man/cat8/rump_tmpfs.0 man-puffs-catman .cat,rump
@@ -3816,7 +3816,7 @@
./usr/share/man/html1/skeyinit.html man-util-htmlman skey,html
./usr/share/man/html1/sleep.html man-util-htmlman html
./usr/share/man/html1/slogin.html man-secsh-htmlman html
-./usr/share/man/html1/smbutil.html man-util-htmlman html
+./usr/share/man/html1/smbutil.html man-obsolete obsolete
./usr/share/man/html1/sntp.html man-ntp-htmlman html
./usr/share/man/html1/sockstat.html man-util-htmlman html
./usr/share/man/html1/sort.html man-util-htmlman html
@@ -4713,7 +4713,7 @@
./usr/share/man/html4/nele.html man-sys-htmlman html
./usr/share/man/html4/neo.html man-sys-htmlman html
./usr/share/man/html4/netintro.html man-sys-htmlman html
-./usr/share/man/html4/netsmb.html man-sys-htmlman html
+./usr/share/man/html4/netsmb.html man-obsolete obsolete
./usr/share/man/html4/networking.html man-sys-htmlman html
./usr/share/man/html4/nfe.html man-sys-htmlman html
./usr/share/man/html4/nfsmb.html man-sys-htmlman html
@@ -4722,7 +4722,7 @@
./usr/share/man/html4/njs.html man-sys-htmlman html
./usr/share/man/html4/nsclpcsio.html man-sys-htmlman html
./usr/share/man/html4/nside.html man-sys-htmlman html
-./usr/share/man/html4/nsmb.html man-sys-htmlman html
+./usr/share/man/html4/nsmb.html man-obsolete obsolete
./usr/share/man/html4/nsp.html man-obsolete obsolete
./usr/share/man/html4/nsphy.html man-sys-htmlman html
./usr/share/man/html4/nsphyter.html man-sys-htmlman html
@@ -5846,7 +5846,7 @@
./usr/share/man/html8/mount_ptyfs.html man-sysutil-htmlman html
./usr/share/man/html8/mount_puffs.html man-sysutil-htmlman html
./usr/share/man/html8/mount_qemufwcfg.html man-sysutil-htmlman html
-./usr/share/man/html8/mount_smbfs.html man-smbfs-htmlman html
+./usr/share/man/html8/mount_smbfs.html man-obsolete obsolete
./usr/share/man/html8/mount_sysctlfs.html man-puffs-htmlman html
./usr/share/man/html8/mount_sysvbfs.html man-sysutil-htmlman html
./usr/share/man/html8/mount_tmpfs.html man-sysutil-htmlman html
@@ -6047,7 +6047,7 @@
./usr/share/man/html8/rump_msdos.html man-puffs-htmlman html,rump
./usr/share/man/html8/rump_nfs.html man-puffs-htmlman html,rump
./usr/share/man/html8/rump_ntfs.html man-puffs-htmlman html,rump
-./usr/share/man/html8/rump_smbfs.html man-puffs-htmlman html,rump
+./usr/share/man/html8/rump_smbfs.html man-obsolete obsolete
./usr/share/man/html8/rump_syspuffs.html man-puffs-htmlman html,rump
./usr/share/man/html8/rump_sysvbfs.html man-puffs-htmlman html,rump
./usr/share/man/html8/rump_tmpfs.html man-puffs-htmlman html,rump
@@ -6748,7 +6748,7 @@
./usr/share/man/man1/skeyinit.1 man-util-man skey,.man
./usr/share/man/man1/sleep.1 man-util-man .man
./usr/share/man/man1/slogin.1 man-secsh-man .man
-./usr/share/man/man1/smbutil.1 man-util-man .man
+./usr/share/man/man1/smbutil.1 man-obsolete obsolete
./usr/share/man/man1/sntp.1 man-ntp-man .man
./usr/share/man/man1/sockstat.1 man-util-man .man
./usr/share/man/man1/sort.1 man-util-man .man
@@ -7746,7 +7746,7 @@
./usr/share/man/man4/nele.4 man-sys-man .man
./usr/share/man/man4/neo.4 man-sys-man .man
./usr/share/man/man4/netintro.4 man-sys-man .man
-./usr/share/man/man4/netsmb.4 man-sys-man .man
+./usr/share/man/man4/netsmb.4 man-obsolete obsolete
./usr/share/man/man4/networking.4 man-sys-man .man
./usr/share/man/man4/nfe.4 man-sys-man .man
./usr/share/man/man4/nfsmb.4 man-sys-man .man
@@ -7757,7 +7757,7 @@
./usr/share/man/man4/nsclpcsio.4 man-sys-man .man
./usr/share/man/man4/nside.4 man-sys-man .man
./usr/share/man/man4/nsip.4 man-obsolete obsolete
-./usr/share/man/man4/nsmb.4 man-sys-man .man
+./usr/share/man/man4/nsmb.4 man-obsolete obsolete
./usr/share/man/man4/nsp.4 man-obsolete obsolete
./usr/share/man/man4/nsphy.4 man-sys-man .man
./usr/share/man/man4/nsphyter.4 man-sys-man .man
@@ -9043,7 +9043,7 @@
./usr/share/man/man8/mount_ptyfs.8 man-sysutil-man .man
./usr/share/man/man8/mount_puffs.8 man-sysutil-man .man
./usr/share/man/man8/mount_qemufwcfg.8 man-sysutil-man .man
-./usr/share/man/man8/mount_smbfs.8 man-smbfs-man .man
+./usr/share/man/man8/mount_smbfs.8 man-obsolete obsolete
./usr/share/man/man8/mount_sysctlfs.8 man-puffs-man .man
./usr/share/man/man8/mount_sysvbfs.8 man-sysutil-man .man
./usr/share/man/man8/mount_tmpfs.8 man-sysutil-man .man
@@ -9292,7 +9292,7 @@
./usr/share/man/man8/rump_msdos.8 man-puffs-man .man,rump
./usr/share/man/man8/rump_nfs.8 man-puffs-man .man,rump
./usr/share/man/man8/rump_ntfs.8 man-puffs-man .man,rump
-./usr/share/man/man8/rump_smbfs.8 man-puffs-man .man,rump
+./usr/share/man/man8/rump_smbfs.8 man-obsolete obsolete
./usr/share/man/man8/rump_syspuffs.8 man-puffs-man .man,rump
./usr/share/man/man8/rump_sysvbfs.8 man-puffs-man .man,rump
./usr/share/man/man8/rump_tmpfs.8 man-puffs-man .man,rump
Index: src/distrib/sets/lists/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.217 src/distrib/sets/lists/misc/mi:1.218
--- src/distrib/sets/lists/misc/mi:1.217 Sun Mar 29 17:13:47 2020
+++ src/distrib/sets/lists/misc/mi Sat Apr 4 15:39:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.217 2020/03/29 17:13:47 christos Exp $
+# $NetBSD: mi,v 1.218 2020/04/04 15:39:16 jdolecek Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1607,7 +1607,7 @@
./usr/share/examples/rpcapd/rpcapd@.service misc-netutil-examples share
./usr/share/examples/rtadvd/rtadvd.conf misc-router-examples use_inet6,share
./usr/share/examples/slip/slip.login misc-slip-examples share
-./usr/share/examples/smbfs/dot.nsmbrc misc-sysutil-examples share
+./usr/share/examples/smbfs/dot.nsmbrc misc-obsolete obsolete
./usr/share/examples/supfiles/ftp.cs.umn.edu misc-obsolete obsolete
./usr/share/examples/supfiles/skarven.itea.unit.no misc-obsolete obsolete
./usr/share/examples/supfiles/sup.au.netbsd.org misc-obsolete obsolete
Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.134 src/distrib/sets/lists/modules/mi:1.135
--- src/distrib/sets/lists/modules/mi:1.134 Sat Feb 29 18:46:12 2020
+++ src/distrib/sets/lists/modules/mi Sat Apr 4 15:39:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.134 2020/02/29 18:46:12 skrll Exp $
+# $NetBSD: mi,v 1.135 2020/04/04 15:39:16 jdolecek Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -398,8 +398,8 @@
./@MODULEDIR@/skipjack/skipjack.kmod modules-base-kernel kmod
./@MODULEDIR@/slcompress modules-base-kernel kmod
./@MODULEDIR@/slcompress/slcompress.kmod modules-base-kernel kmod
-./@MODULEDIR@/smbfs modules-base-kernel kmod
-./@MODULEDIR@/smbfs/smbfs.kmod modules-base-kernel kmod
+./@MODULEDIR@/smbfs base-obsolete obsolete
+./@MODULEDIR@/smbfs/smbfs.kmod base-obsolete obsolete
./@MODULEDIR@/solaris modules-base-kernel kmod,solaris
./@MODULEDIR@/solaris/solaris.kmod modules-base-kernel kmod,solaris
./@MODULEDIR@/spdmem modules-base-kernel kmod
Index: src/distrib/sets/lists/rescue/mi
diff -u src/distrib/sets/lists/rescue/mi:1.1 src/distrib/sets/lists/rescue/mi:1.2
--- src/distrib/sets/lists/rescue/mi:1.1 Wed Oct 2 11:16:00 2019
+++ src/distrib/sets/lists/rescue/mi Sat Apr 4 15:39:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1 2019/10/02 11:16:00 maya Exp $
+# $NetBSD: mi,v 1.2 2020/04/04 15:39:16 jdolecek Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -99,7 +99,7 @@
./rescue/mount_overlay base-rescue-root
./rescue/mount_portal base-obsolete obsolete
./rescue/mount_procfs base-rescue-root
-./rescue/mount_smbfs base-rescue-root
+./rescue/mount_smbfs base-obsolete obsolete
./rescue/mount_tmpfs base-rescue-root
./rescue/mount_ufs base-rescue-root
./rescue/mount_umap base-rescue-root
Index: src/external/bsd/Makefile
diff -u src/external/bsd/Makefile:1.69 src/external/bsd/Makefile:1.70
--- src/external/bsd/Makefile:1.69 Wed Mar 4 22:56:08 2020
+++ src/external/bsd/Makefile Sat Apr 4 15:39:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2020/03/04 22:56:08 jmcneill Exp $
+# $NetBSD: Makefile,v 1.70 2020/04/04 15:39:13 jdolecek Exp $
.include <bsd.own.mk>
@@ -44,6 +44,6 @@ SUBDIR+= librtld_db
SUBDIR+= unbound
.endif
-SUBDIR+= blacklist pdisk nvi ppp smbfs libnv
+SUBDIR+= blacklist pdisk nvi ppp libnv
.include <bsd.subdir.mk>
Index: src/rescue/list
diff -u src/rescue/list:1.52 src/rescue/list:1.53
--- src/rescue/list:1.52 Wed Dec 12 10:25:29 2018
+++ src/rescue/list Sat Apr 4 15:39:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.52 2018/12/12 10:25:29 martin Exp $
+# $NetBSD: list,v 1.53 2020/04/04 15:39:16 jdolecek Exp $
SRCDIRS bin
@@ -85,9 +85,6 @@ PROG mount_ntfs
PROG mount_null
PROG mount_overlay
PROG mount_procfs
-PROG mount_smbfs
-SPECIAL mount_smbfs srcdir external/bsd/smbfs/sbin/mount_smbfs
-LIBS ${SMB_LIBDIR}/libsmb.a
PROG mount_tmpfs
PROG mount_umap
PROG mount_union
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.702 src/share/man/man4/Makefile:1.703
--- src/share/man/man4/Makefile:1.702 Sun Feb 9 16:06:17 2020
+++ src/share/man/man4/Makefile Sat Apr 4 15:39:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.702 2020/02/09 16:06:17 jmcneill Exp $
+# $NetBSD: Makefile,v 1.703 2020/04/04 15:39:13 jdolecek Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -43,7 +43,7 @@ MAN= aac.4 ac97.4 acardide.4 aceride.4 a
micphy.4 midi.4 mii.4 mk48txx.4 mlx.4 mly.4 mpls.4 mpii.4 mpt.4 \
mpu.4 mtd.4 mtio.4 msm6242b.4 multicast.4 mvsata.4 \
nadb.4 ne.4 neo.4 netintro.4 nfe.4 nfsmb.4 njata.4 njs.4 \
- nsclpcsio.4 nside.4 nsphy.4 nsphyter.4 ntwoc.4 null.4 nsmb.4 \
+ nsclpcsio.4 nside.4 nsphy.4 nsphyter.4 ntwoc.4 null.4 \
nvme.4 nvmm.4 \
oak.4 oosiop.4 opl.4 options.4 optiide.4 osiop.4 otus.4 \
pad.4 pas.4 pcdisplay.4 pcf8563rtc.4 pciide.4 pckbc.4 pckbd.4 pcn.4 \
@@ -218,7 +218,6 @@ MLINKS+=midi.4 sequencer.4
MLINKS+=mii.4 phy.4
MLINKS+=netintro.4 networking.4
MLINKS+=nfsmb.4 nfsmbc.4
-MLINKS+=nsmb.4 netsmb.4
MLINKS+=ntwoc.4 ntwo.4
MLINKS+=pci.4 pchb.4
MLINKS+=pci.4 ppb.4
