Security update due CVE-2009-0022

30 files changed, 110 insertions, 126 deletions

diff --git a/net/samba32-devel/Makefile b/net/samba32-devel/Makefile
index 187fa216b089..2940961cf426 100644
--- a/net/samba32-devel/Makefile
+++ b/net/samba32-devel/Makefile
@@ -6,17 +6,12 @@
 #
 
 PORTNAME=		samba
-PORTVERSION?=		3.2.4
-PORTREVISION=	2
+PORTVERSION?=		3.2.7
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	. old-versions rc pre
 DISTNAME=		${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}
 
-PATCH_SITES=		http://us1.samba.org/samba/ftp/patches/security/
-PATCHFILES=		samba-3.2.4-CVE-2008-4314.patch
-PATCH_DIST_STRIP=	-p2
-
 MAINTAINER?=		timur@FreeBSD.org
 COMMENT?=		A free SMB and CIFS client and server for UNIX
 
@@ -157,12 +152,10 @@ CONFIGURE_ARGS+=	--without-utmp
 CONFIGURE_ARGS+=	--with-winbind
 PLIST_SUB+=		WINBIND=""
 SUB_LIST+=		WINBIND=""
-WITH_WINBIND_NSS=	yes
-PLIST_SUB+=		WINBIND_NSS=""
 .else
 CONFIGURE_ARGS+=	--without-winbind
-PLIST_SUB+=		WINBIND="@comment " WINBIND_NSS="@comment "
-SUB_LIST+=		WINBIND="@comment " WINBIND_NSS="@comment "
+PLIST_SUB+=		WINBIND="@comment "
+SUB_LIST+=		WINBIND="@comment "
 .endif
 
 .if !defined(WITHOUT_SWAT)
@@ -421,12 +414,10 @@ post-install:
 	${INSTALL_SCRIPT} "${WRKSRC}/script/mksmbpasswd.sh" "${PREFIX}/bin/make_smbpasswd"
 # Winbind
 .if !defined(WITHOUT_WINBIND)
-.	if defined(WITH_WINBIND_NSS)
-	    ${INSTALL_PROGRAM} "${WRKSRC}/nsswitch/nss_winbind.so" "${SAMBA_LIBDIR}/nss_winbind.so.1"
-	    ${INSTALL_PROGRAM} "${WRKSRC}/nsswitch/nss_wins.so" "${SAMBA_LIBDIR}/nss_wins.so.1"
-	    @${ECHO_CMD} "${SAMBA_LIB}/nss_winbind.so.1" >> ${TMPPLIST};
-	    @${ECHO_CMD} "${SAMBA_LIB}/nss_wins.so.1" >> ${TMPPLIST};
-.	endif
+	${INSTALL_PROGRAM} "${WRKSRC}/nsswitch/nss_winbind.so" "${SAMBA_LIBDIR}/nss_winbind.so.1"
+	${INSTALL_PROGRAM} "${WRKSRC}/nsswitch/nss_wins.so" "${SAMBA_LIBDIR}/nss_wins.so.1"
+	@${ECHO_CMD} "${SAMBA_LIB}/nss_winbind.so.1" >> ${TMPPLIST};
+	@${ECHO_CMD} "${SAMBA_LIB}/nss_wins.so.1" >> ${TMPPLIST};
 	${INSTALL_PROGRAM} "${WRKSRC}/bin/pam_winbind.so" "${SAMBA_LIBDIR}"
 	@${ECHO_CMD} "${SAMBA_LIB}/pam_winbind.so" >> ${TMPPLIST};
 .endif
diff --git a/net/samba32-devel/distinfo b/net/samba32-devel/distinfo
index 249f7afe9652..b476d0c42e56 100644
--- a/net/samba32-devel/distinfo
+++ b/net/samba32-devel/distinfo
@@ -1,6 +1,3 @@
-MD5 (samba-3.2.4.tar.gz) = 7870a6bb3a025c6081cd56688acd494a
-SHA256 (samba-3.2.4.tar.gz) = a85ea5eee24453dbc227835124166f9fca769bc067b77fda048343572fbf3eeb
-SIZE (samba-3.2.4.tar.gz) = 25160752
-MD5 (samba-3.2.4-CVE-2008-4314.patch) = dc60e0f9d8c3d2447e25240dfb8a5db0
-SHA256 (samba-3.2.4-CVE-2008-4314.patch) = 66b0c6b9c493bc70f6ea7df55bda8d1ffdd4baf844ef3240a2d6b35d1a78ac38
-SIZE (samba-3.2.4-CVE-2008-4314.patch) = 1846
+MD5 (samba-3.2.7.tar.gz) = 528677f261f3ed4a58f9483ca25ba6b2
+SHA256 (samba-3.2.7.tar.gz) = 4f2bb8c5785c50ad05d3adc0027c0881211b8a5c51e840651b53b7e455c004a3
+SIZE (samba-3.2.7.tar.gz) = 25177621
diff --git a/net/samba32-devel/files/patch-aa b/net/samba32-devel/files/patch-aa
new file mode 100644
index 000000000000..05e210258292
--- /dev/null
+++ b/net/samba32-devel/files/patch-aa
@@ -0,0 +1,11 @@
+--- ./rpc_server/srv_samr_nt.c.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./rpc_server/srv_samr_nt.c	2009-01-06 17:10:53.000000000 +0000
+@@ -2709,7 +2709,7 @@
+ 		return NT_STATUS_INVALID_HANDLE;
+ 
+ 	status = access_check_samr_function(info->acc_granted,
+-					    SA_RIGHT_DOMAIN_OPEN_ACCOUNT,
++					    SAMR_USER_ACCESS_GET_ATTRIBUTES,
+ 					    "_samr_QueryUserInfo");
+ 	if (!NT_STATUS_IS_OK(status)) {
+ 		return status;
diff --git a/net/samba32-devel/files/patch-configure.in b/net/samba32-devel/files/patch-configure.in
index c2a185f54ac7..86c40f06af11 100644
--- a/net/samba32-devel/files/patch-configure.in
+++ b/net/samba32-devel/files/patch-configure.in
@@ -1,5 +1,5 @@
---- ./configure.in.orig	2008-09-18 06:49:02.000000000 +0000
-+++ ./configure.in	2008-10-10 00:42:10.000000000 +0000
+--- ./configure.in.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./configure.in	2009-01-06 17:10:53.000000000 +0000
 @@ -184,16 +184,6 @@
         fi
  fi
@@ -17,7 +17,7 @@
  #################################################
  # check for a shared memory profiling support
  AC_MSG_CHECKING(whether to use profiling)
-@@ -873,6 +863,21 @@
+@@ -888,6 +878,21 @@
  	[#include <signal.h>])
  fi
  
@@ -39,15 +39,7 @@
  AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [
      AC_TRY_COMPILE([
  #include <sys/types.h>
-@@ -1038,6 +1043,7 @@
- 
- # Find a method of generating a stack trace
- AC_CHECK_HEADERS(execinfo.h libexc.h libunwind.h)
-+AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
- AC_CHECK_FUNCS(backtrace_symbols)
- AC_CHECK_LIB(exc, trace_back_stack)
- 
-@@ -1841,9 +1847,6 @@
+@@ -1858,9 +1863,6 @@
  AC_MSG_CHECKING([PICFLAG])
  AC_MSG_RESULT([$PICFLAG])
  
@@ -57,7 +49,7 @@
  AC_CACHE_CHECK([whether building shared libraries actually works],
                 [ac_cv_shlib_works],[
     # try building a trivial shared library
-@@ -2282,31 +2285,15 @@
+@@ -2299,31 +2301,15 @@
  
      #  This is here to handle -withval stuff for --with-libiconv
      #  Perhaps we should always add a -L
@@ -95,7 +87,7 @@
  	iconv_current_CPPFLAGS="-I$i/include"
  
          if test x"$jm_cv_lib_iconv" != x; then
-@@ -2315,7 +2302,6 @@
+@@ -2332,7 +2318,6 @@
  	    # We found iconv in libc.
  	    iconv_current_LIBS=""
          fi
@@ -103,7 +95,7 @@
      fi
  
      if test x"$ICONV_FOUND" = "xyes" ; then
-@@ -4013,10 +3999,10 @@
+@@ -4030,10 +4015,10 @@
  
    ################################################################
    # first test for Active Directory support being enabled
@@ -118,7 +110,7 @@
    ##################################################################
    # then test for uuid.h (necessary to generate unique DNS keynames
    # (uuid.h is required for this test)
-@@ -5640,6 +5626,7 @@
+@@ -5673,6 +5658,7 @@
  		NSSSONAMEVERSIONSUFFIX=".1"
  		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
  		    nsswitch/winbind_nss_linux.o"
@@ -126,7 +118,7 @@
  		WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
  		WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT"
  		;;
-@@ -5718,23 +5705,15 @@
+@@ -5751,23 +5737,15 @@
  fi
  
  # Display test results
@@ -150,7 +142,7 @@
  	## Only worry about libwbclient if we have shared library support
  	## and winbindd
          LIBWBCLIENT_SHARED=$LIBWBCLIENT_SHARED_TARGET
-@@ -5752,26 +5731,34 @@
+@@ -5785,26 +5763,34 @@
  
  	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
  	EXTRA_SBIN_PROGS="$EXTRA_SBIN_PROGS bin/winbindd\$(EXEEXT)"
@@ -189,7 +181,7 @@
  
  AC_SUBST(WINBIND_KRB5_LOCATOR)
  
-@@ -5866,7 +5853,7 @@
+@@ -5899,7 +5885,7 @@
      AC_CHECK_FUNCS(DNSServiceRegister)
      AC_CHECK_LIB_EXT(dns_sd, DNSSD_LIBS, DNSServiceRegister)
      if test x"$ac_cv_func_DNSServiceRegister" != x"yes" -a \
@@ -198,7 +190,7 @@
  	have_dnssd_support=no
      fi
  
-@@ -5922,13 +5909,21 @@
+@@ -5955,13 +5941,21 @@
  # Start
  AC_CHECK_FUNC(getmntent)
  
@@ -221,7 +213,7 @@
  		int main(void)
  		{
  			struct statfs fsd;
-@@ -6173,6 +6168,16 @@
+@@ -6207,6 +6201,16 @@
  
  fi
  
diff --git a/net/samba32-devel/files/patch-include__includes.h b/net/samba32-devel/files/patch-include__includes.h
index 5b3b649209bd..398db821c136 100644
--- a/net/samba32-devel/files/patch-include__includes.h
+++ b/net/samba32-devel/files/patch-include__includes.h
@@ -1,5 +1,5 @@
---- ./include/includes.h.orig	2008-09-18 06:49:02.000000000 +0000
-+++ ./include/includes.h	2008-10-10 00:42:10.000000000 +0000
+--- ./include/includes.h.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./include/includes.h	2009-01-06 17:10:53.000000000 +0000
 @@ -207,10 +207,10 @@
  #undef HAVE_LDAP
  #endif
diff --git a/net/samba32-devel/files/patch-lib__iconv.c b/net/samba32-devel/files/patch-lib__iconv.c
index a08c2744f60c..8e62d60933ae 100644
--- a/net/samba32-devel/files/patch-lib__iconv.c
+++ b/net/samba32-devel/files/patch-lib__iconv.c
@@ -1,5 +1,5 @@
---- ./lib/iconv.c.orig	2008-09-18 06:49:02.000000000 +0000
-+++ ./lib/iconv.c	2008-10-10 00:42:10.000000000 +0000
+--- ./lib/iconv.c.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./lib/iconv.c	2009-01-06 17:10:53.000000000 +0000
 @@ -136,7 +136,7 @@
  			char **outbuf, size_t *outbytesleft)
  {
diff --git a/net/samba32-devel/files/patch-lib__replace__libreplace_cc.m4 b/net/samba32-devel/files/patch-lib__replace__libreplace_cc.m4
index 55e116f8cc89..28244a7fe3ed 100644
--- a/net/samba32-devel/files/patch-lib__replace__libreplace_cc.m4
+++ b/net/samba32-devel/files/patch-lib__replace__libreplace_cc.m4
@@ -1,5 +1,5 @@
---- ./lib/replace/libreplace_cc.m4.orig	2008-09-18 06:49:02.000000000 +0000
-+++ ./lib/replace/libreplace_cc.m4	2008-10-10 00:42:10.000000000 +0000
+--- ./lib/replace/libreplace_cc.m4.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./lib/replace/libreplace_cc.m4	2009-01-06 17:10:53.000000000 +0000
 @@ -145,6 +145,10 @@
  AC_CHECK_TYPE(uintptr_t, unsigned long long)
  AC_CHECK_TYPE(ptrdiff_t, unsigned long long)
diff --git a/net/samba32-devel/files/patch-libaddns__dns.h b/net/samba32-devel/files/patch-libaddns__dns.h
index d4d2484f5e54..93f66b47be8f 100644
--- a/net/samba32-devel/files/patch-libaddns__dns.h
+++ b/net/samba32-devel/files/patch-libaddns__dns.h
@@ -1,5 +1,5 @@
---- ./libaddns/dns.h.orig	2008-10-10 00:47:19.000000000 +0000
-+++ ./libaddns/dns.h	2008-10-10 00:47:57.000000000 +0000
+--- ./libaddns/dns.h.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./libaddns/dns.h	2009-01-06 17:10:53.000000000 +0000
 @@ -81,12 +81,12 @@
  #include <krb5.h>
  #endif
diff --git a/net/samba32-devel/files/patch-m4__aclocal.m4 b/net/samba32-devel/files/patch-m4__aclocal.m4
index 173f3c611e5e..fabdba79100e 100644
--- a/net/samba32-devel/files/patch-m4__aclocal.m4
+++ b/net/samba32-devel/files/patch-m4__aclocal.m4
@@ -1,5 +1,5 @@
---- ./m4/aclocal.m4.orig	2008-09-18 06:49:02.000000000 +0000
-+++ ./m4/aclocal.m4	2008-10-10 00:42:10.000000000 +0000
+--- ./m4/aclocal.m4.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./m4/aclocal.m4	2009-01-06 17:10:53.000000000 +0000
 @@ -416,101 +416,79 @@
    dnl those with the standalone portable libiconv installed).
    AC_MSG_CHECKING(for iconv in $1)
diff --git a/net/samba32-devel/files/patch-nsswitch__pam_winbind.c b/net/samba32-devel/files/patch-nsswitch__pam_winbind.c
index be0b470971e7..9098e8190121 100644
--- a/net/samba32-devel/files/patch-nsswitch__pam_winbind.c
+++ b/net/samba32-devel/files/patch-nsswitch__pam_winbind.c
@@ -1,5 +1,5 @@
---- ./nsswitch/pam_winbind.c.orig	2008-09-18 06:49:02.000000000 +0000
-+++ ./nsswitch/pam_winbind.c	2008-10-10 00:42:10.000000000 +0000
+--- ./nsswitch/pam_winbind.c.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./nsswitch/pam_winbind.c	2009-01-06 17:10:53.000000000 +0000
 @@ -39,14 +39,14 @@
  			 const void *_item)
  {
diff --git a/net/samba32-devel/files/patch-nsswitch__wins_freebsd.c b/net/samba32-devel/files/patch-nsswitch__wins_freebsd.c
index d105e18b679d..17efec3bca40 100644
--- a/net/samba32-devel/files/patch-nsswitch__wins_freebsd.c
+++ b/net/samba32-devel/files/patch-nsswitch__wins_freebsd.c
@@ -1,5 +1,5 @@
---- ./nsswitch/wins_freebsd.c.orig	2008-10-10 00:42:10.000000000 +0000
-+++ ./nsswitch/wins_freebsd.c	2008-10-10 00:42:10.000000000 +0000
+--- ./nsswitch/wins_freebsd.c.orig	2009-01-06 17:10:53.000000000 +0000
++++ ./nsswitch/wins_freebsd.c	2009-01-06 17:10:53.000000000 +0000
 @@ -0,0 +1,112 @@
 +/* 
 +   Unix SMB/CIFS implementation.
diff --git a/net/samba32-devel/files/patch-smbd__quotas.c b/net/samba32-devel/files/patch-smbd__quotas.c
index 297ee470c73a..9e8bb2375b9d 100644
--- a/net/samba32-devel/files/patch-smbd__quotas.c
+++ b/net/samba32-devel/files/patch-smbd__quotas.c
@@ -1,5 +1,5 @@
---- ./smbd/quotas.c.orig	2008-10-10 00:48:11.000000000 +0000
-+++ ./smbd/quotas.c	2008-10-10 00:48:41.000000000 +0000
+--- ./smbd/quotas.c.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./smbd/quotas.c	2009-01-06 17:10:53.000000000 +0000
 @@ -1023,6 +1023,8 @@
  	enum clnt_stat clnt_stat;
  	bool ret = True;
diff --git a/net/samba32-devel/files/patch-smbd__statvfs.c b/net/samba32-devel/files/patch-smbd__statvfs.c
index 3202ebb8bd10..d15c4bcfa2d9 100644
--- a/net/samba32-devel/files/patch-smbd__statvfs.c
+++ b/net/samba32-devel/files/patch-smbd__statvfs.c
@@ -1,5 +1,5 @@
---- ./smbd/statvfs.c.orig	2008-09-18 06:49:02.000000000 +0000
-+++ ./smbd/statvfs.c	2008-10-10 00:42:10.000000000 +0000
+--- ./smbd/statvfs.c.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./smbd/statvfs.c	2009-01-06 17:10:53.000000000 +0000
 @@ -3,6 +3,7 @@
     VFS API's statvfs abstraction
     Copyright (C) Alexander Bokovoy			2005
diff --git a/net/samba32-devel/files/patch-utils__net_time.c b/net/samba32-devel/files/patch-utils__net_time.c
index 1cc240ce820f..155780336feb 100644
--- a/net/samba32-devel/files/patch-utils__net_time.c
+++ b/net/samba32-devel/files/patch-utils__net_time.c
@@ -1,5 +1,5 @@
---- ./utils/net_time.c.orig	2008-09-18 06:49:02.000000000 +0000
-+++ ./utils/net_time.c	2008-10-10 00:42:10.000000000 +0000
+--- ./utils/net_time.c.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./utils/net_time.c	2009-01-06 17:10:53.000000000 +0000
 @@ -84,9 +84,15 @@
  		return "unknown";
  	}
diff --git a/net/samba32-devel/pkg-plist.swat b/net/samba32-devel/pkg-plist.swat
index 75c4ae5e408c..b1e13fae2c59 100644
--- a/net/samba32-devel/pkg-plist.swat
+++ b/net/samba32-devel/pkg-plist.swat
@@ -268,6 +268,7 @@ share/swat/help/manpages/vfs_readahead.8.html
 share/swat/help/manpages/vfs_readonly.8.html
 share/swat/help/manpages/vfs_recycle.8.html
 share/swat/help/manpages/vfs_shadow_copy.8.html
+share/swat/help/manpages/vfs_smb_traffic_analyzer.8.html
 share/swat/help/manpages/vfs_streams_depot.8.html
 share/swat/help/manpages/vfs_streams_xattr.8.html
 share/swat/help/manpages/vfs_xattr_tdb.8.html
diff --git a/net/samba32/Makefile b/net/samba32/Makefile
index 187fa216b089..2940961cf426 100644
--- a/net/samba32/Makefile
+++ b/net/samba32/Makefile
@@ -6,17 +6,12 @@
 #
 
 PORTNAME=		samba
-PORTVERSION?=		3.2.4
-PORTREVISION=	2
+PORTVERSION?=		3.2.7
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	. old-versions rc pre
 DISTNAME=		${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}
 
-PATCH_SITES=		http://us1.samba.org/samba/ftp/patches/security/
-PATCHFILES=		samba-3.2.4-CVE-2008-4314.patch
-PATCH_DIST_STRIP=	-p2
-
 MAINTAINER?=		timur@FreeBSD.org
 COMMENT?=		A free SMB and CIFS client and server for UNIX
 
@@ -157,12 +152,10 @@ CONFIGURE_ARGS+=	--without-utmp
 CONFIGURE_ARGS+=	--with-winbind
 PLIST_SUB+=		WINBIND=""
 SUB_LIST+=		WINBIND=""
-WITH_WINBIND_NSS=	yes
-PLIST_SUB+=		WINBIND_NSS=""
 .else
 CONFIGURE_ARGS+=	--without-winbind
-PLIST_SUB+=		WINBIND="@comment " WINBIND_NSS="@comment "
-SUB_LIST+=		WINBIND="@comment " WINBIND_NSS="@comment "
+PLIST_SUB+=		WINBIND="@comment "
+SUB_LIST+=		WINBIND="@comment "
 .endif
 
 .if !defined(WITHOUT_SWAT)
@@ -421,12 +414,10 @@ post-install:
 	${INSTALL_SCRIPT} "${WRKSRC}/script/mksmbpasswd.sh" "${PREFIX}/bin/make_smbpasswd"
 # Winbind
 .if !defined(WITHOUT_WINBIND)
-.	if defined(WITH_WINBIND_NSS)
-	    ${INSTALL_PROGRAM} "${WRKSRC}/nsswitch/nss_winbind.so" "${SAMBA_LIBDIR}/nss_winbind.so.1"
-	    ${INSTALL_PROGRAM} "${WRKSRC}/nsswitch/nss_wins.so" "${SAMBA_LIBDIR}/nss_wins.so.1"
-	    @${ECHO_CMD} "${SAMBA_LIB}/nss_winbind.so.1" >> ${TMPPLIST};
-	    @${ECHO_CMD} "${SAMBA_LIB}/nss_wins.so.1" >> ${TMPPLIST};
-.	endif
+	${INSTALL_PROGRAM} "${WRKSRC}/nsswitch/nss_winbind.so" "${SAMBA_LIBDIR}/nss_winbind.so.1"
+	${INSTALL_PROGRAM} "${WRKSRC}/nsswitch/nss_wins.so" "${SAMBA_LIBDIR}/nss_wins.so.1"
+	@${ECHO_CMD} "${SAMBA_LIB}/nss_winbind.so.1" >> ${TMPPLIST};
+	@${ECHO_CMD} "${SAMBA_LIB}/nss_wins.so.1" >> ${TMPPLIST};
 	${INSTALL_PROGRAM} "${WRKSRC}/bin/pam_winbind.so" "${SAMBA_LIBDIR}"
 	@${ECHO_CMD} "${SAMBA_LIB}/pam_winbind.so" >> ${TMPPLIST};
 .endif
diff --git a/net/samba32/distinfo b/net/samba32/distinfo
index 249f7afe9652..b476d0c42e56 100644
--- a/net/samba32/distinfo
+++ b/net/samba32/distinfo
@@ -1,6 +1,3 @@
-MD5 (samba-3.2.4.tar.gz) = 7870a6bb3a025c6081cd56688acd494a
-SHA256 (samba-3.2.4.tar.gz) = a85ea5eee24453dbc227835124166f9fca769bc067b77fda048343572fbf3eeb
-SIZE (samba-3.2.4.tar.gz) = 25160752
-MD5 (samba-3.2.4-CVE-2008-4314.patch) = dc60e0f9d8c3d2447e25240dfb8a5db0
-SHA256 (samba-3.2.4-CVE-2008-4314.patch) = 66b0c6b9c493bc70f6ea7df55bda8d1ffdd4baf844ef3240a2d6b35d1a78ac38
-SIZE (samba-3.2.4-CVE-2008-4314.patch) = 1846
+MD5 (samba-3.2.7.tar.gz) = 528677f261f3ed4a58f9483ca25ba6b2
+SHA256 (samba-3.2.7.tar.gz) = 4f2bb8c5785c50ad05d3adc0027c0881211b8a5c51e840651b53b7e455c004a3
+SIZE (samba-3.2.7.tar.gz) = 25177621
diff --git a/net/samba32/files/patch-aa b/net/samba32/files/patch-aa
new file mode 100644
index 000000000000..05e210258292
--- /dev/null
+++ b/net/samba32/files/patch-aa
@@ -0,0 +1,11 @@
+--- ./rpc_server/srv_samr_nt.c.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./rpc_server/srv_samr_nt.c	2009-01-06 17:10:53.000000000 +0000
+@@ -2709,7 +2709,7 @@
+ 		return NT_STATUS_INVALID_HANDLE;
+ 
+ 	status = access_check_samr_function(info->acc_granted,
+-					    SA_RIGHT_DOMAIN_OPEN_ACCOUNT,
++					    SAMR_USER_ACCESS_GET_ATTRIBUTES,
+ 					    "_samr_QueryUserInfo");
+ 	if (!NT_STATUS_IS_OK(status)) {
+ 		return status;
diff --git a/net/samba32/files/patch-configure.in b/net/samba32/files/patch-configure.in
index c2a185f54ac7..86c40f06af11 100644
--- a/net/samba32/files/patch-configure.in
+++ b/net/samba32/files/patch-configure.in
@@ -1,5 +1,5 @@
---- ./configure.in.orig	2008-09-18 06:49:02.000000000 +0000
-+++ ./configure.in	2008-10-10 00:42:10.000000000 +0000
+--- ./configure.in.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./configure.in	2009-01-06 17:10:53.000000000 +0000
 @@ -184,16 +184,6 @@
         fi
  fi
@@ -17,7 +17,7 @@
  #################################################
  # check for a shared memory profiling support
  AC_MSG_CHECKING(whether to use profiling)
-@@ -873,6 +863,21 @@
+@@ -888,6 +878,21 @@
  	[#include <signal.h>])
  fi
  
@@ -39,15 +39,7 @@
  AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [
      AC_TRY_COMPILE([
  #include <sys/types.h>
-@@ -1038,6 +1043,7 @@
- 
- # Find a method of generating a stack trace
- AC_CHECK_HEADERS(execinfo.h libexc.h libunwind.h)
-+AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
- AC_CHECK_FUNCS(backtrace_symbols)
- AC_CHECK_LIB(exc, trace_back_stack)
- 
-@@ -1841,9 +1847,6 @@
+@@ -1858,9 +1863,6 @@
  AC_MSG_CHECKING([PICFLAG])
  AC_MSG_RESULT([$PICFLAG])
  
@@ -57,7 +49,7 @@
  AC_CACHE_CHECK([whether building shared libraries actually works],
                 [ac_cv_shlib_works],[
     # try building a trivial shared library
-@@ -2282,31 +2285,15 @@
+@@ -2299,31 +2301,15 @@
  
      #  This is here to handle -withval stuff for --with-libiconv
      #  Perhaps we should always add a -L
@@ -95,7 +87,7 @@
  	iconv_current_CPPFLAGS="-I$i/include"
  
          if test x"$jm_cv_lib_iconv" != x; then
-@@ -2315,7 +2302,6 @@
+@@ -2332,7 +2318,6 @@
  	    # We found iconv in libc.
  	    iconv_current_LIBS=""
          fi
@@ -103,7 +95,7 @@
      fi
  
      if test x"$ICONV_FOUND" = "xyes" ; then
-@@ -4013,10 +3999,10 @@
+@@ -4030,10 +4015,10 @@
  
    ################################################################
    # first test for Active Directory support being enabled
@@ -118,7 +110,7 @@
    ##################################################################
    # then test for uuid.h (necessary to generate unique DNS keynames
    # (uuid.h is required for this test)
-@@ -5640,6 +5626,7 @@
+@@ -5673,6 +5658,7 @@
  		NSSSONAMEVERSIONSUFFIX=".1"
  		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
  		    nsswitch/winbind_nss_linux.o"
@@ -126,7 +118,7 @@
  		WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT"
  		WINBIND_WINS_NSS="nsswitch/nss_wins.$SHLIBEXT"
  		;;
-@@ -5718,23 +5705,15 @@
+@@ -5751,23 +5737,15 @@
  fi
  
  # Display test results
@@ -150,7 +142,7 @@
  	## Only worry about libwbclient if we have shared library support
  	## and winbindd
          LIBWBCLIENT_SHARED=$LIBWBCLIENT_SHARED_TARGET
-@@ -5752,26 +5731,34 @@
+@@ -5785,26 +5763,34 @@
  
  	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
  	EXTRA_SBIN_PROGS="$EXTRA_SBIN_PROGS bin/winbindd\$(EXEEXT)"
@@ -189,7 +181,7 @@
  
  AC_SUBST(WINBIND_KRB5_LOCATOR)
  
-@@ -5866,7 +5853,7 @@
+@@ -5899,7 +5885,7 @@
      AC_CHECK_FUNCS(DNSServiceRegister)
      AC_CHECK_LIB_EXT(dns_sd, DNSSD_LIBS, DNSServiceRegister)
      if test x"$ac_cv_func_DNSServiceRegister" != x"yes" -a \
@@ -198,7 +190,7 @@
  	have_dnssd_support=no
      fi
  
-@@ -5922,13 +5909,21 @@
+@@ -5955,13 +5941,21 @@
  # Start
  AC_CHECK_FUNC(getmntent)
  
@@ -221,7 +213,7 @@
  		int main(void)
  		{
  			struct statfs fsd;
-@@ -6173,6 +6168,16 @@
+@@ -6207,6 +6201,16 @@
  
  fi
  
diff --git a/net/samba32/files/patch-include__includes.h b/net/samba32/files/patch-include__includes.h
index 5b3b649209bd..398db821c136 100644
--- a/net/samba32/files/patch-include__includes.h
+++ b/net/samba32/files/patch-include__includes.h
@@ -1,5 +1,5 @@
---- ./include/includes.h.orig	2008-09-18 06:49:02.000000000 +0000
-+++ ./include/includes.h	2008-10-10 00:42:10.000000000 +0000
+--- ./include/includes.h.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./include/includes.h	2009-01-06 17:10:53.000000000 +0000
 @@ -207,10 +207,10 @@
  #undef HAVE_LDAP
  #endif
diff --git a/net/samba32/files/patch-lib__iconv.c b/net/samba32/files/patch-lib__iconv.c
index a08c2744f60c..8e62d60933ae 100644
--- a/net/samba32/files/patch-lib__iconv.c
+++ b/net/samba32/files/patch-lib__iconv.c
@@ -1,5 +1,5 @@
---- ./lib/iconv.c.orig	2008-09-18 06:49:02.000000000 +0000
-+++ ./lib/iconv.c	2008-10-10 00:42:10.000000000 +0000
+--- ./lib/iconv.c.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./lib/iconv.c	2009-01-06 17:10:53.000000000 +0000
 @@ -136,7 +136,7 @@
  			char **outbuf, size_t *outbytesleft)
  {
diff --git a/net/samba32/files/patch-lib__replace__libreplace_cc.m4 b/net/samba32/files/patch-lib__replace__libreplace_cc.m4
index 55e116f8cc89..28244a7fe3ed 100644
--- a/net/samba32/files/patch-lib__replace__libreplace_cc.m4
+++ b/net/samba32/files/patch-lib__replace__libreplace_cc.m4
@@ -1,5 +1,5 @@
---- ./lib/replace/libreplace_cc.m4.orig	2008-09-18 06:49:02.000000000 +0000
-+++ ./lib/replace/libreplace_cc.m4	2008-10-10 00:42:10.000000000 +0000
+--- ./lib/replace/libreplace_cc.m4.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./lib/replace/libreplace_cc.m4	2009-01-06 17:10:53.000000000 +0000
 @@ -145,6 +145,10 @@
  AC_CHECK_TYPE(uintptr_t, unsigned long long)
  AC_CHECK_TYPE(ptrdiff_t, unsigned long long)
diff --git a/net/samba32/files/patch-libaddns__dns.h b/net/samba32/files/patch-libaddns__dns.h
index d4d2484f5e54..93f66b47be8f 100644
--- a/net/samba32/files/patch-libaddns__dns.h
+++ b/net/samba32/files/patch-libaddns__dns.h
@@ -1,5 +1,5 @@
---- ./libaddns/dns.h.orig	2008-10-10 00:47:19.000000000 +0000
-+++ ./libaddns/dns.h	2008-10-10 00:47:57.000000000 +0000
+--- ./libaddns/dns.h.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./libaddns/dns.h	2009-01-06 17:10:53.000000000 +0000
 @@ -81,12 +81,12 @@
  #include <krb5.h>
  #endif
diff --git a/net/samba32/files/patch-m4__aclocal.m4 b/net/samba32/files/patch-m4__aclocal.m4
index 173f3c611e5e..fabdba79100e 100644
--- a/net/samba32/files/patch-m4__aclocal.m4
+++ b/net/samba32/files/patch-m4__aclocal.m4
@@ -1,5 +1,5 @@
---- ./m4/aclocal.m4.orig	2008-09-18 06:49:02.000000000 +0000
-+++ ./m4/aclocal.m4	2008-10-10 00:42:10.000000000 +0000
+--- ./m4/aclocal.m4.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./m4/aclocal.m4	2009-01-06 17:10:53.000000000 +0000
 @@ -416,101 +416,79 @@
    dnl those with the standalone portable libiconv installed).
    AC_MSG_CHECKING(for iconv in $1)
diff --git a/net/samba32/files/patch-nsswitch__pam_winbind.c b/net/samba32/files/patch-nsswitch__pam_winbind.c
index be0b470971e7..9098e8190121 100644
--- a/net/samba32/files/patch-nsswitch__pam_winbind.c
+++ b/net/samba32/files/patch-nsswitch__pam_winbind.c
@@ -1,5 +1,5 @@
---- ./nsswitch/pam_winbind.c.orig	2008-09-18 06:49:02.000000000 +0000
-+++ ./nsswitch/pam_winbind.c	2008-10-10 00:42:10.000000000 +0000
+--- ./nsswitch/pam_winbind.c.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./nsswitch/pam_winbind.c	2009-01-06 17:10:53.000000000 +0000
 @@ -39,14 +39,14 @@
  			 const void *_item)
  {
diff --git a/net/samba32/files/patch-nsswitch__wins_freebsd.c b/net/samba32/files/patch-nsswitch__wins_freebsd.c
index d105e18b679d..17efec3bca40 100644
--- a/net/samba32/files/patch-nsswitch__wins_freebsd.c
+++ b/net/samba32/files/patch-nsswitch__wins_freebsd.c
@@ -1,5 +1,5 @@
---- ./nsswitch/wins_freebsd.c.orig	2008-10-10 00:42:10.000000000 +0000
-+++ ./nsswitch/wins_freebsd.c	2008-10-10 00:42:10.000000000 +0000
+--- ./nsswitch/wins_freebsd.c.orig	2009-01-06 17:10:53.000000000 +0000
++++ ./nsswitch/wins_freebsd.c	2009-01-06 17:10:53.000000000 +0000
 @@ -0,0 +1,112 @@
 +/* 
 +   Unix SMB/CIFS implementation.
diff --git a/net/samba32/files/patch-smbd__quotas.c b/net/samba32/files/patch-smbd__quotas.c
index 297ee470c73a..9e8bb2375b9d 100644
--- a/net/samba32/files/patch-smbd__quotas.c
+++ b/net/samba32/files/patch-smbd__quotas.c
@@ -1,5 +1,5 @@
---- ./smbd/quotas.c.orig	2008-10-10 00:48:11.000000000 +0000
-+++ ./smbd/quotas.c	2008-10-10 00:48:41.000000000 +0000
+--- ./smbd/quotas.c.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./smbd/quotas.c	2009-01-06 17:10:53.000000000 +0000
 @@ -1023,6 +1023,8 @@
  	enum clnt_stat clnt_stat;
  	bool ret = True;
diff --git a/net/samba32/files/patch-smbd__statvfs.c b/net/samba32/files/patch-smbd__statvfs.c
index 3202ebb8bd10..d15c4bcfa2d9 100644
--- a/net/samba32/files/patch-smbd__statvfs.c
+++ b/net/samba32/files/patch-smbd__statvfs.c
@@ -1,5 +1,5 @@
---- ./smbd/statvfs.c.orig	2008-09-18 06:49:02.000000000 +0000
-+++ ./smbd/statvfs.c	2008-10-10 00:42:10.000000000 +0000
+--- ./smbd/statvfs.c.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./smbd/statvfs.c	2009-01-06 17:10:53.000000000 +0000
 @@ -3,6 +3,7 @@
     VFS API's statvfs abstraction
     Copyright (C) Alexander Bokovoy			2005
diff --git a/net/samba32/files/patch-utils__net_time.c b/net/samba32/files/patch-utils__net_time.c
index 1cc240ce820f..155780336feb 100644
--- a/net/samba32/files/patch-utils__net_time.c
+++ b/net/samba32/files/patch-utils__net_time.c
@@ -1,5 +1,5 @@
---- ./utils/net_time.c.orig	2008-09-18 06:49:02.000000000 +0000
-+++ ./utils/net_time.c	2008-10-10 00:42:10.000000000 +0000
+--- ./utils/net_time.c.orig	2008-12-19 13:57:33.000000000 +0000
++++ ./utils/net_time.c	2009-01-06 17:10:53.000000000 +0000
 @@ -84,9 +84,15 @@
  		return "unknown";
  	}
diff --git a/net/samba32/pkg-plist.swat b/net/samba32/pkg-plist.swat
index 75c4ae5e408c..b1e13fae2c59 100644
--- a/net/samba32/pkg-plist.swat
+++ b/net/samba32/pkg-plist.swat
@@ -268,6 +268,7 @@ share/swat/help/manpages/vfs_readahead.8.html
 share/swat/help/manpages/vfs_readonly.8.html
 share/swat/help/manpages/vfs_recycle.8.html
 share/swat/help/manpages/vfs_shadow_copy.8.html
+share/swat/help/manpages/vfs_smb_traffic_analyzer.8.html
 share/swat/help/manpages/vfs_streams_depot.8.html
 share/swat/help/manpages/vfs_streams_xattr.8.html
 share/swat/help/manpages/vfs_xattr_tdb.8.html