From 453bf5a3004107204e1858532a38b3e703e32995 Mon Sep 17 00:00:00 2001
From: Andrzej Szeszo <aszeszo@gmail.com>
Date: Tue, 04 Jun 2013 12:32:37 +0200
Subject: [PATCH] Merge remote-tracking branch 'origin/upstream' into oi/hipster

---
 components/samba/samba/Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/samba/samba/Makefile b/components/samba/samba/Makefile
index f2e0fd8..1b3a5cb 100644
--- a/components/samba/samba/Makefile
+++ b/components/samba/samba/Makefile
@@ -26,11 +26,11 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		samba
-COMPONENT_VERSION=	3.6.12
+COMPONENT_VERSION=	3.6.15
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.samba.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH=	sha256:6ff797c1772613bd5172d2c8b900fd56bf096d7252faee8b47c4925a4fdc9f8b
+COMPONENT_ARCHIVE_HASH=	sha256:42b9acb13f8760a1767829ebaa4c371e462aad5287caf92887e64930cf27da60
 COMPONENT_ARCHIVE_URL=	http://us1.samba.org/samba/ftp/stable/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/samba
 

--
Gitblit v1.9.3