diff --git a/rsyslog/bionic/v8-stable/debian/control b/rsyslog/bionic/v8-stable/debian/control index 59da79e9..b90b8706 100644 --- a/rsyslog/bionic/v8-stable/debian/control +++ b/rsyslog/bionic/v8-stable/debian/control @@ -21,6 +21,7 @@ Build-Depends: debhelper (>= 8), liblognorm-dev (>= 1.0.0), libfastjson-dev (>= 0.99.7), libglib2.0-dev, + libpcap-dev, uuid-dev, libkrb5-dev, libgnutls28-dev, @@ -103,6 +104,15 @@ Description: documentation for rsyslog templates, etc, and has detailed information for all available configuration directives. +Package: rsyslog-impcap +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), + libpcap +Description: This module provides the impcap contributed module. + Package: rsyslog-mysql Architecture: any Priority: extra diff --git a/rsyslog/bionic/v8-stable/debian/rsyslog-impcap.install b/rsyslog/bionic/v8-stable/debian/rsyslog-impcap.install new file mode 100644 index 00000000..d846c539 --- /dev/null +++ b/rsyslog/bionic/v8-stable/debian/rsyslog-impcap.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/rsyslog/impcap.so diff --git a/rsyslog/bionic/v8-stable/debian/rules b/rsyslog/bionic/v8-stable/debian/rules index 223a360d..8a4ec9bc 100755 --- a/rsyslog/bionic/v8-stable/debian/rules +++ b/rsyslog/bionic/v8-stable/debian/rules @@ -26,6 +26,7 @@ override_dh_auto_configure: --enable-pgsql \ --enable-mail \ --enable-imfile \ + --enable-impcap \ --enable-impstats \ --enable-gnutls \ --enable-relp \ diff --git a/rsyslog/eoan/v8-stable/debian/control b/rsyslog/eoan/v8-stable/debian/control index b8f88480..c832a8db 100644 --- a/rsyslog/eoan/v8-stable/debian/control +++ b/rsyslog/eoan/v8-stable/debian/control @@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.6.1), autotools-dev (>= 20100122.1), libczmq-dev (>= 4.0.0), + libpcap-dev, dh-autoreconf, librabbitmq-dev, librabbitmq4, @@ -293,6 +294,15 @@ Depends: ${shlibs:Depends}, Description: Provides the imkmsg rsyslog plugin which can be used to read structured kernel logs. +Package: rsyslog-impcap +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), + libpcap +Description: This module provides the impcap contributed module. + Package: rsyslog-mmutf8fix Architecture: any Priority: extra diff --git a/rsyslog/eoan/v8-stable/debian/rsyslog-impcap.install b/rsyslog/eoan/v8-stable/debian/rsyslog-impcap.install new file mode 100644 index 00000000..d846c539 --- /dev/null +++ b/rsyslog/eoan/v8-stable/debian/rsyslog-impcap.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/rsyslog/impcap.so diff --git a/rsyslog/eoan/v8-stable/debian/rules b/rsyslog/eoan/v8-stable/debian/rules index 89eedf63..fd1be258 100755 --- a/rsyslog/eoan/v8-stable/debian/rules +++ b/rsyslog/eoan/v8-stable/debian/rules @@ -29,6 +29,7 @@ override_dh_auto_configure: --enable-gnutls \ --enable-relp \ --enable-clickhouse \ + --enable-impcap \ --enable-pmaixforwardedfrom \ --enable-pmcisconames \ --enable-pmlastmsg \ diff --git a/rsyslog/focal/v8-stable/debian/changelog~ b/rsyslog/focal/v8-stable/debian/changelog~ deleted file mode 100644 index 0b883ccb..00000000 --- a/rsyslog/focal/v8-stable/debian/changelog~ +++ /dev/null @@ -1,23 +0,0 @@ -rsyslog (8.2004.0-0adiscon1eoan1) eoan; urgency=medium - - * Packages for 8.2004.0 - - -- Florian Riedl Tue, 28 Apr 2020 12:58:28 +0000 - -rsyslog (8.2002.0-0adiscon1eoan1) eoan; urgency=medium - - * Packages for 8.2002.0 - - -- Florian Riedl Tue, 25 Feb 2020 14:41:31 +0000 - -rsyslog (8.2001.0-0adiscon1eoan1) eoan; urgency=medium - - * Packages for 8.2001.0 - - -- Florian Riedl Tue, 14 Jan 2020 16:13:50 +0000 - -rsyslog (8.1911.0-0adiscon1eoan1) eoan; urgency=medium - - * Initial build for Ubuntu 19.10 - - -- Florian Riedl Wed, 18 Dec 2019 15:07:18 +0000 diff --git a/rsyslog/focal/v8-stable/debian/control b/rsyslog/focal/v8-stable/debian/control index 9d071ff3..bc6d9e15 100644 --- a/rsyslog/focal/v8-stable/debian/control +++ b/rsyslog/focal/v8-stable/debian/control @@ -21,6 +21,7 @@ Build-Depends: debhelper (>= 12), liblognorm-dev (>= 1.0.0), libfastjson-dev (>= 0.99.7), libglib2.0-dev, + libpcap-dev, uuid-dev, libkrb5-dev, libgnutls28-dev, @@ -374,6 +375,15 @@ Depends: ${shlibs:Depends}, libsasl2-2 Description: This module implements an Apache Kafka producer, permitting rsyslog to write data to Kafka. +Package: rsyslog-impcap +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), + libpcap +Description: This module provides the impcap contributed module. + Package: rsyslog-redis Architecture: any Priority: extra diff --git a/rsyslog/focal/v8-stable/debian/rsyslog-impcap.install b/rsyslog/focal/v8-stable/debian/rsyslog-impcap.install new file mode 100644 index 00000000..d846c539 --- /dev/null +++ b/rsyslog/focal/v8-stable/debian/rsyslog-impcap.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/rsyslog/impcap.so diff --git a/rsyslog/focal/v8-stable/debian/rsyslog.install~ b/rsyslog/focal/v8-stable/debian/rsyslog.install~ deleted file mode 100644 index 1543d1f7..00000000 --- a/rsyslog/focal/v8-stable/debian/rsyslog.install~ +++ /dev/null @@ -1,33 +0,0 @@ -debian/rsyslog.conf /etc/ -debian/50-default.conf /usr/share/rsyslog -debian/tmp/usr/sbin/ -debian/tmp/usr/share/man/ -debian/tmp/usr/lib/rsyslog/imfile.so -debian/tmp/usr/lib/rsyslog/imklog.so -debian/tmp/usr/lib/rsyslog/immark.so -debian/tmp/usr/lib/rsyslog/impstats.so -debian/tmp/usr/lib/rsyslog/imtcp.so -debian/tmp/usr/lib/rsyslog/imudp.so -debian/tmp/usr/lib/rsyslog/imuxsock.so -debian/tmp/usr/lib/rsyslog/imjournal.so -debian/tmp/usr/lib/rsyslog/lmnet.so -debian/tmp/usr/lib/rsyslog/lmnetstrms.so -debian/tmp/usr/lib/rsyslog/lmnsd_ptcp.so -debian/tmp/usr/lib/rsyslog/lmregexp.so -debian/tmp/usr/lib/rsyslog/lmstrmsrv.so -debian/tmp/usr/lib/rsyslog/lmtcpclt.so -debian/tmp/usr/lib/rsyslog/lmtcpsrv.so -debian/tmp/usr/lib/rsyslog/lmzlibw.so -debian/tmp/usr/lib/rsyslog/ommail.so -debian/tmp/usr/lib/rsyslog/omprog.so -debian/tmp/usr/lib/rsyslog/omjournal.so -# debian/tmp/usr/lib/rsyslog/omruleset.so -debian/tmp/usr/lib/rsyslog/mmpstrucdata.so -debian/tmp/usr/lib/rsyslog/mmsequence.so -debian/tmp/usr/lib/rsyslog/mmexternal.so -debian/tmp/usr/lib/rsyslog/lmnsd_gtls.so -debian/tmp/usr/lib/rsyslog/lmcry_gcry.so -#debian/tmp/usr/lib/rsyslog/lmsig_gt.so -debian/tmp/usr/lib/rsyslog/pm*.so -debian/tmp/lib/systemd/system/rsyslog.service -debian/usr.sbin.rsyslogd etc/apparmor.d/ diff --git a/rsyslog/focal/v8-stable/debian/rules b/rsyslog/focal/v8-stable/debian/rules index fc0cb617..f0973292 100755 --- a/rsyslog/focal/v8-stable/debian/rules +++ b/rsyslog/focal/v8-stable/debian/rules @@ -28,6 +28,7 @@ override_dh_auto_configure: --enable-pgsql \ --enable-mail \ --enable-imfile \ + --enable-impcap \ --enable-impstats \ --enable-gnutls \ --enable-relp \ diff --git a/rsyslog/focal/v8-stable/debian/rules~ b/rsyslog/focal/v8-stable/debian/rules~ deleted file mode 100755 index 23b3751c..00000000 --- a/rsyslog/focal/v8-stable/debian/rules~ +++ /dev/null @@ -1,82 +0,0 @@ -#!/usr/bin/make -f - -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk - -# the default LDFLAGS="-Wl,-Bsymbolic-functions" caused rsyslog to -# segfault on receipt of first message (see LP: #794230) -unexport LDFLAGS - -%: - dh $@ --with autoreconf -#org dh $@ --with autotools_dev - -override_dh_auto_configure: - dh_auto_configure -- \ - --enable-mysql \ - --enable-pgsql \ - --enable-mail \ - --enable-imfile \ - --enable-impstats \ - --enable-gnutls \ - --enable-relp \ - --enable-pmaixforwardedfrom \ - --enable-pmcisconames \ - --enable-pmlastmsg \ - --enable-pmrfc3164sd \ - --enable-pmsnare \ - --enable-omprog \ - --enable-elasticsearch \ - --enable-mmjsonparse \ - --enable-imptcp \ - --enable-mmnormalize \ - --enable-mmanon \ - --enable-ommongodb \ - --enable-mmfields \ - --enable-mmpstrucdata \ - --enable-mmsequence \ - --enable-mmutf8fix \ - --enable-pmciscoios \ - --enable-usertools \ - --enable-imjournal \ - --enable-omjournal \ - --enable-mmrm1stspace \ - --enable-pmnull \ - --enable-omkafka \ - --enable-imkafka \ - --enable-kafka-static \ - --enable-omhiredis \ - --enable-omstdout \ - --enable-mmkubernetes \ - --disable-testbench \ - --disable-liblogging-stdlog \ - --with-systemdsystemunitdir=/lib/systemd/system - -# -# --enable-omkafka \ -# --enable-guardtime \ -# --enable-gt-ksi \ -# --enable-gssapi-krb5 \ -# --enable-guardtime \ -# --enable-ommongodb \ -# --enable-mmnormalize \ -# --enable-imzmq3 \ -# --enable-omzmq3 \ - -override_dh_auto_install: - dh_auto_install - install --mode=644 -D plugins/ommysql/createDB.sql debian/rsyslog-mysql/usr/share/dbconfig-common/data/rsyslog-mysql/install/mysql - install --mode=644 -D plugins/ompgsql/createDB.sql debian/rsyslog-pgsql/usr/share/dbconfig-common/data/rsyslog-pgsql/install/pgsql - -override_dh_compress: - dh_compress -X rsyslog-example.conf - -override_dh_installinit: - dh_apparmor --profile-name=usr.sbin.rsyslogd -prsyslog - dh_installinit -R - -override_dh_auto_test: -ifeq (, $(findstring nocheck, $(DEB_BUILD_OPTIONS))) - make check || ( cat tests/test-suite.log; exit 1; ) -endif - diff --git a/rsyslog/groovy/v8-stable/debian/control b/rsyslog/groovy/v8-stable/debian/control index a7b97e96..81d7d4a3 100644 --- a/rsyslog/groovy/v8-stable/debian/control +++ b/rsyslog/groovy/v8-stable/debian/control @@ -21,6 +21,7 @@ Build-Depends: debhelper (>= 12), liblognorm-dev (>= 1.0.0), libfastjson-dev (>= 0.99.7), libglib2.0-dev, + libpcap-dev, uuid-dev, libkrb5-dev, libgnutls28-dev, @@ -103,6 +104,15 @@ Description: documentation for rsyslog templates, etc, and has detailed information for all available configuration directives. +Package: rsyslog-impcap +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), + libpcap +Description: This module provides the impcap contributed module. + Package: rsyslog-mysql Architecture: any Priority: extra diff --git a/rsyslog/groovy/v8-stable/debian/rsyslog-impcap.install b/rsyslog/groovy/v8-stable/debian/rsyslog-impcap.install new file mode 100644 index 00000000..d846c539 --- /dev/null +++ b/rsyslog/groovy/v8-stable/debian/rsyslog-impcap.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/rsyslog/impcap.so diff --git a/rsyslog/groovy/v8-stable/debian/rules b/rsyslog/groovy/v8-stable/debian/rules index 37890a8f..28da3b43 100755 --- a/rsyslog/groovy/v8-stable/debian/rules +++ b/rsyslog/groovy/v8-stable/debian/rules @@ -17,6 +17,7 @@ override_dh_auto_configure: --libexecdir=/usr/lib/rsyslog \ --libdir=/usr/lib \ --enable-improg \ + --enable-impcap \ --enable-imdocker \ --enable-omrabbitmq \ --enable-imczmq \ diff --git a/rsyslog/trusty/v8-stable/debian/control b/rsyslog/trusty/v8-stable/debian/control index ec284f40..b30e6b33 100644 --- a/rsyslog/trusty/v8-stable/debian/control +++ b/rsyslog/trusty/v8-stable/debian/control @@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.6.1), autotools-dev (>= 20100122.1), dh-autoreconf, + libpcap-dev, librabbitmq-dev, librabbitmq1, zlib1g-dev, @@ -260,6 +261,15 @@ Depends: ${shlibs:Depends}, Description: Provides the imkmsg rsyslog plugin which can be used to read structured kernel logs. +Package: rsyslog-impcap +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), + libpcap +Description: This module provides the impcap contributed module. + Package: rsyslog-mmutf8fix Architecture: any Priority: extra diff --git a/rsyslog/trusty/v8-stable/debian/rsyslog-impcap.install b/rsyslog/trusty/v8-stable/debian/rsyslog-impcap.install new file mode 100644 index 00000000..d846c539 --- /dev/null +++ b/rsyslog/trusty/v8-stable/debian/rsyslog-impcap.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/rsyslog/impcap.so diff --git a/rsyslog/trusty/v8-stable/debian/rules b/rsyslog/trusty/v8-stable/debian/rules index ef51043c..b3214f4f 100755 --- a/rsyslog/trusty/v8-stable/debian/rules +++ b/rsyslog/trusty/v8-stable/debian/rules @@ -17,6 +17,7 @@ override_dh_auto_configure: dh_auto_configure -- \ --enable-kmsg \ --enable-improg \ + --enable-impcap \ --enable-omrabbitmq \ --enable-omuxsock \ --enable-mysql \ diff --git a/rsyslog/xenial/v8-stable/debian/control b/rsyslog/xenial/v8-stable/debian/control index d4c911b2..7e065b58 100644 --- a/rsyslog/xenial/v8-stable/debian/control +++ b/rsyslog/xenial/v8-stable/debian/control @@ -23,6 +23,7 @@ Build-Depends: debhelper (>= 8), liblognorm-dev (>= 1.0.0), libfastjson-dev (>= 0.99.7), libglib2.0-dev, + libpcap-dev, uuid-dev, libkrb5-dev, libgnutls-dev, @@ -105,6 +106,15 @@ Description: documentation for rsyslog templates, etc, and has detailed information for all available configuration directives. +Package: rsyslog-impcap +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), + libpcap +Description: This module provides the impcap contributed module. + Package: rsyslog-mysql Architecture: any Priority: extra diff --git a/rsyslog/xenial/v8-stable/debian/rsyslog-impcap.install b/rsyslog/xenial/v8-stable/debian/rsyslog-impcap.install new file mode 100644 index 00000000..d846c539 --- /dev/null +++ b/rsyslog/xenial/v8-stable/debian/rsyslog-impcap.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/rsyslog/impcap.so diff --git a/rsyslog/xenial/v8-stable/debian/rules b/rsyslog/xenial/v8-stable/debian/rules index 7307e7d2..35730a50 100755 --- a/rsyslog/xenial/v8-stable/debian/rules +++ b/rsyslog/xenial/v8-stable/debian/rules @@ -23,6 +23,7 @@ override_dh_auto_configure: --enable-pgsql \ --enable-mail \ --enable-imfile \ + --enable-impcap \ --enable-impstats \ --enable-gnutls \ --enable-relp \