From nakaji@boggy.acest.tutrp.tut.ac.jp  Mon May 26 21:30:26 2003
Return-Path: <nakaji@boggy.acest.tutrp.tut.ac.jp>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CD4EE37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 26 May 2003 21:30:26 -0700 (PDT)
Received: from boggy.acest.tutrp.tut.ac.jp (boggy.acest.tutrp.tut.ac.jp [133.15.67.40])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A247E43F85
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 26 May 2003 21:30:25 -0700 (PDT)
	(envelope-from nakaji@boggy.acest.tutrp.tut.ac.jp)
Received: from boggy.acest.tutrp.tut.ac.jp (localhost [127.0.0.1])
	by boggy.acest.tutrp.tut.ac.jp (8.12.9/8.12.9) with ESMTP id h4R4UHdj093389
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 May 2003 13:30:17 +0900 (JST)
	(envelope-from nakaji@boggy.acest.tutrp.tut.ac.jp)
Received: (from nakaji@localhost)
	by boggy.acest.tutrp.tut.ac.jp (8.12.9/8.12.9/Submit) id h4R4UG3D093388;
	Tue, 27 May 2003 13:30:16 +0900 (JST)
Message-Id: <200305270430.h4R4UG3D093388@boggy.acest.tutrp.tut.ac.jp>
Date: Tue, 27 May 2003 13:30:16 +0900 (JST)
From: NAKAJI Hiroyuki <nakaji@jp.freebsd.org>
Reply-To: NAKAJI Hiroyuki <nakaji@jp.freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: japanese/samba is updated to samba-2.2.8a-ja-1.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         52711
>Category:       ports
>Synopsis:       japanese/samba is updated to samba-2.2.8a-ja-1.0
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    nork
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 26 21:40:03 PDT 2003
>Closed-Date:    Fri Jun 06 18:35:57 PDT 2003
>Last-Modified:  Fri Jun 06 18:35:57 PDT 2003
>Originator:     NAKAJI Hiroyuki
>Release:        FreeBSD 5.1-BETA i386
>Organization:
>Environment:
System: FreeBSD boggy.acest.tutrp.tut.ac.jp 5.1-BETA FreeBSD 5.1-BETA #98: Tue May 13 18:44:54 JST 2003 root@boggy.acest.tutrp.tut.ac.jp:/usr/obj/usr/src/sys/NAKAJI i386


>Description:
	Samba-2.2.8a-ja-1.0 was released on May/27/2003 from SUGJ
(http://www.samba.gr.jp/).

>How-To-Repeat:

>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/samba/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- Makefile	9 Apr 2003 09:56:19 -0000	1.29
+++ Makefile	27 May 2003 02:12:41 -0000
@@ -20,8 +20,9 @@
 COMMENT=	A free SMB and CIFS client and server for UNIX
 
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
-SAMBA_VERSION=		2.2.7b
+SAMBA_VERSION=		2.2.8a
 SAMBA_JA_VERSION=	1.0
 
 USE_BZIP2=	yes
@@ -74,7 +75,7 @@
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh.sample
 SAMPLE_CONFIG=	${SAMBA_CONFDIR}/smb.conf.default
 
-CONFIGURE_ARGS=	--with-i18n-swat --with-included-gettext \
+CONFIGURE_ARGS=	--with-i18n-swat \
 		--libdir=${SAMBA_CONFDIR} \
 		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \
 		--with-lockdir=${VARDIR}/db/samba \
@@ -86,7 +87,9 @@
 
 .include <bsd.port.pre.mk>
 
-CONFIGURE_ENV+=	TESTDIR=/tmp
+CONFIGURE_ENV+=	TESTDIR=/tmp \
+		CPPFLAGS=-I${LOCALBASE}/include \
+		LDFLAGS=-L${LOCALBASE}/lib
 
 .if defined(WITH_SYSLOG)
 CONFIGURE_ARGS+=	--with-syslog
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/japanese/samba/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo
--- distinfo	9 Apr 2003 09:56:19 -0000	1.17
+++ distinfo	27 May 2003 02:13:59 -0000
@@ -1 +1 @@
-MD5 (samba-2.2.7b-ja-1.0.tar.bz2) = 13609e6d0aa47b7cd52d9ee8b756ff9b
+MD5 (samba-2.2.8a-ja-1.0.tar.bz2) = 4c1af06f1570449584c92033c4901e0b
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->nork 
Responsible-Changed-By: nork 
Responsible-Changed-When: Mon May 26 22:45:14 PDT 2003 
Responsible-Changed-Why:  
I'll handle this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=52711 
State-Changed-From-To: open->feedback 
State-Changed-By: nork 
State-Changed-When: Fri Jun 6 12:31:43 PDT 2003 
State-Changed-Why:  
Patch you want to add, please! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=52711 

From: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
To: Norikatsu Shigemura <nork@FreeBSD.org>
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/52711: japanese/samba is updated to samba-2.2.8a-ja-1.0
Date: Sat, 07 Jun 2003 07:27:51 +0900

 Here is a additional patch, files/patch-forXP, which will fix the
 problem that when the name of the share is longer than 12 characters
 the share cannot be accessed from Windows XP. The problem was reported
 in [samba-jp:14789].
 
 This adhoc fix will be revised and samba-2.2.8a-ja-1.1 will be
 released as soon as possible.
 
 Full diff from ports-current/japanese/samba is also available at
 http://heimat.jp/~nakaji/FreeBSD/ports/ja-samba.diff
 
 --->8------>8------>8------>8------>8------>8------>8------>8---
 --- param/loadparm.c.orig	Tue May 20 11:28:38 2003
 +++ param/loadparm.c	Wed Jun  4 23:31:55 2003
 @@ -3857,8 +3857,10 @@
  	int iService;
  	fstring serviceName;
  	int len;
 +	enum remote_arch_types ra_type = get_remote_arch();
  	
 -	len = (get_remote_arch() == RA_WIN2K) ? 127 : 12;
 +	len = ( (ra_type == RA_WIN2K) || (ra_type == RA_WINXP) ||
 +	        (ra_type == RA_WIN2K3) ) ? 127 : 12;
  
  	for (iService = iNumServices - 1; iService >= 0; iService--)
  	{
 --- rpc_server/srv_srvsvc_nt.c.orig	Tue May 20 11:22:11 2003
 +++ rpc_server/srv_srvsvc_nt.c	Wed Jun  4 23:31:55 2003
 @@ -38,9 +38,11 @@
  	pstring net_name;
  	pstring remark;
  	uint32 type;
 +	enum remote_arch_types ra_type = get_remote_arch();
  
  	StrnCpy(net_name, lp_servicename(snum),
 -		(get_remote_arch() == RA_WIN2K) ? 127 : 12);
 +		(((ra_type == RA_WIN2K) || (ra_type == RA_WINXP) ||
 +		  (ra_type == RA_WIN2K3) ) ? 127 : 12 ) );
  	pstrcpy(remark, lp_comment(snum));
  	standard_sub_conn(p->conn, remark, sizeof(remark));
  	len_net_name = strlen(net_name);
 --- smbd/trans2.c.orig	Tue May 20 11:17:19 2003
 +++ smbd/trans2.c	Wed Jun  4 23:34:21 2003
 @@ -921,7 +921,8 @@
  	SMB_STRUCT_STAT sbuf;
  
  	ra_type = get_remote_arch();
 -	NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K));
 +	NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K) ||
 +	           (ra_type == RA_WINXP) || (ra_type == RA_WIN2K3) );
  
  	if (total_params < 12)
  		return(ERROR_DOS(ERRDOS,ERRinvalidparam));
 @@ -1488,7 +1489,9 @@
  			/* NT4 always serves this up as unicode but expects it to be
  			 * delivered as ascii! (tridge && JRA)
  			 */
 -			if ((get_remote_arch() != RA_WIN2K) && (global_client_caps & CAP_NT_SMBS)) {
 +			if (((get_remote_arch() != RA_WIN2K) ||
 +			     (get_remote_arch() != RA_WINXP) ||
 +			     (get_remote_arch() != RA_WIN2K3)) && (global_client_caps & CAP_NT_SMBS)) {
  				data_len = 18 + strlen(vname);
  				SIVAL(pdata,12,strlen(vname));
  				pstrcpy(pdata+18,vname);      
 @@ -3100,7 +3103,8 @@
  	int max_referral_level;
  
  	ra_type = get_remote_arch();
 -	NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K));
 +	NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K) ||
 +	           (ra_type == RA_WINXP) || (ra_type == RA_WIN2K3) );
  
  	DEBUG(10,("call_trans2getdfsreferral\n"));
 --->8------>8------>8------>8------>8------>8------>8------>8---
  
 >>>>> In <200306061932.h56JWJRp014565@freefall.freebsd.org> 
 >>>>>	Norikatsu Shigemura <nork@FreeBSD.org> wrote:
 > Synopsis: japanese/samba is updated to samba-2.2.8a-ja-1.0
 
 > State-Changed-From-To: open->feedback
 > State-Changed-By: nork
 > State-Changed-When: Fri Jun 6 12:31:43 PDT 2003
 > State-Changed-Why: 
 > Patch you want to add, please!
 
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=52711
 -- 
 NAKAJI Hiroyuki
State-Changed-From-To: feedback->closed 
State-Changed-By: nork 
State-Changed-When: Fri Jun 6 18:35:46 PDT 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=52711 
>Unformatted:
