Diverse Fixes.

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

diff --git a/config/rootfiles/ver_devel/devel b/config/rootfiles/ver_devel/devel
index 7e1e257990c278dbb4c1626d357aebcde4e777f7..d65d1f91c63a9e7c450f0d001c18155940719f1d 100644 (file)
--- a/config/rootfiles/ver_devel/devel
+++ b/config/rootfiles/ver_devel/devel
@@ -21,7 +21,6 @@ usr/lib
 usr/libexec
 usr/local
 usr/man
-usr/nagios
 usr/sbin
 usr/share
 usr/sieve

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index cfa139ca02a1f9e15ae3918bcd3f13b6ed63b3bd..4fba86087276572bb86884bca8a8c56aa9ff0e14 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -60,7 +60,6 @@
 * cyrus-imapd-2.2.12
 * cyrus-sasl-2.1.21
 * db-4.4.20
-* dbus-0.62
 * dhcp-3.0.4
 * dhcpcd-2.0.8
 * diffutils-2.8.1
@@ -105,13 +104,11 @@
 * groff-1.18.1.1
 * grub-0.97
 * gzip-1.3.5
-* hal-0.5.7.1
 * hddtemp-0.3-beta14
 * hdparm-6.6
 * htop-0.6.2
 * httpd-2.2.2
 * hwdata-0.191
-* hwinfo-ipfire
 * iana-etc-2.10
 * ibod
 * iftop-0.17
@@ -122,7 +119,6 @@
 * ipp2p-0.8.2-iptables
 * iproute2-2.6.16-060323
 * iptables-1.3.5
-* iptraf-3.0.0
 * iptstate-2.1
 * iputils-ss020927
 * isapnptools-1.26
@@ -175,7 +171,6 @@
 * mpg123-0.59r
 * mtools-3.9.10
 * mysql-5.0.24a
-* nagios-2.5
 * nano-1.2.5
 * nash
 * nasm-0.98.39

diff --git a/lfs/slang b/lfs/slang
index 371218b809da1ebfd23f354dcb98c6050764c88f..0cb9c18c720876473a62648c5a14cbb5391824d1 100644 (file)
--- a/lfs/slang
+++ b/lfs/slang
@@ -79,12 +79,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 ifeq "$(LFS_PASS)" "install"
        cd $(DIR_APP) && ./configure --prefix=""
        cd $(DIR_APP)/src && patch < $(DIR_SRC)/src/patches/slang-$(VER)-uclibc.patch
-       cd $(DIR_APP)/src && make $(MAKETUNING)
+       cd $(DIR_APP)/src && make
        cd $(DIR_APP)/src && make install DESTDIR="/opt/$(MACHINE)-uClibc"
 else
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
        cd $(DIR_APP) && make $(MAKETUNING)
-       cd $(DIR_APP) && make elf $(MAKETUNING)
+       cd $(DIR_APP) && make elf
        cd $(DIR_APP) && make install-elf
        cd $(DIR_APP) && chmod -v 755 /usr/lib/libslang.so.2.0.6
 endif

diff --git a/make.sh b/make.sh
index 143f4f7f544f55dfb042e2fd47368d817274d73f..d641bc0889f5cc481c5ec55219fb7075de671213 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -170,7 +170,7 @@ prepareenv() {
     # Setup environment
     set +h
     LC_ALL=POSIX
-    MAKETUNING="-j4"
+    MAKETUNING="-j6"
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 

diff --git a/src/misc-progs/smartctrl.c b/src/misc-progs/smartctrl.c
index b3a40629bcf94ad61fe761dcf3522b550d73c9a5..b5a4427850da5e65ed1868c110c9dfa311a082a8 100644 (file)
--- a/src/misc-progs/smartctrl.c
+++ b/src/misc-progs/smartctrl.c
@@ -13,6 +13,10 @@
 #include <fcntl.h>
 #include "setuid.h"
 
+#define BUFFER_SIZE 1024
+
+char command[BUFFER_SIZE]; 
+
 int main(int argc, char *argv[]) {
 
        if (!(initsetuid()))
@@ -22,7 +26,8 @@ int main(int argc, char *argv[]) {
                fprintf(stderr, "\nNo argument given.\n\nsmartctrl <device>\n\n");
                exit(1);
        }
-       safe_system("smartctl -iHA /dev/%s", argv[1]);
+       sprintf(command, "smartctl -iHA /dev/%s", argv[1]);
+       safe_system(command);
 
        return 0;
 }