This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via fd4da55b68527cfef08eeffbb39915cf2ee01ed9 (commit) via aed60254080eba17ebc217d9cfb2043b6f196f63 (commit) from 16295ef4a0bd053a2e2b34e5d14478131ac1fe3c (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit fd4da55b68527cfef08eeffbb39915cf2ee01ed9 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Thu Jun 24 21:39:07 2010 +0200

Fixed guardian ignore file handling and linefead detection.

commit aed60254080eba17ebc217d9cfb2043b6f196f63 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Thu Jun 24 21:38:47 2010 +0200

Updated samba to latest stable

-----------------------------------------------------------------------

Summary of changes: config/guardian/guardian.pl | 3 ++- doc/packages-list.txt | 2 +- lfs/samba | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-)

Difference in files: diff --git a/config/guardian/guardian.pl b/config/guardian/guardian.pl index b5c3f9c..8c2e3b7 100644 --- 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 42a483d..acde829 100644 --- 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 b146441..965a450 100644 --- 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)

hooks/post-receive -- IPFire 2.x development tree