From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 2 Apr 2011 15:56:33 +0000 (+0200)
Subject: Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.9-core49~39
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=cadb66f381e606df01509e9a4e388b1d3b85752b;hp=c03cf9ea9db6ed0d757b44211a6df6116275078c

Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

Conflicts:
	config/rootfiles/core/49/filelists/files
	config/rootfiles/core/49/update.sh
---

diff --git a/config/rootfiles/common/lm_sensors b/config/rootfiles/common/lm_sensors
index 76e796ec31..217ac549d3 100644
--- a/config/rootfiles/common/lm_sensors
+++ b/config/rootfiles/common/lm_sensors
@@ -8,9 +8,8 @@ usr/bin/sensors-conf-convert
 #usr/lib/libsensors.a
 usr/lib/libsensors.so
 usr/lib/libsensors.so.4
-usr/lib/libsensors.so.4.2.1
+usr/lib/libsensors.so.4.3.1
 #usr/man/man1/sensors.1
-#usr/man/man3
 #usr/man/man3/libsensors.3
 #usr/man/man5/sensors.conf.5
 #usr/man/man5/sensors3.conf.5
diff --git a/config/rootfiles/core/49/exclude b/config/rootfiles/core/49/exclude
index e69de29bb2..6fe46b4c89 100644
--- a/config/rootfiles/core/49/exclude
+++ b/config/rootfiles/core/49/exclude
@@ -0,0 +1 @@
+/srv/web/ipfire/html/proxy.pac
diff --git a/config/rootfiles/core/49/filelists/MIME-Tools b/config/rootfiles/core/49/filelists/MIME-Tools
new file mode 120000
index 0000000000..af86028c94
--- /dev/null
+++ b/config/rootfiles/core/49/filelists/MIME-Tools
@@ -0,0 +1 @@
+../../../common/MIME-Tools
\ No newline at end of file
diff --git a/config/rootfiles/core/49/filelists/Mail-Tools b/config/rootfiles/core/49/filelists/Mail-Tools
new file mode 120000
index 0000000000..55e3e0c429
--- /dev/null
+++ b/config/rootfiles/core/49/filelists/Mail-Tools
@@ -0,0 +1 @@
+../../../common/Mail-Tools
\ No newline at end of file
diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files
index d4ff5e242c..ed587ee921 100644
--- a/config/rootfiles/core/49/filelists/files
+++ b/config/rootfiles/core/49/filelists/files
@@ -1,2 +1,5 @@
 etc/system-release
+var/ipfire/backup/bin/backup.pl
+srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/pppsetup.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
diff --git a/config/rootfiles/core/49/filelists/lm_sensors b/config/rootfiles/core/49/filelists/lm_sensors
new file mode 120000
index 0000000000..dd0df32e0e
--- /dev/null
+++ b/config/rootfiles/core/49/filelists/lm_sensors
@@ -0,0 +1 @@
+../../../common/lm_sensors
\ No newline at end of file
diff --git a/lfs/MIME-Tools b/lfs/MIME-Tools
index 00f0b40801..6e2e2ef999 100644
--- a/lfs/MIME-Tools
+++ b/lfs/MIME-Tools
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.420
+VER        = 5.502
 
 THISAPP    = MIME-tools-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4db6505cc0132c80c5a9cc54f443a21a
+$(DL_FILE)_MD5 = 6a87adda74867e3f8868a0599137bde0
 
 install : $(TARGET)
 
diff --git a/lfs/Mail-Tools b/lfs/Mail-Tools
index b1ad6c8cef..4e4b8faab5 100644
--- a/lfs/Mail-Tools
+++ b/lfs/Mail-Tools
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.74
+VER        = 2.07
 
 THISAPP    = MailTools-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = aba82a7eb87906278d98174e10d838be
+$(DL_FILE)_MD5 = df861e05cbcf3a336ecebfb2c42529d0
 
 install : $(TARGET)
 
diff --git a/lfs/lm_sensors b/lfs/lm_sensors
index 475c05b0eb..b5ebcfba7e 100644
--- a/lfs/lm_sensors
+++ b/lfs/lm_sensors
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.2
+VER        = 3.3.0
 
 THISAPP    = lm_sensors-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 58a9a225808ac4587c4c8cbd12b40b5c
+$(DL_FILE)_MD5 = 5eb18d7531ead4f54f28a1133a606535
 
 install : $(TARGET)