Remove the old SMB1->NFS translator sharity-light. No support for encrypted
passwords (required by default since NT4 SP3 and dangerous to disable) so very limited server support. SMB1 needs to die anyway. And even when it worked, it never really worked particularly well. ok ajacoutot@ jca@
This commit is contained in:
sthen
parent
60fb27d8ee
commit
b7185a5622
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.1005 2017/05/06 15:55:06 fcambus Exp $
|
||||
# $OpenBSD: Makefile,v 1.1006 2017/05/15 14:18:42 sthen Exp $
|
||||
|
||||
SUBDIR =
|
||||
SUBDIR += GeoIP
|
||||
@ -628,7 +628,6 @@
|
||||
SUBDIR += seafile
|
||||
SUBDIR += sendxmpp
|
||||
SUBDIR += serf
|
||||
SUBDIR += sharity-light
|
||||
SUBDIR += si
|
||||
SUBDIR += sic
|
||||
SUBDIR += silc-client
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
# $OpenBSD: Makefile,v 1.26 2014/01/01 20:46:28 naddy Exp $
|
||||
|
||||
COMMENT= userland smbfs --- SMB to NFS protocols converter
|
||||
|
||||
VERSION= 1.3
|
||||
DISTNAME= Sharity-Light.${VERSION}
|
||||
PKGNAME= sharity-light-${VERSION}
|
||||
REVISION= 0
|
||||
CATEGORIES= net
|
||||
|
||||
MASTER_SITES= http://www.obdev.at/ftp/pub/Products/Sharity-Light/
|
||||
|
||||
HOMEPAGE= http://www.obdev.at/products/sharity-light/
|
||||
|
||||
# GPLv2
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
WANTLIB= c
|
||||
|
||||
NO_TEST= Yes
|
||||
|
||||
MAKE_FLAGS= ARCH="" THE_CC="${CC}" CFLAGS="${CFLAGS} -Wall"
|
||||
|
||||
post-extract:
|
||||
@mkdir -p ${WRKSRC}/unshlight
|
||||
@cp -f ${FILESDIR}/unshlight.c ${WRKSRC}/unshlight
|
||||
@cp -f ${FILESDIR}/Makefile.unshlight ${WRKSRC}/unshlight/Makefile
|
||||
|
||||
post-build:
|
||||
@cd ${WRKSRC}/unshlight && \
|
||||
${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
|
||||
|
||||
do-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Sharity-Light
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/shlight ${PREFIX}/sbin
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/unshlight/unshlight ${PREFIX}/sbin
|
||||
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/Sharity-Light
|
||||
${INSTALL_DATA} ${WRKSRC}/FAQ.txt ${PREFIX}/share/doc/Sharity-Light/FAQ
|
||||
${INSTALL_MAN} ${WRKSRC}/smbmount.8 ${PREFIX}/man/man8/sh-smbmount.8
|
||||
|
||||
.include <bsd.port.mk>
|
||||
@ -1,2 +0,0 @@
|
||||
SHA256 (Sharity-Light.1.3.tar.gz) = ASOa2agYZ/LAjSMGr2Fl+BruqbGjS+o2j0YwNVXXaBE=
|
||||
SIZE (Sharity-Light.1.3.tar.gz) = 78504
|
||||
@ -1,4 +0,0 @@
|
||||
PROG=unshlight
|
||||
NOMAN=sorry
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
@ -1,80 +0,0 @@
|
||||
/* $OpenBSD: unshlight.c,v 1.3 2009/04/01 16:24:05 jasper Exp $ */
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/mount.h>
|
||||
|
||||
#include <err.h>
|
||||
#include <sysexits.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <signal.h>
|
||||
#include <string.h>
|
||||
|
||||
static void usage(void);
|
||||
|
||||
int
|
||||
main(int argc, char** argv)
|
||||
{
|
||||
struct statfs* mntbuf;
|
||||
int mntcount, i;
|
||||
int aflag=0;
|
||||
int ch;
|
||||
|
||||
while ( (ch = getopt(argc, argv, "a")) != -1) {
|
||||
switch (ch) {
|
||||
case 'a':
|
||||
aflag=1;
|
||||
break;
|
||||
case '?':
|
||||
default:
|
||||
usage();
|
||||
}
|
||||
}
|
||||
argc -= optind;
|
||||
argv += optind;
|
||||
if (aflag && argc != 0)
|
||||
usage();
|
||||
if (!aflag && argc == 0)
|
||||
usage();
|
||||
|
||||
for (; argc>0 || aflag; aflag?(void)(aflag=0):(void)(argc--, argv++)) {
|
||||
char abspath[MAXPATHLEN];
|
||||
pid_t pid=0;
|
||||
if (argc > 0) {
|
||||
if (realpath(argv[0], abspath) == 0) {
|
||||
warn(abspath);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
mntcount=getmntinfo(&mntbuf, MNT_NOWAIT);
|
||||
if (mntcount < 0)
|
||||
err(EX_OSERR, "getmntinfo");
|
||||
for (i=0; i<mntcount; i++) {
|
||||
char* s;
|
||||
int error;
|
||||
if (argc > 0 && strcmp(abspath, mntbuf[i].f_mntonname) != 0) continue;
|
||||
#if (defined(__FreeBSD_version) && __FreeBSD_version > 300000) || defined(__OpenBSD__)
|
||||
if (strcmp(mntbuf[i].f_fstypename, "nfs") != 0) continue;
|
||||
#else
|
||||
if (mntbuf[i].f_type != MOUNT_NFS) continue;
|
||||
#endif
|
||||
if (strncmp(mntbuf[i].f_mntfromname, "shlight-", 8) != 0) continue;
|
||||
pid=strtoul(mntbuf[i].f_mntfromname+8, &s, 10);
|
||||
if (*s) continue;
|
||||
error = unmount (mntbuf[i].f_mntonname, 0);
|
||||
if (error == 0) {
|
||||
kill (pid, SIGHUP);
|
||||
} else {
|
||||
warn(mntbuf[i].f_mntonname);
|
||||
}
|
||||
}
|
||||
if (argc > 0 && !pid)
|
||||
warnx("%s: not currently mounted", abspath);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
usage(void)
|
||||
{
|
||||
errx(EX_USAGE, "Usage: unshlight [-a] [node]");
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-README,v 1.2 2008/02/13 23:01:23 merdely Exp $
|
||||
--- README.orig Mon Dec 29 06:11:57 2003
|
||||
+++ README Wed Feb 13 16:47:12 2008
|
||||
@@ -178,8 +178,7 @@ I have added the man-page for smbmount to this distrib
|
||||
the operation of Sharity-Light and smbmount is so similar. You can view
|
||||
it in a terminal window by typing:
|
||||
|
||||
- nroff -man smbmount.8 | more
|
||||
-
|
||||
+man sh-smbmount
|
||||
|
||||
Security considerations
|
||||
=======================
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-nfs-version,v 1.4 2009/04/01 16:24:05 jasper Exp $
|
||||
--- nfs/syscalls.c.orig Mon Dec 29 06:11:57 2003
|
||||
+++ nfs/syscalls.c Wed Feb 13 16:47:13 2008
|
||||
@@ -78,7 +78,7 @@ struct nfs_args nfs_args;
|
||||
#endif
|
||||
|
||||
bzero(&nfs_args, sizeof(nfs_args));
|
||||
-#if defined(BSD4_4_LITE2) || defined(NETBSD)
|
||||
+#if defined(BSD4_4_LITE2) || defined(NETBSD) || defined(__OpenBSD__)
|
||||
nfs_args.version = NFS_ARGSVERSION;
|
||||
#endif
|
||||
nfs_args.wsize = 8192;
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-rumba_c,v 1.1 2008/02/13 23:01:23 merdely Exp $
|
||||
--- rumba.c.orig Wed Feb 13 16:49:10 2008
|
||||
+++ rumba.c Wed Feb 13 16:49:18 2008
|
||||
@@ -87,7 +87,7 @@ static inline void str_upper(char *name)
|
||||
|
||||
static void print_version(void)
|
||||
{
|
||||
- printf("%s: Version 1.2 (2003-12-29)\n", progname);
|
||||
+ printf("%s: Version 1.3 (2003-12-29)\n", progname);
|
||||
exit(0);
|
||||
}
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
If you want a short description of what Sharity-Light can do for you: you can
|
||||
mount volumes exported by Windows or related operating systems on your Unix
|
||||
machine.
|
||||
|
||||
What does Sharity-Light do?
|
||||
===========================
|
||||
If you know smbfs for Linux: Sharity-Light is roughly the same. It is
|
||||
derived from smbfs, but runs as a user level program, not in the kernel.
|
||||
If you know samba: Sharity-Light is roughly the opposite: a client for the
|
||||
Lanmanager protocol. If you know neither of these: Sharity-Light lets you
|
||||
mount drives exported by Windows (f.Workgroups/95/NT), Lan Manager, OS/2
|
||||
etc. on Unix machines.
|
||||
@ -1,7 +0,0 @@
|
||||
@comment $OpenBSD: PLIST,v 1.4 2009/04/01 16:24:05 jasper Exp $
|
||||
@man man/man8/sh-smbmount.8
|
||||
@bin sbin/shlight
|
||||
@bin sbin/unshlight
|
||||
share/doc/Sharity-Light/
|
||||
share/doc/Sharity-Light/FAQ
|
||||
share/doc/Sharity-Light/README
|
||||
Loading…
Reference in New Issue
Block a user