From b27961e905bdf8d7d67a6a30b51b31f1ddabdf91 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 20 Sep 2010 10:20:03 +0200
Subject: [PATCH 1/4] Updated ipfireseeder for core40.

---
 config/rootfiles/packages/ipfireseeder | 2 +-
 lfs/ipfireseeder                       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index 64898bef2..bacd4dda6 100644
--- a/config/rootfiles/packages/ipfireseeder
+++ b/config/rootfiles/packages/ipfireseeder
@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.7.i586-full-core39.iso.torrent
+var/ipfire/seeder/ipfire-2.7.i586-full-core40.iso.torrent
 #var/log/seeder
 var/log/seeder/info
diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index a0921c65c..b2a65ca0f 100644
--- a/lfs/ipfireseeder
+++ b/lfs/ipfireseeder
@@ -27,13 +27,13 @@ include Config
 VER        = 1.00
 
 THISAPP    = ipfireseeder-$(VER)
-DL_FILE    = ipfire-2.7.i586-full-core39.iso.torrent
+DL_FILE    = ipfire-2.7.i586-full-core40.iso.torrent
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
-PAK_VER    = 14
+PAK_VER    = 15
 
 DEPS       = "rtorrent"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fb86055370d1cd5c0736c47b3e4f68f6
+$(DL_FILE)_MD5 = 6475e2d772a39db73ea869328f98d2f3
 
 install : $(TARGET)
 

From ced716a1be295c06db1cde529c37ba043f23dc16 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 21 Sep 2010 23:36:30 +0200
Subject: [PATCH 2/4] Dnsmasq: disable internal TFTP-Server.

---
 lfs/dnsmasq | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lfs/dnsmasq b/lfs/dnsmasq
index 4804c1d94..29fb9b38d 100644
--- a/lfs/dnsmasq
+++ b/lfs/dnsmasq
@@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && sed -i -e 's|/usr/local|/usr|g' Makefile
 	cd $(DIR_APP)/src && sed -i \
 		-e 's|^\/\* #define HAVE_ISC_READER .*$$|#define HAVE_ISC_READER\n#define NO_IPV6|' \
+		-e 's|^#define HAVE_TFTP *$$|//#define HAVE_TFTP|' \
 		-e 's/^#define CHUSER .*$$/#define CHUSER "dnsmasq"/' config.h
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install

From a16ee2c1d12c329597e0fcc3cc5f005dd9a4ec21 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 22 Sep 2010 19:43:40 +0200
Subject: [PATCH 3/4] Updated mpd (0.15.12).

---
 lfs/mpd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lfs/mpd b/lfs/mpd
index 3e0999ce4..e6d86ab03 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)
 

From f63935b14af95fdeb2ae0324f4e8ddecd9c495c1 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 30 Sep 2010 23:53:55 +0200
Subject: [PATCH 4/4] Fix bandwich usage display with IE8.

---
 html/cgi-bin/speed.cgi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/cgi-bin/speed.cgi b/html/cgi-bin/speed.cgi
index 3445ec1aa..b714d679c 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