- Put lockfiles into ${VARDIR}/db/samba

- Resolve kerberos/ldap issues with libsmbclient
- Reenable iconv autodetection
- Add a small patch from Konstantin Reznichenko <kot@premierbank.dp.ua> that fixes
  coredump of smbd when user add script is invoked

PR: ports/66617
Submitted by: maintainer

4 files changed, 35 insertions, 11 deletions

diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index d54f49e0ead4..8018cc5bf150 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -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 @@ COMMENT?=		A free SMB and CIFS client and server for UNIX
 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 @@ VARDIR=			${DESTDIR}/var
 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+=	--exec-prefix=${PREFIX} \
 
 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 @@ CONFIGURE_ARGS+=	--with-included-popt
 .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+=	--without-ads
 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
diff --git a/net/samba3/files/patch-lib_util_str.c b/net/samba3/files/patch-lib_util_str.c
new file mode 100644
index 000000000000..f5450d387648
--- /dev/null
+++ b/net/samba3/files/patch-lib_util_str.c
@@ -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++);
diff --git a/net/samba3/files/samba.sh.sample b/net/samba3/files/samba.sh.sample
index c37ba55de080..1b51ab40b6d8 100644
--- a/net/samba3/files/samba.sh.sample
+++ b/net/samba3/files/samba.sh.sample
@@ -63,7 +63,7 @@ samba_stop() {
 }
 
 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 \
diff --git a/net/samba3/pkg-message b/net/samba3/pkg-message
index 1eaf5aeb529e..2346286df435 100644
--- a/net/samba3/pkg-message
+++ b/net/samba3/pkg-message
@@ -15,4 +15,7 @@ script:
   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.
 ******************************************************************************