dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-syslog-ng-2.0.8.tar.gz

.gitignore

@@ -0,0 +1,2 @@
+syslog-ng-2.0.10.tar.gz
+syslog-ng.init.d

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: syslog-ng
-# $Id$
-NAME := syslog-ng
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

rsyslog-3.14.1-logrotate.d-rsyslog.log

@@ -0,0 +1,6 @@
+/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {
+    sharedscripts
+    postrotate
+        /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
+    endscript
+}

rsyslog-3.21.9-logrotate.d-rsyslog.log

@@ -0,0 +1,6 @@
+/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {
+    sharedscripts
+    postrotate
+	/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
+    endscript
+}

rsyslog-syslog-ng-fc10.sysconfig

@@ -0,0 +1,3 @@
+SYSLOGNG_PID="/var/run/syslog-ng.pid"
+SYSLOGNG_OPTIONS="-p $SYSLOGNG_PID"
+SYSLOGNG_COMPAT_PID="/var/run/syslogd.pid"

rsyslog-syslog-ng.sysconfig

@@ -0,0 +1,3 @@
+SYSLOGNG_PID="/var/run/syslog-ng.pid"
+SYSLOGNG_OPTIONS="-p $SYSLOGNG_PID"
+SYSLOGNG_COMPAT_PID="/var/run/rsyslogd.pid"

sources

@@ -1 +1 @@
-ae48df049aa09bde55d52f3c08aefbac  syslog-ng-2.0.8.tar.gz
+17c4c7725d2eab62b588395f1ed93f32  syslog-ng-2.1.4.tar.gz

sysklogd-1.4.1-44-logrotate.d-syslog.log

@@ -0,0 +1,7 @@
+/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {
+    sharedscripts
+    postrotate
+	/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
+	/bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
+    endscript
+}

sysklogd-1.4.1-logrotate.d-syslog.log

@@ -0,0 +1,6 @@
+/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {
+    sharedscripts
+    postrotate
+	/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
+    endscript
+}

sysklogd-syslog-ng.sysconfig

@@ -0,0 +1,3 @@
+SYSLOGNG_PID="/var/run/syslog-ng.pid"
+SYSLOGNG_OPTIONS="-p $SYSLOGNG_PID"
+SYSLOGNG_COMPAT_PID="/var/run/syslogd.pid"

syslog-ng-2.1.4-libnet.patch

@@ -0,0 +1,12 @@
+diff -uNr syslog-ng-2.1.4.orig/configure.in syslog-ng-2.1.4/configure.in
+--- syslog-ng-2.1.4.orig/configure.in	2008-11-19 05:00:11.000000000 -0800
++++ syslog-ng-2.1.4/configure.in	2009-08-20 19:27:52.000000000 -0700
+@@ -466,7 +466,7 @@
+ elif test "x$enable_static_linking" = "xyes"; then
+ 	DEPS_LIBS="-static $LIBS $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBNET_LIBS $LIBWRAP_LIBS $LIBDBI_LIBS"	
+ else
+-	DEPS_LIBS="$LIBS $LD_START_STATIC $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBNET_LIBS $LIBWRAP_LIBS $LD_END_STATIC $LIBDBI_LIBS $DL_LIBS"
++	DEPS_LIBS="$LIBS $LD_START_STATIC $LEXLIB $GLIB_LIBS $EVTLOG_LIBS $LIBWRAP_LIBS $LD_END_STATIC $LIBNET_LIBS $LIBDBI_LIBS $DL_LIBS"
+ fi
+ LIBS="$DEPS_LIBS"
+ YFLAGS="-d"

syslog-ng.conf

@@ -0,0 +1,61 @@
+# syslog-ng configuration file.
+#
+# This should behave pretty much like the original syslog on RedHat. But
+# it could be configured a lot smarter.
+#
+# See syslog-ng(8) and syslog-ng.conf(5) for more information.
+#
+
+options {
+	sync (0);
+	time_reopen (10);
+	log_fifo_size (1000);
+	long_hostnames (off);
+	use_dns (no);
+	use_fqdn (no);
+	create_dirs (no);
+	keep_hostname (yes);
+};
+
+source s_sys {
+	file ("/proc/kmsg" log_prefix("kernel: "));
+	unix-stream ("/dev/log");
+	internal();
+	# udp(ip(0.0.0.0) port(514));
+};
+
+destination d_cons { file("/dev/console"); };
+destination d_mesg { file("/var/log/messages"); };
+destination d_auth { file("/var/log/secure"); };
+destination d_mail { file("/var/log/maillog" sync(10)); };
+destination d_spol { file("/var/log/spooler"); };
+destination d_boot { file("/var/log/boot.log"); };
+destination d_cron { file("/var/log/cron"); };
+destination d_kern { file("/var/log/kern"); };
+destination d_mlal { usertty("*"); };
+
+filter f_kernel     { facility(kern); };
+filter f_default    { level(info..emerg) and
+                        not (facility(mail)
+                        or facility(authpriv) 
+                        or facility(cron)); };
+filter f_auth       { facility(authpriv); };
+filter f_mail       { facility(mail); };
+filter f_emergency  { level(emerg); };
+filter f_news       { facility(uucp) or
+                        (facility(news) 
+                        and level(crit..emerg)); };
+filter f_boot   { facility(local7); };
+filter f_cron   { facility(cron); };
+
+#log { source(s_sys); filter(f_kernel); destination(d_cons); };
+log { source(s_sys); filter(f_kernel); destination(d_kern); };
+log { source(s_sys); filter(f_default); destination(d_mesg); };
+log { source(s_sys); filter(f_auth); destination(d_auth); };
+log { source(s_sys); filter(f_mail); destination(d_mail); };
+log { source(s_sys); filter(f_emergency); destination(d_mlal); };
+log { source(s_sys); filter(f_news); destination(d_spol); };
+log { source(s_sys); filter(f_boot); destination(d_boot); };
+log { source(s_sys); filter(f_cron); destination(d_cron); };
+
+# vim:ft=syslog-ng:ai:si:ts=4:sw=4:et:

syslog-ng.init.d

@@ -0,0 +1,123 @@
+#!/bin/sh
+#
+# syslog-ng starts/stops syslog-ng service
+#
+# chkconfig: - 12 88
+# description: Syslog is the facility by which many daemons use to log \
+#     messages to various system log files.
+#
+
+### BEGIN INIT INFO
+# Provides: $syslog
+# Required-Start: $local_fs
+# Required-Stop: $local_fs
+# Short-Description: Next-generation syslog server
+# Description: syslog-ng, as the name shows, is a syslogd replacement, but
+#     with new functionality for the new generation. The original syslogd
+#     allows messages only to be sorted based on priority/facility pairs;
+#     syslog-ng adds the possibility to filter based on message contents
+#     using regular expressions. The new configuration scheme is intuitive
+#     and powerful.  Forwarding logs over TCP and remembering all forwarding
+#     hops makes it ideal for firewalled environments.  
+### END INIT INFO
+
+# Source function library.
+. /etc/init.d/functions
+
+[ -e /etc/sysconfig/syslog-ng ] && . /etc/sysconfig/syslog-ng
+
+RETVAL=0
+
+check_syntax()
+{
+	[ -x /sbin/syslog-ng ] || exit 5
+	syslog-ng -s $SYSLOGNG_OPTIONS
+	RETVAL=$?
+	return $RETVAL
+}
+
+verify_config()
+{
+	check_syntax
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] || exit $retval
+}
+
+checkconfig()
+{
+	action $"Checking Configuration: " check_syntax
+}
+
+start()
+{
+	verify_config
+	echo -n $"Starting syslog-ng: "
+	if [ -e $SYSLOGNG_COMPAT_PID ]; then
+		failure "PID file for existing syslog daemon exists"
+	fi
+	daemon syslog-ng $SYSLOGNG_OPTIONS
+	ln -sf $SYSLOGNG_PID $SYSLOGNG_COMPAT_PID
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
+	return $RETVAL
+}
+
+stop()
+{
+	echo -n $"Stopping syslog-ng: "
+	REMOVE_COMPAT_PID=0
+	if [ -e $SYSLOGNG_PID ]; then
+		if [ -e $SYSLOGNG_COMPAT_PID -a $(<$SYSLOGNG_PID) == $(<$SYSLOGNG_COMPAT_PID) ]; then
+			REMOVE_COMPAT_PID=1
+		fi
+	fi
+	killproc syslog-ng
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/syslog-ng
+	[ $RETVAL -eq 0 -a $REMOVE_COMPAT_PID -eq 1 ] && rm -f $SYSLOGNG_COMPAT_PID
+	return $RETVAL
+}
+
+reload()
+{
+	verify_config
+	echo -n $"Reloading syslog-ng: "
+	killproc syslog-ng -HUP
+	RETVAL=$?
+	echo
+	return $RETVAL
+}
+
+restart()
+{
+	stop
+	start
+}
+
+
+case "$1" in
+	start|stop|reload)
+		$1
+		;;
+	restart|force_reload)
+		restart
+		;;
+	status)
+		status syslog-ng
+		;;
+	checkconfig|configtest|check|test)
+		checkconfig
+		;;
+	condrestart|try-restart)
+		[ -f /var/lock/subsys/syslog-ng ] && restart || :
+		;;
+	*)
+		echo $"Usage: $0 {start|stop|restart|reload|condrestart|checkconfig}"
+		exit 1
+esac
+
+exit $?
+
+# vim: ft=sh:ts=4:ai:si:

syslog-ng.spec

@@ -1,46 +1,60 @@
-# Rebuild option:
-#
-#   --with spoofsource              enables the syslog-ng spoof-source feature
-#
-
-%define spoofsource  0
 %{?_with_spoofsource:%define spoofsource 1}
+%define evtlog_ver 0.2.7-1
 
-%define sbindir   /sbin
+%define _sbindir /sbin
+%define _localstatedir /var/lib/syslog-ng
 
-Name:             syslog-ng
+Name: syslog-ng
-Version:          2.0.8
+Version: 2.1.4
-Release:          3%{?dist}
+Release: 8%{?dist}
-Summary:          Syslog replacement daemon
+Summary: Next-generation syslog server
 
-Group:            System Environment/Daemons
+Group: System Environment/Daemons
-License:          GPLv2
+License: GPLv2+
-URL:              http://www.balabit.com/products/syslog-ng/
+Url: http://www.balabit.com/products/syslog_ng/
-Source0:          http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/syslog-ng-%{version}.tar.gz
+Source0: http://www.balabit.com/downloads/files/syslog-ng/sources/2.1/src/%{name}-%{version}.tar.gz
-Source1:          syslog.log
+Source1: syslog-ng.conf
-Patch0:           syslog-ng-2.0.0-init.patch
+Source2: syslog-ng.init.d
-Patch1:           syslog-ng-1.6.7-logrotate.patch
+Source10: sysklogd-syslog-ng.sysconfig
-Patch2:           syslog-ng-2.0.5-conf.patch
+Source11: sysklogd-1.4.1-logrotate.d-syslog.log
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source12: sysklogd-1.4.1-44-logrotate.d-syslog.log
+Source20: rsyslog-syslog-ng.sysconfig
+Source21: rsyslog-3.14.1-logrotate.d-rsyslog.log
+Source30: rsyslog-syslog-ng-fc10.sysconfig
+Source31: rsyslog-3.21.9-logrotate.d-rsyslog.log
 
-BuildRequires:    flex
+Patch0: syslog-ng-2.1.4-libnet.patch
-BuildRequires:    byacc
+
-BuildRequires:    pkgconfig >= 0.20
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    glib2-devel >= 2.2
+
-BuildRequires:    eventlog-devel >= 0.2.5
+BuildRequires: eventlog-devel >= %{evtlog_ver}
-BuildRequires:    tcp_wrappers-devel
+BuildRequires: pkgconfig
-%if %{spoofsource}
+BuildRequires: glib2-devel
-BuildRequires:    libnet-devel >= 1.1
+%if 0%{?fedora}
+BuildRequires: glib2-static
 %endif
+%if 0%{?rhel}
+BuildRequires: tcp_wrappers
+BuildRequires: eventlog-static >= %{evtlog_ver}
+BuildRequires: automake
+%else
+BuildRequires: tcp_wrappers-devel
+%endif
+BuildRequires: libnet-devel
+Requires: logrotate
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service
+Provides: syslog
+%if 0%{?rhel} == 4
+# makes vixie-cron and initscripts happy
+Provides: sysklogd = 1.3.33-6
+%endif
+# merge separate syslog-vim package into one
+Provides: syslog-ng-vim = %{version}-%{release}
+Obsoletes: syslog-ng-vim < 2.0.8-1
 
-Requires:         logrotate
-Requires(post):   chkconfig, initscripts
-Requires(preun):  chkconfig, initscripts
-Requires(postun): initscripts
-#
-# Keep initscripts and vixie-cron happy
-#
-Provides:         syslog
 
 %description
 syslog-ng, as the name shows, is a syslogd replacement, but with new 
@@ -54,90 +68,125 @@ ideal for firewalled environments.
 
 %prep
 %setup -q
-%patch0 -p1
+%if 0%{?rhel}
-%patch1 -p1
+%patch0 -p1 -b .libnet
-%patch2 -p1
+%endif
-%{__sed} -i  's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
+
-chmod -c a-x contrib/syslog2ng
+# fix perl path
+%{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
 
 # force regeneration to avoid broken paths from upstream (#265221)
-touch src/cfg-grammar.y
+touch src/cfg-grammar.c src/cfg-lex.c
+
+%define logrotated_dst syslog
+%if 0%{?rhel}
+	%if 0%{?rhel} <= 4
+		%define sysconfig_src %{SOURCE10}
+		%define logrotated_src %{SOURCE11}
+	%endif
+	%if 0%{?rhel} >= 5
+		%define sysconfig_src %{SOURCE10}
+		%define logrotated_src %{SOURCE12}
+	%endif
+%endif
+%if 0%{?fedora}
+	%if 0%{?fedora} <= 9
+		%define sysconfig_src %{SOURCE20}
+		%define logrotated_src %{SOURCE21}
+	%endif
+	%if 0%{?fedora} >= 10
+		%define sysconfig_src %{SOURCE30}
+		%define logrotated_src %{SOURCE31}
+	%endif
+%endif
 
 
 %build
 %configure \
-    --sbindir=%{sbindir} \
+	--enable-ipv6 \
-    --sysconfdir=%{_sysconfdir}/syslog-ng \
+	--sysconfdir=%{_sysconfdir}/%{name} \
-    --enable-ipv6 \
+	--enable-tcp-wrapper \
-    --enable-tcp-wrapper \
+%if 0%{?spoofsource}
-%if ! %{spoofsource}
+	--enable-spoof-source \
-    --disable-spoof-source \
-%else
-    --enable-spoof-source \
 %endif
-    --enable-dynamic-linking
+%if 0%{?rhel}
-make %{?_smp_mflags}
+	--enable-mixed-linking
+%else
+	--enable-dynamic-linking
+%endif
+
+
+make %{_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
-make install DESTDIR=$RPM_BUILD_ROOT
+%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/%{name}
+%{__install} -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/syslog-ng.conf
 
-install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
+%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/init.d
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+%{__install} -p -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 
-install -p -m 755 contrib/fedora-packaging/syslog-ng.init \
+%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/sysconfig
-    $RPM_BUILD_ROOT%{_initrddir}/syslog-ng
+%{__install} -p -m 644 %{sysconfig_src} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
-install -p -m 644 contrib/fedora-packaging/syslog-ng.conf \
-    $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/syslog-ng.conf
-install -p -m 644 contrib/fedora-packaging/syslog-ng.sysconfig \
-    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/syslog-ng
-install -p -m 644 %{SOURCE1} \
-    $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/syslog
 
-# Vim syntax file
+%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/logrotate.d
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
+%{__install} -p -m 644 %{logrotated_src} \
-install -p -m 644 contrib/syslog-ng.vim $RPM_BUILD_ROOT%{_datadir}/%{name}/
+	%{buildroot}%{_sysconfdir}/logrotate.d/%{logrotated_dst}
+
+# make local state dir
+%{__install} -d -m 755 %{buildroot}/%{_localstatedir}
+
+# fix authors file
+/usr/bin/iconv -f iso8859-1 -t utf-8 AUTHORS > AUTHORS.conv && \
+	%{__mv} -f AUTHORS.conv AUTHORS
+
+# fix executable perms on contrib files
+%{__chmod} -x contrib/relogger.pl
+%{__chmod} -x contrib/syslog2ng
+
+# fix script interpreter
+sed -i 's/\/usr\/local\/bin\/perl/\/usr\/bin\/perl/' contrib/relogger.pl
+
+# install vim files
+%{__install} -d -m 755 %{buildroot}%{_datadir}/%{name}
+%{__install} -p -m 644 contrib/syslog-ng.vim %{buildroot}%{_datadir}/%{name}
 for vimver in 63 64 70 71 ; do
-    install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax
+	%{__install} -d -m 755 %{buildroot}%{_datadir}/vim/vim$vimver/syntax
-    cd $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax
+	cd %{buildroot}%{_datadir}/vim/vim$vimver/syntax
-    ln -s ../../../%{name}/syslog-ng.vim .
+	ln -s ../../../%{name}/syslog-ng.vim .
+	cd -
 done
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
-# only rpm -i (not rpm {-U|-F})
+/sbin/chkconfig --add %{name}
-if [ $1 = 1 ]; then
+
-    /sbin/chkconfig --add syslog-ng
-#   /sbin/service syslog-ng start
-fi
 
 %preun
-# only rpm -e (not rpm {-U|-F})
+if [ "$1" = 0 ]; then
-if [ $1 = 0 ]; then
+	/sbin/service %{name} stop > /dev/null 2>&1
-    /sbin/service syslog-ng stop > /dev/null 2>&1 || :
+	/sbin/chkconfig --del %{name}
-    /sbin/chkconfig --del syslog-ng
 fi
 
+
 %postun
-# only rpm {-U|-F} (not rpm -e)
+if [ "$1" -ge 1 ]; then
-if [ $1 = 1 ]; then
+	/sbin/service %{name} condrestart >/dev/null 2>&1
-    /sbin/service syslog-ng condrestart
 fi
 
 
 %triggerin -- vim-common
 VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
 [ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \
-    cd %{_datadir}/vim/vim${VIMVERNEW}/syntax && \
+	cd %{_datadir}/vim/vim${VIMVERNEW}/syntax && \
-    ln -sf ../../../%{name}/syslog-ng.vim . || :
+	ln -sf ../../../%{name}/syslog-ng.vim . || :
 
 %triggerun -- vim-common
 VIMVEROLD=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | head -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
@@ -147,34 +196,78 @@ VIMVEROLD=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | head -n 1 |
 VIMVEROLD=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | head -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
 VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
 if [ $1 = 1 ]; then
-    rm -f %{_datadir}/vim/vim${VIMVEROLD}/syntax/syslog-ng.vim || :
+	rm -f %{_datadir}/vim/vim${VIMVEROLD}/syntax/syslog-ng.vim || :
-    [ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \
+	[ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \
-        cd %{_datadir}/vim/vim${VIMVERNEW}/syntax && \
+		cd %{_datadir}/vim/vim${VIMVERNEW}/syntax && \
-        ln -sf ../../../%{name}/syslog-ng.vim . || :
+		ln -sf ../../../%{name}/syslog-ng.vim . || :
 fi
 
 
+
 %files
-%defattr(-,root,root,-)
+%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS COPYING README ChangeLog NEWS
 %doc doc/reference/syslog-ng.txt
 %doc doc/security/*.txt
 %doc doc/examples/syslog-ng.conf.sample
 %doc contrib/{relogger.pl,syslog2ng,syslog-ng.conf.doc}
-%{_bindir}/loggen
-%{sbindir}/%{name}
-%{_initrddir}/%{name}
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/logrotate.d/syslog
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{logrotated_dst}
-%{_datadir}/%{name}/
+%{_sysconfdir}/init.d/%{name}
-%{_mandir}/man5/*.5*
+%dir %{_localstatedir}
-%{_mandir}/man8/*.8*
+%{_sbindir}/%{name}
+%{_bindir}/loggen
+%{_datadir}/%{name}
+%{_mandir}/man5/*
+%{_mandir}/man8/*
 %ghost %{_datadir}/vim/
 
 
 %changelog
+* Tue Sep 15 2009 Ray Van Dolson <rayvd@fedoraproject.org> - 2.1.4-8
+- Adjust eventlog build requirement
+
+* Tue Sep 15 2009 Ray Van Dolson <rayvd@fedoraproject.org> - 2.1.4-7
+- Branch sync
+
+* Tue Sep 15 2009 Ray Van Dolson <rayvd@fedoraproject.org> - 2.1.4-6
+- Branch sync
+
+* Tue Sep 15 2009 Ray Van Dolson <rayvd@fedoraproject.org> - 2.1.4-5
+- Rebuilding for tag issue
+
+* Thu Aug 20 2009 Ray Van Dolson <rayvd@fedoraproject.org> - 2.1.4-4
+- libnet linking (bug#518150)
+
+* Tue Aug 18 2009 Ray Van Dolson <rayvd@fedoraproject.org> - 2.1.4-3
+- Init script fix (bug#517339)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Mar 24 2009 Douglas E. Warner <silfreed@silfreed.net> - 2.1.4-1
+- update to 2.1.4
+- enabling mixed linking to compile only non-system libs statically
+- lots of packaging updates to be able to build on RHEL4,5, Fedora9+ and be
+  parallel-installable with rsyslog and/or sysklogd on those platforms
+- removing BR for flex & byacc to try to prevent files from being regenerated
+- fixing build error with cfg-lex.l and flex 2.5.4
+- Fixed a possible DoS condition triggered by a destination port unreachable
+  ICMP packet received from a UDP destination.  syslog-ng started eating all
+  available memory and CPU until it crashed if this happened.
+- Fixed the rate at which files regular were read using the file() source.
+- Report connection breaks as a write error instead of reporting POLLERR as
+  the write error path reports more sensible information in the logs.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Dec 02 2008 Douglas E. Warner <silfreed@silfreed.net> 2.0.10-1
+- update to 2.0.10
+- fix for CVE-2008-5110
+
 * Mon Sep 15 2008 Peter Vrabec <pvrabec@redhat.com> 2.0.8-3
 - do not conflicts with rsyslog, both rsyslog and syslog-ng use 
   same pidfile and logrotate file (#441664)
@@ -413,4 +506,3 @@ fi
 * Sun Dec 08 2002 Richard E. Perlotto II <richard@perlotto.com> 1.5.23-1
 - Updated file with notes and PGP signatures
 
-# vim:set ai ts=4 sw=4 sts=4 et: