Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x

diff --git a/config/guardian/guardian.pl b/config/guardian/guardian.pl
index b5c3f9c16ae78c3499b5c2f062396f6ffd784177..8c2e3b7046e98a3094bd1f28e8a7908dbbd7c866 100644 (file)
--- a/config/guardian/guardian.pl
+++ b/config/guardian/guardian.pl
@@ -211,7 +211,8 @@ sub build_ignore_hash {
        if ($ignorefile ne "") {
                open (IGNORE, $ignorefile);
                while (<IGNORE>) {
-                       chop;
+                       $_=~ s/\s+$//;
+                       chomp;
                        next if (/\#/);  #skip comments
                        next if (/^\s*$/); # and blank lines
                        $ignore{$_}=1;

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 42a483d9c6255cb1ac31a57d6688dbac0b95c715..acde82953eb042a1f9f2c008043e69b6ef08281b 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -296,7 +296,7 @@
 * rssdler-0.4.0a
 * rsync-3.0.7
 * rtorrent-0.8.6
-* samba-3.5.3
+* samba-3.5.4
 * sane-1.0.19
 * screen-4.0.3
 * sdparm-1.01

diff --git a/lfs/samba b/lfs/samba
index b1464417df77334368cbf18a41672f64f65cd8da..965a4503e0b6b41e33ad755c13c53c2b5a556790 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.5.3
+VER        = 3.5.4
 
 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    = 27
+PAK_VER    = 28
 
 DEPS       = "cups"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7c8d2a34b649380d5df838c3e030dbec
+$(DL_FILE)_MD5 = 22c8c977eaa18be50f3878c6d0e0c2f0
 
 install : $(TARGET)