rebase to 8.34.0

added mmkubernetes module
added fmhttp module
finished converting rsyslog config to new syntax
dropped obsolete defattr statements from spec

.gitignore

@@ -49,3 +49,5 @@ rsyslog-4.6.3.tar.gz
 /rsyslog-doc-8.31.0.tar.gz
 /rsyslog-doc-8.32.0.tar.gz
 /rsyslog-8.32.0.tar.gz
+/rsyslog-doc-8.34.0.tar.gz
+/rsyslog-8.34.0.tar.gz

rsyslog-8.34.0-sd-service.patch

@@ -5,7 +5,7 @@ diff -up rsyslog-7.4.1/rsyslog.service.in.orig rsyslog-7.4.1/rsyslog.service.in
  
  [Service]
  Type=notify
--ExecStart=@sbindir@/rsyslogd -n
+-ExecStart=@sbindir@/rsyslogd -n -iNONE
 +EnvironmentFile=-/etc/sysconfig/rsyslog
 +ExecStart=@sbindir@/rsyslogd -n $SYSLOGD_OPTIONS
 +UMask=0066

rsyslog.spec

@@ -54,7 +54,7 @@ Provides: syslog
 Obsoletes: sysklogd < 1.5-11
 
 # tweak the upstream service file to honour configuration from /etc/sysconfig/rsyslog
-Patch0: rsyslog-8.8.0-sd-service.patch
+Patch0: rsyslog-8.34.0-sd-service.patch
 
 %package crypto
 Summary: Encryption support
@@ -175,6 +175,12 @@ Group: System Environment/Daemons
 Requires: %name = %version-%release
 BuildRequires: librdkafka-devel
 
+%package mmkubernetes
+Summary: Provides the mmkubernetes module
+Group: System Environment/Daemons
+Requires: %name = %version-%release
+BuildRequires: libcurl-devel
+
 %description
 Rsyslog is an enhanced, multi-threaded syslog daemon. It supports MySQL,
 syslog/TCP, RFC 3195, permitted sender lists, filtering on any message part,
@@ -267,6 +273,10 @@ The omamqp1 output module can be used to send log messages via an AMQP
 %description kafka
 The rsyslog-kafka package provides module for Apache Kafka output. 
 
+%description mmkubernetes
+The rsyslog-mmkubernetes package provides module for adding kubernetes 
+container metadata. 
+
 %prep
 # set up rsyslog-doc sources
 %setup -q -a 1 -T -c
@@ -340,6 +350,7 @@ export HIREDIS_LIBS="-L%{_libdir} -lhiredis"
 	--enable-unlimited-select \
 	--enable-usertools \
 	--enable-omkafka \
+	--enable-mmkubernetes \
 
 make V=1
 
@@ -437,6 +448,7 @@ done
 %{_libdir}/rsyslog/pmcisconames.so
 %{_libdir}/rsyslog/pmlastmsg.so
 %{_libdir}/rsyslog/pmsnare.so
+%{_libdir}/rsyslog/fmhttp.so
 
 %files crypto
 %{_bindir}/rscryutil
@@ -510,9 +522,14 @@ done
 %files kafka
 %{_libdir}/rsyslog/omkafka.so
 
+%files mmkubernetes
+%{_libdir}/rsyslog/mmkubernetes.so
+
 %changelog
 * Thu Apr 05 2018 Jiri Vymazal <jvymazal@redhat.com> - 8.34.0-1
 - rebase to 8.34.0
+- added mmkubernetes module
+- added fmhttp module
 - finished converting rsyslog config to new syntax
 - dropped obsolete defattr statements from spec
 

sources

@@ -1,4 +1,2 @@
-SHA512 (rsyslog-8.31.0.tar.gz) = aab888dda8df3ad7ff404767a58539cdc0bb92d0e537b703cf5833555688dd6d8223889b8d70bf8c594339a51831b57df7a65b397d8b40cded608dfb007befe7
-SHA512 (rsyslog-doc-8.31.0.tar.gz) = 51a63fa520d8176e183afa44ccf889374810dddfd5fdb363ed06b134bfbe0d1a94085e4836cf3bb2a07cb83564bbb87cef3763ac9429a5efc50aff276542defa
-SHA512 (rsyslog-doc-8.32.0.tar.gz) = e64eba3c40eab35e266826fb7e183418f38eb008f2a21ddf2c523d1e42aacaa20f882a561e5df67a979463048b58232fa82759645a21dc6962f6836ac8f57bce
-SHA512 (rsyslog-8.32.0.tar.gz) = eea85d77bf3624fbad6f0838fa2a4af7c14d853c8f120f14cf697cdfda7f7e0692dab684d2ddd07fe44a0bcd50cf91baf69af1bb63dc9d60e19146f1150155ac
+SHA512 (rsyslog-doc-8.34.0.tar.gz) = edf9aa63c777624c3dc27dfd64b38893b9b4c9b56941df1d7a8c6bc3cb4cbbfb83e8c356cbefeab7c688ecb6017b66ed99931cb71b69b7c927b4743548dd40d4
+SHA512 (rsyslog-8.34.0.tar.gz) = 69eaececa2f8b98799deac8e6cb2cf635a5117da7a21cbb0b880b7df1d83c6ccf16133dab099a6e5fb865f34c2dad164a1bf1952d16ca116af3b1dd35d15065e