updated collectd and hdparm

started core 9 and closed core 9

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1226 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/core/6/files b/config/rootfiles/core/6/files
index 4bce986a1938588cba85d9267180785734a90f13..6a52d27286a82f14289542436bb00524b03ee2d0 100644 (file)
--- a/config/rootfiles/core/6/files
+++ b/config/rootfiles/core/6/files
@@ -12,8 +12,8 @@ lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/ieee1394/sbp2.ko
 var/ipfire/langs
 srv/web/ipfire/cgi-bin/outgoingfw.cgi
 etc/init.d/squid
-bin/ntfs-3g
-lib/libntfs-3g.so
-lib/libntfs-3g.so.21
-lib/libntfs-3g.so.21.0.0
-sbin/mount.ntfs-3g
+#bin/ntfs-3g
+#lib/libntfs-3g.so
+#lib/libntfs-3g.so.21
+#lib/libntfs-3g.so.21.0.0
+#sbin/mount.ntfs-3g

diff --git a/config/rootfiles/core/8/files b/config/rootfiles/core/8/files
index 989570be02cff4f119126fd9885f900e03918f09..6530baaf33100423405b7ceef6d1272e7a49570b 100644 (file)
--- a/config/rootfiles/core/8/files
+++ b/config/rootfiles/core/8/files
@@ -5,3 +5,8 @@ lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/net/r8168.ko
 srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 etc/ntp
 usr/local/bin/wirelessctrl
+bin/ntfs-3g
+lib/libntfs-3g.so
+lib/libntfs-3g.so.23
+lib/libntfs-3g.so.23.0.0
+sbin/mount.ntfs-3g

diff --git a/config/rootfiles/core/8/update.sh b/config/rootfiles/core/8/update.sh
index 2e88c6ce9a171eac82367138882a2e614f7b9708..6deda161aa23946e5bb531ee5b884bdf25a41cb8 100644 (file)
--- a/config/rootfiles/core/8/update.sh
+++ b/config/rootfiles/core/8/update.sh
@@ -4,3 +4,4 @@ extract_files
 depmod -a
 echo "DROPWIRELESSFORWARD=on" >> /var/ipfire/optionsfw/settings
 echo "DROPWIRELESSINPUT=on" >> /var/ipfire/optionsfw/settings
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1

diff --git a/config/rootfiles/core/9/files b/config/rootfiles/core/9/files
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/config/rootfiles/core/9/meta b/config/rootfiles/core/9/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/9/meta
@@ -0,0 +1 @@
+DEPS=""

diff --git a/config/rootfiles/core/9/update.sh b/config/rootfiles/core/9/update.sh
new file mode 100644 (file)
index 0000000..a97e2ca
--- /dev/null
+++ b/config/rootfiles/core/9/update.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+. /opt/pakfire/lib/functions.sh
+extract_files
+depmod -a
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 07732008e12504b9c5abd25c5ac570bdd60eedc4..f6ab08c6777da256b6b9c4bd9db31052016ff2de 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -55,6 +55,7 @@
 * centerim-4.22.1
 * clamav-0.92.1
 * collectd-4.2.3
+* collectd-4.3.0
 * coreutils-5.96
 * cpio-2.6
 * cups-1.2.12
@@ -100,6 +101,7 @@
 * gzip-1.3.5
 * hddtemp-0.3-beta14
 * hdparm-8.1
+* hdparm-8.4
 * hplip-2.7.10
 * htop-0.7
 * httpd-2.2.6

diff --git a/lfs/collectd b/lfs/collectd
index 1794b5c63507f5db60f143dc5c84e8ae644c68a2..90564fe43d39399d368361127a22d5d2b2b8f726 100644 (file)
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = collectd
-VER        = 4.2.3
+VER        = 4.3.0
 
 THISAPP    = collectd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 19ebd43875fa364a356065b1d692c944
+$(DL_FILE)_MD5 = ace292ba502f09379741e79561cf2c89
 
 install : $(TARGET)
 

diff --git a/lfs/hdparm b/lfs/hdparm
index 9f79de3f345d3c49e2e0f3a75c32ffcccfa72500..9b4902900c99a9b1331582c042d0b90fc6c645dc 100644 (file)
--- a/lfs/hdparm
+++ b/lfs/hdparm
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 8.1
+VER        = 8.4
 
 THISAPP    = hdparm-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 87c1512497195204034503665f71f5fc
+$(DL_FILE)_MD5 = f29945ce67796253157dc3a8041131fb
 
 install : $(TARGET)