From 28eb7eed6a6bc7cd2c0cfd0709f16332e6f0b08c653694f0330fc3dbb03f3c64 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Tue, 30 Apr 2013 10:52:44 +0000
Subject: [PATCH] - Enabled log file signing module lmsig_gt using GuardTime as
   separate rsyslog-module-guardtime package. - Moved previously enabled log
 file encryption module lmcry_gcry   and its utility into a separate
 rsyslog-module-gcrypt package.

OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=144
---
 rsyslog.changes |  8 +++++
 rsyslog.spec    | 79 +++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 81 insertions(+), 6 deletions(-)

diff --git a/rsyslog.changes b/rsyslog.changes
index a629576..9a8e9a5 100644
--- a/rsyslog.changes
+++ b/rsyslog.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Apr 30 10:49:01 UTC 2013 - mt@suse.de
+
+- Enabled log file signing module lmsig_gt using GuardTime as
+  separate rsyslog-module-guardtime package.
+- Moved previously enabled log file encryption module lmcry_gcry
+  and its utility into a separate rsyslog-module-gcrypt package.
+
 -------------------------------------------------------------------
 Tue Apr 30 07:56:12 UTC 2013 - mt@suse.de
 
diff --git a/rsyslog.spec b/rsyslog.spec
index d087b0f..567295f 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -43,6 +43,8 @@ Release:        0
 %endif
 %bcond_without  gssapi
 %bcond_without  gnutls
+%bcond_without  gcrypt
+%bcond_without  guardtime
 %bcond_without  mysql
 %bcond_without  pgsql
 %bcond_without  relp
@@ -103,10 +105,15 @@ BuildRequires:  czmq-devel >= 1.1.0
 %if %{with gssapi}
 BuildRequires:  krb5-devel
 %endif
-BuildRequires:  libgcrypt-devel
 %if %{with gnutls}
 BuildRequires:  libgnutls-devel
 %endif
+%if %{with gcrypt}
+BuildRequires:  libgcrypt-devel
+%endif
+%if %{with guardtime}
+BuildRequires:  libgt-devel
+%endif
 %if %{with dbi}
 BuildRequires:  libdbi-devel
 %endif
@@ -294,6 +301,39 @@ This module provides the ability for TLS encrypted TCP logging (based
 on current syslog-transport-tls internet drafts).
 %endif
 
+%if %{with gcrypt}
+
+%package module-gcrypt
+Requires:       %{name} = %{version}
+Summary:        Libgcrypt log file encryption support module for rsyslog
+Group:          System/Daemons
+
+%description module-gcrypt
+Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog
+package.
+
+This module provides log file encryption support using libgcrypt and
+a rsgtutil utility to manage the files.
+%endif
+
+%if %{with guardtime}
+
+%package module-guardtime
+Requires:       %{name} = %{version}
+Summary:        GuardTime log file signing support module for rsyslog
+Group:          System/Daemons
+
+%description module-guardtime
+Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog
+package.
+
+This module provides log file signing support using GuardTime Keyless
+Signature Service and a rsgtutil utility to manage the files.
+
+The digital timestamping component of the service is officially certified
+and Guardtime is accredited as a timestamp authority by the European Union.
+%endif
+
 %if %{with relp}
 
 %package module-relp
@@ -434,8 +474,6 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../..
 #        --enable-rfc3195        \
 # needs java
 #        --enable-gui            \
-# meeds libgt >= 0.3.1
-#        --enable-guardtime	 \
 %configure			\
 	--with-moddirs=%{rsyslog_module_dir_withdeps} \
 	--enable-option-checking	\
@@ -516,7 +554,14 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../..
 	--enable-omjournal	\
 %endif
 	--enable-mmanon		\
+%if %{with guardtime}
+	--enable-guardtime	\
+%endif
+%if %{with gcrypt}
 	--enable-libgcrypt	\
+%else
+	--disable-libgcrypt	\
+%endif
 	--enable-usertools	\
 	--disable-static
 
@@ -524,6 +569,8 @@ make %{?_smp_mflags:%{_smp_mflags}} V=1
 
 %install
 make install DESTDIR="%{buildroot}"  V=1
+# Hack for v7.3.13, remove when fixed upstream
+install -m644 tools/rsgtutil.1 %{buildroot}%{_mandir}/man1/
 #
 rm -f %{buildroot}%{rsyslog_module_dir_nodeps}/*.la
 #
@@ -535,7 +582,12 @@ if test "%{rsyslog_module_dir_nodeps}" != "%{rsyslog_module_dir_withdeps}" ; the
 %if %{with gnutls}
 		lmnsd_gtls.so \
 %endif
+%if %{with gcrypt}
 		lmcry_gcry.so \
+%endif
+%if %{with guardtime}
+		lmsig_gt.so  \
+%endif
 %if %{with gssapi}
 		omgssapi.so imgssapi.so lmgssutil.so \
 %endif
@@ -802,9 +854,6 @@ fi
 %{rsyslog_module_dir_nodeps}/omjournal.so
 %endif
 %dir %{rsyslog_module_dir_withdeps}
-%{rsyslog_module_dir_withdeps}/lmcry_gcry.so
-%{_bindir}/rscryutil
-%{_mandir}/man1/rscryutil.1*
 %{_mandir}/man5/rsyslog.conf.5*
 %{_mandir}/man8/rsyslogd.8*
 %dir %{rsyslogdocdir}
@@ -944,4 +993,22 @@ fi
 %{rsyslog_module_dir_withdeps}/omzmq3.so
 %endif
 
+%if %{with gcrypt}
+
+%files module-gcrypt
+%defattr(-,root,root)
+%{rsyslog_module_dir_withdeps}/lmcry_gcry.so
+%{_bindir}/rscryutil
+%{_mandir}/man1/rscryutil.1*
+%endif
+
+%if %{with guardtime}
+
+%files module-guardtime
+%defattr(-,root,root)
+%{rsyslog_module_dir_withdeps}/lmsig_gt.so
+%{_bindir}/rsgtutil
+%{_mandir}/man1/rsgtutil.1*
+%endif
+
 %changelog