ports/66617: net/samba-devel (Samba 3.0.4) Port - group_mapping.tdb deleted at reboot
Timur I. Bakeyev
timur at com.bat.ru
Mon May 17 22:50:24 UTC 2004
The following reply was made to PR ports/66617; it has been noted by GNATS.
From: "Timur I. Bakeyev" <timur at com.bat.ru>
To: freebsd-gnats-submit at FreeBSD.org
Cc: hkunst at moneyfitness.com
Subject: Re: ports/66617: net/samba-devel (Samba 3.0.4) Port - group_mapping.tdb deleted at reboot
Date: Tue, 18 May 2004 00:46:15 +0200
--17pEHd4RhPHOinZp
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Here is the patch, that fixes this problem - it putes, all the files into /var/db/samba.
Hope, it's the final point in the trip of lockdir around the file system :)
Also, these patch removes dependency of libsmbclient from kerberos and ldap.
iconv autodetection is back :)
And there is a small patch from Konstantin Reznichenko <kot at premierbank.dp.ua> tha fixes
coredump of smbd when user add script is invoked.
With regards,
Timur.
--17pEHd4RhPHOinZp
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="samba-devel.diff"
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/samba-devel/Makefile,v
retrieving revision 1.120
diff -u -r1.120 Makefile
--- Makefile 11 May 2004 20:30:01 -0000 1.120
+++ Makefile 17 May 2004 22:20:06 -0000
@@ -7,7 +7,7 @@
PORTNAME= samba
PORTVERSION= 3.0.4
-PORTREVISION?= 0
+PORTREVISION?= 1
PORTEPOCH?= 1
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SAMBA}
@@ -20,8 +20,7 @@
CONFLICTS?= ja-samba-2.* samba-2.* sharity-light-1.*
USE_ICONV= yes
-GNU_CONFIGURE= yes
-#USE_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
LATEST_LINK?= ${PKGNAMEPREFIX}${PORTNAME}-3${PKGNAMESUFFIX}
EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
@@ -32,7 +31,7 @@
SAMBA_SPOOL?= ${VARDIR}/spool/samba
SAMBA_LOGDIR= ${VARDIR}/log/samba
SAMBA_RUNDIR= ${VARDIR}/run
-SAMBA_LOCKDIR= ${SAMBA_RUNDIR}/samba
+SAMBA_LOCKDIR?= ${VARDIR}/db/samba
SAMBA_PRIVATE?= ${PREFIX}/private
SAMBA_CONFDIR?= ${PREFIX}/etc
SAMBA_SWATDIR= ${PREFIX}/share/swat
@@ -56,11 +55,10 @@
CONFIGURE_ARGS+= --with-libiconv=${LOCALBASE}
-OPTIONS= LDAP "With LDAP support" on \
- ADS "With Active Directory support" on
-
.if !defined(SAMBA_SUBPORT)
-OPTIONS+= CUPS "With CUPS printing support" on \
+OPTIONS= LDAP "With LDAP support" on \
+ ADS "With Active Directory support" on \
+ CUPS "With CUPS printing support" on \
WINBIND "With WinBIND support" on \
ACL_SUPPORT "With ACL support" off \
SYSLOG "With Syslog support" off \
@@ -198,7 +196,7 @@
.endif
# Common part
-.if !defined(WITHOUT_ADS)
+.if defined(WITH_ADS)
WANT_LDAP= yes
WANT_KRB5= yes
CONFIGURE_ARGS+= --with-ads
@@ -211,7 +209,7 @@
CONFIGURE_ARGS+= --with-krb5=${KRB5_HOME}
.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME}
-.elif ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(/usr/lib/libkrb5.a)
+.elif ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(${DESTDIR}/usr/lib/libkrb5.a)
CONFIGURE_ARGS+= --with-krb5=${DESTDIR}/usr
.else
LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal
Index: pkg-message
===================================================================
RCS file: /home/ncvs/ports/net/samba-devel/pkg-message,v
retrieving revision 1.1
diff -u -r1.1 pkg-message
--- pkg-message 6 Apr 2004 11:56:20 -0000 1.1
+++ pkg-message 17 May 2004 22:20:06 -0000
@@ -15,4 +15,7 @@
chmod 600 smbpasswd
But the usage of it is deprecated.
+------------------------------------------------------------------------------
+NOTICE: *.tdb files have been moved from /var/run/samba/ to /var/db/samba/!
+NOTICE: Please, move them manually, if necessary, at least winbind_*.tdb.
******************************************************************************
Index: files/patch-lib_util_str.c
===================================================================
RCS file: files/patch-lib_util_str.c
diff -N files/patch-lib_util_str.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-lib_util_str.c 17 May 2004 22:20:06 -0000
@@ -0,0 +1,23 @@
+--- lib/util_str.c.orig Tue Apr 20 22:42:55 2004
++++ lib/util_str.c Fri May 14 02:02:30 2004
+@@ -1980,10 +1980,16 @@
+ {
+ int bits = 0;
+ int char_count = 0;
+- size_t out_cnt = 0;
+- size_t len = data.length;
+- size_t output_len = data.length * 2;
+- char *result = malloc(output_len); /* get us plenty of space */
++ size_t out_cnt, len, output_len;
++ char *result;
++
++ if (!data.length || !data.data)
++ return NULL;
++
++ out_cnt = 0;
++ len = data.length;
++ output_len = data.length * 2;
++ result = malloc(output_len); /* get us plenty of space */
+
+ while (len-- && out_cnt < (data.length * 2) - 5) {
+ int c = (unsigned char) *(data.data++);
Index: files/samba.sh.sample
===================================================================
RCS file: /home/ncvs/ports/net/samba-devel/files/samba.sh.sample,v
retrieving revision 1.6
diff -u -r1.6 samba.sh.sample
--- files/samba.sh.sample 20 Apr 2004 16:15:05 -0000 1.6
+++ files/samba.sh.sample 17 May 2004 22:20:06 -0000
@@ -63,7 +63,7 @@
}
nmbd_precmd() {
- # XXX: Never delete winbindd_idmap.tdb and winbindd_cache.tdb
+ # XXX: Never delete winbindd_idmap, winbindd_cache and group_mapping
if [ -d "%%SAMBA_LOCKDIR%%" ]; then
echo "Starting SAMBA: removing stale tdbs :"
for file in connections.tdb locking.tdb messages.tdb \
--17pEHd4RhPHOinZp
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="samba-libsmbclient.diff"
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/samba-libsmbclient/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile 11 May 2004 20:30:01 -0000 1.16
+++ Makefile 17 May 2004 22:20:15 -0000
@@ -5,7 +5,7 @@
# $FreeBSD: ports/net/samba-libsmbclient/Makefile,v 1.16 2004/05/11 20:30:01 lofi Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 0
PKGNAMESUFFIX= -libsmbclient
--17pEHd4RhPHOinZp--
More information about the freebsd-ports-bugs
mailing list