From: Jacek Konieczny <jajcus@pld-linux.org>
Date: Mon, 10 May 2010 12:29:43 +0000 (+0000)
Subject: - already merged on HEAD
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=468cef98d5cf49130becac6107ab6bc97799fa73;p=packages%2Fsyslog-ng.git

- already merged on HEAD

Changed files:
    bug-15.patch -> 1.1.2.1
    syslog-ng-datadir.patch -> 1.2.2.1
    syslog-ng-link.patch -> 1.6.2.1
    syslog-ng-pyssl.patch -> 1.1.2.1
    syslog-ng-simple.conf -> 1.3.2.1
    syslog-ng.conf -> 1.32.2.1
    syslog-ng.init -> 1.28.2.4
    syslog-ng.logrotate -> 1.16.2.1
    syslog-ng.spec -> 1.182.2.3
    syslog-ng.upstart -> 1.1.2.4
---

diff --git a/bug-15.patch b/bug-15.patch
deleted file mode 100644
index 3fee6ba..0000000
--- a/bug-15.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/src/afinter.c b/src/afinter.c
-index 0085d85..a67a9a7 100644
---- a/src/afinter.c
-+++ b/src/afinter.c
-@@ -34,6 +34,7 @@ typedef struct _AFInterSourceDriver
- } AFInterSourceDriver;
- 
- static gint next_mark_target = -1;
-+static GSource *global_internal_source;
- 
- void 
- afinter_postpone_mark(gint mark_freq)
-@@ -121,6 +122,7 @@ afinter_source_dispatch(GSource *source,
- static void
- afinter_source_finalize(GSource *source)
- {
-+  global_internal_source = NULL;
- }
- 
- GSourceFuncs afinter_source_watch_funcs =
-@@ -161,11 +163,26 @@ afinter_source_init(LogPipe *s)
-   
-   if (!log_source_init(s))
-     return FALSE;
-+
-+  if (cfg->internal_source_present)
-+    {
-+      msg_error("You have two internal() sources in your configuration, this is not supported and would cause hangs", NULL);
-+      return FALSE;
-+    }
-   
-+  if (global_internal_source)
-+    {
-+      msg_error("Internal error, internal() GSource was duplicated, this is bad", NULL);
-+      g_assert_not_reached();
-+      return FALSE;
-+    }
-+    
-   /* the source added below references this logreader, it will be unref'd
-      when the source is destroyed */ 
-   self->watch = afinter_source_watch_new(&self->super.super, cfg->mark_freq);
-   g_source_attach(self->watch, NULL);
-+  global_internal_source = self->watch;
-+  cfg->internal_source_present = TRUE;
-   return TRUE;
- }
- 
-@@ -204,8 +221,13 @@ afinter_sd_init(LogPipe *s)
- 
-   log_source_options_init(&self->source_options, cfg, self->super.group);
-   self->source = afinter_source_new(self, &self->source_options);
-+  if (!log_pipe_init(&self->source->super, cfg))
-+    {
-+      log_pipe_unref(&self->source->super);
-+      self->source = NULL;
-+      return FALSE;
-+    }
-   log_pipe_append(&self->source->super, s);
--  log_pipe_init(&self->source->super, cfg);
-   return TRUE;
- }
- 
-diff --git a/src/cfg.h b/src/cfg.h
-index 5e3f1bd..cc2005d 100644
---- a/src/cfg.h
-+++ b/src/cfg.h
-@@ -98,6 +98,7 @@ struct _GlobalConfig
-   
-   struct _LogTemplate *file_template;
-   struct _LogTemplate *proto_template;
-+  gboolean internal_source_present;
-   
-   /* */
-   GHashTable *sources;
diff --git a/syslog-ng-datadir.patch b/syslog-ng-datadir.patch
deleted file mode 100644
index 5dfe596..0000000
--- a/syslog-ng-datadir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur syslog-ng-2.0.6.orig/src/syslog-ng.h syslog-ng-2.0.6/src/syslog-ng.h
---- syslog-ng-2.0.6.orig/src/syslog-ng.h	2007-09-22 16:16:15.000000000 +0200
-+++ syslog-ng-2.0.6/src/syslog-ng.h	2007-12-08 08:25:22.000000000 +0100
-@@ -50,9 +50,9 @@
- #define PATH_SYSLOGNG           PATH_PREFIX "/libexec/syslog-ng"
- #endif
- 
--#define PATH_PERSIST_CONFIG     PATH_LOCALSTATEDIR "/syslog-ng.persist"
--#define PATH_QDISK              PATH_LOCALSTATEDIR
--#define PATH_PATTERNDB_FILE     PATH_LOCALSTATEDIR "/patterndb.xml"
-+#define PATH_PERSIST_CONFIG     "/var/lib/syslog-ng/syslog-ng.persist"
-+#define PATH_QDISK              "/var/lib/syslog-ng"
-+#define PATH_PATTERNDB_FILE     "/var/lib/syslog-ng/patterndb.xml"
- 
- #define LOG_PRIORITY_LISTEN 0
- #define LOG_PRIORITY_READER 0
diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch
deleted file mode 100644
index 2c0966c..0000000
--- a/syslog-ng-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- syslog-ng-2.0.3/configure.in.orig	2007-03-04 10:58:00.000000000 +0100
-+++ syslog-ng-2.0.3/configure.in	2007-04-03 23:53:53.219462987 +0200
-@@ -265,9 +265,8 @@
- AC_CHECK_LIB(door, door_create, BASE_LIBS="$BASE_LIBS -ldoor")
- AC_CHECK_LIB(socket, socket, BASE_LIBS="$BASE_LIBS -lsocket")
- AC_CHECK_LIB(rt, nanosleep, BASE_LIBS="$BASE_LIBS -lrt")
--AC_CHECK_LIB(nsl, gethostbyname, BASE_LIBS="$BASE_LIBS -lnsl")
-+AC_CHECK_LIB(resolv, gethostbyname, BASE_LIBS="$BASE_LIBS -lresolv")
- AC_CHECK_LIB(regex, regexec, REGEX_LIBS="-lregex")
--AC_CHECK_LIB(resolv, res_init, RESOLV_LIBS="-lresolv")
- 
- if test "x$enable_linux_caps" = "xyes" -o "x$enable_linux_caps" = "xauto"; then
- 	AC_CHECK_LIB(cap, cap_set_proc, LIBCAP_LIBS="-lcap")
diff --git a/syslog-ng-pyssl.patch b/syslog-ng-pyssl.patch
deleted file mode 100644
index 3c43185..0000000
--- a/syslog-ng-pyssl.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- syslog-ng-3.0.2/tests/functional/messagegen.py.orig	2009-05-12 16:55:58.000000000 +0200
-+++ syslog-ng-3.0.2/tests/functional/messagegen.py	2009-05-12 16:52:46.000000000 +0200
-@@ -1,4 +1,5 @@
- import struct, stat, re
-+from socket import ssl
- from socket import *
- import os, sys, errno
- 
diff --git a/syslog-ng-simple.conf b/syslog-ng-simple.conf
deleted file mode 100644
index 0f4ea92..0000000
--- a/syslog-ng-simple.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-@version: 3.0
-#
-# Syslog-ng configuration for PLD Linux
-#
-# Copyright (c) 1999 anonymous
-# Copyright (c) 1999 Balazs Scheidler
-# $Id$
-#
-# Syslog-ng configuration file
-
-options {
-	long_hostnames(off);
-	flush_lines(0);
-
-	# The default action of syslog-ng 1.6.0 is to log a STATS line
-	# to the file every 10 minutes.  That's pretty ugly after a while.
-	# Change it to every 12 hours so you get a nice daily update of
-	# how many messages syslog-ng missed (0).
-	stats_freq(43200);
-};
-
-source s_kernel { file ("/proc/kmsg" program_override("kernel: ")); };
-source s_src    { unix-stream("/dev/log"); internal(); };
-
-destination d_mail        { file("/var/log/maillog"); };
-destination d_messages    { file("/var/log/messages"); };
-destination d_kernel      { file("/var/log/kernel"); };
-destination d_console_all { file("/dev/tty12"); };
-
-filter f_mail             { facility(mail); };
-
-log { source(s_kernel); destination(d_kernel); };
-log { source(s_src); destination(d_console_all); };
-log { source(s_src); filter(f_mail); destination(d_mail); };
-log { source(s_src); destination(d_messages); flags(fallback); };
diff --git a/syslog-ng.conf b/syslog-ng.conf
deleted file mode 100644
index 478fb71..0000000
--- a/syslog-ng.conf
+++ /dev/null
@@ -1,135 +0,0 @@
-@version: 3.0
-#
-# Syslog-ng configuration for PLD Linux
-#
-# See syslog-ng(8) and syslog-ng.conf(5) for more information.
-#
-
-options {
-	flush_lines(0);
-	owner(root);
-	group(logs);
-	perm(0640);
-	create_dirs(yes);
-	dir_owner(root);
-	dir_group(logs);
-	dir_perm(0750);
-	stats_freq(3600);
-	time_reopen(10);
-	time_reap(360);
-	mark_freq(600);
-	log_fifo_size(2048);
-};
-
-source s_sys	{
-	file ("/proc/kmsg" program_override("kernel"));
-	unix-stream("/dev/log" max-connections(1000));
-	internal();
-};
-
-# uncomment the line below if you want to setup syslog server
-#source s_net	{ udp(); };
-
-#destination d_loghost	{ udp("loghost" port(514)); };
-
-destination d_kern	{ file("/var/log/kernel"); };
-destination d_messages	{ file("/var/log/messages"); };
-destination d_authlog	{ file("/var/log/secure"); };
-destination d_mail	{ file("/var/log/maillog"); };
-destination d_uucp	{ file("/var/log/spooler"); };
-destination d_debug	{ file("/var/log/debug"); };
-destination d_cron	{ file("/var/log/cron" owner(root) group(crontab) perm(0660)); };
-destination d_syslog	{ file("/var/log/syslog"); };
-destination d_daemon	{ file("/var/log/daemon"); };
-destination d_lpr		{ file("/var/log/lpr"); };
-destination d_user	{ file("/var/log/user"); };
-destination d_ppp		{ file("/var/log/ppp"); };
-destination d_ftp		{ file("/var/log/xferlog"); };
-destination d_audit	{ file("/var/log/audit"); };
-destination d_postgres	{ file("/var/log/pgsql"); };
-destination d_freshclam	{ file("/var/log/freshclam.log"); };
-
-# Log iptables messages to separate file
-destination d_iptables	{ file("/var/log/iptables"); };
-
-destination d_console	{ usertty("root"); };
-#destination d_console_all	{ file("/dev/tty12"); };
-
-destination d_xconsole	{ pipe("/dev/xconsole"); };
-
-destination d_newscrit	{ file("/var/log/news/news.crit" owner(news) group(news)); };
-destination d_newserr	{ file("/var/log/news/news.err" owner(news) group(news)); };
-destination d_newsnotice	{ file("/var/log/news/news.notice" owner(news) group(news)); };
-
-# Filters for standard syslog(3) facilities
-#filter f_audit		{ facility(audit); };
-filter f_authpriv	{ facility(authpriv, auth); };
-filter f_cron		{ facility(cron); };
-filter f_daemon		{ facility(daemon); };
-filter f_ftp		{ facility(ftp); };
-filter f_kern		{ facility(kern); };
-filter f_lpr		{ facility(lpr); };
-filter f_mail		{ facility(mail); };
-filter f_news		{ facility(news); };
-filter f_syslog		{ facility(syslog); };
-filter f_user		{ facility(user); };
-filter f_uucp		{ facility(uucp); };
-filter f_local0		{ facility(local0); };
-filter f_local1		{ facility(local1); };
-filter f_local2		{ facility(local2); };
-filter f_local3		{ facility(local3); };
-filter f_local4		{ facility(local4); };
-filter f_local5		{ facility(local5); };
-filter f_local6		{ facility(local6); };
-filter f_local7		{ facility(local7); };
-
-# Filters for standard syslog(3) priorities
-filter p_debug		{ level(debug); };
-filter p_info		{ level(info); };
-filter p_notice		{ level(notice); };
-filter p_warn		{ level(warn); };
-filter p_err		{ level(err); };
-filter p_alert		{ level(alert); };
-filter p_crit		{ level(crit); };
-filter p_emergency	{ level(emerg); };
-
-# Additional filters for specific programs/use
-filter f_freshclam	{ program(freshclam); };
-filter f_ppp		{ program(pppd) or program(chat); };
-filter f_postgres	{ program(postgres); };
-filter f_iptables	{ match("IN=[A-Za-z0-9\.]* OUT=[A-Za-z0-9\.]*" value("MESSAGE")); };
-
-log { source(s_sys); filter(f_authpriv);	destination(d_authlog); };
-log { source(s_sys); filter(f_cron);		destination(d_cron); };
-log { source(s_sys); filter(f_daemon);		destination(d_daemon); };
-log { source(s_sys); filter(f_ftp);		destination(d_ftp); };
-log { source(s_sys); filter(f_kern);		destination(d_kern); };
-log { source(s_sys); filter(f_lpr);		destination(d_lpr); };
-log { source(s_sys); filter(f_mail);			destination(d_mail); };
-log { source(s_sys); filter(f_news); filter(p_crit);	destination(d_uucp); };
-log { source(s_sys); filter(f_news); filter(p_crit);	destination(d_newscrit); };
-log { source(s_sys); filter(f_news); filter(p_err);	destination(d_newserr); };
-log { source(s_sys); filter(f_news); filter(p_warn);	destination(d_newsnotice); };
-log { source(s_sys); filter(f_news); filter(p_notice);	destination(d_newsnotice); };
-log { source(s_sys); filter(f_news); filter(p_info);	destination(d_newsnotice); };
-log { source(s_sys); filter(f_news); filter(p_debug);	destination(d_newsnotice); };
-log { source(s_sys); filter(f_syslog);		destination(d_syslog); };
-log { source(s_sys); filter(f_user);		destination(d_user); };
-log { source(s_sys); filter(f_uucp);		destination(d_uucp); };
-
-log { source(s_sys); filter(p_debug);		destination(d_debug); };
-
-log { source(s_sys); filter(f_daemon); filter(f_ppp);		destination(d_ppp); };
-log { source(s_sys); filter(f_local6); filter(f_freshclam);	destination(d_freshclam); };
-log { source(s_sys); filter(f_local0); filter(f_postgres);	destination(d_postgres); };
-#log { source(s_sys); filter(f_iptables);	destination(d_iptables); };
-
-log { source(s_sys); filter(p_emergency);	destination(d_console); };
-#log { source(s_sys); destination(d_console_all); };
-
-#  This is a catchall statement, and should catch all messages which were not
-#  accepted any of the previous statements.
-log { source(s_sys); destination(d_messages); flags(fallback); };
-
-# Network syslogging
-#log { source(s_sys); destination(d_loghost); };
diff --git a/syslog-ng.init b/syslog-ng.init
deleted file mode 100644
index 63f8f67..0000000
--- a/syslog-ng.init
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/sh
-#
-# syslog	Starts syslog-ng (syslogd replacement).
-#
-# chkconfig:	2345 30 70
-# description:	Syslog is the facility by which many daemons use to log \
-#		messages to various system log files. It is a good idea to \
-#		always run syslog.
-
-# Source function library
-. /etc/rc.d/init.d/functions
-
-# Set defaults
-ENABLE_RECEIVE_FROM_NET=no
-HOSTLIST=""
-DOMAINLIST=""
-MARK_TIMESTAMP=""
-
-# Get service config
-if [ -f /etc/sysconfig/syslog-ng ]; then
-	. /etc/sysconfig/syslog-ng
-fi
-
-checkconfig() {
-	syslog-ng $OPTIONS -F -s -p /var/run/syslog-ng-syntaxcheck.pid
-	RETVAL=$?
-	return $RETVAL
-}
-
-configtest() {
-	checkconfig 2>/dev/null
-	RETVAL=$?
-	if [ $RETVAL != 0 ]; then
-		show "Checking syslog-ng config syntax"
-		fail
-		echo >&2 "Configuration file syntax test failed. Run $0 configtest to see errors."
-		exit $RETVAL
-	fi
-}
-
-start() {
-	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/syslog-ng ]; then
-		msg_starting "syslog-ng"
-		emit starting JOB=syslog-ng SERVICE=syslog
-		daemon /usr/sbin/syslog-ng -f /etc/syslog-ng/syslog-ng.conf $OPTIONS
-		emit started JOB=syslog-ng SERVICE=syslog
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
-	else
-		msg_already_running "syslog-ng"
-	fi
-}
-
-stop() {
-	if [ -f /var/lock/subsys/syslog-ng ]; then
-		msg_stopping "syslog-ng"
-		emit stopping JOB=syslog-ng SERVICE=syslog
-		killproc syslog-ng
-		emit stopped JOB=syslog-ng SERVICE=syslog
-		rm -f /var/lock/subsys/syslog-ng >/dev/null 2>&1
-	else
-		msg_not_running "syslog-ng"
-	fi
-}
-
-condrestart() {
-	if [ -f /var/lock/subsys/syslog-ng ]; then
-		configtest
-		stop
-		start
-	else
-		msg_not_running "syslog-ng"
-		RETVAL=$1
-	fi
-}
-
-reload() {
-	if [ -f /var/lock/subsys/syslog-ng ]; then
-		configtest
-		msg_reloading "syslog-ng"
-		killproc syslog-ng -HUP
-		RETVAL=$?
-	else
-		msg_not_running "syslog-ng"
-		exit 7
-	fi
-}
-
-flush_logs() {
-	if use_upstart && [ -f /etc/init/syslog-ng.conf ] ; then
-		/sbin/initctl reload syslog-ng
-	elif [ -f /var/lock/subsys/syslog-ng ]; then
-		configtest
-		msg_reloading "syslog-ng"
-		killproc syslog-ng -HUP
-		RETVAL=$?
-	else
-		msg_not_running "syslog-ng"
-		exit 7
-	fi
-}
-
-upstart_controlled --except configtest flush-logs
-
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
-	configtest
-	start
-	;;
-  stop)
-	stop
-	;;
-  restart)
-	configtest
-	stop
-	start
-	;;
-  try-restart)
-	condrestart 0
-	;;
-  reload|force-reload)
-  	reload
-	;;
-  flush-logs)
-  	flush_logs
-	;;
-  configtest)
-	show "Checking syslog-ng config syntax"
-	res=$(checkconfig 2>&1)
-	RETVAL=$?
-	[ $RETVAL = 0 ] && ok || fail
-	echo >&2 "$res"
-	;;
-  status)
-	status syslog-ng
-	exit $?
-	;;
-  *)
-	msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status|configtest|flush-logs}"
-	exit 3
-esac
-
-exit $RETVAL
diff --git a/syslog-ng.logrotate b/syslog-ng.logrotate
deleted file mode 100644
index 97b8e53..0000000
--- a/syslog-ng.logrotate
+++ /dev/null
@@ -1,20 +0,0 @@
-/var/log/daemon
-/var/log/debug
-/var/log/iptables
-/var/log/kernel
-/var/log/lpr
-/var/log/maillog
-/var/log/messages
-/var/log/pgsql
-/var/log/secure
-/var/log/spooler
-/var/log/syslog
-/var/log/user
-/var/log/xferlog
-{
-	sharedscripts
-	
-	postrotate
-		/sbin/service syslog-ng flush-logs >/dev/null
-	endscript
-}
diff --git a/syslog-ng.spec b/syslog-ng.spec
deleted file mode 100644
index bbff7df..0000000
--- a/syslog-ng.spec
+++ /dev/null
@@ -1,235 +0,0 @@
-#
-# Conditional build:
-%bcond_with	dynamic		# link dynamically with glib, eventlog, pcre, openssl
-%bcond_without	sql		# build without support for logging to SQL DB
-%bcond_without	tests
-
-%define		glib2_ver	2.24.0
-Summary:	Syslog-ng - new generation of the system logger
-Summary(pl.UTF-8):	Syslog-ng - zamiennik syskloga
-Summary(pt_BR.UTF-8):	Daemon de log nova geração
-Name:		syslog-ng
-Version:	3.0.5
-Release:	2.1
-License:	GPL v2
-Group:		Daemons
-Source0:	http://www.balabit.com/downloads/files/syslog-ng/sources/%{version}/source/%{name}_%{version}.tar.gz
-# Source0-md5:	28f0d9ff2243b330e8cd6311ef9b2f12
-Source1:	%{name}.init
-Source2:	%{name}.conf
-Source3:	%{name}.logrotate
-Source4:	http://www.balabit.com/dl/guides/%{name}-v3.0-guide-admin-en.pdf
-# Source4-md5:	1a801f138a9a2245009ecb617be4338b
-Source5:	%{name}-simple.conf
-Source6:	%{name}.upstart
-Patch0:		%{name}-link.patch
-Patch1:		%{name}-datadir.patch
-Patch2:		%{name}-pyssl.patch
-Patch3:		bug-15.patch
-URL:		http://www.balabit.com/products/syslog_ng/
-BuildRequires:	autoconf >= 2.53
-BuildRequires:	automake
-BuildRequires:	bison
-BuildRequires:	flex
-BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.268
-%if %{with tests}
-BuildRequires:	libdbi-drivers-sqlite3
-BuildRequires:	tzdata
-%endif
-%if %{with dynamic}
-BuildRequires:	eventlog-devel >= 0.2
-BuildRequires:	glib2-devel >= 1:%{glib2_ver}
-BuildRequires:	libcap-devel
-%if %{with sql}
-BuildRequires:	libdbi-devel >= 0.8.3-2
-%endif
-BuildRequires:	libnet-devel >= 1:1.1.2.1-3
-BuildRequires:	libwrap-devel
-BuildRequires:	openssl-devel >= 0.9.8
-BuildRequires:	pcre-devel
-%else
-BuildRequires:	eventlog-static >= 0.2
-BuildRequires:	glib2-static >= 1:%{glib2_ver}
-BuildRequires:	glibc-static
-BuildRequires:	libcap-static
-%if %{with sql}
-BuildRequires:	libdbi-static >= 0.8.3-2
-%endif
-BuildRequires:	libnet-static >= 1:1.1.2.1-3
-BuildRequires:	libwrap-static
-BuildRequires:	openssl-static >= 0.9.8
-BuildRequires:	pcre-static
-BuildRequires:	zlib-static
-%endif
-Requires(post):	fileutils
-Requires(post,preun):	/sbin/chkconfig
-Requires:	glib2 >= 1:%{glib2_ver}
-Requires:	psmisc >= 20.1
-Requires:	rc-scripts > 0.4.2.8
-Provides:	syslogdaemon
-Conflicts:	klogd
-Conflicts:	msyslog
-Conflicts:	syslog
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-## to be moved to rpm-build-macros
-## TODO: handle RPM_SKIP_AUTO_RESTART
-
-# migrate from init script to upstart job
-%define	upstart_post() \
-	if [ -f /var/lock/subsys/"%1" ] ; then \
-		/sbin/service --no-upstart "%1" stop \
-		/sbin/service "%1" start \
-	fi
-
-# restart the job after upgrade or migrate to init script on removal
-%define	upstart_postun() \
-	if [ -x /sbin/initctl ] && /sbin/initctl status "%1" 2>/dev/null | grep -q 'running' ; then \
-		/sbin/initctl stop "%1" 2>/dev/null \
-		[ -f "/etc/rc.d/init.d/%1" -o -f "/etc/init/%1.conf" ] && /sbin/service "%1" start \
-	fi
-
-%description
-syslog-ng is a syslogd replacement for Unix and Unix-like systems. It
-has been tested on Solaris, BSDi and Linux, and were found to run
-reliably. syslog-ng gives you a much enhanced configuration scheme,
-which lets you filter messages based on not only priority/facility
-pairs, but also on message content. You can use regexps to direct log
-stream to different destinations. A destination can be anything from a
-simple file to a network connection. syslog-ng supports TCP
-logforwarding, together with hashing to prevent unauthorized
-modification on the line.
-
-%description -l pl.UTF-8
-Syslog-ng jest zamiennikiem dla standardowo używanych programów typu
-syslog. Działa w systemie SunOS, BSD, Linux. Daje znacznie większe
-możliwości logowania i kontrolowania zbieranych informacji.
-
-%description -l pt_BR.UTF-8
-Syslog-ng é um substituto para o syslog tradicional, mas com diversas
-melhorias, como, por exemplo, a habilidade de filtrar mensagens de log
-por seu conteúdo (usando expressões regulares) e não apenas pelo par
-facility/prioridade como o syslog original.
-
-%package upstart
-Summary:	Upstart job description for syslog-ng
-Summary(pl.UTF-8):	Opis zadania Upstart dl syslog-ng
-Group:		Daemons
-Requires:	%{name} = %{version}-%{release}
-Requires:	upstart >= 0.6
-
-%description upstart
-Upstart job description for syslog-ng.
-
-%description upstart -l pl.UTF-8
-Opis zadania Upstart dl syslog-ng.
-
-%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-cp -a %{SOURCE4} doc
-cp -a %{SOURCE5} contrib
-
-%build
-%{__aclocal}
-%{__autoconf}
-%{__automake}
-%configure \
-	--sysconfdir=%{_sysconfdir}/syslog-ng \
-	--with-timezone-dir=%{_datadir}/zoneinfo \
-	--with-pidfile-dir=/var/run \
-	--enable-ssl \
-	--enable-ipv6 \
-	--enable-tcp-wrapper \
-	--enable-spoof-source \
-	--enable-linux-caps \
-	--enable-pcre \
-%if %{with sql}
-	--enable-sql \
-%endif
-%if %{with dynamic}
-	--enable-dynamic-linking
-%endif
-
-%{__make}
-
-%{?with_tests:%{__make} check}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{init,sysconfig,logrotate.d,rc.d/init.d},%{_sysconfdir}/syslog-ng} \
-	$RPM_BUILD_ROOT/var/{log,lib/%{name}}
-
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/syslog-ng
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/syslog-ng.conf
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/syslog-ng
-
-for n in daemon debug iptables kernel lpr maillog messages secure spooler syslog user xferlog
-do
-	> $RPM_BUILD_ROOT/var/log/$n
-done
-touch $RPM_BUILD_ROOT/etc/sysconfig/%{name}
-
-rm $RPM_BUILD_ROOT%{_bindir}/loggen
-
-install %{SOURCE6} $RPM_BUILD_ROOT/etc/init/%{name}.conf
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-/sbin/chkconfig --add syslog-ng
-%service syslog-ng restart "syslog-ng daemon"
-
-%preun
-if [ "$1" = "0" ]; then
-	%service syslog-ng stop
-	/sbin/chkconfig --del syslog-ng
-fi
-
-%post upstart
-%upstart_post %{name}
-
-%postun upstart
-%upstart_postun %{name}
-
-%triggerun -- syslog-ng < 3.0
-sed -i -e 's#sync(\(.*\))#flush_lines(\1)#g' /etc/syslog-ng/syslog-ng.conf
-sed -i -e 's#pipe ("/proc/kmsg"#file ("/proc/kmsg"#g' /etc/syslog-ng/syslog-ng.conf
-sed -i -e 's#log_prefix#program_override#g' /etc/syslog-ng/syslog-ng.conf
-sed -i -e 's#^destination #destination d_#g' /etc/syslog-ng/syslog-ng.conf
-sed -i -e 's#destination(#destination(d_#g' /etc/syslog-ng/syslog-ng.conf
-sed -i -e 's,\bstats\b,stats_freq,' /etc/syslog-ng/syslog-ng.conf
-sed -i -e 's#match("IN\=\[A-Za-z0-9\]\* OUT=\[A-Za-z0-9\]\*");#match("IN=[A-Za-z0-9]* OUT=[A-Za-z0-9]*" value("MESSAGE"));#g' /etc/syslog-ng/syslog-ng.conf
-sed -i -e "1 s#\(.*\)\$#@version: 3.0\n\1#g" /etc/syslog-ng/syslog-ng.conf
-rm -f %{_var}/lib/%{name}/syslog-ng.persist
-%service -q syslog-ng restart
-exit 0
-
-%files
-%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS debian/syslog-ng.conf* contrib/{relogger.pl,syslog-ng.vim}
-%doc doc/examples/syslog-ng.conf.sample contrib/syslog-ng.conf.{doc,RedHat} contrib/syslog-ng-simple.conf
-%doc contrib/{apparmor,selinux,syslog2ng} doc/syslog-ng-v3.0-guide-admin-en.pdf
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
-%attr(750,root,root) %dir %{_sysconfdir}/syslog-ng
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/syslog-ng.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/syslog-ng
-%attr(754,root,root) /etc/rc.d/init.d/syslog-ng
-%attr(755,root,root) %{_sbindir}/syslog-ng
-%dir %{_var}/lib/%{name}
-%{_mandir}/man5/syslog-ng.conf.5*
-%{_mandir}/man8/syslog-ng.8*
-
-%attr(640,root,root) %ghost /var/log/*
-
-%files upstart
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf
diff --git a/syslog-ng.upstart b/syslog-ng.upstart
deleted file mode 100644
index c8c13c9..0000000
--- a/syslog-ng.upstart
+++ /dev/null
@@ -1,15 +0,0 @@
-
-start on pld.sysinit-done
-stop on pld.shutdown-started
-
-env SERVICE=syslog
-export SERVICE
-
-respawn
-
-console output
-
-exec /usr/sbin/syslog-ng --process-mode=background -f /etc/syslog-ng/syslog-ng.conf
-expect fork
-
-# vi: ft=upstart