X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=syslog-ng.spec;h=341d55eae60e32550b9746264641b83a5ca4859e;hb=c0e8ee8f64ba53862360f58ea22a33d2d1d903be;hp=e417abafb956ac0a8f0998b3577bcaf601f1aa59;hpb=72fef41365f71e8e3540ab81622a9ab77f369e25;p=packages%2Fsyslog-ng.git

diff --git a/syslog-ng.spec b/syslog-ng.spec
index e417aba..341d55e 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -4,48 +4,41 @@
 #   (well, for modules bringing additional functionality it's acceptable IMO --q)
 #
 # Conditional build:
-%bcond_with	dynamic		# link dynamically with glib, eventlog, pcre (modules are always linked dynamically)
-%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		# do not perform "make check"
-%bcond_without	json		# build without support for JSON template formatting
-%bcond_without	mongodb		# build without support for mongodb destination
-%bcond_without	smtp		# build without support for logging into SMTP
-%bcond_with	system_libivykis	# use system libivykis
-%bcond_with	system_rabbitmq	# use system librabbitmq [not supported yet]
-
-%if "%{pld_release}" == "ac"
-%define		glib2_ver	1:2.16.0
-%else
+%bcond_with	dynamic			# link dynamically with glib, eventlog, pcre (modules are always linked dynamically)
+%bcond_without	sql			# support for logging to SQL DB
+%bcond_without	tests			# do not perform "make check"
+%bcond_without	json			# support for JSON template formatting
+%bcond_without	mongodb			# support for mongodb destination
+%bcond_without	redis			# support for Redis destination
+%bcond_without	smtp			# support for logging into SMTP
+%bcond_without	geoip			# support for GeoIP
+%bcond_with	systemd			# support for systemd
+%bcond_without	system_libivykis	# use system libivykis
+%bcond_with	system_rabbitmq		# use system librabbitmq [not supported yet]
+
 %define		glib2_ver	1:2.24.0
-%endif
 Summary:	Syslog-ng - new generation of the system logger
 Summary(pl.UTF-8):	Syslog-ng - systemowy demon logujący nowej generacji
 Summary(pt_BR.UTF-8):	Daemon de log nova geração
 Name:		syslog-ng
-Version:	3.4.3
-Release:	1
+Version:	3.6.2
+Release:	3
 License:	GPL v2+ with OpenSSL exception
 Group:		Daemons
 Source0:	http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/%{version}/source/%{name}_%{version}.tar.gz
-# Source0-md5:	80b873a11b3e02706bc3f2430b9be068
+# Source0-md5:	6928e9be3499a2e9ae52ea8aa204b165
 Source1:	%{name}.init
 Source2:	%{name}.conf
 Source3:	%{name}.logrotate
-Source4:	http://www.balabit.com/support/documentation/syslog-ng-ose-3.4-guides/en/syslog-ng-ose-v3.4-guide-admin/pdf/%{name}-ose-v3.4-guide-admin.pdf
-# Source4-md5:	fbc1516a2af9f40d0a7c4929fdf381b1
+Source4:	http://www.balabit.com/support/documentation/syslog-ng-ose-3.6-guides/en/syslog-ng-ose-v3.6-guide-admin/pdf/%{name}-ose-v3.6-guide-admin.pdf
+# Source4-md5:	bb12c18aef655096987911c4a9fe3ffa
 Source5:	%{name}-simple.conf
-Source6:	%{name}.upstart
 Patch0:		%{name}-datadir.patch
 Patch1:		cap_syslog-vserver-workaround.patch
 Patch2:		%{name}-nolibs.patch
-Patch3:		%{name}-systemd.patch
-Patch4:		man-paths.patch
+Patch3:		man-paths.patch
 URL:		http://www.balabit.com/products/syslog_ng/
-BuildRequires:	GeoIP-devel >= 1.5.1
+%{?with_geoip:BuildRequires:	GeoIP-devel >= 1.5.1}
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
 BuildRequires:	bison >= 2.4
@@ -54,7 +47,8 @@ BuildRequires:	eventlog-devel >= 0.2.12
 %{?with_tests:BuildRequires:	findutils}
 BuildRequires:	flex
 BuildRequires:	glib2-devel >= %{glib2_ver}
-%{?with_json:BuildRequires:	json-c-devel >= 0.7}
+%{?with_redis:BuildRequires:	hiredis-devel}
+%{?with_json:BuildRequires:	json-c-devel >= 0.9}
 BuildRequires:	libcap-devel
 %{?with_sql:BuildRequires:	libdbi-devel >= 0.8.3-2}
 %{?with_smtp:BuildRequires:	libesmtp-devel}
@@ -85,7 +79,6 @@ BuildRequires:	zlib-static
 %endif
 Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
-Requires(post,preun,postun):	systemd-units >= 38
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	eventlog >= 0.2.12
 Requires:	glib2 >= %{glib2_ver}
@@ -93,7 +86,6 @@ Requires:	pcre >= 6.1
 Requires:	psmisc >= 20.1
 %{?with_system_rabbitmq:Requires:	rabbitmq-c >= 0.0.1}
 Requires:	rc-scripts >= 0.4.3.0
-Requires:	systemd-units >= 38
 # for afsocket
 Requires:	libnet >= 1:1.1.2.1-7
 # for afsocket and dbparser
@@ -219,6 +211,19 @@ JSON formatting template function for syslog-ng.
 %description module-json-plugin -l pl.UTF-8
 Moduł sysloga-ng do obsługi szablonów z formatowaniem JSON.
 
+%package module-redis
+Summary:	Redis destination support module for syslog-ng
+Summary(pl.UTF-8):	Moduł sysloga-ng do obsługi zapisu logów w bazie Redis
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description module-redis
+Redis destination support module for syslog-ng (via libhiredis).
+
+%description module-redis -l pl.UTF-8
+Moduł sysloga-ng do obsługi zapisu logów w bazie Redis (poprzez
+libhiredis).
+
 %package module-tfgeoip
 Summary:	syslog-ng template function module to get GeoIP info from an IPv4 addresses
 Summary(pl.UTF-8):	Moduł funkcji szablonu sysloga-ng do pobierania informacji GeoIP z adresów IPv4
@@ -276,7 +281,6 @@ Pliki nagłówkowe do tworzenia modułów dla sysloga-ng.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 cp -p %{SOURCE4} doc
 cp -p %{SOURCE5} contrib/syslog-ng.conf.simple
 
@@ -312,15 +316,15 @@ done
 	--with-module-dir=%{_libdir}/syslog-ng \
 	--with-pidfile-dir=/var/run \
 	--with-timezone-dir=%{_datadir}/zoneinfo \
-	--enable-systemd \
-	--with-systemdsystemunitdir=%{systemdunitdir} \
+	--disable-systemd \
 	--enable-amqp \
-	--enable-geoip \
+	--enable-geoip%{!?with_geoip:=no} \
 	--enable-ipv6 \
 	--enable-json%{!?with_json:=no} \
 	--enable-linux-caps \
 	--enable-pacct \
 	--enable-pcre \
+	--enable-redis%{!?with_redis:=no} \
 	--enable-smtp%{!?with_smtp:=no} \
 	--enable-spoof-source \
 	--enable-ssl \
@@ -366,10 +370,6 @@ touch $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 %{__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
 
@@ -394,20 +394,11 @@ fi
 /sbin/chkconfig --add syslog-ng
 %service syslog-ng restart "syslog-ng daemon"
 
-%systemd_post syslog-ng.service
-
 %preun
 if [ "$1" = "0" ]; then
 	%service syslog-ng stop
 	/sbin/chkconfig --del syslog-ng
 fi
-%systemd_preun syslog-ng.service
-
-%postun
-%systemd_reload
-
-%triggerpostun -- syslog-ng < 3.3.4-3
-%systemd_trigger syslog-ng.service
 
 %triggerun -- syslog-ng < 3.0
 sed -i -e 's#sync(\(.*\))#flush_lines(\1)#g' /etc/syslog-ng/syslog-ng.conf
@@ -422,24 +413,14 @@ rm -f %{_var}/lib/%{name}/syslog-ng.persist
 %service -q syslog-ng restart
 exit 0
 
-%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 || :
-
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS debian/syslog-ng.conf* contrib/relogger.pl
+%doc AUTHORS NEWS.md 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.4-guide-admin.pdf
+%doc contrib/{apparmor,selinux,syslog2ng} doc/syslog-ng-ose-v3.6-guide-admin.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
@@ -447,7 +428,6 @@ exit 0
 %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
-%{systemdunitdir}/syslog-ng.service
 %dir %{_libdir}/syslog-ng
 %attr(755,root,root) %{_libdir}/syslog-ng/libafamqp.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libaffile.so
@@ -455,13 +435,17 @@ exit 0
 %attr(755,root,root) %{_libdir}/syslog-ng/libafsocket.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libafsocket-notls.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libafsocket-tls.so
+%attr(755,root,root) %{_libdir}/syslog-ng/libafstomp.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libafuser.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libbasicfuncs.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libconfgen.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libcryptofuncs.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libcsvparser.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libdbparser.so
+%attr(755,root,root) %{_libdir}/syslog-ng/libgraphite.so
+%attr(755,root,root) %{_libdir}/syslog-ng/liblinux-kmsg-format.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libpacctformat.so
+%attr(755,root,root) %{_libdir}/syslog-ng/libpseudofile.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libsyslog-ng-crypto.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libsyslogformat.so
 %attr(755,root,root) %{_libdir}/syslog-ng/libsystem-source.so
@@ -473,8 +457,15 @@ exit 0
 
 %dir %{_datadir}/syslog-ng/include
 %dir %{_datadir}/syslog-ng/include/scl
+%dir %{_datadir}/syslog-ng/include/scl/graphite
+%{_datadir}/syslog-ng/include/scl/graphite/README
+%{_datadir}/syslog-ng/include/scl/graphite/plugin.conf
+%dir %{_datadir}/syslog-ng/include/scl/nodejs
+%{_datadir}/syslog-ng/include/scl/nodejs/plugin.conf
 %dir %{_datadir}/syslog-ng/include/scl/pacct
 %{_datadir}/syslog-ng/include/scl/pacct/plugin.conf
+%dir %{_datadir}/syslog-ng/include/scl/rewrite
+%{_datadir}/syslog-ng/include/scl/rewrite/cc-mask.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
@@ -505,12 +496,6 @@ exit 0
 %attr(640,root,root) %ghost /var/log/user
 %attr(640,root,root) %ghost /var/log/xferlog
 
-%if "%{pld_release}" == "th"
-%files upstart
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf
-%endif
-
 %if %{with mongodb}
 %files module-afmongodb
 %defattr(644,root,root,755)
@@ -535,13 +520,21 @@ exit 0
 %attr(755,root,root) %{_libdir}/syslog-ng/libjson-plugin.so
 %endif
 
+%if %{with redis}
+%files module-redis
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/syslog-ng/libredis.so
+%endif
+
+%if %{with geoip}
 %files module-tfgeoip
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/syslog-ng/libtfgeoip.so
+%endif
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libsyslog-ng-%{version}.so
+%attr(755,root,root) %{_libdir}/libsyslog-ng-*.so.*
 %dir %{_datadir}/syslog-ng
 
 %files devel