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 f5f63e050528814489a417b587e017e5d383e512 (commit) via 82f53e0afd9441127fb6cf778a24358edcb2fa37 (commit) via d6f92411062b78652f8bef75b22d3d841281e30f (commit) from c9f3d84663ed9e3b03e49bf58530c97185f33334 (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 f5f63e050528814489a417b587e017e5d383e512 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Feb 9 08:18:50 2010 +0100

Updated mpd (0.15.8).

commit 82f53e0afd9441127fb6cf778a24358edcb2fa37 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Feb 9 08:18:13 2010 +0100

samba.cgi don't overwrite old errormessage.

commit d6f92411062b78652f8bef75b22d3d841281e30f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Feb 9 08:17:33 2010 +0100

Fix core37 filelist.

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

Summary of changes: config/rootfiles/core/37/filelists/files | 8 ++++---- doc/packages-list.txt | 4 +++- html/cgi-bin/samba.cgi | 2 +- lfs/mpd | 6 +++--- 4 files changed, 11 insertions(+), 9 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/37/filelists/files b/config/rootfiles/core/37/filelists/files index e275dd3..1e46cb9 100644 --- a/config/rootfiles/core/37/filelists/files +++ b/config/rootfiles/core/37/filelists/files @@ -3,8 +3,8 @@ lib/modules/2.6.27.42-ipfire/kernel/net lib/modules/2.6.27.42-ipfire-xen/kernel/net lib/modules/2.6.27.42-ipfire/mISDN/hfcsusb.ko lib/modules/2.6.27.42-ipfire-xen/mISDN/hfcsusb.ko -lib/modules/2.6.27.42-ipfire/kernel/driver/hwmon/coretemp.ko -lib/modules/2.6.27.42-ipfire-xen/kernel/driver/hwmon/coretemp.ko -lib/modules/2.6.27.42-ipfire/kernel/driver/net/e131x.ko -lib/modules/2.6.27.42-ipfire-xen/kernel/driver/net/e131x.ko +lib/modules/2.6.27.42-ipfire/kernel/drivers/hwmon/coretemp.ko +lib/modules/2.6.27.42-ipfire-xen/kernel/drivers/hwmon/coretemp.ko +lib/modules/2.6.27.42-ipfire/kernel/drivers/net/et131x.ko +lib/modules/2.6.27.42-ipfire-xen/kernel/drivers/net/et131x.ko srv/web/ipfire/cgi-bin/urlfilter.cgi diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 027de07..c6696fe 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -98,6 +98,8 @@ * elinks-0.11.6 * esniper-2-19-0 * espgs-8.15.1 +* et131x-kmod-2.6.27.42-ipfire +* et131x-kmod-2.6.27.42-ipfire-xen * etherwake-1.09 * ethtool-3 * expat-2.0.0 @@ -229,7 +231,7 @@ * module-init-tools-3.5 * motion-3.2.11 * mpc-0.19 -* mpd-0.15.6 +* mpd-0.15.8 * mpeg2dec-0.4.0b * mpfire-ipfire * mtd-CVS-20070507 diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 4438a8b..4b8de89 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -126,7 +126,7 @@ my $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`; sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='1;'>" );print "<center><img src='/images/clock.gif' alt='' /><br/><font color='red'>$Lang::tr{'pagerefresh'}</font></center>";&Header::closebox();}

if (($sambasettings{'WIDELINKS'} eq 'on') & ($sambasettings{'UNIXEXTENSION'} eq 'on')) - {$errormessage="Don't enable 'Wide links' and 'Unix extension' at the same time"; } + {$errormessage = "$errormessage<br />Don't enable 'Wide links' and 'Unix extension' at the same time"; }

&Header::openpage('Samba', 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); diff --git a/lfs/mpd b/lfs/mpd index d755406..45d7d71 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -24,7 +24,7 @@

include Config

-VER = 0.15.6 +VER = 0.15.8

THISAPP = mpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/${THISAPP} TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpd -PAK_VER = 9 +PAK_VER = 10

DEPS = "alsa ffmpeg-libs glib lame libshout libogg libid3tag libvorbis"

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = e0b7a11f86f8f021a92c49a96032ff39 +$(DL_FILE)_MD5 = 824e1ce46c0f468865d9e5e403cdaf5d

install : $(TARGET)

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