X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=syslog-ng.spec;h=4e60fa95b89738c15fb8c6c91aaf8708e17adb3c;hb=de8f2086eecbda8763b1e88079299992edeef4b2;hp=649997904315ab52d204859da233c03bcb6d2fec;hpb=0872fe7c466c91b04bff07c9ddc58d8e945570b6;p=packages%2Fsyslog-ng.git

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 6499979..4e60fa9 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -1,71 +1,103 @@
 #
+# TODO:
+#	- move SQL module to a separate package
+#	- relies on libs in /usr/ which is wrong
+#	- use external libivykis.spec
+#
 # Conditional build:
 %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.UTF-8):	Syslog-ng - zamiennik syskloga
 Summary(pt_BR.UTF-8):	Daemon de log nova geração
 Name:		syslog-ng
-Version:	3.0.2
-Release:	1
+Version:	3.3.1
+Release:	2
 License:	GPL v2
 Group:		Daemons
-Source0:	http://www.balabit.com/downloads/files/syslog-ng/sources/%{version}/source/%{name}_%{version}.tar.gz
-# Source0-md5:	0dce90ddd4f0f417ce2b9d88ccbca2e9
+Source0:	http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/%{version}/source/%{name}_%{version}.tar.gz
+# Source0-md5:	a3dfe8a49aa8ce1aeb7e1ed5b11af378
 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:	1a801f138a9a2245009ecb617be4338b
+Source4:	http://www.balabit.com/support/documentation/syslog-ng-ose-v3.3-guide-admin-en.pdf
+# Source4-md5:	bb23e36a8f44956858f2d622f9d1826d
 Source5:	%{name}-simple.conf
-Patch0:		%{name}-link.patch
-Patch1:		%{name}-datadir.patch
-Patch2:		%{name}-tz.patch
-Patch3:		%{name}-pyssl.patch
+Source6:	%{name}.upstart
+Patch0:		%{name}-datadir.patch
+Patch1:		cap_syslog-vserver-workaround.patch
 URL:		http://www.balabit.com/products/syslog_ng/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.268
+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 >= 0.2
-BuildRequires:	glib2-devel >= 1:2.10.1
+BuildRequires:	eventlog-devel >= 0.2.12
+BuildRequires:	glib2-devel >= 1:%{glib2_ver}
 BuildRequires:	libcap-devel
-%if %{with sql}
-BuildRequires:	libdbi-devel >= 0.8.3-2
-%endif
+%{?with_sql:BuildRequires:	libdbi-devel >= 0.8.3-2}
 BuildRequires:	libnet-devel >= 1:1.1.2.1-3
 BuildRequires:	libwrap-devel
-BuildRequires:	openssl-devel >= 0.9.8
+BuildRequires:	openssl-devel
 BuildRequires:	pcre-devel
 %else
-BuildRequires:	eventlog-static >= 0.2
-BuildRequires:	glib2-static >= 1:2.2.0
+BuildRequires:	eventlog-static >= 0.2.12
+BuildRequires:	glib2-static >= 1:%{glib2_ver}
 BuildRequires:	glibc-static
 BuildRequires:	libcap-static
-%if %{with sql}
-BuildRequires:	libdbi-static >= 0.8.3-2
-%endif
+%{?with_sql:BuildRequires:	libdbi-static >= 0.8.3-2}
 BuildRequires:	libnet-static >= 1:1.1.2.1-3
 BuildRequires:	libwrap-static
-BuildRequires:	openssl-static >= 0.9.8
+BuildRequires:	openssl-static
 BuildRequires:	pcre-static
 BuildRequires:	zlib-static
+Requires:	libnet >= 1:1.1.2.1-7
 %endif
 Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
+Requires:	glib2 >= 1:%{glib2_ver}
 Requires:	psmisc >= 20.1
-Requires:	rc-scripts >= 0.2.0
+Requires:	rc-scripts >= 0.4.3.0
 Provides:	syslogdaemon
 Conflicts:	klogd
 Conflicts:	msyslog
 Conflicts:	syslog
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# syslog-ng has really crazy linking rules (see their bugzilla).
+# Some rules, according to syslog-ng devs, are like this:
+# - libsyslog-ng.so has undefined symbols for third party libraries
+#   and these symbols should go via main syslog-ng binary
+# - same applies for modules
+%if %{without dynamic}
+%define		no_install_post_check_so	1
+# filterout_ld - see comment few lines above
+%define		filterout_ld			-Wl,--as-needed -Wl,--no-copy-dt-needed-entries
+%define		_sbindir			/sbin
+%define		_libdir				/%{_lib}
+%endif
+
 %description
 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
@@ -88,21 +120,44 @@ 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
 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
+Conflicts:	avahi-upstart < 0.6.30-2
+Conflicts:	openssh-server-upstart < 2:5.8p2-2
+Conflicts:	postgresql-upstart < 9.0.4-2
+
+%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
-%patch3 -p1
 cp -a %{SOURCE4} doc
-cp -a %{SOURCE5} contrib
+cp -a %{SOURCE5} contrib/syslog-ng.conf.simple
+
+%{__sed} -i -e 's|/usr/bin/awk|/bin/awk|' scl/syslogconf/convert-syslogconf.awk
 
 %build
-%{__aclocal}
-%{__autoconf}
-%{__automake}
+for i in . lib/ivykis; do
+cd $i
+	%{__libtoolize}
+	%{__aclocal} -I m4
+	%{__autoconf}
+	%{__automake}
+cd -
+done
 %configure \
 	--sysconfdir=%{_sysconfdir}/syslog-ng \
+	--datadir=%{_datadir}/syslog-ng \
+	--with-module-dir=%{_libdir}/syslog-ng \
 	--with-timezone-dir=%{_datadir}/zoneinfo \
 	--with-pidfile-dir=/var/run \
 	--enable-ssl \
@@ -111,41 +166,68 @@ cp -a %{SOURCE5} contrib
 	--enable-spoof-source \
 	--enable-linux-caps \
 	--enable-pcre \
+	--enable-pacct \
 %if %{with sql}
 	--enable-sql \
 %endif
 %if %{with dynamic}
 	--enable-dynamic-linking
+%else
+	--enable-mixed-linking
 %endif
 
 %{__make}
 
-%{?with_tests:%{__make} check}
+%{?with_tests:LD_LIBRARY_PATH=$PWD/lib/.libs %{__make} check}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{sysconfig,logrotate.d,rc.d/init.d},%{_sysconfdir}/syslog-ng} \
-	$RPM_BUILD_ROOT/var/{log,lib/%{name}}
+install -d $RPM_BUILD_ROOT/etc/{init,sysconfig,logrotate.d,rc.d/init.d} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/patterndb.d \
+	$RPM_BUILD_ROOT/var/{log,lib/%{name}/xsd}
 
-%{__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
+%{__sed} -e 's|@@SBINDIR@@|%{_sbindir}|g' %{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 daemon debug iptables kernel lpr maillog messages secure spooler syslog user xferlog
-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
+%{__rm} $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}/loggen*
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/syslog-ng/*.la
+
+%if "%{pld_release}" == "th"
+%{__sed} -e 's|@@SBINDIR@@|%{_sbindir}|g' %{SOURCE6} > $RPM_BUILD_ROOT/etc/init/%{name}.conf
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+/sbin/ldconfig
+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"
 
@@ -155,6 +237,18 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del syslog-ng
 fi
 
+%postun -p /sbin/ldconfig
+
+%post upstart
+%upstart_post %{name}
+
+%postun upstart
+%upstart_postun %{name}
+
+%triggerun upstart -- syslog-ng-upstart < 3.2.4-3
+#  use SERVICE_syslog=y in upstart job environment instead of SERVICE=syslog
+%{__sed} -i -e 's,SERVICE=syslog,SERVICE_syslog=y,' /etc/init/*.conf || :
+
 %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
@@ -170,17 +264,51 @@ 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} contrib/syslog-ng-simple.conf
-%doc contrib/{apparmor,selinux,syslog2ng} doc/syslog-ng-v3.0-guide-admin-en.pdf
+%doc AUTHORS ChangeLog NEWS debian/syslog-ng.conf* contrib/relogger.pl
+%doc contrib/syslog-ng.conf.{doc,simple,RedHat}
+%doc contrib/{apparmor,selinux,syslog2ng} doc/syslog-ng-ose-v3.3-guide-admin-en.pdf
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(750,root,root) %dir %{_sysconfdir}/syslog-ng
+%attr(750,root,root) %dir %{_sysconfdir}/syslog-ng/patterndb.d
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/modules.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/scl.conf
 %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) %{_libdir}/libsyslog-ng-%{version}.so
+%dir %{_libdir}/syslog-ng
+%attr(755,root,root) %{_libdir}/syslog-ng/lib*.so
 %attr(755,root,root) %{_sbindir}/syslog-ng
+%attr(755,root,root) %{_sbindir}/syslog-ng-ctl
+%attr(755,root,root) %{_bindir}/pdbtool
+%attr(755,root,root) %{_bindir}/update-patterndb
+
+%dir %{_datadir}/syslog-ng
+%dir %{_datadir}/syslog-ng/include
+%dir %{_datadir}/syslog-ng/include/scl
+%dir %{_datadir}/syslog-ng/include/scl/pacct
+%{_datadir}/syslog-ng/include/scl/pacct/plugin.conf
+%dir %{_datadir}/syslog-ng/include/scl/syslogconf
+%{_datadir}/syslog-ng/include/scl/syslogconf/README
+%attr(755,root,root) %{_datadir}/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk
+%{_datadir}/syslog-ng/include/scl/syslogconf/plugin.conf
+%dir %{_datadir}/syslog-ng/include/scl/system
+%attr(755,root,root) %{_datadir}/syslog-ng/include/scl/system/generate-system-source.sh
+%{_datadir}/syslog-ng/include/scl/system/plugin.conf
+%dir %{_datadir}/syslog-ng/xsd
+%{_datadir}/syslog-ng/xsd/patterndb-*.xsd
+
 %dir %{_var}/lib/%{name}
+%dir %{_var}/lib/%{name}/xsd
+%{_mandir}/man1/pdbtool.1*
+%{_mandir}/man1/syslog-ng-ctl.1*
 %{_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