rpms/syslog-ng/EL-4 sources, 1.7, 1.8 syslog-ng.init.d, 1.1, 1.2 syslog-ng.spec, 1.10, 1.11

[rayvd]

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27330

Modified Files:
	sources syslog-ng.init.d syslog-ng.spec 
Log Message:
Fix for bz #517339 and bz#518582


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	24 Mar 2009 16:55:44 -0000	1.7
+++ sources	11 Sep 2009 13:23:54 -0000	1.8
@@ -1 +1,2 @@
 17c4c7725d2eab62b588395f1ed93f32  syslog-ng-2.1.4.tar.gz
+02ce641aa7ca3649f2cd562f2864e654  syslog-ng-2.1.4-libnet.patch


Index: syslog-ng.init.d
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/EL-4/syslog-ng.init.d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- syslog-ng.init.d	24 Mar 2009 16:55:44 -0000	1.1
+++ syslog-ng.init.d	11 Sep 2009 13:23:54 -0000	1.2
@@ -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=$?


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/EL-4/syslog-ng.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- syslog-ng.spec	24 Mar 2009 16:55:44 -0000	1.10
+++ syslog-ng.spec	11 Sep 2009 13:23:54 -0000	1.11
@@ -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 <rayvd at fedoraproject.org> - 2.1.4-4
+- libnet linking (bug#518150)
+
+* Tue Aug 18 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 2.1.4-3
+- Init script fix (bug#517339)
+
 * Tue Mar 24 2009 Douglas E. Warner <silfreed at silfreed.net> - 2.1.4-1
 - update to 2.1.4
 - enabling mixed linking to compile only non-system libs statically