Module Name: src
Committed By: jdolecek
Date: Sat Apr 4 15:43:22 UTC 2020
Modified Files:
src/sys: Makefile
src/sys/conf: files filesystems.config
src/sys/fs: Makefile
src/sys/modules: Makefile
src/sys/rump/fs: Makefile.rumpfscomp
Removed Files:
src/sys/fs/smbfs: Makefile files.smbfs smbfs.h smbfs_io.c smbfs_kq.c
smbfs_node.c smbfs_node.h smbfs_smb.c smbfs_subr.c smbfs_subr.h
smbfs_vfsops.c smbfs_vnops.c
src/sys/modules/smbfs: Makefile
src/sys/netsmb: Makefile files.netsmb iconv.c iconv.h mchain.h
netbios.h smb.h smb_conn.c smb_conn.h smb_crypt.c smb_dev.c
smb_dev.h smb_iod.c smb_rq.c smb_rq.h smb_smb.c smb_subr.c
smb_subr.h smb_tran.h smb_trantcp.c smb_trantcp.h smb_usr.c
subr_mchain.c
src/sys/rump/dev/lib/libnetsmb: Makefile NETSMB.ioconf
netsmb_component.c netsmb_iconv.c netsmb_user.c netsmb_user.h
src/sys/rump/fs/lib/libsmbfs: Makefile
Log Message:
remove SMBFS and nsmb(4) - kernel part
it's unmaintained and supports only obsolete SMB1
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/Makefile
cvs rdiff -u -r1.1262 -r1.1263 src/sys/conf/files
cvs rdiff -u -r1.13 -r1.14 src/sys/conf/filesystems.config
cvs rdiff -u -r1.21 -r1.22 src/sys/fs/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/fs/smbfs/Makefile src/sys/fs/smbfs/files.smbfs
cvs rdiff -u -r1.18 -r0 src/sys/fs/smbfs/smbfs.h
cvs rdiff -u -r1.34 -r0 src/sys/fs/smbfs/smbfs_io.c
cvs rdiff -u -r1.27 -r0 src/sys/fs/smbfs/smbfs_kq.c
cvs rdiff -u -r1.58 -r0 src/sys/fs/smbfs/smbfs_node.c
cvs rdiff -u -r1.16 -r0 src/sys/fs/smbfs/smbfs_node.h
cvs rdiff -u -r1.48 -r0 src/sys/fs/smbfs/smbfs_smb.c
cvs rdiff -u -r1.19 -r0 src/sys/fs/smbfs/smbfs_subr.c
cvs rdiff -u -r1.22 -r0 src/sys/fs/smbfs/smbfs_subr.h
cvs rdiff -u -r1.109 -r0 src/sys/fs/smbfs/smbfs_vfsops.c
cvs rdiff -u -r1.95 -r0 src/sys/fs/smbfs/smbfs_vnops.c
cvs rdiff -u -r1.243 -r1.244 src/sys/modules/Makefile
cvs rdiff -u -r1.2 -r0 src/sys/modules/smbfs/Makefile
cvs rdiff -u -r1.6 -r0 src/sys/netsmb/Makefile src/sys/netsmb/smb_tran.h
cvs rdiff -u -r1.2 -r0 src/sys/netsmb/files.netsmb
cvs rdiff -u -r1.14 -r0 src/sys/netsmb/iconv.c
cvs rdiff -u -r1.10 -r0 src/sys/netsmb/iconv.h src/sys/netsmb/mchain.h
cvs rdiff -u -r1.8 -r0 src/sys/netsmb/netbios.h
cvs rdiff -u -r1.20 -r0 src/sys/netsmb/smb.h src/sys/netsmb/smb_conn.h
cvs rdiff -u -r1.31 -r0 src/sys/netsmb/smb_conn.c
cvs rdiff -u -r1.12 -r0 src/sys/netsmb/smb_crypt.c
cvs rdiff -u -r1.50 -r0 src/sys/netsmb/smb_dev.c src/sys/netsmb/smb_trantcp.c
cvs rdiff -u -r1.7 -r0 src/sys/netsmb/smb_dev.h src/sys/netsmb/smb_trantcp.h
cvs rdiff -u -r1.40 -r0 src/sys/netsmb/smb_iod.c
cvs rdiff -u -r1.36 -r0 src/sys/netsmb/smb_rq.c
cvs rdiff -u -r1.13 -r0 src/sys/netsmb/smb_rq.h
cvs rdiff -u -r1.35 -r0 src/sys/netsmb/smb_smb.c
cvs rdiff -u -r1.39 -r0 src/sys/netsmb/smb_subr.c
cvs rdiff -u -r1.22 -r0 src/sys/netsmb/smb_subr.h
cvs rdiff -u -r1.19 -r0 src/sys/netsmb/smb_usr.c
cvs rdiff -u -r1.24 -r0 src/sys/netsmb/subr_mchain.c
cvs rdiff -u -r1.9 -r0 src/sys/rump/dev/lib/libnetsmb/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libnetsmb/NETSMB.ioconf \
src/sys/rump/dev/lib/libnetsmb/netsmb_iconv.c \
src/sys/rump/dev/lib/libnetsmb/netsmb_user.h
cvs rdiff -u -r1.4 -r0 src/sys/rump/dev/lib/libnetsmb/netsmb_component.c
cvs rdiff -u -r1.7 -r0 src/sys/rump/dev/lib/libnetsmb/netsmb_user.c
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/fs/Makefile.rumpfscomp
cvs rdiff -u -r1.3 -r0 src/sys/rump/fs/lib/libsmbfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/Makefile
diff -u src/sys/Makefile:1.84 src/sys/Makefile:1.85
--- src/sys/Makefile:1.84 Mon Jun 17 17:01:50 2019
+++ src/sys/Makefile Sat Apr 4 15:43:21 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.84 2019/06/17 17:01:50 sevan Exp $
+# $NetBSD: Makefile,v 1.85 2020/04/04 15:43:21 jdolecek Exp $
.include <bsd.own.mk>
SUBDIR= altq arch compat dev fs miscfs \
net net80211 netatalk netbt netcan netipsec netinet netinet6 \
- netmpls netsmb \
+ netmpls \
nfs opencrypto sys ufs uvm
.if make(obj) || make(cleandir) || ${MKKMOD} != "no"
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1262 src/sys/conf/files:1.1263
--- src/sys/conf/files:1.1262 Tue Mar 31 03:42:10 2020
+++ src/sys/conf/files Sat Apr 4 15:43:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1262 2020/03/31 03:42:10 nisimura Exp $
+# $NetBSD: files,v 1.1263 2020/04/04 15:43:22 jdolecek Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -1499,7 +1499,6 @@ include "fs/ntfs/files.ntfs"
include "fs/ptyfs/files.ptyfs"
include "fs/puffs/files.puffs"
include "fs/udf/files.udf"
-include "fs/smbfs/files.smbfs"
include "fs/sysvbfs/files.sysvbfs"
include "fs/tmpfs/files.tmpfs"
include "fs/union/files.union"
Index: src/sys/conf/filesystems.config
diff -u src/sys/conf/filesystems.config:1.13 src/sys/conf/filesystems.config:1.14
--- src/sys/conf/filesystems.config:1.13 Mon Jun 17 17:06:39 2019
+++ src/sys/conf/filesystems.config Sat Apr 4 15:43:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: filesystems.config,v 1.13 2019/06/17 17:06:39 christos Exp $
+# $NetBSD: filesystems.config,v 1.14 2020/04/04 15:43:22 jdolecek Exp $
#file-system ADOSFS # AmigaDOS-compatible file system
#options APPLE_UFS # Apple UFS support in FFS
#file-system AUTOFS # Automounter Filesystem
@@ -26,8 +26,6 @@ file-system PROCFS # /proc
file-system PTYFS # /dev/ptm support
file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
pseudo-device putter # for puffs and pud
-file-system SMBFS # experimental - CIFS; also needs nsmb (below)
-pseudo-device nsmb # experimental - SMB requester
#file-system SYSVBFS # sysvfs
file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
Index: src/sys/fs/Makefile
diff -u src/sys/fs/Makefile:1.21 src/sys/fs/Makefile:1.22
--- src/sys/fs/Makefile:1.21 Tue Jan 9 03:31:13 2018
+++ src/sys/fs/Makefile Sat Apr 4 15:43:21 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2018/01/09 03:31:13 christos Exp $
+# $NetBSD: Makefile,v 1.22 2020/04/04 15:43:21 jdolecek Exp $
SUBDIR= adosfs autofs cd9660 efs filecorefs hfs msdosfs nilfs ntfs ptyfs \
- puffs smbfs sysvbfs tmpfs udf union v7fs
+ puffs sysvbfs tmpfs udf union v7fs
.include <bsd.kinc.mk>
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.243 src/sys/modules/Makefile:1.244
--- src/sys/modules/Makefile:1.243 Thu Mar 12 15:02:29 2020
+++ src/sys/modules/Makefile Sat Apr 4 15:43:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.243 2020/03/12 15:02:29 pgoyette Exp $
+# $NetBSD: Makefile,v 1.244 2020/04/04 15:43:21 jdolecek Exp $
.include <bsd.own.mk>
@@ -149,7 +149,6 @@ SUBDIR+= securelevel
SUBDIR+= sequencer
SUBDIR+= skipjack
SUBDIR+= slcompress
-SUBDIR+= smbfs
SUBDIR+= spdmem
SUBDIR+= spkr
SUBDIR+= sppp_subr
Index: src/sys/rump/fs/Makefile.rumpfscomp
diff -u src/sys/rump/fs/Makefile.rumpfscomp:1.6 src/sys/rump/fs/Makefile.rumpfscomp:1.7
--- src/sys/rump/fs/Makefile.rumpfscomp:1.6 Sun Nov 15 16:54:16 2015
+++ src/sys/rump/fs/Makefile.rumpfscomp Sat Apr 4 15:43:21 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.rumpfscomp,v 1.6 2015/11/15 16:54:16 pooka Exp $
+# $NetBSD: Makefile.rumpfscomp,v 1.7 2020/04/04 15:43:21 jdolecek Exp $
#
.include <bsd.own.mk>
RUMPFSCOMP= cd9660 efs ext2fs fdesc ffs hfs kernfs lfs mfs msdos \
- nfs nilfs ntfs null ptyfs smbfs syspuffs sysvbfs \
+ nfs nilfs ntfs null ptyfs syspuffs sysvbfs \
tmpfs udf umap union v7fs
.if ${MKZFS} != "no" || make(rumpdescribe)
