From 749bd6c3be35c708cfb038b4b9df74e1aa029c78 Mon Sep 17 00:00:00 2001 From: Andre lorbach Date: Mon, 29 Jan 2024 14:24:26 +0100 Subject: [PATCH] Fix debian files for all Ubuntu releases up to 22.04 - updated PHP Key in config - extend auto_daily scripts support for daily builds - updated github workflow to modern ubuntu releases --- .github/workflows/ci.yml | 34 +- rsyslog/bionic/master/debian/changelog | 334 ++++++++++--- rsyslog/bionic/master/debian/control | 100 +++- rsyslog/bionic/master/debian/patches/series | 1 - rsyslog/bionic/master/debian/rsyslog.install | 1 + rsyslog/bionic/master/debian/rules | 16 +- rsyslog/eoan/master/debian/changelog | 145 +++--- rsyslog/eoan/master/debian/control | 100 +++- rsyslog/eoan/master/debian/patches/series | 1 - rsyslog/eoan/master/debian/patches/series~ | 2 + rsyslog/eoan/master/debian/rsyslog.install | 1 + rsyslog/eoan/master/debian/rules | 10 + rsyslog/focal/master/debian/changelog | 224 ++++++--- rsyslog/focal/master/debian/compat | 2 +- rsyslog/focal/master/debian/control | 106 +++- rsyslog/focal/master/debian/patches/series | 1 - rsyslog/focal/master/debian/patches/series~ | 2 + rsyslog/focal/master/debian/rsyslog.install | 1 + rsyslog/focal/master/debian/rules | 20 +- rsyslog/focal/v8-stable/debian/control | 1 - rsyslog/groovy/master/debian/changelog | 157 +++--- rsyslog/groovy/master/debian/compat | 2 +- rsyslog/groovy/master/debian/control | 93 +++- rsyslog/groovy/master/debian/patches/series | 1 - rsyslog/groovy/master/debian/patches/series~ | 2 + rsyslog/groovy/master/debian/rsyslog.install | 1 + rsyslog/groovy/master/debian/rules | 19 +- rsyslog/jammy/master/debian/changelog | 121 ++--- rsyslog/jammy/master/debian/compat | 2 +- rsyslog/jammy/master/debian/control | 108 ++++- rsyslog/jammy/master/debian/patches/series | 1 - rsyslog/jammy/master/debian/rsyslog.install | 1 + rsyslog/jammy/master/debian/rules | 20 +- rsyslog/jammy/v8-stable/debian/control | 1 - rsyslog/trusty/master/debian/changelog | 458 ++++++++++++++++++ rsyslog/trusty/master/debian/control | 88 +++- rsyslog/trusty/master/debian/rsyslog.install | 1 + .../trusty/master/debian/rsyslog.logrotate | 4 +- rsyslog/trusty/master/debian/rules | 14 +- rsyslog/xenial/master/debian/changelog | 444 +++++++++++++++++ rsyslog/xenial/master/debian/control | 91 +++- rsyslog/xenial/master/debian/patches/series | 1 - rsyslog/xenial/master/debian/rsyslog.install | 1 + rsyslog/xenial/master/debian/rules | 11 +- scripts/auto_daily.sh | 15 +- scripts/auto_daily_project.sh | 60 ++- scripts/config.sh | 9 +- 47 files changed, 2337 insertions(+), 491 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 58da85aa..9a09434e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 # Default: 360 minutes timeout-minutes: 60 @@ -36,7 +36,7 @@ jobs: # When set to true, cancel all in-progress jobs if any matrix job fails. fail-fast: false matrix: - release: [14.04, 16.04, 18.04, 20.04] + release: [18.04, 20.04] # , 22.04] steps: - name: git checkout packging project @@ -104,40 +104,40 @@ jobs: name: debs-${{ matrix.release }} path: debs-${{ matrix.release }} - check_14_04: - runs-on: ubuntu-18.04 + check_20_04: + runs-on: ubuntu-22.04 needs: build timeout-minutes: 30 steps: - - name: Download 14.04 debs + - name: Download 20.04 debs uses: actions/download-artifact@v1 with: - name: debs-14.04 + name: debs-20.04 - name: merge support libraries from OBS run: | mkdir tt cd tt - wget -q http://download.opensuse.org/repositories/home:/rgerhards/xUbuntu_14.04/Packages - grep Filename: Packages |grep amd64 | grep -v rsyslog \ - |sed 's~Filename: ./~wget -q http://download.opensuse.org/repositories/home:/rgerhards/xUbuntu_14.04/~' \ + wget -q http://download.opensuse.org/repositories/home:/rgerhards/xUbuntu_20.04/Packages + grep Filename: Packages | grep amd64 | grep -v rsyslog \ + | sed 's/Filename: /wget -q http:\/\/download.opensuse.org\/repositories\/home:\/rgerhards\/xUbuntu_20.04\//' \ > tmp source tmp # get .deb files ls -l - mv *deb $GITHUB_WORKSPACE/debs-14.04 + mv *deb $GITHUB_WORKSPACE/debs-20.04 cd .. rm -rf tt - name: prepare local repository run: | - cd debs-14.04 + cd debs-20.04 dpkg-scanpackages . /dev/null >Packages cd $GITHUB_WORKSPACE - name: check package install run: | - docker run --rm -v $GITHUB_WORKSPACE/debs-14.04:/debs ubuntu:14.04 bash -c \ + docker run --rm -v $GITHUB_WORKSPACE/debs-20.04:/debs ubuntu:20.04 bash -c \ ' echo "deb [trusted=yes] file:///debs ./" >> /etc/apt/sources.list apt-get update @@ -150,8 +150,9 @@ jobs: # Default: 360 minutes timeout-minutes: 10 strategy: + fail-fast: false matrix: - release: [16.04, 18.04, 20.04] + release: [20.04] #22.04 steps: - name: Download ${{ matrix.release }} debs @@ -166,6 +167,10 @@ jobs: sudo mkdir /var/www/html/repo sudo chmod o+rw /var/www/html/repo + - name: start local web server + run: | + sudo service apache2 start + - name: get support libraries from OBS run: | cd /var/www/html/repo @@ -257,9 +262,12 @@ jobs: # Perform apt update and install rsyslog packages sudo apt-get clean sudo apt-get update + sudo apt-cache search rsyslog + sudo apt-cache show rsyslog sudo apt-get install -y rsyslog rsyslog-improg rsyslog-imkmsg rsyslogd -v sudo systemctl restart rsyslog sudo systemctl status rsyslog logger test1 tail -n20 /var/log/syslog + grep "test1" /var/log/syslog --count || { echo "test1 not logged into /var/log/syslog" >&2; exit 1; } diff --git a/rsyslog/bionic/master/debian/changelog b/rsyslog/bionic/master/debian/changelog index c722ea2d..bc5be7f9 100644 --- a/rsyslog/bionic/master/debian/changelog +++ b/rsyslog/bionic/master/debian/changelog @@ -1,120 +1,326 @@ -rsyslog (8.28.0-0adiscon4zesty1) zesty; urgency=medium +rsyslog (8.2312.0-0adiscon1bionic1) bionic; urgency=medium - * Repack + * Packages for 8.2312.0 - -- Florian Riedl Thu, 20 Jul 2017 09:04:54 +0000 + -- Rainer Gerhards Thu, 12 Dec 2023 13:29:59 +0000 -rsyslog (8.28.0-0adiscon3zesty1) zesty; urgency=medium +rsyslog (8.2310.0-0adiscon1bionic1) bionic; urgency=medium - * Repack + * Packages for 8.2310.0 - -- Florian Riedl Wed, 19 Jul 2017 10:49:43 +0000 + -- Rainer Gerhards Thu, 10 Oct 2023 13:29:59 +0000 -rsyslog (8.28.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2308.0-0adiscon1bionic1) bionic; urgency=medium - * Enabled imkafka/omkafka + * Packages for 8.2308.0 - -- Florian Riedl Wed, 19 Jul 2017 08:07:15 +0000 + -- Rainer Gerhards Thu, 15 Aug 2023 13:29:59 +0000 -rsyslog (8.28.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2306.0-0adiscon1bionic1) bionic; urgency=medium - * package for 8.28.0 + * Packages for 8.2306.0 - -- Florian Riedl Tue, 18 Jul 2017 12:31:57 +0000 + -- Rainer Gerhards Thu, 20 Jun 2023 13:29:59 +0000 -rsyslog (8.27.0-0adiscon4zesty1) zesty; urgency=medium +rsyslog (8.2304.0-0adiscon1bionic1) bionic; urgency=medium - * Repack + * Packages for 8.2304.0 - -- Florian Riedl Wed, 17 May 2017 14:55:48 +0000 + -- Rainer Gerhards Thu, 18 Apr 2023 13:29:59 +0000 -rsyslog (8.27.0-0adiscon3zesty1) zesty; urgency=medium +rsyslog (8.2302.0-0adiscon1bionic1) bionic; urgency=medium - * Re-enabled omkafka + * Packages for 8.2302.0 - -- Florian Riedl Wed, 17 May 2017 10:29:27 +0000 + -- Rainer Gerhards Thu, 21 Feb 2023 13:29:59 +0000 -rsyslog (8.27.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2212.0-0adiscon1bionic1) bionic; urgency=medium - * Fixed disabled rules + * Packages for 8.2212.0 - -- Florian Riedl Tue, 16 May 2017 15:57:45 +0000 + -- Rainer Gerhards Thu, 06 Dec 2022 13:29:59 +0000 -rsyslog (8.27.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2210.0-0adiscon1bionic1) bionic; urgency=medium - * Packages for 8.27.0 - * Removed Kafka package for re-work + * Packages for 8.2210.0 - -- Florian Riedl Tue, 16 May 2017 15:43:33 +0000 + -- Rainer Gerhards Thu, 18 Oct 2022 13:29:59 +0000 -rsyslog (8.26.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2206.0-0adiscon1bionic1) bionic; urgency=medium - * Added modules pmnull and omkafka to the packages + * Packages for 8.2206.0 - -- Florian Riedl Thu, 13 Apr 2017 14:20:49 +0000 + -- Rainer Gerhards Thu, 14 Jun 2022 13:29:59 +0000 -rsyslog (8.26.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2204.1-0adiscon1bionic1) bionic; urgency=medium - * Packages for 8.26.0 + * Packages for 8.2204.1 - -- Florian Riedl Tue, 04 Apr 2017 13:10:26 +0000 + -- Rainer Gerhards Thu, 05 May 2022 13:29:59 +0000 -rsyslog (8.25.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2204.0-0adiscon1bionic1) bionic; urgency=medium - * Packages for 8.25.0 + * Packages for 8.2204.0 - -- Florian Riedl Tue, 21 Feb 2017 16:01:58 +0000 + -- Rainer Gerhards Thu, 19 Apr 2022 13:29:59 +0000 -rsyslog (8.24.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2202.0-0adiscon1bionic1) bionic; urgency=medium - * Added separate package for new module mmrm1stspace + * Packages for 8.2202.0 - -- Florian Riedl Thu, 02 Feb 2017 16:44:25 +0000 + -- Rainer Gerhards Thu, 15 Feb 2022 13:29:59 +0000 -rsyslog (8.24.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2112.0-0adiscon1bionic1) bionic; urgency=medium - * Packages for 8.24.0 + * Packages for 8.2112.0 - -- Florian Riedl Tue, 10 Jan 2017 13:31:00 +0000 + -- Florian Riedl Thu, 16 Dec 2021 13:29:59 +0000 -rsyslog (8.23.0-0adiscon1yakkety1) yakkety; urgency=medium +rsyslog (8.2110.0-0adiscon1bionic1) bionic; urgency=medium - * Packages for 8.23.0 + * Packages for 8.2110.0 - -- Florian Riedl Tue, 15 Nov 2016 16:51:21 +0000 + -- Rainer Gerhards Tue, 19 Oct 2021 10:17:34 +0000 -rsyslog (8.22.0-0adiscon1yakkety1) yakkety; urgency=medium +rsyslog (8.2108.0-0adiscon1bionic1) bionic; urgency=medium - * New packages for 8.22.0 + * Packages for 8.2108.0 - -- Florian Riedl Tue, 04 Oct 2016 15:03:04 +0000 + -- Rainer Gerhards Tue, 17 Aug 2021 10:17:34 +0000 -rsyslog (8.21.0-0adiscon1yakkety1) yakkety; urgency=medium +rsyslog (8.2106.0-0adiscon1bionic1) bionic; urgency=medium - * new upstream release - * disable liblogging-stdlog - We currently want to log by default by the syslog() API + * Packages for 8.2106.0 - -- Rainer Gerhards Tue, 23 Aug 2016 14:44:38 +0000 + -- Florian Riedl Tue, 15 Jun 2021 10:17:34 +0000 -rsyslog (8.20.0-0adiscon5yakkety1) yakkety; urgency=medium +rsyslog (8.2104.0-0adiscon1bionic1) bionic; urgency=medium - * fix dependencies + * Packages for 8.2104.0 - -- Rainer Gerhards Wed, 03 Aug 2016 08:20:34 +0000 + -- Florian Riedl Tue, 08 Dec 2020 10:17:34 +0000 -rsyslog (8.20.0-0adiscon4yakkety1) yakkety; urgency=medium +rsyslog (8.2012.0-0adiscon1bionic1) bionic; urgency=medium - * fix apparmor rules that could prevent startup - see also https://github.com/rsyslog/rsyslog-pkg-ubuntu/issues/48 - * yakkety seems to no longer provide libgnutls-dev but libgnutls28-dev - instead. Adjusted build dependency. + * Packages for 8.2012.0 - -- Rainer Gerhards Wed, 03 Aug 2016 06:38:34 +0000 + -- Florian Riedl Tue, 08 Dec 2020 10:17:34 +0000 -rsyslog (8.20.0-0adiscon3yakket1) yakkety; urgency=medium +rsyslog (8.2010.0-0adiscon2bionic1) bionic; urgency=medium - * initial release for yakkety - * add support for libfastjson 0.99.3, liblognorm 2.0.1 packages + * Rebuild for librelp 1.9.0 - -- Rainer Gerhards Tue, 02 Aug 2016 12:14:09 +0000 + -- Florian Riedl Tue, 24 Nov 2020 15:53:25 +0000 + +rsyslog (8.2010.0-0adiscon1bionic1) bionic; urgency=medium + + * Packages for 8.2010.0 + + -- Florian Riedl Tue, 20 Oct 2020 09:29:05 +0000 + +rsyslog (8.2008.0-0adiscon2bionic1) bionic; urgency=medium + + * Rebuild for librelp 1.8.0 + + -- Florian Riedl Tue, 29 Sep 2020 20:37:01 +0000 + +rsyslog (8.2008.0-0adiscon1bionic1) bionic; urgency=medium + + * Packages for 8.2008.0 + + -- Rainer Gerhards Mon, 06 Jul 2020 09:24:57 +0000 + +rsyslog (8.2006.0-0adiscon2bionic1) bionic; urgency=medium + + * new subpackages + + -- Rainer Gerhards Mon, 06 Jul 2020 09:24:57 +0000 + +rsyslog (8.2006.0-0adiscon1bionic1) bionic; urgency=medium + + * Packages for 8.2006.0 + + -- Florian Riedl Tue, 23 Jun 2020 13:56:57 +0000 + +rsyslog (8.2004.0-0adiscon1bionic1) bionic; urgency=medium + + * Packages for 8.2004.0 + + -- Florian Riedl Tue, 28 Apr 2020 12:57:57 +0000 + +rsyslog (8.2002.0-0adiscon1bionic1) bionic; urgency=medium + + * Packages for 8.2002.0 + + -- Florian Riedl Tue, 25 Feb 2020 14:40:32 +0000 + +rsyslog (8.2001.0-0adiscon1bionic1) bionic; urgency=medium + + * Packages for 8.2001.0 + + -- Florian Riedl Tue, 14 Jan 2020 16:12:54 +0000 + +rsyslog (8.1911.0-0adiscon1bionic1) bionic; urgency=medium + + * Packages for 8.1911.0 + + -- Florian Riedl Tue, 12 Nov 2019 09:42:10 +0000 + +rsyslog (8.1910.0-0adiscon1bionic1) bionic; urgency=medium + + * Packages for 8.1910.0 + + -- Florian Riedl Tue, 01 Oct 2019 08:31:05 +0000 + +rsyslog (8.1908.0-0adiscon1bionic1) bionic; urgency=medium + + * Packages for 8.1908.0 + + -- Florian Riedl Tue, 20 Aug 2019 09:25:33 +0000 + +rsyslog (8.1907.0-0adiscon2bionic1) bionic; urgency=medium + + * Added patch to revert BSD HUP fix + Ref: https://github.com/rsyslog/rsyslog/issues/3760 + + -- Florian Riedl Tue, 30 Jul 2019 09:34:02 +0000 + +rsyslog (8.1907.0-0adiscon1bionic1) bionic; urgency=medium + + * Packages for 8.1907.0 + + -- Florian Riedl Tue, 09 Jul 2019 10:15:47 +0000 + +rsyslog (8.1905.0-0adiscon2bionic1) bionic; urgency=medium + + * Added patch for fix in queue subsystem + closes: https://github.com/rsyslog/rsyslog/issues/3681 + + -- Florian Riedl Mon, 03 Jun 2019 14:50:49 +0000 + +rsyslog (8.1905.0-0adiscon1bionic1) bionic; urgency=medium + + * Packages for 8.1905.0 + + -- Florian Riedl Tue, 28 May 2019 09:14:59 +0000 + +rsyslog (8.1904.0-0adiscon1bionic1) bionic; urgency=medium + + * Packages for 8.1904.0 + + -- Florian Riedl Wed, 17 Apr 2019 10:20:54 +0000 + +rsyslog (8.1903.0-0adiscon1bionic1) bionic; urgency=medium + + * Packages for 8.1903.0 + + -- Florian Riedl Tue, 05 Mar 2019 15:02:15 +0000 + +rsyslog (8.1901.0-0adiscon2bionic1) bionic; urgency=medium + + * Removed dependency for liblogging-stdlog. Ref: https://github.com/rsyslog/rsyslog-pkg-ubuntu/is$ + * Added sub-package for pmnormalize. Ref: https://github.com/rsyslog/rsyslog-pkg-ubuntu/pull/84 + + -- Florian Riedl Fri, 08 Feb 2019 11:08:19 +0000 + +rsyslog (8.1901.0-0adiscon1bionic1) bionic; urgency=medium + + * Packages for 8.1901.0 + + -- Florian Riedl Tue, 22 Jan 2019 11:13:11 +0000 + +rsyslog (8.40.0-0adiscon1bionic1) bionic; urgency=medium + + * Packages for 8.40.0 + + -- Florian Riedl Tue, 11 Dec 2018 11:27:39 +0000 + +rsyslog (8.39.0-0adiscon5bionic1) bionic; urgency=medium + + * Added patch to fix imfile resend issue + Fixes: https://github.com/rsyslog/rsyslog/issues/3249 + + -- Florian Riedl Tue, 13 Nov 2018 11:45:00 +0000 + +rsyslog (8.39.0-0adiscon4bionic1) bionic; urgency=medium + + * Rebuild for liblognorm 2.0.6 + + -- Florian Riedl Wed, 07 Nov 2018 14:43:28 +0000 + +rsyslog (8.39.0-0adiscon3bionic1) bionic; urgency=medium + + * Rebuild for fixed Kafka dependency + + -- Florian Riedl Wed, 31 Oct 2018 09:45:41 +0000 + +rsyslog (8.39.0-0adiscon2bionic1) bionic; urgency=medium + + * Rebuild without missing and unused files + + -- Florian Riedl Tue, 30 Oct 2018 14:34:46 +0000 + +rsyslog (8.39.0-0adiscon1bionic1) bionic; urgency=medium + + * Packages for 8.39.0 + + -- Florian Riedl Tue, 30 Oct 2018 14:05:36 +0000 + +rsyslog (8.38.0-0adiscon1bionic1) bionic; urgency=medium + + * Packages for 8.38.0 + + -- Florian Riedl Tue, 18 Sep 2018 10:25:59 +0000 + +rsyslog (8.37.0-0adiscon1bionic1) bionic; urgency=medium + + * Packages for 8.37.0 + + -- Florian Riedl Tue, 07 Aug 2018 10:31:27 +0000 + +rsyslog (8.36.0-0adiscon5bionic1) bionic; urgency=medium + + * Updated librelp dependency + * Updated Kafka dependency + + -- Florian Riedl Thu, 02 Aug 2018 13:03:15 +0000 + +rsyslog (8.36.0-0adiscon4bionic1) bionic; urgency=medium + + * Rebuilt packages to undo new Kafka dependency + + -- Florian Riedl Fri, 27 Jul 2018 13:12:29 +0000 + +rsyslog (8.36.0-0adiscon3bionic1) bionic; urgency=medium + + * Rebuilt packages for updated Kafka dependency + + -- Florian Riedl Wed, 25 Jul 2018 08:48:10 +0000 + +rsyslog (8.36.0-0adiscon2bionic1) bionic; urgency=medium + + * Added sub-package rsyslog-openssl for OpenSSL TLS support + + -- Florian Riedl Wed, 27 Jun 2018 14:36:21 +0000 + +rsyslog (8.36.0-0adiscon1bionic1) bionic; urgency=medium + + * Packages for 8.36.0 + * Removed imrelp patch + * Fixed systemd patch. ref: #81 + + -- Florian Riedl Tue, 26 Jun 2018 10:58:24 +0000 + +rsyslog (8.35.0-0adiscon2bionic1) bionic; urgency=medium + + * Added patch for systemd, so a pid file will be generated again + ref: #79 + * Fixed libmongoc dependency + + -- Florian Riedl Fri, 15 Jun 2018 09:09:08 +0000 + +rsyslog (8.35.0-0adiscon1bionic1) bionic; urgency=medium + + * Initial build for Ubuntu 18.04 + + -- Florian Riedl Tue, 22 May 2018 14:38:21 +0000 diff --git a/rsyslog/bionic/master/debian/control b/rsyslog/bionic/master/debian/control index ddb5a083..50a3fba6 100644 --- a/rsyslog/bionic/master/debian/control +++ b/rsyslog/bionic/master/debian/control @@ -7,15 +7,21 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.6.1), autotools-dev (>= 20100122.1), dh-autoreconf, + libczmq-dev (>= 4.0.0), zlib1g-dev, + librabbitmq-dev, + librabbitmq4, libmysqlclient-dev, libpq-dev, + libgrok-dev, + libgrok1, libmongoc-dev, - librelp-dev (>= 1.0.2), + librelp-dev (>= 1.2.17), libestr-dev (>= 0.1.2), liblognorm-dev (>= 1.0.0), - libfastjson-dev, + libfastjson-dev (>= 0.99.7), libglib2.0-dev, + libpcap-dev, uuid-dev, libkrb5-dev, libgnutls28-dev, @@ -31,7 +37,8 @@ Build-Depends: debhelper (>= 8), liblz4-dev, libsasl2-dev, libssl-dev, - libhiredis-dev + libhiredis-dev, + libnet-dev Standards-Version: 3.9.2 XSBC-Original-Vcs-Git: git://git.debian.org/git/collab-maint/rsyslog.git XSBC-Original-Vcs-Browser: http://git.debian.org/?p=collab-maint/rsyslog.git;a=summary @@ -49,7 +56,7 @@ Depends: ${shlibs:Depends}, lsb-base (>= 3.2-14), adduser, ucf, - libfastjson4 + libfastjson4 (>= 0.99.7) Recommends: logrotate Suggests: rsyslog-mysql | rsyslog-pgsql, rsyslog-doc, @@ -62,8 +69,8 @@ Suggests: rsyslog-mysql | rsyslog-pgsql, rsyslog-openssl, rsyslog-udpspoof, rsyslog-mmrm1stspace, - rsyslog-kafka, rsyslog-mmutf8fix, + rsyslog-kafka, rsyslog-omstdout, apparmor (>= 2.3) Description: a rocket-fast system for log processing @@ -98,6 +105,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 @@ -149,18 +165,36 @@ Description: MongoDB output plugin for rsyslog # encrypted syslog messages. GSSAPI is commonly used for Kerberos # authentication. +Package: rsyslog-omclickhouse +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the omclickhouse rsyslog plugin + Package: rsyslog-relp Architecture: any Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends}, rsyslog (= ${binary:Version}), - librelp0 (>= 1.0.2) + librelp0 (>= 1.2.17) Description: RELP protocol support for rsyslog These plugins allows rsyslog to send and receive syslog messages via the RELP protocol. RELP ensures reliable transport over the network even on connection loss or if a peer becomes unavailable. +Package: rsyslog-czmq +Architecture: any +Priority: optional +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}) +Description: ZeroMQ protocol support for rsyslog via CZMQ + These plugins allows rsyslog to send and receive ZeroMQ syslog + messages via the CZMQ library. + Package: rsyslog-elasticsearch Architecture: any Priority: extra @@ -178,7 +212,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 @@ -226,6 +260,49 @@ Depends: ${shlibs:Depends}, liblognorm5 Description: Parse all fields of the message into structured data inside the JSON tree. +Package: rsyslog-mmgrok +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the mmgrok rsyslog plugin + +Package: rsyslog-omrabbitmq +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + librabbitmq4, + rsyslog (= ${binary:Version}), +Description: Provides the omrabbitmq rsyslog plugin + +Package: rsyslog-imdocker +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgrok1, + rsyslog (= ${binary:Version}), +Description: Provides the imdocker rsyslog plugin + +Package: rsyslog-improg +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the improg rsyslog plugin + +Package: rsyslog-imkmsg +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the imkmsg rsyslog plugin which can be used to read structured + kernel logs. + Package: rsyslog-mmutf8fix Architecture: any Priority: extra @@ -245,6 +322,15 @@ Description: TLS protocol support for rsyslog This netstream plugin allows rsyslog to send and receive encrypted syslog messages via the upcoming syslog-transport-tls IETF standard protocol. +Package: rsyslog-udpspoof +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), + libnet-dev +Description: This module is similar to the regular UDP forwarder, but permits to spoof the sender address. + Package: rsyslog-openssl Architecture: any Priority: extra diff --git a/rsyslog/bionic/master/debian/patches/series b/rsyslog/bionic/master/debian/patches/series index d50e6bf7..f9fae80c 100644 --- a/rsyslog/bionic/master/debian/patches/series +++ b/rsyslog/bionic/master/debian/patches/series @@ -1,6 +1,5 @@ # Debian patches for rsyslog 01-dont_create_db.patch -02-rsyslog-systemd.patch # 0001-build-link-omelasticsearch-against-lm.patch # Ubuntu patches for rsyslog # 100-imuxsock-allow-missing-date.patch diff --git a/rsyslog/bionic/master/debian/rsyslog.install b/rsyslog/bionic/master/debian/rsyslog.install index ddf33856..1f7047f9 100644 --- a/rsyslog/bionic/master/debian/rsyslog.install +++ b/rsyslog/bionic/master/debian/rsyslog.install @@ -9,6 +9,7 @@ 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/omuxsock.so debian/tmp/usr/lib/rsyslog/imjournal.so debian/tmp/usr/lib/rsyslog/lmnet.so debian/tmp/usr/lib/rsyslog/lmnetstrms.so diff --git a/rsyslog/bionic/master/debian/rules b/rsyslog/bionic/master/debian/rules index c4442b2f..9cd5f5c0 100755 --- a/rsyslog/bionic/master/debian/rules +++ b/rsyslog/bionic/master/debian/rules @@ -2,24 +2,35 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk +export DEB_BUILD_OPTIONS="parallel=4" # the default LDFLAGS="-Wl,-Bsymbolic-functions" caused rsyslog to # segfault on receipt of first message (see LP: #794230) unexport LDFLAGS %: - dh $@ --with autoreconf + dh $@ --parallel --with autoreconf #org dh $@ --with autotools_dev override_dh_auto_configure: dh_auto_configure -- \ + --enable-kmsg \ + --enable-improg \ + --enable-imdocker \ + --enable-omrabbitmq \ + --enable-imczmq \ + --enable-omczmq \ + --enable-mmgrok \ + --enable-omuxsock \ --enable-mysql \ --enable-pgsql \ --enable-mail \ --enable-imfile \ + --enable-impcap \ --enable-impstats \ --enable-gnutls \ --enable-relp \ + --enable-clickhouse \ --enable-pmaixforwardedfrom \ --enable-pmcisconames \ --enable-pmlastmsg \ @@ -39,13 +50,13 @@ override_dh_auto_configure: --enable-pmciscoios \ --enable-pmnormalize \ --enable-usertools \ + --enable-omudpspoof \ --enable-imjournal \ --enable-omjournal \ --enable-mmrm1stspace \ --enable-pmnull \ --enable-omkafka \ --enable-imkafka \ - --enable-kafka-static \ --enable-omhiredis \ --enable-omstdout \ --enable-mmkubernetes \ @@ -55,6 +66,7 @@ override_dh_auto_configure: --with-systemdsystemunitdir=/lib/systemd/system # +# --enable-kafka-static \ # --enable-omkafka \ # --enable-guardtime \ # --enable-gt-ksi \ diff --git a/rsyslog/eoan/master/debian/changelog b/rsyslog/eoan/master/debian/changelog index c722ea2d..ec8e275c 100644 --- a/rsyslog/eoan/master/debian/changelog +++ b/rsyslog/eoan/master/debian/changelog @@ -1,120 +1,137 @@ -rsyslog (8.28.0-0adiscon4zesty1) zesty; urgency=medium +rsyslog (8.2312.0-0adiscon1eoan1) eoan; urgency=medium - * Repack + * Packages for 8.2312.0 - -- Florian Riedl Thu, 20 Jul 2017 09:04:54 +0000 + -- Rainer Gerhards Thu, 12 Dec 2023 13:29:59 +0000 -rsyslog (8.28.0-0adiscon3zesty1) zesty; urgency=medium +rsyslog (8.2310.0-0adiscon1eoan1) eoan; urgency=medium - * Repack + * Packages for 8.2310.0 - -- Florian Riedl Wed, 19 Jul 2017 10:49:43 +0000 + -- Rainer Gerhards Thu, 10 Oct 2023 13:29:59 +0000 -rsyslog (8.28.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2308.0-0adiscon1eoan1) eoan; urgency=medium - * Enabled imkafka/omkafka + * Packages for 8.2308.0 - -- Florian Riedl Wed, 19 Jul 2017 08:07:15 +0000 + -- Rainer Gerhards Thu, 15 Aug 2023 13:29:59 +0000 -rsyslog (8.28.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2306.0-0adiscon1eoan1) eoan; urgency=medium - * package for 8.28.0 + * Packages for 8.2306.0 - -- Florian Riedl Tue, 18 Jul 2017 12:31:57 +0000 + -- Rainer Gerhards Thu, 20 Jun 2023 13:29:59 +0000 -rsyslog (8.27.0-0adiscon4zesty1) zesty; urgency=medium +rsyslog (8.2304.0-0adiscon1eoan1) eoan; urgency=medium - * Repack + * Packages for 8.2304.0 - -- Florian Riedl Wed, 17 May 2017 14:55:48 +0000 + -- Rainer Gerhards Thu, 18 Apr 2023 13:29:59 +0000 -rsyslog (8.27.0-0adiscon3zesty1) zesty; urgency=medium +rsyslog (8.2302.0-0adiscon1eoan1) eoan; urgency=medium - * Re-enabled omkafka + * Packages for 8.2302.0 - -- Florian Riedl Wed, 17 May 2017 10:29:27 +0000 + -- Rainer Gerhards Thu, 21 Feb 2023 13:29:59 +0000 -rsyslog (8.27.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2212.0-0adiscon1eoan1) eoan; urgency=medium - * Fixed disabled rules + * Packages for 8.2212.0 - -- Florian Riedl Tue, 16 May 2017 15:57:45 +0000 + -- Rainer Gerhards Thu, 06 Dec 2022 13:29:59 +0000 -rsyslog (8.27.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2210.0-0adiscon1eoan1) eoan; urgency=medium - * Packages for 8.27.0 - * Removed Kafka package for re-work + * Packages for 8.2210.0 - -- Florian Riedl Tue, 16 May 2017 15:43:33 +0000 + -- Rainer Gerhards Thu, 18 Oct 2022 13:29:59 +0000 -rsyslog (8.26.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2206.0-0adiscon1eoan1) eoan; urgency=medium - * Added modules pmnull and omkafka to the packages + * Packages for 8.2206.0 - -- Florian Riedl Thu, 13 Apr 2017 14:20:49 +0000 + -- Rainer Gerhards Thu, 14 Jun 2022 13:29:59 +0000 -rsyslog (8.26.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2204.1-0adiscon1eoan1) eoan; urgency=medium - * Packages for 8.26.0 + * Packages for 8.2204.1 - -- Florian Riedl Tue, 04 Apr 2017 13:10:26 +0000 + -- Rainer Gerhards Thu, 05 May 2022 13:29:59 +0000 -rsyslog (8.25.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2204.0-0adiscon1eoan1) eoan; urgency=medium - * Packages for 8.25.0 + * Packages for 8.2204.0 - -- Florian Riedl Tue, 21 Feb 2017 16:01:58 +0000 + -- Rainer Gerhards Thu, 19 Apr 2022 13:29:59 +0000 -rsyslog (8.24.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2202.0-0adiscon1eoan1) eoan; urgency=medium - * Added separate package for new module mmrm1stspace + * Packages for 8.2202.0 - -- Florian Riedl Thu, 02 Feb 2017 16:44:25 +0000 + -- Rainer Gerhards Thu, 15 Feb 2022 13:29:59 +0000 -rsyslog (8.24.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2110.0-0adiscon1eoan1) eoan; urgency=medium - * Packages for 8.24.0 + * Packages for 8.2110.0 - -- Florian Riedl Tue, 10 Jan 2017 13:31:00 +0000 + -- Rainer Gerhards Tue, 19 Oct 2021 10:17:34 +0000 -rsyslog (8.23.0-0adiscon1yakkety1) yakkety; urgency=medium +rsyslog (8.2108.0-0adiscon1eoan1) eoan; urgency=medium - * Packages for 8.23.0 + * Packages for 8.2108.0 - -- Florian Riedl Tue, 15 Nov 2016 16:51:21 +0000 + -- Rainer Gerhards Tue, 17 Aug 2021 10:17:34 +0000 -rsyslog (8.22.0-0adiscon1yakkety1) yakkety; urgency=medium +rsyslog (8.2106.0-0adiscon1eoan1) eoan; urgency=medium - * New packages for 8.22.0 + * Packages for 8.2106.0 - -- Florian Riedl Tue, 04 Oct 2016 15:03:04 +0000 + -- Rainer Gerhards Mon, 15 Jun 2021 09:24:57 +0000 -rsyslog (8.21.0-0adiscon1yakkety1) yakkety; urgency=medium +rsyslog (8.2104.0-0adiscon1eoan1) eoan; urgency=medium - * new upstream release - * disable liblogging-stdlog - We currently want to log by default by the syslog() API + * Packages for 8.2104.0 - -- Rainer Gerhards Tue, 23 Aug 2016 14:44:38 +0000 + -- Rainer Gerhards Mon, 06 Jul 2020 09:24:57 +0000 -rsyslog (8.20.0-0adiscon5yakkety1) yakkety; urgency=medium +rsyslog (8.2008.0-0adiscon1eoan1) eoan; urgency=medium - * fix dependencies + * Packages for 8.2008.0 - -- Rainer Gerhards Wed, 03 Aug 2016 08:20:34 +0000 + -- Rainer Gerhards Mon, 06 Jul 2020 09:24:57 +0000 -rsyslog (8.20.0-0adiscon4yakkety1) yakkety; urgency=medium +rsyslog (8.2006.0-0adiscon2eoan1) eoan; urgency=medium - * fix apparmor rules that could prevent startup - see also https://github.com/rsyslog/rsyslog-pkg-ubuntu/issues/48 - * yakkety seems to no longer provide libgnutls-dev but libgnutls28-dev - instead. Adjusted build dependency. + * new subpackages - -- Rainer Gerhards Wed, 03 Aug 2016 06:38:34 +0000 + -- Rainer Gerhards Mon, 06 Jul 2020 09:24:57 +0000 -rsyslog (8.20.0-0adiscon3yakket1) yakkety; urgency=medium +rsyslog (8.2006.0-0adiscon1eoan1) eoan; urgency=medium - * initial release for yakkety - * add support for libfastjson 0.99.3, liblognorm 2.0.1 packages + * Packages for 8.2006.0 - -- Rainer Gerhards Tue, 02 Aug 2016 12:14:09 +0000 + -- Florian Riedl Tue, 23 Jun 2020 13:57:30 +0000 + +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/eoan/master/debian/control b/rsyslog/eoan/master/debian/control index ddb5a083..c832a8db 100644 --- a/rsyslog/eoan/master/debian/control +++ b/rsyslog/eoan/master/debian/control @@ -6,15 +6,21 @@ XSBC-Original-Maintainer: Michael Biebl 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, zlib1g-dev, libmysqlclient-dev, libpq-dev, + libgrok-dev, + libgrok1, libmongoc-dev, - librelp-dev (>= 1.0.2), + librelp-dev (>= 1.2.17), libestr-dev (>= 0.1.2), liblognorm-dev (>= 1.0.0), - libfastjson-dev, + libfastjson-dev (>= 0.99.7), libglib2.0-dev, uuid-dev, libkrb5-dev, @@ -49,7 +55,7 @@ Depends: ${shlibs:Depends}, lsb-base (>= 3.2-14), adduser, ucf, - libfastjson4 + libfastjson4 (>= 0.99.7) Recommends: logrotate Suggests: rsyslog-mysql | rsyslog-pgsql, rsyslog-doc, @@ -62,8 +68,8 @@ Suggests: rsyslog-mysql | rsyslog-pgsql, rsyslog-openssl, rsyslog-udpspoof, rsyslog-mmrm1stspace, - rsyslog-kafka, rsyslog-mmutf8fix, + rsyslog-kafka, rsyslog-omstdout, apparmor (>= 2.3) Description: a rocket-fast system for log processing @@ -149,13 +155,31 @@ Description: MongoDB output plugin for rsyslog # encrypted syslog messages. GSSAPI is commonly used for Kerberos # authentication. +Package: rsyslog-czmq +Architecture: any +Priority: optional +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}) +Description: ZeroMQ protocol support for rsyslog via CZMQ + These plugins allows rsyslog to send and receive ZeroMQ syslog + messages via the CZMQ library. + +Package: rsyslog-omclickhouse +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the omclickhouse rsyslog plugin + Package: rsyslog-relp Architecture: any Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends}, rsyslog (= ${binary:Version}), - librelp0 (>= 1.0.2) + librelp0 (>= 1.2.17) Description: RELP protocol support for rsyslog These plugins allows rsyslog to send and receive syslog messages via the RELP protocol. RELP ensures reliable transport over the network even on @@ -178,7 +202,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 @@ -226,6 +250,59 @@ Depends: ${shlibs:Depends}, liblognorm5 Description: Parse all fields of the message into structured data inside the JSON tree. +Package: rsyslog-mmgrok +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgrok1, + rsyslog (= ${binary:Version}), +Description: Provides the mmgrok rsyslog plugin + +Package: rsyslog-omrabbitmq +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + librabbitmq4, + rsyslog (= ${binary:Version}), +Description: Provides the omrabbitmq rsyslog plugin + +Package: rsyslog-imdocker +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgrok1, + rsyslog (= ${binary:Version}), +Description: Provides the imdocker rsyslog plugin + +Package: rsyslog-improg +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the improg rsyslog plugin + +Package: rsyslog-imkmsg +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +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 @@ -347,14 +424,3 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, rsyslog (= ${binary:Version}), Description: Message modification module to add Kubernetes metadata to a messages. - -#Package: rsyslog-zmq -#Architecture: any -#Priority: extra -#Depends: ${shlibs:Depends}, -# ${misc:Depends}, -# rsyslog (= ${binary:Version}), -# libzmq1 -#Description: zmq3 support for RSyslog. -# These plugins allows you to push data from and into rsyslog from a -# zeromq socket. diff --git a/rsyslog/eoan/master/debian/patches/series b/rsyslog/eoan/master/debian/patches/series index d50e6bf7..f9fae80c 100644 --- a/rsyslog/eoan/master/debian/patches/series +++ b/rsyslog/eoan/master/debian/patches/series @@ -1,6 +1,5 @@ # Debian patches for rsyslog 01-dont_create_db.patch -02-rsyslog-systemd.patch # 0001-build-link-omelasticsearch-against-lm.patch # Ubuntu patches for rsyslog # 100-imuxsock-allow-missing-date.patch diff --git a/rsyslog/eoan/master/debian/patches/series~ b/rsyslog/eoan/master/debian/patches/series~ index f9fae80c..0dd66dbb 100644 --- a/rsyslog/eoan/master/debian/patches/series~ +++ b/rsyslog/eoan/master/debian/patches/series~ @@ -1,5 +1,7 @@ # Debian patches for rsyslog 01-dont_create_db.patch +02-rsyslog-systemd.patch +rsyslog-8.1907-revert-BSD-HUP.patch # 0001-build-link-omelasticsearch-against-lm.patch # Ubuntu patches for rsyslog # 100-imuxsock-allow-missing-date.patch diff --git a/rsyslog/eoan/master/debian/rsyslog.install b/rsyslog/eoan/master/debian/rsyslog.install index ddf33856..1f7047f9 100644 --- a/rsyslog/eoan/master/debian/rsyslog.install +++ b/rsyslog/eoan/master/debian/rsyslog.install @@ -9,6 +9,7 @@ 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/omuxsock.so debian/tmp/usr/lib/rsyslog/imjournal.so debian/tmp/usr/lib/rsyslog/lmnet.so debian/tmp/usr/lib/rsyslog/lmnetstrms.so diff --git a/rsyslog/eoan/master/debian/rules b/rsyslog/eoan/master/debian/rules index c4442b2f..fd1be258 100755 --- a/rsyslog/eoan/master/debian/rules +++ b/rsyslog/eoan/master/debian/rules @@ -13,6 +13,14 @@ unexport LDFLAGS override_dh_auto_configure: dh_auto_configure -- \ + --enable-kmsg \ + --enable-improg \ + --enable-imdocker \ + --enable-omrabbitmq \ + --enable-imczmq \ + --enable-omczmq \ + --enable-mmgrok \ + --enable-omuxsock \ --enable-mysql \ --enable-pgsql \ --enable-mail \ @@ -20,6 +28,8 @@ override_dh_auto_configure: --enable-impstats \ --enable-gnutls \ --enable-relp \ + --enable-clickhouse \ + --enable-impcap \ --enable-pmaixforwardedfrom \ --enable-pmcisconames \ --enable-pmlastmsg \ diff --git a/rsyslog/focal/master/debian/changelog b/rsyslog/focal/master/debian/changelog index c722ea2d..80ffebed 100644 --- a/rsyslog/focal/master/debian/changelog +++ b/rsyslog/focal/master/debian/changelog @@ -1,120 +1,216 @@ -rsyslog (8.28.0-0adiscon4zesty1) zesty; urgency=medium +rsyslog (8.2312.0-0adiscon1focal1) focal; urgency=medium - * Repack + * Packages for 8.2312.0 - -- Florian Riedl Thu, 20 Jul 2017 09:04:54 +0000 + -- Rainer Gerhards Thu, 12 Dec 2023 13:29:59 +0000 -rsyslog (8.28.0-0adiscon3zesty1) zesty; urgency=medium +rsyslog (8.2310.0-0adiscon1focal1) focal; urgency=medium - * Repack + * Packages for 8.2310.0 - -- Florian Riedl Wed, 19 Jul 2017 10:49:43 +0000 + -- Rainer Gerhards Thu, 10 Oct 2023 13:29:59 +0000 -rsyslog (8.28.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2308.0-0adiscon1focal1) focal; urgency=medium - * Enabled imkafka/omkafka + * Packages for 8.2308.0 - -- Florian Riedl Wed, 19 Jul 2017 08:07:15 +0000 + -- Rainer Gerhards Thu, 15 Aug 2023 13:29:59 +0000 -rsyslog (8.28.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2306.0-0adiscon1focal1) focal; urgency=medium - * package for 8.28.0 + * Packages for 8.2306.0 - -- Florian Riedl Tue, 18 Jul 2017 12:31:57 +0000 + -- Rainer Gerhards Thu, 20 Jun 2023 13:29:59 +0000 -rsyslog (8.27.0-0adiscon4zesty1) zesty; urgency=medium +rsyslog (8.2304.0-0adiscon1focal1) focal; urgency=medium - * Repack + * Packages for 8.2304.0 - -- Florian Riedl Wed, 17 May 2017 14:55:48 +0000 + -- Rainer Gerhards Thu, 18 Apr 2023 13:29:59 +0000 -rsyslog (8.27.0-0adiscon3zesty1) zesty; urgency=medium +rsyslog (8.2302.0-0adiscon1focal1) focal; urgency=medium - * Re-enabled omkafka + * Packages for 8.2302.0 - -- Florian Riedl Wed, 17 May 2017 10:29:27 +0000 + -- Rainer Gerhards Thu, 21 Feb 2023 13:29:59 +0000 -rsyslog (8.27.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2212.0-0adiscon1focal1) focal; urgency=medium - * Fixed disabled rules + * Packages for 8.2212.0 - -- Florian Riedl Tue, 16 May 2017 15:57:45 +0000 + -- Rainer Gerhards Thu, 06 Dec 2022 13:29:59 +0000 -rsyslog (8.27.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2210.0-0adiscon1focal1) focal; urgency=medium - * Packages for 8.27.0 - * Removed Kafka package for re-work + * Packages for 8.2210.0 - -- Florian Riedl Tue, 16 May 2017 15:43:33 +0000 + -- Rainer Gerhards Thu, 18 Oct 2022 13:29:59 +0000 -rsyslog (8.26.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2206.0-0adiscon1focal1) focal; urgency=medium - * Added modules pmnull and omkafka to the packages + * Packages for 8.2206.0 - -- Florian Riedl Thu, 13 Apr 2017 14:20:49 +0000 + -- Rainer Gerhards Thu, 14 Jun 2022 13:29:59 +0000 -rsyslog (8.26.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2204.1-0adiscon1focal1) focal; urgency=medium - * Packages for 8.26.0 + * Packages for 8.2204.1 - -- Florian Riedl Tue, 04 Apr 2017 13:10:26 +0000 + -- Rainer Gerhards Thu, 05 May 2022 13:29:59 +0000 -rsyslog (8.25.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2204.0-0adiscon1focal1) focal; urgency=medium - * Packages for 8.25.0 + * Packages for 8.2204.0 - -- Florian Riedl Tue, 21 Feb 2017 16:01:58 +0000 + -- Rainer Gerhards Thu, 19 Apr 2022 13:29:59 +0000 -rsyslog (8.24.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2202.0-0adiscon1focal1) focal; urgency=medium - * Added separate package for new module mmrm1stspace + * Packages for 8.2202.0 - -- Florian Riedl Thu, 02 Feb 2017 16:44:25 +0000 + -- Rainer Gerhards Thu, 15 Feb 2022 13:29:59 +0000 -rsyslog (8.24.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2112.0-0adiscon1focal1) focal; urgency=medium - * Packages for 8.24.0 + * Packages for 8.2112.0 - -- Florian Riedl Tue, 10 Jan 2017 13:31:00 +0000 + -- Florian Riedl Thu, 16 Dec 2021 13:30:42 +0000 -rsyslog (8.23.0-0adiscon1yakkety1) yakkety; urgency=medium +rsyslog (8.2110.0-0adiscon1focal1) focal; urgency=medium - * Packages for 8.23.0 + * Packages for 8.2110.0 - -- Florian Riedl Tue, 15 Nov 2016 16:51:21 +0000 + -- Rainer Gerhards Tue, 19 Oct 2021 10:17:34 +0000 -rsyslog (8.22.0-0adiscon1yakkety1) yakkety; urgency=medium +rsyslog (8.2108.0-0adiscon1focal1) focal; urgency=medium - * New packages for 8.22.0 + * Packages for 8.2108.0 - -- Florian Riedl Tue, 04 Oct 2016 15:03:04 +0000 + -- Rainer Gerhards Tue, 17 Aug 2021 10:17:34 +0000 -rsyslog (8.21.0-0adiscon1yakkety1) yakkety; urgency=medium +rsyslog (8.2106.0-0adiscon1focal1) focal; urgency=medium - * new upstream release - * disable liblogging-stdlog - We currently want to log by default by the syslog() API + * Packages for 8.2106.0 - -- Rainer Gerhards Tue, 23 Aug 2016 14:44:38 +0000 + -- Florian Riedl Tue, 15 Jun 2021 10:18:09 +0000 -rsyslog (8.20.0-0adiscon5yakkety1) yakkety; urgency=medium +rsyslog (8.2104.0-0adiscon1focal1) focal; urgency=medium - * fix dependencies + * Packages for 8.2104.0 - -- Rainer Gerhards Wed, 03 Aug 2016 08:20:34 +0000 + -- Florian Riedl Tue, 08 Dec 2020 10:18:09 +0000 -rsyslog (8.20.0-0adiscon4yakkety1) yakkety; urgency=medium +rsyslog (8.2012.0-0adiscon1focal1) focal; urgency=medium - * fix apparmor rules that could prevent startup - see also https://github.com/rsyslog/rsyslog-pkg-ubuntu/issues/48 - * yakkety seems to no longer provide libgnutls-dev but libgnutls28-dev - instead. Adjusted build dependency. + * Packages for 8.2012.0 - -- Rainer Gerhards Wed, 03 Aug 2016 06:38:34 +0000 + -- Florian Riedl Tue, 08 Dec 2020 10:18:09 +0000 -rsyslog (8.20.0-0adiscon3yakket1) yakkety; urgency=medium +rsyslog (8.2010.0-0adiscon2focal1) focal; urgency=medium - * initial release for yakkety - * add support for libfastjson 0.99.3, liblognorm 2.0.1 packages + * Rebuild for librelp 1.9.0 + + -- Florian Riedl Tue, 24 Nov 2020 15:53:54 +0000 + +rsyslog (8.2010.0-0adiscon1focal1) focal; urgency=medium + + * Packages for 8.2010.0 + + -- Florian Riedl Tue, 20 Oct 2020 09:29:41 +0000 + +rsyslog (8.2008.0-0adiscon2focal1) focal; urgency=medium + + * Rebuild for librelp 1.8.0 + + -- Florian Riedl Tue, 29 Sep 2020 20:37:28 +0000 + +rsyslog (8.2008.0-0adiscon1focal1) focal; urgency=medium + + * Packages for 8.2008.0 + + -- Rainer Gerhards Thu, 27 Aug 2020 09:24:57 +0000 + +rsyslog (8.2006.0-0adiscon2focal1) focal; urgency=medium + + * new subpackages + + -- Rainer Gerhards Mon, 06 Jul 2020 09:24:57 +0000 + +rsyslog (8.2006.0-0adiscon1focal1) focal; urgency=medium + + * Packages for 8.2006.0 + + -- Florian Riedl Tue, 23 Jun 2020 13:58:19 +0000 + +rsyslog (8.2004.0-0adiscon12focal1) focal; urgency=medium + + * libdir and libexecdir absolute paths + + -- Florian Riedl Mon, 25 May 2020 10:37:03 +0000 + +rsyslog (8.2004.0-0adiscon11focal1) focal; urgency=medium + + * Set libdir and libexecdir in rules + + -- Florian Riedl Mon, 25 May 2020 10:24:28 +0000 + +rsyslog (8.2004.0-0adiscon10focal1) focal; urgency=medium + + * Fix test for rules file + + -- Florian Riedl Mon, 25 May 2020 09:03:06 +0000 + +rsyslog (8.2004.0-0adiscon9focal1) focal; urgency=medium + + * Fix test for rules file + + -- Florian Riedl Mon, 25 May 2020 08:36:30 +0000 + +rsyslog (8.2004.0-0adiscon8focal1) focal; urgency=medium + + * Upped debhelper required version to 12 + + -- Florian Riedl Wed, 20 May 2020 15:10:28 +0000 + +rsyslog (8.2004.0-0adiscon7focal1) focal; urgency=medium + + * Removed debhelper compat, instead set compatibility mode + + -- Florian Riedl Wed, 20 May 2020 14:42:18 +0000 + +rsyslog (8.2004.0-0adiscon6focal1) focal; urgency=medium + + * Set debhelper-compat in Builddepends + + -- Florian Riedl Wed, 20 May 2020 14:37:57 +0000 + +rsyslog (8.2004.0-0adiscon5focal1) focal; urgency=medium + + * Changed debhelper level + + -- Florian Riedl Wed, 20 May 2020 14:17:17 +0000 + +rsyslog (8.2004.0-0adiscon4focal1) focal; urgency=medium + + * Disabled mmkubernetes + + -- Florian Riedl Wed, 20 May 2020 13:47:33 +0000 + +rsyslog (8.2004.0-0adiscon3focal1) focal; urgency=medium + + * Re-upload + + -- Florian Riedl Wed, 20 May 2020 13:34:04 +0000 + +rsyslog (8.2004.0-0adiscon2focal1) focal; urgency=medium + + * Re-Upload + + -- Florian Riedl Mon, 18 May 2020 13:18:09 +0000 + +rsyslog (8.2004.0-0adiscon1focal1) focal; urgency=medium + + * Initial package for Ubuntu 20.04 + + -- Florian Riedl Mon, 18 May 2020 10:38:08 +0000 - -- Rainer Gerhards Tue, 02 Aug 2016 12:14:09 +0000 diff --git a/rsyslog/focal/master/debian/compat b/rsyslog/focal/master/debian/compat index 45a4fb75..ec635144 100644 --- a/rsyslog/focal/master/debian/compat +++ b/rsyslog/focal/master/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/rsyslog/focal/master/debian/control b/rsyslog/focal/master/debian/control index ecf4c67b..9d0b115e 100644 --- a/rsyslog/focal/master/debian/control +++ b/rsyslog/focal/master/debian/control @@ -3,35 +3,41 @@ Section: admin Priority: important Maintainer: Andre Lorbach XSBC-Original-Maintainer: Michael Biebl -Build-Depends: debhelper (>= 8), +Build-Depends: debhelper (>= 12), dpkg-dev (>= 1.6.1), autotools-dev (>= 20100122.1), + libczmq-dev (>= 4.0.0), dh-autoreconf, + librabbitmq-dev, + librabbitmq4, zlib1g-dev, + libgrok-dev, + libgrok1, libmysqlclient-dev, libpq-dev, libmongoc-dev, - librelp-dev (>= 1.0.2), + librelp-dev (>= 1.2.17), libestr-dev (>= 0.1.2), liblognorm-dev (>= 1.0.0), - libfastjson-dev, + libfastjson-dev (>= 0.99.7), libglib2.0-dev, + libpcap-dev, uuid-dev, libkrb5-dev, libgnutls28-dev, pkg-config, dh-apparmor, - dh-systemd (>= 1.4), libcurl4-gnutls-dev, bison, libgcrypt-dev, - python-docutils, + python3-docutils, libsystemd-dev (>= 209) [linux-any], librdkafka-dev, liblz4-dev, libsasl2-dev, libssl-dev, - libhiredis-dev + libhiredis-dev, + libnet-dev Standards-Version: 3.9.2 XSBC-Original-Vcs-Git: git://git.debian.org/git/collab-maint/rsyslog.git XSBC-Original-Vcs-Browser: http://git.debian.org/?p=collab-maint/rsyslog.git;a=summary @@ -49,7 +55,7 @@ Depends: ${shlibs:Depends}, lsb-base (>= 3.2-14), adduser, ucf, - libfastjson4 + libfastjson4 (>= 0.99.7) Recommends: logrotate Suggests: rsyslog-mysql | rsyslog-pgsql, rsyslog-doc, @@ -62,8 +68,8 @@ Suggests: rsyslog-mysql | rsyslog-pgsql, rsyslog-openssl, rsyslog-udpspoof, rsyslog-mmrm1stspace, - rsyslog-kafka, rsyslog-mmutf8fix, + rsyslog-kafka, rsyslog-omstdout, apparmor (>= 2.3) Description: a rocket-fast system for log processing @@ -149,13 +155,31 @@ Description: MongoDB output plugin for rsyslog # encrypted syslog messages. GSSAPI is commonly used for Kerberos # authentication. +Package: rsyslog-czmq +Architecture: any +Priority: optional +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}) +Description: ZeroMQ protocol support for rsyslog via CZMQ + These plugins allows rsyslog to send and receive ZeroMQ syslog + messages via the CZMQ library. + +Package: rsyslog-omclickhouse +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the omclickhouse rsyslog plugin + Package: rsyslog-relp Architecture: any Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends}, rsyslog (= ${binary:Version}), - librelp0 (>= 1.0.2) + librelp0 (>= 1.2.17) Description: RELP protocol support for rsyslog These plugins allows rsyslog to send and receive syslog messages via the RELP protocol. RELP ensures reliable transport over the network even on @@ -178,7 +202,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 @@ -226,6 +250,50 @@ Depends: ${shlibs:Depends}, liblognorm5 Description: Parse all fields of the message into structured data inside the JSON tree. +Package: rsyslog-mmgrok +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgrok1, + rsyslog (= ${binary:Version}), +Description: Provides the mmgrok rsyslog plugin + +Package: rsyslog-omrabbitmq +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + librabbitmq4, + rsyslog (= ${binary:Version}), +Description: Provides the omrabbitmq rsyslog plugin + +Package: rsyslog-imdocker +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgrok1, + rsyslog (= ${binary:Version}), +Description: Provides the imdocker rsyslog plugin + +Package: rsyslog-improg +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the improg rsyslog plugin + +Package: rsyslog-imkmsg +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the imkmsg rsyslog plugin which can be used to read structured + kernel logs. + Package: rsyslog-mmutf8fix Architecture: any Priority: extra @@ -245,6 +313,15 @@ Description: TLS protocol support for rsyslog This netstream plugin allows rsyslog to send and receive encrypted syslog messages via the upcoming syslog-transport-tls IETF standard protocol. +Package: rsyslog-udpspoof +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), + libnet-dev +Description: This module is similar to the regular UDP forwarder, but permits to spoof the sender address. + Package: rsyslog-openssl Architecture: any Priority: extra @@ -307,6 +384,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/master/debian/patches/series b/rsyslog/focal/master/debian/patches/series index d50e6bf7..f9fae80c 100644 --- a/rsyslog/focal/master/debian/patches/series +++ b/rsyslog/focal/master/debian/patches/series @@ -1,6 +1,5 @@ # Debian patches for rsyslog 01-dont_create_db.patch -02-rsyslog-systemd.patch # 0001-build-link-omelasticsearch-against-lm.patch # Ubuntu patches for rsyslog # 100-imuxsock-allow-missing-date.patch diff --git a/rsyslog/focal/master/debian/patches/series~ b/rsyslog/focal/master/debian/patches/series~ index f9fae80c..0dd66dbb 100644 --- a/rsyslog/focal/master/debian/patches/series~ +++ b/rsyslog/focal/master/debian/patches/series~ @@ -1,5 +1,7 @@ # Debian patches for rsyslog 01-dont_create_db.patch +02-rsyslog-systemd.patch +rsyslog-8.1907-revert-BSD-HUP.patch # 0001-build-link-omelasticsearch-against-lm.patch # Ubuntu patches for rsyslog # 100-imuxsock-allow-missing-date.patch diff --git a/rsyslog/focal/master/debian/rsyslog.install b/rsyslog/focal/master/debian/rsyslog.install index ddf33856..1f7047f9 100644 --- a/rsyslog/focal/master/debian/rsyslog.install +++ b/rsyslog/focal/master/debian/rsyslog.install @@ -9,6 +9,7 @@ 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/omuxsock.so debian/tmp/usr/lib/rsyslog/imjournal.so debian/tmp/usr/lib/rsyslog/lmnet.so debian/tmp/usr/lib/rsyslog/lmnetstrms.so diff --git a/rsyslog/focal/master/debian/rules b/rsyslog/focal/master/debian/rules index b78a2725..38c97f93 100755 --- a/rsyslog/focal/master/debian/rules +++ b/rsyslog/focal/master/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f DPKG_EXPORT_BUILDFLAGS = 1 +export DEB_BUILD_OPTIONS="parallel=4" include /usr/share/dpkg/buildflags.mk # the default LDFLAGS="-Wl,-Bsymbolic-functions" caused rsyslog to @@ -8,20 +9,30 @@ include /usr/share/dpkg/buildflags.mk unexport LDFLAGS %: - dh $@ --with autoreconf + dh $@ --parallel --with autoreconf #org dh $@ --with autotools_dev override_dh_auto_configure: dh_auto_configure -- \ - --libdir=/usr/lib \ --libexecdir=/usr/lib/rsyslog \ + --libdir=/usr/lib \ + --enable-kmsg \ + --enable-improg \ + --enable-imdocker \ + --enable-omrabbitmq \ + --enable-imczmq \ + --enable-omczmq \ + --enable-mmgrok \ + --enable-omuxsock \ --enable-mysql \ --enable-pgsql \ --enable-mail \ --enable-imfile \ + --enable-impcap \ --enable-impstats \ --enable-gnutls \ --enable-relp \ + --enable-clickhouse \ --enable-pmaixforwardedfrom \ --enable-pmcisconames \ --enable-pmlastmsg \ @@ -41,6 +52,7 @@ override_dh_auto_configure: --enable-pmciscoios \ --enable-pmnormalize \ --enable-usertools \ + --enable-omudpspoof \ --enable-imjournal \ --enable-omjournal \ --enable-mmrm1stspace \ @@ -49,14 +61,13 @@ override_dh_auto_configure: --enable-imkafka \ --enable-omhiredis \ --enable-omstdout \ - --enable-mmkubernetes \ --enable-openssl \ + --enable-mmkubernetes \ --disable-testbench \ --disable-liblogging-stdlog \ --with-systemdsystemunitdir=/lib/systemd/system # -# --enable-kafka-static \ # --enable-omkafka \ # --enable-guardtime \ # --enable-gt-ksi \ @@ -66,6 +77,7 @@ override_dh_auto_configure: # --enable-mmnormalize \ # --enable-imzmq3 \ # --enable-omzmq3 \ +# --enable-kafka-static \ override_dh_auto_install: dh_auto_install diff --git a/rsyslog/focal/v8-stable/debian/control b/rsyslog/focal/v8-stable/debian/control index 8475dbaf..9d0b115e 100644 --- a/rsyslog/focal/v8-stable/debian/control +++ b/rsyslog/focal/v8-stable/debian/control @@ -27,7 +27,6 @@ Build-Depends: debhelper (>= 12), libgnutls28-dev, pkg-config, dh-apparmor, - dh-systemd (>= 1.4), libcurl4-gnutls-dev, bison, libgcrypt-dev, diff --git a/rsyslog/groovy/master/debian/changelog b/rsyslog/groovy/master/debian/changelog index c722ea2d..21b0cdba 100644 --- a/rsyslog/groovy/master/debian/changelog +++ b/rsyslog/groovy/master/debian/changelog @@ -1,120 +1,149 @@ -rsyslog (8.28.0-0adiscon4zesty1) zesty; urgency=medium +rsyslog (8.2312.0-0adiscon1groovy1) groovy; urgency=medium - * Repack + * Packages for 8.2312.0 - -- Florian Riedl Thu, 20 Jul 2017 09:04:54 +0000 + -- Rainer Gerhards Thu, 12 Dec 2023 13:29:59 +0000 -rsyslog (8.28.0-0adiscon3zesty1) zesty; urgency=medium +rsyslog (8.2310.0-0adiscon1groovy1) groovy; urgency=medium - * Repack + * Packages for 8.2310.0 - -- Florian Riedl Wed, 19 Jul 2017 10:49:43 +0000 + -- Rainer Gerhards Thu, 10 Oct 2023 13:29:59 +0000 -rsyslog (8.28.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2308.0-0adiscon1groovy1) groovy; urgency=medium - * Enabled imkafka/omkafka + * Packages for 8.2308.0 - -- Florian Riedl Wed, 19 Jul 2017 08:07:15 +0000 + -- Rainer Gerhards Thu, 15 Aug 2023 13:29:59 +0000 -rsyslog (8.28.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2306.0-0adiscon1groovy1) groovy; urgency=medium - * package for 8.28.0 + * Packages for 8.2306.0 - -- Florian Riedl Tue, 18 Jul 2017 12:31:57 +0000 + -- Rainer Gerhards Thu, 20 Jun 2023 13:29:59 +0000 -rsyslog (8.27.0-0adiscon4zesty1) zesty; urgency=medium +rsyslog (8.2304.0-0adiscon1groovy1) groovy; urgency=medium - * Repack + * Packages for 8.2304.0 - -- Florian Riedl Wed, 17 May 2017 14:55:48 +0000 + -- Rainer Gerhards Thu, 18 Apr 2023 13:29:59 +0000 -rsyslog (8.27.0-0adiscon3zesty1) zesty; urgency=medium +rsyslog (8.2302.0-0adiscon1groovy1) groovy; urgency=medium - * Re-enabled omkafka + * Packages for 8.2302.0 - -- Florian Riedl Wed, 17 May 2017 10:29:27 +0000 + -- Rainer Gerhards Thu, 21 Feb 2023 13:29:59 +0000 -rsyslog (8.27.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2212.0-0adiscon1groovy1) groovy; urgency=medium - * Fixed disabled rules + * Packages for 8.2212.0 - -- Florian Riedl Tue, 16 May 2017 15:57:45 +0000 + -- Rainer Gerhards Thu, 06 Dec 2022 13:29:59 +0000 -rsyslog (8.27.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2210.0-0adiscon1groovy1) groovy; urgency=medium - * Packages for 8.27.0 - * Removed Kafka package for re-work + * Packages for 8.2210.0 - -- Florian Riedl Tue, 16 May 2017 15:43:33 +0000 + -- Rainer Gerhards Thu, 18 Oct 2022 13:29:59 +0000 -rsyslog (8.26.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2206.0-0adiscon1groovy1) groovy; urgency=medium - * Added modules pmnull and omkafka to the packages + * Packages for 8.2206.0 - -- Florian Riedl Thu, 13 Apr 2017 14:20:49 +0000 + -- Rainer Gerhards Thu, 14 Jun 2022 13:29:59 +0000 -rsyslog (8.26.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2204.1-0adiscon1groovy1) groovy; urgency=medium - * Packages for 8.26.0 + * Packages for 8.2204.1 - -- Florian Riedl Tue, 04 Apr 2017 13:10:26 +0000 + -- Rainer Gerhards Thu, 05 May 2022 13:29:59 +0000 -rsyslog (8.25.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2204.0-0adiscon1groovy1) groovy; urgency=medium - * Packages for 8.25.0 + * Packages for 8.2204.0 - -- Florian Riedl Tue, 21 Feb 2017 16:01:58 +0000 + -- Rainer Gerhards Thu, 19 Apr 2022 13:29:59 +0000 -rsyslog (8.24.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2202.0-0adiscon1groovy1) groovy; urgency=medium - * Added separate package for new module mmrm1stspace + * Packages for 8.2202.0 - -- Florian Riedl Thu, 02 Feb 2017 16:44:25 +0000 + -- Rainer Gerhards Thu, 15 Feb 2022 13:29:59 +0000 -rsyslog (8.24.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2110.0-0adiscon1groovy1) groovy; urgency=medium - * Packages for 8.24.0 + * Packages for 8.2110.0 - -- Florian Riedl Tue, 10 Jan 2017 13:31:00 +0000 + -- Rainer Gerhards Tue, 19 Oct 2021 10:17:34 +0000 -rsyslog (8.23.0-0adiscon1yakkety1) yakkety; urgency=medium +rsyslog (8.2108.0-0adiscon1groovy1) groovy; urgency=medium - * Packages for 8.23.0 + * Packages for 8.2108.0 - -- Florian Riedl Tue, 15 Nov 2016 16:51:21 +0000 + -- Rainer Gerhards Tue, 17 Aug 2021 10:17:34 +0000 -rsyslog (8.22.0-0adiscon1yakkety1) yakkety; urgency=medium +rsyslog (8.2106.0-0adiscon1groovy1) groovy; urgency=medium - * New packages for 8.22.0 + * Packages for 8.2106.0 - -- Florian Riedl Tue, 04 Oct 2016 15:03:04 +0000 + -- Rainer Gerhards Tue, 15 Jun 2021 12:55:50 +0000 -rsyslog (8.21.0-0adiscon1yakkety1) yakkety; urgency=medium +rsyslog (8.2104.0-0adiscon1groovy1) groovy; urgency=medium - * new upstream release - * disable liblogging-stdlog - We currently want to log by default by the syslog() API + * Packages for 8.2104.0 - -- Rainer Gerhards Tue, 23 Aug 2016 14:44:38 +0000 + -- Rainer Gerhards Mon, 19 Apr 2021 10:18:50 +0000 -rsyslog (8.20.0-0adiscon5yakkety1) yakkety; urgency=medium +rsyslog (8.2012.0-0adiscon1groovy1) groovy; urgency=medium - * fix dependencies + * Packages for 8.2012.0 - -- Rainer Gerhards Wed, 03 Aug 2016 08:20:34 +0000 + -- Florian Riedl Tue, 08 Dec 2020 10:18:50 +0000 -rsyslog (8.20.0-0adiscon4yakkety1) yakkety; urgency=medium +rsyslog (8.2010.0-0adiscon3groovy1) groovy; urgency=medium - * fix apparmor rules that could prevent startup - see also https://github.com/rsyslog/rsyslog-pkg-ubuntu/issues/48 - * yakkety seems to no longer provide libgnutls-dev but libgnutls28-dev - instead. Adjusted build dependency. + * Rebuild for librelp 1.9.0 - -- Rainer Gerhards Wed, 03 Aug 2016 06:38:34 +0000 + -- Florian Riedl Tue, 24 Nov 2020 15:54:22 +0000 -rsyslog (8.20.0-0adiscon3yakket1) yakkety; urgency=medium +rsyslog (8.2010.0-0adiscon2groovy1) groovy; urgency=medium - * initial release for yakkety - * add support for libfastjson 0.99.3, liblognorm 2.0.1 packages + * Disabled mmgrok - -- Rainer Gerhards Tue, 02 Aug 2016 12:14:09 +0000 + -- Florian Riedl Tue, 20 Oct 2020 12:35:58 +0000 + +rsyslog (8.2010.0-0adiscon1groovy1) groovy; urgency=medium + + * Packages for 8.2010.0 + + -- Florian Riedl Tue, 20 Oct 2020 09:30:13 +0000 + +rsyslog (8.2008.0-0adiscon2groovy1) groovy; urgency=medium + + * Rebuild for librelp 1.8.0 + + -- Florian Riedl Tue, 29 Sep 2020 20:38:07 +0000 + +rsyslog (8.2008.0-0adiscon1groovy1) groovy; urgency=medium + + * Packages for 8.2008.0 + + -- Rainer Gerhards Mon, 06 Jul 2020 09:24:57 +0000 + +rsyslog (8.2006.0-0adiscon2groovy1) groovy; urgency=medium + + * new subpackages + + -- Rainer Gerhards Mon, 06 Jul 2020 09:24:57 +0000 + +rsyslog (8.2006.0-0adiscon1groovy1) groovy; urgency=medium + + * Packages for 8.2006.0 + + -- Florian Riedl Tue, 23 Jun 2020 13:58:54 +0000 + +rsyslog (8.2004.0-0adiscon1groovy1) groovy; urgency=medium + + * Initial build for Ubuntu 20.10 + + -- Florian Riedl Thu, 28 May 2020 15:31:27 +0000 diff --git a/rsyslog/groovy/master/debian/compat b/rsyslog/groovy/master/debian/compat index 45a4fb75..ec635144 100644 --- a/rsyslog/groovy/master/debian/compat +++ b/rsyslog/groovy/master/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/rsyslog/groovy/master/debian/control b/rsyslog/groovy/master/debian/control index 60282733..1957e2eb 100644 --- a/rsyslog/groovy/master/debian/control +++ b/rsyslog/groovy/master/debian/control @@ -3,19 +3,25 @@ Section: admin Priority: important Maintainer: Andre Lorbach XSBC-Original-Maintainer: Michael Biebl -Build-Depends: debhelper (>= 8), +Build-Depends: debhelper (>= 12), dpkg-dev (>= 1.6.1), autotools-dev (>= 20100122.1), dh-autoreconf, + librabbitmq-dev, + librabbitmq4, + libczmq-dev (>= 4.0.0), zlib1g-dev, libmysqlclient-dev, libpq-dev, + libgrok-dev, + libgrok1, libmongoc-dev, - librelp-dev (>= 1.0.2), + librelp-dev (>= 1.2.17), libestr-dev (>= 0.1.2), liblognorm-dev (>= 1.0.0), - libfastjson-dev, + libfastjson-dev (>= 0.99.7), libglib2.0-dev, + libpcap-dev, uuid-dev, libkrb5-dev, libgnutls28-dev, @@ -25,7 +31,7 @@ Build-Depends: debhelper (>= 8), libcurl4-gnutls-dev, bison, libgcrypt-dev, - python-docutils, + python3-docutils, libsystemd-dev (>= 209) [linux-any], librdkafka-dev, liblz4-dev, @@ -49,7 +55,7 @@ Depends: ${shlibs:Depends}, lsb-base (>= 3.2-14), adduser, ucf, - libfastjson4 + libfastjson4 (>= 0.99.7) Recommends: logrotate Suggests: rsyslog-mysql | rsyslog-pgsql, rsyslog-doc, @@ -62,8 +68,8 @@ Suggests: rsyslog-mysql | rsyslog-pgsql, rsyslog-openssl, rsyslog-udpspoof, rsyslog-mmrm1stspace, - rsyslog-kafka, rsyslog-mmutf8fix, + rsyslog-kafka, rsyslog-omstdout, apparmor (>= 2.3) Description: a rocket-fast system for log processing @@ -98,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 @@ -149,13 +164,31 @@ Description: MongoDB output plugin for rsyslog # encrypted syslog messages. GSSAPI is commonly used for Kerberos # authentication. +Package: rsyslog-czmq +Architecture: any +Priority: optional +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}) +Description: ZeroMQ protocol support for rsyslog via CZMQ + These plugins allows rsyslog to send and receive ZeroMQ syslog + messages via the CZMQ library. + +Package: rsyslog-omclickhouse +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the omclickhouse rsyslog plugin + Package: rsyslog-relp Architecture: any Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends}, rsyslog (= ${binary:Version}), - librelp0 (>= 1.0.2) + librelp0 (>= 1.2.17) Description: RELP protocol support for rsyslog These plugins allows rsyslog to send and receive syslog messages via the RELP protocol. RELP ensures reliable transport over the network even on @@ -178,7 +211,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 @@ -226,6 +259,50 @@ Depends: ${shlibs:Depends}, liblognorm5 Description: Parse all fields of the message into structured data inside the JSON tree. +#Package: rsyslog-mmgrok +#Architecture: any +#Priority: extra +#Depends: ${shlibs:Depends}, +# ${misc:Depends}, +# libgrok1, +# rsyslog (= ${binary:Version}), +#Description: Provides the mmgrok rsyslog plugin + +Package: rsyslog-omrabbitmq +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + librabbitmq4, + rsyslog (= ${binary:Version}), +Description: Provides the omrabbitmq rsyslog plugin + +Package: rsyslog-imdocker +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgrok1, + rsyslog (= ${binary:Version}), +Description: Provides the imdocker rsyslog plugin + +Package: rsyslog-improg +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the improg rsyslog plugin + +Package: rsyslog-imkmsg +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the imkmsg rsyslog plugin which can be used to read structured + kernel logs. + Package: rsyslog-mmutf8fix Architecture: any Priority: extra diff --git a/rsyslog/groovy/master/debian/patches/series b/rsyslog/groovy/master/debian/patches/series index d50e6bf7..f9fae80c 100644 --- a/rsyslog/groovy/master/debian/patches/series +++ b/rsyslog/groovy/master/debian/patches/series @@ -1,6 +1,5 @@ # Debian patches for rsyslog 01-dont_create_db.patch -02-rsyslog-systemd.patch # 0001-build-link-omelasticsearch-against-lm.patch # Ubuntu patches for rsyslog # 100-imuxsock-allow-missing-date.patch diff --git a/rsyslog/groovy/master/debian/patches/series~ b/rsyslog/groovy/master/debian/patches/series~ index f9fae80c..0dd66dbb 100644 --- a/rsyslog/groovy/master/debian/patches/series~ +++ b/rsyslog/groovy/master/debian/patches/series~ @@ -1,5 +1,7 @@ # Debian patches for rsyslog 01-dont_create_db.patch +02-rsyslog-systemd.patch +rsyslog-8.1907-revert-BSD-HUP.patch # 0001-build-link-omelasticsearch-against-lm.patch # Ubuntu patches for rsyslog # 100-imuxsock-allow-missing-date.patch diff --git a/rsyslog/groovy/master/debian/rsyslog.install b/rsyslog/groovy/master/debian/rsyslog.install index ddf33856..1f7047f9 100644 --- a/rsyslog/groovy/master/debian/rsyslog.install +++ b/rsyslog/groovy/master/debian/rsyslog.install @@ -9,6 +9,7 @@ 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/omuxsock.so debian/tmp/usr/lib/rsyslog/imjournal.so debian/tmp/usr/lib/rsyslog/lmnet.so debian/tmp/usr/lib/rsyslog/lmnetstrms.so diff --git a/rsyslog/groovy/master/debian/rules b/rsyslog/groovy/master/debian/rules index b78a2725..4bba3213 100755 --- a/rsyslog/groovy/master/debian/rules +++ b/rsyslog/groovy/master/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f DPKG_EXPORT_BUILDFLAGS = 1 +export DEB_BUILD_OPTIONS="parallel=4" include /usr/share/dpkg/buildflags.mk # the default LDFLAGS="-Wl,-Bsymbolic-functions" caused rsyslog to @@ -8,13 +9,19 @@ include /usr/share/dpkg/buildflags.mk unexport LDFLAGS %: - dh $@ --with autoreconf + dh $@ --parallel --with autoreconf #org dh $@ --with autotools_dev override_dh_auto_configure: dh_auto_configure -- \ - --libdir=/usr/lib \ --libexecdir=/usr/lib/rsyslog \ + --libdir=/usr/lib \ + --enable-improg \ + --enable-impcap \ + --enable-imdocker \ + --enable-omrabbitmq \ + --enable-imczmq \ + --enable-omczmq \ --enable-mysql \ --enable-pgsql \ --enable-mail \ @@ -22,6 +29,7 @@ override_dh_auto_configure: --enable-impstats \ --enable-gnutls \ --enable-relp \ + --enable-clickhouse \ --enable-pmaixforwardedfrom \ --enable-pmcisconames \ --enable-pmlastmsg \ @@ -41,6 +49,8 @@ override_dh_auto_configure: --enable-pmciscoios \ --enable-pmnormalize \ --enable-usertools \ + --enable-kmsg \ + --enable-omuxsock \ --enable-imjournal \ --enable-omjournal \ --enable-mmrm1stspace \ @@ -49,14 +59,14 @@ override_dh_auto_configure: --enable-imkafka \ --enable-omhiredis \ --enable-omstdout \ - --enable-mmkubernetes \ --enable-openssl \ + --enable-mmkubernetes \ --disable-testbench \ --disable-liblogging-stdlog \ --with-systemdsystemunitdir=/lib/systemd/system +# --enable-mmgrok \ # -# --enable-kafka-static \ # --enable-omkafka \ # --enable-guardtime \ # --enable-gt-ksi \ @@ -66,6 +76,7 @@ override_dh_auto_configure: # --enable-mmnormalize \ # --enable-imzmq3 \ # --enable-omzmq3 \ +# --enable-kafka-static \ override_dh_auto_install: dh_auto_install diff --git a/rsyslog/jammy/master/debian/changelog b/rsyslog/jammy/master/debian/changelog index c722ea2d..8fbf3608 100644 --- a/rsyslog/jammy/master/debian/changelog +++ b/rsyslog/jammy/master/debian/changelog @@ -1,120 +1,77 @@ -rsyslog (8.28.0-0adiscon4zesty1) zesty; urgency=medium +rsyslog (8.2312.0-0adiscon3jammy1) jammy; urgency=medium - * Repack + * Packages for 8.2312.0 - -- Florian Riedl Thu, 20 Jul 2017 09:04:54 +0000 + -- Rainer Gerhards Thu, 12 Dec 2023 13:29:59 +0000 -rsyslog (8.28.0-0adiscon3zesty1) zesty; urgency=medium +rsyslog (8.2310.0-0adiscon3jammy1) jammy; urgency=medium - * Repack + * Packages for 8.2310.0 - -- Florian Riedl Wed, 19 Jul 2017 10:49:43 +0000 + -- Rainer Gerhards Thu, 10 Oct 2023 13:29:59 +0000 -rsyslog (8.28.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2308.0-0adiscon3jammy1) jammy; urgency=medium - * Enabled imkafka/omkafka + * Packages for 8.2308.0 - -- Florian Riedl Wed, 19 Jul 2017 08:07:15 +0000 + -- Rainer Gerhards Thu, 15 Aug 2023 13:29:59 +0000 -rsyslog (8.28.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2306.0-0adiscon3jammy1) jammy; urgency=medium - * package for 8.28.0 + * Packages for 8.2306.0 - -- Florian Riedl Tue, 18 Jul 2017 12:31:57 +0000 + -- Rainer Gerhards Thu, 20 Jun 2023 13:29:59 +0000 -rsyslog (8.27.0-0adiscon4zesty1) zesty; urgency=medium +rsyslog (8.2304.0-0adiscon3jammy1) jammy; urgency=medium - * Repack + * Packages for 8.2304.0 - -- Florian Riedl Wed, 17 May 2017 14:55:48 +0000 + -- Rainer Gerhards Thu, 18 Apr 2023 13:29:59 +0000 -rsyslog (8.27.0-0adiscon3zesty1) zesty; urgency=medium +rsyslog (8.2302.0-0adiscon3jammy1) jammy; urgency=medium - * Re-enabled omkafka + * Packages for 8.2302.0 - -- Florian Riedl Wed, 17 May 2017 10:29:27 +0000 + -- Rainer Gerhards Thu, 21 Feb 2023 13:29:59 +0000 -rsyslog (8.27.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2212.0-0adiscon3jammy1) jammy; urgency=medium - * Fixed disabled rules + * Packages for 8.2212.0 - -- Florian Riedl Tue, 16 May 2017 15:57:45 +0000 + -- Rainer Gerhards Thu, 06 Dec 2022 13:29:59 +0000 -rsyslog (8.27.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2210.0-0adiscon3jammy1) jammy; urgency=medium - * Packages for 8.27.0 - * Removed Kafka package for re-work + * Packages for 8.2210.0 - -- Florian Riedl Tue, 16 May 2017 15:43:33 +0000 + -- Rainer Gerhards Thu, 18 Oct 2022 13:29:59 +0000 -rsyslog (8.26.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2206.0-0adiscon3jammy1) jammy; urgency=medium - * Added modules pmnull and omkafka to the packages + * Packages for 8.2206.0 - -- Florian Riedl Thu, 13 Apr 2017 14:20:49 +0000 + -- Rainer Gerhards Thu, 14 Jun 2022 13:29:59 +0000 -rsyslog (8.26.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2204.1-0adiscon3jammy1) jammy; urgency=medium - * Packages for 8.26.0 + * Packages for 8.2204.1 - -- Florian Riedl Tue, 04 Apr 2017 13:10:26 +0000 + -- Rainer Gerhards Thu, 05 May 2022 13:29:59 +0000 -rsyslog (8.25.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2204.0-0adiscon1jammy1) jammy; urgency=medium - * Packages for 8.25.0 + * Packages for 8.2204.0 - -- Florian Riedl Tue, 21 Feb 2017 16:01:58 +0000 + -- Florian Riedl Tue, 19 Apr 2022 13:15:02 +0000 -rsyslog (8.24.0-0adiscon2zesty1) zesty; urgency=medium +rsyslog (8.2202.0-0adiscon3jammy1) jammy; urgency=medium - * Added separate package for new module mmrm1stspace + * Disabled mmgrok for Jammy due to build error - -- Florian Riedl Thu, 02 Feb 2017 16:44:25 +0000 + -- Florian Riedl Fri, 25 Mar 2022 11:23:51 +0000 -rsyslog (8.24.0-0adiscon1zesty1) zesty; urgency=medium +rsyslog (8.2202.0-0adiscon2jammy1) jammy; urgency=medium - * Packages for 8.24.0 + * Initial Packages for Ubuntu 22.04 Jammy - -- Florian Riedl Tue, 10 Jan 2017 13:31:00 +0000 - -rsyslog (8.23.0-0adiscon1yakkety1) yakkety; urgency=medium - - * Packages for 8.23.0 - - -- Florian Riedl Tue, 15 Nov 2016 16:51:21 +0000 - -rsyslog (8.22.0-0adiscon1yakkety1) yakkety; urgency=medium - - * New packages for 8.22.0 - - -- Florian Riedl Tue, 04 Oct 2016 15:03:04 +0000 - -rsyslog (8.21.0-0adiscon1yakkety1) yakkety; urgency=medium - - * new upstream release - * disable liblogging-stdlog - We currently want to log by default by the syslog() API - - -- Rainer Gerhards Tue, 23 Aug 2016 14:44:38 +0000 - -rsyslog (8.20.0-0adiscon5yakkety1) yakkety; urgency=medium - - * fix dependencies - - -- Rainer Gerhards Wed, 03 Aug 2016 08:20:34 +0000 - -rsyslog (8.20.0-0adiscon4yakkety1) yakkety; urgency=medium - - * fix apparmor rules that could prevent startup - see also https://github.com/rsyslog/rsyslog-pkg-ubuntu/issues/48 - * yakkety seems to no longer provide libgnutls-dev but libgnutls28-dev - instead. Adjusted build dependency. - - -- Rainer Gerhards Wed, 03 Aug 2016 06:38:34 +0000 - -rsyslog (8.20.0-0adiscon3yakket1) yakkety; urgency=medium - - * initial release for yakkety - * add support for libfastjson 0.99.3, liblognorm 2.0.1 packages - - -- Rainer Gerhards Tue, 02 Aug 2016 12:14:09 +0000 + -- Florian Riedl Fri, 25 Mar 2022 10:46:13 +0000 diff --git a/rsyslog/jammy/master/debian/compat b/rsyslog/jammy/master/debian/compat index 45a4fb75..ec635144 100644 --- a/rsyslog/jammy/master/debian/compat +++ b/rsyslog/jammy/master/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/rsyslog/jammy/master/debian/control b/rsyslog/jammy/master/debian/control index ecf4c67b..923f02d6 100644 --- a/rsyslog/jammy/master/debian/control +++ b/rsyslog/jammy/master/debian/control @@ -3,35 +3,42 @@ Section: admin Priority: important Maintainer: Andre Lorbach XSBC-Original-Maintainer: Michael Biebl -Build-Depends: debhelper (>= 8), +Build-Depends: debhelper (>= 12), dpkg-dev (>= 1.6.1), autotools-dev (>= 20100122.1), + libczmq-dev (>= 4.0.0), dh-autoreconf, + librabbitmq-dev, + librabbitmq4, zlib1g-dev, libmysqlclient-dev, + libgrok1, + libgrok-dev, libpq-dev, libmongoc-dev, - librelp-dev (>= 1.0.2), + librelp-dev (>= 1.2.17), libestr-dev (>= 0.1.2), liblognorm-dev (>= 1.0.0), - libfastjson-dev, + libfastjson-dev (>= 0.99.7), libglib2.0-dev, + libpcap-dev, uuid-dev, libkrb5-dev, libgnutls28-dev, pkg-config, dh-apparmor, - dh-systemd (>= 1.4), libcurl4-gnutls-dev, bison, libgcrypt-dev, - python-docutils, + python3-docutils, libsystemd-dev (>= 209) [linux-any], librdkafka-dev, liblz4-dev, libsasl2-dev, libssl-dev, - libhiredis-dev + libhiredis-dev, + util-linux, + libnet-dev Standards-Version: 3.9.2 XSBC-Original-Vcs-Git: git://git.debian.org/git/collab-maint/rsyslog.git XSBC-Original-Vcs-Browser: http://git.debian.org/?p=collab-maint/rsyslog.git;a=summary @@ -49,7 +56,7 @@ Depends: ${shlibs:Depends}, lsb-base (>= 3.2-14), adduser, ucf, - libfastjson4 + libfastjson4 (>= 0.99.7) Recommends: logrotate Suggests: rsyslog-mysql | rsyslog-pgsql, rsyslog-doc, @@ -62,8 +69,8 @@ Suggests: rsyslog-mysql | rsyslog-pgsql, rsyslog-openssl, rsyslog-udpspoof, rsyslog-mmrm1stspace, - rsyslog-kafka, rsyslog-mmutf8fix, + rsyslog-kafka, rsyslog-omstdout, apparmor (>= 2.3) Description: a rocket-fast system for log processing @@ -149,13 +156,31 @@ Description: MongoDB output plugin for rsyslog # encrypted syslog messages. GSSAPI is commonly used for Kerberos # authentication. +Package: rsyslog-czmq +Architecture: any +Priority: optional +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}) +Description: ZeroMQ protocol support for rsyslog via CZMQ + These plugins allows rsyslog to send and receive ZeroMQ syslog + messages via the CZMQ library. + +Package: rsyslog-omclickhouse +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the omclickhouse rsyslog plugin + Package: rsyslog-relp Architecture: any Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends}, rsyslog (= ${binary:Version}), - librelp0 (>= 1.0.2) + librelp0 (>= 1.2.17) Description: RELP protocol support for rsyslog These plugins allows rsyslog to send and receive syslog messages via the RELP protocol. RELP ensures reliable transport over the network even on @@ -178,7 +203,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 @@ -226,6 +251,51 @@ Depends: ${shlibs:Depends}, liblognorm5 Description: Parse all fields of the message into structured data inside the JSON tree. +#Package: rsyslog-mmgrok +#Architecture: any +#Priority: extra +#Depends: ${shlibs:Depends}, +# ${misc:Depends}, +# libgrok1, +# rsyslog (= ${binary:Version}), +#Description: Provides the mmgrok rsyslog plugin + + +Package: rsyslog-omrabbitmq +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + librabbitmq4, + rsyslog (= ${binary:Version}), +Description: Provides the omrabbitmq rsyslog plugin + +Package: rsyslog-imdocker +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgrok1, + rsyslog (= ${binary:Version}), +Description: Provides the imdocker rsyslog plugin + +Package: rsyslog-improg +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the improg rsyslog plugin + +Package: rsyslog-imkmsg +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the imkmsg rsyslog plugin which can be used to read structured + kernel logs. + Package: rsyslog-mmutf8fix Architecture: any Priority: extra @@ -245,6 +315,15 @@ Description: TLS protocol support for rsyslog This netstream plugin allows rsyslog to send and receive encrypted syslog messages via the upcoming syslog-transport-tls IETF standard protocol. +Package: rsyslog-udpspoof +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), + libnet-dev +Description: This module is similar to the regular UDP forwarder, but permits to spoof the sender address. + Package: rsyslog-openssl Architecture: any Priority: extra @@ -307,6 +386,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/jammy/master/debian/patches/series b/rsyslog/jammy/master/debian/patches/series index d50e6bf7..f9fae80c 100644 --- a/rsyslog/jammy/master/debian/patches/series +++ b/rsyslog/jammy/master/debian/patches/series @@ -1,6 +1,5 @@ # Debian patches for rsyslog 01-dont_create_db.patch -02-rsyslog-systemd.patch # 0001-build-link-omelasticsearch-against-lm.patch # Ubuntu patches for rsyslog # 100-imuxsock-allow-missing-date.patch diff --git a/rsyslog/jammy/master/debian/rsyslog.install b/rsyslog/jammy/master/debian/rsyslog.install index ddf33856..1f7047f9 100644 --- a/rsyslog/jammy/master/debian/rsyslog.install +++ b/rsyslog/jammy/master/debian/rsyslog.install @@ -9,6 +9,7 @@ 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/omuxsock.so debian/tmp/usr/lib/rsyslog/imjournal.so debian/tmp/usr/lib/rsyslog/lmnet.so debian/tmp/usr/lib/rsyslog/lmnetstrms.so diff --git a/rsyslog/jammy/master/debian/rules b/rsyslog/jammy/master/debian/rules index b78a2725..6ecd786d 100755 --- a/rsyslog/jammy/master/debian/rules +++ b/rsyslog/jammy/master/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f DPKG_EXPORT_BUILDFLAGS = 1 +export DEB_BUILD_OPTIONS="parallel=4" include /usr/share/dpkg/buildflags.mk # the default LDFLAGS="-Wl,-Bsymbolic-functions" caused rsyslog to @@ -8,20 +9,29 @@ include /usr/share/dpkg/buildflags.mk unexport LDFLAGS %: - dh $@ --with autoreconf + dh $@ --parallel --with autoreconf #org dh $@ --with autotools_dev override_dh_auto_configure: dh_auto_configure -- \ - --libdir=/usr/lib \ --libexecdir=/usr/lib/rsyslog \ + --libdir=/usr/lib \ + --enable-kmsg \ + --enable-improg \ + --enable-imdocker \ + --enable-omrabbitmq \ + --enable-imczmq \ + --enable-omczmq \ + --enable-omuxsock \ --enable-mysql \ --enable-pgsql \ --enable-mail \ --enable-imfile \ + --enable-impcap \ --enable-impstats \ --enable-gnutls \ --enable-relp \ + --enable-clickhouse \ --enable-pmaixforwardedfrom \ --enable-pmcisconames \ --enable-pmlastmsg \ @@ -41,6 +51,7 @@ override_dh_auto_configure: --enable-pmciscoios \ --enable-pmnormalize \ --enable-usertools \ + --enable-omudpspoof \ --enable-imjournal \ --enable-omjournal \ --enable-mmrm1stspace \ @@ -49,14 +60,13 @@ override_dh_auto_configure: --enable-imkafka \ --enable-omhiredis \ --enable-omstdout \ - --enable-mmkubernetes \ --enable-openssl \ + --enable-mmkubernetes \ --disable-testbench \ --disable-liblogging-stdlog \ --with-systemdsystemunitdir=/lib/systemd/system # -# --enable-kafka-static \ # --enable-omkafka \ # --enable-guardtime \ # --enable-gt-ksi \ @@ -66,6 +76,8 @@ override_dh_auto_configure: # --enable-mmnormalize \ # --enable-imzmq3 \ # --enable-omzmq3 \ +# --enable-kafka-static \ +# --enable-mmgrok \ override_dh_auto_install: dh_auto_install diff --git a/rsyslog/jammy/v8-stable/debian/control b/rsyslog/jammy/v8-stable/debian/control index 547def32..923f02d6 100644 --- a/rsyslog/jammy/v8-stable/debian/control +++ b/rsyslog/jammy/v8-stable/debian/control @@ -39,7 +39,6 @@ Build-Depends: debhelper (>= 12), libhiredis-dev, util-linux, libnet-dev -# dh-systemd (>= 1.4), Standards-Version: 3.9.2 XSBC-Original-Vcs-Git: git://git.debian.org/git/collab-maint/rsyslog.git XSBC-Original-Vcs-Browser: http://git.debian.org/?p=collab-maint/rsyslog.git;a=summary diff --git a/rsyslog/trusty/master/debian/changelog b/rsyslog/trusty/master/debian/changelog index 9b2d8ae9..48441169 100644 --- a/rsyslog/trusty/master/debian/changelog +++ b/rsyslog/trusty/master/debian/changelog @@ -1,3 +1,461 @@ +rsyslog (8.2312.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2312.0 + + -- Rainer Gerhards Thu, 12 Dec 2023 13:29:59 +0000 + +rsyslog (8.2310.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2310.0 + + -- Rainer Gerhards Thu, 10 Oct 2023 13:29:59 +0000 + +rsyslog (8.2308.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2308.0 + + -- Rainer Gerhards Thu, 15 Aug 2023 13:29:59 +0000 + +rsyslog (8.2306.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2306.0 + + -- Rainer Gerhards Thu, 20 Jun 2023 13:29:59 +0000 + +rsyslog (8.2304.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2304.0 + + -- Rainer Gerhards Thu, 18 Apr 2023 13:29:59 +0000 + +rsyslog (8.2302.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2302.0 + + -- Rainer Gerhards Thu, 21 Feb 2023 13:29:59 +0000 + +rsyslog (8.2212.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2212.0 + + -- Rainer Gerhards Thu, 06 Dec 2022 13:29:59 +0000 + +rsyslog (8.2210.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2210.0 + + -- Rainer Gerhards Thu, 18 Oct 2022 13:29:59 +0000 + +rsyslog (8.2206.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2206.0 + + -- Rainer Gerhards Thu, 14 Jun 2022 13:29:59 +0000 + +rsyslog (8.2204.1-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2204.1 + + -- Rainer Gerhards Thu, 05 May 2022 13:29:59 +0000 + +rsyslog (8.2204.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2204.0 + + -- Rainer Gerhards Thu, 19 Apr 2022 13:29:59 +0000 + +rsyslog (8.2202.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2202.0 + + -- Rainer Gerhards Thu, 15 Feb 2022 13:29:59 +0000 + +rsyslog (8.2112.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2112.0 + + -- Florian Riedl Thu, 16 Dec 2021 13:28:18 +0000 + +rsyslog (8.2110.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2110.0 + + -- Rainer Gerhards Tue, 19 Oct 2021 10:17:34 +0000 + +rsyslog (8.2108.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2108.0 + + -- Rainer Gerhards Tue, 17 Aug 2021 10:17:34 +0000 + +rsyslog (8.2106.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2106.0 + + -- Rainer Gerhards Tue, 15 Jun 2021 10:18:50 +0000 + +rsyslog (8.2104.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2104.0 + + -- Rainer Gerhards Mon, 19 Apr 2021 10:18:50 +0000 + +rsyslog (8.2012.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2012.0 + + -- Florian Riedl Tue, 08 Dec 2020 10:11:37 +0000 + +rsyslog (8.2010.0-0adiscon2trusty1) trusty; urgency=medium + + * Rebuild for librelp 1.9.0 + + -- Florian Riedl Tue, 24 Nov 2020 15:52:03 +0000 + +rsyslog (8.2010.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2010.0 + + -- Florian Riedl Tue, 20 Oct 2020 09:27:33 +0000 + +rsyslog (8.2008.0-0adiscon2trusty1) trusty; urgency=medium + + * Rebuild for librelp 1.8.0 + + -- Florian Riedl Tue, 29 Sep 2020 20:35:46 +0000 + +rsyslog (8.2008.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2008.0 + + -- Rainer Gerhards Mon, 06 Jul 2020 09:24:57 +0000 + +rsyslog (8.2006.0-0adiscon2trusty1) trusty; urgency=medium + + * new subpackages + + -- Rainer Gerhards Mon, 06 Jul 2020 09:24:57 +0000 + +rsyslog (8.2006.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2006.0 + + -- Florian Riedl Tue, 23 Jun 2020 13:55:31 +0000 + +rsyslog (8.2004.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2004.0 + + -- Florian Riedl Tue, 28 Apr 2020 12:56:45 +0000 + +rsyslog (8.2002.0-0adiscon3trusty1) trusty; urgency=medium + + * Disabled redis support because of inability to build + + -- Florian Riedl Tue, 25 Feb 2020 15:34:17 +0000 + +rsyslog (8.2002.0-0adiscon2trusty1) trusty; urgency=medium + + * Repack of 8.2002.0 + + -- Florian Riedl Tue, 25 Feb 2020 15:14:47 +0000 + +rsyslog (8.2002.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2002.0 + + -- Florian Riedl Tue, 25 Feb 2020 14:39:33 +0000 + +rsyslog (8.2001.0-0adiscon2trusty1) trusty; urgency=medium + + * Repack of 8.2001.0 + + -- Florian Riedl Wed, 15 Jan 2020 08:55:20 +0000 + +rsyslog (8.2001.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.2001.0 + + -- Florian Riedl Tue, 14 Jan 2020 16:11:56 +0000 + +rsyslog (8.1911.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.1911.0 + + -- Florian Riedl Tue, 12 Nov 2019 09:41:15 +0000 + +rsyslog (8.1910.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.1910.0 + + -- Florian Riedl Tue, 01 Oct 2019 08:30:03 +0000 + +rsyslog (8.1908.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.1908.0 + + -- Florian Riedl Tue, 20 Aug 2019 09:24:30 +0000 + +rsyslog (8.1907.0-0adiscon2trusty1) trusty; urgency=medium + + * Added patch to revert BSD HUP fix + Ref: https://github.com/rsyslog/rsyslog/issues/3760 + + -- Florian Riedl Tue, 30 Jul 2019 09:33:12 +0000 + +rsyslog (8.1907.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.1907.0 + + -- Florian Riedl Tue, 09 Jul 2019 10:14:34 +0000 + +rsyslog (8.1905.0-0adiscon2trusty1) trusty; urgency=medium + + * Added patch for fix in queue subsystem + closes: https://github.com/rsyslog/rsyslog/issues/3681 + + -- Florian Riedl Mon, 03 Jun 2019 14:49:39 +0000 + +rsyslog (8.1905.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.1905.0 + + -- Florian Riedl Tue, 28 May 2019 09:14:02 +0000 + +rsyslog (8.1904.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.1904.0 + + -- Florian Riedl Wed, 17 Apr 2019 10:19:57 +0000 + +rsyslog (8.1903.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.1903.0 + + -- Florian Riedl Tue, 05 Mar 2019 15:01:15 +0000 + +rsyslog (8.1901.0-0adiscon2trusty1) trusty; urgency=medium + + * Removed dependency for liblogging-stdlog. Ref: https://github.com/rsyslog/rsyslog-pkg-ubuntu/is$ + + -- Florian Riedl Fri, 08 Feb 2019 10:55:44 +0000 + +rsyslog (8.1901.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.1901.0 + + -- Florian Riedl Tue, 22 Jan 2019 11:12:06 +0000 + +rsyslog (8.40.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.40.0 + + -- Florian Riedl Tue, 11 Dec 2018 11:26:38 +0000 + +rsyslog (8.39.0-0adiscon5trusty1) trusty; urgency=medium + + * Added patch to fix imfile resend issue + Fixes: https://github.com/rsyslog/rsyslog/issues/3249 + + -- Florian Riedl Tue, 13 Nov 2018 11:44:03 +0000 + +rsyslog (8.39.0-0adiscon4trusty1) trusty; urgency=medium + + * Rebuild for liblognorm 2.0.6 + + -- Florian Riedl Wed, 07 Nov 2018 14:42:15 +0000 + +rsyslog (8.39.0-0adiscon3trusty1) trusty; urgency=medium + + * Rebuild for fixed Kafka dependency + + -- Florian Riedl Wed, 31 Oct 2018 09:44:34 +0000 + +rsyslog (8.39.0-0adiscon2trusty1) trusty; urgency=medium + + * Rebuild without missing and unused files + + -- Florian Riedl Tue, 30 Oct 2018 14:33:50 +0000 + +rsyslog (8.39.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.39.0 + + -- Florian Riedl Tue, 30 Oct 2018 14:04:08 +0000 + +rsyslog (8.38.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.38.0 + + -- Florian Riedl Tue, 18 Sep 2018 10:24:37 +0000 + +rsyslog (8.37.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.37.0 + + -- Florian Riedl Tue, 07 Aug 2018 10:29:38 +0000 + +rsyslog (8.36.0-0adiscon5trusty1) trusty; urgency=medium + + * Updated librelp dependency + * Updated Kafka dependency + + -- Florian Riedl Thu, 02 Aug 2018 13:01:59 +0000 + +rsyslog (8.36.0-0adiscon4trusty1) trusty; urgency=medium + + * Rebuilt packages to undo new Kafka dependency + + -- Florian Riedl Fri, 27 Jul 2018 13:08:24 +0000 + +rsyslog (8.36.0-0adiscon3trusty1) trusty; urgency=medium + + * Rebuilt packages for updated Kafka dependency + + -- Florian Riedl Wed, 25 Jul 2018 08:46:44 +0000 + +rsyslog (8.36.0-0adiscon2trusty1) trusty; urgency=medium + + * Added sub-package rsyslog-openssl for OpenSSL TLS support + + -- Florian Riedl Wed, 27 Jun 2018 14:34:53 +0000 + +rsyslog (8.36.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.36.0 + * Removed imrelp patch + + -- Florian Riedl Tue, 26 Jun 2018 10:55:55 +0000 + +rsyslog (8.35.0-0adiscon3trusty1) trusty; urgency=medium + + * Rebuild for imrelp patch + + -- Florian Riedl Fri, 18 May 2018 14:40:39 +0000 + +rsyslog (8.35.0-0adiscon2trusty1) trusty; urgency=medium + + * Rebuild for missing control information + + -- Florian Riedl Tue, 15 May 2018 10:43:22 +0000 + +rsyslog (8.35.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.35.0 + * Added package rsyslog-fmhash + + -- Florian Riedl Tue, 15 May 2018 10:40:20 +0000 + +rsyslog (8.34.0-0adiscon3trusty1) trusty; urgency=medium + + * Rebuild of rsyslog 8.34.0 for updated Kafka support library + + -- Florian Riedl Wed, 04 Apr 2018 12:15:59 +0000 + +rsyslog (8.34.0-0adiscon2trusty1) trusty; urgency=medium + + * Rebuild + + -- Florian Riedl Tue, 03 Apr 2018 15:15:52 +0000 + +rsyslog (8.34.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.34.0 + * Added package rsyslog-mmkubernetes + * Added package rsyslog-fmhttp + + -- Florian Riedl Tue, 03 Apr 2018 15:12:28 +0000 + +rsyslog (8.33.1-0adiscon2trusty1) trusty; urgency=medium + + * New librelp dependency + + -- Florian Riedl Wed, 21 Mar 2018 15:43:32 +0000 + +rsyslog (8.33.1-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.33.1 + + -- Florian Riedl Tue, 06 Mar 2018 11:39:13 +0000 + +rsyslog (8.33.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.33.0 + * Removed patches from previous build + + -- Florian Riedl Tue, 20 Feb 2018 12:44:57 +0000 + +rsyslog (8.32.0-0adiscon3trusty1) trusty; urgency=medium + + * Added patch for external cmd parser + ref: https://github.com/rsyslog/rsyslog/pull/2410 + + -- Florian Riedl Fri, 19 Jan 2018 12:00:46 +0000 + +rsyslog (8.32.0-0adiscon2trusty1) trusty; urgency=medium + + * Added patches for json processing in rainerscript and jsonmesg + fixes: https://github.com/rsyslog/rsyslog/issues/2391 + fixes: https://github.com/rsyslog/rsyslog/issues/2396 + + -- Florian Riedl Wed, 17 Jan 2018 16:41:49 +0000 + +rsyslog (8.32.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.32.0 + * New sub-package for omstdout + + -- Florian Riedl Fri, 12 Jan 2018 11:29:12 +0000 + +rsyslog (8.31.0-0adiscon3trusty1) trusty; urgency=medium + + * Fixed error in logrotate script + + -- Florian Riedl Wed, 29 Nov 2017 16:35:31 +0000 + +rsyslog (8.31.0-0adiscon2trusty1) trusty; urgency=medium + + * Updated Kafka library + + -- Florian Riedl Tue, 28 Nov 2017 10:24:03 +0000 + +rsyslog (8.31.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.31.0 + * Disabled MongoDB package because of dependency change + + -- Florian Riedl Tue, 28 Nov 2017 09:45:09 +0000 + +rsyslog (8.30.0-0adiscon2trusty1) trusty; urgency=medium + + * Dependency fix + + -- Florian Riedl Wed, 18 Oct 2017 14:40:37 +0000 + +rsyslog (8.30.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.30.0 + + -- Florian Riedl Tue, 17 Oct 2017 09:52:24 +0000 + +rsyslog (8.29.0-0adiscon3trusty1) trusty; urgency=medium + + * Repack for new liblognorm version + + -- Florian Riedl Wed, 04 Oct 2017 14:58:41 +0000 + +rsyslog (8.29.0-0adiscon2trusty1) trusty; urgency=medium + + * Re-enabled mmutf8fix + + -- Florian Riedl Mon, 21 Aug 2017 12:34:28 +0000 + +rsyslog (8.29.0-0adiscon1trusty1) trusty; urgency=medium + + * Packages for 8.29.0 + + -- Florian Riedl Wed, 09 Aug 2017 08:48:12 +0000 + rsyslog (8.28.0-0adiscon11trusty1) trusty; urgency=medium * Repack diff --git a/rsyslog/trusty/master/debian/control b/rsyslog/trusty/master/debian/control index a4b82a09..b30e6b33 100644 --- a/rsyslog/trusty/master/debian/control +++ b/rsyslog/trusty/master/debian/control @@ -7,14 +7,17 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.6.1), autotools-dev (>= 20100122.1), dh-autoreconf, + libpcap-dev, + librabbitmq-dev, + librabbitmq1, zlib1g-dev, libmysqlclient-dev, libpq-dev, # libmongo-client-dev (>= 0.1.4), - librelp-dev (>= 1.0.2), + librelp-dev (>= 1.2.17), 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, @@ -25,11 +28,12 @@ Build-Depends: debhelper (>= 8), libcurl4-gnutls-dev, bison, python-docutils, + adisconhelperlrdk-dev, liblz4-dev, libsasl2-dev, libssl-dev, - libnet-dev, - adisconhelperlrdk-dev + libnet-dev +# libhiredis-dev Standards-Version: 3.9.2 XSBC-Original-Vcs-Git: git://git.debian.org/git/collab-maint/rsyslog.git XSBC-Original-Vcs-Browser: http://git.debian.org/?p=collab-maint/rsyslog.git;a=summary @@ -47,7 +51,7 @@ Depends: ${shlibs:Depends}, lsb-base (>= 3.2-14), adduser, ucf, - libfastjson4 + libfastjson4 (>= 0.99.7) Recommends: logrotate Suggests: rsyslog-mysql | rsyslog-pgsql, rsyslog-doc, @@ -146,13 +150,21 @@ Description: PostgreSQL output plugin for rsyslog # encrypted syslog messages. GSSAPI is commonly used for Kerberos # authentication. +Package: rsyslog-omclickhouse +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the omclickhouse rsyslog plugin + Package: rsyslog-relp Architecture: any Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends}, rsyslog (= ${binary:Version}), - librelp0 (>= 1.0.2) + librelp0 (>= 1.2.17) Description: RELP protocol support for rsyslog These plugins allows rsyslog to send and receive syslog messages via the RELP protocol. RELP ensures reliable transport over the network even on @@ -175,7 +187,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 @@ -223,6 +235,41 @@ Depends: ${shlibs:Depends}, liblognorm5 Description: Parse all fields of the message into structured data inside the JSON tree. +Package: rsyslog-omrabbitmq +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + librabbitmq1, + rsyslog (= ${binary:Version}), +Description: Provides the omrabbitmq rsyslog plugin + +Package: rsyslog-improg +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the improg rsyslog plugin + +Package: rsyslog-imkmsg +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +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 @@ -242,6 +289,15 @@ Description: TLS protocol support for rsyslog This netstream plugin allows rsyslog to send and receive encrypted syslog messages via the upcoming syslog-transport-tls IETF standard protocol. +Package: rsyslog-udpspoof +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), + libnet-dev +Description: This module is similar to the regular UDP forwarder, but permits to spoof the sender address. + Package: rsyslog-openssl Architecture: any Priority: extra @@ -253,15 +309,6 @@ Description: TLS protocol support for rsyslog This netstream plugin allows rsyslog to send and receive encrypted syslog messages via the upcoming syslog-transport-tls IETF standard protocol. -Package: rsyslog-udpspoof -Architecture: any -Priority: extra -Depends: ${shlibs:Depends}, - ${misc:Depends}, - rsyslog (= ${binary:Version}), - libnet-dev -Description: This module is similar to the regular UDP forwarder, but permits to spoof the sender address. - Package: rsyslog-utils Architecture: any Priority: extra @@ -303,6 +350,15 @@ Depends: ${shlibs:Depends}, libsasl2-2 Description: This module implements an Apache Kafka producer, permitting rsyslog to write data to Kafka. +#Package: rsyslog-redis +#Architecture: any +#Priority: extra +#Depends: ${shlibs:Depends}, +# ${misc:Depends}, +# rsyslog (= ${binary:Version}), +# libhiredis0.11 +#Description: This module implements Redis support, permitting ryslog to write to redis + Package: rsyslog-omstdout Architecture: any Priority: extra diff --git a/rsyslog/trusty/master/debian/rsyslog.install b/rsyslog/trusty/master/debian/rsyslog.install index 64360bca..665689d3 100644 --- a/rsyslog/trusty/master/debian/rsyslog.install +++ b/rsyslog/trusty/master/debian/rsyslog.install @@ -9,6 +9,7 @@ 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/omuxsock.so debian/tmp/usr/lib/rsyslog/lmnet.so debian/tmp/usr/lib/rsyslog/lmnetstrms.so debian/tmp/usr/lib/rsyslog/lmnsd_ptcp.so diff --git a/rsyslog/trusty/master/debian/rsyslog.logrotate b/rsyslog/trusty/master/debian/rsyslog.logrotate index 894cfa63..3ca2d129 100644 --- a/rsyslog/trusty/master/debian/rsyslog.logrotate +++ b/rsyslog/trusty/master/debian/rsyslog.logrotate @@ -7,7 +7,7 @@ delaycompress compress postrotate - /etc/init.d/rsyslog rotate > /dev/null + /etc/init.d/rsyslog rotate > /dev/null endscript } @@ -33,6 +33,6 @@ delaycompress sharedscripts postrotate - /etc/init.d/rsyslog rotate > /dev/null + /etc/init.d/rsyslog rotate > /dev/null endscript } diff --git a/rsyslog/trusty/master/debian/rules b/rsyslog/trusty/master/debian/rules index 944e4e08..5918d097 100755 --- a/rsyslog/trusty/master/debian/rules +++ b/rsyslog/trusty/master/debian/rules @@ -1,8 +1,6 @@ #!/usr/bin/make -f -#export DEB_CFLAGS_MAINT_APPEND = -std=c99 -export DEB_CFLAGS_MAINT_APPEND = -std=c99 -g -fsanitize=address -#export CC=clang +export DEB_CFLAGS_MAINT_APPEND = -std=c99 DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk @@ -17,6 +15,11 @@ unexport LDFLAGS override_dh_auto_configure: dh_auto_configure -- \ + --enable-kmsg \ + --enable-improg \ + --enable-impcap \ + --enable-omrabbitmq \ + --enable-omuxsock \ --enable-mysql \ --enable-pgsql \ --enable-mail \ @@ -24,6 +27,7 @@ override_dh_auto_configure: --enable-impstats \ --enable-gnutls \ --enable-relp \ + --enable-clickhouse \ --enable-pmaixforwardedfrom \ --enable-pmcisconames \ --enable-pmlastmsg \ @@ -46,8 +50,6 @@ override_dh_auto_configure: --enable-mmrm1stspace \ --enable-omkafka \ --enable-imkafka \ - --enable-kafka-static \ - --disable-omhiredis \ --enable-omstdout \ --enable-mmkubernetes \ --enable-openssl \ @@ -56,9 +58,11 @@ override_dh_auto_configure: --with-systemdsystemunitdir=/lib/systemd/system # unstable +# --enable-kafka-static \ # --enable-guardtime \ # --enable-gt-ksi \ # +# --enable-omhiredis \ # --enable-jemalloc \ # --enable-gssapi-krb5 \ # --enable-guardtime \ diff --git a/rsyslog/xenial/master/debian/changelog b/rsyslog/xenial/master/debian/changelog index e2d02bc5..98e028b3 100644 --- a/rsyslog/xenial/master/debian/changelog +++ b/rsyslog/xenial/master/debian/changelog @@ -1,3 +1,447 @@ +rsyslog (8.2312.0-0adiscon1xenial1) xenial; urgency=medium +rsyslog (8.2310.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2310.0 + + -- Rainer Gerhards Thu, 10 Oct 2023 13:29:59 +0000 + +rsyslog (8.2308.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2308.0 + + -- Rainer Gerhards Thu, 15 Aug 2023 13:29:59 +0000 + +rsyslog (8.2306.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2306.0 + + -- Rainer Gerhards Thu, 20 Jun 2023 13:29:59 +0000 + +rsyslog (8.2304.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2304.0 + + -- Rainer Gerhards Thu, 18 Apr 2023 13:29:59 +0000 + +rsyslog (8.2302.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2302.0 + + -- Rainer Gerhards Thu, 21 Feb 2023 13:29:59 +0000 + +rsyslog (8.2212.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2212.0 + + -- Rainer Gerhards Thu, 06 Dec 2022 13:29:59 +0000 + +rsyslog (8.2210.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2210.0 + + -- Rainer Gerhards Thu, 18 Oct 2022 13:29:59 +0000 + +rsyslog (8.2206.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2206.0 + + -- Rainer Gerhards Thu, 14 Jun 2022 13:29:59 +0000 + +rsyslog (8.2204.1-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2204.1 + + -- Rainer Gerhards Thu, 05 May 2022 13:29:59 +0000 + +rsyslog (8.2204.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2204.0 + + -- Rainer Gerhards Thu, 19 Apr 2022 13:29:59 +0000 + +rsyslog (8.2202.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2202.0 + + -- Rainer Gerhards Thu, 15 Feb 2022 13:29:59 +0000 + +rsyslog (8.2112.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2112.0 + + -- Florian Riedl Thu, 16 Dec 2021 13:29:20 +0000 + +rsyslog (8.2110.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2110.0 + + -- Rainer Gerhards Tue, 19 Oct 2021 10:17:34 +0000 + +rsyslog (8.2108.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2108.0 + + -- Rainer Gerhards Tue, 17 Aug 2021 10:17:34 +0000 + +rsyslog (8.2106.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2106.0 + + -- Rainer Gerhards Tue, 15 Jun 2021 10:18:50 +0000 + +rsyslog (8.2104.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2104.0 + + -- Rainer Gerhards Mon, 19 Apr 2021 10:18:50 +0000 + +rsyslog (8.2012.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2012.0 + + -- Florian Riedl Tue, 08 Dec 2020 10:16:58 +0000 + +rsyslog (8.2010.0-0adiscon2xenial1) xenial; urgency=medium + + * Rebuild for librelp 1.9.0 + + -- Florian Riedl Tue, 24 Nov 2020 15:52:53 +0000 + +rsyslog (8.2010.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2010.0 + + -- Florian Riedl Tue, 20 Oct 2020 09:28:11 +0000 + +rsyslog (8.2008.0-0adiscon2xenial1) xenial; urgency=medium + + * Rebuild for librelp 1.8.0 + + -- Florian Riedl Tue, 29 Sep 2020 20:36:29 +0000 + +rsyslog (8.2008.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2008.0 + + -- Rainer Gerhards Mon, 06 Jul 2020 09:24:57 +0000 + +rsyslog (8.2006.0-0adiscon2xenial1) xenial; urgency=medium + + * new subpackages + + -- Rainer Gerhards Mon, 06 Jul 2020 09:24:57 +0000 + +rsyslog (8.2006.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2006.0 + + -- Florian Riedl Tue, 23 Jun 2020 13:56:01 +0000 + +rsyslog (8.2004.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2004.0 + + -- Florian Riedl Tue, 28 Apr 2020 12:57:23 +0000 + +rsyslog (8.2002.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2002.0 + + -- Florian Riedl Tue, 25 Feb 2020 14:40:04 +0000 + +rsyslog (8.2001.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.2001.0 + + -- Florian Riedl Tue, 14 Jan 2020 16:12:24 +0000 + +rsyslog (8.1911.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.1911.0 + + -- Florian Riedl Tue, 12 Nov 2019 09:41:42 +0000 + +rsyslog (8.1910.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.1910.0 + + -- Florian Riedl Tue, 01 Oct 2019 08:30:34 +0000 + +rsyslog (8.1908.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.1908.0 + + -- Florian Riedl Tue, 20 Aug 2019 09:25:05 +0000 + +rsyslog (8.1907.0-0adiscon2xenial1) xenial; urgency=medium + + * Added patch to revert BSD HUP fix + Ref: https://github.com/rsyslog/rsyslog/issues/3760 + + -- Florian Riedl Tue, 30 Jul 2019 09:33:37 +0000 + +rsyslog (8.1907.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.1907.0 + + -- Florian Riedl Tue, 09 Jul 2019 10:15:09 +0000 + +rsyslog (8.1905.0-0adiscon2xenial1) xenial; urgency=medium + + * Added patch for fix in queue subsystem + closes: https://github.com/rsyslog/rsyslog/issues/3681 + + -- Florian Riedl Mon, 03 Jun 2019 14:50:06 +0000 + +rsyslog (8.1905.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.1905.0 + + -- Florian Riedl Tue, 28 May 2019 09:14:30 +0000 + +rsyslog (8.1904.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.1904.0 + + -- Florian Riedl Wed, 17 Apr 2019 10:20:26 +0000 + +rsyslog (8.1903.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.1903.0 + + -- Florian Riedl Tue, 05 Mar 2019 15:01:46 +0000 + +rsyslog (8.1901.0-0adiscon2xenial1) xenial; urgency=medium + + * Removed dependency for liblogging-stdlog. Ref: https://github.com/rsyslog/rsyslog-pkg-ubuntu/is$ + * Added sub-package for pmnormalize. Ref: https://github.com/rsyslog/rsyslog-pkg-ubuntu/pull/84 + + -- Florian Riedl Fri, 08 Feb 2019 10:57:29 +0000 + +rsyslog (8.1901.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.1901.0 + + -- Florian Riedl Tue, 22 Jan 2019 11:12:37 +0000 + +rsyslog (8.40.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.40.0 + + -- Florian Riedl Tue, 11 Dec 2018 11:27:09 +0000 + +rsyslog (8.39.0-0adiscon5xenial1) xenial; urgency=medium + + * Added patch to fix imfile resend issue + Fixes: https://github.com/rsyslog/rsyslog/issues/3249 + + -- Florian Riedl Tue, 13 Nov 2018 11:44:34 +0000 + +rsyslog (8.39.0-0adiscon4xenial1) xenial; urgency=medium + + * Rebuild for liblognorm 2.0.6 + + -- Florian Riedl Wed, 07 Nov 2018 14:43:02 +0000 + +rsyslog (8.39.0-0adiscon3xenial1) xenial; urgency=medium + + * Rebuild for fixed Kafka dependency + + -- Florian Riedl Wed, 31 Oct 2018 09:45:16 +0000 + +rsyslog (8.39.0-0adiscon2xenial1) xenial; urgency=medium + + * Rebuild without missing and unused files + + -- Florian Riedl Tue, 30 Oct 2018 14:34:19 +0000 + +rsyslog (8.39.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.39.0 + + -- Florian Riedl Tue, 30 Oct 2018 14:05:01 +0000 + +rsyslog (8.38.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.38.0 + + -- Florian Riedl Tue, 18 Sep 2018 10:25:08 +0000 + +rsyslog (8.37.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.37.0 + + -- Florian Riedl Tue, 07 Aug 2018 10:30:53 +0000 + +rsyslog (8.36.0-0adiscon5xenial1) xenial; urgency=medium + + * Updated librelp dependency + * Updated Kafka dependency + + -- Florian Riedl Thu, 02 Aug 2018 13:02:48 +0000 + +rsyslog (8.36.0-0adiscon4xenial1) xenial; urgency=medium + + * Rebuilt packages to undo new Kafka dependency + + -- Florian Riedl Fri, 27 Jul 2018 13:11:59 +0000 + +rsyslog (8.36.0-0adiscon3xenial1) xenial; urgency=medium + + * Rebuilt packages for updated Kafka dependency + + -- Florian Riedl Wed, 25 Jul 2018 08:47:38 +0000 + +rsyslog (8.36.0-0adiscon2xenial1) xenial; urgency=medium + + * Added sub-package rsyslog-openssl for OpenSSL TLS support + + -- Florian Riedl Wed, 27 Jun 2018 14:35:28 +0000 + +rsyslog (8.36.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.36.0 + * Removed imrelp patch + * Fixed systemd patch. ref: #81 + + -- Florian Riedl Tue, 26 Jun 2018 10:56:38 +0000 + +rsyslog (8.35.0-0adiscon3xenial1) xenial; urgency=medium + + * Added patch for systemd, so a pid file will be generated again + ref: #79 + * Fixed libmongoc dependency + + -- Florian Riedl Fri, 15 Jun 2018 09:07:30 +0000 + +rsyslog (8.35.0-0adiscon2xenial1) xenial; urgency=medium + + * Rebuild for imrelp patch + + -- Florian Riedl Fri, 18 May 2018 14:41:12 +0000 + +rsyslog (8.35.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.35.0 + * Added package rsyslog-fmhash + + -- Florian Riedl Tue, 15 May 2018 10:44:00 +0000 + +rsyslog (8.34.0-0adiscon2xenial1) xenial; urgency=medium + + * Rebuild for updated Kafka support library + + -- Florian Riedl Wed, 04 Apr 2018 12:17:22 +0000 + +rsyslog (8.34.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.34.0 + * Added package rsyslog-mmkubernetes + * Added package rsyslog-fmhttp + + -- Florian Riedl Tue, 03 Apr 2018 15:16:29 +0000 + +rsyslog (8.33.1-0adiscon4xenial1) xenial; urgency=medium + + * Rebuild for libhiredis dependency update + Ref: https://github.com/rsyslog/rsyslog-pkg-ubuntu/pull/77 + + -- Florian Riedl Wed, 28 Mar 2018 10:54:08 +0000 + +rsyslog (8.33.1-0adiscon3xenial1) xenial; urgency=medium + + * Changed install file definitions for gnutls + Fixes: https://github.com/rsyslog/rsyslog-pkg-ubuntu/issues/57 + + -- Florian Riedl Wed, 28 Mar 2018 10:03:55 +0000 + +rsyslog (8.33.1-0adiscon2xenial1) xenial; urgency=medium + + * New librelp dependency + + -- Florian Riedl Wed, 21 Mar 2018 15:44:02 +0000 + +rsyslog (8.33.1-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.33.1 + + -- Florian Riedl Tue, 06 Mar 2018 11:39:46 +0000 + +rsyslog (8.33.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.33.0 + * Removed patches from previous build + * Included the missing rsyslog-gnutls sub-package + + -- Florian Riedl Tue, 20 Feb 2018 12:45:41 +0000 + +rsyslog (8.32.0-0adiscon3xenial1) xenial; urgency=medium + + * Added patch for external cmd parser + ref: https://github.com/rsyslog/rsyslog/pull/2410 + + -- Florian Riedl Fri, 19 Jan 2018 12:01:16 +0000 + +rsyslog (8.32.0-0adiscon2xenial1) xenial; urgency=medium + + * Added patches for json processing in rainerscript and jsonmesg + fixes: https://github.com/rsyslog/rsyslog/issues/2391 + fixes: https://github.com/rsyslog/rsyslog/issues/2396 + + -- Florian Riedl Wed, 17 Jan 2018 16:42:50 +0000 + +rsyslog (8.32.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.32.0 + * New sub-package for omstdout + + -- Florian Riedl Fri, 12 Jan 2018 11:30:04 +0000 + +rsyslog (8.31.0-0adiscon2xenial1) xenial; urgency=medium + + * Updated Kafka library + + -- Florian Riedl Tue, 28 Nov 2017 10:24:40 +0000 + +rsyslog (8.31.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.31.0 + * Changed dependency for MongoDB + * Enabled Redis package + * Changed logrotate script postrotate command + + -- Florian Riedl Tue, 28 Nov 2017 09:47:10 +0000 + +rsyslog (8.30.0-0adiscon2xenial1) xenial; urgency=medium + + * Dependency fix + + -- Florian Riedl Wed, 18 Oct 2017 14:41:18 +0000 + +rsyslog (8.30.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.30.0 + + -- Florian Riedl Tue, 17 Oct 2017 09:54:23 +0000 + +rsyslog (8.29.0-0adiscon3xenial1) xenial; urgency=medium + + * Repack for new liblognorm version + + -- Florian Riedl Wed, 04 Oct 2017 15:00:18 +0000 + +rsyslog (8.29.0-0adiscon2xenial1) xenial; urgency=medium + + * Re-enabled mmutf8fix + + -- Florian Riedl Mon, 21 Aug 2017 12:35:07 +0000 + +rsyslog (8.29.0-0adiscon1xenial1) xenial; urgency=medium + + * Packages for 8.29.0 + + -- Florian Riedl Wed, 09 Aug 2017 08:49:53 +0000 + rsyslog (8.28.0-0adiscon8xenial1) xenial; urgency=medium * Repack diff --git a/rsyslog/xenial/master/debian/control b/rsyslog/xenial/master/debian/control index 7b5e5063..383538ea 100644 --- a/rsyslog/xenial/master/debian/control +++ b/rsyslog/xenial/master/debian/control @@ -7,16 +7,23 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.6.1), autotools-dev (>= 20100122.1), dh-autoreconf, + librabbitmq-dev, + librabbitmq4, zlib1g-dev, + libgrok-dev, + libgrok1, + libtokyocabinet-dev, + libtokyocabinet9, libmysqlclient-dev, libpq-dev, libmongoc-dev, libbson-dev, - librelp-dev (>= 1.0.2), + librelp-dev (>= 1.2.17), libestr-dev (>= 0.1.2), liblognorm-dev (>= 1.0.0), - libfastjson-dev, + libfastjson-dev (>= 0.99.7), libglib2.0-dev, + libpcap-dev, uuid-dev, libkrb5-dev, libgnutls-dev, @@ -31,7 +38,8 @@ Build-Depends: debhelper (>= 8), liblz4-dev, libsasl2-dev, libhiredis-dev, - libssl-dev + libssl-dev, + libnet-dev Standards-Version: 3.9.2 XSBC-Original-Vcs-Git: git://git.debian.org/git/collab-maint/rsyslog.git XSBC-Original-Vcs-Browser: http://git.debian.org/?p=collab-maint/rsyslog.git;a=summary @@ -50,7 +58,7 @@ Depends: ${shlibs:Depends}, initscripts (>= 2.88dsf-13.3), adduser, ucf, - libfastjson4 + libfastjson4 (>= 0.99.7) Recommends: logrotate Suggests: rsyslog-mysql | rsyslog-pgsql, rsyslog-doc, @@ -99,6 +107,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 @@ -150,13 +167,21 @@ Description: MongoDB output plugin for rsyslog # encrypted syslog messages. GSSAPI is commonly used for Kerberos # authentication. +Package: rsyslog-omclickhouse +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the omclickhouse rsyslog plugin + Package: rsyslog-relp Architecture: any Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends}, rsyslog (= ${binary:Version}), - librelp0 (>= 1.0.2) + librelp0 (>= 1.2.17) Description: RELP protocol support for rsyslog These plugins allows rsyslog to send and receive syslog messages via the RELP protocol. RELP ensures reliable transport over the network even on @@ -179,7 +204,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 @@ -227,6 +252,51 @@ Depends: ${shlibs:Depends}, liblognorm5 Description: Parse all fields of the message into structured data inside the JSON tree. +Package: rsyslog-mmgrok +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgrok1, + libtokyocabinet9, + rsyslog (= ${binary:Version}), +Description: Provides the mmgrok rsyslog plugin + +Package: rsyslog-omrabbitmq +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + librabbitmq4, + rsyslog (= ${binary:Version}), +Description: Provides the omrabbitmq rsyslog plugin + +Package: rsyslog-imdocker +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgrok1, + rsyslog (= ${binary:Version}), +Description: Provides the imdocker rsyslog plugin + +Package: rsyslog-improg +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the improg rsyslog plugin + +Package: rsyslog-imkmsg +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), +Description: Provides the imkmsg rsyslog plugin which can be used to read structured + kernel logs. + Package: rsyslog-mmutf8fix Architecture: any Priority: extra @@ -246,6 +316,15 @@ Description: TLS protocol support for rsyslog This netstream plugin allows rsyslog to send and receive encrypted syslog messages via the upcoming syslog-transport-tls IETF standard protocol. +Package: rsyslog-udpspoof +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + rsyslog (= ${binary:Version}), + libnet-dev +Description: This module is similar to the regular UDP forwarder, but permits to spoof the sender address. + Package: rsyslog-openssl Architecture: any Priority: extra diff --git a/rsyslog/xenial/master/debian/patches/series b/rsyslog/xenial/master/debian/patches/series index add98a13..f9fae80c 100644 --- a/rsyslog/xenial/master/debian/patches/series +++ b/rsyslog/xenial/master/debian/patches/series @@ -1,6 +1,5 @@ # Debian patches for rsyslog 01-dont_create_db.patch -remove-rsyslog.service.patch # 0001-build-link-omelasticsearch-against-lm.patch # Ubuntu patches for rsyslog # 100-imuxsock-allow-missing-date.patch diff --git a/rsyslog/xenial/master/debian/rsyslog.install b/rsyslog/xenial/master/debian/rsyslog.install index ddf33856..1f7047f9 100644 --- a/rsyslog/xenial/master/debian/rsyslog.install +++ b/rsyslog/xenial/master/debian/rsyslog.install @@ -9,6 +9,7 @@ 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/omuxsock.so debian/tmp/usr/lib/rsyslog/imjournal.so debian/tmp/usr/lib/rsyslog/lmnet.so debian/tmp/usr/lib/rsyslog/lmnetstrms.so diff --git a/rsyslog/xenial/master/debian/rules b/rsyslog/xenial/master/debian/rules index d0582c68..049942f5 100755 --- a/rsyslog/xenial/master/debian/rules +++ b/rsyslog/xenial/master/debian/rules @@ -13,13 +13,21 @@ unexport LDFLAGS override_dh_auto_configure: dh_auto_configure -- \ + --enable-kmsg \ + --enable-improg \ + --enable-imdocker \ + --enable-omrabbitmq \ + --enable-mmgrok \ + --enable-omuxsock \ --enable-mysql \ --enable-pgsql \ --enable-mail \ --enable-imfile \ + --enable-impcap \ --enable-impstats \ --enable-gnutls \ --enable-relp \ + --enable-clickhouse \ --enable-pmaixforwardedfrom \ --enable-pmcisconames \ --enable-pmlastmsg \ @@ -39,13 +47,13 @@ override_dh_auto_configure: --enable-pmciscoios \ --enable-pmnormalize \ --enable-usertools \ + --enable-omudpspoof \ --enable-imjournal \ --enable-omjournal \ --enable-mmrm1stspace \ --enable-pmnull \ --enable-omkafka \ --enable-imkafka \ - --enable-kafka-static \ --enable-omhiredis \ --enable-omstdout \ --enable-mmkubernetes \ @@ -55,6 +63,7 @@ override_dh_auto_configure: --with-systemdsystemunitdir=/lib/systemd/system # +# --enable-kafka-static \ # --enable-guardtime \ # --enable-gt-ksi \ # --enable-gssapi-krb5 \ diff --git a/scripts/auto_daily.sh b/scripts/auto_daily.sh index c30c4e78..7846963c 100755 --- a/scripts/auto_daily.sh +++ b/scripts/auto_daily.sh @@ -8,16 +8,21 @@ date set -v set -x +source $RSI_SCRIPTS/config.sh -#libfastjson -for PROJECT in libfastjson libestr liblogging \ - librelp liblognorm libgt libksi rsyslog +PPADAILY=daily-stable +PPABRANCH=master +PROJECTS=${1:-"libestr liblogging libfastjson liblognorm librelp rsyslog"} +CUSTOMBUILD=${2} + +for PROJECT in $PROJECTS do - for PLATFORM in trusty xenial bionic eoan focal groovy + # Ubuntu (bionic 18.04, ) 20.04 and 22.04 + for PLATFORM in focal jammy do cd $INFRAHOME/repo/rsyslog-pkg-ubuntu/$PROJECT rm -fv *.tar.gz cp -v $INFRAHOME/repo/$PROJECT/*.tar.gz . - $INFRAHOME/repo/rsyslog-pkg-ubuntu/scripts/auto_daily_project.sh $PLATFORM v8-devel master + $INFRAHOME/repo/rsyslog-pkg-ubuntu/scripts/auto_daily_project.sh $PLATFORM $PPADAILY $PPABRANCH $CUSTOMBUILD done done diff --git a/scripts/auto_daily_project.sh b/scripts/auto_daily_project.sh index fb9fa23a..d5e11084 100755 --- a/scripts/auto_daily_project.sh +++ b/scripts/auto_daily_project.sh @@ -12,33 +12,41 @@ #set -o xtrace # useful for debugging #set -v - echo package build for `pwd` $1/$2/$3 date # params -szPlatform=$1 # trusty, vivid, ... -UPLOAD_PPA=$2 # path of the ppa (e.g. v8-devel) -szBranch=$3 # branch to use (e.g. master) - # Note: this must match the tarball branch +szPlatform=$1 # trusty, vivid, ... +UPLOAD_PPA=$2 # path of the ppa (e.g. v8-devel) +BRANCH=$3 # branch to use (e.g. master) + # Note: this must match the tarball branch +CUSTOMBUILD=$4 # Use if set, needed for rebuilds to make unique upload files +CUSTOMBUILD=$4 +if [ -z "$CUSTOMBUILD" ]; then + CUSTOMBUILD=$(date +%Y%m%d%H%M%S) +fi + rm -fv *.orig.tar.gz # clean up if left over, temporary work file! # only a single .tar.gz must exist at any time ls -l *.tar.gz # debug output szSourceFile=`ls *.tar.gz` szSourceBase=`basename $szSourceFile .tar.gz` VERSION=`echo $szSourceBase|cut -d- -f2` -LAUNCHPAD_VERSION=`echo $VERSION|cut -d. -f1-3`'~'`date +%Y%m%d%H%M%S` +CUSTOMBUILD=$CUSTOMBUILD +LAUNCHPAD_VERSION=`echo $VERSION|cut -d. -f1-3`'-'`echo $CUSTOMBUILD` PROJECT=`echo $szSourceBase | cut -d- -f1` PROJECT_SONAME=$PROJECT`cat CURR_LIBSONAME` szReplaceFile="${PROJECT}_$LAUNCHPAD_VERSION" -VERSION_FILE="LAST_VERSION.$szBranch.$szPlatform" +VERSION_FILE="LAST_VERSION.$BRANCH.$szPlatform" echo PROJECT $PROJECT echo PROJECT_SONAME $PROJECT_SONAME echo VERSION $VERSION +echo LAUNCHPAD_VERSION $LAUNCHPAD_VERSION echo Platform $szPlatform echo PPA $PPA +echo UPLOAD_PPA $UPLOAD_PPA if [ -z "$PROJECT" ]; then echo "variable PROJECT is unset" | mutt -s "$0 script error" $RS_NOTIFY_EMAIL @@ -76,9 +84,13 @@ rm -f $PROJECT_*.dsc rm -f $PROJECT_*.build rm -f $PROJECT_*.debian.tar.gz rm -f $PROJECT_*.orig.tar.gz +# Delete LAUNCHPAD_VERSION Dir if it exists and is in the current working directory +if [[ -d "./$LAUNCHPAD_VERSION" ]]; then + echo "REMOVE existing directory $LAUNCHPAD_VERSION !" + rm -rf "./$LAUNCHPAD_VERSION" +fi # BEGIN ACTUAL BUILD PROCESS - tar xfz $szSourceFile if [ $? -ne 0 ]; then echo error extracting source tarball @@ -90,9 +102,9 @@ mv $szSourceBase $LAUNCHPAD_VERSION cd $LAUNCHPAD_VERSION ls -l .. ls -l ../$szPlatform -ls -l ../$szPlatform/$szBranch -ls -l ../$szPlatform/$szBranch/debian -cp -rv ../$szPlatform/$szBranch/debian . +ls -l ../$szPlatform/$BRANCH +ls -l ../$szPlatform/$BRANCH/debian +cp -rv ../$szPlatform/$BRANCH/debian . pwd ls -l @@ -105,8 +117,10 @@ echo " -- Adiscon package maintainers `da # Build Source package now! if [ -v PACKAGE_SIGNING_KEY_ID ]; then + echo "RUN debuild -S -sa -rfakeroot -k $PACKAGE_SIGNING_KEY_ID debuild -S -sa -rfakeroot -k"$PACKAGE_SIGNING_KEY_ID" else + echo "RUN debuild -S -sa -rfakeroot -us -uc debuild -S -sa -rfakeroot -us -uc fi if [ $? -ne 0 ]; then @@ -119,16 +133,18 @@ fi cd .. if [ -v PACKAGE_SIGNING_KEY_ID ]; then - # This only works on bash >4.2 note no $ before the variable name - # If there is a key defined, upload changes to PPA now! - dput -f $PPA/$UPLOAD_PPA `ls *.changes` - if [ $? -ne 0 ]; then + # This only works on bash >4.2 note no $ before the variable name + # If there is a key defined, upload changes to PPA now! + echo "Upload to $PPA/$UPLOAD_PPA" + debsign -k $PACKAGE_SIGNING_KEY_ID `ls *.changes` + dput -f $PPA/$UPLOAD_PPA `ls *.changes` + if [ $? -ne 0 ]; then echo "fail in dput, PPA upload to Launchpad failed" | mutt -s "$PROJECT_SONAME daily build failed!" $RS_NOTIFY_EMAIL - exit 1 - fi - #cleanup - echo $VERSION >$VERSION_FILE - #exit # do this for testing - rm -rf $LAUNCHPAD_VERSION - rm -v $szReplaceFile*.dsc $szReplaceFile*.build $szReplaceFile*.changes $szReplaceFile*.upload *.tar.gz + exit 1 + fi + #cleanup + echo $VERSION >$VERSION_FILE + #exit # do this for testing + rm -rf $LAUNCHPAD_VERSION + rm -v $szReplaceFile*.dsc $szReplaceFile*.build $szReplaceFile*.changes $szReplaceFile*.upload *.tar.gz fi diff --git a/scripts/config.sh b/scripts/config.sh index 22e7e604..76aa58c3 100644 --- a/scripts/config.sh +++ b/scripts/config.sh @@ -1,9 +1,6 @@ PLATFORM="precise trusty xenial bionic eoan focal groovy jammy" ARCHTECT="amd64 i386" -BRANCHES="v8-stable v8-stable-testing" -# GPG KEY -export KEY_ID=AEF0CF8E +BRANCHES="v8-stable v8-stable-testing daily-stable" +# OLD GPG KEY AEF0CF8E +export KEY_ID=60A6DC05CFD77E25BFB74F0F8B4ED6BFE8EDD305 export PPA=ppa:adiscon -# Mine -# KEY_ID=F6A93574 -