X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=syslog-ng.spec;h=e79d237b50f122adb3647d3303e4540007ddfda0;hb=3851a6e603b2cdfa186e1aedb3932c06686220e6;hp=6ea645e3d13f8bf6b61634476f237b3f2590e963;hpb=311f3ecdfb3f038294aca93c70c0b1a1e548ca8f;p=packages%2Fsyslog-ng.git

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 6ea645e..e79d237 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -2,25 +2,30 @@
 # Conditional build:
 %bcond_with	dynamic		# link dynamically with glib, eventlog, pcre, openssl
 %bcond_without	sql		# build without support for logging to SQL DB
+%bcond_without	tests
 #
 Summary:	Syslog-ng - new generation of the system logger
 Summary(pl.UTF-8):	Syslog-ng - zamiennik syskloga
 Summary(pt_BR.UTF-8):	Daemon de log nova geração
 Name:		syslog-ng
-Version:	3.0.1
-Release:	2
+Version:	3.0.2
+Release:	4
 License:	GPL v2
 Group:		Daemons
-Source0:	http://www.balabit.com/downloads/files/syslog-ng/sources/3.0.1/source/%{name}_%{version}.tar.gz
-# Source0-md5:	14e13519bad47d0a6308905292385321
+Source0:	http://www.balabit.com/downloads/files/syslog-ng/sources/%{version}/source/%{name}_%{version}.tar.gz
+# Source0-md5:	0dce90ddd4f0f417ce2b9d88ccbca2e9
 Source1:	%{name}.init
 Source2:	%{name}.conf
 Source3:	%{name}.logrotate
-Source4:	http://www.balabit.com/dl/guides/syslog-ng-v3.0-guide-admin-en.pdf
-# Source4-md5:	d85266ac9155ad6df9844aadf830b379
+Source4:	http://www.balabit.com/dl/guides/%{name}-v3.0-guide-admin-en.pdf
+# Source4-md5:	1a801f138a9a2245009ecb617be4338b
+Source5:	%{name}-simple.conf
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-datadir.patch
-Patch2:		%{name}-fixes.patch
+Patch2:		%{name}-tz.patch
+Patch3:		%{name}-pyssl.patch
+Patch4:		bug-15.patch
+Patch5:		%{name}-bug-48.patch
 URL:		http://www.balabit.com/products/syslog_ng/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
@@ -28,6 +33,9 @@ BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.268
+%if %{with tests}
+BuildRequires:	tzdata
+%endif
 %if %{with dynamic}
 BuildRequires:	eventlog-devel >= 0.2
 BuildRequires:	glib2-devel >= 1:2.10.1
@@ -55,7 +63,6 @@ BuildRequires:	zlib-static
 %endif
 Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
-Requires:	logrotate
 Requires:	psmisc >= 20.1
 Requires:	rc-scripts >= 0.2.0
 Provides:	syslogdaemon
@@ -91,8 +98,11 @@ facility/prioridade como o syslog original.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-
-install %{SOURCE4} doc/
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+cp -a %{SOURCE4} doc
+cp -a %{SOURCE5} contrib
 
 %build
 %{__aclocal}
@@ -117,6 +127,8 @@ install %{SOURCE4} doc/
 
 %{__make}
 
+%{?with_tests:%{__make} check}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/{sysconfig,logrotate.d,rc.d/init.d},%{_sysconfdir}/syslog-ng} \
@@ -135,17 +147,12 @@ do
 done
 touch $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
+rm $RPM_BUILD_ROOT%{_bindir}/loggen
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-for n in /var/log/{daemon,debug,iptables,kernel,lpr,maillog,messages,secure,spooler,syslog,user,xferlog}
-do
-	[ -f $n ] && continue
-	touch $n
-	chmod 640 $n
-done
-
 /sbin/chkconfig --add syslog-ng
 %service syslog-ng restart "syslog-ng daemon"
 
@@ -155,17 +162,29 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del syslog-ng
 fi
 
+%triggerun -- syslog-ng < 3.0
+sed -i -e 's#sync(\(.*\))#flush_lines(\1)#g' /etc/syslog-ng/syslog-ng.conf
+sed -i -e 's#pipe ("/proc/kmsg"#file ("/proc/kmsg"#g' /etc/syslog-ng/syslog-ng.conf
+sed -i -e 's#log_prefix#program_override#g' /etc/syslog-ng/syslog-ng.conf
+sed -i -e 's#^destination #destination d_#g' /etc/syslog-ng/syslog-ng.conf
+sed -i -e 's#destination(#destination(d_#g' /etc/syslog-ng/syslog-ng.conf
+sed -i -e 's,\bstats\b,stats_freq,' /etc/syslog-ng/syslog-ng.conf
+sed -i -e 's#match("IN\=\[A-Za-z0-9\]\* OUT=\[A-Za-z0-9\]\*");#match("IN=[A-Za-z0-9]* OUT=[A-Za-z0-9]*" value("MESSAGE"));#g' /etc/syslog-ng/syslog-ng.conf
+sed -i -e "1 s#\(.*\)\$#@version: 3.0\n\1#g" /etc/syslog-ng/syslog-ng.conf
+rm -f %{_var}/lib/%{name}/syslog-ng.persist
+%service -q syslog-ng restart
+exit 0
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS debian/syslog-ng.conf* contrib/{relogger.pl,syslog-ng.vim}
-%doc doc/examples/syslog-ng.conf.sample contrib/syslog-ng.conf.{doc,RedHat}
-%doc contrib/{apparmor,selinux} doc/syslog-ng-v3.0-guide-admin-en.pdf
+%doc doc/examples/syslog-ng.conf.sample contrib/syslog-ng.conf.{doc,RedHat} contrib/syslog-ng-simple.conf
+%doc contrib/{apparmor,selinux,syslog2ng} doc/syslog-ng-v3.0-guide-admin-en.pdf
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(750,root,root) %dir %{_sysconfdir}/syslog-ng
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/syslog-ng.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/syslog-ng
 %attr(754,root,root) /etc/rc.d/init.d/syslog-ng
-%attr(755,root,root) %{_bindir}/loggen
 %attr(755,root,root) %{_sbindir}/syslog-ng
 %dir %{_var}/lib/%{name}
 %{_mandir}/man5/syslog-ng.conf.5*