rpms/syslog-ng/F-10 sources,1.17,1.18 syslog-ng.spec,1.39,1.40

Wed Sep 16 04:18:35 UTC 2009

Author: rayvd

Update of /cvs/pkgs/rpms/syslog-ng/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20509

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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18

--- sources	3 Dec 2008 03:54:55 -0000	1.17
+++ sources	16 Sep 2009 04:18:34 -0000	1.18
@@ -1 +1,2 @@
-3f96ccf13dda0b9e150e511bcffde795  syslog-ng-2.0.10.tar.gz
+17c4c7725d2eab62b588395f1ed93f32  syslog-ng-2.1.4.tar.gz
+02ce641aa7ca3649f2cd562f2864e654  syslog-ng-2.1.4-libnet.patch


Index: syslog-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syslog-ng/F-10/syslog-ng.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- syslog-ng.spec	3 Dec 2008 03:54:55 -0000	1.39
+++ syslog-ng.spec	16 Sep 2009 04:18:34 -0000	1.40
@@ -1,143 +1,192 @@
-# Rebuild option:
-#
-#   --with spoofsource              enables the syslog-ng spoof-source feature
-#
-
-%define spoofsource  0
 %{?_with_spoofsource:%define spoofsource 1}
+%define evtlog_ver 0.2.7-2
 
-%define sbindir   /sbin
+%define _sbindir /sbin
+%define _localstatedir /var/lib/syslog-ng
 
-Name:             syslog-ng
-Version:          2.0.10
-Release:          1%{?dist}
-Summary:          Syslog replacement daemon
-
-Group:            System Environment/Daemons
-License:          GPLv2
-URL:              http://www.balabit.com/products/syslog-ng/
-Source0:          http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/syslog-ng-%{version}.tar.gz
-Source1:          syslog.log
-Patch0:           syslog-ng-2.0.0-init.patch
-Patch1:           syslog-ng-1.6.7-logrotate.patch
-Patch2:           syslog-ng-2.0.5-conf.patch
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:    flex
-BuildRequires:    byacc
-BuildRequires:    pkgconfig >= 0.20
-BuildRequires:    glib2-devel >= 2.2
-BuildRequires:    eventlog-devel >= 0.2.5
-BuildRequires:    tcp_wrappers-devel
-%if %{spoofsource}
-BuildRequires:    libnet-devel >= 1.1
+Name: syslog-ng
+Version: 2.1.4
+Release: 4%{?dist}
+Summary: Next-generation syslog server
+
+Group: System Environment/Daemons
+License: GPLv2+
+Url: http://www.balabit.com/products/syslog_ng/
+Source0: http://www.balabit.com/downloads/files/syslog-ng/sources/2.1/src/%{name}-%{version}.tar.gz
+Source1: syslog-ng.conf
+Source2: syslog-ng.init.d
+Source10: sysklogd-syslog-ng.sysconfig
+Source11: sysklogd-1.4.1-logrotate.d-syslog.log
+Source12: sysklogd-1.4.1-44-logrotate.d-syslog.log
+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}
+BuildRequires: pkgconfig
+BuildRequires: glib2-devel
+%if 0%{?fedora}
+BuildRequires: glib2-static
+%endif
+%if 0%{?rhel}
+BuildRequires: tcp_wrappers
+BuildRequires: eventlog-static >= %{evtlog_ver}
+BuildRequires: automake
+%else
+BuildRequires: tcp_wrappers-devel
+%endif
+BuildRequires: libnet-devel
+Requires: logrotate
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service
+Provides: syslog
+%if 0%{?rhel} == 4
+# makes vixie-cron and initscripts happy
+Provides: sysklogd = 1.3.33-6
 %endif
+# merge separate syslog-vim package into one
+Provides: syslog-ng-vim = %{version}-%{release}
+Obsoletes: syslog-ng-vim < 2.0.8-1
 
-Requires:         logrotate
-Requires(post):   chkconfig, initscripts
-Requires(preun):  chkconfig, initscripts
-Requires(postun): initscripts
-#
-# Keep initscripts and vixie-cron happy
-#
-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.
 
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%{__sed} -i  's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
-chmod -c a-x contrib/syslog2ng
+%if 0%{?rhel}
+%patch0 -p1 -b .libnet
+%endif
+
+# fix perl path
+%{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
 
 # force regeneration to avoid broken paths from upstream (#265221)
-touch src/cfg-grammar.y
+touch src/cfg-grammar.c src/cfg-lex.c
+
+%define logrotated_dst syslog
+%if 0%{?rhel}
+	%if 0%{?rhel} <= 4
+		%define sysconfig_src %{SOURCE10}
+		%define logrotated_src %{SOURCE11}
+	%endif
+	%if 0%{?rhel} >= 5
+		%define sysconfig_src %{SOURCE10}
+		%define logrotated_src %{SOURCE12}
+	%endif
+%endif
+%if 0%{?fedora}
+	%if 0%{?fedora} <= 9
+		%define sysconfig_src %{SOURCE20}
+		%define logrotated_src %{SOURCE21}
+	%endif
+	%if 0%{?fedora} >= 10
+		%define sysconfig_src %{SOURCE30}
+		%define logrotated_src %{SOURCE31}
+	%endif
+%endif
 
 
 %build
 %configure \
-    --sbindir=%{sbindir} \
-    --sysconfdir=%{_sysconfdir}/syslog-ng \
-    --enable-ipv6 \
-    --enable-tcp-wrapper \
-%if ! %{spoofsource}
-    --disable-spoof-source \
+	--enable-ipv6 \
+	--sysconfdir=%{_sysconfdir}/%{name} \
+	--enable-tcp-wrapper \
+%if 0%{?spoofsource}
+	--enable-spoof-source \
+%endif
+%if 0%{?rhel}
+	--enable-mixed-linking
 %else
-    --enable-spoof-source \
+	--enable-dynamic-linking
 %endif
-    --enable-dynamic-linking
-make %{?_smp_mflags}
+
+
+make %{_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+
+%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/%{name}
+%{__install} -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/syslog-ng.conf
+
+%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/init.d
+%{__install} -p -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/%{name}
+
+%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/sysconfig
+%{__install} -p -m 644 %{sysconfig_src} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+
+%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/logrotate.d
+%{__install} -p -m 644 %{logrotated_src} \
+	%{buildroot}%{_sysconfdir}/logrotate.d/%{logrotated_dst}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+# make local state dir
+%{__install} -d -m 755 %{buildroot}/%{_localstatedir}
 
-install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-
-install -p -m 755 contrib/fedora-packaging/syslog-ng.init \
-    $RPM_BUILD_ROOT%{_initrddir}/syslog-ng
-install -p -m 644 contrib/fedora-packaging/syslog-ng.conf \
-    $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 %{SOURCE1} \
-    $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/syslog
-
-# Vim syntax file
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -p -m 644 contrib/syslog-ng.vim $RPM_BUILD_ROOT%{_datadir}/%{name}/
+# fix authors file
+/usr/bin/iconv -f iso8859-1 -t utf-8 AUTHORS > AUTHORS.conv && \
+	%{__mv} -f AUTHORS.conv AUTHORS
+
+# fix executable perms on contrib files
+%{__chmod} -x contrib/relogger.pl
+%{__chmod} -x contrib/syslog2ng
+
+# fix script interpreter
+sed -i 's/\/usr\/local\/bin\/perl/\/usr\/bin\/perl/' contrib/relogger.pl
+
+# install vim files
+%{__install} -d -m 755 %{buildroot}%{_datadir}/%{name}
+%{__install} -p -m 644 contrib/syslog-ng.vim %{buildroot}%{_datadir}/%{name}
 for vimver in 63 64 70 71 ; do
-    install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax
-    cd $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax
-    ln -s ../../../%{name}/syslog-ng.vim .
+	%{__install} -d -m 755 %{buildroot}%{_datadir}/vim/vim$vimver/syntax
+	cd %{buildroot}%{_datadir}/vim/vim$vimver/syntax
+	ln -s ../../../%{name}/syslog-ng.vim .
+	cd -
 done
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
-# only rpm -i (not rpm {-U|-F})
-if [ $1 = 1 ]; then
-    /sbin/chkconfig --add syslog-ng
-#   /sbin/service syslog-ng start
-fi
+/sbin/chkconfig --add %{name}
+
 
 %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
+if [ "$1" = 0 ]; then
+	/sbin/service %{name} stop > /dev/null 2>&1
+	/sbin/chkconfig --del %{name}
 fi
 
+
 %postun
-# only rpm {-U|-F} (not rpm -e)
-if [ $1 = 1 ]; then
-    /sbin/service syslog-ng condrestart
+if [ "$1" -ge 1 ]; then
+	/sbin/service %{name} condrestart >/dev/null 2>&1
 fi
 
 
 %triggerin -- vim-common
 VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
 [ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \
-    cd %{_datadir}/vim/vim${VIMVERNEW}/syntax && \
-    ln -sf ../../../%{name}/syslog-ng.vim . || :
+	cd %{_datadir}/vim/vim${VIMVERNEW}/syntax && \
+	ln -sf ../../../%{name}/syslog-ng.vim . || :
 
 %triggerun -- vim-common
 VIMVEROLD=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | head -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
@@ -147,34 +196,62 @@ VIMVEROLD=`rpm -q --qf='%%{epoch}:%%{ver
 VIMVEROLD=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | head -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
 VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
 if [ $1 = 1 ]; then
-    rm -f %{_datadir}/vim/vim${VIMVEROLD}/syntax/syslog-ng.vim || :
-    [ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \
-        cd %{_datadir}/vim/vim${VIMVERNEW}/syntax && \
-        ln -sf ../../../%{name}/syslog-ng.vim . || :
+	rm -f %{_datadir}/vim/vim${VIMVEROLD}/syntax/syslog-ng.vim || :
+	[ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \
+		cd %{_datadir}/vim/vim${VIMVERNEW}/syntax && \
+		ln -sf ../../../%{name}/syslog-ng.vim . || :
 fi
 
 
+
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%defattr(-,root,root)
+%doc AUTHORS COPYING README ChangeLog NEWS
 %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}
-%{_bindir}/loggen
-%{sbindir}/%{name}
-%{_initrddir}/%{name}
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/logrotate.d/syslog
-%{_datadir}/%{name}/
-%{_mandir}/man5/*.5*
-%{_mandir}/man8/*.8*
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{logrotated_dst}
+%{_sysconfdir}/init.d/%{name}
+%dir %{_localstatedir}
+%{_sbindir}/%{name}
+%{_bindir}/loggen
+%{_datadir}/%{name}
+%{_mandir}/man5/*
+%{_mandir}/man8/*
 %ghost %{_datadir}/vim/
 
 
 %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)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at 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 at silfreed.net> - 2.1.4-1
+- update to 2.1.4
+- enabling mixed linking to compile only non-system libs statically
+- lots of packaging updates to be able to build on RHEL4,5, Fedora9+ and be
+  parallel-installable with rsyslog and/or sysklogd on those platforms
+- removing BR for flex & byacc to try to prevent files from being regenerated
+- fixing build error with cfg-lex.l and flex 2.5.4
+- Fixed a possible DoS condition triggered by a destination port unreachable
+  ICMP packet received from a UDP destination.  syslog-ng started eating all
+  available memory and CPU until it crashed if this happened.
+- Fixed the rate at which files regular were read using the file() source.
+- Report connection breaks as a write error instead of reporting POLLERR as
+  the write error path reports more sensible information in the logs.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Dec 02 2008 Douglas E. Warner <silfreed at silfreed.net> 2.0.10-1
 - update to 2.0.10
 - fix for CVE-2008-5110
@@ -417,4 +494,3 @@ fi
 * Sun Dec 08 2002 Richard E. Perlotto II <richard at perlotto.com> 1.5.23-1
 - Updated file with notes and PGP signatures
 
-# vim:set ai ts=4 sw=4 sts=4 et:


