From b4c8d582db1ca1a00193f827105a80523b1936e0 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 2 Apr 2011 12:13:59 +0200 Subject: [PATCH 1/4] MIME-Tools: Update to 5.502. --- lfs/MIME-Tools | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/MIME-Tools b/lfs/MIME-Tools index 00f0b4080..6e2e2ef99 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 # # # # 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) From 563e4c7d67ae869b12d050751ab27d2b357548d8 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 2 Apr 2011 12:15:19 +0200 Subject: [PATCH 2/4] Mail-tools: Update to 2.07. --- lfs/Mail-Tools | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/Mail-Tools b/lfs/Mail-Tools index b1ad6c8ce..4e4b8faab 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) From 777d1bfd0ad10d4445b7a1300bb948561c350ed5 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 2 Apr 2011 17:51:13 +0200 Subject: [PATCH 3/4] lm_sensors: Update to 3.3.0. --- config/rootfiles/common/lm_sensors | 3 +-- lfs/lm_sensors | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/lm_sensors b/config/rootfiles/common/lm_sensors index 76e796ec3..217ac549d 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/lfs/lm_sensors b/lfs/lm_sensors index 475c05b0e..b5ebcfba7 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) From 2d84d37af6df59404760cf4d1413a7b019ba295c Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 2 Apr 2011 17:52:42 +0200 Subject: [PATCH 4/4] Started core49. --- config/rootfiles/core/49/exclude | 1 + config/rootfiles/core/49/filelists/MIME-Tools | 1 + config/rootfiles/core/49/filelists/Mail-Tools | 1 + config/rootfiles/core/49/filelists/files | 4 ++ config/rootfiles/core/49/filelists/lm_sensors | 1 + config/rootfiles/core/49/meta | 1 + config/rootfiles/core/49/update.sh | 59 +++++++++++++++++++ make.sh | 2 +- 8 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 config/rootfiles/core/49/exclude create mode 120000 config/rootfiles/core/49/filelists/MIME-Tools create mode 120000 config/rootfiles/core/49/filelists/Mail-Tools create mode 100644 config/rootfiles/core/49/filelists/files create mode 120000 config/rootfiles/core/49/filelists/lm_sensors create mode 100644 config/rootfiles/core/49/meta create mode 100644 config/rootfiles/core/49/update.sh diff --git a/config/rootfiles/core/49/exclude b/config/rootfiles/core/49/exclude new file mode 100644 index 000000000..6fe46b4c8 --- /dev/null +++ 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 000000000..af86028c9 --- /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 000000000..55e3e0c42 --- /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 new file mode 100644 index 000000000..6bc22d450 --- /dev/null +++ b/config/rootfiles/core/49/filelists/files @@ -0,0 +1,4 @@ +etc/system-release +var/ipfire/backup/bin/backup.pl +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi diff --git a/config/rootfiles/core/49/filelists/lm_sensors b/config/rootfiles/core/49/filelists/lm_sensors new file mode 120000 index 000000000..dd0df32e0 --- /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/config/rootfiles/core/49/meta b/config/rootfiles/core/49/meta new file mode 100644 index 000000000..d547fa86f --- /dev/null +++ b/config/rootfiles/core/49/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/49/update.sh b/config/rootfiles/core/49/update.sh new file mode 100644 index 000000000..b34d37d65 --- /dev/null +++ b/config/rootfiles/core/49/update.sh @@ -0,0 +1,59 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2011 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=48 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#depmod 2.6.32.28-ipfire >/dev/null 2>&1 +#depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1 +#depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1 + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index a05cfbcc2..f572b9304 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number -CORE="48" # Core Level (Filename) +CORE="49" # Core Level (Filename) PAKFIRE_CORE="48" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan