]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
Revert "Rechecked syslog-ng commit"
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 6 Dec 2008 10:10:11 +0000 (11:10 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 6 Dec 2008 10:10:11 +0000 (11:10 +0100)
This reverts commit 7cabf3c8fa5c364a79a2f6b6cad3e2f03e993d7b.

config/syslog-ng/syslog-ng.conf [deleted file]
lfs/eventlog [deleted file]
lfs/syslog-ng [deleted file]
make.sh
src/initscripts/core/syslog-ng [deleted file]
src/rootfiles/core/03.syslog-ng [deleted file]

diff --git a/config/syslog-ng/syslog-ng.conf b/config/syslog-ng/syslog-ng.conf
deleted file mode 100644 (file)
index 57c54b3..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-options { long_hostnames(off); sync(0); };
-
-source src { unix-stream("/dev/log"); internal(); };
-source kernsrc { file("/proc/kmsg"); };
-
-destination authlog { file("/var/log/auth.log"); };
-destination syslog { file("/var/log/syslog"); };
-destination cron { file("/var/log/cron.log"); };
-destination daemon { file("/var/log/daemon.log"); };
-destination kern { file("/var/log/kern.log"); };
-destination lpr { file("/var/log/lpr.log"); };
-destination user { file("/var/log/user.log"); };
-destination uucp { file("/var/log/uucp.log"); };
-destination ppp { file("/var/log/ppp.log"); };
-destination mail { file("/var/log/mail.log"); };
-
-destination mailinfo { file("/var/log/mail.info"); };
-destination mailwarn { file("/var/log/mail.warn"); };
-destination mailerr { file("/var/log/mail.err"); };
-destination local0 { file("/var/log/local0.log"); };
-destination local1 { file("/var/log/local1.log"); };
-destination all { file("/var/log/all.log"); };
-
-destination newscrit { file("/var/log/news/news.crit"); };
-destination newserr { file("/var/log/news/news.err"); };
-destination newsnotice { file("/var/log/news/news.notice"); };
-
-destination debug { file("/var/log/debug"); };
-destination messages { file("/var/log/messages"); };
-destination console { usertty("root"); };
-destination console_all { file("/dev/tty12"); };
-
-filter f_auth { facility(auth); };
-filter f_authpriv { facility(auth, authpriv); };
-filter f_syslog { not facility(authpriv, mail) and not match(ppp.*LCP); };
-filter f_cron { facility(cron); };
-filter f_daemon { facility(daemon); };
-filter f_kern { facility(kern); };
-filter f_lpr { facility(lpr); };
-filter f_mail { facility(mail) and not match (imapd); };
-filter f_user { facility(user); };
-filter f_uucp { facility(cron); };
-filter f_ppp { program(ppp); };
-filter f_news { facility(news); };
-filter f_debug { not facility(auth, authpriv, news, mail) and not match(ppp.*LCP); };
-filter f_messages { level(info..warn)and not facility(auth, authpriv, mail, news); };
-filter f_emergency { level(emerg); };
-
-filter f_info { level(info); };
-filter f_notice { level(notice); };
-filter f_warn { level(warn); };
-filter f_crit { level(crit); };
-filter f_err { level(err); };
-
-log { source(src); filter(f_authpriv); destination(authlog); };
-log { source(src); filter(f_syslog); destination(syslog); };
-log { source(src); filter(f_cron); destination(cron); };
-log { source(src); filter(f_daemon); destination(daemon); };
-log { source(kernsrc); filter(f_kern); destination(kern); };
-log { source(src); filter(f_lpr); destination(lpr); };
-log { source(src); filter(f_mail); destination(mail); };
-log { source(src); filter(f_user); destination(user); };
-log { source(src); filter(f_uucp); destination(uucp); };
-log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
-log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
-log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
-log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
-log { source(src); filter(f_news); filter(f_err); destination(newserr); };
-log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
-log { source(src); filter(f_debug); destination(debug); };
-log { source(src); filter(f_messages); destination(messages); };
-log { source(src); filter(f_emergency); destination(console); };
-log { source(src); filter(f_ppp); destination(ppp); };
-log { source(src); destination(console_all); };
-log { source(src); destination(all); };
diff --git a/lfs/eventlog b/lfs/eventlog
deleted file mode 100644 (file)
index 6cd4ba1..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program 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 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-PKG_NAME   = eventlog
-VER        = 0.2.7
-
-THISAPP    = $(PKG_NAME)-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-
-OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-install : $(OBJECT)
-
-download : $(objects)
-
-$(objects) :
-       @$(LOAD)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(OBJECT) :
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-
-       cd $(DIR_APP) && ./configure && make $(PARALLELISMFLAGS)
-       cd $(DIR_APP) && make install
-
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)
diff --git a/lfs/syslog-ng b/lfs/syslog-ng
deleted file mode 100644 (file)
index 2e2df47..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program 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 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-PKG_NAME   = syslog-ng
-VER        = 2.0.10
-
-THISAPP    = $(PKG_NAME)-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-
-OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-install : $(OBJECT)
-
-download : $(objects)
-
-$(objects) :
-       @$(LOAD)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(OBJECT) :
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig ./configure --enable-dynamic-linking && make $(PARALLELISMFLAGS)
-       cd $(DIR_APP) && make install
-
-       cp -vf $(DIR_CONF)/$(PKG_NAME)/$(PKG_NAME).conf \
-               /etc/$(PKG_NAME).conf
-
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 29fa0d28f24b7f562791beaff4f4c4b461e5d062..063f51f9ea176323f8430882b2ad6aa407239df3 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -201,8 +201,6 @@ ipfire_build() {
        ipfire_make python-IPy
        ipfire_make libxml2
        ipfire_make libxslt
-       ipfire_make eventlog
-       ipfire_make syslog-ng
        ipfire_make popt
        ipfire_make libusb
        ipfire_make bc
diff --git a/src/initscripts/core/syslog-ng b/src/initscripts/core/syslog-ng
deleted file mode 100644 (file)
index 8389122..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-# Begin /etc/init.d/syslog-ng
-
-### BEGIN INIT INFO
-# Provides:            syslog-ng
-# Required-Start:      localnet
-# Should-Start:
-# Required-Stop:       $local_fs sendsignals
-# Should-Stop:
-# Default-Start:       2 3 4 5
-# Default-Stop:        0 1 6
-# Short-Description:   Starts log daemon.
-# Description:         Starts log daemon.
-# X-LFS-Default-Start: S10
-# X-LFS-Default-Stop:  K90
-# X-LFS-Provided-By:   LFS
-### END INIT INFO
-
-. /lib/lsb/init-functions
-
-case "${1}" in
-    start)
-        MESSAGE="Log daemon..."
-        start_daemon /usr/local/sbin/syslog-ng -f /etc/syslog-ng.conf
-        evaluate_retval start
-
-    stop)
-        MESSAGE="Log daemon..."
-        killproc /usr/local/sbin/syslog-ng
-        evaluate_retval stop
-        ;;
-
-    force-reload)
-        MESSAGE="Log daemon config file..."
-        killproc -HUP `/usr/local/sbin/syslog-ng`
-        evaluate_retval reload
-        ;;
-
-    restart)
-        MESSAGE="Log deamons..."
-        failed=0
-        killproc /usr/local/sbin/syslog-ng || failed=1
-        start_daemon /usr/local/sbin/syslog-ng -f /etc/syslog-ng || failed=1
-        (exit ${failed})
-        evaluate_retval restart
-        ;;
-
-    status)
-        statusproc /usr/local/sbin/syslog-ng
-        ;;
-
-    *)
-        echo "Usage: ${0} {start|stop|force-reload|restart|status}"
-        exit 1
-        ;;
-esac
-
-# End /etc/init.d/sysklog-ng
-#
diff --git a/src/rootfiles/core/03.syslog-ng b/src/rootfiles/core/03.syslog-ng
deleted file mode 100644 (file)
index 9b7dd7c..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-etc/syslog-ng.conf
-usr/local/bin/loggen
-usr/local/sbin/syslog-ng
-#usr/local/share/man/man5/syslog-ng.conf.5
-#usr/local/share/man/man8/syslog-ng.8