Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 Sep 2004 15:26:07 +0900 (JST)
From:      NAKAJI Hiroyuki <nakaji@xa12.heimat.gr.jp>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/71581: [japanese/samba] samba-2.2.11-ja-1.0 was released
Message-ID:  <200409110626.i8B6Q6uL046816@xa12.heimat.gr.jp>
Resent-Message-ID: <200409110630.i8B6UCL1045179@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         71581
>Category:       ports
>Synopsis:       [japanese/samba] samba-2.2.11-ja-1.0 was released
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 11 06:30:12 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     NAKAJI Hiroyuki
>Release:        FreeBSD 6.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD xa12.heimat.gr.jp 6.0-CURRENT FreeBSD 6.0-CURRENT #8: Fri Sep 10 14:33:10 JST 2004 root@xa12.heimat.gr.jp:/usr/obj/usr/src/sys/NAKAJI i386


>Description:
	Samba-2.2.11-ja-1.0 was released on Sep 10 2004. Samba-2.2.11
is an update release to fix Windows XP SP2 printing problem (CAN-2004-0829).

>How-To-Repeat:

>Fix:

Index: Makefile
===================================================================
RCS file: /net/pcat/home/ncvs/ports/japanese/samba/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- Makefile	5 Aug 2004 16:45:51 -0000	1.43
+++ Makefile	11 Sep 2004 06:20:02 -0000
@@ -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
Index: distinfo
===================================================================
RCS file: /net/pcat/home/ncvs/ports/japanese/samba/distinfo,v
retrieving revision 1.22
diff -u -r1.22 distinfo
--- distinfo	5 Aug 2004 16:45:51 -0000	1.22
+++ distinfo	11 Sep 2004 01:38:44 -0000
@@ -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
Index: pkg-plist
===================================================================
RCS file: /net/pcat/home/ncvs/ports/japanese/samba/pkg-plist,v
retrieving revision 1.17
diff -u -r1.17 pkg-plist
--- pkg-plist	5 Aug 2004 16:45:51 -0000	1.17
+++ pkg-plist	11 Sep 2004 05:53:34 -0000
@@ -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



>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200409110626.i8B6Q6uL046816>