diff --git a/sources b/sources index 6e8df16..b96e564 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 17c4c7725d2eab62b588395f1ed93f32 syslog-ng-2.1.4.tar.gz +02ce641aa7ca3649f2cd562f2864e654 syslog-ng-2.1.4-libnet.patch diff --git a/syslog-ng.init.d b/syslog-ng.init.d index d881721..eafaf4c 100644 --- a/syslog-ng.init.d +++ b/syslog-ng.init.d @@ -67,8 +67,10 @@ stop() { echo -n $"Stopping syslog-ng: " REMOVE_COMPAT_PID=0 - if [ -e $SYSLOGNG_COMPAT_PID -a $(<$SYSLOGNG_PID) == $(<$SYSLOGNG_COMPAT_PID) ]; then - REMOVE_COMPAT_PID=1 + 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=$? diff --git a/syslog-ng.spec b/syslog-ng.spec index 4ebb2f2..f0b5935 100644 --- a/syslog-ng.spec +++ b/syslog-ng.spec @@ -6,7 +6,7 @@ Name: syslog-ng Version: 2.1.4 -Release: 1%{?dist} +Release: 4%{?dist} Summary: Next-generation syslog server Group: System Environment/Daemons @@ -22,6 +22,9 @@ 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 + +Patch0: syslog-ng-2.1.4-libnet.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: eventlog-devel >= %{evtlog_ver} @@ -33,6 +36,7 @@ BuildRequires: glib2-static %if 0%{?rhel} BuildRequires: tcp_wrappers BuildRequires: eventlog-static >= %{evtlog_ver} +BuildRequires: automake %else BuildRequires: tcp_wrappers-devel %endif @@ -64,6 +68,9 @@ ideal for firewalled environments. %prep %setup -q +%if 0%{?rhel} +%patch0 -p1 -b .libnet +%endif # fix perl path %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl @@ -219,6 +226,12 @@ fi %changelog +* Thu Aug 20 2009 Ray Van Dolson - 2.1.4-4 +- libnet linking (bug#518150) + +* Tue Aug 18 2009 Ray Van Dolson - 2.1.4-3 +- Init script fix (bug#517339) + * Tue Mar 24 2009 Douglas E. Warner - 2.1.4-1 - update to 2.1.4 - enabling mixed linking to compile only non-system libs statically