rpms/syslog-ng
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for bz #517339 and bz#518582

Browse Source
This commit is contained in:
rayvd 2009-09-16 04:16:25 +00:00
parent 78a2aab194
commit 24b6d67c89
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sources
View File

@ -1 +1,2 @@
17c4c7725d2eab62b588395f1ed93f32 syslog-ng-2.1.4.tar.gz 17c4c7725d2eab62b588395f1ed93f32 syslog-ng-2.1.4.tar.gz
02ce641aa7ca3649f2cd562f2864e654 syslog-ng-2.1.4-libnet.patch

6
syslog-ng.init.d
View File

@ -67,8 +67,10 @@ stop()
{ {
echo -n $"Stopping syslog-ng: " echo -n $"Stopping syslog-ng: "
REMOVE_COMPAT_PID=0 REMOVE_COMPAT_PID=0
if [ -e $SYSLOGNG_COMPAT_PID -a $(<$SYSLOGNG_PID) == $(<$SYSLOGNG_COMPAT_PID) ]; then if [ -e $SYSLOGNG_PID ]; then
REMOVE_COMPAT_PID=1 if [ -e $SYSLOGNG_COMPAT_PID -a $(<$SYSLOGNG_PID) == $(<$SYSLOGNG_COMPAT_PID) ]; then
REMOVE_COMPAT_PID=1
fi
fi fi
killproc syslog-ng killproc syslog-ng
RETVAL=$? RETVAL=$?

18
syslog-ng.spec
View File

@ -6,7 +6,7 @@
Name: syslog-ng Name: syslog-ng
Version: 2.1.4 Version: 2.1.4
Release: 1%{?dist} Release: 4%{?dist}
Summary: Next-generation syslog server Summary: Next-generation syslog server
Group: System Environment/Daemons Group: System Environment/Daemons
@ -22,6 +22,9 @@ Source20: rsyslog-syslog-ng.sysconfig
Source21: rsyslog-3.14.1-logrotate.d-rsyslog.log Source21: rsyslog-3.14.1-logrotate.d-rsyslog.log
Source30: rsyslog-syslog-ng-fc10.sysconfig Source30: rsyslog-syslog-ng-fc10.sysconfig
Source31: rsyslog-3.21.9-logrotate.d-rsyslog.log 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: eventlog-devel >= %{evtlog_ver} BuildRequires: eventlog-devel >= %{evtlog_ver}
@ -33,6 +36,7 @@ BuildRequires: glib2-static
%if 0%{?rhel} %if 0%{?rhel}
BuildRequires: tcp_wrappers BuildRequires: tcp_wrappers
BuildRequires: eventlog-static >= %{evtlog_ver} BuildRequires: eventlog-static >= %{evtlog_ver}
BuildRequires: automake
%else %else
BuildRequires: tcp_wrappers-devel BuildRequires: tcp_wrappers-devel
%endif %endif
@ -64,6 +68,9 @@ ideal for firewalled environments.
%prep %prep
%setup -q %setup -q
%if 0%{?rhel}
%patch0 -p1 -b .libnet
%endif
# fix perl path # fix perl path
%{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
@ -219,6 +226,15 @@ fi
%changelog %changelog
* 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 * Tue Mar 24 2009 Douglas E. Warner <silfreed@silfreed.net> - 2.1.4-1
- update to 2.1.4 - update to 2.1.4
- enabling mixed linking to compile only non-system libs statically - enabling mixed linking to compile only non-system libs statically