Update to Samba 3.6.6, from maintainer Ian McWilliam.

o  Fix possible memory leaks in the Samba master process (bug #8970).
o  Fix uninitialized memory read in talloc_free().
o  Fix joining of XP Pro workstations to 3.6 DCs (bug #8373).
This commit is contained in:
sthen 2012-06-27 07:29:17 +00:00
parent 1fc510c2f5
commit cf0fe9c493
6 changed files with 147 additions and 19 deletions

View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.164 2012/05/22 11:43:31 sthen Exp $
# $OpenBSD: Makefile,v 1.165 2012/06/27 07:29:17 sthen Exp $
SHARED_ONLY= Yes
COMMENT-main= SMB and CIFS client and server for UNIX
COMMENT-docs= additional documentation and examples for Samba
DISTNAME= samba-3.6.5
REVISION-main= 0
DISTNAME= samba-3.6.6
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/}
FULLPKGPATH-docs= net/samba,-docs

View File

@ -1,5 +1,5 @@
MD5 (samba-3.6.5.tar.gz) = LwwUVHMzwbSP1HKLAx5wQA==
RMD160 (samba-3.6.5.tar.gz) = AYDo1O2pY0BI1B3hZv57agfDi0U=
SHA1 (samba-3.6.5.tar.gz) = 5BYRyVsruRx3NZKHQriv9PwNp24=
SHA256 (samba-3.6.5.tar.gz) = ivZf87jBFV54l8iaiV4xVVNOw8W5eHfuLwX8nYurgMQ=
SIZE (samba-3.6.5.tar.gz) = 29009444
MD5 (samba-3.6.6.tar.gz) = C+pShC0XIjHAwOI+5XDXrw==
RMD160 (samba-3.6.6.tar.gz) = cKUgASocAghfDWIJwqyshFEtn4s=
SHA1 (samba-3.6.6.tar.gz) = 8VFs4zL+EcaKBShV7ddFNorE2Ok=
SHA256 (samba-3.6.6.tar.gz) = Z2hfK633RRywatYFNHhAcpR8OoReTQr+xat4F/LukxA=
SIZE (samba-3.6.6.tar.gz) = 34061741

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-source3_Makefile_in,v 1.1 2012/04/10 22:01:20 sthen Exp $
--- source3/Makefile.in.orig Sat Apr 7 14:23:20 2012
+++ source3/Makefile.in Tue Apr 10 22:56:36 2012
$OpenBSD: patch-source3_Makefile_in,v 1.2 2012/06/27 07:29:17 sthen Exp $
--- source3/Makefile.in.orig Mon Jun 25 03:21:16 2012
+++ source3/Makefile.in Tue Jun 26 12:01:27 2012
@@ -28,7 +28,7 @@ SHLD=@SHLD@
LIB_PATH_VAR=@LIB_PATH_VAR@
@ -10,7 +10,7 @@ $OpenBSD: patch-source3_Makefile_in,v 1.1 2012/04/10 22:01:20 sthen Exp $
DSO_EXPORTS=@DSO_EXPORTS@
SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
@@ -1674,11 +1674,7 @@ COMPILE = $(COMPILE_CC)
@@ -1675,11 +1675,7 @@ COMPILE = $(COMPILE_CC)
echo "Checking $*.c with '$(CC_CHECKER)'";\
$(CHECK_CC); \
fi

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-source3_configure_in,v 1.2 2012/04/16 21:58:34 sthen Exp $
--- source3/configure.in.orig Sat Apr 7 14:23:20 2012
+++ source3/configure.in Tue Apr 10 23:47:13 2012
$OpenBSD: patch-source3_configure_in,v 1.3 2012/06/27 07:29:17 sthen Exp $
--- source3/configure.in.orig Mon Jun 25 03:21:16 2012
+++ source3/configure.in Tue Jun 26 12:01:27 2012
@@ -834,9 +834,15 @@ if test x$enable_cups != xno; then
if test "x$CUPS_CONFIG" != x; then
@ -51,7 +51,7 @@ $OpenBSD: patch-source3_configure_in,v 1.2 2012/04/16 21:58:34 sthen Exp $
PICFLAG="-fPIC"
AC_DEFINE(STAT_ST_BLOCKSIZE,512,[The size of a block])
AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work correctly])
@@ -6747,13 +6753,43 @@ fi
@@ -6750,13 +6756,43 @@ fi
CFLAGS=$CFLAGS_SAVE

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-docs,v 1.17 2011/10/21 20:10:51 sthen Exp $
@comment $OpenBSD: PLIST-docs,v 1.18 2012/06/27 07:29:17 sthen Exp $
@conflict samba-<3.6.0
@pkgpath net/samba,-docs,ads
@pkgpath net/samba,-docs,cups
@ -34,7 +34,7 @@ share/examples/samba/LDAP/get_next_oid
share/examples/samba/LDAP/ol-schema-migrate.pl
share/examples/samba/LDAP/samba-nds.schema
share/examples/samba/LDAP/samba-schema-FDS.ldif
share/examples/samba/LDAP/samba-schema-netscapeds5.x
share/examples/samba/LDAP/samba-schema-netscapeds5.x.README
share/examples/samba/LDAP/samba-schema.IBMSecureWay
share/examples/samba/LDAP/samba.ldif
share/examples/samba/LDAP/samba.schema
@ -47,8 +47,11 @@ share/examples/samba/VFS/README
share/examples/samba/VFS/autogen.sh
share/examples/samba/VFS/config.guess
share/examples/samba/VFS/config.sub
share/examples/samba/VFS/configure
share/examples/samba/VFS/configure.in
share/examples/samba/VFS/install-sh
share/examples/samba/VFS/module_config.h.in
share/examples/samba/VFS/module_config.h.in~
share/examples/samba/VFS/shadow_copy_test.c
share/examples/samba/VFS/skel_opaque.c
share/examples/samba/VFS/skel_transparent.c
@ -296,6 +299,61 @@ share/swat/help/Samba3-ByExample/appendix.html
share/swat/help/Samba3-ByExample/ch14.html
share/swat/help/Samba3-ByExample/go01.html
share/swat/help/Samba3-ByExample/happy.html
share/swat/help/Samba3-ByExample/images/
share/swat/help/Samba3-ByExample/images/AccountingNetwork.png
share/swat/help/Samba3-ByExample/images/Charity-Network.png
share/swat/help/Samba3-ByExample/images/Domain-WorkgroupAnnouncement.png
share/swat/help/Samba3-ByExample/images/HostAnnouncment.png
share/swat/help/Samba3-ByExample/images/LocalMasterAnnouncement.png
share/swat/help/Samba3-ByExample/images/NullConnect.png
share/swat/help/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png
share/swat/help/Samba3-ByExample/images/UserConnect.png
share/swat/help/Samba3-ByExample/images/UserMgrNT4.png
share/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture.png
share/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture2.png
share/swat/help/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
share/swat/help/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
share/swat/help/Samba3-ByExample/images/WindowsXP-NullConnection.png
share/swat/help/Samba3-ByExample/images/WindowsXP-UserConnection.png
share/swat/help/Samba3-ByExample/images/XP-screen001.png
share/swat/help/Samba3-ByExample/images/acct2net.png
share/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png
share/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP.png
share/swat/help/Samba3-ByExample/images/ch7-fail-overLDAP.png
share/swat/help/Samba3-ByExample/images/ch7-singleLDAP.png
share/swat/help/Samba3-ByExample/images/ch8-migration.png
share/swat/help/Samba3-ByExample/images/chap4-net.png
share/swat/help/Samba3-ByExample/images/chap5-net.png
share/swat/help/Samba3-ByExample/images/chap6-net.png
share/swat/help/Samba3-ByExample/images/chap7-idresol.png
share/swat/help/Samba3-ByExample/images/chap7-net-A.png
share/swat/help/Samba3-ByExample/images/chap7-net-Ar.png
share/swat/help/Samba3-ByExample/images/chap7-net.png
share/swat/help/Samba3-ByExample/images/chap7-net2-B.png
share/swat/help/Samba3-ByExample/images/chap7-net2-Br.png
share/swat/help/Samba3-ByExample/images/chap7-net2.png
share/swat/help/Samba3-ByExample/images/chap7-net2r.png
share/swat/help/Samba3-ByExample/images/chap7-netr.png
share/swat/help/Samba3-ByExample/images/chap9-ADSDC.png
share/swat/help/Samba3-ByExample/images/chap9-SambaDC.png
share/swat/help/Samba3-ByExample/images/imc-usermanager2.png
share/swat/help/Samba3-ByExample/images/lam-config.png
share/swat/help/Samba3-ByExample/images/lam-group-members.png
share/swat/help/Samba3-ByExample/images/lam-groups.png
share/swat/help/Samba3-ByExample/images/lam-hosts.png
share/swat/help/Samba3-ByExample/images/lam-login.png
share/swat/help/Samba3-ByExample/images/lam-users.png
share/swat/help/Samba3-ByExample/images/openmag.png
share/swat/help/Samba3-ByExample/images/wxpp001.png
share/swat/help/Samba3-ByExample/images/wxpp004.png
share/swat/help/Samba3-ByExample/images/wxpp006.png
share/swat/help/Samba3-ByExample/images/wxpp007.png
share/swat/help/Samba3-ByExample/images/wxpp008.png
share/swat/help/Samba3-ByExample/images/wxpp010.png
share/swat/help/Samba3-ByExample/images/wxpp011.png
share/swat/help/Samba3-ByExample/images/wxpp012.png
share/swat/help/Samba3-ByExample/images/wxpp013.png
share/swat/help/Samba3-ByExample/images/wxpp015.png
share/swat/help/Samba3-ByExample/index.html
share/swat/help/Samba3-ByExample/ix01.html
share/swat/help/Samba3-ByExample/kerberos.html
@ -373,6 +431,75 @@ share/swat/help/Samba3-HOWTO/domain-member.html
share/swat/help/Samba3-HOWTO/go01.html
share/swat/help/Samba3-HOWTO/groupmapping.html
share/swat/help/Samba3-HOWTO/idmapper.html
share/swat/help/Samba3-HOWTO/images/
share/swat/help/Samba3-HOWTO/images/10small.png
share/swat/help/Samba3-HOWTO/images/11small.png
share/swat/help/Samba3-HOWTO/images/12small.png
share/swat/help/Samba3-HOWTO/images/13small.png
share/swat/help/Samba3-HOWTO/images/14small.png
share/swat/help/Samba3-HOWTO/images/1small.png
share/swat/help/Samba3-HOWTO/images/2small.png
share/swat/help/Samba3-HOWTO/images/3small.png
share/swat/help/Samba3-HOWTO/images/4small.png
share/swat/help/Samba3-HOWTO/images/5small.png
share/swat/help/Samba3-HOWTO/images/6small.png
share/swat/help/Samba3-HOWTO/images/7small.png
share/swat/help/Samba3-HOWTO/images/8small.png
share/swat/help/Samba3-HOWTO/images/9small.png
share/swat/help/Samba3-HOWTO/images/WME001.png
share/swat/help/Samba3-HOWTO/images/WME002.png
share/swat/help/Samba3-HOWTO/images/WME003.png
share/swat/help/Samba3-HOWTO/images/WME004.png
share/swat/help/Samba3-HOWTO/images/WME005.png
share/swat/help/Samba3-HOWTO/images/WME006.png
share/swat/help/Samba3-HOWTO/images/WME007.png
share/swat/help/Samba3-HOWTO/images/WME008.png
share/swat/help/Samba3-HOWTO/images/WME009.png
share/swat/help/Samba3-HOWTO/images/WME010.png
share/swat/help/Samba3-HOWTO/images/WME011.png
share/swat/help/Samba3-HOWTO/images/WME012.png
share/swat/help/Samba3-HOWTO/images/WME013.png
share/swat/help/Samba3-HOWTO/images/WME014.png
share/swat/help/Samba3-HOWTO/images/WXPP002.png
share/swat/help/Samba3-HOWTO/images/WXPP003.png
share/swat/help/Samba3-HOWTO/images/WXPP005.png
share/swat/help/Samba3-HOWTO/images/WXPP009.png
share/swat/help/Samba3-HOWTO/images/WXPP014.png
share/swat/help/Samba3-HOWTO/images/a_small.png
share/swat/help/Samba3-HOWTO/images/access1.png
share/swat/help/Samba3-HOWTO/images/browsing1.png
share/swat/help/Samba3-HOWTO/images/cups1.png
share/swat/help/Samba3-HOWTO/images/cups2.png
share/swat/help/Samba3-HOWTO/images/domain.png
share/swat/help/Samba3-HOWTO/images/ethereal1.png
share/swat/help/Samba3-HOWTO/images/ethereal2.png
share/swat/help/Samba3-HOWTO/images/idmap-gid2sid.png
share/swat/help/Samba3-HOWTO/images/idmap-groups.png
share/swat/help/Samba3-HOWTO/images/idmap-sid2gid.png
share/swat/help/Samba3-HOWTO/images/idmap-sid2uid.png
share/swat/help/Samba3-HOWTO/images/idmap-store-gid2sid.png
share/swat/help/Samba3-HOWTO/images/idmap-uid2sid.png
share/swat/help/Samba3-HOWTO/images/idmap.png
share/swat/help/Samba3-HOWTO/images/idmap_winbind_no_loop.png
share/swat/help/Samba3-HOWTO/images/pdftoepsonusb.png
share/swat/help/Samba3-HOWTO/images/pdftosocket.png
share/swat/help/Samba3-HOWTO/images/trusts1.png
share/swat/help/Samba3-HOWTO/images/w2kp001.png
share/swat/help/Samba3-HOWTO/images/w2kp002.png
share/swat/help/Samba3-HOWTO/images/w2kp003.png
share/swat/help/Samba3-HOWTO/images/w2kp004.png
share/swat/help/Samba3-HOWTO/images/w2kp005.png
share/swat/help/Samba3-HOWTO/images/w2kp006.png
share/swat/help/Samba3-HOWTO/images/wxpp001.png
share/swat/help/Samba3-HOWTO/images/wxpp004.png
share/swat/help/Samba3-HOWTO/images/wxpp006.png
share/swat/help/Samba3-HOWTO/images/wxpp007.png
share/swat/help/Samba3-HOWTO/images/wxpp008.png
share/swat/help/Samba3-HOWTO/images/wxpp010.png
share/swat/help/Samba3-HOWTO/images/wxpp011.png
share/swat/help/Samba3-HOWTO/images/wxpp012.png
share/swat/help/Samba3-HOWTO/images/wxpp013.png
share/swat/help/Samba3-HOWTO/images/wxpp015.png
share/swat/help/Samba3-HOWTO/index.html
share/swat/help/Samba3-HOWTO/install.html
share/swat/help/Samba3-HOWTO/integrate-ms-networks.html
@ -450,6 +577,7 @@ share/swat/help/manpages/testparm.1.html
share/swat/help/manpages/vfs_acl_tdb.8.html
share/swat/help/manpages/vfs_acl_xattr.8.html
share/swat/help/manpages/vfs_aio_fork.8.html
share/swat/help/manpages/vfs_aio_pthread.8.html
share/swat/help/manpages/vfs_audit.8.html
share/swat/help/manpages/vfs_cacheprime.8.html
share/swat/help/manpages/vfs_cap.8.html

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.20 2012/04/10 22:37:02 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.21 2012/06/27 07:29:17 sthen Exp $
@conflict samba-docs-<3.6.0
@pkgpath ${BASE_PKGPATH}
@bin bin/eventlogadm
@ -148,6 +148,7 @@ lib/samba/vfs/xattr_tdb.so
@man man/man8/vfs_acl_tdb.8
@man man/man8/vfs_acl_xattr.8
@man man/man8/vfs_aio_fork.8
@man man/man8/vfs_aio_pthread.8
@man man/man8/vfs_audit.8
@man man/man8/vfs_cacheprime.8
@man man/man8/vfs_cap.8