Update to 2.2.7b-ja-1.0.

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

5 files changed, 8 insertions, 109 deletions

diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile
index 42d7158d9968..39592674e45b 100644
--- a/japanese/samba/Makefile
+++ b/japanese/samba/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	samba
 PORTVERSION=	${SAMBA_VERSION}.j${SAMBA_JA_VERSION}
-PORTREVISION=	2
 CATEGORIES=	japanese net
 MASTER_SITES=	ftp://ftp.samba.gr.jp/pub/samba-jp/%SUBDIR%/ \
 		ftp://ftp.iij.ad.jp/pub/SAMBA/samba-jp/%SUBDIR%/ \
@@ -22,8 +21,8 @@ COMMENT=	A free SMB and CIFS client and server for UNIX
 
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 
-SAMBA_VERSION=		2.2.7a
-SAMBA_JA_VERSION=	1.1
+SAMBA_VERSION=		2.2.7b
+SAMBA_JA_VERSION=	1.0
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
@@ -130,6 +129,9 @@ WINBIND=	""
 CONFIGURE_ARGS+=	--with-winbind-auth-challenge
 .endif
 
+# malloc.h check is not needed.
+CONFIGURE_ENV+=	ac_cv_header_malloc_h=no
+
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.samba
 
diff --git a/japanese/samba/distinfo b/japanese/samba/distinfo
index 0e834ff36254..41fe20729655 100644
--- a/japanese/samba/distinfo
+++ b/japanese/samba/distinfo
@@ -1 +1 @@
-MD5 (samba-2.2.7a-ja-1.1.tar.bz2) = 7f5c104c1b2b0a5a40b56d5b831819b8
+MD5 (samba-2.2.7b-ja-1.0.tar.bz2) = 13609e6d0aa47b7cd52d9ee8b756ff9b
diff --git a/japanese/samba/files/README.FreeBSD b/japanese/samba/files/README.FreeBSD
index 32a995ef572c..30cd32c9c8ab 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.7a, implemented the
+Samba Japanese Edition is based on Samba 2.2.7b, 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-security b/japanese/samba/files/patch-security
deleted file mode 100644
index 4fc7af172f19..000000000000
--- a/japanese/samba/files/patch-security
+++ /dev/null
@@ -1,103 +0,0 @@
---- smbd/ipc.c.orig	Mon Mar 17 13:17:56 2003
-+++ smbd/ipc.c	Tue Apr  8 13:17:45 2003
-@@ -398,7 +398,7 @@
-   
- 	if (tdscnt)  {
- 		if((data = (char *)malloc(tdscnt)) == NULL) {
--			DEBUG(0,("reply_trans: data malloc fail for %d bytes !\n", tdscnt));
-+			DEBUG(0,("reply_trans: data malloc fail for %u bytes !\n", tdscnt));
- 			END_PROFILE(SMBtrans);
- 			return(ERROR_DOS(ERRDOS,ERRnomem));
- 		} 
-@@ -412,7 +412,7 @@
- 
- 	if (tpscnt) {
- 		if((params = (char *)malloc(tpscnt)) == NULL) {
--			DEBUG(0,("reply_trans: param malloc fail for %d bytes !\n", tpscnt));
-+			DEBUG(0,("reply_trans: param malloc fail for %u bytes !\n", tpscnt));
- 			SAFE_FREE(data);
- 			END_PROFILE(SMBtrans);
- 			return(ERROR_DOS(ERRDOS,ERRnomem));
-@@ -428,7 +428,7 @@
- 	if (suwcnt) {
- 		int i;
- 		if((setup = (uint16 *)malloc(suwcnt*sizeof(uint16))) == NULL) {
--			DEBUG(0,("reply_trans: setup malloc fail for %d bytes !\n", (int)(suwcnt * sizeof(uint16))));
-+			DEBUG(0,("reply_trans: setup malloc fail for %u bytes !\n", (unsigned int)(suwcnt * sizeof(uint16))));
- 			SAFE_FREE(data);
- 			SAFE_FREE(params);
- 			END_PROFILE(SMBtrans);
-@@ -524,7 +524,7 @@
- 	}
- 	
- 	
--	DEBUG(3,("trans <%s> data=%d params=%d setup=%d\n",
-+	DEBUG(3,("trans <%s> data=%u params=%u setup=%u\n",
- 		 name,tdscnt,tpscnt,suwcnt));
- 	
- 	/*
---- smbd/password.c.orig	Thu Nov 21 22:05:51 2002
-+++ smbd/password.c	Tue Apr  8 13:17:45 2003
-@@ -816,7 +816,7 @@
- 		if (!ok && lp_username(snum)) {
- 			char *auser;
- 			pstring user_list;
--			StrnCpy(user_list,lp_username(snum),sizeof(pstring));
-+			StrnCpy(user_list,lp_username(snum),sizeof(pstring)-1);
- 
- 			pstring_sub(user_list,"%S",lp_servicename(snum), True);
- 	  
---- smbd/reply.c.orig	Wed Feb  5 15:15:15 2003
-+++ smbd/reply.c	Tue Apr  8 13:17:45 2003
-@@ -1490,6 +1490,9 @@
- 
-         for (i=numentries;(i<maxentries) && !finished;i++)
-         {
-+          /* check to make sure we have room in the buffer */
-+	  if ( ((PTR_DIFF(p, outbuf))+DIR_STRUCT_SIZE) > BUFFER_SIZE )
-+	      break;
-           finished = 
-             !get_dir_entry(conn,mask,dirtype,fname,&size,&mode,&date,check_descend);
-           if (!finished)
-@@ -3603,6 +3606,9 @@
-     
- 
- 		for (i=first;i<first+num_to_get;i++) {
-+			/* check to make sure we have room in the buffer */
-+			if ( (PTR_DIFF(p, outbuf)+28) > BUFFER_SIZE )
-+				break;
- 			put_dos_date2(p,0,queue[i].time);
- 			SCVAL(p,4,(queue[i].status==LPQ_PRINTING?2:3));
- 			SSVAL(p,5, queue[i].job);
---- smbd/statcache.c.orig	Fri Nov  9 18:27:43 2001
-+++ smbd/statcache.c	Tue Apr  8 13:17:45 2003
-@@ -88,7 +88,7 @@
-    * StrnCpy always null terminates.
-    */
- 
--  StrnCpy(orig_name, full_orig_name, namelen);
-+  StrnCpy(orig_name, full_orig_name, MIN(namelen, sizeof(orig_name)-1));
-   if(!case_sensitive)
-     strupper( orig_name );
- 
---- smbd/trans2.c.orig	Mon Mar 17 13:17:56 2003
-+++ smbd/trans2.c	Tue Apr  8 13:17:45 2003
-@@ -217,7 +217,6 @@
- 	int16 open_ofun;
- 	int32 open_size;
- 	char *pname;
--	int16 namelen;
- 
- 	pstring fname;
- 	mode_t unixmode;
-@@ -247,9 +246,8 @@
- 	open_ofun = SVAL(params,12);
- 	open_size = IVAL(params,14);
- 	pname = &params[28];
--	namelen = strlen(pname)+1;
- 
--	StrnCpy(fname,pname,namelen);
-+	pstrcpy(fname,pname);
- 	if (strchr(fname,'?'))
- 		return(ERROR_DOS(ERRDOS,ERRinvalidname));
- 
diff --git a/japanese/samba/pkg-message b/japanese/samba/pkg-message
index 52d2ddafd67b..a01cb5ca53ff 100644
--- a/japanese/samba/pkg-message
+++ b/japanese/samba/pkg-message
@@ -4,5 +4,5 @@ The lock directory where browse.dat, wins.dat and other *.tdb files
 are created by smbd and nmbd is changed from /var/spool/lock to
 /var/db/samba.
 
-If you are about to update your japanese/samba from 2.0.10j1.2 to 2.2.2j1.0,
+If you are about to update your japanese/samba from 2.0.10j1.2 to 2.2.7bj1.0,
 you need to remove old these files in /var/spool/lock.