summaryrefslogtreecommitdiff
path: root/net/samba
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2008-04-03 20:19:42 +0000
committerjlam <jlam@pkgsrc.org>2008-04-03 20:19:42 +0000
commitf990df9430cc89f68b98b6b9d1a5a690c3ead7fe (patch)
tree66c57bab9fca67b6bf03074aca7c53d8219dc4e5 /net/samba
parenta8d98ad4bf0297db89a3b22d5f1789ef47c38949 (diff)
downloadpkgsrc-f990df9430cc89f68b98b6b9d1a5a690c3ead7fe.tar.gz
Update samba to version 3.0.28a.
CHANGES FOR PKGSRC: ================== Makefile: + Modify section that manually handles the ELF symlinks for samba shared libraries -- add additional libraries that are built (addns, smbsharemodes) and reorganize so we don't need two loops where one will do. + Pass --with-included-popt to the configure script to force using the popt distribution included with samba to avoid any library mismatch errors between samba and any installed popt. This fixes PR pkg/34444 by Jason Lingohr. + Don't build the smbmount programs on Linux -- they're deprecated in favor of the mount.cifs programs. + Remove some pkgviews-related settings -- I'm not supporting pkgviews installation of samba. Makefile.patches: + Empty out PATCHFILES because we are updating to the latest release of samba, which has all previous patches for security advisories already rolled into the main sources. Makefile.mirrors: + Update SAMBA_MIRRORS in Makefile.mirrors to the latest list of FTP mirrors. options.mk: + Only show the ``acl'' option on platforms that actually support POSIX ACLs. + Add a new ``fam'' option to enable building the notify_fam VFS module. patch-ab, patch-ax: + Remove patch-ab and update patch-ax -- there's nothing for the scripts to back up so we don't need to patch the install* scripts to avoid this. patch-ae, patch-ah: + Update patch-ae and remove patch-ah -- we should definitely check that PAM_AUTHTOK_RECOVERY_ERR is defined before using its value to define PAM_AUTHTOK_RECOVER_ERR. patch-at, patch-au: + Fix patch-at and patch-au -- in configure.in, we need to "escape" left and right brackets or else m4 will strip them away in the resulting configure script. This should fix the detection of FreeBSD and NetBSD systems capable of using nss_winbind noted in PR pkg/38076 by Ingo Meyer. patch-ay: + Remove some unnecessary changes -- we can safely just do "mkdir" in some places because we know the parent and any intermediate directories exist. patch-be: + Fix a bug in locating WINS_LIST -- nmbd/nmbd_winsserver.c was referring to WINS_LIST under the state directory in one place and under the lock directory in another; change all references to be under the state directory. patch-db: + Add patch to fix the build of samba on older BSDs. Patch supplied in PR pkg/37487 by John Frear. All remaining changes to patches/patch-* are simply to remove fuzz. MAJOR CHANGES FROM VERSION 3.0.26a: * Fix failure to join Windows 2008 domains. * Fix Windows Vista (including SP1 RC) inter-op issues. * Add a new ``administrative share'' service parameter for defining hidden shares that cannot be managed from Windows. * Fix for CVS-2007-6015 (already fixed in 3.0.26anb4 in pkgsrc). * Fix for CVS-2007-5398 (already fixed in 3.0.26anb4 in pkgsrc). * Fix for CVS-2007-4572 (already fixed in 3.0.26anb4 in pkgsrc). Also subsequent fix for regression experienced by smbfs clients caused by the fix for CVS-2007-4572, noted in PR pkg/38300 by Dave Barnes. * Many other bugs fixed and memory leaks plugged.
Diffstat (limited to 'net/samba')
-rw-r--r--net/samba/Makefile61
-rw-r--r--net/samba/Makefile.mirrors26
-rw-r--r--net/samba/Makefile.patches10
-rw-r--r--net/samba/PLIST38
-rw-r--r--net/samba/distinfo44
-rw-r--r--net/samba/options.mk23
-rw-r--r--net/samba/patches/patch-aa6
-rw-r--r--net/samba/patches/patch-ab14
-rw-r--r--net/samba/patches/patch-ae4
-rw-r--r--net/samba/patches/patch-ah16
-rw-r--r--net/samba/patches/patch-at40
-rw-r--r--net/samba/patches/patch-au26
-rw-r--r--net/samba/patches/patch-ax16
-rw-r--r--net/samba/patches/patch-ay22
-rw-r--r--net/samba/patches/patch-ba24
-rw-r--r--net/samba/patches/patch-be13
-rw-r--r--net/samba/patches/patch-bo6
-rw-r--r--net/samba/patches/patch-br6
-rw-r--r--net/samba/patches/patch-bs18
-rw-r--r--net/samba/patches/patch-ca8
-rw-r--r--net/samba/patches/patch-db15
21 files changed, 191 insertions, 245 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 30021735cce..a6ca90af5ec 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.179 2007/12/21 17:32:24 drochner Exp $
+# $NetBSD: Makefile,v 1.180 2008/04/03 20:19:42 jlam Exp $
.include "Makefile.mirrors"
DISTNAME= samba-${VERSION}
-PKGREVISION= 4
CATEGORIES= net
MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/}
@@ -13,12 +12,11 @@ MAINTAINER= jlam@pkgsrc.org
HOMEPAGE= http://www.samba.org/
COMMENT= SMB/CIFS protocol server suite
-VERSION= 3.0.26a
+VERSION= 3.0.28a
CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* \
winbind-[0-9]*
MAKE_JOBS_SAFE= NO
-PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/${DISTNAME}/source
@@ -28,8 +26,6 @@ BUILD_DEFS+= VARBASE
.include "../../mk/bsd.prefs.mk"
PKG_SYSCONFSUBDIR?= samba
-PKG_SYSCONFVAR= samba
-
SAMBA_ETCDIR?= ${PKG_SYSCONFDIR}
SAMBA_LIBDIR?= ${PREFIX}/lib/samba
SAMBA_LOCKDIR?= ${SAMBA_VARDIR}/run/samba
@@ -58,8 +54,9 @@ CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE:Q}
CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR:Q}
CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR:Q}
-CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat
-CONFIGURE_ARGS+= --with-libsmbclient
+CONFIGURE_ARGS+= --with-mandir=${PREFIX:Q}/${PKGMANDIR:Q}
+CONFIGURE_ARGS+= --with-swatdir=${PREFIX:Q}/share/samba/swat
+CONFIGURE_ARGS+= --with-included-popt
.include "../../converters/libiconv/buildlink3.mk"
CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv}
@@ -70,14 +67,14 @@ CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
.include "options.mk"
-# Only Linux supports smbmount for mounting a Samba share into the
+# Only Linux supports mount.cifs for mounting a CIFS share into the
# filesystem.
#
.if ${OPSYS} == "Linux"
-CONFIGURE_ARGS+= --with-smbmount
-PLIST_SUBST+= SMBMOUNT=
+CONFIGURE_ARGS+= --with-cifsmount
+PLIST_SUBST+= CIFSMOUNT=
.else
-PLIST_SUBST+= SMBMOUNT="@comment "
+PLIST_SUBST+= CIFSMOUNT="@comment "
.endif
# mktemp is useful for the replacement adduser script, but don't require
@@ -116,35 +113,31 @@ SUBST_SED.paths+= -e 's,@MKTEMP@,${MKTEMP},g' -e 's,@RM@,${RM},g'
SUBST_SED.paths+= -e 's,@PWD_MKDB@,${PWD_MKDB},g' -e 's,@SH@,${SH},g'
SUBST_STAGE.paths= post-patch
-SUBST_CLASSES+= mandir
-SUBST_STAGE.mandir= pre-configure
-SUBST_FILES.mandir= Makefile.in
-SUBST_SED.mandir= -e 's,@mandir@,${PREFIX}/${PKGMANDIR},g'
-
# Get the shared library major and minors for the installed shared
# libraries. We'll need these to create the versioned symlinks for
# the shared libraries because samba Makefile doesn't do it on its
# own.
#
-.for LIB in LIBSMBCLIENT LIBMSRPC
+SAMBA_LIBS= smbclient msrpc smbsharemodes addns
+
+.PHONY: install-samba-lib-symlinks
+.for l in ${SAMBA_LIBS}
. for NUM in MAJOR MINOR
-${LIB}_${NUM}_cmd= ${AWK} -F= '/^${LIB}_${NUM}/ { print $$2; }' \
- ${WRKSRC}/Makefile.in
-${LIB}_${NUM}= ${${LIB}_${NUM}_cmd:sh}
-PLIST_SUBST+= ${LIB}_${NUM}=${${LIB}_${NUM}}
+LIB${NUM}_cmd.${l}= ${AWK} -F= '/^LIB${l:tu}_${NUM}/ { print $$2; }' \
+ ${WRKSRC:Q}/Makefile.in
+LIB${NUM}.${l}= ${LIB${NUM}_cmd.${l}:sh}
+PLIST_SUBST+= LIB${NUM}.${l}=${LIB${NUM}.${l}}
. endfor
-.endfor
-SMBLIBS= msrpc smbclient
-SMBVERSION.msrpc= ${LIBMSRPC_MAJOR} ${LIBMSRPC_MAJOR}.${LIBMSRPC_MINOR}
-SMBVERSION.smbclient= ${LIBSMBCLIENT_MAJOR} ${LIBSMBCLIENT_MAJOR}.${LIBSMBCLIENT_MINOR}
+SAMBA_VERSIONS.${l}= ${LIBMAJOR.${l}} ${LIBMAJOR.${l}}.${LIBMINOR.${l}}
-.PHONY: install-samba-lib-symlinks
-install-samba-lib-symlinks:
-.for l in ${SMBLIBS}
- for v in ${SMBVERSION.${l}}; do \
- (cd ${DESTDIR}${SAMBA_LIBDIR} && rm -f lib${l}.so.$$v && \
- ln -s lib${l}.so lib${l}.so.$$v); \
+.PHONY: install-samba-lib-symlinks-${l}
+install-samba-lib-symlinks: install-samba-lib-symlinks-${l}
+install-samba-lib-symlinks-${l}:
+ for v in ${SAMBA_VERSIONS.${l}}; do \
+ cd ${DESTDIR}${SAMBA_LIBDIR} && \
+ rm -f lib${l}.so.$$v && \
+ ln -s lib${l}.so lib${l}.so.$$v; \
done
.endfor
@@ -173,7 +166,7 @@ post-install: install-samba-lib-symlinks
cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mknissmbpwdtbl.sh ${DESTDIR}${PREFIX}/${EGDIR}
cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mksmbpasswd.sh ${DESTDIR}${PREFIX}/${EGDIR}
cd ${WRKSRC}/script; ${INSTALL_SCRIPT} updatesmbpasswd.sh ${DESTDIR}${PREFIX}/${EGDIR}
- ${CHMOD} -x ${DESTDIR}${PREFIX}/include/libmsrpc.h \
- ${DESTDIR}${PREFIX}/include/libsmbclient.h
+ ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/include/libmsrpc.h \
+ ${DESTDIR}${PREFIX}/include/libsmbclient.h
.include "../../mk/bsd.pkg.mk"
diff --git a/net/samba/Makefile.mirrors b/net/samba/Makefile.mirrors
index a0689f0d526..531d15e8241 100644
--- a/net/samba/Makefile.mirrors
+++ b/net/samba/Makefile.mirrors
@@ -1,41 +1,27 @@
-# $NetBSD: Makefile.mirrors,v 1.4 2007/06/08 20:52:18 jdolecek Exp $
+# $NetBSD: Makefile.mirrors,v 1.5 2008/04/03 20:19:42 jlam Exp $
#
# This Makefile fragment contains the mirror sites for fetching Samba.
###
-### This list was last updated on 20060401 from:
+### This list was last updated on 20080403 from:
### http://www.samba.org/samba/download/ftp_mirrors.html
###
SAMBA_MIRRORS= \
- ftp://ftp.samba.org/pub/samba/ \
ftp://ftp.planetmirror.com/pub/samba/ \
- ftp://gd.tuwien.ac.at/infosys/servers/samba/ \
ftp://ftp.easynet.be/samba/ \
- ftp://ftp.pucpr.br/samba/ \
http://mirrors.uol.com.br/pub/samba/ \
- ftp://ftp.uni-sofia.bg/samba/ \
- ftp://mirror.kn.vutbr.cz/pub/ftp.samba.org/ \
+ ftp://ca.samba.org/ \
ftp://mirrors.dotsrc.org/samba/ \
- ftp://fi.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://ftp.ring.gr.jp/pub/net/samba/ \
ftp://ftp.samba.gr.jp/pub/samba/ \
- ftp://ftp.linux.edu.lv/mirrors/ftp.samba.org// \
+ http://samba.osmirror.nl/samba/ftp/ \
ftp://ftp.bit.nl/mirror/samba/ \
ftp://www.bibsyst.no/pub/samba/ \
- ftp://giswitch.sggw.waw.pl/pub/unix/samba/ \
- ftp://ftp.citkit.ru/pub/samba/ \
- ftp://ru.samba.org/pub/samba/ \
- ftp://ru2.samba.org// \
+ ftp://pl.samba.org/pub/unix/net/samba/ \
ftp://ftp.chg.ru/packages/samba/ \
ftp://ftp.oss.eznetsols.org/samba/ \
- ftp://ftp.k2.net/mirrors/samba/ \
- ftp://se.samba.org/pub/samba/ \
- ftp://us1.samba.org/pub/samba/ \
- ftp://us5.samba.org/pub/samba-ftp/ \
- ftp://us2.samba.org/pub/samba/ \
- ftp://us4.samba.org/pub/samba/
+ ftp://us5.samba.org/pub/samba-ftp/
diff --git a/net/samba/Makefile.patches b/net/samba/Makefile.patches
index 821edd1a595..da3f53c1754 100644
--- a/net/samba/Makefile.patches
+++ b/net/samba/Makefile.patches
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.patches,v 1.7 2007/12/10 21:44:48 adrianp Exp $
+# $NetBSD: Makefile.patches,v 1.8 2008/04/03 20:19:42 jlam Exp $
#
# This Makefile fragment describes the recommended patches for the
# currently packaged version of Samba. All recommended patches for
@@ -6,17 +6,9 @@
# of Samba, so upon updating to the latest release of Samba, the
# PATCHFILES variable should be empty.
#
-
-# Currently, no patch is needed.
-#
# The PATCHFILES are listed in chronological order according to the time
# they are added to ${PATCH_SITES}.
#
#PATCH_SITES= http://www.samba.org/samba/patches/patches-${VERSION}/
#PATCHFILES=
PATCH_DIST_STRIP= -p2
-
-.for CVE_PATCH in samba-3.0.26a-CVE-2007-4572.patch samba-3.0.26a-CVE-2007-5398.patch samba-3.0.27a-CVE-2007-6015.patch
-PATCHFILES+= ${CVE_PATCH}
-SITES.${CVE_PATCH}= http://www.samba.org/samba/ftp/patches/security/
-.endfor
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 01c2cc0cc5b..7a2bc0422fd 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2007/10/28 07:28:46 taca Exp $
+@comment $NetBSD: PLIST,v 1.38 2008/04/03 20:19:42 jlam Exp $
bin/eventlogadm
bin/findsmb
bin/net
@@ -12,14 +12,11 @@ bin/smbclient
bin/smbcontrol
bin/smbcquotas
bin/smbget
-${SMBMOUNT}bin/smbmnt
-${SMBMOUNT}bin/smbmount
bin/smbpasswd
bin/smbspool
bin/smbstatus
bin/smbtar
bin/smbtree
-${SMBMOUNT}bin/smbumount
bin/tdbbackup
bin/tdbdump
bin/tdbtool
@@ -38,13 +35,18 @@ lib/samba/fi.msg
lib/samba/fr.msg
lib/samba/it.msg
lib/samba/ja.msg
-lib/samba/libsmbsharemodes.so
+lib/samba/libaddns.so
+lib/samba/libaddns.so.${LIBMAJOR.addns}
+lib/samba/libaddns.so.${LIBMAJOR.addns}.${LIBMINOR.addns}
lib/samba/libmsrpc.so
-lib/samba/libmsrpc.so.${LIBMSRPC_MAJOR}
-lib/samba/libmsrpc.so.${LIBMSRPC_MAJOR}.${LIBMSRPC_MINOR}
+lib/samba/libmsrpc.so.${LIBMAJOR.msrpc}
+lib/samba/libmsrpc.so.${LIBMAJOR.msrpc}.${LIBMINOR.msrpc}
lib/samba/libsmbclient.so
-lib/samba/libsmbclient.so.${LIBSMBCLIENT_MAJOR}
-lib/samba/libsmbclient.so.${LIBSMBCLIENT_MAJOR}.${LIBSMBCLIENT_MINOR}
+lib/samba/libsmbclient.so.${LIBMAJOR.smbclient}
+lib/samba/libsmbclient.so.${LIBMAJOR.smbclient}.${LIBMINOR.smbclient}
+lib/samba/libsmbsharemodes.so
+lib/samba/libsmbsharemodes.so.${LIBMAJOR.smbsharemodes}
+lib/samba/libsmbsharemodes.so.${LIBMAJOR.smbsharemodes}.${LIBMINOR.smbsharemodes}
lib/samba/lowcase.dat
lib/samba/nl.msg
lib/samba/pl.msg
@@ -59,6 +61,7 @@ lib/samba/vfs/extd_audit.so
lib/samba/vfs/fake_perms.so
lib/samba/vfs/full_audit.so
lib/samba/vfs/netatalk.so
+${FAM}lib/samba/vfs/notify_fam.so
lib/samba/vfs/readahead.so
lib/samba/vfs/readonly.so
lib/samba/vfs/recycle.so
@@ -87,9 +90,9 @@ man/man5/lmhosts.5
man/man5/smb.conf.5
man/man5/smbgetrc.5
man/man5/smbpasswd.5
-man/man7/samba.7
man/man7/libsmbclient.7
man/man7/pam_winbind.7
+man/man7/samba.7
man/man8/eventlogadm.8
man/man8/idmap_ad.8
man/man8/idmap_ldap.8
@@ -101,11 +104,8 @@ man/man8/net.8
man/man8/nmbd.8
man/man8/pdbedit.8
man/man8/smbd.8
-${SMBMOUNT}man/man8/smbmnt.8
-${SMBMOUNT}man/man8/smbmount.8
man/man8/smbpasswd.8
man/man8/smbspool.8
-${SMBMOUNT}man/man8/smbumount.8
man/man8/swat.8
man/man8/tdbbackup.8
man/man8/tdbdump.8
@@ -129,11 +129,11 @@ man/man8/vfs_readonly.8
man/man8/vfs_recycle.8
man/man8/vfs_shadow_copy.8
man/man8/winbindd.8
-${SMBMOUNT}sbin/mount.cifs
+${CIFSMOUNT}sbin/mount.cifs
sbin/nmbd
sbin/smbd
sbin/swat
-${SMBMOUNT}sbin/umount.cifs
+${CIFSMOUNT}sbin/umount.cifs
${WINBIND}sbin/winbindd
share/doc/samba/NT4-Locking.reg
share/doc/samba/NT4_PlainPassword.reg
@@ -257,9 +257,9 @@ share/samba/swat/help/Samba3-HOWTO/AccessControls.html
share/samba/swat/help/Samba3-HOWTO/AdvancedNetworkManagement.html
share/samba/swat/help/Samba3-HOWTO/Appendix.html
share/samba/swat/help/Samba3-HOWTO/Backup.html
+share/samba/swat/help/Samba3-HOWTO/CUPS-printing.html
share/samba/swat/help/Samba3-HOWTO/ChangeNotes.html
share/samba/swat/help/Samba3-HOWTO/ClientConfig.html
-share/samba/swat/help/Samba3-HOWTO/CUPS-printing.html
share/samba/swat/help/Samba3-HOWTO/DNSDHCP.html
share/samba/swat/help/Samba3-HOWTO/FastStart.html
share/samba/swat/help/Samba3-HOWTO/InterdomainTrusts.html
@@ -414,7 +414,6 @@ share/samba/swat/help/manpages/tdbdump.8.html
share/samba/swat/help/manpages/tdbtool.8.html
share/samba/swat/help/manpages/testparm.1.html
share/samba/swat/help/manpages/umount.cifs.8.html
-share/samba/swat/help/manpages/vfstest.1.html
share/samba/swat/help/manpages/vfs_audit.8.html
share/samba/swat/help/manpages/vfs_cacheprime.8.html
share/samba/swat/help/manpages/vfs_cap.8.html
@@ -432,6 +431,7 @@ share/samba/swat/help/manpages/vfs_readahead.8.html
share/samba/swat/help/manpages/vfs_readonly.8.html
share/samba/swat/help/manpages/vfs_recycle.8.html
share/samba/swat/help/manpages/vfs_shadow_copy.8.html
+share/samba/swat/help/manpages/vfstest.1.html
share/samba/swat/help/manpages/wbinfo.1.html
share/samba/swat/help/manpages/winbindd.8.html
share/samba/swat/help/welcome-no-samba-doc.html
@@ -620,6 +620,8 @@ share/samba/swat/using_samba/inx.html
share/samba/swat/using_samba/samba2_s.gif
share/samba/swat/using_samba/samba2_xs.gif
share/samba/swat/using_samba/toc.html
+@dirrm share/samba/swat/using_samba/figs
+@dirrm share/samba/swat/using_samba
@dirrm share/samba/swat/lang/tr/images
@dirrm share/samba/swat/lang/tr/help
@dirrm share/samba/swat/lang/tr
@@ -628,8 +630,6 @@ share/samba/swat/using_samba/toc.html
@dirrm share/samba/swat/lang
@dirrm share/samba/swat/include
@dirrm share/samba/swat/images
-@dirrm share/samba/swat/using_samba/figs
-@dirrm share/samba/swat/using_samba
@dirrm share/samba/swat/help/manpages
@dirrm share/samba/swat/help/Samba3-HOWTO/images
@dirrm share/samba/swat/help/Samba3-HOWTO
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 5ee6f9902e3..55553edfe2e 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,52 +1,42 @@
-$NetBSD: distinfo,v 1.60 2008/02/19 10:28:12 taca Exp $
+$NetBSD: distinfo,v 1.61 2008/04/03 20:19:42 jlam Exp $
-SHA1 (samba-3.0.26a-CVE-2007-4572.patch) = 32b4f45558a0765b9cd96e67ac57a83cc62678ea
-RMD160 (samba-3.0.26a-CVE-2007-4572.patch) = 81afb6ce0a58cd688fc3c25c1c8a878ca1a4b7fc
-Size (samba-3.0.26a-CVE-2007-4572.patch) = 8203 bytes
-SHA1 (samba-3.0.26a-CVE-2007-5398.patch) = e2b7d91446e07bf1be5930187417f26841995743
-RMD160 (samba-3.0.26a-CVE-2007-5398.patch) = b547196a44437d6336495ea727f9abfcfd41e79c
-Size (samba-3.0.26a-CVE-2007-5398.patch) = 1232 bytes
-SHA1 (samba-3.0.26a.tar.gz) = 1625ac3f1c2a57600a9141a2b4bbe59fe8c4d6d2
-RMD160 (samba-3.0.26a.tar.gz) = 9a62ba3ea2747b500ddea56729499524ae4329d2
-Size (samba-3.0.26a.tar.gz) = 18180031 bytes
-SHA1 (samba-3.0.27a-CVE-2007-6015.patch) = 962f9b0fee584a01324c4811e223b9e978dc76a1
-RMD160 (samba-3.0.27a-CVE-2007-6015.patch) = eafff2cd721fed64098bf6eaaf47d7501d58ba21
-Size (samba-3.0.27a-CVE-2007-6015.patch) = 1739 bytes
-SHA1 (patch-aa) = 7d5de1fde89747df328c1e213d50893dffcc57bf
-SHA1 (patch-ab) = 9597f88f6e7f97da446968562b4d3ab8e9644f0f
+SHA1 (samba-3.0.28a.tar.gz) = b4829b133af3865f6518bae14af4d989b6f1c31a
+RMD160 (samba-3.0.28a.tar.gz) = 646680c49fd56d98430d325884a5911d406e13be
+Size (samba-3.0.28a.tar.gz) = 18172643 bytes
+SHA1 (patch-aa) = b323c778c0c4f01cd102d019a996914d0d7eb106
SHA1 (patch-ac) = 47529dfe904768e6a3076131978c89fe2d1e3619
-SHA1 (patch-ae) = a220568afcb6ae97e1000296795f852f8e92f624
+SHA1 (patch-ae) = 28fc3d1ad158f8025f1f9ba8e170d93c31fa45ba
SHA1 (patch-af) = 9f14842b7d0b5e66bf1d52bcacefe5e1aa392b7c
SHA1 (patch-ag) = c73e717e053b6618b2a334602fefabe5a5f98a98
-SHA1 (patch-ah) = 5bd17d69b96439797339deb07ffff59d74ac403e
SHA1 (patch-ak) = 0c69720954282022c7982d36eaee94a03db7b689
-SHA1 (patch-at) = 21080ca3699e7dbb61c40b9bc3d0fc39e1d82288
-SHA1 (patch-au) = 69d58caf47ecdcbc722b2980e313481126b5ed25
+SHA1 (patch-at) = a7f9ba91cee27bcfcc9bce2d06141bf01cd0ac38
+SHA1 (patch-au) = f1b86b6f3a161b485bf5507fa1da69352b5a5e93
SHA1 (patch-av) = c29ba19e96c24ef95a9a043f8678d77c00d73506
SHA1 (patch-aw) = 5b6c1bf65d23564eaabf1bafda41a29d1f687538
-SHA1 (patch-ax) = 73c182fc30dd9b1b36d77e8ba6cfec7b022a993c
-SHA1 (patch-ay) = 686634cd9de272b04751c87d4bf1092c6e88df56
-SHA1 (patch-ba) = 43423a68141b0d4999fb6f984e6ec45bdce3b8c7
+SHA1 (patch-ax) = e528921710514bc2651bfca808c21d608f928a95
+SHA1 (patch-ay) = e6ccc4fb20fa909f5d3cecbc4bf3628ba5b355e9
+SHA1 (patch-ba) = 7a9245427ed21b1dfe846b341f70debca6de2e7c
SHA1 (patch-bc) = d525b9201a5cda85346704ad7b860e2b3a3aeb08
SHA1 (patch-bd) = faf24c792ecff76972d0a80f5418d8c38ca9ed21
-SHA1 (patch-be) = 677b8240b00599b6b6ae5c87f6baeb2319a0f3de
+SHA1 (patch-be) = b3386824969a1a02cf8e5d5a9889ce55f6813f48
SHA1 (patch-bg) = d9081df9d43a686eaca8e3fad57cb99ed9fa844a
SHA1 (patch-bh) = 3098da6f800f66f46615af853c94e09e2a984b24
SHA1 (patch-bi) = 187427d1b884c6ae49369a7d33785cdd810e1769
SHA1 (patch-bm) = 20107d012f7e17f34cbaca8b8059214273f687ba
SHA1 (patch-bn) = e6071e4adf05c132d7e5ef0cc529b4e3df1cf567
-SHA1 (patch-bo) = efba1d37c0bb890968fa31653596fc3cf0d2ceb4
+SHA1 (patch-bo) = 5d3091f33287f4d2f0bc7dadee119abd92f91653
SHA1 (patch-bp) = 08f2387324aaec8161f3114de84d81c815dd8179
SHA1 (patch-bq) = dc25eb43336d4ad7ecef1b4ea8c5dcd72cc91a7b
-SHA1 (patch-br) = bf3642a0bd63ee65b2eeb961d4c79504ad583613
-SHA1 (patch-bs) = bc241be076c773c222a90b816471c09b2745497b
+SHA1 (patch-br) = fc0d4c1f638a534f86e59ed8ebaddbf1978fa64f
+SHA1 (patch-bs) = 1c08caf388e337497464097a11c909ddd5f9a3ff
SHA1 (patch-bt) = 262a86f15af3550966e05949bb3c1e4325532c1f
SHA1 (patch-bu) = ba28d950f8e1c14fa99a400b79cb4d6b587a7140
SHA1 (patch-bv) = 2d80f4e24edab32bf4f620f651e70b9e63d28cc5
SHA1 (patch-bw) = 11f9b3713382a23075ed5980d7b8a2dbd11ecf54
-SHA1 (patch-ca) = 636ddd71fb078ad93dfb96bc8399a3dbbe65ccdb
+SHA1 (patch-ca) = 0c2c4c1bdb3348de3e8719cc468a6e0c28a36b73
SHA1 (patch-ce) = 81c6c2d9c6c0df7180d41a0382f2b4600f545620
SHA1 (patch-cf) = 8b50f657f8f4fa71936ec4766c2517ca5d128ff7
SHA1 (patch-cg) = 2755a019759826a39c3e201f6a0d1646e6dd2fba
SHA1 (patch-ch) = 3c4c404519154e294cee134ddb4d2b9c7d8e02a2
SHA1 (patch-da) = 2dddd250b2207d658b02ff43b46199ce4305b7f8
+SHA1 (patch-db) = a43800408fae9bc2bfdd0db4d481dda6b936778b
diff --git a/net/samba/options.mk b/net/samba/options.mk
index 8dc860724bb..0adc5c05810 100644
--- a/net/samba/options.mk
+++ b/net/samba/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.22 2007/10/28 07:28:46 taca Exp $
+# $NetBSD: options.mk,v 1.23 2008/04/03 20:19:42 jlam Exp $
# Recommended package options for various setups:
#
@@ -8,7 +8,14 @@
# Domain Controller ldap winbind
#
PKG_OPTIONS_VAR= PKG_OPTIONS.samba
-PKG_SUPPORTED_OPTIONS= acl ads cups ldap pam winbind
+PKG_SUPPORTED_OPTIONS= ads cups fam ldap pam winbind
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+SAMBA_ACL_OPSYS= AIX FreeBSD HPUX IRIX Linux OSF1 SunOS
+.if !empty(SAMBA_ACL_OPSYS:M${OPSYS})
+PKG_SUPPORTED_OPTIONS+= acl
+.endif
.include "../../mk/bsd.options.mk"
@@ -61,6 +68,18 @@ PLIST_SUBST+= CUPS="@comment "
.endif
###
+### Access Control List support.
+###
+.if !empty(PKG_OPTIONS:Mfam)
+. include "../../mk/fam.buildlink3.mk"
+CONFIGURE_ARGS+= --enable-fam
+PLIST_SUBST+= FAM=
+.else
+CONFIGURE_ARGS+= --disable-fam
+PLIST_SUBST+= FAM="@comment "
+.endif
+
+###
### Support LDAP authentication and storage of Samba account information.
###
.if !empty(PKG_OPTIONS:Mldap)
diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
index 3226844f115..ee655612925 100644
--- a/net/samba/patches/patch-aa
+++ b/net/samba/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.31 2008/02/19 10:28:12 taca Exp $
+$NetBSD: patch-aa,v 1.32 2008/04/03 20:19:42 jlam Exp $
---- nsswitch/pam_winbind.c.orig 2007-04-21 10:48:07.000000000 +0900
+--- nsswitch/pam_winbind.c.orig 2008-03-08 10:56:27.000000000 -0500
+++ nsswitch/pam_winbind.c
-@@ -1289,6 +1289,8 @@ static char *_pam_delete(register char *
+@@ -1291,6 +1291,8 @@ static char *_pam_delete(register char *
return NULL;
}
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
deleted file mode 100644
index 55709e0d594..00000000000
--- a/net/samba/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.26 2007/02/11 18:39:04 tron Exp $
-
---- script/installbin.sh.in.orig 2007-02-04 18:59:25.000000000 +0000
-+++ script/installbin.sh.in 2007-02-11 15:13:13.000000000 +0000
-@@ -14,8 +14,7 @@
- p2=`basename $p`
- echo "Installing $p as $DESTDIR/$BINDIR/$p2 "
- if [ -f $DESTDIR/$BINDIR/$p2 ]; then
-- rm -f $DESTDIR/$BINDIR/$p2.old
-- mv $DESTDIR/$BINDIR/$p2 $DESTDIR/$BINDIR/$p2.old
-+ rm -f $DESTDIR/$BINDIR/$p2
- fi
- cp $p $DESTDIR/$BINDIR/
- chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
diff --git a/net/samba/patches/patch-ae b/net/samba/patches/patch-ae
index 3e648262f79..aa6a37732e6 100644
--- a/net/samba/patches/patch-ae
+++ b/net/samba/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.8 2005/11/14 08:05:27 jlam Exp $
+$NetBSD: patch-ae,v 1.9 2008/04/03 20:19:42 jlam Exp $
--- auth/pampass.c.orig 2005-10-12 13:03:28.000000000 -0400
+++ auth/pampass.c
@@ -6,7 +6,7 @@ $NetBSD: patch-ae,v 1.8 2005/11/14 08:05:27 jlam Exp $
#include <security/pam_appl.h>
-+#ifndef PAM_AUTHTOK_RECOVER_ERR
++#if defined(PAM_AUTHTOK_RECOVERY_ERR) && !defined(PAM_AUTHTOK_RECOVER_ERR)
+#define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR
+#endif
+
diff --git a/net/samba/patches/patch-ah b/net/samba/patches/patch-ah
deleted file mode 100644
index 6698a580c61..00000000000
--- a/net/samba/patches/patch-ah
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2005/11/14 08:05:27 jlam Exp $
-
---- lib/pam_errors.c.orig 2005-10-12 13:03:29.000000000 -0400
-+++ lib/pam_errors.c
-@@ -23,9 +23,9 @@
- #ifdef WITH_PAM
- #include <security/pam_appl.h>
-
--#if defined(PAM_AUTHTOK_RECOVERY_ERR) && !defined(PAM_AUTHTOK_RECOVER_ERR)
-+#ifndef PAM_AUTHTOK_RECOVER_ERR
- #define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR
--#endif
-+#endif
-
- /* PAM -> NT_STATUS map */
- static const struct {
diff --git a/net/samba/patches/patch-at b/net/samba/patches/patch-at
index d2a0b7b7732..f93253b2cb8 100644
--- a/net/samba/patches/patch-at
+++ b/net/samba/patches/patch-at
@@ -1,6 +1,6 @@
-$NetBSD: patch-at,v 1.8 2007/12/21 17:32:25 drochner Exp $
+$NetBSD: patch-at,v 1.9 2008/04/03 20:19:42 jlam Exp $
---- configure.orig 2007-09-11 16:22:55.000000000 +0200
+--- configure.orig 2008-03-08 10:58:14.000000000 -0500
+++ configure
@@ -667,6 +667,7 @@ target_vendor
target_os
@@ -18,7 +18,7 @@ $NetBSD: patch-at,v 1.8 2007/12/21 17:32:25 drochner Exp $
--with-piddir=DIR Where to put pid files ($ac_default_prefix/var/locks)
--with-swatdir=DIR Where to put SWAT files ($ac_default_prefix/swat)
--with-configdir=DIR Where to put configuration files ($libdir)
-@@ -2125,6 +2127,7 @@ fi
+@@ -2136,6 +2138,7 @@ fi
rootsbindir="\${SBINDIR}"
lockdir="\${VARDIR}/locks"
@@ -26,7 +26,7 @@ $NetBSD: patch-at,v 1.8 2007/12/21 17:32:25 drochner Exp $
piddir="\${VARDIR}/locks"
test "${mandir}" || mandir="\${prefix}/man"
logfilebase="\${VARDIR}"
-@@ -2139,7 +2142,8 @@ swatdir="\${prefix}/swat"
+@@ -2150,7 +2153,8 @@ swatdir="\${prefix}/swat"
if test "${with_fhs+set}" = set; then
withval=$with_fhs; case "$withval" in
yes)
@@ -36,7 +36,7 @@ $NetBSD: patch-at,v 1.8 2007/12/21 17:32:25 drochner Exp $
piddir="\${VARDIR}/run"
mandir="\${prefix}/share/man"
logfilebase="\${VARDIR}/log/samba"
-@@ -2213,6 +2217,26 @@ fi
+@@ -2224,6 +2228,26 @@ fi
#################################################
@@ -63,7 +63,7 @@ $NetBSD: patch-at,v 1.8 2007/12/21 17:32:25 drochner Exp $
# set pid directory location
# Check whether --with-piddir was given.
-@@ -2450,6 +2474,7 @@ fi
+@@ -2461,6 +2485,7 @@ fi
@@ -71,7 +71,7 @@ $NetBSD: patch-at,v 1.8 2007/12/21 17:32:25 drochner Exp $
## check for --enable-debug first before checking CFLAGS before
## so that we don't mix -O and -g
# Check whether --enable-debug was given.
-@@ -31006,7 +31031,8 @@ done
+@@ -31342,7 +31367,8 @@ done
@@ -81,7 +81,7 @@ $NetBSD: patch-at,v 1.8 2007/12/21 17:32:25 drochner Exp $
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -46527,6 +46553,75 @@ _ACEOF
+@@ -46875,6 +46901,75 @@ _ACEOF
fi
if test $iface = no; then
@@ -157,7 +157,7 @@ $NetBSD: patch-at,v 1.8 2007/12/21 17:32:25 drochner Exp $
{ echo "$as_me:$LINENO: checking for iface ifconf" >&5
echo $ECHO_N "checking for iface ifconf... $ECHO_C" >&6; }
if test "${samba_cv_HAVE_IFACE_IFCONF+set}" = set; then
-@@ -49841,9 +49936,9 @@ LIBS="-lcrypto $KRB5_LIBS $LIBS"
+@@ -50250,9 +50345,9 @@ LIBS="-lcrypto $KRB5_LIBS $LIBS"
@@ -170,7 +170,7 @@ $NetBSD: patch-at,v 1.8 2007/12/21 17:32:25 drochner Exp $
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -49859,11 +49954,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -50268,11 +50363,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -184,7 +184,7 @@ $NetBSD: patch-at,v 1.8 2007/12/21 17:32:25 drochner Exp $
;
return 0;
}
-@@ -49886,13 +49981,13 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -50295,13 +50390,13 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -200,7 +200,7 @@ $NetBSD: patch-at,v 1.8 2007/12/21 17:32:25 drochner Exp $
ac_cv_lib_ext_crypto=no
fi
-@@ -49900,11 +49995,11 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -50309,11 +50404,11 @@ rm -f core conftest.err conftest.$ac_obj
conftest$ac_exeext conftest.$ac_ext
fi
@@ -216,7 +216,7 @@ $NetBSD: patch-at,v 1.8 2007/12/21 17:32:25 drochner Exp $
_ACEOF
fi
-@@ -62806,31 +62901,39 @@ case "$host_os" in
+@@ -63337,31 +63432,39 @@ case "$host_os" in
NSSSONAMEVERSIONSUFFIX=".2"
WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
;;
@@ -240,7 +240,7 @@ $NetBSD: patch-at,v 1.8 2007/12/21 17:32:25 drochner Exp $
- nsswitch/winbind_nss_netbsd.o \
+ *freebsd*)
+ case "$UNAME_R" in
-+ 5-9*)
++ [5-9]*)
+ # FreeBSD winbind client is implemented as a wrapper
+ # around the Linux version.
+ NSSSONAMEVERSIONSUFFIX=".1"
@@ -256,9 +256,9 @@ $NetBSD: patch-at,v 1.8 2007/12/21 17:32:25 drochner Exp $
+ esac
+ ;;
+
-+ *netbsd*[3-9]*)
++ *netbsd*)
+ case "$UNAME_R" in
-+ 3-9*)
++ [3-9]*)
+ # NetBSD winbind client is implemented as a wrapper
+ # around the Linux version. It needs getpwent_r() to
+ # indicate libc's use of the correct nsdispatch API.
@@ -278,7 +278,7 @@ $NetBSD: patch-at,v 1.8 2007/12/21 17:32:25 drochner Exp $
;;
*irix*)
# IRIX has differently named shared libraries
-@@ -67320,6 +67423,7 @@ target_vendor!$target_vendor$ac_delim
+@@ -67888,6 +67991,7 @@ target_vendor!$target_vendor$ac_delim
target_os!$target_os$ac_delim
configdir!$configdir$ac_delim
lockdir!$lockdir$ac_delim
@@ -286,7 +286,7 @@ $NetBSD: patch-at,v 1.8 2007/12/21 17:32:25 drochner Exp $
piddir!$piddir$ac_delim
logfilebase!$logfilebase$ac_delim
privatedir!$privatedir$ac_delim
-@@ -67363,7 +67467,6 @@ IDMAP_LIBS!$IDMAP_LIBS$ac_delim
+@@ -67931,7 +68035,6 @@ IDMAP_LIBS!$IDMAP_LIBS$ac_delim
KRB5_LIBS!$KRB5_LIBS$ac_delim
UUID_LIBS!$UUID_LIBS$ac_delim
LDAP_LIBS!$LDAP_LIBS$ac_delim
@@ -294,7 +294,7 @@ $NetBSD: patch-at,v 1.8 2007/12/21 17:32:25 drochner Exp $
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -67405,6 +67508,7 @@ _ACEOF
+@@ -67973,6 +68076,7 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -302,7 +302,7 @@ $NetBSD: patch-at,v 1.8 2007/12/21 17:32:25 drochner Exp $
INSTALL_PAM_MODULES!$INSTALL_PAM_MODULES$ac_delim
UNINSTALL_PAM_MODULES!$UNINSTALL_PAM_MODULES$ac_delim
NSS_MODULES!$NSS_MODULES$ac_delim
-@@ -67488,7 +67592,7 @@ SMBD_LIBS!$SMBD_LIBS$ac_delim
+@@ -68056,7 +68160,7 @@ SMBD_LIBS!$SMBD_LIBS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
diff --git a/net/samba/patches/patch-au b/net/samba/patches/patch-au
index 2e86390181c..a5c9d7d2449 100644
--- a/net/samba/patches/patch-au
+++ b/net/samba/patches/patch-au
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.8 2007/12/21 17:32:26 drochner Exp $
+$NetBSD: patch-au,v 1.9 2008/04/03 20:19:42 jlam Exp $
---- configure.in.orig 2007-08-20 15:04:51.000000000 +0200
+--- configure.in.orig 2008-03-08 10:56:26.000000000 -0500
+++ configure.in
-@@ -27,6 +27,7 @@ AC_PREFIX_DEFAULT(/usr/local/samba)
+@@ -38,6 +38,7 @@ AC_PREFIX_DEFAULT(/usr/local/samba)
rootsbindir="\${SBINDIR}"
lockdir="\${VARDIR}/locks"
@@ -10,7 +10,7 @@ $NetBSD: patch-au,v 1.8 2007/12/21 17:32:26 drochner Exp $
piddir="\${VARDIR}/locks"
test "${mandir}" || mandir="\${prefix}/man"
logfilebase="\${VARDIR}"
-@@ -40,7 +41,8 @@ AC_ARG_WITH(fhs,
+@@ -51,7 +52,8 @@ AC_ARG_WITH(fhs,
[ --with-fhs Use FHS-compliant paths (default=no)],
[ case "$withval" in
yes)
@@ -20,7 +20,7 @@ $NetBSD: patch-au,v 1.8 2007/12/21 17:32:26 drochner Exp $
piddir="\${VARDIR}/run"
mandir="\${prefix}/share/man"
logfilebase="\${VARDIR}/log/samba"
-@@ -100,6 +102,22 @@ AC_ARG_WITH(lockdir,
+@@ -111,6 +113,22 @@ AC_ARG_WITH(lockdir,
esac])
#################################################
@@ -43,7 +43,7 @@ $NetBSD: patch-au,v 1.8 2007/12/21 17:32:26 drochner Exp $
# set pid directory location
AC_ARG_WITH(piddir,
[ --with-piddir=DIR Where to put pid files ($ac_default_prefix/var/locks)],
-@@ -246,6 +264,7 @@ fi
+@@ -257,6 +275,7 @@ fi
AC_SUBST(configdir)
AC_SUBST(lockdir)
@@ -51,7 +51,7 @@ $NetBSD: patch-au,v 1.8 2007/12/21 17:32:26 drochner Exp $
AC_SUBST(piddir)
AC_SUBST(logfilebase)
AC_SUBST(privatedir)
-@@ -1231,7 +1250,7 @@ AC_CHECK_FUNCS(lstat64 fopen64 atexit gr
+@@ -1242,7 +1261,7 @@ AC_CHECK_FUNCS(lstat64 fopen64 atexit gr
AC_CHECK_FUNCS(fseek64 fseeko64 ftell64 ftello64 setluid getpwanam setlinebuf)
AC_CHECK_FUNCS(opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64)
AC_CHECK_FUNCS(getpwent_r)
@@ -60,7 +60,7 @@ $NetBSD: patch-au,v 1.8 2007/12/21 17:32:26 drochner 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)
-@@ -2823,6 +2842,21 @@ if test x"$samba_cv_HAVE_IFACE_AIX" = x"
+@@ -2834,6 +2853,21 @@ if test x"$samba_cv_HAVE_IFACE_AIX" = x"
fi
if test $iface = no; then
@@ -82,7 +82,7 @@ $NetBSD: patch-au,v 1.8 2007/12/21 17:32:26 drochner Exp $
AC_CACHE_CHECK([for iface ifconf],samba_cv_HAVE_IFACE_IFCONF,[
SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS}"
-@@ -3498,7 +3532,7 @@ if test x"$with_ads_support" != x"no"; t
+@@ -3524,7 +3558,7 @@ if test x"$with_ads_support" != x"no"; t
AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data)
# Heimdal checks.
@@ -91,7 +91,7 @@ $NetBSD: patch-au,v 1.8 2007/12/21 17:32:26 drochner Exp $
AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator)
AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec)
-@@ -5719,31 +5753,39 @@ case "$host_os" in
+@@ -5769,31 +5803,39 @@ case "$host_os" in
NSSSONAMEVERSIONSUFFIX=".2"
WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
;;
@@ -115,7 +115,7 @@ $NetBSD: patch-au,v 1.8 2007/12/21 17:32:26 drochner Exp $
- nsswitch/winbind_nss_netbsd.o \
+ *freebsd*)
+ case "$UNAME_R" in
-+ [5-9]*)
++ [[5-9]]*)
+ # FreeBSD winbind client is implemented as a wrapper
+ # around the Linux version.
+ NSSSONAMEVERSIONSUFFIX=".1"
@@ -131,9 +131,9 @@ $NetBSD: patch-au,v 1.8 2007/12/21 17:32:26 drochner Exp $
+ esac
+ ;;
+
-+ *netbsd*[[3-9]]*)
++ *netbsd*)
+ case "$UNAME_R" in
-+ [3-9]*)
++ [[3-9]]*)
+ # NetBSD winbind client is implemented as a wrapper
+ # around the Linux version. It needs getpwent_r() to
+ # indicate libc's use of the correct nsdispatch API.
diff --git a/net/samba/patches/patch-ax b/net/samba/patches/patch-ax
index 49ffbc37e97..62bcfbf6765 100644
--- a/net/samba/patches/patch-ax
+++ b/net/samba/patches/patch-ax
@@ -1,7 +1,7 @@
-$NetBSD: patch-ax,v 1.2 2006/10/17 05:46:10 rillig Exp $
+$NetBSD: patch-ax,v 1.3 2008/04/03 20:19:42 jlam Exp $
---- script/installscripts.sh.orig 2005-02-25 18:59:43.000000000 +0100
-+++ script/installscripts.sh 2006-10-17 07:12:12.000000000 +0200
+--- script/installscripts.sh.orig 2007-11-14 22:15:04.000000000 -0500
++++ script/installscripts.sh
@@ -12,7 +12,7 @@ echo Installing scripts in $BINDIR
for d in $BINDIR; do
@@ -11,13 +11,3 @@ $NetBSD: patch-ax,v 1.2 2006/10/17 05:46:10 rillig Exp $
if [ ! -d $d ]; then
echo Failed to make directory $d
echo Have you run installbin first?
-@@ -25,8 +25,7 @@ for p in $*; do
- p2=`basename $p`
- echo Installing $BINDIR/$p2
- if [ -f $BINDIR/$p2 ]; then
-- rm -f $BINDIR/$p2.old
-- mv $BINDIR/$p2 $BINDIR/$p2.old
-+ rm -f $BINDIR/$p2
- fi
- cp $p $BINDIR/
- chmod $INSTALLPERMS $BINDIR/$p2
diff --git a/net/samba/patches/patch-ay b/net/samba/patches/patch-ay
index a3807ca1205..04373abad20 100644
--- a/net/samba/patches/patch-ay
+++ b/net/samba/patches/patch-ay
@@ -1,6 +1,6 @@
-$NetBSD: patch-ay,v 1.3 2007/10/28 07:28:48 taca Exp $
+$NetBSD: patch-ay,v 1.4 2008/04/03 20:19:42 jlam Exp $
---- script/installswat.sh.orig 2007-03-01 13:55:02.000000000 +0900
+--- script/installswat.sh.orig 2007-11-14 22:15:04.000000000 -0500
+++ script/installswat.sh
@@ -140,7 +140,7 @@ if [ -d $SRCDIR../docs/htmldocs/ ]; then
@@ -11,21 +11,3 @@ $NetBSD: patch-ay,v 1.3 2007/10/28 07:28:48 taca Exp $
if test ! -d "$INSTALLDIR"; then
echo "Failed to make directory $INSTALLDIR, does $USER have privileges? "
exit 1
-@@ -168,7 +168,7 @@ if [ -d $SRCDIR../docs/htmldocs/ ]; then
-
- if test -d "$SRCDIR../docs/$dir/images/"; then
- if test ! -d "$INSTALLDIR/images/" -a "$mode" = 'install'; then
-- mkdir "$INSTALLDIR/images"
-+ mkdir -p "$INSTALLDIR/images"
- if test ! -d "$INSTALLDIR/images/"; then
- echo "Failed to make directory $INSTALLDIR/images, does $USER have privileges? "
- exit 1
-@@ -204,7 +204,7 @@ if [ "x$BOOKDIR" != "x" -a -f $SRCDIR../
-
- for d in $BOOKDIR $BOOKDIR/figs ; do
- if test ! -d "$d" -a "$mode" = 'install'; then
-- mkdir $d
-+ mkdir -p $d
- if test ! -d "$d"; then
- echo "Failed to make directory $d, does $USER have privileges? "
- exit 1
diff --git a/net/samba/patches/patch-ba b/net/samba/patches/patch-ba
index 1195faaa4c2..402cfe5474f 100644
--- a/net/samba/patches/patch-ba
+++ b/net/samba/patches/patch-ba
@@ -1,16 +1,7 @@
-$NetBSD: patch-ba,v 1.6 2007/11/06 00:47:51 rillig Exp $
+$NetBSD: patch-ba,v 1.7 2008/04/03 20:19:42 jlam Exp $
---- Makefile.in.orig 2007-06-20 02:11:39.000000000 +0900
+--- Makefile.in.orig 2008-03-08 10:56:26.000000000 -0500
+++ Makefile.in
-@@ -81,7 +81,7 @@ AUTHLIBDIR = $(LIBDIR)/auth
- CONFIGLIBDIR = $(LIBDIR)/config
- CONFIGDIR = @configdir@
- VARDIR = @localstatedir@
--MANDIR = @mandir@
-+MANDIR = @mandir@
- DATADIR = @datadir@
-
- # The permissions to give the executables
@@ -106,6 +106,9 @@ SWATDIR = @swatdir@
# the directory where lock files go
LOCKDIR = @lockdir@
@@ -77,6 +68,15 @@ $NetBSD: patch-ba,v 1.6 2007/11/06 00:47:51 rillig Exp $
bin/tdbbackup@EXEEXT@: proto_exists $(TDBBACKUP_OBJ) bin/.dummy
@echo Linking $@
+@@ -1566,7 +1569,7 @@ bin/timelimit@EXEEXT@: script/tests/time
+ @echo Linking $@
+ @$(CC) $(FLAGS) -o $@ $(DYNEXP) script/tests/timelimit.o
+
+-install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@
++install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ @INSTALL_LIBSMBSHAREMODES@ @INSTALL_LIBADDNS@
+
+
+ install-everything: install installmodules
@@ -1580,7 +1583,7 @@ install-everything: install installmodul
# is not used
@@ -97,7 +97,7 @@ $NetBSD: patch-ba,v 1.6 2007/11/06 00:47:51 rillig Exp $
@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(CHARSETLIBDIR) $(CHARSET_MODULES)
@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(AUTHLIBDIR) $(AUTH_MODULES)
@$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) ldapsam.@SHLIBEXT@ ldapsam_compat.@SHLIBEXT@
-@@ -1704,6 +1709,7 @@ showlayout:
+@@ -1705,6 +1710,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 fcba609271e..03222dcebd7 100644
--- a/net/samba/patches/patch-be
+++ b/net/samba/patches/patch-be
@@ -1,6 +1,6 @@
-$NetBSD: patch-be,v 1.3 2007/10/28 07:28:48 taca Exp $
+$NetBSD: patch-be,v 1.4 2008/04/03 20:19:42 jlam Exp $
---- nmbd/nmbd_winsserver.c.orig 2007-06-26 10:16:47.000000000 +0900
+--- nmbd/nmbd_winsserver.c.orig 2008-03-08 10:33:35.000000000 -0500
+++ nmbd/nmbd_winsserver.c
@@ -574,7 +574,7 @@ BOOL initialise_wins(void)
}
@@ -11,6 +11,15 @@ $NetBSD: patch-be,v 1.3 2007/10/28 07:28:48 taca Exp $
if (!wins_tdb) {
DEBUG(0,("initialise_wins: failed to open wins.tdb. Error was %s\n",
strerror(errno) ));
+@@ -585,7 +585,7 @@ BOOL initialise_wins(void)
+
+ add_samba_names_to_subnet(wins_server_subnet);
+
+- if((fp = x_fopen(lock_path(WINS_LIST),O_RDONLY,0)) == NULL) {
++ if((fp = x_fopen(state_path(WINS_LIST),O_RDONLY,0)) == NULL) {
+ DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
+ WINS_LIST, strerror(errno) ));
+ return True;
@@ -2338,7 +2338,7 @@ void wins_write_database(time_t t, BOOL
}
}
diff --git a/net/samba/patches/patch-bo b/net/samba/patches/patch-bo
index 83505ee7fb3..4bafb3b7493 100644
--- a/net/samba/patches/patch-bo
+++ b/net/samba/patches/patch-bo
@@ -1,8 +1,8 @@
-$NetBSD: patch-bo,v 1.4 2007/10/28 07:28:49 taca Exp $
+$NetBSD: patch-bo,v 1.5 2008/04/03 20:19:42 jlam Exp $
---- nmbd/nmbd.c.orig 2007-03-01 13:54:45.000000000 +0900
+--- nmbd/nmbd.c.orig 2008-03-08 10:56:27.000000000 -0500
+++ nmbd/nmbd.c
-@@ -743,6 +743,10 @@ static BOOL open_sockets(BOOL isdaemon,
+@@ -757,6 +757,10 @@ static BOOL open_sockets(BOOL isdaemon,
mkdir(lp_lockdir(), 0755);
}
diff --git a/net/samba/patches/patch-br b/net/samba/patches/patch-br
index 8bf29f034fd..bc3d1ea7b04 100644
--- a/net/samba/patches/patch-br
+++ b/net/samba/patches/patch-br
@@ -1,8 +1,8 @@
-$NetBSD: patch-br,v 1.3 2007/10/28 07:28:49 taca Exp $
+$NetBSD: patch-br,v 1.4 2008/04/03 20:19:42 jlam Exp $
---- lib/util.c.orig 2007-08-20 22:04:50.000000000 +0900
+--- lib/util.c.orig 2008-03-08 10:33:34.000000000 -0500
+++ lib/util.c
-@@ -2597,6 +2597,26 @@ char *lock_path(const char *name)
+@@ -2598,6 +2598,26 @@ char *lock_path(const char *name)
}
/*****************************************************************
diff --git a/net/samba/patches/patch-bs b/net/samba/patches/patch-bs
index 7dcd17fe4f8..28337f397ea 100644
--- a/net/samba/patches/patch-bs
+++ b/net/samba/patches/patch-bs
@@ -1,6 +1,6 @@
-$NetBSD: patch-bs,v 1.4 2007/10/28 07:28:49 taca Exp $
+$NetBSD: patch-bs,v 1.5 2008/04/03 20:19:42 jlam Exp $
---- param/loadparm.c.orig 2007-09-11 23:17:48.000000000 +0900
+--- param/loadparm.c.orig 2008-03-08 10:56:27.000000000 -0500
+++ param/loadparm.c
@@ -109,6 +109,7 @@ typedef struct {
char *szDeletePrinterCommand;
@@ -10,7 +10,7 @@ $NetBSD: patch-bs,v 1.4 2007/10/28 07:28:49 taca Exp $
char *szPidDir;
char *szRootdir;
char *szDefaultService;
-@@ -274,6 +275,7 @@ typedef struct {
+@@ -276,6 +277,7 @@ typedef struct {
BOOL bUnixPasswdSync;
BOOL bPasswdChatDebug;
int iPasswdChatTimeout;
@@ -18,7 +18,7 @@ $NetBSD: patch-bs,v 1.4 2007/10/28 07:28:49 taca Exp $
BOOL bTimestampLogs;
BOOL bNTSmbSupport;
BOOL bNTPipeSupport;
-@@ -880,6 +882,7 @@ static struct parm_struct parm_table[] =
+@@ -890,6 +892,7 @@ static struct parm_struct parm_table[] =
{"passwd chat", P_STRING, P_GLOBAL, &Globals.szPasswdChat, NULL, NULL, FLAG_ADVANCED},
{"passwd chat debug", P_BOOL, P_GLOBAL, &Globals.bPasswdChatDebug, NULL, NULL, FLAG_ADVANCED},
{"passwd chat timeout", P_INTEGER, P_GLOBAL, &Globals.iPasswdChatTimeout, NULL, NULL, FLAG_ADVANCED},
@@ -26,7 +26,7 @@ $NetBSD: patch-bs,v 1.4 2007/10/28 07:28:49 taca Exp $
{"check password script", P_STRING, P_GLOBAL, &Globals.szCheckPasswordScript, NULL, NULL, FLAG_ADVANCED},
{"username map", P_STRING, P_GLOBAL, &Globals.szUsernameMap, NULL, NULL, FLAG_ADVANCED},
{"password level", P_INTEGER, P_GLOBAL, &Globals.pwordlevel, NULL, NULL, FLAG_ADVANCED},
-@@ -1196,6 +1199,7 @@ static struct parm_struct parm_table[] =
+@@ -1212,6 +1215,7 @@ static struct parm_struct parm_table[] =
{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED},
{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED},
{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE},
@@ -34,7 +34,7 @@ $NetBSD: patch-bs,v 1.4 2007/10/28 07:28:49 taca Exp $
{"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED},
#ifdef WITH_UTMP
{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED},
-@@ -1460,6 +1464,7 @@ static void init_globals(BOOL first_time
+@@ -1476,6 +1480,7 @@ static void init_globals(BOOL first_time
string_set(&Globals.szPasswdProgram, "");
string_set(&Globals.szPidDir, dyn_PIDDIR);
string_set(&Globals.szLockDir, dyn_LOCKDIR);
@@ -42,7 +42,7 @@ $NetBSD: patch-bs,v 1.4 2007/10/28 07:28:49 taca Exp $
string_set(&Globals.szSocketAddress, "0.0.0.0");
pstrcpy(s, "Samba ");
pstrcat(s, SAMBA_VERSION_STRING);
-@@ -1543,6 +1548,7 @@ static void init_globals(BOOL first_time
+@@ -1559,6 +1564,7 @@ static void init_globals(BOOL first_time
Globals.bPamPasswordChange = False;
Globals.bPasswdChatDebug = False;
Globals.iPasswdChatTimeout = 2; /* 2 second default. */
@@ -50,7 +50,7 @@ $NetBSD: patch-bs,v 1.4 2007/10/28 07:28:49 taca 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 */
-@@ -1787,6 +1793,7 @@ FN_GLOBAL_STRING(lp_addprinter_cmd, &Glo
+@@ -1806,6 +1812,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.4 2007/10/28 07:28:49 taca 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)
-@@ -1958,6 +1965,7 @@ FN_GLOBAL_BOOL(lp_pam_password_change, &
+@@ -1979,6 +1986,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-ca b/net/samba/patches/patch-ca
index 9c9640be625..eca32c9f7bb 100644
--- a/net/samba/patches/patch-ca
+++ b/net/samba/patches/patch-ca
@@ -1,11 +1,11 @@
-$NetBSD: patch-ca,v 1.4 2007/10/28 07:28:50 taca Exp $
+$NetBSD: patch-ca,v 1.5 2008/04/03 20:19:42 jlam Exp $
---- VERSION.orig 2007-09-11 23:17:48.000000000 +0900
+--- VERSION.orig 2008-03-08 10:56:26.000000000 -0500
+++ VERSION
-@@ -95,5 +95,5 @@ SAMBA_VERSION_IS_SVN_SNAPSHOT=
+@@ -95,5 +95,5 @@ SAMBA_VERSION_IS_GIT_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=
+ SAMBA_VERSION_VENDOR_PATCH=
diff --git a/net/samba/patches/patch-db b/net/samba/patches/patch-db
new file mode 100644
index 00000000000..81162a39d3b
--- /dev/null
+++ b/net/samba/patches/patch-db
@@ -0,0 +1,15 @@
+$NetBSD: patch-db,v 1.1 2008/04/03 20:19:42 jlam Exp $
+
+--- include/includes.h.orig 2008-03-08 10:56:26.000000000 -0500
++++ include/includes.h
+@@ -224,6 +224,10 @@ typedef int ber_int_t;
+ #include <sys/attributes.h>
+ #endif
+
++#if !defined(ENOATTR) && !defined(ENODATA)
++#define ENOATTR EAGAIN
++#endif
++
+ #ifndef ENOATTR
+ #define ENOATTR ENODATA
+ #endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-20 20:33:47 +0000