Update to 3.0.3.p2 (aka pre2), which containes

a lot of imporvements and bugfixes since 3.0.2a.

In addition following problems solved:
 o linking agaist libiconv is mandatary now
 o more ways of detecting Kerberos5 installation and
   LIB_DEPENDS on Heimdal port if none is found -
   should address problems with bentoo building as well
 o fixed problem when port wasn't compilable when LDAP
   wasn't chosen and ADS was.

Submitted by:	Timur Bakeyev <timur@gnu.org> (maintainer)
PR:		65237

6 files changed, 140 insertions, 28 deletions

diff --git a/net/samba3/files/README.FreeBSD b/net/samba3/files/README.FreeBSD
index 24234b687c89..5bc20d291549 100644
--- a/net/samba3/files/README.FreeBSD
+++ b/net/samba3/files/README.FreeBSD
@@ -18,4 +18,4 @@ use NT4+SP3 or Win95+updates clients, set "encrypt passwords" parameter to
 yes and use smbpasswd [username] to use /usr/local/private/smbpasswd for
 authentication.
 
-FreeBSD SAMBA ports maintainer: Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>
+FreeBSD Samba-devel port maintainer: Timur Bakeyev <timur@gnu.org>
diff --git a/net/samba3/files/patch-Makefile.in b/net/samba3/files/patch-Makefile.in
index 05811dbdd358..efeaa5e5b20e 100644
--- a/net/samba3/files/patch-Makefile.in
+++ b/net/samba3/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Feb  6 23:40:27 2004
-+++ Makefile.in	Thu Mar  4 05:47:34 2004
+--- Makefile.in.orig	Sun Apr  4 09:37:15 2004
++++ Makefile.in	Mon Apr  5 20:43:42 2004
 @@ -101,6 +101,7 @@
  LIBSMBCLIENT_MAJOR=0
  LIBSMBCLIENT_MINOR=1
@@ -8,7 +8,7 @@
  
  FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper  -I. $(CPPFLAGS) -I$(srcdir)
  FLAGS2 = 
-@@ -951,8 +952,8 @@
+@@ -957,8 +958,8 @@
  		@SONAMEFLAG@`basename $@`
  
  bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
@@ -19,7 +19,7 @@
  		$(KRB5LIBS) $(LDAP_LIBS) \
  		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
  
-@@ -1035,13 +1036,13 @@
+@@ -1041,13 +1042,13 @@
  @WINBIND_NSS@: $(WINBIND_NSS_PICOBJS)
  	@echo "Linking $@"
  	@$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \
@@ -35,7 +35,7 @@
  
  nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
  	@echo "Linking $@"
-@@ -1204,7 +1205,7 @@
+@@ -1218,7 +1219,7 @@
  
  bin/t_snprintf@EXEEXT@: lib/snprintf.c
  	$(CC) $(FLAGS) -o $@ -DTEST_SNPRINTF lib/snprintf.c -lm
@@ -44,7 +44,7 @@
  
  install-everything: install installmodules
  
-@@ -1256,7 +1257,7 @@
+@@ -1270,7 +1271,7 @@
  
  installclientlib: installdirs libsmbclient
  	@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/lib
@@ -53,21 +53,3 @@
  	-$(INSTALLCLIENTCMD_A) bin/libsmbclient.a $(DESTDIR)${prefix}/lib
  	@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)${prefix}/include
  	-$(INSTALLCMD) $(srcdir)/include/libsmbclient.h $(DESTDIR)${prefix}/include
-@@ -1276,7 +1277,7 @@
- 	fi
- 	PYTHON_OBJS="$(PYTHON_PICOBJS)" \
- 	PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS) $(FLAGS)" \
--	LIBS="$(LIBS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS)" \
-+	LIBS="$(LDFLAGS) $(LIBS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS)" \
- 		$(PYTHON) python/setup.py build
- 
- python_install: $(PYTHON_PICOBJS)
-@@ -1286,7 +1287,7 @@
- 	fi
- 	PYTHON_OBJS="$(PYTHON_PICOBJS)" \
- 	PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
--	LIBS="$(LIBS)" \
-+	LIBS="$(LDFLAGS) $(LIBS)" \
- 		$(PYTHON) python/setup.py install
- 
- python_clean:
diff --git a/net/samba3/files/patch-aclocal.m4 b/net/samba3/files/patch-aclocal.m4
new file mode 100644
index 000000000000..36c172411d1e
--- /dev/null
+++ b/net/samba3/files/patch-aclocal.m4
@@ -0,0 +1,104 @@
+--- aclocal.m4.orig	Sat Apr  3 22:30:01 2004
++++ aclocal.m4	Sat Apr  3 22:33:24 2004
+@@ -564,89 +564,20 @@
+     jm_cv_lib_iconv=""
+     jm_cv_giconv=no
+     jm_save_LIBS="$LIBS"
+-    LIBS="$LIBS -lbiconv"
+-    AC_TRY_LINK([#include <stdlib.h>
+-#include <biconv.h>],
+-        [iconv_t cd = iconv_open("","");
+-         iconv(cd,NULL,NULL,NULL,NULL);
+-         iconv_close(cd);],
+-      jm_cv_func_iconv=yes
+-      jm_cv_biconv=yes
+-      jm_cv_include="biconv.h"
+-      jm_cv_lib_iconv="biconv")
+-      LIBS="$jm_save_LIBS"
+-
+-    dnl Check for include in funny place but no lib needed
+-    if test "$jm_cv_func_iconv" != yes; then 
+-      AC_TRY_LINK([#include <stdlib.h>
+-#include <giconv.h>],
+-        [iconv_t cd = iconv_open("","");
+-         iconv(cd,NULL,NULL,NULL,NULL);
+-         iconv_close(cd);],
+-         jm_cv_func_iconv=yes
+-         jm_cv_include="giconv.h"
+-         jm_cv_giconv="yes"
+-         jm_cv_lib_iconv="")
+-
+-      dnl Standard iconv.h include, lib in glibc or libc ...
+-      if test "$jm_cv_func_iconv" != yes; then
+-        AC_TRY_LINK([#include <stdlib.h>
++    LIBS="$LIBS -liconv"
++  AC_TRY_LINK([#include <stdlib.h>
+ #include <iconv.h>],
+-          [iconv_t cd = iconv_open("","");
+-           iconv(cd,NULL,NULL,NULL,NULL);
+-           iconv_close(cd);],
+-           jm_cv_include="iconv.h"
+-           jm_cv_func_iconv=yes
+-           jm_cv_lib_iconv="")
+-
+-          if test "$jm_cv_lib_iconv" != yes; then
+-            jm_save_LIBS="$LIBS"
+-            LIBS="$LIBS -lgiconv"
+-            AC_TRY_LINK([#include <stdlib.h>
+-#include <giconv.h>],
+-              [iconv_t cd = iconv_open("","");
+-               iconv(cd,NULL,NULL,NULL,NULL);
+-               iconv_close(cd);],
+-              jm_cv_lib_iconv=yes
+-              jm_cv_func_iconv=yes
+-              jm_cv_include="giconv.h"
+-              jm_cv_giconv=yes
+-              jm_cv_lib_iconv="giconv")
+-
+-           LIBS="$jm_save_LIBS"
+-
+-        if test "$jm_cv_func_iconv" != yes; then
+-          jm_save_LIBS="$LIBS"
+-          LIBS="$LIBS -liconv"
+-          AC_TRY_LINK([#include <stdlib.h>
+-#include <iconv.h>],
+-            [iconv_t cd = iconv_open("","");
+-             iconv(cd,NULL,NULL,NULL,NULL);
+-             iconv_close(cd);],
+-            jm_cv_include="iconv.h"
+-            jm_cv_func_iconv=yes
+-            jm_cv_lib_iconv="iconv")
+-          LIBS="$jm_save_LIBS"
+-        fi
+-      fi
+-    fi
+-  fi
++    [iconv_t cd = iconv_open("","");
++     iconv(cd,NULL,NULL,NULL,NULL);
++     iconv_close(cd);],
++    jm_cv_include="iconv.h"
++    jm_cv_func_iconv=yes
++    jm_cv_lib_iconv="iconv")
++    LIBS="$jm_save_LIBS"
+   if test "$jm_cv_func_iconv" = yes; then
+-    if test "$jm_cv_giconv" = yes; then
+-      AC_DEFINE(HAVE_GICONV, 1, [What header to include for iconv() function: giconv.h])
+-      AC_MSG_RESULT(yes)
+-      ICONV_FOUND=yes
+-    else
+-      if test "$jm_cv_biconv" = yes; then
+-        AC_DEFINE(HAVE_BICONV, 1, [What header to include for iconv() function: biconv.h])
+-        AC_MSG_RESULT(yes)
+-        ICONV_FOUND=yes
+-      else 
+-        AC_DEFINE(HAVE_ICONV, 1, [What header to include for iconv() function: iconv.h])
+-        AC_MSG_RESULT(yes)
+-        ICONV_FOUND=yes
+-      fi
+-    fi
++    AC_DEFINE(HAVE_ICONV, 1, [What header to include for iconv() function: iconv.h])
++    AC_MSG_RESULT(yes)
++    ICONV_FOUND=yes
+   else
+     AC_MSG_RESULT(no)
+   fi
diff --git a/net/samba3/files/patch-configure.in b/net/samba3/files/patch-configure.in
index bdba5d47cd7c..88a46040b022 100644
--- a/net/samba3/files/patch-configure.in
+++ b/net/samba3/files/patch-configure.in
@@ -1,6 +1,14 @@
---- configure.in.orig	Sat Jan 31 04:40:54 2004
-+++ configure.in	Sat Jan 31 04:43:23 2004
-@@ -4037,6 +4037,8 @@
+--- configure.in.orig	Sun Apr  4 09:37:25 2004
++++ configure.in	Mon Apr  5 21:21:58 2004
+@@ -2983,7 +2983,6 @@
+ 
+ 
+ dictpath="/usr/lib/cracklib_dict"
+-with_cracklib=yes
+ ###############################################
+ # test for where we get FaciestCheck from
+ AC_MSG_CHECKING(where to use cracklib from (default=$dictpath))
+@@ -4118,6 +4117,8 @@
  		# the Linux version.
  		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
  		    nsswitch/winbind_nss_linux.o"
diff --git a/net/samba3/files/patch-smbd_chgpasswd.c b/net/samba3/files/patch-smbd_chgpasswd.c
new file mode 100644
index 000000000000..104ead0ff325
--- /dev/null
+++ b/net/samba3/files/patch-smbd_chgpasswd.c
@@ -0,0 +1,10 @@
+--- smbd/chgpasswd.c.orig	Mon Apr  5 21:33:21 2004
++++ smbd/chgpasswd.c	Mon Apr  5 21:33:34 2004
+@@ -49,7 +49,6 @@
+ #include "includes.h"
+ 
+ #ifdef HAVE_WORKING_CRACKLIB
+-#include <crack.h>
+ 
+ #ifndef HAVE_CRACKLIB_DICTPATH
+ #ifndef CRACKLIB_DICTPATH
diff --git a/net/samba3/files/patch-tests_crack.c b/net/samba3/files/patch-tests_crack.c
new file mode 100644
index 000000000000..6d62851c7d7d
--- /dev/null
+++ b/net/samba3/files/patch-tests_crack.c
@@ -0,0 +1,8 @@
+--- tests/crack.c.orig	Sat Apr  3 18:04:05 2004
++++ tests/crack.c	Sat Apr  3 01:12:18 2004
+@@ -1,5 +1,3 @@
+-#include <crack.h>
+-
+ #ifndef HAVE_CRACKLIB_DICTPATH
+ #ifndef CRACKLIB_DICTPATH
+ #define CRACKLIB_DICTPATH SAMBA_CRACKLIB_DICTPATH