Updated net/sharity-light 1.2 to 1.3

------------------------------------
(Some lines out of following lines doesn't seem to be included in
previous commit log, so ..including ..)

- Finding the GMT offset of the local time is not straight forward. Added
  an ifdef in kernel.c/kernel_init() to handle Solaris' way of doing it.
- INADDR_NONE is not defined on Solaris. Added workaround to rumba.c

* Release Sharity-Light 1.2 1998-11-24

- Added aSYSTEM and aHIDDEN attributes to smb_proc_unlink(), this allows
  deleting dotfiles on a samba server.

- Added contributed recode code for russian character set (compile time
  option)

* Release Sharity-Light 1.3 2003-12-29

5 files changed, 41 insertions, 45 deletions

diff --git a/net/sharity-light/Makefile b/net/sharity-light/Makefile
index a6f3953b0df..d6dc2fc6e12 100644
--- a/net/sharity-light/Makefile
+++ b/net/sharity-light/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2012/10/23 17:19:08 asau Exp $
+# $NetBSD: Makefile,v 1.12 2016/09/01 12:58:46 mef Exp $
 #
 
-DISTNAME=	Sharity-Light.1.2
-PKGNAME=	sharity-light-1.2
-PKGREVISION=	1
+DISTNAME=	Sharity-Light.1.3
+PKGNAME=	sharity-light-1.3
 CATEGORIES=	net
 MASTER_SITES=	http://www.obdev.at/ftp/pub/Products/Sharity-Light/
 
diff --git a/net/sharity-light/distinfo b/net/sharity-light/distinfo
index 93c46fd85a4..686c7d0c931 100644
--- a/net/sharity-light/distinfo
+++ b/net/sharity-light/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 00:35:37 agc Exp $
+$NetBSD: distinfo,v 1.11 2016/09/01 12:58:46 mef Exp $
 
-SHA1 (Sharity-Light.1.2.tar.gz) = 4a8e93695b1772005e401c2aafbd3f5f70a3b30e
-RMD160 (Sharity-Light.1.2.tar.gz) = 35fba8ab2ebd98cf32f2b20ac0fc8325a6c69325
-SHA512 (Sharity-Light.1.2.tar.gz) = 557caed5645112e8a087cc9a3be5ee66d031591ba23337478d5b502f9b0830262007f2ff9397f88e3281fc6920b3889e343adac9142880a66763f4072568f67f
-Size (Sharity-Light.1.2.tar.gz) = 76481 bytes
-SHA1 (patch-aa) = 349384306807e8d0e16334a2d9a7e7e0002ef8d1
-SHA1 (patch-ab) = 1f49eb5831020d9c491c2c872e07d68287e5c72a
-SHA1 (patch-ac) = 2087a294f04ff2cc4fc4edd1814807e6f01cd949
+SHA1 (Sharity-Light.1.3.tar.gz) = 8d4262dd2c793db74596527f4215c1c84a77f7af
+RMD160 (Sharity-Light.1.3.tar.gz) = 55f56a00c7488a2c29d38682a5faef92863f5d29
+SHA512 (Sharity-Light.1.3.tar.gz) = 8b7e0ff63d674c22e46cea6f3d581a30924cc49c63aeff4d46e8ccb837d1f9171a64a6ccd3e341b89dd5e9c905c28322c1c1cf578603b7a375240c5e0d0f1fe5
+Size (Sharity-Light.1.3.tar.gz) = 78504 bytes
+SHA1 (patch-aa) = 5d6f2c146aa382c0e5297e9369ffc542714832eb
+SHA1 (patch-ab) = 45c81730053307d4cd94111f0f5db864067285b1
+SHA1 (patch-ac) = 62d485693f19386756c9cfe44983df1c59763109
 SHA1 (patch-ad) = 9d884d65a3f12de391a190a43104c97073dcc785
 SHA1 (patch-ae) = a9f49fd4322f92f53e217b1fe9c5b3d54eb00515
 SHA1 (patch-af) = 55684c776c8a3eddaca6840757fb51ef0a78778d
diff --git a/net/sharity-light/patches/patch-aa b/net/sharity-light/patches/patch-aa
index 855c9dfeef3..4896781803f 100644
--- a/net/sharity-light/patches/patch-aa
+++ b/net/sharity-light/patches/patch-aa
@@ -1,17 +1,18 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/09 16:09:36 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2016/09/01 12:58:46 mef Exp $
 
---- Makefile.orig	Tue Nov 24 09:52:13 1998
-+++ Makefile	Thu Mar  8 11:27:22 2001
-@@ -5,18 +5,18 @@
+--- Makefile.orig	2003-12-29 20:11:57.000000000 +0900
++++ Makefile	2016-09-01 21:44:20.000000000 +0900
+@@ -5,7 +5,7 @@
  NAME	=	shlight
  
  INCLUDES =	-Iinclude -I.
 -THE_CC	=	gcc
-+THE_CC	=	${CC}
++THE_CC =	${CC}
  
  ##############################################################################
  ############################ System specific part ############################
- ##############################################################################
+@@ -15,11 +15,11 @@ THE_CC	=	gcc
+ # translation.
  
  # For NEXTSTEP/OPENSTEP:
 -CFLAGS = -Wall -O2 -traditional-cpp -g
@@ -26,7 +27,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/09 16:09:36 wiz Exp $
  
  # For Linux: (use static linking because of libc5/libc6 troubles)
  #CFLAGS = -Wall -O2 -g
-@@ -29,9 +29,9 @@
+@@ -37,9 +37,9 @@ RPC_WARNFLAGS = -Wno-unused -Wno-switch 
  #RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized
  
  # For NetBsd
@@ -38,7 +39,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/09 16:09:36 wiz Exp $
  
  # For BSDI
  #CFLAGS= -Wall -O2
-@@ -59,22 +59,21 @@
+@@ -67,22 +67,21 @@ RPC_WARNFLAGS = -Wno-unused -Wno-switch 
  ######################## End of system specific part #########################
  ##############################################################################
  
@@ -48,7 +49,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/09 16:09:36 wiz Exp $
 +LD	=	${LD}
 +STRIP	=	${STRIP}
  
- OFILES = proc.o sock.o rumba.o psinode.o kernel.o smb_abstraction.o fo_nfs.o
+ OFILES = proc.o recode.o sock.o rumba.o psinode.o kernel.o smb_abstraction.o fo_nfs.o
  
  .c.o:
 -	$(CC) $(CFLAGS) $(ARCH) -c -o $*.o $<
@@ -58,7 +59,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/09 16:09:36 wiz Exp $
  
  nfs_dir:
 -	(cd nfs; $(MAKE) "CFLAGS=$(CFLAGS)" "CC=$(THE_CC)" "ARCH=$(ARCH)" "RPC_WARNFLAGS=$(RPC_WARNFLAGS)")
-+	(cd nfs; $(MAKE) "CFLAGS=$(CFLAGS)" "CC=$(CC)" "ARCH=$(ARCH)" "RPC_WARNFLAGS=$(RPC_WARNFLAGS)")
++	(cd nfs; $(MAKE) "CFLAGS=$(CFLAGS)"     "CC=$(CC)" "ARCH=$(ARCH)" "RPC_WARNFLAGS=$(RPC_WARNFLAGS)")
  
  $(NAME): $(OFILES) nfs_dir
 -	$(CC) $(LDFLAGS) $(ARCH) -o $(NAME) $(OFILES) nfs/nfs.o $(LIBS)
diff --git a/net/sharity-light/patches/patch-ab b/net/sharity-light/patches/patch-ab
index bd1ac2dc0cb..d1a228002f8 100644
--- a/net/sharity-light/patches/patch-ab
+++ b/net/sharity-light/patches/patch-ab
@@ -1,22 +1,18 @@
-$NetBSD: patch-ab,v 1.5 2011/04/03 09:18:45 obache Exp $
+$NetBSD: patch-ab,v 1.6 2016/09/01 12:58:46 mef Exp $
 
---- nfs/syscalls.c.orig	1998-06-30 12:24:56.000000000 +0000
-+++ nfs/syscalls.c
-@@ -19,6 +19,13 @@
+--- nfs/syscalls.c.orig	2003-12-29 20:11:57.000000000 +0900
++++ nfs/syscalls.c	2016-09-01 21:47:55.000000000 +0900
+@@ -19,6 +19,9 @@
  #include <arpa/inet.h>
- #include "my_defines.h"
- 
-+#ifdef __NetBSD__
-+#include <nfs/nfsmount.h>
+ #ifdef __NetBSD__
+ #include <nfs/nfsmount.h>
 +#if __NetBSD_Version__ >= 299000900
 +#define statfs statvfs
 +#endif
-+#endif
-+
- /* --------------------------- general constants --------------------------- */
+ #endif
+ #include "my_defines.h"
  
- #define NFS_TIMEOUT_SECONDS		10	/* nfs timeout in seconds */
-@@ -62,7 +69,7 @@ int	syscall_mount(char *dir, void *root_
+@@ -68,7 +71,7 @@ int	syscall_mount(char *dir, void *root_
  									struct sockaddr_in *socket, char *mntfrom)
  {
  struct nfs_args		nfs_args;
@@ -25,7 +21,7 @@ $NetBSD: patch-ab,v 1.5 2011/04/03 09:18:45 obache Exp $
  #	ifdef _NEW_VFSCONF
  		struct vfsconf vfc;
  		int error;
-@@ -93,7 +100,7 @@ struct nfs_args		nfs_args;
+@@ -99,7 +102,7 @@ struct nfs_args		nfs_args;
  #else
  #	define NFSNAME MOUNT_NFS
  #endif
@@ -34,7 +30,7 @@ $NetBSD: patch-ab,v 1.5 2011/04/03 09:18:45 obache Exp $
  #	ifdef _NEW_VFSCONF
  #		define GETVFSBYNAME	error = getvfsbyname("nfs", &vfc)
  #		define VFCERROR		error
-@@ -113,6 +120,8 @@ struct nfs_args		nfs_args;
+@@ -119,6 +122,8 @@ struct nfs_args		nfs_args;
  	if (VFCERROR)
  		return -1;
  	return mount(VFCNFSNAME, dir, 0, &nfs_args);
diff --git a/net/sharity-light/patches/patch-ac b/net/sharity-light/patches/patch-ac
index dbe1897cc7b..5da0d3dc98b 100644
--- a/net/sharity-light/patches/patch-ac
+++ b/net/sharity-light/patches/patch-ac
@@ -1,19 +1,19 @@
-$NetBSD: patch-ac,v 1.1 2001/03/12 16:06:00 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2016/09/01 12:58:46 mef Exp $
 
---- proc.c.orig	Mon Nov 16 18:12:26 1998
-+++ proc.c
-@@ -867,12 +867,13 @@
+--- proc.c.orig	2003-12-29 20:11:57.000000000 +0900
++++ proc.c	2016-09-01 21:49:38.000000000 +0900
+@@ -823,12 +823,13 @@ smb_proc_mv(struct smb_server *server, 
          char *p;
          char *buf = server->packet;
          int result;
-+        const word o_attr = aSYSTEM | aHIDDEN;
++	const word o_attr = aSYSTEM | aHIDDEN;
  
          smb_lock_server(server);
  
   retry:
-         p = smb_setup_header(server, SMBunlink, 1, 2 + len);
+         p = smb_setup_header(server, SMBmv, 1, olen + nlen + 4);
 -        WSET(buf, smb_vwv0, 0);
 +        WSET(buf, smb_vwv0, o_attr);
-         smb_encode_ascii(p, path, len);
+         p = smb_encode_ascii(p, opath, olen);
+         smb_encode_ascii(p, npath, olen);
  
-         if ((result = smb_request_ok(server, SMBunlink, 0, 0)) < 0) {