--- a/components/samba/samba/Makefile	Wed Feb 18 03:48:16 2015 -0800
+++ b/components/samba/samba/Makefile	Wed Feb 25 15:53:29 2015 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 # parfait seems to spin when looking at the .bc files, so
@@ -30,12 +30,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