[src/trunk]: src/usr.sbin/puffs We don't have smbfs anymore.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/usr.sbin/puffs We don't have smbfs anymore.
From: christos <christos%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 14:18:52 +0000
details:   https://anonhg.NetBSD.org/src/rev/58de7c65dd2b
branches:  trunk
changeset: 850440:58de7c65dd2b
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Apr 04 17:05:06 2020 +0000

description:
We don't have smbfs anymore.

diffstat:

 usr.sbin/puffs/Makefile                 |    3 +-
 usr.sbin/puffs/makerumpmanpages.sh      |    8 +-
 usr.sbin/puffs/rump_smbfs/Makefile      |   20 -----
 usr.sbin/puffs/rump_smbfs/rump_smbfs.8  |  110 --------------------------------
 usr.sbin/puffs/rump_smbfs/rump_smbfs.c  |   80 -----------------------
 usr.sbin/puffs/rump_smbfs/smb_rumpops.c |   52 ---------------
 6 files changed, 5 insertions(+), 268 deletions(-)

diffs (truncated from 331 to 300 lines):

diff -r d2b3877125a2 -r 58de7c65dd2b usr.sbin/puffs/Makefile
--- a/usr.sbin/puffs/Makefile   Sat Apr 04 17:00:05 2020 +0000
+++ b/usr.sbin/puffs/Makefile   Sat Apr 04 17:05:06 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.18 2017/05/21 15:28:43 riastradh Exp $
+#      $NetBSD: Makefile,v 1.19 2020/04/04 17:05:06 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -8,7 +8,6 @@
 SUBDIR+=rump_cd9660 rump_efs rump_ext2fs rump_ffs rump_hfs rump_lfs
 SUBDIR+=rump_msdos rump_nfs rump_ntfs rump_syspuffs rump_sysvbfs
 SUBDIR+=rump_tmpfs rump_udf rump_v7fs
-SUBDIR+=rump_smbfs
 
 #
 # The following are not built by default
diff -r d2b3877125a2 -r 58de7c65dd2b usr.sbin/puffs/makerumpmanpages.sh
--- a/usr.sbin/puffs/makerumpmanpages.sh        Sat Apr 04 17:00:05 2020 +0000
+++ b/usr.sbin/puffs/makerumpmanpages.sh        Sat Apr 04 17:05:06 2020 +0000
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-#      $NetBSD: makerumpmanpages.sh,v 1.13 2011/07/24 08:55:30 uch Exp $
+#      $NetBSD: makerumpmanpages.sh,v 1.14 2020/04/04 17:05:06 christos Exp $
 #
 
 IFS=' '
 COPYRIGHT='.\" WARNING: GENERATED FILE, DO NOT EDIT
 .\"    INSTEAD, EDIT makerumpmanpages.sh AND REGEN
-.\"    from: $NetBSD: makerumpmanpages.sh,v 1.13 2011/07/24 08:55:30 uch Exp $
+.\"    from: $NetBSD: makerumpmanpages.sh,v 1.14 2020/04/04 17:05:06 christos Exp $
 .\"
 .\" Copyright (c) 2008-2010 Antti Kantee.  All rights reserved.
 .\"
@@ -157,7 +157,7 @@
 
 # vary manpages slightly based on the type of server in question
 disk="cd9660 efs ext2fs ffs hfs lfs msdos ntfs sysvbfs udf v7fs"
-net="nfs smbfs"
+net="nfs"
 fictional="fdesc kernfs tmpfs"
 special="au-naturel nqmfs syspuffs"
 
@@ -220,7 +220,7 @@
        fsc=`echo $fs | tr '[:lower:]' '[:upper:]'`
        eval sedstr="${sedsub}"
 
-       printf '.\\"    $NetBSD: makerumpmanpages.sh,v 1.13 2011/07/24 08:55:30 uch Exp $\n.\\"\n' > rump_${fs}/rump_${fs}.8
+       printf '.\\"    $NetBSD: makerumpmanpages.sh,v 1.14 2020/04/04 17:05:06 christos Exp $\n.\\"\n' > rump_${fs}/rump_${fs}.8
        echo ${COPYRIGHT} | sed -e 's/\$//g' >> rump_${fs}/rump_${fs}.8
 
        echo ${MANTMPL1} | sed -e "$sedstr" >> rump_${fs}/rump_${fs}.8
diff -r d2b3877125a2 -r 58de7c65dd2b usr.sbin/puffs/rump_smbfs/Makefile
--- a/usr.sbin/puffs/rump_smbfs/Makefile        Sat Apr 04 17:00:05 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#      $NetBSD: Makefile,v 1.8 2017/03/14 14:05:52 ozaki-r Exp $
-#
-
-SMBROOT=${.CURDIR}/../../../external/bsd/smbfs
-
-MOUNTNAME=     smbfs
-SRCS+=         smb_rumpops.c
-
-PROGDPLIBS+=   smb ${SMBROOT}/lib/libsmb
-LDADD+=        -lrumpnet_sockin -lrumpnet_net -lrumpnet
-LDADD+=                -lrumpkern_crypto -lrumpdev_netsmb -lrumpdev
-
-ISRUMP=                # it is
-
-.include "${SMBROOT}/Makefile.inc"
-
-CPPFLAGS+=-I${SMBDIST}/mount_smbfs
-.PATH: ${SMBDIST}/mount_smbfs
-
-.include <bsd.prog.mk>
diff -r d2b3877125a2 -r 58de7c65dd2b usr.sbin/puffs/rump_smbfs/rump_smbfs.8
--- a/usr.sbin/puffs/rump_smbfs/rump_smbfs.8    Sat Apr 04 17:00:05 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-.\"    $NetBSD: rump_smbfs.8,v 1.6 2011/07/24 09:00:07 uch Exp $
-.\"
-.\"    WARNING: GENERATED FILE, DO NOT EDIT
-.\"    INSTEAD, EDIT makerumpmanpages.sh AND REGEN
-.\"    from: NetBSD: makerumpmanpages.sh,v 1.12 2010/11/22 07:56:31 pooka Exp 
-.\"
-.\" Copyright (c) 2008-2010 Antti Kantee. All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd November 21, 2010
-.Dt RUMP_SMBFS 8
-.Os
-.Sh NAME
-.Nm rump_smbfs
-.Nd mount a smbfs share with a userspace server
-.Sh SYNOPSIS
-.Cd "file-system PUFFS"
-.Cd "pseudo-device putter"
-.Pp
-.Nm
-.Op options
-.Ar share
-.Ar mountpoint
-.Sh DESCRIPTION
-.Em NOTE!
-This manual page describes features specific to the
-.Xr rump 3
-file server.
-Please see
-.Xr mount_smbfs 8
-for a full description of the available command line options.
-.Pp
-The
-.Nm
-utility can be used to mount smbfs file systems.
-It uses
-.Xr rump 3
-and
-.Xr p2k 3
-to facilitate running the file system as a server in userspace.
-As opposed to
-.Xr mount_smbfs 8 ,
-.Nm
-does not use file system code within the kernel and therefore does
-not require kernel support except
-.Xr puffs 4 .
-Apart from a minor speed penalty there is no downside with respect to
-in-kernel code.
-.Pp
-Even though the
-.Nm
-file system client runs within a virtual rump kernel in userspace,
-it uses host network services
-.Pq by means of Dq rump sockin .
-This means that regardless of whether using
-.Nm
-or
-.Xr mount_smbfs 8 ,
-the same network configurations will be used.
-Currently,
-.Dq sockin
-supports IPv4.
-.Pp
-To use
-.Nm
-via
-.Xr mount 8 ,
-the flags
-.Fl o Ar rump
-and
-.Fl t Ar smbfs
-should be given.
-Similarly,
-.Nm
-is used instead of
-.Xr mount_smbfs 8
-if
-.Dq rump
-is added to the options field of
-.Xr fstab 5 .
-.Sh SEE ALSO
-.Xr p2k 3 ,
-.Xr puffs 3 ,
-.Xr rump 3 ,
-.Xr mount_smbfs 8
-.Sh HISTORY
-The
-.Nm
-utility first appeared in
-.Nx 6.0 .
diff -r d2b3877125a2 -r 58de7c65dd2b usr.sbin/puffs/rump_smbfs/rump_smbfs.c
--- a/usr.sbin/puffs/rump_smbfs/rump_smbfs.c    Sat Apr 04 17:00:05 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/*     $NetBSD: rump_smbfs.c,v 1.6 2010/01/12 18:43:37 pooka Exp $     */
-
-/*
- * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/types.h>
-#include <sys/mount.h>
-
-#include <fs/smbfs/smbfs.h>
-
-#include <rump/rump.h>
-#include <rump/p2k.h>
-
-#include <err.h>
-#include <puffs.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "mount_smbfs.h"
-
-struct p2k_mount *docancel;
-static void
-pcancel(void)
-{
-
-       if (docancel)
-               p2k_cancel(docancel, 0);
-}
-
-int
-main(int argc, char *argv[])
-{
-       struct smbfs_args args;
-       char canon_dev[MAXPATHLEN], canon_dir[MAXPATHLEN];
-       struct p2k_mount *p2m;
-       int mntflags;
-
-       setprogname(argv[0]);
-       puffs_unmountonsignal(SIGINT, true);
-       puffs_unmountonsignal(SIGTERM, true);
-
-       p2m = p2k_init(PUFFS_KFLAG_WTCACHE);
-       atexit(pcancel);
-       docancel = p2m;
-       /* XXX: this will exit upon error.  therefore kludge with atexit */
-       mount_smbfs_parseargs(argc, argv, &args, &mntflags,
-           canon_dev, canon_dir);
-       docancel = NULL;
-
-       if (p2k_setup_fs(p2m, MOUNT_SMBFS, canon_dev, canon_dir, mntflags,
-           &args, sizeof(args)) == -1)
-               err(1, "mount");
-       if (p2k_mainloop(p2m) == -1)
-               err(1, "fs service");
-
-       return 0;
-}
diff -r d2b3877125a2 -r 58de7c65dd2b usr.sbin/puffs/rump_smbfs/smb_rumpops.c
--- a/usr.sbin/puffs/rump_smbfs/smb_rumpops.c   Sat Apr 04 17:00:05 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*     $NetBSD: smb_rumpops.c,v 1.1 2009/09/06 20:26:47 pooka Exp $    */
-
-/*
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
Prev by Date: [src/trunk]: src/distrib/sets/lists gnuctf is only binutils=234
Next by Date: [src/trunk]: src/sys/net Multilink PPP: sanity check of option values, storag...
Previous by Thread: [src/trunk]: src/distrib/sets/lists gnuctf is only binutils=234
Next by Thread: [src/trunk]: src/sys/net Multilink PPP: sanity check of option values, storag...
Indexes:
Home | Main Index | Thread Index | Old Index