rsyslog 8.36.0

OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=293

rsyslog.spec

@@ -50,6 +50,7 @@ Release:        0
 %endif
 %bcond_without  gssapi
 %bcond_without  gnutls
+%bcond_without  openssl
 %bcond_without  gcrypt
 %bcond_without  mysql
 %bcond_without  pgsql
@@ -114,7 +115,6 @@ BuildRequires:  libtool
 BuildRequires:  bison
 BuildRequires:  curl-devel
 BuildRequires:  flex
-BuildRequires:  openssl-devel >= 0.9.7
 BuildRequires:  pcre-devel
 BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel
@@ -155,6 +155,9 @@ BuildRequires:  krb5-devel
 %if %{with gnutls}
 BuildRequires:  libgnutls-devel
 %endif
+%if %{with openssl}
+BuildRequires:  pkgconfig(openssl)
+%endif
 %if %{with gcrypt}
 BuildRequires:  libgcrypt-devel
 %endif
@@ -364,8 +367,23 @@ Group:          System/Daemons
 Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog
 package.
 
-This module provides the ability for TLS encrypted TCP logging (based
-on current syslog-transport-tls internet drafts).
+This module provides the ability for TLS encrypted TCP logging using
+the GnuTLS library.
+%endif
+
+%if %{with openssl}
+
+%package module-ossl
+Requires:       %{name} = %{version}
+Summary:        TLS encryption support module for rsyslog
+Group:          System/Daemons
+
+%description module-ossl
+Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog
+package.
+
+This module provides the ability for TLS encrypted TCP logging using
+the OpenSSL library.
 %endif
 
 %if %{with gcrypt}
@@ -575,6 +593,7 @@ autoreconf -fiv
 	--enable-inet		\
 	--enable-unlimited-select	\
 	--enable-rsyslogd	\
+	--enable-liblogging-stdlog	\
 %if %{with elasticsearch}
 	--enable-elasticsearch	\
 %endif
@@ -584,6 +603,9 @@ autoreconf -fiv
 %if %{with gnutls}
 	--enable-gnutls		\
 %endif
+%if %{with openssl}
+	--enable-openssl	\
+%endif
 %if %{with gssapi}
 	--enable-gssapi-krb5	\
 %endif
@@ -654,6 +676,7 @@ autoreconf -fiv
 %endif
 	--enable-mmanon		\
 	--enable-mmaudit	\
+	--enable-mmkubernetes 	\
 	--enable-mmjsonparse	\
 	--enable-mmutf8fix	\
 	--enable-mmcount	\
@@ -693,6 +716,9 @@ if test "%{rsyslog_module_dir_nodeps}" != "%{rsyslog_module_dir_withdeps}" ; the
 %if %{with gnutls}
 		lmnsd_gtls.so \
 %endif
+%if %{with openssl}
+		lmnsd_ossl.so \
+%endif
 %if %{with gcrypt}
 		lmcry_gcry.so \
 %endif
@@ -965,6 +991,7 @@ fi
 %{rsyslog_module_dir_nodeps}/mmcount.so
 %{rsyslog_module_dir_nodeps}/mmexternal.so
 %{rsyslog_module_dir_nodeps}/mmfields.so
+%{rsyslog_module_dir_nodeps}/mmkubernetes.so
 %{rsyslog_module_dir_nodeps}/mmpstrucdata.so
 %{rsyslog_module_dir_nodeps}/mmrfc5424addhmac.so
 %{rsyslog_module_dir_nodeps}/mmsequence.so
@@ -1075,6 +1102,13 @@ fi
 %{rsyslog_module_dir_withdeps}/lmnsd_gtls.so
 %endif
 
+%if %{with openssl}
+
+%files module-ossl
+%defattr(-,root,root)
+%{rsyslog_module_dir_withdeps}/lmnsd_ossl.so
+%endif
+
 %if %{with relp}
 
 %files module-relp