Update ja-samba package to 2.2.12.0.9.1 (2.2.12-ja-1.0beta1).

- Fix security problem up fixed by 2.2.12 and recent problem reported
  by CAN-2004-1154.

- pkgsrc changes:

	* Overhaul pkgsrc structure (as net/samba).
	* Adapt PKG_OPTIONS frame work.
	* Add support for winbind (not tested).
	* Add SAMBA_USER/SAMBA_GROUP for default user.
	* move codepages directory from share/samba to lib/samba.

8 files changed, 172 insertions, 28 deletions

diff --git a/net/ja-samba/patches/patch-aa b/net/ja-samba/patches/patch-aa
index 418c5bb9741..88c4b818cfd 100644
--- a/net/ja-samba/patches/patch-aa
+++ b/net/ja-samba/patches/patch-aa
@@ -1,17 +1,51 @@
-$NetBSD: patch-aa,v 1.6 2004/06/05 13:16:35 taca Exp $
+$NetBSD: patch-aa,v 1.7 2005/06/19 18:38:40 taca Exp $
 
 --- Makefile.in.orig	2004-01-22 20:24:22.000000000 +0900
 +++ Makefile.in
-@@ -117,6 +117,8 @@ LDSHFLAGSPO = @LDSHFLAGS@ @ARCHFLAGPO@
+@@ -117,6 +117,9 @@ LDSHFLAGSPO = @LDSHFLAGS@ @ARCHFLAGPO@
  LDSHFLAGS32 = @LDSHFLAGS@ @ARCHFLAG32@
  LDSHFLAGS64 = @LDSHFLAGS@ @ARCHFLAG64@
  
 +PAM_NEEDS_LIBC = @PAM_NEEDS_LIBC@
++PAM_SMBPASS= @PAM_MOD@
 +
  WINBIND_PROGS = @WINBIND_TARGETS@
  WINBIND_SPROGS = @WINBIND_STARGETS@
  WINBIND_PAM_PROGS = @WINBIND_PAM_TARGETS@
-@@ -753,7 +755,7 @@ bin/libsmbclient.a: $(LIBSMBCLIENT_PICOB
+@@ -124,10 +127,10 @@ WINBIND_LPROGS = @WINBIND_LTARGETS@
+ 
+ SPROGS = bin/smbd bin/nmbd bin/swat
+ PROGS1 = bin/smbclient bin/smbspool bin/testparm bin/testprns bin/smbstatus bin/smbcontrol bin/tdbbackup bin/make_printerdef @RUNPROG@ 
+-PROGS2 = bin/smbpasswd bin/make_smbcodepage bin/rpcclient bin/make_unicodemap bin/smbcacls @PAM_MOD@ @PDBEDIT@
++PROGS2 = bin/smbpasswd bin/make_smbcodepage bin/rpcclient bin/make_unicodemap bin/smbcacls @PDBEDIT@
+ MPROGS = @MPROGS@
+ WPROGS = @WRAPPROG@ @WRAP@ @WRAP32@ @WRAP64@
+-LPROGS = $(WINBIND_PAM_PROGS) $(WINBIND_LPROGS)
++LPROGS = ${PAM_SMBPASS} $(WINBIND_PAM_PROGS) $(WINBIND_LPROGS)
+ PROGS = $(PROGS1) $(PROGS2) $(MPROGS) $(WPROGS) bin/nmblookup
+ TORTURE_PROGS = bin/smbtorture bin/msgtest bin/masktest bin/locktest bin/locktest2
+ SHLIBS = @LIBSMBCLIENT@
+@@ -465,7 +468,7 @@ TDBDUMP_OBJ =  tdb/tdbdump.o $(TDBBASE_O
+ # now the rules...
+ ######################################################################
+ 
+-all : CHECK all-gettext-support $(SPROGS) $(PROGS) $(WINBIND_PROGS) $(WINBIND_SPROGS) $(LPROGS) $(BUILD_PROGS)
++all : CHECK all-gettext-support $(SPROGS) $(PROGS) $(SHLIBS) $(WINBIND_PROGS) $(WINBIND_SPROGS) $(LPROGS) $(BUILD_PROGS)
+ 
+ # The following "everything" is NOT needed except by Samba developers - so do not use this!
+ everything : CHECK all-gettext-support $(SPROGS) $(PROGS) $(SHLIBS) nsswitch smbwrapper smbtorture debug2html smbfilter $(BUILD_PROGS)
+@@ -744,8 +747,8 @@ bin/smbwrapper.64.@SHLIBEXT@: $(PICOBJS6
+ 
+ bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS) bin/.dummy
+ 	@echo Linking libsmbclient shared library $@
+-	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(SOLIBS) \
+-		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
++	@$(SHLD) $(LDSHFLAGS) -o $@ $(LDFLAGS) $(LIBSMBCLIENT_PICOBJS) \
++		$(SOLIBS) @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
+ 
+ bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS) bin/.dummy
+ 	@echo Linking libsmbclient non-shared library $@
+@@ -753,7 +756,7 @@ bin/libsmbclient.a: $(LIBSMBCLIENT_PICOB
  
  bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_OBJ) bin/.dummy
  	@echo Linking shared library $@
@@ -20,7 +54,7 @@ $NetBSD: patch-aa,v 1.6 2004/06/05 13:16:35 taca Exp $
  		@SONAMEFLAG@`basename $@`
  
  nsswitch/libnss_wins.@SHLIBEXT@: $(NSS_OBJ)
-@@ -777,7 +779,7 @@ nsswitch/libnss_winbind.@SHLIBEXT@: $(WI
+@@ -777,7 +780,7 @@ nsswitch/libnss_winbind.@SHLIBEXT@: $(WI
  
  nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_OBJ)
  	@echo Linking $@
@@ -29,3 +63,27 @@ $NetBSD: patch-aa,v 1.6 2004/06/05 13:16:35 taca Exp $
  		@SONAMEFLAG@`basename $@`
  
  bin/wbinfo: $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(NOPROTO_OBJ) \
+@@ -878,7 +881,7 @@ ipk-codepages-ja: $(BUILD_PROGS)
+ 	$(SHELL) $(srcdir)/script/mkipk.sh
+ 	-rm -rf $(IPKTMP)
+ 
+-install: installbin installman installscripts installcp installswat install-gettext-support
++install: installbin installman installscripts installcp installswat install-gettext-support @INSTALLCLIENTLIB@
+ # install: installbin installman installscripts installcp installswat install-gettext-support @INSTALLCLIENTLIB@
+ 
+ installdirs:
+@@ -916,11 +919,9 @@ installswat: installdirs
+ 	fi; done;
+ 
+ installclientlib: @LIBSMBCLIENT@
+-	$(SHELL) $(srcdir)/install-sh -d -m $(INSTALLPERMS) ${prefix}/lib
+-	-$(INSTALLCLIENTCMD_SH) @LIBSMBCLIENT_SHARED@ ${prefix}/lib
+-	-$(INSTALLCLIENTCMD_A) @LIBSMBCLIENT_NON_SHARED@ ${prefix}/lib
+-	$(SHELL) $(srcdir)/install-sh -d -m $(INSTALLPERMS) ${prefix}/include
+-	-$(INSTALLCMD) include/libsmbclient.h ${prefix}/include
++	$(INSTALLCLIENTCMD_SH) @LIBSMBCLIENT_SHARED@ ${prefix}/lib
++	$(INSTALLCLIENTCMD_A) @LIBSMBCLIENT_NON_SHARED@ ${prefix}/lib
++	$(INSTALLCMD) include/libsmbclient.h ${prefix}/include
+ 
+ # revert to the previously installed version
+ revert:
diff --git a/net/ja-samba/patches/patch-ab b/net/ja-samba/patches/patch-ab
index 5de4011ecaf..fe966aa48eb 100644
--- a/net/ja-samba/patches/patch-ab
+++ b/net/ja-samba/patches/patch-ab
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.6 2004/06/05 13:16:35 taca Exp $
+$NetBSD: patch-ab,v 1.7 2005/06/19 18:38:40 taca Exp $
 
 --- configure.in.orig	2004-01-22 20:20:32.000000000 +0900
 +++ configure.in
+@@ -1077,7 +1077,7 @@ case "$host_os" in
+ 			PICFLAG="-KPIC"   # Is this correct for SunOS
+ 			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
+ 		;;
+-		*freebsd*) AC_DEFINE(FREEBSD)
++		*freebsd*|*dragonfly*) AC_DEFINE(FREEBSD)
+ 			AC_DEFINE(BSD44)
+ 			BLDSHARED="true"
+ 			LDSHFLAGS="-shared"
 @@ -2352,6 +2352,10 @@ AC_ARG_WITH(pam,
  # we can't build a pam module if we don't have pam.
  AC_CHECK_LIB(pam, pam_get_data, [AC_DEFINE(HAVE_LIBPAM)])
@@ -13,3 +22,11 @@ $NetBSD: patch-ab,v 1.6 2004/06/05 13:16:35 taca Exp $
  #################################################
  # check for pam_smbpass support
  AC_MSG_CHECKING(whether to use pam_smbpass)
+@@ -2717,6 +2721,7 @@ AC_ARG_WITH(libsmbclient,
+   yes)
+      if test $BLDSHARED = true; then
+         INSTALLCLIENTCMD_SH="\$(INSTALLCMD)"
++        INSTALLCLIENTCMD_A="\$(INSTALLCMD)"
+         LIBSMBCLIENT_SHARED=bin/libsmbclient.$SHLIBEXT
+ 	LIBSMBCLIENT_NON_SHARED=bin/libsmbclient.a
+         LIBSMBCLIENT=libsmbclient
diff --git a/net/ja-samba/patches/patch-ac b/net/ja-samba/patches/patch-ac
index cbfc248d05f..ce3ab51a967 100644
--- a/net/ja-samba/patches/patch-ac
+++ b/net/ja-samba/patches/patch-ac
@@ -1,7 +1,16 @@
-$NetBSD: patch-ac,v 1.6 2004/06/05 13:16:35 taca Exp $
+$NetBSD: patch-ac,v 1.7 2005/06/19 18:38:40 taca Exp $
 
 --- configure.orig	2004-01-22 20:20:31.000000000 +0900
 +++ configure
+@@ -16267,7 +16267,7 @@ _ACEOF
+ _ACEOF
+ 
+ 		;;
+-		*freebsd*) cat >>confdefs.h <<\_ACEOF
++		*freebsd*|*dragonfly*) cat >>confdefs.h <<\_ACEOF
+ #define FREEBSD 1
+ _ACEOF
+ 
 @@ -21449,6 +21449,49 @@ echo "${ECHO_T}no" >&6
  
  fi;
@@ -52,7 +61,15 @@ $NetBSD: patch-ac,v 1.6 2004/06/05 13:16:35 taca Exp $
  #################################################
  # check for a NISPLUS password database
  echo "$as_me:$LINENO: checking whether to use NISPLUS SAM database" >&5
-@@ -26986,6 +27029,7 @@ s,@ROFF@,$ROFF,;t t
+@@ -21775,6 +21818,7 @@ if test "${with_libsmbclient+set}" = set
+   yes)
+      if test $BLDSHARED = true; then
+         INSTALLCLIENTCMD_SH="\$(INSTALLCMD)"
++        INSTALLCLIENTCMD_A="\$(INSTALLCMD)"
+         LIBSMBCLIENT_SHARED=bin/libsmbclient.$SHLIBEXT
+ 	LIBSMBCLIENT_NON_SHARED=bin/libsmbclient.a
+         LIBSMBCLIENT=libsmbclient
+@@ -26986,6 +27030,7 @@ s,@ROFF@,$ROFF,;t t
  s,@DYNEXP@,$DYNEXP,;t t
  s,@SHDYNEXP@,$SHDYNEXP,;t t
  s,@KRBLIBS@,$KRBLIBS,;t t
diff --git a/net/ja-samba/patches/patch-ao b/net/ja-samba/patches/patch-ao
index e7f689dbd87..ebed943198e 100644
--- a/net/ja-samba/patches/patch-ao
+++ b/net/ja-samba/patches/patch-ao
@@ -1,10 +1,10 @@
-$NetBSD: patch-ao,v 1.1 2003/03/29 08:18:50 taca Exp $
+$NetBSD: patch-ao,v 1.2 2005/06/19 18:38:40 taca Exp $
 
 Expand & in the gecos field to a capitalized login name.
 
---- lib/util_getent.c.orig	Sat Feb  2 19:46:42 2002
-+++ lib/util_getent.c	Sun Oct 13 21:37:56 2002
-@@ -155,6 +155,11 @@
+--- lib/util_getent.c.orig	2005-03-02 14:33:07.000000000 +0900
++++ lib/util_getent.c
+@@ -155,6 +155,11 @@ struct sys_pwent * getpwent_list(void)
  	struct sys_pwent *plist;
  	struct sys_pwent *pent;
  	struct passwd *pwd;
@@ -14,9 +14,9 @@ Expand & in the gecos field to a capitalized login name.
 +	int buflen;
 +#endif
  	
- 	pent = (struct sys_pwent *) malloc(sizeof(struct sys_pwent));
+ 	pent = SMB_MALLOC_P(struct sys_pwent);
  	if (pent == NULL) {
-@@ -178,9 +183,38 @@
+@@ -178,9 +183,38 @@ struct sys_pwent * getpwent_list(void)
  		pent->pw_uid = pwd->pw_uid;
  		pent->pw_gid = pwd->pw_gid;
  		if (pwd->pw_gecos) {
@@ -42,10 +42,10 @@ Expand & in the gecos field to a capitalized login name.
 +					*bp++ = *p;
 +			}
 +			*bp = '\0';
-+			if ((pent->pw_name = strdup(buf)) == NULL)
++			if ((pent->pw_name = SMB_STRDUP(buf)) == NULL)
 +				goto err;
 +#else
- 			if ((pent->pw_name = strdup(pwd->pw_gecos)) == NULL)
+ 			if ((pent->pw_name = SMB_STRDUP(pwd->pw_gecos)) == NULL)
  				goto err;
 +#endif
  		}
@@ -53,5 +53,5 @@ Expand & in the gecos field to a capitalized login name.
 +  gecos_done:
 +#endif
  		if (pwd->pw_dir) {
- 			if ((pent->pw_name = strdup(pwd->pw_dir)) == NULL)
+ 			if ((pent->pw_name = SMB_STRDUP(pwd->pw_dir)) == NULL)
  				goto err;
diff --git a/net/ja-samba/patches/patch-ax b/net/ja-samba/patches/patch-ax
deleted file mode 100644
index 8ebdcc1efd0..00000000000
--- a/net/ja-samba/patches/patch-ax
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2004/10/03 16:16:39 taca Exp $
-
---- smbd/vfs.c.orig	2003-05-20 11:17:19.000000000 +0900
-+++ smbd/vfs.c
-@@ -790,7 +790,6 @@ BOOL reduce_name(connection_struct *conn
- 	*dir2 = *wd = *base_name = *newname = 0;
- 
- 	if (widelinks) {
--		unix_clean_name(s);
- 		/* can't have a leading .. */
- 		if (strncmp(s,"..",2) == 0 && (s[2]==0 || s[2]=='/')) {
- 			DEBUG(3,("Illegal file name? (%s)\n",s));
diff --git a/net/ja-samba/patches/patch-ay b/net/ja-samba/patches/patch-ay
new file mode 100644
index 00000000000..45dfb49f3b9
--- /dev/null
+++ b/net/ja-samba/patches/patch-ay
@@ -0,0 +1,12 @@
+$NetBSD: patch-ay,v 1.1 2005/06/19 18:38:40 taca Exp $
+
+--- lib/util.c.orig	2005-03-02 14:33:07.000000000 +0900
++++ lib/util.c
+@@ -1925,6 +1925,7 @@ char *smb_xstrndup(const char *s, size_t
+ #if defined(PARANOID_MALLOC_CHECKER)
+ #ifdef strndup
+ #undef strndup
++	extern char *strndup(const char *, size_t);
+ #endif
+ #endif
+ 	char *s1 = strndup(s, n);
diff --git a/net/ja-samba/patches/patch-az b/net/ja-samba/patches/patch-az
new file mode 100644
index 00000000000..e45a77cc946
--- /dev/null
+++ b/net/ja-samba/patches/patch-az
@@ -0,0 +1,13 @@
+$NetBSD: patch-az,v 1.1 2005/06/19 18:38:40 taca Exp $
+
+--- nsswitch/pam_winbind.h.orig	2004-01-22 20:20:34.000000000 +0900
++++ nsswitch/pam_winbind.h
+@@ -25,7 +25,7 @@
+ #define PAM_SM_ACCOUNT
+ #define PAM_SM_PASSWORD
+ 
+-#if defined(SUNOS5) || defined(SUNOS4) || defined(HPUX) || defined(FREEBSD)
++#if defined(SUNOS5) || defined(SUNOS4) || defined(HPUX) || defined(FREEBSD) || defined(__NetBSD__)
+ 
+ /* Solaris always uses dynamic pam modules */
+ #if !defined(__FreeBSD__)
diff --git a/net/ja-samba/patches/patch-bh b/net/ja-samba/patches/patch-bh
new file mode 100644
index 00000000000..71c6dd8d0ef
--- /dev/null
+++ b/net/ja-samba/patches/patch-bh
@@ -0,0 +1,39 @@
+$NetBSD: patch-bh,v 1.1 2005/06/19 18:38:40 taca Exp $
+
+--- passdb/pdb_ldap.c.orig	2005-03-02 14:33:12.000000000 +0900
++++ passdb/pdb_ldap.c
+@@ -296,14 +296,14 @@ static int rebindproc (LDAP *ldap_struct
+                 memset(*credp, '\0', strlen(*credp));
+                 SAFE_FREE(*credp);
+ 	} else {
+-                *whop = strdup(ldap_state->bind_dn);
++                *whop = SMB_STRDUP(ldap_state->bind_dn);
+                 if (!*whop) {
+                         return LDAP_NO_MEMORY;
+                 }
+                 DEBUG(5,("ldap_connect_system: Rebinding as \"%s\"\n",
+                           whop));
+ 
+-                *credp = strdup(ldap_secret);
++                *credp = SMB_STRDUP(ldap_secret);
+                 if (!*credp) {
+                         SAFE_FREE(*whop);
+                         return LDAP_NO_MEMORY;
+@@ -517,7 +517,7 @@ static void make_a_mod (LDAPMod *** modl
+ 		}
+ 		mods[i]->mod_op = modop;
+ 		mods[i]->mod_values = NULL;
+-		mods[i]->mod_type = strdup(attribute);
++		mods[i]->mod_type = SMB_STRDUP(attribute);
+ 		mods[i + 1] = NULL;
+ 	}
+ 
+@@ -533,7 +533,7 @@ static void make_a_mod (LDAPMod *** modl
+ 			DEBUG (0, ("make_a_mod: Memory allocation failure!\n"));
+ 			return;
+ 		}
+-		mods[i]->mod_values[j] = strdup(value);
++		mods[i]->mod_values[j] = SMB_STRDUP(value);
+ 		mods[i]->mod_values[j + 1] = NULL;
+ 	}
+ 	*modlist = mods;