From 0449b50f896009ad68431e2bd7b3091f5570269d Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 26 Feb 2011 19:13:37 +0100 Subject: [PATCH 01/10] Fix core updater 45-48 to remove only old core updates from cache. Conflicts: config/rootfiles/core/48/update.sh --- config/rootfiles/core/45/update.sh | 9 +++++++-- config/rootfiles/core/46/update.sh | 9 +++++++-- config/rootfiles/core/47/update.sh | 9 +++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh index 228ada4e4..6a76bf845 100644 --- a/config/rootfiles/core/45/update.sh +++ b/config/rootfiles/core/45/update.sh @@ -25,8 +25,13 @@ /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # -# Remove core updates from pakfire cache to save space... -rm -f /var/cache/pakfire/core-upgrade-*.ipfire +# Remove old core updates from pakfire cache to save space... +core=45 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-$i.ipfire +done + # #Stop services echo Stopping Proxy diff --git a/config/rootfiles/core/46/update.sh b/config/rootfiles/core/46/update.sh index 6d2a75dc4..ccf6719ce 100644 --- a/config/rootfiles/core/46/update.sh +++ b/config/rootfiles/core/46/update.sh @@ -25,8 +25,13 @@ /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # -# Remove core updates from pakfire cache to save space... -rm -f /var/cache/pakfire/core-upgrade-*.ipfire +# Remove old core updates from pakfire cache to save space... +core=46 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-$i.ipfire +done + # #Stop services diff --git a/config/rootfiles/core/47/update.sh b/config/rootfiles/core/47/update.sh index ef10f558b..02c315c81 100644 --- a/config/rootfiles/core/47/update.sh +++ b/config/rootfiles/core/47/update.sh @@ -25,8 +25,13 @@ /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # -# Remove core updates from pakfire cache to save space... -rm -f /var/cache/pakfire/core-upgrade-*.ipfire +# Remove old core updates from pakfire cache to save space... +core=47 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-$i.ipfire +done + # #Stop services From 0b1f331c5081e10d98ae9b9174bda2fc3442265d Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 27 Feb 2011 16:31:52 +0100 Subject: [PATCH 02/10] Fix name generation of old core updates. Conflicts: config/rootfiles/core/48/update.sh --- config/rootfiles/core/45/update.sh | 2 +- config/rootfiles/core/46/update.sh | 2 +- config/rootfiles/core/47/update.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh index 6a76bf845..646a5532a 100644 --- a/config/rootfiles/core/45/update.sh +++ b/config/rootfiles/core/45/update.sh @@ -29,7 +29,7 @@ core=45 for (( i=1; i<=$core; i++ )) do - rm -f /var/cache/pakfire/core-upgrade-$i.ipfire + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done # diff --git a/config/rootfiles/core/46/update.sh b/config/rootfiles/core/46/update.sh index ccf6719ce..7769a85a6 100644 --- a/config/rootfiles/core/46/update.sh +++ b/config/rootfiles/core/46/update.sh @@ -29,7 +29,7 @@ core=46 for (( i=1; i<=$core; i++ )) do - rm -f /var/cache/pakfire/core-upgrade-$i.ipfire + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done # diff --git a/config/rootfiles/core/47/update.sh b/config/rootfiles/core/47/update.sh index 02c315c81..3adc61658 100644 --- a/config/rootfiles/core/47/update.sh +++ b/config/rootfiles/core/47/update.sh @@ -29,7 +29,7 @@ core=47 for (( i=1; i<=$core; i++ )) do - rm -f /var/cache/pakfire/core-upgrade-$i.ipfire + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done # From 3bcaa8bbdf45ae2ff2ac9084ef2ccdd38a55d912 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 21 Mar 2011 12:24:37 +0100 Subject: [PATCH 03/10] nano: rootfile update. --- config/rootfiles/packages/nano | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/config/rootfiles/packages/nano b/config/rootfiles/packages/nano index 8a2f61624..815c3fac7 100644 --- a/config/rootfiles/packages/nano +++ b/config/rootfiles/packages/nano @@ -9,17 +9,34 @@ usr/bin/rnano #usr/share/man/man5/nanorc.5 #usr/share/nano usr/share/nano/asm.nanorc +usr/share/nano/awk.nanorc usr/share/nano/c.nanorc +usr/share/nano/cmake.nanorc +usr/share/nano/css.nanorc +usr/share/nano/debian.nanorc +usr/share/nano/fortran.nanorc +usr/share/nano/gentoo.nanorc usr/share/nano/groff.nanorc usr/share/nano/html.nanorc usr/share/nano/java.nanorc +usr/share/nano/makefile.nanorc +#usr/share/nano/man-html +#usr/share/nano/man-html/nano.1.html +#usr/share/nano/man-html/nanorc.5.html +#usr/share/nano/man-html/rnano.1.html usr/share/nano/man.nanorc +usr/share/nano/mgp.nanorc usr/share/nano/mutt.nanorc usr/share/nano/nanorc.nanorc +usr/share/nano/objc.nanorc +usr/share/nano/ocaml.nanorc usr/share/nano/patch.nanorc usr/share/nano/perl.nanorc +usr/share/nano/php.nanorc usr/share/nano/pov.nanorc usr/share/nano/python.nanorc usr/share/nano/ruby.nanorc usr/share/nano/sh.nanorc +usr/share/nano/tcl.nanorc usr/share/nano/tex.nanorc +usr/share/nano/xml.nanorc From ed10297e1bf16da05f429e1c6f1fc21926d96474 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 26 Mar 2011 14:22:51 +0100 Subject: [PATCH 04/10] ipfireseeder: update to seed core48. --- 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 4e21567ef..866d173c6 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.9.i586-full-core47.iso.torrent +var/ipfire/seeder/ipfire-2.9.i586-full-core48.iso.torrent #var/log/seeder var/log/seeder/info diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index 4bdbc481f..2292c3ee2 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -27,13 +27,13 @@ include Config VER = 1.00 THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.9.i586-full-core47.iso.torrent +DL_FILE = ipfire-2.9.i586-full-core48.iso.torrent DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 23 +PAK_VER = 24 DEPS = "rtorrent" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 388d32a2f741df4afa76578948804ae3 +$(DL_FILE)_MD5 = 37dd855f48af4efae045eb9b1f971a6e install : $(TARGET) From 1151f4d08bf00dee56487968f321a09e0bb36bfe Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 26 Mar 2011 14:30:49 +0100 Subject: [PATCH 05/10] gnump3d: add full path to gnumpd3d-index at gnump3d install. --- src/paks/gnump3d/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/paks/gnump3d/install.sh b/src/paks/gnump3d/install.sh index 13c7e8a85..1e0f3cb65 100644 --- a/src/paks/gnump3d/install.sh +++ b/src/paks/gnump3d/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files [ -d /var/mp3 ] || ( mkdir /var/mp3 && chown nobody.nobody /var/mp3 ) -gnump3d-index & +/usr/bin/gnump3d-index & start_service ${NAME} ln -svf ../init.d/gnump3d /etc/rc.d/rc0.d/K00gnump3d ln -svf ../init.d/gnump3d /etc/rc.d/rc3.d/S99gnump3d From 7a524f82b94fa35dab7c1abfbe11865ece156ef5 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 29 Mar 2011 16:19:22 +0200 Subject: [PATCH 06/10] core48: add missing perl-GD modules. --- config/rootfiles/core/48/filelists/perl-GD | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/48/filelists/perl-GD diff --git a/config/rootfiles/core/48/filelists/perl-GD b/config/rootfiles/core/48/filelists/perl-GD new file mode 120000 index 000000000..962d937da --- /dev/null +++ b/config/rootfiles/core/48/filelists/perl-GD @@ -0,0 +1 @@ +../../../common/perl-GD \ No newline at end of file From efaf7bd8df72e27be32f7d937e3e4e2039fcff0d Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 29 Mar 2011 17:23:26 +0200 Subject: [PATCH 07/10] Started core upgrade 49. --- config/rootfiles/core/49/exclude | 0 config/rootfiles/core/49/filelists/files | 1 + config/rootfiles/core/49/filelists/perl-GD | 1 + config/rootfiles/core/49/meta | 1 + config/rootfiles/core/49/update.sh | 59 ++++++++++++++++++++++ make.sh | 2 +- 6 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 config/rootfiles/core/49/exclude create mode 100644 config/rootfiles/core/49/filelists/files create mode 120000 config/rootfiles/core/49/filelists/perl-GD 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..e69de29bb diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files new file mode 100644 index 000000000..0037af183 --- /dev/null +++ b/config/rootfiles/core/49/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/49/filelists/perl-GD b/config/rootfiles/core/49/filelists/perl-GD new file mode 120000 index 000000000..962d937da --- /dev/null +++ b/config/rootfiles/core/49/filelists/perl-GD @@ -0,0 +1 @@ +../../../common/perl-GD \ 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..7c2a8bfcd --- /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=49 +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 From 59d6383286979b33f0d63f8afac6a6209fbd1c0d Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Fri, 1 Apr 2011 11:09:59 +0200 Subject: [PATCH 08/10] Updated ntfs-3g to latest stable. --- config/rootfiles/common/ntfs-3g | 17 +++++++++++++++-- lfs/ntfs-3g | 4 ++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/ntfs-3g b/config/rootfiles/common/ntfs-3g index 662213c65..2762b8fd7 100644 --- a/config/rootfiles/common/ntfs-3g +++ b/config/rootfiles/common/ntfs-3g @@ -1,14 +1,19 @@ +bin/lowntfs-3g bin/ntfs-3g lib/libntfs-3g.so -lib/libntfs-3g.so.54 -lib/libntfs-3g.so.54.0.0 +lib/libntfs-3g.so.80 +lib/libntfs-3g.so.80.0.0 +sbin/mount.lowntfs-3g sbin/mount.ntfs-3g usr/bin/ntfs-3g.probe +usr/bin/ntfs-3g.secaudit +usr/bin/ntfs-3g.usermap #usr/include/ntfs-3g #usr/include/ntfs-3g/attrib.h #usr/include/ntfs-3g/attrlist.h #usr/include/ntfs-3g/bitmap.h #usr/include/ntfs-3g/bootsect.h +#usr/include/ntfs-3g/cache.h #usr/include/ntfs-3g/collate.h #usr/include/ntfs-3g/compat.h #usr/include/ntfs-3g/compress.h @@ -16,6 +21,7 @@ usr/bin/ntfs-3g.probe #usr/include/ntfs-3g/device.h #usr/include/ntfs-3g/device_io.h #usr/include/ntfs-3g/dir.h +#usr/include/ntfs-3g/efs.h #usr/include/ntfs-3g/endians.h #usr/include/ntfs-3g/index.h #usr/include/ntfs-3g/inode.h @@ -27,6 +33,9 @@ usr/bin/ntfs-3g.probe #usr/include/ntfs-3g/misc.h #usr/include/ntfs-3g/mst.h #usr/include/ntfs-3g/ntfstime.h +#usr/include/ntfs-3g/object_id.h +#usr/include/ntfs-3g/param.h +#usr/include/ntfs-3g/reparse.h #usr/include/ntfs-3g/runlist.h #usr/include/ntfs-3g/security.h #usr/include/ntfs-3g/support.h @@ -34,12 +43,16 @@ usr/bin/ntfs-3g.probe #usr/include/ntfs-3g/unistr.h #usr/include/ntfs-3g/version.h #usr/include/ntfs-3g/volume.h +#usr/include/ntfs-3g/xattrs.h #usr/lib/libntfs-3g.a #usr/lib/libntfs-3g.la usr/lib/libntfs-3g.so usr/lib/pkgconfig/libntfs-3g.pc #usr/share/doc/ntfs-3g #usr/share/doc/ntfs-3g/README +#usr/share/man/man8/mount.lowntfs-3g.8 #usr/share/man/man8/mount.ntfs-3g.8 #usr/share/man/man8/ntfs-3g.8 #usr/share/man/man8/ntfs-3g.probe.8 +#usr/share/man/man8/ntfs-3g.secaudit.8 +#usr/share/man/man8/ntfs-3g.usermap.8 diff --git a/lfs/ntfs-3g b/lfs/ntfs-3g index 06ecb0c49..4d65137ba 100644 --- a/lfs/ntfs-3g +++ b/lfs/ntfs-3g @@ -24,7 +24,7 @@ include Config -VER = 2009.4.4 +VER = 2011.1.15 THISAPP = ntfs-3g-$(VER) DL_FILE = $(THISAPP).tgz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e0b5c170f088a8d82968f0a6b34d31da +$(DL_FILE)_MD5 = 15a5cf5752012269fa168c24191f00e2 install : $(TARGET) From e3341bc21612b4036801b32d6679fa3d17ca0d99 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Sat, 2 Apr 2011 14:32:31 +0200 Subject: [PATCH 09/10] Fixded localhost webservers are directed to the proxy if auto configuration is used. Fixes bug #770 --- config/rootfiles/core/49/filelists/files | 1 + html/cgi-bin/proxy.cgi | 1 + 2 files changed, 2 insertions(+) diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 0037af183..d4ff5e242 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -1 +1,2 @@ etc/system-release +srv/web/ipfire/cgi-bin/proxy.cgi diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 8b3200dab..fc65e7a1b 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -2924,6 +2924,7 @@ sub writepacfile if ( (isPlainHostName(host)) || (dnsDomainIs(host, ".$mainsettings{'DOMAINNAME'}")) || + (isInNet(host, "127.0.0.1", "255.0.0")) || (isInNet(host, "10.0.0.0", "255.0.0.0")) || (isInNet(host, "172.16.0.0", "255.240.0.0")) || (isInNet(host, "192.168.0.0", "255.255.0.0")) || From c03cf9ea9db6ed0d757b44211a6df6116275078c Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Sat, 2 Apr 2011 14:37:42 +0200 Subject: [PATCH 10/10] Fixed the last commit. A 0 was missing. --- html/cgi-bin/proxy.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index fc65e7a1b..a0aa1acd3 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -2924,7 +2924,7 @@ sub writepacfile if ( (isPlainHostName(host)) || (dnsDomainIs(host, ".$mainsettings{'DOMAINNAME'}")) || - (isInNet(host, "127.0.0.1", "255.0.0")) || + (isInNet(host, "127.0.0.1", "255.0.0.0")) || (isInNet(host, "10.0.0.0", "255.0.0.0")) || (isInNet(host, "172.16.0.0", "255.240.0.0")) || (isInNet(host, "192.168.0.0", "255.255.0.0")) ||