diff options
author | asau <asau@pkgsrc.org> | 2011-12-16 22:32:06 +0000 |
---|---|---|
committer | asau <asau@pkgsrc.org> | 2011-12-16 22:32:06 +0000 |
commit | 3528386084c700defca36f000475f23e0edd3ea3 (patch) | |
tree | c59d48f913df3d7f9c8defb513dbe8c6b4d59cb3 /net | |
parent | 5d41fd5b4a061b6e9db65d0c7d67ddc6e181fa62 (diff) | |
download | pkgsrc-3528386084c700defca36f000475f23e0edd3ea3.tar.gz |
Update to Samba 3.6.1
Major enhancements in Samba 3.6.1 include:
o Fix smbd crashes triggered by Windows XP clients (bug #8384).
o Fix a Winbind race leading to 100% CPU load (bug #8409).
o Several SMB2 fixes.
o The VFS ACL modules are no longer experimental but production-ready.
Full release notes at http://www.samba.org/samba/history/samba-3.6.1.html
Major enhancements in Samba 3.6.0 include:
- Changed security defaults:
client ntlmv2 auth = yes
client use spnego principal = no
send spnego principal = no
- SMB2 support (fully functional with one omission)
- Internal Winbind passdb changes
- New Spoolss code
- ID Mapping Changes
- Endpoint Mapper
- Internal restructuring
- SMB Traffic Analyzer (http://holger123.wordpress.com/smb-traffic-analyzer/)
- NFS quota backend on Linux
Full release notes at http://www.samba.org/samba/history/samba-3.6.0.html
Diffstat (limited to 'net')
-rw-r--r-- | net/samba/Makefile | 9 | ||||
-rw-r--r-- | net/samba/PLIST | 45 | ||||
-rw-r--r-- | net/samba/distinfo | 21 | ||||
-rw-r--r-- | net/samba/patches/patch-af | 59 | ||||
-rw-r--r-- | net/samba/patches/patch-ag | 20 | ||||
-rw-r--r-- | net/samba/patches/patch-ah | 14 | ||||
-rw-r--r-- | net/samba/patches/patch-aj | 10 | ||||
-rw-r--r-- | net/samba/patches/patch-al | 20 | ||||
-rw-r--r-- | net/samba/patches/patch-am | 44 | ||||
-rw-r--r-- | net/samba/patches/patch-ap | 15 |
10 files changed, 110 insertions, 147 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index b0483e556d2..2fe4fb11962 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.205 2011/12/16 11:05:24 asau Exp $ +# $NetBSD: Makefile,v 1.206 2011/12/16 22:32:06 asau Exp $ .include "../../net/samba/Makefile.mirrors" DISTNAME= samba-${VERSION} -PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${SAMBA_MIRRORS:=stable/} @@ -12,7 +11,7 @@ HOMEPAGE= http://www.samba.org/ COMMENT= SMB/CIFS protocol server suite LICENSE= gnu-gpl-v3 -VERSION= 3.5.11 +VERSION= 3.6.1 CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]* PKG_DESTDIR_SUPPORT= user-destdir @@ -141,9 +140,9 @@ post-install: ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/tr/include ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/tr/js ${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/gpext - ${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/idmap + ${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/nss_info ${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/pdb - ${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/rpc + ${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/perfcount set -e ; cd ${WRKDIR}/${DISTNAME}/docs/registry; for f in *.reg; do \ ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/${DOCDIR}/$${f}; \ done diff --git a/net/samba/PLIST b/net/samba/PLIST index ce03bb42a23..643666fe2e7 100644 --- a/net/samba/PLIST +++ b/net/samba/PLIST @@ -1,12 +1,6 @@ -@comment $NetBSD: PLIST,v 1.45 2011/12/16 11:05:24 asau Exp $ +@comment $NetBSD: PLIST,v 1.46 2011/12/16 22:32:06 asau Exp $ bin/eventlogadm bin/findsmb -bin/ldbadd -bin/ldbdel -bin/ldbedit -bin/ldbmodify -bin/ldbrename -bin/ldbsearch bin/net bin/nmblookup bin/ntlm_auth @@ -22,10 +16,12 @@ bin/smbget bin/smbpasswd bin/smbspool bin/smbstatus +bin/smbta-util bin/smbtar bin/smbtree bin/tdbbackup bin/tdbdump +bin/tdbrestore bin/tdbtool bin/testparm ${PLIST.winbind}bin/wbinfo @@ -35,7 +31,6 @@ include/smb_share_modes.h include/talloc.h include/tdb.h ${PLIST.winbind}include/wbclient.h -${PLIST.winbind}include/wbc_async.h lib/libnetapi.${LIBEXT} lib/libnetapi.${LIBEXT}.0 lib/libsmbclient.${LIBEXT} @@ -44,8 +39,10 @@ lib/libsmbsharemodes.${LIBEXT} lib/libsmbsharemodes.${LIBEXT}.0 lib/libtalloc.${LIBEXT} lib/libtalloc.${LIBEXT}.2 +lib/libtalloc.${LIBEXT}.2.0.5 lib/libtdb.${LIBEXT} lib/libtdb.${LIBEXT}.1 +lib/libtdb.${LIBEXT}.1.2.9 ${PLIST.winbind}lib/libwbclient.${LIBEXT} ${PLIST.winbind}lib/libwbclient.${LIBEXT}.0 ${PLIST.winbind}lib/nss_winbind.${LIBEXT}.0 @@ -57,6 +54,7 @@ lib/samba/de.msg lib/samba/en.msg lib/samba/fi.msg lib/samba/fr.msg +lib/samba/idmap/autorid.${LIBEXT} lib/samba/it.msg lib/samba/ja.msg lib/samba/lowcase.dat @@ -71,11 +69,13 @@ lib/samba/vfs/acl_xattr.${LIBEXT} lib/samba/vfs/audit.${LIBEXT} lib/samba/vfs/cap.${LIBEXT} lib/samba/vfs/catia.${LIBEXT} +lib/samba/vfs/crossrename.${LIBEXT} lib/samba/vfs/default_quota.${LIBEXT} lib/samba/vfs/expand_msdfs.${LIBEXT} lib/samba/vfs/extd_audit.${LIBEXT} lib/samba/vfs/fake_perms.${LIBEXT} lib/samba/vfs/full_audit.${LIBEXT} +lib/samba/vfs/linux_xfs_sgid.${LIBEXT} lib/samba/vfs/netatalk.${LIBEXT} ${PLIST.fam}lib/samba/vfs/notify_fam.${LIBEXT} lib/samba/vfs/preopen.${LIBEXT} @@ -88,17 +88,12 @@ lib/samba/vfs/shadow_copy2.${LIBEXT} lib/samba/vfs/smb_traffic_analyzer.${LIBEXT} lib/samba/vfs/streams_depot.${LIBEXT} lib/samba/vfs/streams_xattr.${LIBEXT} +lib/samba/vfs/time_audit.${LIBEXT} lib/samba/vfs/xattr_tdb.${LIBEXT} ${PLIST.pam}lib/security/pam_smbpass.${LIBEXT} ${PLIST.pam}${PLIST.winbind}lib/security/pam_winbind.${LIBEXT} ${PLIST.cups}libexec/cups/backend/smb man/man1/findsmb.1 -man/man1/ldbadd.1 -man/man1/ldbdel.1 -man/man1/ldbedit.1 -man/man1/ldbmodify.1 -man/man1/ldbrename.1 -man/man1/ldbsearch.1 man/man1/log2pcap.1 man/man1/nmblookup.1 man/man1/ntlm_auth.1 @@ -127,13 +122,13 @@ man/man7/winbind_krb5_locator.7 man/man8/eventlogadm.8 man/man8/idmap_ad.8 man/man8/idmap_adex.8 +man/man8/idmap_autorid.8 man/man8/idmap_hash.8 man/man8/idmap_ldap.8 man/man8/idmap_nss.8 man/man8/idmap_rid.8 man/man8/idmap_tdb.8 man/man8/idmap_tdb2.8 -man/man8/mount.cifs.8 man/man8/net.8 man/man8/nmbd.8 man/man8/pam_winbind.8 @@ -141,18 +136,20 @@ man/man8/pdbedit.8 man/man8/smbd.8 man/man8/smbpasswd.8 man/man8/smbspool.8 +man/man8/smbta-util.8 man/man8/swat.8 man/man8/tdbbackup.8 man/man8/tdbdump.8 man/man8/tdbtool.8 -man/man8/umount.cifs.8 man/man8/vfs_acl_tdb.8 man/man8/vfs_acl_xattr.8 +man/man8/vfs_aio_fork.8 man/man8/vfs_audit.8 man/man8/vfs_cacheprime.8 man/man8/vfs_cap.8 man/man8/vfs_catia.8 man/man8/vfs_commit.8 +man/man8/vfs_crossrename.8 man/man8/vfs_default_quota.8 man/man8/vfs_dirsort.8 man/man8/vfs_extd_audit.8 @@ -173,6 +170,7 @@ man/man8/vfs_shadow_copy2.8 man/man8/vfs_smb_traffic_analyzer.8 man/man8/vfs_streams_depot.8 man/man8/vfs_streams_xattr.8 +man/man8/vfs_time_audit.8 man/man8/vfs_xattr_tdb.8 man/man8/winbindd.8 ${PLIST.cifsmount}sbin/mount.cifs @@ -344,11 +342,11 @@ share/samba/swat/help/Samba3-HOWTO/type.html share/samba/swat/help/Samba3-HOWTO/unicode.html share/samba/swat/help/Samba3-HOWTO/upgrading-to-3.0.html share/samba/swat/help/Samba3-HOWTO/winbind.html -share/samba/swat/help/manpages/cifs.upcall.8.html share/samba/swat/help/manpages/eventlogadm.8.html share/samba/swat/help/manpages/findsmb.1.html share/samba/swat/help/manpages/idmap_ad.8.html share/samba/swat/help/manpages/idmap_adex.8.html +share/samba/swat/help/manpages/idmap_autorid.8.html share/samba/swat/help/manpages/idmap_hash.8.html share/samba/swat/help/manpages/idmap_ldap.8.html share/samba/swat/help/manpages/idmap_nss.8.html @@ -356,17 +354,9 @@ share/samba/swat/help/manpages/idmap_rid.8.html share/samba/swat/help/manpages/idmap_tdb.8.html share/samba/swat/help/manpages/idmap_tdb2.8.html share/samba/swat/help/manpages/index.html -share/samba/swat/help/manpages/ldb.3.html -share/samba/swat/help/manpages/ldbadd.1.html -share/samba/swat/help/manpages/ldbdel.1.html -share/samba/swat/help/manpages/ldbedit.1.html -share/samba/swat/help/manpages/ldbmodify.1.html -share/samba/swat/help/manpages/ldbrename.1.html -share/samba/swat/help/manpages/ldbsearch.1.html share/samba/swat/help/manpages/libsmbclient.7.html share/samba/swat/help/manpages/lmhosts.5.html share/samba/swat/help/manpages/log2pcap.1.html -share/samba/swat/help/manpages/mount.cifs.8.html share/samba/swat/help/manpages/net.8.html share/samba/swat/help/manpages/nmbd.8.html share/samba/swat/help/manpages/nmblookup.1.html @@ -390,6 +380,7 @@ share/samba/swat/help/manpages/smbpasswd.5.html share/samba/swat/help/manpages/smbpasswd.8.html share/samba/swat/help/manpages/smbspool.8.html share/samba/swat/help/manpages/smbstatus.1.html +share/samba/swat/help/manpages/smbta-util.8.html share/samba/swat/help/manpages/smbtar.1.html share/samba/swat/help/manpages/smbtree.1.html share/samba/swat/help/manpages/swat.8.html @@ -397,14 +388,15 @@ share/samba/swat/help/manpages/tdbbackup.8.html 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/vfs_acl_tdb.8.html share/samba/swat/help/manpages/vfs_acl_xattr.8.html +share/samba/swat/help/manpages/vfs_aio_fork.8.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 share/samba/swat/help/manpages/vfs_catia.8.html share/samba/swat/help/manpages/vfs_commit.8.html +share/samba/swat/help/manpages/vfs_crossrename.8.html share/samba/swat/help/manpages/vfs_default_quota.8.html share/samba/swat/help/manpages/vfs_dirsort.8.html share/samba/swat/help/manpages/vfs_extd_audit.8.html @@ -425,6 +417,7 @@ share/samba/swat/help/manpages/vfs_shadow_copy2.8.html share/samba/swat/help/manpages/vfs_smb_traffic_analyzer.8.html share/samba/swat/help/manpages/vfs_streams_depot.8.html share/samba/swat/help/manpages/vfs_streams_xattr.8.html +share/samba/swat/help/manpages/vfs_time_audit.8.html share/samba/swat/help/manpages/vfs_xattr_tdb.8.html share/samba/swat/help/manpages/vfstest.1.html share/samba/swat/help/manpages/wbinfo.1.html diff --git a/net/samba/distinfo b/net/samba/distinfo index 5976a324ce2..17d8d10585b 100644 --- a/net/samba/distinfo +++ b/net/samba/distinfo @@ -1,24 +1,23 @@ -$NetBSD: distinfo,v 1.77 2011/12/16 11:05:24 asau Exp $ +$NetBSD: distinfo,v 1.78 2011/12/16 22:32:06 asau Exp $ -SHA1 (samba-3.5.11.tar.gz) = 0801871ab6a11f7d8eb8bf32ff0b87896d263441 -RMD160 (samba-3.5.11.tar.gz) = b3ee1e044e9df417b0dcaf954a6a137db742cba3 -Size (samba-3.5.11.tar.gz) = 30752782 bytes +SHA1 (samba-3.6.1.tar.gz) = fed82fd92958f3209edb3c71321d4b48abee9c4b +RMD160 (samba-3.6.1.tar.gz) = 6ed44e66b22cef00168831fa7ed13571fd5e45ed +Size (samba-3.6.1.tar.gz) = 28984820 bytes SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567 SHA1 (patch-ac) = 5b1c0fdb781cb75f81af71ed2695144d4a35e032 SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971 SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958 -SHA1 (patch-af) = 275cb3b20d6fe9f000ba3c51bc9450a428e782cb -SHA1 (patch-ag) = 92fd576c4b05a913051925e461cde9f5a2f2d6bf -SHA1 (patch-ah) = 6142078efec4263124aa793108c43eef0ce61da4 +SHA1 (patch-af) = 0c40e9ead1c3aba58448dd0a35669de598e543b7 +SHA1 (patch-ag) = d84aeab73f22e372f0d275276f4a1160b240199c +SHA1 (patch-ah) = a75ab50dbdb2de48915e55e43d06e713275b23e2 SHA1 (patch-ai) = 0a12dcfabcab7986968493d5f06701d06c3d5386 -SHA1 (patch-aj) = aecf98cf53e6bf6890e0fc9a40e6936df5f20a1a +SHA1 (patch-aj) = c83d02c15bcb359809c4558885a706cd5c1a686b SHA1 (patch-ak) = cb51a96310eb7dde14351e4f12b68ce8d52c92c3 -SHA1 (patch-al) = f347808c376922da057256d3614a34b556721a66 -SHA1 (patch-am) = 13744f8a5cce3016c37002079eba3c47077e8d6d +SHA1 (patch-al) = 20f587b38f5f7a9afefa9863868e9b275d37c454 +SHA1 (patch-am) = c4054a6923c2a599f3c9e56a06dbde2b8fc59335 SHA1 (patch-an) = a9b31b791d979a1062006bbe55375aaab69210a1 SHA1 (patch-ao) = bc31d3003bdaad141652daff2e0b6b3cafcee8c1 -SHA1 (patch-ap) = 3a47d212b1c29a6b3c46b83903c4f011c28a8c3c SHA1 (patch-aq) = c3d1a3045364bebaa6c90967837907bd1de0964b SHA1 (patch-ar) = 5213b0a3d95d106939c2e268a8538c5e2901079a SHA1 (patch-as) = a9fcb1813d55d598bf1226cf004de85701c93e61 diff --git a/net/samba/patches/patch-af b/net/samba/patches/patch-af index 58232d59d82..011b5071587 100644 --- a/net/samba/patches/patch-af +++ b/net/samba/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.9 2011/12/16 11:05:24 asau Exp $ +$NetBSD: patch-af,v 1.10 2011/12/16 22:32:06 asau Exp $ ---- configure.orig 2011-08-03 18:25:14.000000000 +0000 -+++ configure -@@ -18345,6 +18345,7 @@ $as_echo "#define DARWINOS 1" >>confdefs +--- configure.orig 2011-08-09 15:35:40.000000000 +0400 ++++ configure 2011-08-23 16:12:22.000000000 +0400 +@@ -19397,6 +19397,7 @@ BLDSHARED="true" LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress" @@ -10,16 +10,34 @@ $NetBSD: patch-af,v 1.9 2011/12/16 11:05:24 asau Exp $ CFLAGS="$CFLAGS -fno-common" SHLD="\${CC}" SHLIBEXT="dylib" -@@ -18381,7 +18382,7 @@ fi - $as_echo "$BLDSHARED" >&6; } +@@ -19446,7 +19447,7 @@ - saved_before_as_needed_ldflags="$LDFLAGS" --for flags in "-Wl,--as-needed" "-Wl,-z,ignore" "-z ignore" ; do -+for flags in "-Wl,-z,ignore" "-z ignore" ; do + if test "x$enable_as_needed" != xno; then + saved_before_as_needed_ldflags="$LDFLAGS" +- for flags in "-Wl,--as-needed" "-Wl,-z,ignore" "-z ignore" ; do ++ for flags in "-Wl,-z,ignore" "-z ignore" ; do saved_ldflags="$LDFLAGS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $flags works" >&5 $as_echo_n "checking if $flags works... " >&6; } -@@ -25355,9 +25356,9 @@ LIBS="-lcrypto $KRB5_LIBS $LIBS" +@@ -20152,7 +20153,7 @@ + + fi + +- if test x"$USESHARED" == x"no" ; then ++ if test x"$USESHARED" = x"no" ; then + LINK_LIBTALLOC=STATIC + fi + LIBTALLOCVERSION=`grep ^VERSION ${tallocdir}/wscript | sed -e "s/'//g" -e 's/.* //'` +@@ -20489,7 +20490,7 @@ + + fi + +- if test x"$USESHARED" == x"no" ; then ++ if test x"$USESHARED" = x"no" ; then + LINK_LIBTDB=STATIC + fi + LIBTDBVERSION=`grep ^VERSION ${tdbdir}/wscript | sed -e "s/'//g" -e 's/.* //'` +@@ -26219,9 +26220,9 @@ @@ -32,7 +50,7 @@ $NetBSD: patch-af,v 1.9 2011/12/16 11:05:24 asau Exp $ $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -25369,31 +25370,31 @@ else +@@ -26233,31 +26234,31 @@ #ifdef __cplusplus extern "C" #endif @@ -72,7 +90,7 @@ $NetBSD: patch-af,v 1.9 2011/12/16 11:05:24 asau Exp $ _ACEOF fi -@@ -34506,31 +34507,39 @@ case "$host_os" in +@@ -35632,31 +35633,39 @@ NSSSONAMEVERSIONSUFFIX=".2" WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o" ;; @@ -134,20 +152,3 @@ $NetBSD: patch-af,v 1.9 2011/12/16 11:05:24 asau Exp $ ;; *irix*) # IRIX has differently named shared libraries -@@ -34728,6 +34737,16 @@ $as_echo "#define HAVE_PASSWD_PW_AGE 1" - - fi - -+# NetBSD -+ -+ac_fn_c_check_member "$LINENO" "struct passwd" "pw_class" "ac_cv_member_struct_passwd_pw_class" "#include <pwd.h> -+" -+if test "x$ac_cv_member_struct_passwd_pw_class" = x""yes; then : -+ -+$as_echo "#define HAVE_PASSWD_PW_CLASS 1" >>confdefs.h -+ -+fi -+ - - # AIX 4.3.x and 5.1 do not have as many members in - # struct secmethod_table as AIX 5.2 diff --git a/net/samba/patches/patch-ag b/net/samba/patches/patch-ag index 0e9c8127c85..7e4c17242c2 100644 --- a/net/samba/patches/patch-ag +++ b/net/samba/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.8 2011/12/16 11:05:24 asau Exp $ +$NetBSD: patch-ag,v 1.9 2011/12/16 22:32:06 asau Exp $ ---- registry/regfio.c.orig 2010-12-05 16:01:50.000000000 +0000 -+++ registry/regfio.c -@@ -480,7 +480,7 @@ static REGF_HBIN* read_hbin_block( REGF_ +--- registry/regfio.c.orig 2011-08-09 15:17:47.000000000 +0400 ++++ registry/regfio.c 2011-08-23 16:02:29.000000000 +0400 +@@ -521,7 +521,7 @@ /* remember that the record_size is in the 4 bytes preceeding the record itself */ if ( !prs_set_offset( &hbin->ps, file->data_offset+HBIN_HDR_SIZE-sizeof(uint32) ) ) @@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.8 2011/12/16 11:05:24 asau Exp $ record_size = 0; header = 0; -@@ -503,12 +503,12 @@ static REGF_HBIN* read_hbin_block( REGF_ +@@ -544,12 +544,12 @@ } if ( !prs_set_offset( &hbin->ps, curr_off) ) @@ -27,7 +27,7 @@ $NetBSD: patch-ag,v 1.8 2011/12/16 11:05:24 asau Exp $ SMB_ASSERT( record_size != 0 ); -@@ -532,7 +532,7 @@ static REGF_HBIN* read_hbin_block( REGF_ +@@ -573,7 +573,7 @@ DEBUG(10,("read_hbin_block: free space offset == 0x%x\n", hbin->free_off)); if ( !prs_set_offset( &hbin->ps, file->data_offset+HBIN_HDR_SIZE ) ) @@ -36,7 +36,7 @@ $NetBSD: patch-ag,v 1.8 2011/12/16 11:05:24 asau Exp $ return hbin; } -@@ -1557,7 +1557,7 @@ done: +@@ -1598,7 +1598,7 @@ for the record */ if ( !prs_uint32("allocated_size", &hbin->ps, 0, &size) ) @@ -45,8 +45,8 @@ $NetBSD: patch-ag,v 1.8 2011/12/16 11:05:24 asau Exp $ update_free_space( hbin, size ); -@@ -1771,7 +1771,7 @@ static int hashrec_cmp( REGF_HASH_REC *h - qsort( parent->subkeys.hashes, parent->subkey_index, sizeof(REGF_HASH_REC), QSORT_CAST hashrec_cmp ); +@@ -1811,7 +1811,7 @@ + TYPESAFE_QSORT(parent->subkeys.hashes, parent->subkey_index, hashrec_cmp); if ( !hbin_prs_lf_records( "lf_rec", parent->subkeys.hbin, 0, parent ) ) - return False; @@ -54,7 +54,7 @@ $NetBSD: patch-ag,v 1.8 2011/12/16 11:05:24 asau Exp $ } /* write the security descriptor */ -@@ -1923,11 +1923,11 @@ static int hashrec_cmp( REGF_HASH_REC *h +@@ -1963,11 +1963,11 @@ prs_set_offset( &nk->hbin->ps, nk->hbin_off ); if ( !prs_nk_rec( "nk_rec", &nk->hbin->ps, 0, nk ) ) diff --git a/net/samba/patches/patch-ah b/net/samba/patches/patch-ah index 7c4e0edcd6a..f2793bf32a2 100644 --- a/net/samba/patches/patch-ah +++ b/net/samba/patches/patch-ah @@ -1,11 +1,11 @@ -$NetBSD: patch-ah,v 1.5 2011/12/16 11:05:24 asau Exp $ +$NetBSD: patch-ah,v 1.6 2011/12/16 22:32:06 asau Exp $ ---- libsmb/cliconnect.c.orig 2010-12-05 16:06:50.000000000 +0000 -+++ libsmb/cliconnect.c -@@ -2555,7 +2555,7 @@ struct cli_state *get_ipc_connect_master - if (!NT_STATUS_IS_OK(name_resolve_bcast(MSBROWSE, 1, &ip_list, - &count))) { - DEBUG(99, ("No master browsers responded\n")); +--- libsmb/cliconnect.c.orig 2011-08-09 15:17:47.000000000 +0400 ++++ libsmb/cliconnect.c 2011-08-23 16:04:27.000000000 +0400 +@@ -3523,7 +3523,7 @@ + if (!NT_STATUS_IS_OK(status)) { + DEBUG(99, ("No master browsers responded: %s\n", + nt_errstr(status))); - return False; + return NULL; } diff --git a/net/samba/patches/patch-aj b/net/samba/patches/patch-aj index d99b94acd79..1319f9014c8 100644 --- a/net/samba/patches/patch-aj +++ b/net/samba/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.5 2011/12/16 11:05:24 asau Exp $ +$NetBSD: patch-aj,v 1.6 2011/12/16 22:32:06 asau Exp $ ---- smbd/dir.c.orig 2010-12-05 20:59:48.000000000 +0000 -+++ smbd/dir.c -@@ -193,7 +193,7 @@ static struct dptr_struct *dptr_get(stru +--- smbd/dir.c.orig 2011-08-09 15:17:47.000000000 +0400 ++++ smbd/dir.c 2011-08-23 16:05:42.000000000 +0400 +@@ -200,7 +200,7 @@ dptr->wcard, dptr->attr))) { DEBUG(4,("dptr_get: Failed to open %s (%s)\n",dptr->path, strerror(errno))); @@ -10,4 +10,4 @@ $NetBSD: patch-aj,v 1.5 2011/12/16 11:05:24 asau Exp $ + return NULL; } } - DLIST_PROMOTE(sconn->smb1.searches.dirptrs,dptr); + DLIST_PROMOTE(sconn->searches.dirptrs,dptr); diff --git a/net/samba/patches/patch-al b/net/samba/patches/patch-al index e0c0d3e1659..0bfcbec8c9d 100644 --- a/net/samba/patches/patch-al +++ b/net/samba/patches/patch-al @@ -1,19 +1 @@ -$NetBSD: patch-al,v 1.7 2011/12/16 11:05:24 asau Exp $ - ---- lib/ldb/tests/test-schema.sh.orig 2010-01-14 10:12:10.000000000 +0000 -+++ lib/ldb/tests/test-schema.sh -@@ -19,12 +19,12 @@ $VALGRIND bin/ldbmodify $LDBDIR/tests/sc - $VALGRIND bin/ldbmodify $LDBDIR/tests/schema-tests/schema-mod-test-2.ldif || exit 1 - $VALGRIND bin/ldbmodify $LDBDIR/tests/schema-tests/schema-mod-test-3.ldif || exit 1 - $VALGRIND bin/ldbmodify $LDBDIR/tests/schema-tests/schema-mod-test-4.ldif --if [ "$?" == "0" ]; then -+if [ "$?" = "0" ]; then - echo "test failed!" - exit 1 - fi - $VALGRIND bin/ldbmodify $LDBDIR/tests/schema-tests/schema-mod-test-5.ldif --if [ "$?" == "0" ]; then -+if [ "$?" = "0" ]; then - echo "test failed!" - exit 1 - fi +Changes were applied. diff --git a/net/samba/patches/patch-am b/net/samba/patches/patch-am index 3bc12662c6f..578bcb45fb7 100644 --- a/net/samba/patches/patch-am +++ b/net/samba/patches/patch-am @@ -1,31 +1,32 @@ -$NetBSD: patch-am,v 1.9 2011/12/16 11:05:24 asau Exp $ +$NetBSD: patch-am,v 1.10 2011/12/16 22:32:06 asau Exp $ Add support for "passwd expand gecos". ---- lib/util_pw.c.orig 2010-01-14 10:12:10.000000000 +0000 -+++ lib/util_pw.c -@@ -4,6 +4,7 @@ - Safe versions of getpw* calls - +--- ../lib/util/util_pw.c.orig 2011-10-18 22:48:48.000000000 +0400 ++++ ../lib/util/util_pw.c 2011-12-16 19:54:39.000000000 +0400 +@@ -6,6 +6,7 @@ + Copyright (C) Andrew Tridgell 1992-1998 + Copyright (C) Jeremy Allison 1998-2005 Copyright (C) Andrew Bartlett 2002 -+ Copyright (C) Luke Mewburn 2004 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -21,9 +22,12 @@ ++ Copyright (C) Luke Mewburn 2004 + Copyright (C) Timur Bakeyev 2005 + Copyright (C) Bjoern Jacke 2006-2007 - #include "includes.h" +@@ -71,10 +72,13 @@ + return getgrgid(gid); + } +static char *passwd_expand_gecos(const struct passwd *); + - struct passwd *tcopy_passwd(TALLOC_CTX *mem_ctx, const struct passwd *from) + struct passwd *tcopy_passwd(TALLOC_CTX *mem_ctx, + const struct passwd *from) { - struct passwd *ret = TALLOC_P(mem_ctx, struct passwd); + struct passwd *ret = talloc_zero(mem_ctx, struct passwd); + char *gecos; - if (!ret) { + + if (ret == NULL) return NULL; - } -@@ -31,7 +35,10 @@ struct passwd *tcopy_passwd(TALLOC_CTX * +@@ -83,7 +87,10 @@ ret->pw_passwd = talloc_strdup(ret, from->pw_passwd); ret->pw_uid = from->pw_uid; ret->pw_gid = from->pw_gid; @@ -36,12 +37,11 @@ Add support for "passwd expand gecos". + SAFE_FREE(gecos); ret->pw_dir = talloc_strdup(ret, from->pw_dir); ret->pw_shell = talloc_strdup(ret, from->pw_shell); - return ret; -@@ -85,3 +92,38 @@ struct passwd *getpwuid_alloc(TALLOC_CTX +@@ -108,6 +115,41 @@ return tcopy_passwd(mem_ctx, temp); } -+ + + +/**************************************************************** + Expand any `&' characters in pw_gecos with a capitalized pw_name. @@ -76,3 +76,7 @@ Add support for "passwd expand gecos". + } + return buf; +} ++ + /**************************************************************************** + talloc'ed version of getpwuid. + ****************************************************************************/ diff --git a/net/samba/patches/patch-ap b/net/samba/patches/patch-ap deleted file mode 100644 index f1fa5fe0d2c..00000000000 --- a/net/samba/patches/patch-ap +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ap,v 1.3 2011/12/16 11:05:24 asau Exp $ - ---- nmbd/nmbd.c.orig 2010-10-07 16:41:16.000000000 +0000 -+++ nmbd/nmbd.c -@@ -916,6 +916,10 @@ static bool open_sockets(bool isdaemon, - mkdir(lp_lockdir(), 0755); - } - -+ if (!directory_exist(lp_statedir())) { -+ mkdir(lp_statedir(), 0755); -+ } -+ - pidfile_create("nmbd"); - - if (!NT_STATUS_IS_OK(reinit_after_fork(nmbd_messaging_context(), |