Enabled mmutf8fix for all currently supported Ubuntu versions.

rsyslog · Nov 10, 2017 · 654c013 · 654c013
1 parent df9a531
commit 654c013
Show file tree

Hide file tree

Showing 15 changed files with 77 additions and 11 deletions.
diff --git a/rsyslog/artful/master/debian/control b/rsyslog/artful/master/debian/control
@@ -64,9 +64,10 @@ Suggests: rsyslog-mysql | rsyslog-pgsql,
           rsyslog-gnutls,
 	  rsyslog-udpspoof,
 	  rsyslog-mmrm1stspace,
-	  rsyslog-kafka,
+	  rsyslog-mmutf8fix,
 	  rsyslog-pmnull,
           apparmor (>= 2.3)
+#	  rsyslog-kafka,
 Description: a rocket-fast system for log processing
  Rsyslog is a multi-threaded implementation of syslogd (a system utility
  providing support for message logging), with features that include:
@@ -227,6 +228,14 @@ Depends: ${shlibs:Depends},
          liblognorm5
 Description: Parse all fields of the message into structured data inside the JSON tree.
 
+Package: rsyslog-mmutf8fix
+Architecture: any
+Priority: extra
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         rsyslog (= ${binary:Version}),
+Description: The mmutf8fix module permits to fix invalid UTF-8 sequences. Most often, such invalid sequences result from syslog sources sending in non-UTF character sets, e.g. ISO 8859. As syslog does not have a way to convey the character set information, these sequences are not properly handled.
+
 Package: rsyslog-pmciscoios
 Architecture: any
 Priority: extra

diff --git a/rsyslog/artful/master/debian/control~ b/rsyslog/artful/master/debian/control~
@@ -28,7 +28,10 @@ Build-Depends: debhelper (>= 8),
 	       libgcrypt-dev,
 	       python-docutils,
 	       libsystemd-dev  (>= 209) [linux-any],
-	       librdkafka-dev,
+	       adisconhelperlrdk-dev,
+	       liblz4-dev,
+	       libsasl2-dev,
+	       libssl-dev,
 	       liblogging-stdlog-dev
 #	       libksi1-dev,
 Standards-Version: 3.9.2
@@ -238,7 +241,7 @@ Priority: extra
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          rsyslog (= ${binary:Version}), 
-         rsyslog-ksi, 
+#         rsyslog-ksi, 
 	 rsyslog-gnutls
 Description: rsyslog utilities
  Installs rsyslog tools like logctl, rsgtutil or rscryutil. 
@@ -269,7 +272,8 @@ Priority: extra
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          rsyslog (= ${binary:Version}),
-	 librdkafka-dev
+	 liblz4-1,
+ 	 libsasl2-2	
 Description: This module implements an Apache Kafka producer, permitting rsyslog to write data to Kafka.
 
 Package: rsyslog-pmnull

diff --git a/rsyslog/artful/master/debian/rules b/rsyslog/artful/master/debian/rules
@@ -35,6 +35,7 @@ override_dh_auto_configure:
 		--enable-mmfields \
 		--enable-mmpstrucdata \
 		--enable-mmsequence \
+		--enable-mmutf8fix \
 		--enable-pmciscoios \
 		--enable-usertools \
 		--enable-imjournal \

diff --git a/rsyslog/artful/master/debian/rules~ b/rsyslog/artful/master/debian/rules~
@@ -41,10 +41,14 @@ override_dh_auto_configure:
 		--enable-omjournal \
 		--enable-mmrm1stspace \
 		--enable-pmnull \
+		--enable-omkafka \
+		--enable-imkafka \
+		--enable-kafka-static \
 		--disable-testbench \
 		--disable-liblogging-stdlog \
 		--with-systemdsystemunitdir=/lib/systemd/system
 
+#
 #		--enable-omkafka \
 #		 --enable-guardtime \
 #		 --enable-gt-ksi \

diff --git a/rsyslog/artful/v8-stable/debian/control b/rsyslog/artful/v8-stable/debian/control
@@ -64,6 +64,7 @@ Suggests: rsyslog-mysql | rsyslog-pgsql,
           rsyslog-gnutls,
 	  rsyslog-udpspoof,
 	  rsyslog-mmrm1stspace,
+	  rsyslog-mmutf8fix,
 	  rsyslog-kafka,
 	  rsyslog-pmnull,
           apparmor (>= 2.3)
@@ -227,6 +228,14 @@ Depends: ${shlibs:Depends},
          liblognorm5
 Description: Parse all fields of the message into structured data inside the JSON tree.
 
+Package: rsyslog-mmutf8fix
+Architecture: any
+Priority: extra
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         rsyslog (= ${binary:Version}),
+Description: The mmutf8fix module permits to fix invalid UTF-8 sequences. Most often, such invalid sequences result from syslog sources sending in non-UTF character sets, e.g. ISO 8859. As syslog does not have a way to convey the character set information, these sequences are not properly handled.
+
 Package: rsyslog-pmciscoios
 Architecture: any
 Priority: extra

diff --git a/rsyslog/artful/v8-stable/debian/control~ b/rsyslog/artful/v8-stable/debian/control~
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 8),
                librelp-dev (>= 1.0.2),
                libestr-dev (>= 0.1.2),
                liblognorm-dev (>= 1.0.0),
-	       libfastjson-dev,
+	       libfastjson-dev (>= 0.99.7),
 	       libmongo-client-dev, 
 	       libglib2.0-dev,
                uuid-dev,
@@ -28,7 +28,10 @@ Build-Depends: debhelper (>= 8),
 	       libgcrypt-dev,
 	       python-docutils,
 	       libsystemd-dev  (>= 209) [linux-any],
-	       librdkafka-dev,
+	       adisconhelperlrdk-dev,
+	       liblz4-dev,
+	       libsasl2-dev,
+	       libssl-dev,
 	       liblogging-stdlog-dev
 #	       libksi1-dev,
 Standards-Version: 3.9.2
@@ -48,7 +51,7 @@ Depends: ${shlibs:Depends},
          lsb-base (>= 3.2-14),
          adduser,
          ucf,
-	 libfastjson4,
+	 libfastjson4 (>= 0.99.7),
 	 liblogging-stdlog1
 Recommends: logrotate
 Suggests: rsyslog-mysql | rsyslog-pgsql,
@@ -176,7 +179,7 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          rsyslog (= ${binary:Version}),
 	 liblognorm5, 
-	 libfastjson4
+	 libfastjson4 (>= 0.99.7)
 Description: Parsing/handling of CEE/Lumberjack JSON messages in rsyslog
  This plugin parses the message part of syslog. If there's a CEE cookie
  "@cee:" followed by a valid JSON, you can use properties from that JSON
@@ -238,7 +241,7 @@ Priority: extra
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          rsyslog (= ${binary:Version}), 
-         rsyslog-ksi, 
+#         rsyslog-ksi, 
 	 rsyslog-gnutls
 Description: rsyslog utilities
  Installs rsyslog tools like logctl, rsgtutil or rscryutil. 
@@ -269,7 +272,8 @@ Priority: extra
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          rsyslog (= ${binary:Version}),
-	 librdkafka-dev
+	 liblz4-1,
+ 	 libsasl2-2	
 Description: This module implements an Apache Kafka producer, permitting rsyslog to write data to Kafka.
 
 Package: rsyslog-pmnull

diff --git a/rsyslog/artful/v8-stable/debian/rules b/rsyslog/artful/v8-stable/debian/rules
@@ -35,6 +35,7 @@ override_dh_auto_configure:
 		--enable-mmfields \
 		--enable-mmpstrucdata \
 		--enable-mmsequence \
+		--enable-mmutf8fix \
 		--enable-pmciscoios \
 		--enable-usertools \
 		--enable-imjournal \

diff --git a/rsyslog/artful/v8-stable/debian/rules~ b/rsyslog/artful/v8-stable/debian/rules~
@@ -41,10 +41,14 @@ override_dh_auto_configure:
 		--enable-omjournal \
 		--enable-mmrm1stspace \
 		--enable-pmnull \
+		--enable-omkafka \
+		--enable-imkafka \
+		--enable-kafka-static \
 		--disable-testbench \
 		--disable-liblogging-stdlog \
 		--with-systemdsystemunitdir=/lib/systemd/system
 
+#
 #		--enable-omkafka \
 #		 --enable-guardtime \
 #		 --enable-gt-ksi \

diff --git a/rsyslog/precise/master/debian/control b/rsyslog/precise/master/debian/control
@@ -62,6 +62,7 @@ Suggests: rsyslog-mysql | rsyslog-pgsql,
           rsyslog-imptcp,
           rsyslog-gnutls,
 	  rsyslog-udpspoof,
+	  rsyslog-mmutf8fix,
 	  rsyslog-pmnull,
           apparmor (>= 2.3)
 Description: a rocket-fast system for log processing

diff --git a/rsyslog/precise/v8-stable/debian/control b/rsyslog/precise/v8-stable/debian/control
@@ -63,6 +63,7 @@ Suggests: rsyslog-mysql | rsyslog-pgsql,
           rsyslog-gnutls,
 	  rsyslog-udpspoof,
 	  rsyslog-mmrm1stspace,
+	  rsyslog-mmutf8fix,
 	  rsyslog-pmnull,
           apparmor (>= 2.3)
 Description: a rocket-fast system for log processing

diff --git a/rsyslog/trusty/master/debian/control b/rsyslog/trusty/master/debian/control
@@ -62,7 +62,8 @@ Suggests: rsyslog-mysql | rsyslog-pgsql,
           rsyslog-gnutls,
 	  rsyslog-udpspoof,
 	  rsyslog-mmrm1stspace,
-	  rsyslog-kafka,
+	  rsyslog-mmutf8fix,
+#	  rsyslog-kafka,
 	  rsyslog-pmnull,
           apparmor (>= 2.3)
 Description: a rocket-fast system for log processing
@@ -224,6 +225,14 @@ Depends: ${shlibs:Depends},
          liblognorm5
 Description: Parse all fields of the message into structured data inside the JSON tree.
 
+Package: rsyslog-mmutf8fix
+Architecture: any
+Priority: extra
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         rsyslog (= ${binary:Version}),
+Description: The mmutf8fix module permits to fix invalid UTF-8 sequences. Most often, such invalid sequences result from syslog sources sending in non-UTF character sets, e.g. ISO 8859. As syslog does not have a way to convey the character set information, these sequences are not properly handled.
+
 Package: rsyslog-pmciscoios
 Architecture: any
 Priority: extra

diff --git a/rsyslog/xenial/master/debian/control b/rsyslog/xenial/master/debian/control
@@ -64,6 +64,7 @@ Suggests: rsyslog-mysql | rsyslog-pgsql,
           rsyslog-gnutls,
 	  rsyslog-udpspoof,
 	  rsyslog-mmrm1stspace,
+	  rsyslog-mmutf8fix,
 #	  rsyslog-kafka,
 	  rsyslog-pmnull,
           apparmor (>= 2.3)
@@ -227,6 +228,14 @@ Depends: ${shlibs:Depends},
          liblognorm5
 Description: Parse all fields of the message into structured data inside the JSON tree.
 
+Package: rsyslog-mmutf8fix
+Architecture: any
+Priority: extra
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         rsyslog (= ${binary:Version}),
+Description: The mmutf8fix module permits to fix invalid UTF-8 sequences. Most often, such invalid sequences result from syslog sources sending in non-UTF character sets, e.g. ISO 8859. As syslog does not have a way to convey the character set information, these sequences are not properly handled.
+
 Package: rsyslog-pmciscoios
 Architecture: any
 Priority: extra

diff --git a/rsyslog/xenial/master/debian/rules b/rsyslog/xenial/master/debian/rules
@@ -35,6 +35,7 @@ override_dh_auto_configure:
 		--enable-mmfields \
 		--enable-mmpstrucdata \
 		--enable-mmsequence \
+		--enable-mmutf8fix \
 		--enable-pmciscoios \
 		--enable-usertools \
 		--enable-imjournal \

diff --git a/rsyslog/zesty/master/debian/control b/rsyslog/zesty/master/debian/control
@@ -227,6 +227,14 @@ Depends: ${shlibs:Depends},
          liblognorm5
 Description: Parse all fields of the message into structured data inside the JSON tree.
 
+Package: rsyslog-mmutf8fix
+Architecture: any
+Priority: extra
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         rsyslog (= ${binary:Version}),
+Description: The mmutf8fix module permits to fix invalid UTF-8 sequences. Most often, such invalid sequences result from syslog sources sending in non-UTF character sets, e.g. ISO 8859. As syslog does not have a way to convey the character set information, these sequences are not properly handled.
+
 Package: rsyslog-pmciscoios
 Architecture: any
 Priority: extra

diff --git a/rsyslog/zesty/master/debian/rules b/rsyslog/zesty/master/debian/rules
@@ -35,6 +35,7 @@ override_dh_auto_configure:
 		--enable-mmfields \
 		--enable-mmpstrucdata \
 		--enable-mmsequence \
+		--enable-mmutf8fix \
 		--enable-pmciscoios \
 		--enable-usertools \
 		--enable-imjournal \