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

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

config/rootfiles/core/48/filelists/perl-GD

@@ -0,0 +1 @@
+../../../common/perl-GD

config/rootfiles/core/49/filelists/files

@@ -2,3 +2,4 @@ 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

config/rootfiles/core/49/filelists/perl-GD

@@ -0,0 +1 @@
+../../../common/perl-GD

config/rootfiles/core/49/update.sh

@@ -26,7 +26,7 @@
 
 #
 # Remove old core updates from pakfire cache to save space...
-core=48
+core=49
 for (( i=1; i<=$core; i++ ))
 do
 	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire

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

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