--- a/components/samba/samba/Makefile	Wed Feb 25 13:58:13 2015 -0700
+++ b/components/samba/samba/Makefile	Tue Feb 24 03:03:45 2015 -0800
@@ -34,12 +34,12 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		samba
-COMPONENT_VERSION=	3.6.24
-TPNO=			18186
+COMPONENT_VERSION=	3.6.25
+TPNO=			21657
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.samba.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha256:11d0bd04b734731970259efc6692b8e749ff671a9b56d8cc5fa98c192ab234a7
+COMPONENT_ARCHIVE_HASH= sha256:8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751
 COMPONENT_ARCHIVE_URL=	http://ftp.samba.org/pub/samba/stable/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/samba
 

--- a/components/samba/samba/patches/FSCTL_GET_SHADOW_COPY_DATA.patch	Wed Feb 25 13:58:13 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-Samba 3.6.23 patch for:
-FSCTL_GET_SHADOW_COPY_DATA: Initialize output array to, zero
-...derived from Christof Schmitt <[email protected]>'s patch for Samba 4.0
-http://www.samba.org/samba/ftp/patches/security/samba-4.0.17-CVE-2014-0178-CVE-2014-0239.patch
-
---- a/source3/smbd/nttrans.c	2014-03-11 03:17:34.000000000 -0700
-+++ samba-3.6.23/source3/smbd/nttrans.c	2014-06-18 06:17:02.771463164 -0700
-@@ -2303,7 +2303,7 @@
- 		if (!labels) {
- 			*out_len = 16;
- 		} else {
--			*out_len = 12 + labels_data_count + 4;
-+			*out_len = 12 + labels_data_count;
- 		}
- 
- 		if (max_out_len < *out_len) {
-@@ -2313,7 +2313,7 @@
- 			return NT_STATUS_BUFFER_TOO_SMALL;
- 		}
- 
--		cur_pdata = talloc_array(ctx, char, *out_len);
-+		cur_pdata = talloc_zero_array(ctx, char, *out_len);
- 		if (cur_pdata == NULL) {
- 			TALLOC_FREE(shadow_data);
- 			return NT_STATUS_NO_MEMORY;
-@@ -2330,7 +2330,7 @@
- 		}
- 
- 		/* needed_data_count 4 bytes */
--		SIVAL(cur_pdata, 8, labels_data_count + 4);
-+		SIVAL(cur_pdata, 8, labels_data_count);
- 
- 		cur_pdata += 12;
-