rpms/syslog-ng/devel syslog-ng-2.0.0-init.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 syslog-ng.spec, 1.17, 1.18 syslog-ng-1.6.7-init.patch, 1.1, NONE

Jose Pedro Oliveira (jpo) fedora-extras-commits at redhat.com
Sat Feb 10 19:13:38 UTC 2007 

Author: jpo

Update of /cvs/extras/rpms/syslog-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31819

Modified Files:
	.cvsignore sources syslog-ng.spec 
Added Files:
	syslog-ng-2.0.0-init.patch 
Removed Files:
	syslog-ng-1.6.7-init.patch 
Log Message:
Update to 2.0.2.

syslog-ng-2.0.0-init.patch:

--- NEW FILE syslog-ng-2.0.0-init.patch ---
diff -ruN syslog-ng-2.0.0-orig/contrib/fedora-packaging/syslog-ng.init syslog-ng-2.0.0/contrib/fedora-packaging/syslog-ng.init
--- syslog-ng-2.0.0-orig/contrib/fedora-packaging/syslog-ng.init	2006-02-11 07:37:58.000000000 +0000
+++ syslog-ng-2.0.0/contrib/fedora-packaging/syslog-ng.init	2006-12-15 10:46:07.000000000 +0000
@@ -2,10 +2,7 @@
 #
 # syslog-ng    This starts and stops syslog-ng
 #
-# chkconfig:   2345 12 88
-# description: reads and logs messages to the system console, log \
-#              files, other machines and/or users as specified by \
-#              its configuration file.
+# chkconfig:   - 12 88
 # processname: /sbin/syslog-ng
 # config:      /etc/syslog-ng/syslog-ng.conf
 # config:      /etc/sysconfig/syslog-ng
@@ -13,6 +10,10 @@
 #
 ### BEGIN INIT INFO
 # Provides: $syslog
+# Short-Description: System logging and kernel message trapping daemon
+# Description: reads and logs messages to the system console, log \
+#              files, other machines and/or users as specified by \
+#              its configuration file.
 ### END INIT INFO
 
 # Source function library.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Feb 2007 20:49:33 -0000	1.7
+++ .cvsignore	10 Feb 2007 19:13:05 -0000	1.8
@@ -1 +1 @@
-syslog-ng-1.6.12.tar.gz
+syslog-ng-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Feb 2007 20:49:33 -0000	1.7
+++ sources	10 Feb 2007 19:13:05 -0000	1.8
@@ -1 +1 @@
-a3cbfdb6e1e5beea181a7349749719f3  syslog-ng-1.6.12.tar.gz
+7ef12e1e43a99c5b6b8d1984dde72151  syslog-ng-2.0.2.tar.gz


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/devel/syslog-ng.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- syslog-ng.spec	6 Feb 2007 20:49:33 -0000	1.17
+++ syslog-ng.spec	10 Feb 2007 19:13:05 -0000	1.18
@@ -1,36 +1,24 @@
-#
-# 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.12
+Version:          2.0.2
 Release:          1%{?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-%{version}.tar.gz
+Source0:          http://www.balabit.com/downloads/syslog-ng/2.0/src/syslog-ng-%{version}.tar.gz
 Source1:          syslog.log
-Patch0:           syslog-ng-1.6.7-init.patch
+Patch0:           syslog-ng-2.0.0-init.patch
 Patch1:           syslog-ng-1.6.7-logrotate.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildConflicts:   libol-devel < %{libolver}
-BuildRequires:    flex, which
-BuildRequires:    tcp_wrappers-devel
-%if %{spoofing}
-BuildRequires:    libnet-devel >= 1.1
-%endif
+BuildRequires:    flex
+BuildRequires:    pkgconfig >= 0.20
+BuildRequires:    glib2-devel >= 2.2
+BuildRequires:    eventlog-devel >= 0.2.5
+
 Requires:         logrotate
 Requires(post):   chkconfig, initscripts
 Requires(preun):  chkconfig, initscripts
@@ -41,12 +29,12 @@
 Provides:         syslog
 
 %description
-syslog-ng, as the name shows, is a syslogd replacement, but with new 
-functionality for the new generation. The original syslogd allows 
-messages only to be sorted based on priority/facility pairs; syslog-ng 
-adds the possibility to filter based on message contents using regular 
-expressions. The new configuration scheme is intuitive and powerful. 
-Forwarding logs over TCP and remembering all forwarding hops makes it 
+syslog-ng, as the name shows, is a syslogd replacement, but with new
+functionality for the new generation. The original syslogd allows
+messages only to be sorted based on priority/facility pairs; syslog-ng
+adds the possibility to filter based on message contents using regular
+expressions. The new configuration scheme is intuitive and powerful.
+Forwarding logs over TCP and remembering all forwarding hops makes it
 ideal for firewalled environments.
 
 
@@ -55,18 +43,17 @@
 %patch0 -p1
 %patch1 -p1
 %{__sed} -i  's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
-chmod a-x contrib/syslog2ng
-mv libol-%{libolver}/{ChangeLog,ChangeLog.libol}
+chmod -c a-x contrib/syslog2ng
+
 
 %build
 %configure \
     --sbindir=%{sbindir} \
-%if %{spoofing}
-    --enable-spoof-source \
-%endif
-    --enable-tcp-wrapper
+    --sysconfdir=%{_sysconfdir}/syslog-ng \
+    --enable-ipv6
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -141,11 +128,11 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README README.spoof ChangeLog INSTALL NEWS PORTS
-%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 libol-%{libolver}/ChangeLog.libol
+%doc AUTHORS ChangeLog COPYING NEWS README
+%doc doc/reference/syslog-ng.txt
+%doc doc/security/*.txt
+%doc doc/examples/syslog-ng.conf.sample
+%doc contrib/{relogger.pl,syslog2ng,syslog-ng.conf.doc}
 %{sbindir}/syslog-ng
 %{_initrddir}/syslog-ng
 %dir %{_sysconfdir}/%{name}
@@ -159,8 +146,17 @@
 
 
 %changelog
-* Tue Feb  6 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.6.12-1
-- Update to 1.6.12.
+* Mon Jan 29 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.0.2-1
+- Update to 2.0.2.
+
+* Thu Jan  4 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.0.1-1
+- Update to 2.0.1.
+
+* Fri Dec 15 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.0.0-1
+- Updated the init script patch: LSB Description and Short-Description.
+
+* Fri Nov  3 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.0.0-0
+- Update to 2.0.0.
 
 * Sun Sep 10 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.6.11-3
 - Rebuild for FC6.


--- syslog-ng-1.6.7-init.patch DELETED ---

More information about the scm-commits mailing list