Update ja-samba package to 2.2.4.1.0 (samba-ja 2.2.4-ja-1.0).

This is localized message based on samba 2.2.4.  Its own feature:

- Localized winbind support (though winbind isn't supported on NetBSD.)
- Japanese support for resource name: file name, share name, NetBIOS name
  and NetBIOS user name.
- Machine depended character code for file and directory name.
- Japanese documents.
- Internatilnalized swat.

It also fixes security problem found on samba 2.2.3 and later which
happens with --with-tdbsam option.  (It isn't enabled on default.)

14 files changed, 105 insertions, 295 deletions

diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index 1b2f30cbcd5..8fbd2aae667 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,21 +1,19 @@
-# $NetBSD: Makefile,v 1.3 2002/06/28 17:13:59 taca Exp $
+# $NetBSD: Makefile,v 1.4 2002/07/07 14:36:40 taca Exp $
 
-DISTNAME=		samba-2.2.2-ja-1.1
-PKGNAME=		ja-samba-2.2.2.1.1
-PKGREVISION=		1
+DISTNAME=		samba-${SAMBA_BASE_VERSION}-ja-${SAMBA_JA_VERSION}
+PKGNAME=		ja-samba-${SAMBA_BASE_VERSION}.${SAMBA_JA_VERSION}
 WRKSRC=			${WRKDIR}/${DISTNAME}/source
 CATEGORIES=		net
-MASTER_SITES=		ftp://ftp.samba.gr.jp/pub/samba-jp/samba-2.2.2-ja/ \
-			ftp://ring.asahi-net.or.jp/pub/net/samba-jp/samba-2.2.2-ja/
+MASTER_SITES=		ftp://ftp.samba.gr.jp/pub/samba-jp/samba-${SAMBA_BASE_VERSION}-ja/ \
+			ftp://ring.asahi-net.or.jp/pub/net/samba-jp/samba-${SAMBA_BASE_VERSION}-ja/
 EXTRACT_SUFX=		.tar.bz2
 
-PATCH_SITES=		${MASTER_SITES:S/$/patches\//}
-PATCHFILES=		samba-2.2.2-ja-1.1-shirai-1.0.patch.gz
-
 MAINTAINER=		tech-pkg-ja@jp.netbsd.org
 HOMEPAGE=		http://www.jp.samba.org/project/samba-ja/index.html.en
 COMMENT=		Samba supporting I18N swat and L10N for Japanese
 
+SAMBA_BASE_VERSION=	2.2.4
+SAMBA_JA_VERSION=	1.0
 CONFLICTS+=		samba-[0-9]*
 
 GNU_CONFIGURE=		# defined
diff --git a/net/ja-samba/PLIST b/net/ja-samba/PLIST
index 4d6acd94991..f6c36f14fc3 100644
--- a/net/ja-samba/PLIST
+++ b/net/ja-samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/06/25 23:22:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/07/07 14:36:41 taca Exp $
 bin/make_nftable
 bin/make_printerdef
 bin/make_smbcodepage
@@ -13,6 +13,7 @@ bin/smbpasswd
 bin/smbspool
 bin/smbstatus
 bin/smbtar
+bin/tdbbackup
 bin/testparm
 bin/testprns
 etc/rc.d/nmbd
@@ -26,7 +27,6 @@ man/ja_JP.EUC/man1/rpcclient.1
 man/ja_JP.EUC/man1/smbcacls.1
 man/ja_JP.EUC/man1/smbclient.1
 man/ja_JP.EUC/man1/smbcontrol.1
-man/ja_JP.EUC/man1/smbrun.1
 man/ja_JP.EUC/man1/smbsh.1
 man/ja_JP.EUC/man1/smbstatus.1
 man/ja_JP.EUC/man1/smbtar.1
@@ -38,6 +38,7 @@ man/ja_JP.EUC/man5/smb.conf.5
 man/ja_JP.EUC/man5/smbpasswd.5
 man/ja_JP.EUC/man7/samba.7
 man/ja_JP.EUC/man8/nmbd.8
+man/ja_JP.EUC/man8/pdbedit.8
 man/ja_JP.EUC/man8/smbd.8
 man/ja_JP.EUC/man8/smbmnt.8
 man/ja_JP.EUC/man8/smbmount.8
@@ -65,6 +66,7 @@ man/man5/smb.conf.5
 man/man5/smbpasswd.5
 man/man7/samba.7
 man/man8/nmbd.8
+man/man8/pdbedit.8
 man/man8/smbd.8
 man/man8/smbmnt.8
 man/man8/smbmount.8
@@ -113,6 +115,7 @@ share/doc/samba/PROFILES.txt
 share/doc/samba/Passwords.txt
 share/doc/samba/Printing.txt
 share/doc/samba/README.DCEDFS
+share/doc/samba/README.NOW
 share/doc/samba/README.jis
 share/doc/samba/README.sambatar
 share/doc/samba/Recent-FAQs.txt
@@ -120,6 +123,7 @@ share/doc/samba/RoutedNetworks.txt
 share/doc/samba/SCO.txt
 share/doc/samba/SMBTAR.notes
 share/doc/samba/Samba-OpenSSL.txt
+share/doc/samba/Solaris-Winbind-HOWTO.txt
 share/doc/samba/Speed.txt
 share/doc/samba/Speed2.txt
 share/doc/samba/Tracing.txt
@@ -136,9 +140,6 @@ share/doc/samba/WinXP_SignOrSeal.reg
 share/doc/samba/WindowsTerminalServer.reg
 share/doc/samba/announce
 share/doc/samba/cifsntdomain.txt
-share/doc/samba/kurs.pdf
-share/doc/samba/kurs.tex
-share/doc/samba/logo.ps
 share/doc/samba/security_level.txt
 share/examples/samba/LDAP/README
 share/examples/samba/LDAP/export2_smbpasswd.pl
@@ -147,6 +148,9 @@ share/examples/samba/LDAP/import2_smbpasswd.pl
 share/examples/samba/LDAP/import_smbpasswd.pl
 share/examples/samba/LDAP/ldapchpasswd
 share/examples/samba/LDAP/ldapsync.pl
+share/examples/samba/LDAP/samba-schema-netscapeds4.x
+share/examples/samba/LDAP/samba-schema-netscapeds5.x
+share/examples/samba/LDAP/samba-schema.IBMSecureWay
 share/examples/samba/LDAP/samba.schema
 share/examples/samba/README
 share/examples/samba/misc/convert_smbpasswd
@@ -162,6 +166,7 @@ share/examples/samba/printer-accounting/lp-acct
 share/examples/samba/printer-accounting/printcap
 share/examples/samba/printing/smbprint
 share/examples/samba/printing/smbprint.newer
+share/examples/samba/printing/smbprint.safer
 share/examples/samba/printing/smbprint.sysv
 share/examples/samba/simple/README
 share/examples/samba/simple/smb.conf
@@ -195,6 +200,7 @@ share/samba/codepages/codepage.932
 share/samba/codepages/codepage.936
 share/samba/codepages/codepage.949
 share/samba/codepages/codepage.950
+share/samba/codepages/nftable.1251
 share/samba/codepages/nftable.437
 share/samba/codepages/nftable.737
 share/samba/codepages/nftable.775
@@ -215,6 +221,7 @@ share/samba/codepages/nftable.ISO8859-5
 share/samba/codepages/nftable.ISO8859-7
 share/samba/codepages/nftable.ISO8859-9
 share/samba/codepages/nftable.KOI8-R
+share/samba/codepages/unicode_map.1251
 share/samba/codepages/unicode_map.437
 share/samba/codepages/unicode_map.737
 share/samba/codepages/unicode_map.775
@@ -242,7 +249,9 @@ share/samba/swat/help/Integrating-with-Windows.html
 share/samba/swat/help/NT_Security.html
 share/samba/swat/help/OS2-Client-HOWTO.html
 share/samba/swat/help/PAM-Authentication-And-Samba.html
+share/samba/swat/help/Samba-BDC-HOWTO.html
 share/samba/swat/help/Samba-HOWTO-Collection.html
+share/samba/swat/help/Samba-LDAP-HOWTO.html
 share/samba/swat/help/Samba-PDC-HOWTO.html
 share/samba/swat/help/UNIX_INSTALL.html
 share/samba/swat/help/findsmb.1.html
@@ -252,10 +261,9 @@ share/samba/swat/help/make_unicodemap.1.html
 share/samba/swat/help/msdfs_setup.html
 share/samba/swat/help/nmbd.8.html
 share/samba/swat/help/nmblookup.1.html
+share/samba/swat/help/pdbedit.8.html
 share/samba/swat/help/printer_driver2.html
 share/samba/swat/help/rpcclient.1.html
-share/samba/swat/help/samba-pdc-faq.html
-share/samba/swat/help/samba-pdc-howto.html
 share/samba/swat/help/samba.7.html
 share/samba/swat/help/smb.conf.5.html
 share/samba/swat/help/smbcacls.1.html
@@ -266,7 +274,6 @@ share/samba/swat/help/smbmnt.8.html
 share/samba/swat/help/smbmount.8.html
 share/samba/swat/help/smbpasswd.5.html
 share/samba/swat/help/smbpasswd.8.html
-share/samba/swat/help/smbrun.1.html
 share/samba/swat/help/smbsh.1.html
 share/samba/swat/help/smbspool.8.html
 share/samba/swat/help/smbstatus.1.html
@@ -360,6 +367,7 @@ share/samba/swat/ja/help/make_unicodemap.1.html
 share/samba/swat/ja/help/msdfs_setup.html
 share/samba/swat/ja/help/nmbd.8.html
 share/samba/swat/ja/help/nmblookup.1.html
+share/samba/swat/ja/help/pdbedit.8.html
 share/samba/swat/ja/help/printer_driver2.html
 share/samba/swat/ja/help/quota/fig1.gif
 share/samba/swat/ja/help/quota/fig2.gif
@@ -405,7 +413,6 @@ share/samba/swat/ja/help/smbmount.8.html
 share/samba/swat/ja/help/smbmount.txt.html
 share/samba/swat/ja/help/smbpasswd.5.html
 share/samba/swat/ja/help/smbpasswd.8.html
-share/samba/swat/ja/help/smbrun.1.html
 share/samba/swat/ja/help/smbsh.1.html
 share/samba/swat/ja/help/smbspool.8.html
 share/samba/swat/ja/help/smbstatus.1.html
diff --git a/net/ja-samba/distinfo b/net/ja-samba/distinfo
index a25adc74bae..4b137b6eded 100644
--- a/net/ja-samba/distinfo
+++ b/net/ja-samba/distinfo
@@ -1,21 +1,12 @@
-$NetBSD: distinfo,v 1.3 2002/06/28 17:13:59 taca Exp $
+$NetBSD: distinfo,v 1.4 2002/07/07 14:36:41 taca Exp $
 
-SHA1 (samba-2.2.2-ja-1.1.tar.bz2) = e443b3b99db850f4b2f0ca6a829752711cabb87b
-Size (samba-2.2.2-ja-1.1.tar.bz2) = 7154111 bytes
-SHA1 (samba-2.2.2-ja-1.1-shirai-1.0.patch.gz) = ce66057f33061eba1840896c3a0a0f7814832053
-Size (samba-2.2.2-ja-1.1-shirai-1.0.patch.gz) = 6116 bytes
-SHA1 (patch-aa) = 37e11e0384257f6b433fb5353cf150b5c6fe8e9b
-SHA1 (patch-ab) = 11478bb2f46cb5a40585fdb41af635c661fe9476
-SHA1 (patch-ac) = b0612782e2243dfe6988abd08c24c4c82c32d722
+SHA1 (samba-2.2.4-ja-1.0.tar.bz2) = 70b49ad277ed8ad4b5444fd9f6ec3be4616e6273
+Size (samba-2.2.4-ja-1.0.tar.bz2) = 7093819 bytes
+SHA1 (patch-aa) = 18edc5479d6c0b1e552594b5754a4df741c3e25d
 SHA1 (patch-ad) = 6ecafde897991512af7ba1038d91278b83453008
-SHA1 (patch-ae) = 6e2bea197fe641ab03f14c98a5250bb8cee938c2
-SHA1 (patch-af) = f1d8d10b4fa9aec77a6dd878d984e71a61312442
-SHA1 (patch-ah) = 73cbcbee5a4611b1677fe9f0ba1d2686a6384a98
-SHA1 (patch-ai) = 69c4a234da9dd072e38fcac0be80c5ad5d3b5752
+SHA1 (patch-ai) = 6e9869efb1cdd4a683628b4d26228319ea224a2e
 SHA1 (patch-ak) = 24046b0ce52854f676015a5e25c9ffd23424efe4
 SHA1 (patch-al) = e7caad8f6743537469866f9b47b0044ec95852ad
 SHA1 (patch-am) = 92aa5e122529a30e05199cbe26620b3ac01adbc5
 SHA1 (patch-an) = 55c7f9785c19d84b8ad74bbf0827162b156e2327
-SHA1 (patch-ba) = 5d99806e0cb3ddf2d30e09cf414cf7651a1b6455
-SHA1 (patch-bb) = df50bb4ca65693f54e6082693afd3a3867826427
-SHA1 (patch-bc) = 0102830482ed9f0a2b2f2da3f78768bd36f779e3
+SHA1 (patch-bd) = ce538d019d08f4ea8b1b74bdff7b4462da546429
diff --git a/net/ja-samba/patches/patch-aa b/net/ja-samba/patches/patch-aa
index 710d3157022..5318ad59b78 100644
--- a/net/ja-samba/patches/patch-aa
+++ b/net/ja-samba/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/25 15:31:34 taca Exp $
+$NetBSD: patch-aa,v 1.2 2002/07/07 14:36:42 taca Exp $
 
---- Makefile.in.orig	Fri Nov  9 20:28:07 2001
+--- Makefile.in.orig	Fri Jun 21 10:28:27 2002
 +++ Makefile.in
-@@ -51,7 +51,7 @@
+@@ -52,7 +52,7 @@
  CONFIGFILE = $(CONFIGDIR)/smb.conf
  LMHOSTSFILE = $(CONFIGDIR)/lmhosts
  DRIVERFILE = $(CONFIGDIR)/printers.def
@@ -11,22 +11,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/06/25 15:31:34 taca Exp $
  # This is where smbpasswd et al go
  PRIVATEDIR = @privatedir@
  
-@@ -64,6 +64,9 @@
- # the directory where lock files go
- LOCKDIR = @lockdir@
- 
-+# the directory where pid files go
-+PIDFILEDIR = /var/run
-+
- # libsmbclient support here
- BLDSHARED = @BLDSHARED@
- LIBSMBCLIENT_MAJOR=0
-@@ -88,7 +91,7 @@
- PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DTDB_PASSWD_FILE=\"$(TDB_PASSWD_FILE)\"
- FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\"
- FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"  
--FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
-+FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" -DSMBRUN=\"$(SMBRUN)\" 
- FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" 
- FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H   -DI18N_PACKAGE=\"$(I18N_PACKAGE)\" -DSWAT_I18N_PACKAGE=\"$(SWAT_I18N_PACKAGE)\" -DSWAT_I18N_LOCALEDIR=\"$(i18n_localedir)\" -DI18N_LOCALEDIR=\"$(i18n_localedir)\" -Iintl -I$(srcdir)/intl
- 
diff --git a/net/ja-samba/patches/patch-ab b/net/ja-samba/patches/patch-ab
deleted file mode 100644
index b84e8391234..00000000000
--- a/net/ja-samba/patches/patch-ab
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/06/25 15:31:34 taca Exp $
-
---- configure.in.orig	Wed Feb 20 16:39:39 2002
-+++ configure.in
-@@ -13,13 +13,15 @@
-     codepagedir="\$(DATADIR)/samba/codepages"
-     configdir="${sysconfdir}/samba"
-     lockdir="\${VARDIR}/cache/samba"
-+    piddir="\$(VARDIR)/run"
-     logfilebase="\${VARDIR}/log/samba"
-     privatedir="\${CONFIGDIR}/private"
-     swatdir="\${DATADIR}/samba/swat",
-     codepagedir="\$(LIBDIR)/codepages"
-     configdir="\$(LIBDIR)"
-     lockdir="\$(VARDIR)/locks"
--    logfilebase="\$(VARDIR)"
-+    piddir="\${VARDIR}/run"
-+    logfilebase="\$(VARDIR)/log"
-     privatedir="\${prefix}/private"
-     swatdir="\${prefix}/swat")
- 
-@@ -56,6 +58,22 @@
-   esac])
- 
- #################################################
-+# set pid directory location
-+AC_ARG_WITH(piddir,
-+[  --with-piddir=DIR       Where to put lock files (\${VARDIR}/run)],
-+[ case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    AC_MSG_WARN([--with-piddir called without argument - will use default])
-+  ;;
-+  * )
-+    piddir="$withval"
-+    ;;
-+  esac])
-+
-+#################################################
- # set SWAT directory location
- AC_ARG_WITH(swatdir,
- [  --with-swatdir=DIR      Where to put SWAT files ($ac_default_prefix/swat)],
-@@ -108,6 +126,7 @@
- AC_SUBST(configdir)
- AC_SUBST(lockdir)
- AC_SUBST(logfilebase)
-+AC_SUBST(piddir)
- AC_SUBST(privatedir)
- AC_SUBST(swatdir)
- AC_SUBST(bindir)
diff --git a/net/ja-samba/patches/patch-ac b/net/ja-samba/patches/patch-ac
deleted file mode 100644
index cbbe6dc36f8..00000000000
--- a/net/ja-samba/patches/patch-ac
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/06/25 15:31:34 taca Exp $
-
---- configure.orig	Wed Feb 20 16:47:22 2002
-+++ configure
-@@ -19,6 +19,8 @@
- ac_help="$ac_help
-   --with-lockdir=DIR      Where to put lock files ($ac_default_prefix/var/locks)"
- ac_help="$ac_help
-+  --with-piddir=DIR       Where to put lock files (\${VARDIR}/run)"
-+ac_help="$ac_help
-   --with-swatdir=DIR      Where to put SWAT files ($ac_default_prefix/swat)"
- ac_help="$ac_help
-   --with-configdir=DIR    Where to put configuration files (\$libdir)"
-@@ -611,6 +613,7 @@
-   codepagedir="\$(DATADIR)/samba/codepages"
-     configdir="${sysconfdir}/samba"
-     lockdir="\${VARDIR}/cache/samba"
-+    piddir="\$(VARDIR)/run"
-     logfilebase="\${VARDIR}/log/samba"
-     privatedir="\${CONFIGDIR}/private"
-     swatdir="\${DATADIR}/samba/swat"
-@@ -618,7 +621,8 @@
-   codepagedir="\$(LIBDIR)/codepages"
-     configdir="\$(LIBDIR)"
-     lockdir="\$(VARDIR)/locks"
--    logfilebase="\$(VARDIR)"
-+    piddir="\${VARDIR}/run"
-+    logfilebase="\$(VARDIR)/log"
-     privatedir="\${prefix}/private"
-     swatdir="\${prefix}/swat"
- fi
-@@ -663,6 +667,25 @@
- 
- 
- #################################################
-+# set pid directory location
-+# Check whether --with-piddir or --without-piddir was given.
-+if test "${with_piddir+set}" = set; then
-+  withval="$with_piddir"
-+   case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    echo "configure: warning: --with-piddir called without argument - will use default" 1>&2
-+  ;;
-+  * )
-+    piddir="$withval"
-+    ;;
-+  esac
-+fi
-+
-+
-+#################################################
- # set SWAT directory location
- # Check whether --with-swatdir or --without-swatdir was given.
- if test "${with_swatdir+set}" = set; then
-@@ -14749,6 +14772,7 @@
- s%@configdir@%$configdir%g
- s%@lockdir@%$lockdir%g
- s%@logfilebase@%$logfilebase%g
-+s%@piddir@%$piddir%g
- s%@privatedir@%$privatedir%g
- s%@swatdir@%$swatdir%g
- s%@RUNPROG@%$RUNPROG%g
diff --git a/net/ja-samba/patches/patch-ae b/net/ja-samba/patches/patch-ae
deleted file mode 100644
index fe31717701a..00000000000
--- a/net/ja-samba/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/06/25 15:31:34 taca Exp $
-
---- include/proto.h.orig	Fri Dec 28 11:55:08 2001
-+++ include/proto.h
-@@ -1747,6 +1747,7 @@
- char *lp_deleteprinter_cmd __P((void));
- char *lp_os2_driver_map __P((void));
- char *lp_lockdir __P((void));
-+char *lp_piddir __P((void));
- #ifdef WITH_UTMP
- char *lp_utmpdir __P((void));
- char *lp_wtmpdir __P((void));
diff --git a/net/ja-samba/patches/patch-af b/net/ja-samba/patches/patch-af
deleted file mode 100644
index de42c74b533..00000000000
--- a/net/ja-samba/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/06/25 15:31:34 taca Exp $
-
---- lib/pidfile.c.orig	Fri Nov  9 18:26:50 2001
-+++ lib/pidfile.c
-@@ -43,7 +43,7 @@
- 	unsigned ret;
- 	pstring pidFile;
- 
--	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
-+	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
- 
- 	fd = sys_open(pidFile, O_NONBLOCK | O_RDONLY, 0644);
- 	if (fd == -1) {
-@@ -84,7 +84,7 @@
- 	pstring pidFile;
- 	pid_t pid;
- 
--	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
-+	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
- 
- 	pid = pidfile_pid(name);
- 	if (pid != 0) {
diff --git a/net/ja-samba/patches/patch-ah b/net/ja-samba/patches/patch-ah
deleted file mode 100644
index d397f30545f..00000000000
--- a/net/ja-samba/patches/patch-ah
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/06/25 15:31:34 taca Exp $
-
---- param/loadparm.c.orig	Tue Dec 25 19:54:34 2001
-+++ param/loadparm.c
-@@ -117,6 +117,7 @@
- 	char *szDeletePrinterCommand;
- 	char *szOs2DriverMap;
- 	char *szLockDir;
-+	char *szPidDir;
- 	char *szRootdir;
- 	char *szDefaultService;
- 	char *szDfree;
-@@ -1001,6 +1002,7 @@
- 	{N_("auto services"), P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING},
- 	{N_("lock directory"), P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0}, 
- 	{N_("lock dir"), P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
-+	{N_("pid directory"), P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
- #ifdef WITH_UTMP
- 	{N_("utmp directory"), P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
- 	{N_("wtmp directory"), P_STRING, P_GLOBAL, &Globals.szWtmpDir, NULL, NULL, 0},
-@@ -1236,6 +1238,7 @@
- 	string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM);
- 	string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
- 	string_set(&Globals.szLockDir, LOCKDIR);
-+	string_set(&Globals.szPidDir, PIDFILEDIR);
- #ifdef WITH_UTMP
- 	string_set(&Globals.szUtmpDir, "");
- 	string_set(&Globals.szWtmpDir, "");
-@@ -1486,6 +1489,7 @@
- FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
- FN_GLOBAL_STRING(lp_os2_driver_map, &Globals.szOs2DriverMap)
- FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
-+FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
- #ifdef WITH_UTMP
- FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir)
- FN_GLOBAL_STRING(lp_wtmpdir, &Globals.szWtmpDir)
diff --git a/net/ja-samba/patches/patch-ai b/net/ja-samba/patches/patch-ai
index 36f4e82e911..61b75a23d8f 100644
--- a/net/ja-samba/patches/patch-ai
+++ b/net/ja-samba/patches/patch-ai
@@ -1,10 +1,10 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/06/25 15:31:34 taca Exp $
+$NetBSD: patch-ai,v 1.2 2002/07/07 14:36:45 taca Exp $
 
---- profile/profile.c.orig	Fri Nov  9 18:27:26 2001
+--- profile/profile.c.orig	Fri Jun  7 20:08:25 2002
 +++ profile/profile.c
-@@ -24,7 +24,7 @@
+@@ -22,7 +22,7 @@
  
- extern int DEBUGLEVEL;
+ #include "includes.h"
  
 -#define IPC_PERMS ((SHM_R | SHM_W) | (SHM_R>>3) | (SHM_R>>6))
 +#define IPC_PERMS ((S_IRUSR | S_IWUSR) | S_IRGRP | S_IROTH)
diff --git a/net/ja-samba/patches/patch-ba b/net/ja-samba/patches/patch-ba
deleted file mode 100644
index c6dffe61ad2..00000000000
--- a/net/ja-samba/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.1.1.1 2002/06/25 15:31:34 taca Exp $
-
---- lib/charcnv.c.orig	Tue Oct  9 20:15:34 2001
-+++ lib/charcnv.c
-@@ -306,7 +306,7 @@
-     initmaps();
- 
-   for (out = to; *from && (out - to < sizeof(pstring) - 1);)
--      *out++ = dos2unix[(unsigned char)*from++];
-+      *out++ = unix2dos[(unsigned char)*from++];
-   *out = '\0';
-   return to;
- }
diff --git a/net/ja-samba/patches/patch-bb b/net/ja-samba/patches/patch-bb
deleted file mode 100644
index 21588e244c6..00000000000
--- a/net/ja-samba/patches/patch-bb
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2002/06/28 17:14:00 taca Exp $
-
---- smbd/trans2.c.orig	Fri Nov  9 18:27:43 2001
-+++ smbd/trans2.c
-@@ -300,8 +300,8 @@
- static BOOL exact_match(char *str,char *mask, BOOL case_sig) 
- {
- 	if (mask[0] == '.' && mask[1] == 0) return False;
--	if (case_sig) return strcmp(str,mask)==0;
--	return strcasecmp(str,mask) == 0;
-+	if (case_sig) return StrCmp(str,mask)==0;
-+	return StrCaseCmp(str,mask) == 0;
- }
- 
- /****************************************************************************
diff --git a/net/ja-samba/patches/patch-bc b/net/ja-samba/patches/patch-bc
deleted file mode 100644
index 8b50384334a..00000000000
--- a/net/ja-samba/patches/patch-bc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2002/06/28 17:14:00 taca Exp $
-
---- utils/status.c.orig	Fri Nov  9 18:27:58 2001
-+++ utils/status.c
-@@ -513,6 +513,7 @@
- 	struct session_record *ptr;
- 	struct connections_data crec;
- 	pstring unixname;
-+	pstring unixcrecname;
- 
- 	if (dbuf.dsize != sizeof(crec))
- 		return 0;
-@@ -555,7 +556,7 @@
- 						add a sort at some time */
- 		} else {
- 			printf("%-10.10s   %-8s %-8s %5d   %-8s (%s) %s",
--			       crec.name,
-+			       dos_to_unix( unixcrecname, crec.name  ),
- 			       dos_to_unix(unixname, uidtoname(crec.uid)),
- 			       gidtoname(crec.gid),(int)crec.pid,
- 			       crec.machine,crec.addr,
diff --git a/net/ja-samba/patches/patch-bd b/net/ja-samba/patches/patch-bd
new file mode 100644
index 00000000000..2ac37290771
--- /dev/null
+++ b/net/ja-samba/patches/patch-bd
@@ -0,0 +1,69 @@
+$NetBSD: patch-bd,v 1.1 2002/07/07 14:36:48 taca Exp $
+
+--- smbd/quotas.c.orig	Fri Jun  7 20:09:06 2002
++++ smbd/quotas.c
+@@ -855,7 +855,7 @@
+ 
+ #else
+ 
+-#if    defined(__FreeBSD__) || defined(__OpenBSD__)
++#if    defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ #include <ufs/ufs/quota.h>
+ #include <machine/param.h>
+ #elif         AIX
+@@ -865,7 +865,7 @@
+ #define dqb_curfiles dqb_curinodes
+ #define dqb_fhardlimit dqb_ihardlimit
+ #define dqb_fsoftlimit dqb_isoftlimit
+-#else /* !__FreeBSD__ && !AIX && !__OpenBSD__ */
++#else /* !__FreeBSD__ && !AIX && !__OpenBSD__ && !__NetBSD__ */
+ #include <sys/quota.h>
+ #include <devnm.h>
+ #endif
+@@ -879,7 +879,7 @@
+   int r;
+   struct dqblk D;
+   uid_t euser_id;
+-#if !defined(__FreeBSD__) && !defined(AIX) && !defined(__OpenBSD__)
++#if !defined(__FreeBSD__) && !defined(AIX) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+   char dev_disk[256];
+   SMB_STRUCT_STAT S;
+   /* find the block device file */
+@@ -898,7 +898,7 @@
+ 
+   restore_re_uid();
+ #else 
+-#if defined(__FreeBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+   {
+     /* FreeBSD patches from Marty Moll <martym@arbor.edu> */
+     gid_t egrp_id;
+@@ -923,15 +923,15 @@
+   r= quotactl(path,QCMD(Q_GETQUOTA,USRQUOTA),euser_id,(char *) &D);
+ #else /* !__FreeBSD__ && !AIX && !__OpenBSD__ */
+   r=quotactl(Q_GETQUOTA, dev_disk, euser_id, &D);
+-#endif /* !__FreeBSD__ && !AIX && !__OpenBSD__ */
++#endif /* !__FreeBSD__ && !AIX && !__OpenBSD__ && !__NetBSD__ */
+ #endif /* HPUX */
+ 
+   /* Use softlimit to determine disk space, except when it has been exceeded */
+-#if defined(__FreeBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+   *bsize = DEV_BSIZE;
+-#else /* !__FreeBSD__ && !__OpenBSD__ */
++#else /* !__FreeBSD__ && !__OpenBSD__ && !__NetBSD__ */
+   *bsize = 1024;
+-#endif /*!__FreeBSD__ && !__OpenBSD__ */
++#endif /*!__FreeBSD__ && !__OpenBSD__ && !__NetBSD__ */
+ 
+   if (r)
+     {
+@@ -954,7 +954,7 @@
+     return(False);
+   /* Use softlimit to determine disk space, except when it has been exceeded */
+   if ((D.dqb_curblocks>D.dqb_bsoftlimit)
+-#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ ||((D.dqb_curfiles>D.dqb_fsoftlimit) && (D.dqb_fsoftlimit != 0))
+ #endif
+     ) {