5 files changed, 18 insertions, 29 deletions

diff --git a/japanese/samba/files/README.FreeBSD b/japanese/samba/files/README.FreeBSD
index 421446feee90..32a995ef572c 100644
--- a/japanese/samba/files/README.FreeBSD
+++ b/japanese/samba/files/README.FreeBSD
@@ -10,7 +10,7 @@ If you want to use samba-ja,
 See document files in /usr/local/share/doc/samba and example config files in
 /usr/local/share/examples/samba for details.
 
-Samba Japanese Edition is based on Samba 2.2.2, implemented the experimental
+Samba Japanese Edition is based on Samba 2.2.7a, implemented the
 internationalized SWAT and fixed several problems arond functions for
 Japanese support. See smb.conf.sample for details. If you want to use
 NT4+SP3 or Win95+updates clients, set "encrypt passwords" parameter to
diff --git a/japanese/samba/files/patch-aa b/japanese/samba/files/patch-aa
deleted file mode 100644
index 872243b4e802..000000000000
--- a/japanese/samba/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Tue Jun 11 18:48:30 2002
-+++ Makefile.in	Mon Jun 17 13:13:44 2002
-@@ -52,7 +52,7 @@
- CONFIGFILE = $(CONFIGDIR)/smb.conf
- LMHOSTSFILE = $(CONFIGDIR)/lmhosts
- DRIVERFILE = $(CONFIGDIR)/printers.def
--PASSWD_PROGRAM = /bin/passwd
-+PASSWD_PROGRAM = /usr/bin/passwd
- # This is where smbpasswd et al go
- PRIVATEDIR = @privatedir@
- 
diff --git a/japanese/samba/files/patch-ba b/japanese/samba/files/patch-ba
index 60e322a6cae9..283714abc761 100644
--- a/japanese/samba/files/patch-ba
+++ b/japanese/samba/files/patch-ba
@@ -1,6 +1,6 @@
---- configure.in.orig	Thu May  2 20:02:46 2002
-+++ configure.in	Thu May  9 02:29:20 2002
-@@ -498,9 +498,23 @@
+--- configure.in.orig	Mon Dec 16 12:00:04 2002
++++ configure.in	Mon Dec 16 22:56:30 2002
+@@ -510,9 +510,23 @@
  ############################################
  # we need dlopen/dlclose/dlsym/dlerror for PAM, the password database plugins and the new VFS code
  AC_CHECK_FUNCS(dlopen)
@@ -26,15 +26,15 @@
  fi
  # dlopen/dlclose/dlsym/dlerror will be checked again later and defines will be set then
  
-@@ -870,6 +884,7 @@
- 		;;
- 		*bsd*)  BLDSHARED="true"
+@@ -972,6 +986,7 @@
+ 		*osf*) AC_DEFINE(OSF1)
+ 			BLDSHARED="true"
  			LDSHFLAGS="-shared"
 +			DYNEXP="-Wl,--export-dynamic"
  			SONAMEFLAG="-Wl,-soname,"
  			PICFLAG="-fPIC"
  			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
-@@ -1868,7 +1883,7 @@
+@@ -1981,7 +1996,7 @@
    yes)
      AC_MSG_RESULT(yes)
      AC_DEFINE(KRB5_AUTH)
@@ -43,12 +43,3 @@
      CFLAGS="$CFLAGS -I$withval/include"
      LDFLAGS="$LDFLAGS -L$withval/lib"
      ;;
-@@ -2042,7 +2057,7 @@
-   yes)
-     AC_MSG_RESULT(yes)
-     AC_DEFINE(WITH_LDAP_SAM)
--    LIBS="-lldap -llber -lresolv $LIBS"
-+    LIBS="-lldap -llber $LIBS"
-     with_smbpasswd_sam=no
-     ;;
-   *)
diff --git a/japanese/samba/files/patch-includes.h b/japanese/samba/files/patch-includes.h
index 9b976dd07106..2d32256bcec3 100644
--- a/japanese/samba/files/patch-includes.h
+++ b/japanese/samba/files/patch-includes.h
@@ -4,7 +4,7 @@
  #endif
  
  /* this guess needs to be improved (tridge) */
-+#ifndef __FreeBSD__
++#ifndef FREEBSD
  #if (defined(STAT_STATVFS) || defined(STAT_STATVFS64)) && !defined(SYSV)
  #define SYSV 1
 +#endif
diff --git a/japanese/samba/files/smb.conf.default b/japanese/samba/files/smb.conf.default
index 4b8767a76d06..1948c3b23f56 100644
--- a/japanese/samba/files/smb.conf.default
+++ b/japanese/samba/files/smb.conf.default
@@ -419,6 +419,15 @@
 ;   valid users  = %S
 
 # ------------------------------------------------------------
+
+# このパラメータが設定されていた場合、共有内で削除されるファイルは、単
+# に削除される代わりに、パラメータで指定したディレクトリに移動されます。
+# 同じ名前のファイルが複数削除された場合は, ファイル名に一意な識別子が
+# 加えられたファイル名になります。
+
+;  recycle bin = .recycle
+
+# ------------------------------------------------------------
 # 特定のプロジェクトのメンバのみが利用可能な共有の例です。
 # この共有を利用するには project-a グループが定義されている必要があり
 # ます。