rpms/syslog-ng/devel syslog-ng-1.6.7-init.patch, NONE, 1.1 syslog-ng-1.6.7-logrotate.patch, NONE, 1.1 syslog.log, NONE, 1.1 syslog-ng.spec, 1.2, 1.3
Jose Pedro Oliveira (jpo)
fedora-extras-commits at redhat.com
Mon May 9 22:16:04 UTC 2005
Author: jpo
Update of /cvs/extras/rpms/syslog-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3860
Modified Files:
syslog-ng.spec
Added Files:
syslog-ng-1.6.7-init.patch syslog-ng-1.6.7-logrotate.patch
syslog.log
Log Message:
Logrotate handling as suggested by Jeremy Katz.
syslog-ng-1.6.7-init.patch:
--- NEW FILE syslog-ng-1.6.7-init.patch ---
diff -ruN syslog-ng-1.6.7-orig/contrib/fedora-packaging/syslog-ng.init syslog-ng-1.6.7/contrib/fedora-packaging/syslog-ng.init
--- syslog-ng-1.6.7-orig/contrib/fedora-packaging/syslog-ng.init 2005-03-04 15:59:39.000000000 +0000
+++ syslog-ng-1.6.7/contrib/fedora-packaging/syslog-ng.init 2005-05-09 19:14:19.000000000 +0100
@@ -2,7 +2,7 @@
#
# syslog-ng This starts and stops syslog-ng
#
-# chkconfig: 2345 12 88
+# chkconfig: - 12 88
# description: reads and logs messages to the system console, log \
# files, other machines and/or users as specified by \
# its configuration file.
syslog-ng-1.6.7-logrotate.patch:
--- NEW FILE syslog-ng-1.6.7-logrotate.patch ---
diff -ruN syslog-ng-1.6.7-orig/contrib/fedora-packaging/syslog-ng.init syslog-ng-1.6.7/contrib/fedora-packaging/syslog-ng.init
--- syslog-ng-1.6.7-orig/contrib/fedora-packaging/syslog-ng.init 2005-03-04 15:59:39.000000000 +0000
+++ syslog-ng-1.6.7/contrib/fedora-packaging/syslog-ng.init 2005-05-09 18:50:49.000000000 +0100
@@ -9,7 +9,7 @@
# processname: /sbin/syslog-ng
# config: /etc/syslog-ng/syslog-ng.conf
# config: /etc/sysconfig/syslog-ng
-# pidfile: /var/run/syslog-ng.pid
+# pidfile: /var/run/syslog.pid
#
### BEGIN INIT INFO
# Provides: $syslog
diff -ruN syslog-ng-1.6.7-orig/contrib/fedora-packaging/syslog-ng.sysconfig syslog-ng-1.6.7/contrib/fedora-packaging/syslog-ng.sysconfig
--- syslog-ng-1.6.7-orig/contrib/fedora-packaging/syslog-ng.sysconfig 2005-03-04 16:03:29.000000000 +0000
+++ syslog-ng-1.6.7/contrib/fedora-packaging/syslog-ng.sysconfig 2005-05-09 18:53:09.000000000 +0100
@@ -2,4 +2,4 @@
# Syslog-ng command line options
# See syslog-ng(8) for more details
#---
-SYSLOGNG_OPTIONS=""
+SYSLOGNG_OPTIONS="-p /var/run/syslog.pid"
--- NEW FILE syslog.log ---
/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
}
Index: syslog-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/devel/syslog-ng.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- syslog-ng.spec 7 May 2005 00:27:25 -0000 1.2
+++ syslog-ng.spec 9 May 2005 22:16:02 -0000 1.3
@@ -3,13 +3,16 @@
Name: syslog-ng
Version: 1.6.7
-Release: 2.fc4
+Release: 3%{?dist}
Summary: Syslog replacement daemon
Group: System Environment/Daemons
License: GPL
Url: http://www.balabit.com/products/syslog_ng/
Source0: http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-1.6.7.tar.gz
+Source1: syslog.log
+Patch0: syslog-ng-1.6.7-init.patch
+Patch1: syslog-ng-1.6.7-logrotate.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libol-devel >= 0.3.16
@@ -41,6 +44,9 @@
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
+%{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
chmod a-x contrib/syslog2ng
%build
@@ -65,8 +71,8 @@
$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 contrib/fedora-packaging/syslog-ng.logrotate \
- $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/syslog-ng
+install -p -m 644 %{SOURCE1} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/syslog
%clean
rm -rf $RPM_BUILD_ROOT
@@ -75,18 +81,14 @@
%post
# only rpm -i (not rpm {-U|-F})
if [ $1 = 1 ]; then
- /sbin/chkconfig syslog off 2> /dev/null || :
/sbin/chkconfig --add syslog-ng
- /sbin/service syslog stop 2> /dev/null || :
- /sbin/service syslog-ng start
+# /sbin/service syslog-ng start
fi
%preun
# only rpm -e (not rpm {-U|-F})
if [ $1 = 0 ]; then
- /sbin/chkconfig syslog reset 2> /dev/null || :
- /sbin/service syslog-ng stop
- /sbin/service syslog start 2> /dev/null || :
+ /sbin/service syslog-ng stop > /dev/null 2>&1 || :
/sbin/chkconfig --del syslog-ng
fi
@@ -97,29 +99,6 @@
fi
-%triggerin -- sysklogd
-if [ $1 = 1 -a $2 = 1 ]; then
- #
- # 1) syslog-ng being installed and sysklogd installed
- # 2) syslog-ng installed and sysklogd being installed
- #
- # syslog logrotate file -> comment lines in order to avoid
- # a logrotate conflict
- #
- %{__sed} -i 's/^/#/' %{_sysconfdir}/logrotate.d/syslog 2> /dev/null || :
-fi
-
-%triggerun -- sysklogd
-if [ $1 = 0 -a $2 = 1 ]; then
- #
- # 1) syslog-ng being removed and sysklogd installed
- #
- # syslog logrotate file -> uncomment lines
- #
- %{__sed} -i 's/^#//' %{_sysconfdir}/logrotate.d/syslog 2> /dev/null || :
-fi
-
-
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README README.spoof ChangeLog INSTALL NEWS PORTS
@@ -132,12 +111,18 @@
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/syslog-ng.conf
%config(noreplace) %{_sysconfdir}/sysconfig/syslog-ng
-%config(noreplace) %{_sysconfdir}/logrotate.d/syslog-ng
+%config(noreplace) %{_sysconfdir}/logrotate.d/syslog
%{_mandir}/man5/*.5*
%{_mandir}/man8/*.8*
%changelog
+* Mon May 09 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.6.7-3
+- Shipping the sysklogd logrotate file and using the same pidfile
+ as suggested by Jeremy Katz.
+- Patching the init script: no default runlevels.
+- Removed the triggers to handle the logrotate file (no longer needed).
+
* Sat May 07 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.6.7-2.fc4
- Increased libol required version to 0.3.16
(https://lists.balabit.hu/pipermail/syslog-ng/2005-May/007385.html).
More information about the fedora-extras-commits
mailing list