Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

config/rootfiles/common/ntfs-3g

@@ -2,8 +2,8 @@ bin/ntfs-3g
 #lib/libntfs-3g.a
 #lib/libntfs-3g.la
 lib/libntfs-3g.so
-lib/libntfs-3g.so.31
-lib/libntfs-3g.so.31.0.0
+lib/libntfs-3g.so.34
+lib/libntfs-3g.so.34.0.0
 sbin/mount.ntfs-3g
 #usr/include/ntfs-3g
 #usr/include/ntfs-3g/attrib.h

config/rootfiles/core/16/files

@@ -5,8 +5,8 @@ var/ipfire/urlfilter/autoupdate/autoupdate.urls
 usr/sbin/redirect_wrapper
 bin/ntfs-3g
 lib/libntfs-3g.so
-lib/libntfs-3g.so.31
-lib/libntfs-3g.so.31.0.0
+lib/libntfs-3g.so.34
+lib/libntfs-3g.so.34.0.0
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/backup.cgi
 srv/web/ipfire/cgi-bin/outgoingfw.cgi

config/rootfiles/updater/filelists/core16

@@ -5,8 +5,8 @@ var/ipfire/urlfilter/autoupdate/autoupdate.urls
 usr/sbin/redirect_wrapper
 bin/ntfs-3g
 lib/libntfs-3g.so
-lib/libntfs-3g.so.31
-lib/libntfs-3g.so.31.0.0
+lib/libntfs-3g.so.34
+lib/libntfs-3g.so.34.0.0
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/backup.cgi
 srv/web/ipfire/cgi-bin/outgoingfw.cgi

doc/packages-list.txt

@@ -213,7 +213,7 @@
 * nfs-utils-1.1.1
 * nmap-4.03
 * noip_updater_v1.6
-* ntfs-3g-1.2531
+* ntfs-3g-1.2712
 * ntp-4.2.2
 * ocaml-3.09.2
 * oinkmaster-2.0

lfs/ntfs-3g

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.2531
+VER        = 1.2712
 
 THISAPP    = ntfs-3g-$(VER)
 DL_FILE    = $(THISAPP).tgz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 69374cd09803c5fdbb5dabd1d704b9fe
+$(DL_FILE)_MD5 = 9e50dac71261dbb401511be4e9020def
 
 install : $(TARGET)
 

make.sh

@@ -505,7 +505,7 @@ buildipfire() {
   ipfiremake spamassassin
   ipfiremake amavisd
   ipfiremake alsa
-  ipfiremake mpg123
+#  ipfiremake mpg123
   ipfiremake mpfire
   ipfiremake guardian
   ipfiremake libid3tag
@@ -547,18 +547,18 @@ buildipfire() {
   ipfiremake which
   ipfiremake openswan
   ipfiremake lsof
-  ipfiremake centerim
+ # ipfiremake centerim
   ipfiremake br2684ctl
   ipfiremake pcmciautils
   ipfiremake lm_sensors
   ipfiremake collectd
-  ipfiremake lcd4linux
+ # ipfiremake lcd4linux
   ipfiremake neon
-  ipfiremake subversion
+ # ipfiremake subversion
   ipfiremake tcptrack
   ipfiremake teamspeak
   ipfiremake elinks
-  ipfiremake igmpproxy
+ # ipfiremake igmpproxy
   ipfiremake fbset
   ipfiremake sdl
   ipfiremake qemu
@@ -566,7 +566,7 @@ buildipfire() {
   ipfiremake netpbm
   ipfiremake phpSANE
   ipfiremake tunctl
-  ipfiremake nagios
+ # ipfiremake nagios
   ipfiremake ebtables
   ipfiremake arptables
   ipfiremake fontconfig

tools/make-functions

@@ -507,12 +507,12 @@ batch_script() {
 	evaluate 1 mail_me ERROR
 
 	echo "### UPLOADING ISO"
-	$0 upload iso
-	evaluate 1 mail_me ISO
+	#$0 upload iso
+	#evaluate 1 mail_me ISO
 	
 	echo -ne "### UPLOADING PAKS"
-	$0 upload paks
-	evaluate 1 mail_me PAKS
+	#$0 upload paks
+	#evaluate 1 mail_me PAKS
 
 	echo -ne "${BOLD}***SUCCESS!${NORMAL}"
 	mail_me success