Update to 2.0.10-ja-1.0, which fixes the security problems addressed

in FreeBSD-SA-01:45.

PR:		ports/28932
Submitted by:	NAKAJI Hiroyuki <nakaji@jp.freebsd.org> (MAINTAINER)

5 files changed, 18 insertions, 32 deletions

diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile
index 96a7c11bb549..3e32bb311c29 100644
--- a/japanese/samba/Makefile
+++ b/japanese/samba/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 
 Y2K=		http://us1.samba.org/samba/docs/sambay2k.html
 
-SAMBA_VERSION=		2.0.9
+SAMBA_VERSION=		2.0.10
 SAMBA_JA_VERSION=	1.0
 
 # directories
diff --git a/japanese/samba/distinfo b/japanese/samba/distinfo
index 9dee247ad14b..78761c363fe6 100644
--- a/japanese/samba/distinfo
+++ b/japanese/samba/distinfo
@@ -1 +1 @@
-MD5 (samba-2.0.9-ja-1.0.tar.bz2) = 891b9a7a5d4839e3a68cd85cca05e06f
+MD5 (samba-2.0.10-ja-1.0.tar.bz2) = c1d014933733f0db985f5d696f124996
diff --git a/japanese/samba/files/patch-ca b/japanese/samba/files/patch-ca
deleted file mode 100644
index 52eaec56c141..000000000000
--- a/japanese/samba/files/patch-ca
+++ /dev/null
@@ -1,11 +0,0 @@
---- client/client.c.orig	Wed May 10 23:28:49 2000
-+++ client/client.c	Mon Oct 23 00:40:14 2000
-@@ -1577,7 +1577,7 @@
- ****************************************************************************/
- static void server_fn(const char *name, uint32 m, const char *comment)
- {
--        printf("\t%-16.16s     %s\n", name, comment);
-+        printf("\t%-16.16s     %s\n", unix_to_dos((char *)name, True), unix_to_dos((char *)comment, True));
- }
- 
- /****************************************************************************
diff --git a/japanese/samba/files/patch-eb b/japanese/samba/files/patch-eb
deleted file mode 100644
index f30e3acc7cf9..000000000000
--- a/japanese/samba/files/patch-eb
+++ /dev/null
@@ -1,19 +0,0 @@
---- smbd/reply.c.orig	Fri May  4 04:11:44 2001
-+++ smbd/reply.c	Mon Jul  2 13:11:28 2001
-@@ -101,6 +101,7 @@
- 		trim_string( remote_machine, strlen( remote_machine )+1,
- 			     " ", sizeof( " " ), " ", sizeof( " " ));
-  		strlower(remote_machine);
-+		alpha_strcpy(remote_machine,remote_machine,sizeof(remote_machine)-1);
- 
- 		fstrcpy(local_machine,name1);
- 		len = strlen(local_machine);
-@@ -111,6 +112,7 @@
- 		trim_string( local_machine, strlen( local_machine )+1,
-                              " ", sizeof( " " ), " ", sizeof( " " ));
- 		strlower(local_machine);
-+		alpha_strcpy(local_machine,local_machine,sizeof(local_machine)-1);
- 
- 		if (name_type == 'R') {
- 			/* We are being asked for a pathworks session --- 
-
diff --git a/japanese/samba/pkg-plist b/japanese/samba/pkg-plist
index 4f6864195bdd..47a29fed7d0a 100644
--- a/japanese/samba/pkg-plist
+++ b/japanese/samba/pkg-plist
@@ -7,6 +7,7 @@ bin/addtosmbpass
 bin/convert_smbpasswd
 bin/testparm
 bin/testprns
+bin/make_nftable
 bin/make_smbpasswd
 bin/make_smbcodepage
 bin/make_unicodemap
@@ -110,6 +111,21 @@ etc/codepages/unicode_map.ISO8859-2
 etc/codepages/unicode_map.ISO8859-5
 etc/codepages/unicode_map.ISO8859-7
 etc/codepages/unicode_map.KOI8-R
+etc/codepages/nftable.437
+etc/codepages/nftable.737
+etc/codepages/nftable.850
+etc/codepages/nftable.852
+etc/codepages/nftable.861
+etc/codepages/nftable.866
+etc/codepages/nftable.932
+etc/codepages/nftable.936
+etc/codepages/nftable.949
+etc/codepages/nftable.950
+etc/codepages/nftable.ISO8859-1
+etc/codepages/nftable.ISO8859-2
+etc/codepages/nftable.ISO8859-5
+etc/codepages/nftable.ISO8859-7
+etc/codepages/nftable.KOI8-R
 @dirrm etc/codepages
 share/doc/samba/COPYING
 share/doc/samba/Manifest