summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/CHANGES3
-rw-r--r--net/samba/DESCR13
-rw-r--r--net/samba/Makefile5
-rw-r--r--net/samba/Makefile.mirrors15
-rw-r--r--net/samba/PLIST3
-rw-r--r--net/samba/distinfo33
-rw-r--r--net/samba/options.mk64
-rw-r--r--net/samba/patches/patch-am6
-rw-r--r--net/samba/patches/patch-at32
-rw-r--r--net/samba/patches/patch-au22
-rw-r--r--net/samba/patches/patch-ba20
-rw-r--r--net/samba/patches/patch-be8
-rw-r--r--net/samba/patches/patch-bf6
-rw-r--r--net/samba/patches/patch-bi6
-rw-r--r--net/samba/patches/patch-bo6
-rw-r--r--net/samba/patches/patch-bp6
-rw-r--r--net/samba/patches/patch-bs8
-rw-r--r--net/samba/patches/patch-bu8
-rw-r--r--net/samba/patches/patch-bw14
-rw-r--r--net/samba/patches/patch-ca11
20 files changed, 156 insertions, 133 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index 9e10f77ff94..4a94ee50b23 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.13396 2006/03/31 22:25:00 adrianp Exp $
+$NetBSD: CHANGES,v 1.13397 2006/04/01 04:55:44 jlam Exp $
Changes to the packages collection and infrastructure in 2006:
@@ -1796,3 +1796,4 @@ Changes to the packages collection and infrastructure in 2006:
Added net/pear-Net_Sieve version 1.1.1 [adrianp 2006-03-31]
Added mail/ingo version 1.1 [adrianp 2006-03-31]
Added time/kronolith version 2.1 [adrianp 2006-03-31]
+ Updated net/samba to 3.0.22 [jlam 2006-04-01]
diff --git a/net/samba/DESCR b/net/samba/DESCR
index 27a52bca020..fec691f5722 100644
--- a/net/samba/DESCR
+++ b/net/samba/DESCR
@@ -1,7 +1,6 @@
-Samba is a suite of applications that speak the Server Message Block
-(SMB) protocol. Samba allows a UNIX machine to perform client-server
-networking for file and printer sharing with Microsoft Windows systems
-using their native network protocol and to appear as another Windows
-system on the network from the perspective of a Windows client. The
-Samba suite also includes client tools that allow users to access folders
-and printers that Windows systems and Samba servers offer on the network.
+Samba provides file and print services for Microsoft Windows clients.
+These services may be hosted off any TCP/IP-enabled platform. The
+Samba project includes not only an impressive feature set in file and
+print serving capabilities, but has been extended to include client
+functionality, utilities to ease migration to Samba, tools to aid
+interoperability with Microsoft Windows, and administration tools.
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 47cb747967e..0d117e5e070 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.158 2006/01/08 18:35:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.159 2006/04/01 04:55:35 jlam Exp $
.include "Makefile.mirrors"
-DISTNAME= samba-3.0.21a
-PKGREVISION= 1
+DISTNAME= samba-3.0.22
CATEGORIES= net
MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/}
DIST_SUBDIR= ${DISTNAME}
diff --git a/net/samba/Makefile.mirrors b/net/samba/Makefile.mirrors
index 7b243ce725d..71b924824ba 100644
--- a/net/samba/Makefile.mirrors
+++ b/net/samba/Makefile.mirrors
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.mirrors,v 1.2 2006/01/02 22:33:36 jlam Exp $
+# $NetBSD: Makefile.mirrors,v 1.3 2006/04/01 04:55:35 jlam Exp $
#
# This Makefile fragment contains the mirror sites for fetching Samba.
###
-### This list was last updated on 20060102 from:
+### This list was last updated on 20060401 from:
### http://www.samba.org/samba/download/ftp_mirrors.html
###
SAMBA_MIRRORS= \
@@ -12,21 +12,21 @@ SAMBA_MIRRORS= \
ftp://gd.tuwien.ac.at/infosys/servers/samba/ \
ftp://ftp.easynet.be/samba/ \
ftp://ftp.pucpr.br/samba/ \
- ftp://ca.samba.org/ \
- ftp://ftp.linuxforum.net/ftp.samba.org/ \
+ http://mirrors.uol.com.br/pub/samba/ \
+ ftp://ftp.uni-sofia.bg/samba/ \
ftp://mirror.kn.vutbr.cz/pub/MIRRORS/samba/ \
ftp://mirrors.dotsrc.org/samba/ \
ftp://fi.samba.org/pub/samba/ \
- ftp://de3.samba.org/pub/samba/ \
ftp://de.samba.org/samba.org/ \
+ ftp://de3.samba.org/pub/samba/ \
ftp://ftp.ntua.gr/pub/net/samba/ \
+ ftp://ftp.hkmirror.org/pub/samba/sambaftp/ \
ftp://ftp.heanet.ie/pub/samba/ \
- ftp://ie.samba.org/mirrors/ftp.samba.org/pub/samba/ \
ftp://ftp.ring.gr.jp/pub/net/samba/ \
ftp://ftp.samba.gr.jp/pub/samba/ \
+ ftp://ftp.linux.edu.lv/mirrors/ftp.samba.org// \
ftp://ftp.bit.nl/mirror/samba/ \
ftp://www.bibsyst.no/pub/samba/ \
- ftp://pl.samba.org/pub/unix/net/samba/ \
ftp://giswitch.sggw.waw.pl/pub/unix/samba/ \
ftp://ftp.citkit.ru/pub/samba/ \
ftp://ru.samba.org/pub/samba/ \
@@ -35,7 +35,6 @@ SAMBA_MIRRORS= \
ftp://ftp.oss.eznetsols.org/samba/ \
ftp://ftp.k2.net/mirrors/samba/ \
ftp://se.samba.org/pub/samba/ \
- ftp://ftp.ulak.net.tr/samba/ \
ftp://us1.samba.org/pub/samba/ \
ftp://us5.samba.org/pub/samba-ftp/ \
ftp://us2.samba.org/pub/samba/ \
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 50642d7ed39..c9958bb504c 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2006/01/02 22:33:36 jlam Exp $
+@comment $NetBSD: PLIST,v 1.34 2006/04/01 04:55:35 jlam Exp $
bin/eventlogadm
bin/findsmb
bin/net
@@ -542,6 +542,7 @@ share/samba/swat/help/using_samba/inx.html
share/samba/swat/help/using_samba/samba2_s.gif
share/samba/swat/help/using_samba/samba2_xs.gif
share/samba/swat/help/using_samba/toc.html
+share/samba/swat/help/welcome-no-samba-doc.html
share/samba/swat/help/welcome.html
share/samba/swat/images/globals.gif
share/samba/swat/images/home.gif
diff --git a/net/samba/distinfo b/net/samba/distinfo
index b8baf7539d7..f2a6b569b61 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.47 2006/01/02 22:33:36 jlam Exp $
+$NetBSD: distinfo,v 1.48 2006/04/01 04:55:35 jlam Exp $
-SHA1 (samba-3.0.21a/samba-3.0.21a.tar.gz) = c8d339801f2f1c60a4bb652aee85da6a0eb5d224
-RMD160 (samba-3.0.21a/samba-3.0.21a.tar.gz) = 0daede1526cacd631654a82b33af48ffb4789ce4
-Size (samba-3.0.21a/samba-3.0.21a.tar.gz) = 17524018 bytes
+SHA1 (samba-3.0.22/samba-3.0.22.tar.gz) = 76eba872b3e8f647e16d0d8d129e02848a7989d7
+RMD160 (samba-3.0.22/samba-3.0.22.tar.gz) = b41cffc999c524c1650d2dd3fbd063dc79741091
+Size (samba-3.0.22/samba-3.0.22.tar.gz) = 17542657 bytes
SHA1 (patch-ab) = 43e97366a460b0aa19667719f7235c9eb2a58022
SHA1 (patch-ac) = 47529dfe904768e6a3076131978c89fe2d1e3619
SHA1 (patch-ad) = dd1f36ce1ccabaf3b4efb1d61a8af1f4d3d1857a
@@ -14,36 +14,37 @@ SHA1 (patch-ai) = 6e4500634cf3023d1ff22e4df3352d619f93aabc
SHA1 (patch-aj) = c9e406113cdfc21c06483796a7008eb98a7d49fe
SHA1 (patch-ak) = 0c69720954282022c7982d36eaee94a03db7b689
SHA1 (patch-al) = 9962f9ad7a495f4be4bcf1ec9e42ca51a2c417b8
-SHA1 (patch-am) = d2f0b7798bbcf25e887cca8ef9bbd4146aa5d409
-SHA1 (patch-at) = 38d85d8c35569902c257532e076ea9ad2fc5c6d4
-SHA1 (patch-au) = 4b6d26f871263c81792de8132b5beb1008f1805c
+SHA1 (patch-am) = 9dbc7124f2f7d4d29dfb3d5d6617735f99da4694
+SHA1 (patch-at) = bff50b53aedffbd352cc52ba49059b5c8010c140
+SHA1 (patch-au) = a061330dece8a9c49a02cf312b0fd39596b4baf2
SHA1 (patch-av) = cb1c699eecce8aea8454308be6a4ab3f6b767b06
SHA1 (patch-aw) = 374b1660d31ed54b85e68b49e25d80c2c54961be
SHA1 (patch-ax) = 778ff50316524d06d0c609b0aa8c6dfb48914a8e
SHA1 (patch-ay) = 054ba0c228a546af7f020a79b707e5fff0b21ff7
-SHA1 (patch-ba) = c6cfc30753b29a749b14cb3d3d95595e9e2e8c11
+SHA1 (patch-ba) = e3695b8a9adad853528a69c2566af0384e01c015
SHA1 (patch-bb) = 7a51028a9b5d81e4491b09b62851378e16425a99
SHA1 (patch-bc) = a2c94726ca3eb7be9468becdc0c8ac69fc47fae6
SHA1 (patch-bd) = 039eda1d77456fbddbcb0a11007dcaebda78fbc9
-SHA1 (patch-be) = abd72608a8f62ef1caa276b0f016f68458bb7078
-SHA1 (patch-bf) = 66cf695f028d204063c89156bf380deffe703c10
+SHA1 (patch-be) = 5ff0032c79e603a47a222891c709531bb5e9a488
+SHA1 (patch-bf) = 47c85a4a8d636b82ab57a29677beea4f876be746
SHA1 (patch-bg) = c247e4d269d71f992f061a6fbc56b22579d08a09
SHA1 (patch-bh) = 79f301fd1f8cd3d72d8106de6d0d315711d13219
-SHA1 (patch-bi) = 732a7fbc1c981e32554646e557da6299582b0021
+SHA1 (patch-bi) = 11312e7c3e843902e92c488d4ddb5f8eaac63a5a
SHA1 (patch-bj) = 0dd428bc8301762d32661861c83f7067bde39ae1
SHA1 (patch-bk) = 452346a8b031264a9a3e0f9b72ebe42c5e17134f
SHA1 (patch-bl) = 5f29a953dd9cadea8a27526778cc2257ccf3fd7c
SHA1 (patch-bm) = dba69070a9201f77b95f254ee4d9a0e8557894db
SHA1 (patch-bn) = c3a10f18dbcaa71775e7c290d0ac7d98288ba2f0
-SHA1 (patch-bo) = dce02333957386001a1fd841a5851453dcd4860b
-SHA1 (patch-bp) = 5708ce5a71c31b3cdab3b786a94eafbdfc31c46f
+SHA1 (patch-bo) = 2da80baec42437c61d97f44068c0d6cdeefaa877
+SHA1 (patch-bp) = 7e59df8e4f262f594d6278a5d7a4e56f551711c9
SHA1 (patch-bq) = dc25eb43336d4ad7ecef1b4ea8c5dcd72cc91a7b
SHA1 (patch-br) = fc289614054ca1eb39f5ba834c81d2adec2e2217
-SHA1 (patch-bs) = be0fd34166886b2e8ce735c859ac019580ec6400
+SHA1 (patch-bs) = d49fca0b9722bd3a84339a151c6178ebd5ea5feb
SHA1 (patch-bt) = f11307c2519126ec1ae776af7ccd5ef6be378060
-SHA1 (patch-bu) = 5d02e06c0a1234bf451ac977c6a66b1677a49c2c
+SHA1 (patch-bu) = b31be3d6f1acbbb343f3d9afe66a1e43a55014f7
SHA1 (patch-bv) = 2e594d4ed4a98105b1a1311042f14e5f960aa067
-SHA1 (patch-bw) = 04b0d59e6a59ae04faa81663f032baaa54393fca
+SHA1 (patch-bw) = d3b03e1de353091dec5986e0da3d8f3d2981510f
SHA1 (patch-bx) = b46172b1e7e4937039b894eff7caf6dff5cbba62
SHA1 (patch-by) = adc269c07d06108fe77afbb65d5eb309fc4d6d67
SHA1 (patch-bz) = 143ff731caced00aa6ba589a1d83581a7449b853
+SHA1 (patch-ca) = 4863e5d3dbf01c92443464e9a3b01720859aca05
diff --git a/net/samba/options.mk b/net/samba/options.mk
index 84eeae193d3..4539377330a 100644
--- a/net/samba/options.mk
+++ b/net/samba/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2005/12/05 23:55:15 rillig Exp $
+# $NetBSD: options.mk,v 1.13 2006/04/01 04:55:35 jlam Exp $
# Recommended package options for various setups:
#
@@ -129,33 +129,9 @@ SAMBA_STATIC_MODULES:= ${SAMBA_STATIC_MODULES},idmap_ad
WINBINDD_RCD_SCRIPT= winbindd
PLIST_SUBST+= WINBIND=
-# Determine the proper name for the winbind and WINS NSS modules.
-#
-# XXX We should really be trawling the generated Makefiles or config.*
-# XXX files to find this out dynamically.
-#
-NSS_WINBIND.${OPSYS}?= # empty
-NSS_WINBIND.AIX= WINBIND
-NSS_WINBIND.IRIX= libns_winbind.so
-NSS_WINBIND.Linux= libnss_winbind.so
-NSS_WINBIND.SunOS= libnss_winbind.so
-. if !empty(MACHINE_PLATFORM:MFreeBSD-[5-9].*)
-NSS_WINBIND.FreeBSD= nss_winbind.so
-. endif
-. if !empty(MACHINE_PLATFORM:MNetBSD-[3-9].*)
-NSS_WINBIND.NetBSD= nss_winbind.so
-. endif
-NSS_WINBIND= ${NSS_WINBIND.${OPSYS}}
-
-NSS_WINS.${OPSYS}?= # empty
-NSS_WINS.IRIX= libns_wins.so
-NSS_WINS.Linux= libnss_wins.so
-NSS_WINS.SunOS= libnss_wins.so
-NSS_WINS= ${NSS_WINS.${OPSYS}}
-
# Install the PAM winbind module if we're also building with PAM support.
. if empty(PKG_OPTIONS:Mpam)
-PLIST_SUBST+= PAM_WINBIND="@comment no PAM winbind module"
+PLIST_SUBST+= PAM_WINBIND="@comment no PAM winbind module"
. else
PLIST_SUBST+= PAM_WINBIND=lib/security/pam_winbind.so
@@ -166,26 +142,38 @@ samba-pam-winbind-install:
. endif
# Install the NSS winbind module if it exists.
-. if empty(NSS_WINBIND)
-PLIST_SUBST+= NSS_WINBIND="@comment no NSS winbind module"
-. else
-PLIST_SUBST+= NSS_WINBIND=lib/${NSS_WINBIND}
+PLIST_SUBST+= NSS_WINBIND=${NSS_WINBIND:Q}
+NSS_WINBIND= ${NSS_WINBIND_cmd:sh}
+NSS_WINBIND_cmd= \
+ ${TEST} -x ${WRKSRC}/config.status || \
+ { ${ECHO} "@comment no NSS winbind module" ; exit 0; }; \
+ cd ${WRKDIR} && ${ECHO} @WINBIND_NSS@ | \
+ ${WRKSRC}/config.status --file=-:- | \
+ ${AWK} '/^$$/ { print "@comment no NSS winbind module"; exit 0; } \
+ { sub(".*/", "lib/"); print; }' && \
+ ${RM} -f config.log
post-install: samba-nss-winbind-install
samba-nss-winbind-install:
- ${INSTALL_LIB} ${WRKSRC}/nsswitch/${NSS_WINBIND} ${PREFIX}/lib
-. endif
+ lib=${WRKSRC:Q}/nsswitch/${NSS_WINBIND:T:Q}; \
+ ${TEST} ! -f $$lib || ${INSTALL_LIB} $$lib ${PREFIX:Q}/lib
# Install the NSS WINS module if it exists.
-. if empty(NSS_WINS)
-PLIST_SUBST+= NSS_WINS="@comment no NSS WINS module"
-. else
-PLIST_SUBST+= NSS_WINS=lib/${NSS_WINS}
+PLIST_SUBST+= NSS_WINS=${NSS_WINS:Q}
+NSS_WINS= ${NSS_WINS_cmd:sh}
+NSS_WINS_cmd= \
+ ${TEST} -x ${WRKSRC}/config.status || \
+ { ${ECHO} "@comment no NSS WINS module" ; exit 0; }; \
+ cd ${WRKDIR} && ${ECHO} @WINBIND_WINS_NSS@ | \
+ ${WRKSRC}/config.status --file=-:- | \
+ ${AWK} '/^$$/ { print "@comment no NSS WINS module"; exit 0; } \
+ { sub(".*/", "lib/"); print; }' && \
+ ${RM} -f config.log
post-install: samba-nss-wins-install
samba-nss-wins-install:
- ${INSTALL_LIB} ${WRKSRC}/nsswitch/${NSS_WINS} ${PREFIX}/lib
-. endif
+ lib=${WRKSRC:Q}/nsswitch/${NSS_WINS:T:Q}; \
+ ${TEST} ! -f $$lib || ${INSTALL_LIB} $$lib ${PREFIX:Q}/lib
.else
CONFIGURE_ARGS+= --without-winbind
PLIST_SUBST+= WINBIND="@comment "
diff --git a/net/samba/patches/patch-am b/net/samba/patches/patch-am
index 594074fe17f..bfc9a7131df 100644
--- a/net/samba/patches/patch-am
+++ b/net/samba/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.6 2006/01/02 22:33:36 jlam Exp $
+$NetBSD: patch-am,v 1.7 2006/04/01 04:55:35 jlam Exp $
---- sam/idmap_rid.c.orig 2005-10-17 22:45:04.000000000 -0400
+--- sam/idmap_rid.c.orig 2006-01-24 18:46:38.000000000 -0500
+++ sam/idmap_rid.c
@@ -24,8 +24,6 @@
#undef DBGC_CLASS
@@ -18,5 +18,5 @@ $NetBSD: patch-am,v 1.6 2006/01/02 22:33:36 jlam Exp $
-NTSTATUS init_module(void)
+NTSTATUS idmap_rid_init(void)
{
- return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "idmap_rid", &rid_methods);
return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "rid", &rid_methods);
+ }
diff --git a/net/samba/patches/patch-at b/net/samba/patches/patch-at
index d4426339fce..cc78f1bcb7d 100644
--- a/net/samba/patches/patch-at
+++ b/net/samba/patches/patch-at
@@ -1,13 +1,13 @@
-$NetBSD: patch-at,v 1.4 2006/01/02 22:33:36 jlam Exp $
+$NetBSD: patch-at,v 1.5 2006/04/01 04:55:35 jlam Exp $
---- configure.orig 2005-12-29 18:50:51.000000000 -0500
+--- configure.orig 2006-03-29 23:53:13.000000000 -0500
+++ configure
@@ -310,7 +310,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configdir lockdir piddir logfilebase privatedir swatdir LDSHFLAGS SONAMEFLAG SHLD HOST_OS PICFLAGS PICSUFFIX libc_cv_fpie PIE_CFLAGS PIE_LDFLAGS SHLIBEXT INSTALLLIBCMD_SH INSTALLLIBCMD_A INSTALL_LIBMSRPC LIBMSRPC_SHARED LIBMSRPC INSTALL_LIBSMBCLIENT LIBSMBCLIENT_SHARED LIBSMBCLIENT INSTALL_LIBSMBSHAREMODES LIBSMBSHAREMODES_SHARED LIBSMBSHAREMODES PRINT_LIBS AUTH_LIBS ACL_LIBS PASSDB_LIBS IDMAP_LIBS KRB5_LIBS LDAP_LIBS SHLIB_PROGS SMBWRAPPER SMBWRAP_OBJS SMBWRAP_INC EXTRA_BIN_PROGS EXTRA_SBIN_PROGS EXTRA_ALL_TARGETS CONFIG_LIBS SOCKWRAP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK PERL AR ac_ct_AR BROKEN_CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os EGREP CUPS_CONFIG LIBOBJS TERMLIBS TERMLDFLAGS ROFF DYNEXP SMBLDAP SMBLDAPUTIL KRB5CONFIG XML2_CONFIG XML_CFLAGS XML_LIBS MYSQL_CONFIG MYSQL_CFLAGS MYSQL_LIBS PGSQL_CONFIG PGSQL_CFLAGS PGSQL_LIBS WINBIND_NSS WINBIND_WINS_NSS WINBIND_NSS_LDSHFLAGS WINBIND_NSS_EXTRA_OBJS WINBIND_NSS_EXTRA_LIBS BUILD_POPT POPTLIBS FLAGS1 PYTHON PDB_STATIC PDB_MODULES RPC_STATIC RPC_MODULES IDMAP_STATIC IDMAP_MODULES CHARSET_STATIC CHARSET_MODULES AUTH_STATIC AUTH_MODULES VFS_STATIC VFS_MODULES builddir LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configdir lockdir statedir piddir logfilebase privatedir swatdir LDSHFLAGS SONAMEFLAG SHLD HOST_OS PICFLAGS PICSUFFIX libc_cv_fpie PIE_CFLAGS PIE_LDFLAGS SHLIBEXT INSTALLLIBCMD_SH INSTALLLIBCMD_A INSTALL_LIBMSRPC LIBMSRPC_SHARED LIBMSRPC INSTALL_LIBSMBCLIENT LIBSMBCLIENT_SHARED LIBSMBCLIENT INSTALL_LIBSMBSHAREMODES LIBSMBSHAREMODES_SHARED LIBSMBSHAREMODES PRINT_LIBS AUTH_LIBS ACL_LIBS PASSDB_LIBS IDMAP_LIBS KRB5_LIBS LDAP_LIBS SHLIB_PROGS SMBWRAPPER SMBWRAP_OBJS SMBWRAP_INC EXTRA_BIN_PROGS EXTRA_SBIN_PROGS EXTRA_ALL_TARGETS CONFIG_LIBS SOCKWRAP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK PERL AR ac_ct_AR BROKEN_CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os EGREP CUPS_CONFIG LIBOBJS TERMLIBS TERMLDFLAGS ROFF DYNEXP SMBLDAP SMBLDAPUTIL KRB5CONFIG XML2_CONFIG XML_CFLAGS XML_LIBS MYSQL_CONFIG MYSQL_CFLAGS MYSQL_LIBS PGSQL_CONFIG PGSQL_CFLAGS PGSQL_LIBS WINBIND_NSS WINBIND_WINS_NSS WINBIND_NSS_LDSHFLAGS WINBIND_NSS_EXTRA_OBJS WINBIND_NSS_EXTRA_LIBS BUILD_POPT POPTLIBS FLAGS1 PYTHON PDB_STATIC PDB_MODULES RPC_STATIC RPC_MODULES IDMAP_STATIC IDMAP_MODULES CHARSET_STATIC CHARSET_MODULES AUTH_STATIC AUTH_MODULES VFS_STATIC VFS_MODULES builddir LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configdir lockdir piddir logfilebase privatedir swatdir LDSHFLAGS SONAMEFLAG SONAMEVERSIONSUFFIX SHLD HOST_OS PICFLAGS PICSUFFIX libc_cv_fpie PIE_CFLAGS PIE_LDFLAGS SHLIBEXT INSTALLLIBCMD_SH INSTALLLIBCMD_A INSTALL_LIBMSRPC LIBMSRPC_SHARED LIBMSRPC INSTALL_LIBSMBCLIENT LIBSMBCLIENT_SHARED LIBSMBCLIENT INSTALL_LIBSMBSHAREMODES LIBSMBSHAREMODES_SHARED LIBSMBSHAREMODES PRINT_LIBS AUTH_LIBS ACL_LIBS PASSDB_LIBS IDMAP_LIBS KRB5_LIBS LDAP_LIBS SHLIB_PROGS SMBWRAPPER SMBWRAP_OBJS SMBWRAP_INC EXTRA_BIN_PROGS EXTRA_SBIN_PROGS EXTRA_ALL_TARGETS CONFIG_LIBS SOCKWRAP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK PERL AR ac_ct_AR BROKEN_CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os EGREP CUPS_CONFIG LIBOBJS TERMLIBS TERMLDFLAGS ROFF DYNEXP SMBLDAP SMBLDAPUTIL KRB5CONFIG XML2_CONFIG XML_CFLAGS XML_LIBS MYSQL_CONFIG MYSQL_CFLAGS MYSQL_LIBS PGSQL_CONFIG PGSQL_CFLAGS PGSQL_LIBS WINBIND_NSS WINBIND_WINS_NSS WINBIND_NSS_LDSHFLAGS WINBIND_NSS_EXTRA_OBJS WINBIND_NSS_EXTRA_LIBS BUILD_POPT POPTLIBS FLAGS1 PYTHON PDB_STATIC PDB_MODULES RPC_STATIC RPC_MODULES IDMAP_STATIC IDMAP_MODULES CHARSET_STATIC CHARSET_MODULES AUTH_STATIC AUTH_MODULES VFS_STATIC VFS_MODULES builddir LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configdir lockdir statedir piddir logfilebase privatedir swatdir LDSHFLAGS SONAMEFLAG SONAMEVERSIONSUFFIX SHLD HOST_OS PICFLAGS PICSUFFIX libc_cv_fpie PIE_CFLAGS PIE_LDFLAGS SHLIBEXT INSTALLLIBCMD_SH INSTALLLIBCMD_A INSTALL_LIBMSRPC LIBMSRPC_SHARED LIBMSRPC INSTALL_LIBSMBCLIENT LIBSMBCLIENT_SHARED LIBSMBCLIENT INSTALL_LIBSMBSHAREMODES LIBSMBSHAREMODES_SHARED LIBSMBSHAREMODES PRINT_LIBS AUTH_LIBS ACL_LIBS PASSDB_LIBS IDMAP_LIBS KRB5_LIBS LDAP_LIBS SHLIB_PROGS SMBWRAPPER SMBWRAP_OBJS SMBWRAP_INC EXTRA_BIN_PROGS EXTRA_SBIN_PROGS EXTRA_ALL_TARGETS CONFIG_LIBS SOCKWRAP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK PERL AR ac_ct_AR BROKEN_CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os EGREP CUPS_CONFIG LIBOBJS TERMLIBS TERMLDFLAGS ROFF DYNEXP SMBLDAP SMBLDAPUTIL KRB5CONFIG XML2_CONFIG XML_CFLAGS XML_LIBS MYSQL_CONFIG MYSQL_CFLAGS MYSQL_LIBS PGSQL_CONFIG PGSQL_CFLAGS PGSQL_LIBS WINBIND_NSS WINBIND_WINS_NSS WINBIND_NSS_LDSHFLAGS WINBIND_NSS_EXTRA_OBJS WINBIND_NSS_EXTRA_LIBS BUILD_POPT POPTLIBS FLAGS1 PYTHON PDB_STATIC PDB_MODULES RPC_STATIC RPC_MODULES IDMAP_STATIC IDMAP_MODULES CHARSET_STATIC CHARSET_MODULES AUTH_STATIC AUTH_MODULES VFS_STATIC VFS_MODULES builddir LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -64,7 +64,7 @@ $NetBSD: patch-at,v 1.4 2006/01/02 22:33:36 jlam Exp $
# set pid directory location
# Check whether --with-piddir or --without-piddir was given.
-@@ -16939,6 +16962,107 @@ done
+@@ -16941,6 +16964,107 @@ done
@@ -172,7 +172,7 @@ $NetBSD: patch-at,v 1.4 2006/01/02 22:33:36 jlam Exp $
for ac_func in syslog vsyslog timegm
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-@@ -32635,9 +32759,9 @@ LIBS="-lcrypto $KRB5_LIBS $LIBS"
+@@ -33144,9 +33268,9 @@ LIBS="-lcrypto $KRB5_LIBS $LIBS"
@@ -185,7 +185,7 @@ $NetBSD: patch-at,v 1.4 2006/01/02 22:33:36 jlam Exp $
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -32653,11 +32777,11 @@ extern "C"
+@@ -33162,11 +33286,11 @@ extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
@@ -199,7 +199,7 @@ $NetBSD: patch-at,v 1.4 2006/01/02 22:33:36 jlam Exp $
;
return 0;
}
-@@ -32684,22 +32808,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -33193,22 +33317,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -227,7 +227,7 @@ $NetBSD: patch-at,v 1.4 2006/01/02 22:33:36 jlam Exp $
cat >>confdefs.h <<_ACEOF
#define HAVE_DES_SET_KEY 1
_ACEOF
-@@ -44140,13 +44264,37 @@ case "$host_os" in
+@@ -44717,13 +44841,37 @@ case "$host_os" in
*linux*)
WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
;;
@@ -272,7 +272,19 @@ $NetBSD: patch-at,v 1.4 2006/01/02 22:33:36 jlam Exp $
;;
*irix*)
# IRIX has differently named shared libraries
-@@ -47561,6 +47709,7 @@ s,@ECHO_T@,$ECHO_T,;t t
+@@ -44790,6 +44938,11 @@ fi
+
+ # Display test results
+
++if test x"$HAVE_WINBIND" = x"no"; then
++ WINBIND_NSS=""
++ WINBIND_WINS_NSS=""
++fi
++
+ if test x"$HAVE_WINBIND" = x"yes"; then
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+@@ -48138,6 +48291,7 @@ s,@ECHO_T@,$ECHO_T,;t t
s,@LIBS@,$LIBS,;t t
s,@configdir@,$configdir,;t t
s,@lockdir@,$lockdir,;t t
diff --git a/net/samba/patches/patch-au b/net/samba/patches/patch-au
index 1103933e65c..80d3dcf3404 100644
--- a/net/samba/patches/patch-au
+++ b/net/samba/patches/patch-au
@@ -1,6 +1,6 @@
-$NetBSD: patch-au,v 1.4 2006/01/02 22:33:36 jlam Exp $
+$NetBSD: patch-au,v 1.5 2006/04/01 04:55:35 jlam Exp $
---- configure.in.orig 2005-12-14 07:45:51.000000000 -0500
+--- configure.in.orig 2006-02-20 15:33:23.000000000 -0500
+++ configure.in
@@ -23,6 +23,7 @@ fi
AC_PREFIX_DEFAULT(/usr/local/samba)
@@ -51,7 +51,7 @@ $NetBSD: patch-au,v 1.4 2006/01/02 22:33:36 jlam Exp $
AC_SUBST(piddir)
AC_SUBST(logfilebase)
AC_SUBST(privatedir)
-@@ -1150,6 +1169,7 @@ AC_CHECK_FUNCS(setpriv setgidx setuidx s
+@@ -1151,6 +1170,7 @@ AC_CHECK_FUNCS(setpriv setgidx setuidx s
AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt dup2 lseek64 ftruncate64)
AC_CHECK_FUNCS(fseek64 fseeko64 ftell64 ftello64 setluid getpwanam setlinebuf)
AC_CHECK_FUNCS(opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64)
@@ -59,7 +59,7 @@ $NetBSD: patch-au,v 1.4 2006/01/02 22:33:36 jlam Exp $
AC_CHECK_FUNCS(srandom random srand rand setenv usleep strcasecmp fcvt fcvtl symlink readlink)
AC_CHECK_FUNCS(syslog vsyslog timegm)
AC_CHECK_FUNCS(setlocale nl_langinfo)
-@@ -3040,7 +3060,7 @@ if test x"$with_ads_support" != x"no"; t
+@@ -3071,7 +3091,7 @@ if test x"$with_ads_support" != x"no"; t
AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data)
# Heimdal checks.
@@ -68,7 +68,7 @@ $NetBSD: patch-au,v 1.4 2006/01/02 22:33:36 jlam Exp $
AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator)
AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec)
-@@ -4881,13 +4901,37 @@ case "$host_os" in
+@@ -4913,13 +4933,37 @@ case "$host_os" in
*linux*)
WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
;;
@@ -113,3 +113,15 @@ $NetBSD: patch-au,v 1.4 2006/01/02 22:33:36 jlam Exp $
;;
*irix*)
# IRIX has differently named shared libraries
+@@ -4984,6 +5028,11 @@ fi
+
+ # Display test results
+
++if test x"$HAVE_WINBIND" = x"no"; then
++ WINBIND_NSS=""
++ WINBIND_WINS_NSS=""
++fi
++
+ if test x"$HAVE_WINBIND" = x"yes"; then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(WITH_WINBIND,1,[Whether to build winbind])
diff --git a/net/samba/patches/patch-ba b/net/samba/patches/patch-ba
index 92db2940ae3..abd0f4fbdf3 100644
--- a/net/samba/patches/patch-ba
+++ b/net/samba/patches/patch-ba
@@ -1,6 +1,6 @@
-$NetBSD: patch-ba,v 1.2 2006/01/02 22:33:36 jlam Exp $
+$NetBSD: patch-ba,v 1.3 2006/04/01 04:55:35 jlam Exp $
---- Makefile.in.orig 2005-12-14 07:45:49.000000000 -0500
+--- Makefile.in.orig 2006-02-20 15:33:23.000000000 -0500
+++ Makefile.in
@@ -91,6 +91,9 @@ SWATDIR = @swatdir@
# the directory where lock files go
@@ -21,7 +21,7 @@ $NetBSD: patch-ba,v 1.2 2006/01/02 22:33:36 jlam Exp $
PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \
-DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\"
PATH_FLAGS6 = $(PATH_FLAGS5) -DCONFIGDIR=\"$(CONFIGDIR)\"
-@@ -963,7 +966,7 @@ bin/pdbedit@EXEEXT@: $(PDBEDIT_OBJ) @BUI
+@@ -964,7 +967,7 @@ bin/pdbedit@EXEEXT@: $(PDBEDIT_OBJ) @BUI
bin/smbget@EXEEXT@: $(SMBGET_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -30,7 +30,7 @@ $NetBSD: patch-ba,v 1.2 2006/01/02 22:33:36 jlam Exp $
bin/samtest@EXEEXT@: $(SAMTEST_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-@@ -991,11 +994,11 @@ bin/msgtest@EXEEXT@: $(MSGTEST_OBJ) bin/
+@@ -992,11 +995,11 @@ bin/msgtest@EXEEXT@: $(MSGTEST_OBJ) bin/
bin/smbcacls@EXEEXT@: $(SMBCACLS_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@@ -44,7 +44,7 @@ $NetBSD: patch-ba,v 1.2 2006/01/02 22:33:36 jlam Exp $
bin/eventlogadm@EXEEXT@: $(EVTLOGADM_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
-@@ -1054,7 +1057,7 @@ bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) bi
+@@ -1055,7 +1058,7 @@ bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) bi
bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
@echo Linking libsmbclient shared library $@
@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \
@@ -53,7 +53,7 @@ $NetBSD: patch-ba,v 1.2 2006/01/02 22:33:36 jlam Exp $
@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
-@@ -1352,11 +1355,11 @@ bin/ntlm_auth@EXEEXT@: $(NTLM_AUTH_OBJ)
+@@ -1353,11 +1356,11 @@ bin/ntlm_auth@EXEEXT@: $(NTLM_AUTH_OBJ)
@echo Linking $@
@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(NTLM_AUTH_OBJ) \
$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \
@@ -62,12 +62,12 @@ $NetBSD: patch-ba,v 1.2 2006/01/02 22:33:36 jlam Exp $
bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_PICOOBJ)
@echo "Linking shared library $@"
-- @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) $(LIBS) -lc $(LDAP_LIBS) $(KRB5LIBS)
-+ @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) $(LIBS) -lc $(LDAP_LIBS) $(KRB5LIBS) $(PASSDB_LIBS)
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(KRB5LIBS)
++ @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(PASSDB_LIBS)
bin/tdbbackup@EXEEXT@: $(TDBBACKUP_OBJ) bin/.dummy
@echo Linking $@
-@@ -1402,7 +1405,7 @@ install-everything: install installmodul
+@@ -1403,7 +1406,7 @@ install-everything: install installmodul
# is not used
installdirs:
@@ -76,7 +76,7 @@ $NetBSD: patch-ba,v 1.2 2006/01/02 22:33:36 jlam Exp $
installservers: all installdirs
@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SBIN_PROGS)
-@@ -1505,6 +1508,7 @@ showlayout:
+@@ -1506,6 +1509,7 @@ showlayout:
@echo " privatedir: $(PRIVATE_DIR)"
@echo " configdir: $(CONFIGDIR)"
@echo " lockdir: $(LOCKDIR)"
diff --git a/net/samba/patches/patch-be b/net/samba/patches/patch-be
index 4002f2358f4..fcca253b753 100644
--- a/net/samba/patches/patch-be
+++ b/net/samba/patches/patch-be
@@ -1,8 +1,8 @@
-$NetBSD: patch-be,v 1.1 2005/11/14 08:05:28 jlam Exp $
+$NetBSD: patch-be,v 1.2 2006/04/01 04:55:35 jlam Exp $
---- nmbd/nmbd_winsserver.c.orig 2005-10-12 13:03:37.000000000 -0400
+--- nmbd/nmbd_winsserver.c.orig 2006-01-24 18:46:38.000000000 -0500
+++ nmbd/nmbd_winsserver.c
-@@ -234,7 +234,7 @@ BOOL initialise_wins(void)
+@@ -244,7 +244,7 @@ BOOL initialise_wins(void)
add_samba_names_to_subnet(wins_server_subnet);
@@ -11,7 +11,7 @@ $NetBSD: patch-be,v 1.1 2005/11/14 08:05:28 jlam Exp $
DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
WINS_LIST, strerror(errno) ));
return True;
-@@ -1810,7 +1810,7 @@ void wins_write_database(BOOL background
+@@ -1838,7 +1838,7 @@ void wins_write_database(BOOL background
}
}
diff --git a/net/samba/patches/patch-bf b/net/samba/patches/patch-bf
index cd9b7b013ea..48a42e222fa 100644
--- a/net/samba/patches/patch-bf
+++ b/net/samba/patches/patch-bf
@@ -1,8 +1,8 @@
-$NetBSD: patch-bf,v 1.2 2006/01/02 22:33:36 jlam Exp $
+$NetBSD: patch-bf,v 1.3 2006/04/01 04:55:35 jlam Exp $
---- nsswitch/winbindd_util.c.orig 2005-12-14 07:45:50.000000000 -0500
+--- nsswitch/winbindd_util.c.orig 2006-01-24 18:46:34.000000000 -0500
+++ nsswitch/winbindd_util.c
-@@ -1173,7 +1173,7 @@ BOOL winbindd_upgrade_idmap(void)
+@@ -1172,7 +1172,7 @@ BOOL winbindd_upgrade_idmap(void)
SMB_STRUCT_STAT stbuf;
TDB_CONTEXT *idmap_tdb;
diff --git a/net/samba/patches/patch-bi b/net/samba/patches/patch-bi
index c517a21bb5f..59305cfb427 100644
--- a/net/samba/patches/patch-bi
+++ b/net/samba/patches/patch-bi
@@ -1,8 +1,8 @@
-$NetBSD: patch-bi,v 1.2 2006/01/02 22:33:36 jlam Exp $
+$NetBSD: patch-bi,v 1.3 2006/04/01 04:55:35 jlam Exp $
---- rpc_server/srv_srvsvc_nt.c.orig 2005-12-14 07:45:50.000000000 -0500
+--- rpc_server/srv_srvsvc_nt.c.orig 2006-01-24 18:46:36.000000000 -0500
+++ rpc_server/srv_srvsvc_nt.c
-@@ -156,10 +156,10 @@ BOOL share_info_db_init(void)
+@@ -158,10 +158,10 @@ BOOL share_info_db_init(void)
if (share_tdb && local_pid == sys_getpid())
return True;
diff --git a/net/samba/patches/patch-bo b/net/samba/patches/patch-bo
index c72b383f1fd..76b39f8cf67 100644
--- a/net/samba/patches/patch-bo
+++ b/net/samba/patches/patch-bo
@@ -1,8 +1,8 @@
-$NetBSD: patch-bo,v 1.2 2006/01/02 22:33:36 jlam Exp $
+$NetBSD: patch-bo,v 1.3 2006/04/01 04:55:35 jlam Exp $
---- nmbd/nmbd.c.orig 2005-11-09 13:29:00.000000000 -0500
+--- nmbd/nmbd.c.orig 2006-01-24 18:46:38.000000000 -0500
+++ nmbd/nmbd.c
-@@ -770,6 +770,10 @@ static BOOL open_sockets(BOOL isdaemon,
+@@ -773,6 +773,10 @@ static BOOL open_sockets(BOOL isdaemon,
mkdir(lp_lockdir(), 0755);
}
diff --git a/net/samba/patches/patch-bp b/net/samba/patches/patch-bp
index d7c6882fbe8..1b54ba594d5 100644
--- a/net/samba/patches/patch-bp
+++ b/net/samba/patches/patch-bp
@@ -1,8 +1,8 @@
-$NetBSD: patch-bp,v 1.2 2006/01/02 22:33:36 jlam Exp $
+$NetBSD: patch-bp,v 1.3 2006/04/01 04:55:35 jlam Exp $
---- smbd/server.c.orig 2005-10-17 22:44:57.000000000 -0400
+--- smbd/server.c.orig 2006-01-24 18:46:32.000000000 -0500
+++ smbd/server.c
-@@ -866,6 +866,9 @@ void build_options(BOOL screen);
+@@ -868,6 +868,9 @@ void build_options(BOOL screen);
if (!directory_exist(lp_lockdir(), NULL))
mkdir(lp_lockdir(), 0755);
diff --git a/net/samba/patches/patch-bs b/net/samba/patches/patch-bs
index 2df7995ecdc..25b979e37e5 100644
--- a/net/samba/patches/patch-bs
+++ b/net/samba/patches/patch-bs
@@ -1,6 +1,6 @@
-$NetBSD: patch-bs,v 1.2 2006/01/02 22:33:36 jlam Exp $
+$NetBSD: patch-bs,v 1.3 2006/04/01 04:55:35 jlam Exp $
---- param/loadparm.c.orig 2005-12-02 14:21:45.000000000 -0500
+--- param/loadparm.c.orig 2006-02-20 15:33:21.000000000 -0500
+++ param/loadparm.c
@@ -106,6 +106,7 @@ typedef struct
char *szDeletePrinterCommand;
@@ -50,7 +50,7 @@ $NetBSD: patch-bs,v 1.2 2006/01/02 22:33:36 jlam Exp $
Globals.bNTPipeSupport = True; /* Do NT pipes by default. */
Globals.bNTStatusSupport = True; /* Use NT status by default. */
Globals.bStatCache = True; /* use stat cache by default */
-@@ -1724,6 +1730,7 @@ FN_GLOBAL_STRING(lp_addprinter_cmd, &Glo
+@@ -1721,6 +1727,7 @@ FN_GLOBAL_STRING(lp_addprinter_cmd, &Glo
FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
FN_GLOBAL_STRING(lp_os2_driver_map, &Globals.szOs2DriverMap)
FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
@@ -58,7 +58,7 @@ $NetBSD: patch-bs,v 1.2 2006/01/02 22:33:36 jlam Exp $
FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
FN_GLOBAL_STRING(lp_mangling_method, &Globals.szManglingMethod)
FN_GLOBAL_INTEGER(lp_mangle_prefix, &Globals.mangle_prefix)
-@@ -1848,6 +1855,7 @@ FN_GLOBAL_BOOL(lp_pam_password_change, &
+@@ -1845,6 +1852,7 @@ FN_GLOBAL_BOOL(lp_pam_password_change, &
FN_GLOBAL_BOOL(lp_unix_password_sync, &Globals.bUnixPasswdSync)
FN_GLOBAL_BOOL(lp_passwd_chat_debug, &Globals.bPasswdChatDebug)
FN_GLOBAL_INTEGER(lp_passwd_chat_timeout, &Globals.iPasswdChatTimeout)
diff --git a/net/samba/patches/patch-bu b/net/samba/patches/patch-bu
index e8cadbfe927..583425cb343 100644
--- a/net/samba/patches/patch-bu
+++ b/net/samba/patches/patch-bu
@@ -1,8 +1,8 @@
-$NetBSD: patch-bu,v 1.2 2006/01/02 22:33:36 jlam Exp $
+$NetBSD: patch-bu,v 1.3 2006/04/01 04:55:35 jlam Exp $
---- ../docs/manpages/smb.conf.5.orig 2005-12-29 11:19:48.000000000 -0500
+--- ../docs/manpages/smb.conf.5.orig 2006-01-29 11:14:30.000000000 -0500
+++ ../docs/manpages/smb.conf.5
-@@ -3093,6 +3093,12 @@ This integer specifies the number of sec
+@@ -3097,6 +3097,12 @@ This integer specifies the number of sec
Default: \fB\fIpasswd chat timeout\fR = 2 \fR
.TP
@@ -15,7 +15,7 @@ $NetBSD: patch-bu,v 1.2 2006/01/02 22:33:36 jlam Exp $
passwd program (G)
The name of a program that can be used to set UNIX user passwords\&. Any occurrences of \fI%u\fR will be replaced with the user name\&. The user name is checked for existence before calling the password changing program\&.
-@@ -4075,6 +4081,15 @@ This parameter determines if \fBsmbd\fR(
+@@ -4079,6 +4085,15 @@ This parameter determines if \fBsmbd\fR(
Default: \fB\fIstat cache\fR = yes \fR
.TP
diff --git a/net/samba/patches/patch-bw b/net/samba/patches/patch-bw
index aef90a13173..572b67a73e0 100644
--- a/net/samba/patches/patch-bw
+++ b/net/samba/patches/patch-bw
@@ -1,10 +1,10 @@
-$NetBSD: patch-bw,v 1.2 2006/01/02 22:33:36 jlam Exp $
+$NetBSD: patch-bw,v 1.3 2006/04/01 04:55:35 jlam Exp $
---- include/config.h.in.orig 2005-12-29 18:50:49.000000000 -0500
+--- include/config.h.in.orig 2006-03-29 23:53:11.000000000 -0500
+++ include/config.h.in
-@@ -250,9 +250,6 @@
- /* Define to 1 if you have the `decode_krb5_ap_req' function. */
- #undef HAVE_DECODE_KRB5_AP_REQ
+@@ -256,9 +256,6 @@
+ /* Define to 1 if you have the `delproplist' function. */
+ #undef HAVE_DELPROPLIST
-/* Define to 1 if you have the `des_set_key' function. */
-#undef HAVE_DES_SET_KEY
@@ -12,7 +12,7 @@ $NetBSD: patch-bw,v 1.2 2006/01/02 22:33:36 jlam Exp $
/* Whether the 'dev64_t' type is available */
#undef HAVE_DEV64_T
-@@ -314,6 +311,9 @@
+@@ -320,6 +317,9 @@
/* Whether the EncryptedData struct has a etype property */
#undef HAVE_ETYPE_IN_ENCRYPTEDDATA
@@ -22,7 +22,7 @@ $NetBSD: patch-bw,v 1.2 2006/01/02 22:33:36 jlam Exp $
/* Define to 1 if you have the <execinfo.h> header file. */
#undef HAVE_EXECINFO_H
-@@ -461,6 +461,9 @@
+@@ -479,6 +479,9 @@
/* Define to 1 if you have the `getpwanam' function. */
#undef HAVE_GETPWANAM
diff --git a/net/samba/patches/patch-ca b/net/samba/patches/patch-ca
new file mode 100644
index 00000000000..3aaf145dbf9
--- /dev/null
+++ b/net/samba/patches/patch-ca
@@ -0,0 +1,11 @@
+$NetBSD: patch-ca,v 1.3 2006/04/01 04:55:35 jlam Exp $
+
+--- VERSION.orig 2006-03-29 18:36:47.000000000 -0500
++++ VERSION
+@@ -96,5 +96,5 @@ SAMBA_VERSION_IS_SVN_SNAPSHOT=
+ # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() #
+ # -> "CVS 3.0.0rc2-VendorVersion" #
+ ########################################################
+-SAMBA_VERSION_VENDOR_SUFFIX=
++SAMBA_VERSION_VENDOR_SUFFIX="pkgsrc"
+ SAMBA_VENDOR_PATCH=
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-27 12:39:28 +0000