Nagios rausgeschmissen...

Ein paar statische Libs entfernt.

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

diff --git a/config/outgoingfw/defaultservices b/config/outgoingfw/defaultservices
index 9e40eeb31e04acb81a699756748080cfbc220bbc..f2cf475142621856df4aed08d6807b6d79e8dd08 100644 (file)
--- a/config/outgoingfw/defaultservices
+++ b/config/outgoingfw/defaultservices
@@ -31,4 +31,4 @@ ssh,22,tcp&udp,SSH
 telnet,23,tcp&udp,Telnet
 tftp,69,tcp&udp,Trivial File Transfer
 time,37,tcp&udp,Time
 telnet,23,tcp&udp,Telnet
 tftp,69,tcp&udp,Trivial File Transfer
 time,37,tcp&udp,Time

-wins,1512,tcp&udp,Windows Internet Name Service
\ No newline at end of file
+wins,1512,tcp&udp,Windows Internet Name Service

diff --git a/config/rootfiles/common/bridge-utils b/config/rootfiles/common/bridge-utils
index f5eb1319d4eaee8effa4c519a5231a4d6240ba03..6c5db4f49ffb4abcb9f9665ebfe3ec1043c99db4 100644 (file)
--- a/config/rootfiles/common/bridge-utils
+++ b/config/rootfiles/common/bridge-utils
@@ -1,4 +1,4 @@
 #usr/include/libbridge.h
 #usr/include/libbridge.h

-usr/lib/libbridge.a
+#usr/lib/libbridge.a

 #usr/man/man8/brctl.8
 usr/sbin/brctl
 #usr/man/man8/brctl.8
 usr/sbin/brctl

diff --git a/config/rootfiles/common/dbus b/config/rootfiles/common/dbus
deleted file mode 100644 (file)
index 30250b7..0000000
--- a/config/rootfiles/common/dbus
+++ /dev/null
@@ -1,56 +0,0 @@
-#etc/dbus-1
-#etc/dbus-1/session.conf
-#etc/dbus-1/system.conf
-#etc/dbus-1/system.d
-#usr/bin/dbus-binding-tool
-#usr/bin/dbus-cleanup-sockets
-#usr/bin/dbus-daemon
-#usr/bin/dbus-launch
-#usr/bin/dbus-monitor
-#usr/bin/dbus-send
-#usr/include/dbus-1.0
-#usr/include/dbus-1.0/dbus
-#usr/include/dbus-1.0/dbus/dbus-address.h
-#usr/include/dbus-1.0/dbus/dbus-bus.h
-#usr/include/dbus-1.0/dbus/dbus-connection.h
-#usr/include/dbus-1.0/dbus/dbus-errors.h
-#usr/include/dbus-1.0/dbus/dbus-glib-bindings.h
-#usr/include/dbus-1.0/dbus/dbus-glib-error-enum.h
-#usr/include/dbus-1.0/dbus/dbus-glib-lowlevel.h
-#usr/include/dbus-1.0/dbus/dbus-glib.h
-#usr/include/dbus-1.0/dbus/dbus-gtype-specialized.h
-#usr/include/dbus-1.0/dbus/dbus-macros.h
-#usr/include/dbus-1.0/dbus/dbus-memory.h
-#usr/include/dbus-1.0/dbus/dbus-message.h
-#usr/include/dbus-1.0/dbus/dbus-pending-call.h
-#usr/include/dbus-1.0/dbus/dbus-protocol.h
-#usr/include/dbus-1.0/dbus/dbus-server.h
-#usr/include/dbus-1.0/dbus/dbus-shared.h
-#usr/include/dbus-1.0/dbus/dbus-signature.h
-#usr/include/dbus-1.0/dbus/dbus-threads.h
-#usr/include/dbus-1.0/dbus/dbus-types.h
-#usr/include/dbus-1.0/dbus/dbus.h
-#usr/lib/dbus-1.0
-#usr/lib/dbus-1.0/include
-#usr/lib/dbus-1.0/include/dbus
-#usr/lib/dbus-1.0/include/dbus/dbus-arch-deps.h
-#usr/lib/libdbus-1.a
-#usr/lib/libdbus-1.la
-usr/lib/libdbus-1.so
-usr/lib/libdbus-1.so.2
-usr/lib/libdbus-1.so.2.0.0
-#usr/lib/libdbus-glib-1.a
-#usr/lib/libdbus-glib-1.la
-usr/lib/libdbus-glib-1.so
-usr/lib/libdbus-glib-1.so.2
-usr/lib/libdbus-glib-1.so.2.0.0
-#usr/lib/pkgconfig/dbus-1.pc
-#usr/lib/pkgconfig/dbus-glib-1.pc
-#usr/man/man1/dbus-cleanup-sockets.1
-#usr/man/man1/dbus-daemon.1
-#usr/man/man1/dbus-launch.1
-#usr/man/man1/dbus-monitor.1
-#usr/man/man1/dbus-send.1
-#usr/share/dbus-1
-#usr/share/dbus-1/services
-var/run/dbus

diff --git a/config/rootfiles/common/hal b/config/rootfiles/common/hal
deleted file mode 100644 (file)
index f84519b..0000000
--- a/config/rootfiles/common/hal
+++ /dev/null
@@ -1,162 +0,0 @@
-#etc/dbus-1/system.d/hal.conf
-#etc/hal
-#etc/hal/fdi
-#etc/hal/fdi/information
-#etc/hal/fdi/policy
-#etc/hal/fdi/preprobe
-#etc/udev/rules.d/90-hal.rules
-#usr/bin/hal-device
-#usr/bin/hal-device-manager
-#usr/bin/hal-find-by-capability
-#usr/bin/hal-find-by-property
-#usr/bin/hal-get-property
-#usr/bin/hal-set-property
-#usr/bin/lshal
-#usr/include/hal
-#usr/include/hal/libhal-storage.h
-#usr/include/hal/libhal.h
-#usr/lib/hal
-#usr/lib/hal/hal-system-power-pmu
-#usr/lib/hal/hald-addon-acpi
-#usr/lib/hal/hald-addon-hid-ups
-#usr/lib/hal/hald-addon-keyboard
-#usr/lib/hal/hald-addon-pmu
-#usr/lib/hal/hald-addon-storage
-#usr/lib/hal/hald-addon-usb-csr
-#usr/lib/hal/hald-probe-hiddev
-#usr/lib/hal/hald-probe-input
-#usr/lib/hal/hald-probe-pc-floppy
-#usr/lib/hal/hald-probe-printer
-#usr/lib/hal/hald-probe-serial
-#usr/lib/hal/hald-probe-smbios
-#usr/lib/hal/hald-probe-storage
-#usr/lib/hal/hald-probe-volume
-#usr/lib/hal/hald-runner
-#usr/lib/libhal-storage.a
-#usr/lib/libhal-storage.la
-usr/lib/libhal-storage.so
-usr/lib/libhal-storage.so.1
-usr/lib/libhal-storage.so.1.0.0
-#usr/lib/libhal.a
-#usr/lib/libhal.la
-usr/lib/libhal.so
-usr/lib/libhal.so.1
-usr/lib/libhal.so.1.0.0
-#usr/lib/pkgconfig/hal-storage.pc
-#usr/lib/pkgconfig/hal.pc
-#usr/sbin/hald
-#usr/share/doc/hal-0.5.7.1
-#usr/share/doc/hal-0.5.7.1/conf
-#usr/share/doc/hal-0.5.7.1/conf/match-USB-camera.fdi
-#usr/share/doc/hal-0.5.7.1/conf/match-USB-mp3-player.fdi
-#usr/share/doc/hal-0.5.7.1/conf/match-cardreader.fdi
-#usr/share/doc/hal-0.5.7.1/conf/storage-non-fixed.fdi
-#usr/share/doc/hal-0.5.7.1/conf/storage-policy-examples.fdi
-#usr/share/doc/hal-0.5.7.1/conf/storage-skip-all.fdi
-#usr/share/hal
-#usr/share/hal/device-manager
-#usr/share/hal/device-manager/Const.py
-#usr/share/hal/device-manager/Const.pyc
-#usr/share/hal/device-manager/Const.pyo
-#usr/share/hal/device-manager/Device.py
-#usr/share/hal/device-manager/Device.pyc
-#usr/share/hal/device-manager/Device.pyo
-#usr/share/hal/device-manager/DeviceManager.py
-#usr/share/hal/device-manager/DeviceManager.pyc
-#usr/share/hal/device-manager/DeviceManager.pyo
-#usr/share/hal/device-manager/GtkAttributesFacade.py
-#usr/share/hal/device-manager/GtkAttributesFacade.pyc
-#usr/share/hal/device-manager/GtkAttributesFacade.pyo
-#usr/share/hal/device-manager/LibGladeApplication.py
-#usr/share/hal/device-manager/LibGladeApplication.pyc
-#usr/share/hal/device-manager/LibGladeApplication.pyo
-#usr/share/hal/device-manager/Representation.py
-#usr/share/hal/device-manager/Representation.pyc
-#usr/share/hal/device-manager/Representation.pyo
-#usr/share/hal/device-manager/fdo-logo.png
-#usr/share/hal/device-manager/hal-abstract.png
-#usr/share/hal/device-manager/hal-audio.png
-#usr/share/hal/device-manager/hal-bus-pci.png
-#usr/share/hal/device-manager/hal-bus-usb.png
-#usr/share/hal/device-manager/hal-camera.png
-#usr/share/hal/device-manager/hal-cat-cardbus.png
-#usr/share/hal/device-manager/hal-cat-keyboard.png
-#usr/share/hal/device-manager/hal-cat-mouse.png
-#usr/share/hal/device-manager/hal-cdrom.png
-#usr/share/hal/device-manager/hal-computer.png
-#usr/share/hal/device-manager/hal-device-manager.glade
-#usr/share/hal/device-manager/hal-flash.png
-#usr/share/hal/device-manager/hal-floppy.png
-#usr/share/hal/device-manager/hal-harddisk.png
-#usr/share/hal/device-manager/hal-network.png
-#usr/share/hal/device-manager/hal-serial-port.png
-#usr/share/hal/device-manager/hal-unknown.png
-#usr/share/hal/device-manager/hal-video.png
-#usr/share/hal/fdi
-#usr/share/hal/fdi/fdi.dtd
-#usr/share/hal/fdi/fdi.rng
-#usr/share/hal/fdi/information
-#usr/share/hal/fdi/information/10freedesktop
-#usr/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi
-#usr/share/hal/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
-#usr/share/hal/fdi/information/10freedesktop/10-usb-card-readers.fdi
-#usr/share/hal/fdi/information/10freedesktop/10-usb-music-players.fdi
-#usr/share/hal/fdi/information/10freedesktop/10-usb-pda.fdi
-#usr/share/hal/fdi/information/10freedesktop/10-usb-zip-drives.fdi
-#usr/share/hal/fdi/information/10freedesktop/10-wireless-mice.fdi
-#usr/share/hal/fdi/information/20thirdparty
-#usr/share/hal/fdi/policy
-#usr/share/hal/fdi/policy/10osvendor
-#usr/share/hal/fdi/policy/10osvendor/10-keyboard-policy.fdi
-#usr/share/hal/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
-#usr/share/hal/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
-#usr/share/hal/fdi/policy/10osvendor/15-storage-luks.fdi
-#usr/share/hal/fdi/policy/10osvendor/20-storage-methods.fdi
-#usr/share/hal/fdi/policy/20thirdparty
-#usr/share/hal/fdi/preprobe
-#usr/share/hal/fdi/preprobe/10osvendor
-#usr/share/hal/fdi/preprobe/10osvendor/10-ide-drives.fdi
-#usr/share/hal/fdi/preprobe/20thirdparty
-#usr/share/hal/scripts
-#usr/share/hal/scripts/hal-luks-remove
-#usr/share/hal/scripts/hal-luks-setup
-#usr/share/hal/scripts/hal-luks-teardown
-#usr/share/hal/scripts/hal-system-lcd-get-brightness
-#usr/share/hal/scripts/hal-system-lcd-set-brightness
-#usr/share/hal/scripts/hal-system-power-hibernate
-#usr/share/hal/scripts/hal-system-power-reboot
-#usr/share/hal/scripts/hal-system-power-set-power-save
-#usr/share/hal/scripts/hal-system-power-shutdown
-#usr/share/hal/scripts/hal-system-power-suspend
-#usr/share/hal/scripts/hal-system-storage-cleanup-mountpoint
-#usr/share/hal/scripts/hal-system-storage-cleanup-mountpoints
-#usr/share/hal/scripts/hal-system-storage-eject
-#usr/share/hal/scripts/hal-system-storage-mount
-#usr/share/hal/scripts/hal-system-storage-unmount
-#usr/share/locale/cs/LC_MESSAGES/hal.mo
-#usr/share/locale/da/LC_MESSAGES/hal.mo
-#usr/share/locale/de/LC_MESSAGES/hal.mo
-#usr/share/locale/el/LC_MESSAGES/hal.mo
-#usr/share/locale/es/LC_MESSAGES/hal.mo
-#usr/share/locale/eu/LC_MESSAGES/hal.mo
-#usr/share/locale/fi/LC_MESSAGES/hal.mo
-#usr/share/locale/fr/LC_MESSAGES/hal.mo
-#usr/share/locale/hu/LC_MESSAGES/hal.mo
-#usr/share/locale/it/LC_MESSAGES/hal.mo
-#usr/share/locale/ja/LC_MESSAGES/hal.mo
-#usr/share/locale/ko/LC_MESSAGES/hal.mo
-#usr/share/locale/lt/LC_MESSAGES/hal.mo
-#usr/share/locale/nb/LC_MESSAGES/hal.mo
-#usr/share/locale/nl/LC_MESSAGES/hal.mo
-#usr/share/locale/pa/LC_MESSAGES/hal.mo
-#usr/share/locale/pl/LC_MESSAGES/hal.mo
-#usr/share/locale/pt/LC_MESSAGES/hal.mo
-#usr/share/locale/pt_BR/LC_MESSAGES/hal.mo
-#usr/share/locale/ru/LC_MESSAGES/hal.mo
-#usr/share/locale/sl_SI
-#usr/share/locale/sl_SI/LC_MESSAGES
-#usr/share/locale/sl_SI/LC_MESSAGES/hal.mo
-#usr/share/locale/uk/LC_MESSAGES/hal.mo
-#usr/share/locale/zh_CN/LC_MESSAGES/hal.mo
-#usr/share/locale/zh_TW/LC_MESSAGES/hal.mo
-var/run/hald

diff --git a/config/rootfiles/common/hwinfo b/config/rootfiles/common/hwinfo
deleted file mode 100644 (file)
index 1b778c6..0000000
--- a/config/rootfiles/common/hwinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-#etc/init.d/hwscan
-#sbin/hwscan
-#sbin/hwscand
-#sbin/hwscanqueue
-#usr/include/hd.h
-#usr/lib/libhd_tiny.a
-#usr/sbin/check_hd
-#usr/sbin/convert_hd
-#usr/sbin/gen-hwcfg-disk.sh
-#usr/sbin/getsysinfo
-#usr/sbin/hwbootscan
-usr/sbin/hwinfo
-#usr/sbin/mk_isdnhwdb
-#usr/share/hwinfo
-#usr/share/hwinfo/ISDN.CDB.hwdb
-#usr/share/hwinfo/ISDN.CDB.txt

diff --git a/config/rootfiles/common/iptraf b/config/rootfiles/common/iptraf
deleted file mode 100644 (file)
index 1ffefa8..0000000
--- a/config/rootfiles/common/iptraf
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/bin/iptraf
-#usr/bin/rvnamed
-#var/local/iptraf
-#var/local/iptraf/version
-var/log/iptraf
-var/run/iptraf

diff --git a/config/rootfiles/common/kudzu b/config/rootfiles/common/kudzu
index b41dfc5c2d3e2287a744efc9e4e43c3767f33ea5..f91992514c0affcfc2a010f442cf4961363fa417 100644 (file)
--- a/config/rootfiles/common/kudzu
+++ b/config/rootfiles/common/kudzu
@@ -22,8 +22,8 @@ sbin/kudzu
 #usr/include/kudzu/scsi.h
 #usr/include/kudzu/serial.h
 #usr/include/kudzu/usb.h
 #usr/include/kudzu/scsi.h
 #usr/include/kudzu/serial.h
 #usr/include/kudzu/usb.h

-usr/lib/libkudzu.a
-usr/lib/libkudzu_loader.a
+#usr/lib/libkudzu.a
+#usr/lib/libkudzu_loader.a

 #usr/lib/python2.4/site-packages/_kudzumodule.so
 #usr/lib/python2.4/site-packages/drv_libxml2.pyc
 #usr/lib/python2.4/site-packages/kudzu.py
 #usr/lib/python2.4/site-packages/_kudzumodule.so
 #usr/lib/python2.4/site-packages/drv_libxml2.pyc
 #usr/lib/python2.4/site-packages/kudzu.py

diff --git a/lfs/nagios b/lfs/nagios
deleted file mode 100644 (file)
index 342f5d2..0000000
--- a/lfs/nagios
+++ /dev/null
@@ -1,94 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall.                                    #
-#                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 2.5
-
-THISAPP    = nagios-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = nagios
-PAK_VER    = 1
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE) \
-       nagios-plugins-1.4.3.tar.gz
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-nagios-plugins-1.4.3.tar.gz = $(URL_IPFIRE)/nagios-plugins-1.4.3.tar.gz
-
-$(DL_FILE)_MD5 = 1a77528f6797bd3c0320da5e4fae2b1a
-nagios-plugins-1.4.3.tar.gz_MD5 = 2c40fc69d51cc979e85150870a1daa93
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist: 
-       @$(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) $(DIR_SRC)/nagios* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr/nagios --with-cgiurl=/nagios/cgi-bin \
-                               --with-htmurl=/nagios --with-nagios-user=nobody \
-                               --with-nagios-group=nobody
-       cd $(DIR_APP) && make all
-       cd $(DIR_APP) && make install
-       ### Plugins
-       cd $(DIR_SRC) && tar zxf $(DIR_DL)/nagios-plugins-1.4.3.tar.gz
-       cd $(DIR_SRC)/nagios-plugins-1.4.3 && ./configure --prefix=/usr/nagios --with-ping-command="-n %s -c %d"
-       cd $(DIR_SRC)/nagios-plugins-1.4.3 && make
-       cd $(DIR_SRC)/nagios-plugins-1.4.3 && make install
-       @rm -rf $(DIR_APP) $(DIR_SRC)/nagios*
-       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index ce965171c629fb74a535fa20b4dc2e22b1d2e003..143f4f7f544f55dfb042e2fd47368d817274d73f 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -33,7 +33,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 SVN_REVISION=`svn info | grep Revision | cut -c 11-`
 
 MACHINE=`uname -m`
 SVN_REVISION=`svn info | grep Revision | cut -c 11-`
 

-IPFVER="full"                          # Which versions should be compiled? (full|light|voice|devel)
+IPFVER="full"                          # Which versions should be compiled? (full|light|devel)

 
 # Set an information about the build number
 if [ -e ./.svn ]; then
 
 # Set an information about the build number
 if [ -e ./.svn ]; then


@@ -531,7 +531,6 @@ buildipfire() {
   ipfiremake ethereal
   ipfiremake tftp-hpa
   ipfiremake bwm-ng
   ipfiremake ethereal
   ipfiremake tftp-hpa
   ipfiremake bwm-ng

-  ipfiremake nagios

   ipfiremake tripwire
   ipfiremake sysstat
 }
   ipfiremake tripwire
   ipfiremake sysstat
 }