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, next has been updated via 79524818a2a788aa34ce6478b79584a50602198a (commit) via d3607d82438ceea775965895e03e80e8ee256269 (commit) via f63935b14af95fdeb2ae0324f4e8ddecd9c495c1 (commit) via a16ee2c1d12c329597e0fcc3cc5f005dd9a4ec21 (commit) from 98c1a5739f9a909d0d262e27d8e0cc7f11d3b32c (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 79524818a2a788aa34ce6478b79584a50602198a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Oct 1 00:33:00 2010 +0200
Add speed.cgi fix to core update.
commit d3607d82438ceea775965895e03e80e8ee256269 Merge: 98c1a57 f63935b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Oct 1 00:31:31 2010 +0200
Merge branch 'master' into next
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/test/filelists/files | 1 + html/cgi-bin/speed.cgi | 1 + lfs/mpd | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/test/filelists/files b/config/rootfiles/core/test/filelists/files index 509483d..2b9a2f5 100644 --- a/config/rootfiles/core/test/filelists/files +++ b/config/rootfiles/core/test/filelists/files @@ -1,3 +1,4 @@ etc/system-release etc/rc.d/init.d/checkfstab usr/local/bin/rebuild-initrd +srv/web/ipfire/cgi-bin/speed.cgi diff --git a/html/cgi-bin/speed.cgi b/html/cgi-bin/speed.cgi index 3445ec1..b714d67 100644 --- a/html/cgi-bin/speed.cgi +++ b/html/cgi-bin/speed.cgi @@ -73,6 +73,7 @@ else $tx_kbs = int($tx_kbs); }
+print "pragma: no-cache\n"; print "Content-type: text/xml\n\n"; print "<?xml version=\"1.0\"?>\n"; print <<END diff --git a/lfs/mpd b/lfs/mpd index 3e0999c..e6d86ab 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -24,7 +24,7 @@
include Config
-VER = 0.15.8 +VER = 0.15.12
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 = 10 +PAK_VER = 11
DEPS = "alsa faad2 ffmpeg-libs glib lame libshout libogg libid3tag libvorbis"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 824e1ce46c0f468865d9e5e403cdaf5d +$(DL_FILE)_MD5 = b00b289a20ecd9accfd4972d6395135c
install : $(TARGET)
hooks/post-receive -- IPFire 2.x development tree