X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=syslog-ng.spec;h=d3b54266b39f2eb06df0f5d0dd9ebe7f6f6cc761;hb=0e4e3ce15a2d49b712fb6f7d301951ee538f5d17;hp=187109f320cf7b410afd6d274fb80905d8bc5565;hpb=2cb1bc968286428f7fc65aa78916a1d737319cc7;p=packages%2Fsyslog-ng.git

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 187109f..d3b5426 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -1,52 +1,87 @@
 #
 # Conditional build:
-%bcond_with	dynamic		# link dynamically with glib and eventlog
-#
-%define		mainver		1.9
-%define		minorver	9
+%bcond_with	dynamic		# link dynamically with glib, eventlog, pcre, openssl
+%if "%{pld_release}" == "ac"
+%bcond_with		sql		# build with support for logging to SQL DB
+%else
+%bcond_without	sql		# build without support for logging to SQL DB
+%endif
+%bcond_without	tests
 
+%if "%{pld_release}" == "ac"
+%define		glib2_ver	2.16.0
+%else
+%define		glib2_ver	2.24.0
+%endif
 Summary:	Syslog-ng - new generation of the system logger
-Summary(pl):	Syslog-ng - zamiennik syskloga
-Summary(pt_BR):	Daemon de log nova geração
+Summary(pl.UTF-8):	Syslog-ng - zamiennik syskloga
+Summary(pt_BR.UTF-8):	Daemon de log nova geração
 Name:		syslog-ng
-Version:	%{mainver}.%{minorver}
-Release:	2
+Version:	3.2.2
+Release:	0.1
 License:	GPL v2
 Group:		Daemons
-Source0:	http://www.balabit.com/downloads/syslog-ng/%{mainver}/src/%{name}-%{version}.tar.gz
-# Source0-md5:	76dfb7ea910d1b033031aca2f40bf723
+Source0:	http://www.balabit.com/downloads/files/syslog-ng/sources/%{version}/source/%{name}_%{version}.tar.gz
+# Source0-md5:	ed8ebe559d52a63fb61e3e2db566643f
 Source1:	%{name}.init
 Source2:	%{name}.conf
 Source3:	%{name}.logrotate
+Source4:	http://www.balabit.com/dl/guides/%{name}-v3.0-guide-admin-en.pdf
+# Source4-md5:	882f77ad2673e6490099b5393fe26796
+Source5:	%{name}-simple.conf
+Source6:	%{name}.upstart
 Patch0:		%{name}-link.patch
-Patch1:		%{name}-level.patch
+Patch1:		%{name}-datadir.patch
+Patch2:		%{name}-pyssl.patch
 URL:		http://www.balabit.com/products/syslog_ng/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	flex
-BuildRequires:	libwrap-devel
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	pkgconfig
+BuildRequires:	rpm >= 4.4.9-56
+BuildRequires:	rpmbuild(macros) >= 1.561
+BuildRequires:	which
+%if %{with tests}
+%{?with_sql:BuildRequires:	libdbi-drivers-sqlite3}
+BuildRequires:	python
+BuildRequires:	python-modules
+BuildRequires:	tzdata
+%endif
 %if %{with dynamic}
-BuildRequires:	eventlog-devel
-BuildRequires:	glib2-devel >= 2.0.0
+BuildRequires:	eventlog-devel >= 0.2
+BuildRequires:	glib2-devel >= 1:%{glib2_ver}
+BuildRequires:	libcap-devel
+%{?with_sql:BuildRequires:	libdbi-devel >= 0.8.3-2}
+BuildRequires:	libnet-devel >= 1:1.1.2.1-3
+BuildRequires:	libwrap-devel
+BuildRequires:	openssl-devel
+BuildRequires:	pcre-devel
 %else
-BuildRequires:	eventlog-static
-BuildRequires:	glib2-static >= 2.0.0
+BuildRequires:	eventlog-static >= 0.2
+BuildRequires:	glib2-static >= 1:%{glib2_ver}
+BuildRequires:	glibc-static
+BuildRequires:	libcap-static
+%{?with_sql:BuildRequires:	libdbi-static >= 0.8.3-2}
+BuildRequires:	libnet-static >= 1:1.1.2.1-3
+BuildRequires:	libwrap-static
+BuildRequires:	openssl-static
+BuildRequires:	pcre-static
+BuildRequires:	zlib-static
 %endif
 Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
-Requires:	logrotate
+Requires:	glib2 >= 1:%{glib2_ver}
 Requires:	psmisc >= 20.1
-Requires:	rc-scripts >= 0.2.0
+Requires:	rc-scripts >= 0.4.3.0
 Provides:	syslogdaemon
-Obsoletes:	klogd
-Obsoletes:	msyslog
-Obsoletes:	syslog
+Conflicts:	klogd
+Conflicts:	msyslog
+Conflicts:	syslog
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-syslog-ng is a syslogd replacement for unix and unix-like systems. It
+syslog-ng is a syslogd replacement for Unix and Unix-like systems. It
 has been tested on Solaris, BSDi and Linux, and were found to run
 reliably. syslog-ng gives you a much enhanced configuration scheme,
 which lets you filter messages based on not only priority/facility
@@ -56,63 +91,109 @@ simple file to a network connection. syslog-ng supports TCP
 logforwarding, together with hashing to prevent unauthorized
 modification on the line.
 
-%description -l pl
-Syslog-ng jest zamiennikiem dla standardowo u¿ywanych programów typu
-sysklog. Dzia³a w systemie SunOS, BSD, Linux. Daje znacznie wiêksze
-mo¿liwo¶ci logowania i kontrolowania zbieranych informacji.
+%description -l pl.UTF-8
+Syslog-ng jest zamiennikiem dla standardowo używanych programów typu
+syslog. Działa w systemie SunOS, BSD, Linux. Daje znacznie większe
+możliwości logowania i kontrolowania zbieranych informacji.
 
-%description -l pt_BR
-Syslog-ng é um substituto para o syslog tradicional, mas com diversas
+%description -l pt_BR.UTF-8
+Syslog-ng é um substituto para o syslog tradicional, mas com diversas
 melhorias, como, por exemplo, a habilidade de filtrar mensagens de log
-por seu conteúdo (usando expressões regulares) e não apenas pelo par
+por seu conteúdo (usando expressões regulares) e não apenas pelo par
 facility/prioridade como o syslog original.
 
+%package upstart
+Summary:	Upstart job description for syslog-ng
+Summary(pl.UTF-8):	Opis zadania Upstart dla syslog-ng
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+Requires:	upstart >= 0.6
+
+%description upstart
+Upstart job description for syslog-ng.
+
+%description upstart -l pl.UTF-8
+Opis zadania Upstart dla syslog-ng.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+cp -a %{SOURCE4} doc
+cp -a %{SOURCE5} contrib/syslog-ng.conf.simple
 
 %build
-%{__aclocal}
+%{__libtoolize}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 %configure \
 	--sysconfdir=%{_sysconfdir}/syslog-ng \
+	--with-module-dir=/%{_lib}/syslog-ng \
+	--with-timezone-dir=%{_datadir}/zoneinfo \
+	--with-pidfile-dir=/var/run \
+	--enable-ssl \
+	--enable-ipv6 \
+	--enable-tcp-wrapper \
+	--enable-spoof-source \
+	--enable-linux-caps \
+	--enable-pcre \
+	--enable-pacct \
+%if %{with sql}
+	--enable-sql \
+%endif
 %if %{with dynamic}
 	--enable-dynamic-linking
 %endif
 
 %{__make}
 
-tar zxvf doc/reference/syslog-ng.html.tar.gz
+%{?with_tests:%{__make} check}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{logrotate.d,rc.d/init.d},%{_sysconfdir}/syslog-ng} \
-	$RPM_BUILD_ROOT/var/log/
+install -d $RPM_BUILD_ROOT{/etc/{init,sysconfig,logrotate.d,rc.d/init.d},%{_sysconfdir}/syslog-ng} \
+	$RPM_BUILD_ROOT/var/{log,lib/%{name}}
 
-%{__make} install \
+%{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/syslog-ng
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/syslog-ng.conf
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/syslog-ng
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/syslog-ng
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/syslog-ng.conf
+cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/syslog-ng
 
-for n in debug kernel maillog messages secure syslog user spooler lpr daemon
-do
+for n in daemon debug iptables kernel lpr maillog messages secure spooler syslog user xferlog; do
 	> $RPM_BUILD_ROOT/var/log/$n
 done
+touch $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+
+rm $RPM_BUILD_ROOT%{_bindir}/loggen
+
+%if "%{pld_release}" == "th"
+cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/init/%{name}.conf
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-for n in /var/log/{cron,daemon,debug,kernel,lpr,maillog,messages,ppp,secure,spooler,syslog,user}
-do
-	[ -f $n ] && continue
-	touch $n
-	chmod 640 $n
-done
+if [ "$1" = "1" ]; then
+	# disable /proc/kmsg from config on first install on vserver
+	{
+		while read f ctx; do
+			[ "$f" = "VxID:" -o "$f" = "s_context:" ] && break
+		done </proc/self/status
+	} 2>/dev/null
+	if [ -z "$ctx" -o "$ctx" = "0" ]; then
+		VSERVER=no
+	else
+		VSERVER=yes
+	fi
+	if [ "$VSERVER" = "yes" ]; then
+		%{__sed} -i -e '/\/proc\/kmsg/ s/^[^#]/#&/' %{_sysconfdir}/%{name}/%{name}.conf
+	fi
+fi
 
 /sbin/chkconfig --add syslog-ng
 %service syslog-ng restart "syslog-ng daemon"
@@ -123,15 +204,44 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del syslog-ng
 fi
 
+%post upstart
+%upstart_post %{name}
+
+%postun upstart
+%upstart_postun %{name}
+
+%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 doc/examples/syslog-ng.conf.sample doc/reference/syslog-ng.txt* contrib/syslog-ng.conf.{doc,RedHat}
-%doc syslog-ng.html/*
+%doc AUTHORS ChangeLog NEWS debian/syslog-ng.conf* contrib/relogger.pl
+%doc doc/examples/syslog-ng.conf.sample contrib/syslog-ng.conf.{doc,simple,RedHat}
+%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) %{_sbindir}/syslog-ng
-%{_mandir}/man[58]/*
+%dir %{_var}/lib/%{name}
+%{_mandir}/man5/syslog-ng.conf.5*
+%{_mandir}/man8/syslog-ng.8*
 
 %attr(640,root,root) %ghost /var/log/*
+
+%if "%{pld_release}" == "th"
+%files upstart
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf
+%endif