From e2e79cf39224a0ed1b1d184804905d490142d895 Mon Sep 17 00:00:00 2001
From: Maniacikarus <maniacikarus@ipfire.org>
Date: Fri, 15 Aug 2008 07:04:49 +0200
Subject: [PATCH] Updated ntfs-3g to current stable Added ntfs-3g to core16
 dropped iso upload out of make.sh build commented out some packages we may
 drop

---
 config/rootfiles/common/ntfs-3g           |  4 ++--
 config/rootfiles/core/16/files            |  4 ++--
 config/rootfiles/updater/filelists/core16 |  4 ++--
 doc/packages-list.txt                     |  2 +-
 lfs/ntfs-3g                               |  4 ++--
 make.sh                                   | 12 ++++++------
 tools/make-functions                      |  8 ++++----
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/config/rootfiles/common/ntfs-3g b/config/rootfiles/common/ntfs-3g
index b59b21f7ac..0fe5eef639 100644
--- a/config/rootfiles/common/ntfs-3g
+++ b/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
diff --git a/config/rootfiles/core/16/files b/config/rootfiles/core/16/files
index 4ea5a0051f..8defef9eda 100644
--- a/config/rootfiles/core/16/files
+++ b/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
diff --git a/config/rootfiles/updater/filelists/core16 b/config/rootfiles/updater/filelists/core16
index 4ea5a0051f..8defef9eda 100644
--- a/config/rootfiles/updater/filelists/core16
+++ b/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
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 51ed7cabfd..54ed899e42 100644
--- a/doc/packages-list.txt
+++ b/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
diff --git a/lfs/ntfs-3g b/lfs/ntfs-3g
index d2cf9840c6..80cd5a47c2 100644
--- a/lfs/ntfs-3g
+++ b/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)
 
diff --git a/make.sh b/make.sh
index 5a0fdcc269..efd7e8f71a 100755
--- a/make.sh
+++ b/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
diff --git a/tools/make-functions b/tools/make-functions
index 3c3b198f42..c41f4c69a5 100644
--- a/tools/make-functions
+++ b/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
-- 
2.39.2