Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 25 Jun 2010 20:55:30 +0000 (22:55 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 25 Jun 2010 20:55:30 +0000 (22:55 +0200)
config/guardian/guardian.pl
doc/packages-list.txt
lfs/samba

index b5c3f9c..8c2e3b7 100644 (file)
@@ -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;
index 42a483d..acde829 100644 (file)
 * 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
index b146441..965a450 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)