Date: Sun, 17 Apr 2005 17:00:02 +0200 From: "Timur I. Bakeyev" <timur@gnu.org> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/80029: [MAINTAINER] Update net/samba3 to 3.0.14a Message-ID: <1113750002.0@timur.home.bat.ru> Resent-Message-ID: <200504171500.j3HF0VpX011681@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 80029
>Category: ports
>Synopsis: [MAINTAINER] Update net/samba3 to 3.0.14a
>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: Sun Apr 17 15:00:31 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Timur I. Bakeyev
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD 5.3-STABLE #2: Mon Feb 14 05:35:07 CET 2005
root@timur.home.bat.ru:/usr/src/sys/i386/compile/COMMON
>Description:
This is an update of net/samba3 to 3.0.14a.
Common bugs fixed in 3.0.14 include:
~ o Compatibility issues between Winbind and Windows 2003 SP1
~ domain controllers (*2k3sp1*).
~ o MS-DFS errors with Windows XP SP2 clients.
~ o High CPU loads caused by infinite loops in the FindNext()
~ server code.
>How-To-Repeat:
>Fix:
remove files/patch-smbd_dir.c
--- samba3.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/samba3/Makefile,v
retrieving revision 1.139
diff -u -r1.139 Makefile
--- Makefile 12 Apr 2005 03:26:16 -0000 1.139
+++ Makefile 17 Apr 2005 14:37:56 -0000
@@ -6,8 +6,8 @@
#
PORTNAME= samba
-PORTVERSION?= 3.0.12
-PORTREVISION?= 1
+PORTVERSION?= 3.0.14a
+PORTREVISION?= 0
PORTEPOCH?= 1
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SAMBA}
@@ -93,7 +93,7 @@
CONFIGURE_ARGS+= --with-pam --with-readline --with-sendfile-support \
--without-libsmbclient --without-python
-.if defined(WITH_CUPS)
+.if !defined(WITHOUT_CUPS)
LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base
CONFIGURE_ARGS+= --enable-cups
CUPS= cups
@@ -216,7 +216,7 @@
.endif
# Common part
-.if defined(WITH_ADS)
+.if !defined(WITHOUT_ADS)
WANT_LDAP= yes
WANT_KRB5= yes
CONFIGURE_ARGS+= --with-ads
@@ -281,15 +281,6 @@
SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \
SAMBA_SPOOL=${SAMBA_SPOOL}
-pre-configure::
- @${ECHO_MSG} ""
- @${ECHO_MSG} "!!! Due to a bug in the deinstall procedure in port versions prior to 3.0.9,"
- @${ECHO_MSG} "!!! you should BACK UP YOUR VALUABLE ${SAMBA_LOCKDIR}/windbindd_* FILES"
- @${ECHO_MSG} "!!! before you continue the (re)installation."
- @${ECHO_MSG} ""
- @${ECHO_MSG} "*** Press Ctrl-C *now* if you need to preserve these files ***"
- @sleep 5
-
pre-fetch:
@${ECHO_MSG} "===> -------------------------------------------"
@${ECHO_MSG} "===> Run 'make config' to (re)configure the port"
@@ -362,8 +353,7 @@
@${ECHO_CMD} "@exec ${MKDIR} ${SAMBA_LOCKDIR} 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@exec ${CHMOD} 0755 ${SAMBA_LOCKDIR}" >> ${TMPPLIST}
@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_LOCKDIR}" >> ${TMPPLIST}
- @${ECHO_CMD} "@unexec ${RM} -rf ${SAMBA_LOCKDIR}/printing" >> ${TMPPLIST}
- @${ECHO_CMD} "@unexec for f in \`${LS} ${SAMBA_LOCKDIR} | ${GREP} -v '^winbindd_'\`; do ${RM} -f ${SAMBA_LOCKDIR}/\$${f}; done" >> ${TMPPLIST}
+ @${ECHO_CMD} "@unexec for f in connections.tdb locking.tdb messages.tdb sessionid.tdb unexpected.tdb brlock.tdb namelist.debug; do ${RM} -f ${SAMBA_LOCKDIR}/\$${f}; done" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_LOCKDIR} 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove ${SAMBA_LOCKDIR}/* manually.\"" >> ${TMPPLIST}
# Private
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/samba3/distinfo,v
retrieving revision 1.63
diff -u -r1.63 distinfo
--- distinfo 20 Mar 2005 09:29:04 -0000 1.63
+++ distinfo 16 Apr 2005 01:47:21 -0000
@@ -1,2 +1,2 @@
-MD5 (samba-3.0.12.tar.gz) = 5c31e5d115ba08b30d1541983d30e2dc
-SIZE (samba-3.0.12.tar.gz) = 15576905
+MD5 (samba-3.0.14a.tar.gz) = ebee37e66a8b5f6fd328967dc09088e8
+SIZE (samba-3.0.14a.tar.gz) = 15605851
Index: files/patch-smbd_dir.c
===================================================================
RCS file: files/patch-smbd_dir.c
diff -N files/patch-smbd_dir.c
--- files/patch-smbd_dir.c 25 Mar 2005 10:54:10 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-##
-## See https://bugzilla.samba.org/bug/2501 for details
-##
-diff -urBb --exclude-from=samba-cvs/diff.excludes samba-3.0.12-orig/source/smbd/dir.c samba-3.0.12/source/smbd/dir.c
---- smbd/dir.c.orig 2005-03-18 08:56:41.000000000 -0600
-+++ smbd/dir.c 2005-03-21 12:51:56.541216536 -0600
-@@ -595,6 +595,13 @@
- BOOL dptr_SearchDir(struct dptr_struct *dptr, const char *name, long *poffset, SMB_STRUCT_STAT *pst)
- {
- ZERO_STRUCTP(pst);
-+
-+ if (!dptr->has_wild && (dptr->dir_hnd->offset == -1)) {
-+ /* This is a singleton directory and we're already at the end. */
-+ *poffset = -1;
-+ return False;
-+ }
-+
- while (SearchDir(dptr->dir_hnd, name, poffset) == True) {
- if (is_visible_file(dptr->conn, dptr->path, name, pst, True)) {
- return True;
Index: files/samba.sh.sample
===================================================================
RCS file: /home/ncvs/ports/net/samba3/files/samba.sh.sample,v
retrieving revision 1.9
diff -u -r1.9 samba.sh.sample
--- files/samba.sh.sample 23 Nov 2004 17:34:51 -0000 1.9
+++ files/samba.sh.sample 17 Apr 2005 14:36:56 -0000
@@ -18,6 +18,7 @@
#
#nmbd_enable="YES"
#smbd_enable="YES"
+%%WINBIND%%# You need to enable winbindd separately, by adding:
%%WINBIND%%#winbindd_enable="YES"
#
@@ -41,11 +42,9 @@
if test -n ${samba_enable:-""} && checkyesno samba_enable; then
nmbd_enable=${nmbd_enable:-"YES"}
smbd_enable=${smbd_enable:-"YES"}
-%%WINBIND%% winbindd_enable=${winbindd_enable:-"YES"}
%%WINBIND%% # Check, that winbind is actally configured
-%%WINBIND%% if [ ! "`egrep -i '(idmap.*uid|winbind.*uid)' ${samba_config} 2>/dev/null | egrep -v [\#\;]`" ]; then
-%%WINBIND%% #warn "Winbind support is not configured"
-%%WINBIND%% winbindd_enable="NO"
+%%WINBIND%% if [ "`egrep -i '(idmap.*uid|winbind.*uid)' ${samba_config} 2>/dev/null | egrep -v [\#\;]`" ]; then
+%%WINBIND%% winbindd_enable="YES"
%%WINBIND%% fi
fi
--- samba3.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1113750002.0>