From 7c7b9d694d79b7e437c013e4f9d21a68461e256c Mon Sep 17 00:00:00 2001 From: kei Date: Sun, 3 Sep 2000 09:17:00 +0000 Subject: Merged japanese/samba package to net/samba, as per discussion of Hubert Feyrer and Manuel Bouyer. --- net/samba/Makefile | 13 ++-- net/samba/files/md5 | 4 +- net/samba/files/patch-sum | 10 +-- net/samba/patches/patch-aa | 18 ++--- net/samba/patches/patch-ac | 8 +-- net/samba/patches/patch-ae | 12 ++-- net/samba/patches/patch-af | 8 +-- net/samba/pkg/DESCR | 6 ++ net/samba/pkg/PLIST | 164 ++++++++++++++++++++++++++++++++++++++++++++- 9 files changed, 206 insertions(+), 37 deletions(-) diff --git a/net/samba/Makefile b/net/samba/Makefile index 1e9a05d7088..9df82a19959 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.35 2000/08/30 17:44:25 kei Exp $ +# $NetBSD: Makefile,v 1.36 2000/09/03 09:17:00 kei Exp $ -DISTNAME= samba-2.0.7 +DISTNAME= samba-2.0.7-ja-1.2a +PKGNAME= samba-2.0.7.1.2a WRKSRC= ${WRKDIR}/${DISTNAME}/source CATEGORIES= net -MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \ - http://us1.samba.org/samba/ftp/ \ - ftp://us3.samba.org/pub/mirrors/sambaftp/ +MASTER_SITES= ftp://ftp.samba.gr.jp/pub/samba-jp/samba-2.0.7-ja/ +EXTRACT_SUFX= .tar.bz2 -MAINTAINER= bouyer@netbsd.org +MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.samba.org/ CONFLICTS+= samba-2.0.7-ja-* @@ -41,6 +41,7 @@ MAKE_ENV+= LOGDIR=${SAMBA_LOGDIR} CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR} \ --with-privatedir=${SAMBA_PRIVATE} \ --with-swatdir=${PREFIX}/share/swat \ + --with-i18n-swat \ --with-sambabook=${PREFIX}/share/swat/using_samba PLIST_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE} diff --git a/net/samba/files/md5 b/net/samba/files/md5 index 2945d44bf02..6e488fbab4a 100644 --- a/net/samba/files/md5 +++ b/net/samba/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.13 2000/05/02 15:24:09 jlam Exp $ +$NetBSD: md5,v 1.14 2000/09/03 09:17:00 kei Exp $ -MD5 (samba-2.0.7.tar.gz) = b5e61ea655d476072fd0365785fea2d0 +MD5 (samba-2.0.7-ja-1.2a.tar.bz2) = f2bcd6af2b10ae50cf657eb2d33893fd diff --git a/net/samba/files/patch-sum b/net/samba/files/patch-sum index 845cd5aa706..a2b307aa6db 100644 --- a/net/samba/files/patch-sum +++ b/net/samba/files/patch-sum @@ -1,7 +1,7 @@ -$NetBSD: patch-sum,v 1.6 2000/05/02 15:24:09 jlam Exp $ +$NetBSD: patch-sum,v 1.7 2000/09/03 09:17:00 kei Exp $ -MD5 (patch-aa) = 5f8d85555680d54350fffe200229ce41 -MD5 (patch-ac) = 2c9a7e95317eb7d9d505e01b5165dcc1 +MD5 (patch-aa) = 32f95d6c01113cd807bdc35725aa4405 +MD5 (patch-ac) = b45e73c8a468f55a1efe9010f794252e MD5 (patch-ad) = b6b97e8bfeeb31bc2a86018ede0237b0 -MD5 (patch-ae) = 007397b3c2c28b68b23d210979ea4846 -MD5 (patch-af) = f9dab8b4ecc3ef5a15ac24fd0429db3c +MD5 (patch-ae) = 715df29f395b61d253ab81e36d8f0747 +MD5 (patch-af) = 90eb9a65e7a40a035142979bd53ecb24 diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa index 411880a5b9c..1d0ac65b721 100644 --- a/net/samba/patches/patch-aa +++ b/net/samba/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.10 2000/05/02 15:24:09 jlam Exp $ +$NetBSD: patch-aa,v 1.11 2000/09/03 09:17:00 kei Exp $ ---- Makefile.in.orig Tue Apr 25 19:06:11 2000 -+++ Makefile.in Fri Apr 28 16:26:52 2000 -@@ -25,10 +25,12 @@ +--- Makefile.in.orig Thu Jun 8 13:31:59 2000 ++++ Makefile.in Sun Sep 3 06:23:06 2000 +@@ -26,10 +26,12 @@ BINDIR = @bindir@ # we don't use sbindir because we want full compatibility with # the previous releases of Samba @@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.10 2000/05/02 15:24:09 jlam Exp $ SAMBABOOK = @sambabook@ # The permissions to give the executables -@@ -37,12 +39,12 @@ +@@ -38,12 +40,12 @@ # set these to where to find various files # These can be overridden by command line switches (see smbd(8)) # or in smb.conf (see smb.conf(5)) @@ -35,12 +35,12 @@ $NetBSD: patch-aa,v 1.10 2000/05/02 15:24:09 jlam Exp $ # This is where smbpasswd et al go PRIVATEDIR = @privatedir@ -@@ -463,14 +465,14 @@ +@@ -470,14 +472,14 @@ installdirs: $(SHELL) $(srcdir)/install-sh -d -m $(INSTALLPERMS) \ -- $(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR) -+ $(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(ETCDIR) $(LOGDIR) $(CODEPAGEDIR) +- $(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR) ${SWATDIR} ${SAMBABOOK} ++ $(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(ETCDIR) $(LOGDIR) $(CODEPAGEDIR) ${SWATDIR} ${SAMBABOOK} installservers: all installdirs - @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS) @@ -54,7 +54,7 @@ $NetBSD: patch-aa,v 1.10 2000/05/02 15:24:09 jlam Exp $ installscripts: installdirs @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS) -@@ -495,8 +497,8 @@ +@@ -502,8 +504,8 @@ @$(SHELL) $(srcdir)/script/uninstallman.sh $(MANDIR) $(srcdir) uninstallbin: diff --git a/net/samba/patches/patch-ac b/net/samba/patches/patch-ac index 20339626b91..104548bcc54 100644 --- a/net/samba/patches/patch-ac +++ b/net/samba/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.4 2000/05/02 15:24:10 jlam Exp $ +$NetBSD: patch-ac,v 1.5 2000/09/03 09:17:00 kei Exp $ ---- acconfig.h.orig Tue Apr 25 19:06:11 2000 -+++ acconfig.h Fri Apr 28 16:27:20 2000 -@@ -79,7 +79,9 @@ +--- acconfig.h.orig Tue Jul 11 02:37:45 2000 ++++ acconfig.h Sun Sep 3 06:23:07 2000 +@@ -80,7 +80,9 @@ #undef SIZEOF_INO_T #undef SIZEOF_OFF_T #undef STAT_STATVFS64 diff --git a/net/samba/patches/patch-ae b/net/samba/patches/patch-ae index 2d3ca094b97..6d946001f70 100644 --- a/net/samba/patches/patch-ae +++ b/net/samba/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.2 2000/05/02 15:24:10 jlam Exp $ +$NetBSD: patch-ae,v 1.3 2000/09/03 09:17:00 kei Exp $ ---- configure.in.orig Tue Apr 25 19:06:39 2000 -+++ configure.in Fri Apr 28 16:33:54 2000 -@@ -234,9 +234,6 @@ +--- configure.in.orig Tue Jul 11 02:37:45 2000 ++++ configure.in Sun Sep 3 06:23:09 2000 +@@ -237,9 +237,6 @@ AC_CHECK_TYPE(offset_t,loff_t) AC_CHECK_TYPE(ssize_t, int) @@ -12,7 +12,7 @@ $NetBSD: patch-ae,v 1.2 2000/05/02 15:24:10 jlam Exp $ # we need libdl for PAM and the new VFS code AC_CHECK_LIB(dl,main) -@@ -312,7 +309,14 @@ +@@ -315,7 +312,14 @@ # test for where we get readline() from if test "$ac_cv_header_readline_h" = "yes" || test "$ac_cv_header_readline_readline_h" = "yes"; then @@ -28,7 +28,7 @@ $NetBSD: patch-ae,v 1.2 2000/05/02 15:24:10 jlam Exp $ fi -@@ -1138,6 +1142,24 @@ +@@ -1227,6 +1231,24 @@ AC_DEFINE(BROKEN_NISPLUS_INCLUDE_FILES) fi diff --git a/net/samba/patches/patch-af b/net/samba/patches/patch-af index 7f22299d1c7..bda5fdc5778 100644 --- a/net/samba/patches/patch-af +++ b/net/samba/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.2 2000/05/02 15:24:10 jlam Exp $ +$NetBSD: patch-af,v 1.3 2000/09/03 09:17:00 kei Exp $ ---- include/includes.h.orig Tue Apr 25 19:06:46 2000 -+++ include/includes.h Fri Apr 28 16:34:56 2000 -@@ -808,20 +808,20 @@ +--- include/includes.h.orig Sat Jul 15 01:52:58 2000 ++++ include/includes.h Sun Sep 3 06:23:10 2000 +@@ -832,20 +832,20 @@ #define ULTRIX_AUTH 1 #endif diff --git a/net/samba/pkg/DESCR b/net/samba/pkg/DESCR index 9c93e9fb52c..a9060e92f55 100644 --- a/net/samba/pkg/DESCR +++ b/net/samba/pkg/DESCR @@ -12,6 +12,12 @@ capability for these operating systems to behave much like a LAN Server or Windows NT Server machine, only with added functionality and flexibility designed to make life easier for administrators. +This version of samba handles Japanese. Take a look at Samba Users +Group Japan's WWW page for this feature: + +http://www.samba.gr.jp/ + + *===* Security Notes *===* The users' encrypted passwords stored in ${ETCDIR}/private/smbpasswd diff --git a/net/samba/pkg/PLIST b/net/samba/pkg/PLIST index b12b85ad0ee..05e738308af 100644 --- a/net/samba/pkg/PLIST +++ b/net/samba/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2000/08/25 23:47:24 wiz Exp $ +@comment $NetBSD: PLIST,v 1.18 2000/09/03 09:17:00 kei Exp $ bin/addtosmbpass bin/convert_smbpasswd bin/make_printerdef @@ -42,6 +42,28 @@ lib/codepages/unicode_map.ISO8859-2 lib/codepages/unicode_map.ISO8859-5 lib/codepages/unicode_map.ISO8859-7 lib/codepages/unicode_map.KOI8-R +lib/swat-i18n.txt +man/ja/man1/make_smbcodepage.1 +man/ja/man1/make_unicodemap.1 +man/ja/man1/nmblookup.1 +man/ja/man1/smbclient.1 +man/ja/man1/smbrun.1 +man/ja/man1/smbsh.1 +man/ja/man1/smbstatus.1 +man/ja/man1/smbtar.1 +man/ja/man1/testparm.1 +man/ja/man1/testprns.1 +man/ja/man5/lmhosts.5 +man/ja/man5/smb.conf.5 +man/ja/man5/smbpasswd.5 +man/ja/man7/samba.7 +man/ja/man8/nmbd.8 +man/ja/man8/smbd.8 +man/ja/man8/smbmnt.8 +man/ja/man8/smbmount.8 +man/ja/man8/smbpasswd.8 +man/ja/man8/smbspool.8 +man/ja/man8/swat.8 man/man1/make_smbcodepage.1 man/man1/make_unicodemap.1 man/man1/nmblookup.1 @@ -141,14 +163,19 @@ share/doc/samba/textdocs/UNIX_SECURITY.txt share/doc/samba/textdocs/Win95.txt share/doc/samba/textdocs/WinNT.txt share/doc/samba/textdocs/cifsntdomain.txt +share/doc/samba/textdocs/sambafaq.txt share/doc/samba/textdocs/security_level.txt share/doc/samba/textdocs/smbmount.txt share/examples/samba/README +share/examples/samba/add-delete-user-script/README +share/examples/samba/add-delete-user-script/smb-useradd +share/examples/samba/add-delete-user-script/smb-userdel share/examples/samba/autofs/README share/examples/samba/autofs/auto.a share/examples/samba/dce-dfs/README share/examples/samba/dce-dfs/smb.conf share/examples/samba/misc/extra_smbstatus +share/examples/samba/misc/hextoeuc share/examples/samba/misc/wall.perl share/examples/samba/printer-accounting/README share/examples/samba/printer-accounting/acct-all @@ -161,6 +188,7 @@ share/examples/samba/printing/smbprint.sysv share/examples/samba/simple/README share/examples/samba/simple/smb.conf share/examples/samba/smb.conf.default +share/examples/samba/smb.conf.default.ja share/examples/samba/smb.conf.sample share/examples/samba/svr4-startup/README share/examples/samba/svr4-startup/samba.server @@ -178,6 +206,9 @@ share/examples/samba/validchars/validchr.c share/examples/samba/validchars/validchr.com share/examples/samba/wins_hook/README share/examples/samba/wins_hook/dns_update +share/locale/en/LC_MESSAGES/i18n_swat.mo +share/locale/ja/LC_MESSAGES/i18n_swat.mo +share/locale/ja_JP.SJIS/LC_MESSAGES/i18n_swat.mo share/swat/help/DOMAIN_MEMBER.html share/swat/help/NT_Security.html share/swat/help/lmhosts.5.html @@ -213,6 +244,127 @@ share/swat/images/status.gif share/swat/images/viewconfig.gif share/swat/include/footer.html share/swat/include/header.html +share/swat/include/header_css.html +share/swat/ja/help/Application_Serving.txt.html +share/swat/ja/help/BROWSING-Config.txt.html +share/swat/ja/help/BROWSING.txt.html +share/swat/ja/help/CRLF-LF-Conversions.txt.html +share/swat/ja/help/CVS_ACCESS.txt.html +share/swat/ja/help/DIAGNOSIS.txt.html +share/swat/ja/help/DOMAIN.txt.html +share/swat/ja/help/DOMAIN_MEMBER.txt.html +share/swat/ja/help/ENCRYPTION.txt.html +share/swat/ja/help/File-Cacheing.txt.html +share/swat/ja/help/HowToUseSamba/1-18.html +share/swat/ja/help/HowToUseSamba/1-19.html +share/swat/ja/help/HowToUseSamba/1-6.html +share/swat/ja/help/HowToUseSamba/MSNET1.GIF +share/swat/ja/help/HowToUseSamba/MSNETW2.GIF +share/swat/ja/help/HowToUseSamba/PRTCL95.GIF +share/swat/ja/help/HowToUseSamba/SAMBA1.GIF +share/swat/ja/help/HowToUseSamba/WGRPNT1.GIF +share/swat/ja/help/HowToUseSamba/globals.gif +share/swat/ja/help/HowToUseSamba/home.gif +share/swat/ja/help/HowToUseSamba/index.html +share/swat/ja/help/HowToUseSamba/passwd.gif +share/swat/ja/help/HowToUseSamba/printers.gif +share/swat/ja/help/HowToUseSamba/printtool1.gif +share/swat/ja/help/HowToUseSamba/printtool2.gif +share/swat/ja/help/HowToUseSamba/printtool3.gif +share/swat/ja/help/HowToUseSamba/printtool4.gif +share/swat/ja/help/HowToUseSamba/printtool5.gif +share/swat/ja/help/HowToUseSamba/printtool6.gif +share/swat/ja/help/HowToUseSamba/samba.gif +share/swat/ja/help/HowToUseSamba/shares.gif +share/swat/ja/help/HowToUseSamba/status.gif +share/swat/ja/help/HowToUseSamba/swat1.gif +share/swat/ja/help/HowToUseSamba/userhome.gif +share/swat/ja/help/HowToUseSamba/userprofile.gif +share/swat/ja/help/HowToUseSamba/viewconfig.gif +share/swat/ja/help/HowToUseSamba/x-1-256.gif +share/swat/ja/help/HowToUseSamba/x-2-256.gif +share/swat/ja/help/HowToUseSamba/x-3-256.gif +share/swat/ja/help/Macintosh_Clients.txt.html +share/swat/ja/help/NT-Guest-Access.txt.html +share/swat/ja/help/NTDOMAIN.txt.html +share/swat/ja/help/NT_Security.html +share/swat/ja/help/NetBIOS.txt.html +share/swat/ja/help/PRINTER_DRIVER.txt.html +share/swat/ja/help/PROFILES.txt.html +share/swat/ja/help/Passwords.txt.html +share/swat/ja/help/README.smbmount.txt.html +share/swat/ja/help/Speed.txt.html +share/swat/ja/help/Speed2.txt.html +share/swat/ja/help/UNIX-SMB.txt.html +share/swat/ja/help/UNIX_INSTALL.txt.html +share/swat/ja/help/Win95.txt.html +share/swat/ja/help/WinNT.txt.html +share/swat/ja/help/encrypt-passwd.html +share/swat/ja/help/lmhosts.5.html +share/swat/ja/help/make_smbcodepage.1.html +share/swat/ja/help/make_unicodemap.1.html +share/swat/ja/help/nmbd.8.html +share/swat/ja/help/nmblookup.1.html +share/swat/ja/help/samba-func.html +share/swat/ja/help/samba-j.html +share/swat/ja/help/samba.7.html +share/swat/ja/help/samba2.html +share/swat/ja/help/sambafaq-1.html +share/swat/ja/help/sambafaq-2.html +share/swat/ja/help/sambafaq-3.html +share/swat/ja/help/sambafaq-4.html +share/swat/ja/help/sambafaq-5.html +share/swat/ja/help/sambafaq.html +share/swat/ja/help/security_level.txt.html +share/swat/ja/help/smb.conf.5.html +share/swat/ja/help/smbclient.1.html +share/swat/ja/help/smbd.8.html +share/swat/ja/help/smbmnt.8.html +share/swat/ja/help/smbmount.8.html +share/swat/ja/help/smbmount.txt.html +share/swat/ja/help/smbpasswd.5.html +share/swat/ja/help/smbpasswd.8.html +share/swat/ja/help/smbrun.1.html +share/swat/ja/help/smbsh.1.html +share/swat/ja/help/smbspool.8.html +share/swat/ja/help/smbstatus.1.html +share/swat/ja/help/smbtar.1.html +share/swat/ja/help/swat.8.html +share/swat/ja/help/testparm.1.html +share/swat/ja/help/testprns.1.html +share/swat/ja/help/tuning.japanese.html +share/swat/ja/help/welcome.html +share/swat/ja/help/whatsamba.html +share/swat/ja/images/globals.gif +share/swat/ja/images/home.gif +share/swat/ja/images/passwd.gif +share/swat/ja/images/printers.gif +share/swat/ja/images/samba.gif +share/swat/ja/images/shares.gif +share/swat/ja/images/status.gif +share/swat/ja/images/viewconfig.gif +share/swat/ja/include/footer.html +share/swat/ja/include/header.JP1.html +share/swat/ja/include/header.html +share/swat/ja/include/header.nocss.html +share/swat/ja/include/header.org.html +share/swat/ja/include/header.sjis.html +share/swat/ja/include/header_css.html +share/swat/ja_JP.SJIS/help/welcome.html +share/swat/ja_JP.SJIS/images/globals.gif +share/swat/ja_JP.SJIS/images/home.gif +share/swat/ja_JP.SJIS/images/passwd.gif +share/swat/ja_JP.SJIS/images/printers.gif +share/swat/ja_JP.SJIS/images/samba.gif +share/swat/ja_JP.SJIS/images/shares.gif +share/swat/ja_JP.SJIS/images/status.gif +share/swat/ja_JP.SJIS/images/viewconfig.gif +share/swat/ja_JP.SJIS/include/footer.html +share/swat/ja_JP.SJIS/include/header.JP1.html +share/swat/ja_JP.SJIS/include/header.html +share/swat/ja_JP.SJIS/include/header.nocss.html +share/swat/ja_JP.SJIS/include/header.org.html +share/swat/ja_JP.SJIS/include/header_css.html share/swat/using_samba/appa_01.html share/swat/using_samba/appa_02.html share/swat/using_samba/appa_03.html @@ -375,6 +527,15 @@ share/swat/using_samba/this_edition.html @dirrm share/swat/using_samba/gifs @dirrm share/swat/using_samba/figs @dirrm share/swat/using_samba +@dirrm share/swat/ja_JP.SJIS/include +@dirrm share/swat/ja_JP.SJIS/images +@dirrm share/swat/ja_JP.SJIS/help +@dirrm share/swat/ja_JP.SJIS +@dirrm share/swat/ja/include +@dirrm share/swat/ja/images +@dirrm share/swat/ja/help/HowToUseSamba +@dirrm share/swat/ja/help +@dirrm share/swat/ja @dirrm share/swat/include @dirrm share/swat/images @dirrm share/swat/help @@ -390,6 +551,7 @@ share/swat/using_samba/this_edition.html @dirrm share/examples/samba/misc @dirrm share/examples/samba/dce-dfs @dirrm share/examples/samba/autofs +@dirrm share/examples/samba/add-delete-user-script @dirrm share/examples/samba @dirrm share/doc/samba/textdocs @dirrm share/doc/samba/faq -- cgit v1.2.3