From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 9 Dec 2013 23:13:20 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.13-core74~7
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=afa75939328ba211a8905da1749711d2189c70bf;hp=532b997c65fba44c2c5778fd7622fafe513cc245

Merge branch 'master' into next
---

diff --git a/lfs/samba b/lfs/samba
index 7917dbfae7..13110d5628 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.6.21
+VER        = 3.6.22
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 55
+PAK_VER    = 56
 
 DEPS       = "cups"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = faa67c625508dc495c082357913ccea6
+$(DL_FILE)_MD5 = 59add4bb178ebc188d857bc13a508c0b
 
 install : $(TARGET)