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/ntfs-3g b/config/rootfiles/common/ntfs-3g
index 662213c6548fc3e4b6006ab8afc01d62d95ab451..2762b8fd7cc0eea261fb480bd8337cd7d6de3541 100644 (file)
--- 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/config/rootfiles/core/48/filelists/perl-GD b/config/rootfiles/core/48/filelists/perl-GD
new file mode 120000 (symlink)
index 0000000..962d937
--- /dev/null
+++ b/config/rootfiles/core/48/filelists/perl-GD
@@ -0,0 +1 @@
+../../../common/perl-GD
\ No newline at end of file

diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files
index 6bc22d450dd167f3f893a96ac81d11b5f459b6db..ed587ee921d85e8f403e9934bc2c08aff787b51a 100644 (file)
--- a/config/rootfiles/core/49/filelists/files
+++ b/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

diff --git a/config/rootfiles/core/49/filelists/perl-GD b/config/rootfiles/core/49/filelists/perl-GD
new file mode 120000 (symlink)
index 0000000..962d937
--- /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/update.sh b/config/rootfiles/core/49/update.sh
index b34d37d65a03f7c2952890aef0ac0f4e0d8689b2..7c2a8bfcdbb62cbfac19e02507e4fd883eaa3d43 100644 (file)
--- a/config/rootfiles/core/49/update.sh
+++ b/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

diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index 4e21567effbf8545b5f42e3fac41cde8c9cb7384..866d173c6f782fecb71c6fde6562deee259c014a 100644 (file)
--- 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/config/rootfiles/packages/nano b/config/rootfiles/packages/nano
index 8a2f616249cea5375a605c1687a6d661f7869c79..815c3fac7fda262866a2da40e3be8416881160d4 100644 (file)
--- 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

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 8b3200dab4306eb570857f416f518c73c0cbf680..a0aa1acd34e3d8f5981a3de84f7b7bf3feec02fa 100644 (file)
--- 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.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")) ||

diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index 4bdbc481f04716ad91f62f2b6b891f18740fbdc4..2292c3ee2c828e465cd671563cfb55e8abb29396 100644 (file)
--- 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)
 

diff --git a/lfs/ntfs-3g b/lfs/ntfs-3g
index 06ecb0c495ae3d5b40f16e698c046f7866d358fc..4d65137baf8c0f1c3d165aaaec00346b38beeb2f 100644 (file)
--- 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)
 

diff --git a/src/paks/gnump3d/install.sh b/src/paks/gnump3d/install.sh
index 13c7e8a857e1a7397907995be34cadea01ba7596..1e0f3cb651c379ede8803a149245501eb5ea6c94 100644 (file)
--- 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