ports/71581: [japanese/samba] samba-2.2.11-ja-1.0 was released

[NAKAJI Hiroyuki]

The following reply was made to PR ports/71581; it has been noted by GNATS.

From: NAKAJI Hiroyuki <nakaji at jp.freebsd.org>
To: FreeBSD-gnats-submit at FreeBSD.org
Cc: freebsd-ports-bugs at FreeBSD.org, portmgr at freebsd.org
Subject: Re: ports/71581: [japanese/samba] samba-2.2.11-ja-1.0 was released
Date: Sat, 09 Oct 2004 10:04:59 +0900

 Dear Portmgr,
 
 Samba-2.2.12 was released[1] for security fix[2] but samba-2.2.12-ja
 not yet. The diff between 2.2.11 and 2.2.12 is only one line, and
 I put it in japanese/samba/files directory.
 
 Could you please apply this update before 5.3-RELEASE?
 
 [1] http://lists.samba.org/archive/samba-announce/2004/000051.html
 [2] http://lists.samba.org/archive/samba-announce/2004/000050.html
 
 diff -urN -x CVS -x work /usr/ports/japanese/samba/Makefile ./Makefile
 --- /usr/ports/japanese/samba/Makefile	Sat Aug  7 23:25:32 2004
 +++ ./Makefile	Sat Sep 11 15:20:02 2004
 @@ -21,7 +21,7 @@
  
  CONFLICTS=	samba-2.2.* samba-3.0.* sharity-light-1.*
  
 -SAMBA_VERSION=		2.2.10
 +SAMBA_VERSION=		2.2.11
  SAMBA_JA_VERSION=	1.0
  
  USE_BZIP2=	yes
 @@ -45,18 +45,6 @@
  WINBIND?=	"@comment "
  SMBSH?=		"@comment "
  
 -.if defined(WITH_AUDIT)
 -AUDIT=		""
 -LIBSAMBA=	""
 -BUILD_VFS=	""
 -.endif
 -
 -.if defined(WITH_RECYCLE)
 -RECYCLE=	""
 -LIBSAMBA=	""
 -BUILD_VFS=	""
 -.endif
 -
  VARDIR=		/var
  SAMBA_SPOOL=	${VARDIR}/spool/samba
  SAMBA_LOGDIR=	${VARDIR}/log
 @@ -78,6 +66,20 @@
  STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh
  SAMPLE_CONFIG=	${SAMBA_CONFDIR}/smb.conf.default
  
 +OPTIONS+=	SYSLOG		"With Syslog support" on \
 +		SSL		"With SSL support" on \
 +		LDAP		"With LDAP2 support" off \
 +		CUPS		"With CUPS" off \
 +		ACL		"With ACL support" off \
 +		UTMP		"With UTMP support" on \
 +		MSDFS		"With MSDFS support" on \
 +		QUOTA		"With Quota support" on \
 +		RECYCLE		"With Recycle Bin" on \
 +		AUDIT		"With Audit" on \
 +		WINBIND		"With Winbind" on \
 +		WBAUTH		"With Winbind Auth Challenge" on \
 +		SMBSH		"With Smbsh and smbwrapper" on
 +
  .include <bsd.port.pre.mk>
  
  USE_RC_SUBR=	yes
 @@ -92,6 +94,18 @@
  		--with-pam --with-pam_smbpass \
  		--with-included-popt
  
 +.if defined(WITH_AUDIT)
 +AUDIT=		""
 +LIBSAMBA=	""
 +BUILD_VFS=	""
 +.endif
 +
 +.if defined(WITH_RECYCLE)
 +RECYCLE=	""
 +LIBSAMBA=	""
 +BUILD_VFS=	""
 +.endif
 +
  .if defined(WITH_SYSLOG)
  CONFIGURE_ARGS+=	--with-syslog
  .endif
 @@ -140,9 +154,6 @@
  # malloc.h check is not needed.
  CONFIGURE_ENV+=	ac_cv_header_malloc_h=no
  
 -pre-fetch:
 -	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.samba
 -
  post-clean:
  	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
  
 @@ -251,9 +262,6 @@
  
  	@${MKDIR} -m 500 ${SAMBA_PRIVATE}
  	@${CHOWN} root:wheel ${SAMBA_PRIVATE}
 -	@${CAT} /etc/passwd | ${AWK} -F: '$$6 ~ /home/' | ${PREFIX}/bin/make_smbpasswd > ${SAMBA_PRIVATE}/smbpasswd.sample
 -	@test -f ${SAMBA_PRIVATE}/smbpasswd || ${TOUCH} ${SAMBA_PRIVATE}/smbpasswd
 -	@${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd.sample ${SAMBA_PRIVATE}/smbpasswd
  
  	@${CHOWN} root:wheel ${PREFIX}/bin/smbpasswd
  	@${CHMOD} 111 ${PREFIX}/bin/smbpasswd
 diff -urN -x CVS -x work /usr/ports/japanese/samba/distinfo ./distinfo
 --- /usr/ports/japanese/samba/distinfo	Sat Aug  7 23:25:32 2004
 +++ ./distinfo	Sat Sep 11 10:38:44 2004
 @@ -1,2 +1,2 @@
 -MD5 (samba-2.2.10-ja-1.0.tar.bz2) = 73d85b6ff8c6d3a925ff70f264eaeded
 -SIZE (samba-2.2.10-ja-1.0.tar.bz2) = 7473659
 +MD5 (samba-2.2.11-ja-1.0.tar.bz2) = f418c850a54572f7d4cd77fa4ef876c6
 +SIZE (samba-2.2.11-ja-1.0.tar.bz2) = 7473344
 diff -urN -x CVS -x work /usr/ports/japanese/samba/files/patch-smbd:vfs.c ./files/patch-smbd:vfs.c
 --- /usr/ports/japanese/samba/files/patch-smbd:vfs.c	Thu Jan  1 09:00:00 1970
 +++ ./files/patch-smbd:vfs.c	Sat Oct  9 09:51:14 2004
 @@ -0,0 +1,10 @@
 +--- smbd/vfs.c.orig	Sat Oct  9 09:49:52 2004
 ++++ smbd/vfs.c	Sat Oct  9 09:50:17 2004
 +@@ -790,7 +790,6 @@
 + 	*dir2 = *wd = *base_name = *newname = 0;
 + 
 + 	if (widelinks) {
 +-		unix_clean_name(s);
 + 		/* can't have a leading .. */
 + 		if (strncmp(s,"..",2) == 0 && (s[2]==0 || s[2]=='/')) {
 + 			DEBUG(3,("Illegal file name? (%s)\n",s));
 diff -urN -x CVS -x work /usr/ports/japanese/samba/pkg-plist ./pkg-plist
 --- /usr/ports/japanese/samba/pkg-plist	Sat Aug  7 23:25:32 2004
 +++ ./pkg-plist	Sat Sep 11 14:53:34 2004
 @@ -87,7 +87,6 @@
  etc/smb.conf.default
  %%AUDIT%%lib/samba/audit.so
  %%RECYCLE%%lib/samba/recycle.so
 -private/smbpasswd.sample
  sbin/nmbd
  sbin/smbd
  sbin/swat