rpms/syslog-ng/FC-5 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 syslog-ng.spec, 1.12, 1.13
Jose Pedro Oliveira (jpo)
fedora-extras-commits at redhat.com
Sat May 6 12:52:50 UTC 2006
Author: jpo
Update of /cvs/extras/rpms/syslog-ng/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7511
Modified Files:
.cvsignore sources syslog-ng.spec
Log Message:
Sync with devel.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 30 Mar 2006 16:52:51 -0000 1.5
+++ .cvsignore 6 May 2006 12:52:49 -0000 1.6
@@ -1 +1 @@
-syslog-ng-1.6.10.tar.gz
+syslog-ng-1.6.11.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 30 Mar 2006 16:52:51 -0000 1.5
+++ sources 6 May 2006 12:52:49 -0000 1.6
@@ -1 +1 @@
-b723dc5e8454bc274fdab415ac7ea5ea syslog-ng-1.6.10.tar.gz
+8f9ca6140f428dc9adec9fa1c270a2dd syslog-ng-1.6.11.tar.gz
Index: syslog-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/FC-5/syslog-ng.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- syslog-ng.spec 30 Mar 2006 16:52:51 -0000 1.12
+++ syslog-ng.spec 6 May 2006 12:52:49 -0000 1.13
@@ -1,22 +1,36 @@
+#
+# Rebuild option:
+#
+# --with spoofing enables the syslog-ng feature spoof-source
+# (see README.spoof for more information)
+#
%define sbindir /sbin
+%define libolver 0.3.18
+%define spoofing 0
+
+%{?_with_spoofing:%define spoofing 1}
Name: syslog-ng
-Version: 1.6.10
+Version: 1.6.11
Release: 1%{?dist}
Summary: Syslog replacement daemon
Group: System Environment/Daemons
License: GPL
-Url: http://www.balabit.com/products/syslog_ng/
+URL: http://www.balabit.com/products/syslog_ng/
Source0: http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-%{version}.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)
-BuildConflicts: libol-devel < 0.3.17
-BuildRequires: flex, tcp_wrappers, which
+BuildConflicts: libol-devel < %{libolver}
+BuildRequires: flex, which
+BuildRequires: tcp_wrappers
+%if %{spoofing}
+BuildRequires: libnet-devel >= 1.1
+%endif
Requires: logrotate
Requires(post): chkconfig, initscripts
Requires(preun): chkconfig, initscripts
@@ -42,11 +56,14 @@
%patch1 -p1
%{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
chmod a-x contrib/syslog2ng
-mv libol-0.3.18/ChangeLog ChangeLog.libol
+mv libol-%{libolver}/{ChangeLog,ChangeLog.libol}
%build
%configure \
--sbindir=%{sbindir} \
+%if %{spoofing}
+ --enable-spoof-source \
+%endif
--enable-tcp-wrapper
make %{?_smp_mflags}
@@ -76,15 +93,15 @@
%post
# only rpm -i (not rpm {-U|-F})
if [ $1 = 1 ]; then
- /sbin/chkconfig --add syslog-ng
-# /sbin/service syslog-ng start
+ /sbin/chkconfig --add syslog-ng
+# /sbin/service syslog-ng start
fi
%preun
# only rpm -e (not rpm {-U|-F})
if [ $1 = 0 ]; then
- /sbin/service syslog-ng stop > /dev/null 2>&1 || :
- /sbin/chkconfig --del syslog-ng
+ /sbin/service syslog-ng stop > /dev/null 2>&1 || :
+ /sbin/chkconfig --del syslog-ng
fi
%postun
@@ -97,11 +114,10 @@
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README README.spoof ChangeLog INSTALL NEWS PORTS
-%doc doc/sgml/syslog-ng.txt
-%doc doc/*.demo doc/*.sample
+%doc doc/sgml/syslog-ng.txt doc/*.{demo,sample}
%doc contrib/syslog-ng.conf.doc
%doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl
-%doc ChangeLog.libol
+%doc libol-%{libolver}/ChangeLog.libol
%{sbindir}/syslog-ng
%{_initrddir}/syslog-ng
%dir %{_sysconfdir}/%{name}
@@ -113,8 +129,16 @@
%changelog
+* Fri May 5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.6.11-1
+- Update to 1.6.11.
+
+* Sun Apr 2 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.6.10-2
+- Build option to support the syslog-ng spoof-source feature
+ (the feature spoof-source is disabled by default).
+
* Thu Mar 30 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.6.10-1
- Update to 1.6.10.
+- The postscript documentation has been dropped (upstream).
* Wed Feb 15 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.6.9-3
- Rebuild.
More information about the scm-commits
mailing list