Ubuntu
rsyslog package

Merge rsyslog 8.2312.0-2 from Debian

Bug #2045033 reported by Heinrich Schuchardt
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Rsyslog
Fix Released
Unknown
rsyslog (Ubuntu)
Fix Released
Undecided
Unassigned

Bug Description

Debian has released rsyslog 8.2310.0-4. Merge it.

Related branches

~xypron/ubuntu/+source/rsyslog:merge
Nick Rosbrook (community): Needs Fixing
Diff: 14768 lines (+7307/-866) (has conflicts)
216 files modified
.tarball-version (+1/-1)
ChangeLog (+379/-0)
Makefile.am (+8/-1)
Makefile.in (+110/-107)
action.c (+1/-1)
compat/Makefile.in (+4/-1)
config.h.in (+9/-0)
configure (+427/-62)
configure.ac (+79/-18)
contrib/ffaup/Makefile.in (+4/-1)
contrib/fmhash/Makefile.in (+4/-1)
contrib/fmunflatten/Makefile.in (+4/-1)
contrib/imbatchreport/Makefile.in (+4/-1)
contrib/imczmq/Makefile.in (+4/-1)
contrib/imdocker/Makefile.in (+4/-1)
contrib/imhiredis/Makefile.in (+4/-1)
contrib/imhiredis/README (+4/-3)
contrib/imhiredis/imhiredis.c (+27/-7)
contrib/imhttp/Makefile.in (+4/-1)
contrib/imkmsg/Makefile.in (+4/-1)
contrib/imkmsg/imkmsg.c (+82/-3)
contrib/imkmsg/imkmsg.h (+16/-4)
contrib/imkmsg/kmsg.c (+80/-26)
contrib/impcap/Makefile.in (+4/-1)
contrib/improg/Makefile.in (+4/-1)
contrib/imtuxedoulog/Makefile.in (+4/-1)
contrib/mmcount/Makefile.in (+4/-1)
contrib/mmdarwin/Makefile.in (+4/-1)
contrib/mmgrok/Makefile.in (+4/-1)
contrib/mmkubernetes/Makefile.in (+4/-1)
contrib/mmrfc5424addhmac/Makefile.in (+4/-1)
contrib/mmsequence/Makefile.in (+4/-1)
contrib/mmtaghostname/Makefile.in (+4/-1)
contrib/omamqp1/Makefile.in (+4/-1)
contrib/omczmq/Makefile.in (+4/-1)
contrib/omfile-hardened/Makefile.in (+4/-1)
contrib/omhiredis/Makefile.in (+4/-1)
contrib/omhttp/Makefile.in (+4/-1)
contrib/omhttpfs/Makefile.in (+4/-1)
contrib/omrabbitmq/Makefile.in (+4/-1)
contrib/omtcl/Makefile.in (+4/-1)
contrib/pmaixforwardedfrom/Makefile.in (+4/-1)
contrib/pmcisconames/Makefile.in (+4/-1)
contrib/pmdb2diag/Makefile.in (+4/-1)
contrib/pmpanngfw/Makefile.in (+4/-1)
contrib/pmsnare/Makefile.in (+4/-1)
debian/NEWS (+33/-0)
debian/changelog (+147/-0)
debian/examples/rsyslog.d/xconsole.conf (+3/-3)
debian/examples/tmpfiles.d/xconsole.conf (+3/-1)
debian/patches/omusrmsg-bugfix-potential-double-free-which-can-caus.patch (+69/-0)
debian/patches/series (+1/-0)
debian/rsyslog.service (+8/-0)
debian/rules (+1/-2)
debian/tests/logcheck (+15/-1)
dev/null (+0/-10)
dirty.h (+2/-1)
grammar/Makefile.in (+4/-1)
parse.c (+0/-2)
parse.h (+0/-4)
plugins/fmhttp/Makefile.in (+4/-1)
plugins/im3195/Makefile.in (+4/-1)
plugins/imdiag/Makefile.in (+4/-1)
plugins/imdiag/imdiag.c (+37/-1)
plugins/imfile/Makefile.in (+4/-1)
plugins/imfile/imfile.c (+1/-0)
plugins/imgssapi/Makefile.in (+4/-1)
plugins/imgssapi/imgssapi.c (+1/-1)
plugins/imjournal/Makefile.in (+4/-1)
plugins/imjournal/imjournal.c (+473/-126)
plugins/imkafka/Makefile.in (+4/-1)
plugins/imklog/Makefile.in (+4/-1)
plugins/imklog/bsd.c (+13/-7)
plugins/imklog/imklog.c (+0/-1)
plugins/immark/Makefile.in (+4/-1)
plugins/impstats/Makefile.in (+4/-1)
plugins/imptcp/Makefile.in (+4/-1)
plugins/imrelp/Makefile.in (+4/-1)
plugins/imrelp/imrelp.c (+7/-1)
plugins/imsolaris/Makefile.in (+4/-1)
plugins/imtcp/Makefile.in (+4/-1)
plugins/imtcp/imtcp.c (+14/-0)
plugins/imudp/Makefile.in (+4/-1)
plugins/imuxsock/Makefile.in (+4/-1)
plugins/mmanon/Makefile.in (+4/-1)
plugins/mmaudit/Makefile.in (+4/-1)
plugins/mmdblookup/Makefile.in (+4/-1)
plugins/mmexternal/Makefile.in (+4/-1)
plugins/mmfields/Makefile.in (+4/-1)
plugins/mmjsonparse/Makefile.in (+4/-1)
plugins/mmnormalize/Makefile.in (+4/-1)
plugins/mmpstrucdata/Makefile.in (+4/-1)
plugins/mmrm1stspace/Makefile.in (+4/-1)
plugins/mmsnmptrapd/Makefile.in (+4/-1)
plugins/mmutf8fix/Makefile.in (+4/-1)
plugins/omazureeventhubs/Makefile.am (+13/-0)
plugins/omazureeventhubs/Makefile.in (+802/-0)
plugins/omazureeventhubs/omazureeventhubs.c (+1354/-0)
plugins/omclickhouse/Makefile.in (+4/-1)
plugins/omelasticsearch/Makefile.in (+4/-1)
plugins/omgssapi/Makefile.in (+4/-1)
plugins/omhdfs/Makefile.in (+4/-1)
plugins/omjournal/Makefile.in (+4/-1)
plugins/omkafka/Makefile.in (+4/-1)
plugins/omlibdbi/Makefile.in (+4/-1)
plugins/omlibdbi/omlibdbi.c (+9/-3)
plugins/ommail/Makefile.in (+4/-1)
plugins/ommongodb/Makefile.in (+4/-1)
plugins/ommongodb/ommongodb.c (+1/-1)
plugins/ommysql/Makefile.in (+4/-1)
plugins/ompgsql/Makefile.in (+4/-1)
plugins/omprog/Makefile.in (+4/-1)
plugins/omrelp/Makefile.in (+4/-1)
plugins/omruleset/Makefile.in (+4/-1)
plugins/omsnmp/Makefile.in (+4/-1)
plugins/omstdout/Makefile.in (+4/-1)
plugins/omtesting/Makefile.in (+4/-1)
plugins/omudpspoof/Makefile.in (+4/-1)
plugins/omuxsock/Makefile.in (+4/-1)
plugins/pmciscoios/Makefile.in (+4/-1)
plugins/pmlastmsg/Makefile.in (+4/-1)
plugins/pmnormalize/Makefile.in (+4/-1)
plugins/pmnull/Makefile.in (+4/-1)
runtime/Makefile.am (+4/-3)
runtime/Makefile.in (+21/-21)
runtime/conf.c (+1/-4)
runtime/glbl.c (+43/-6)
runtime/glbl.h (+1/-0)
runtime/libgcry.c (+1/-1)
runtime/lookup.c (+62/-21)
runtime/lookup.h (+2/-1)
runtime/net.c (+2/-2)
runtime/net.h (+1/-1)
runtime/netstrm.c (+10/-0)
runtime/netstrm.h (+3/-1)
runtime/netstrms.c (+22/-0)
runtime/netstrms.h (+5/-2)
runtime/nsd.h (+3/-1)
runtime/nsd_gtls.c (+64/-13)
runtime/nsd_gtls.h (+1/-0)
runtime/nsd_ossl.c (+188/-47)
runtime/nsd_ossl.h (+4/-2)
runtime/nsd_ptcp.c (+15/-0)
runtime/nsdsel_ptcp.c (+4/-1)
runtime/rsconf.c (+5/-1)
runtime/rsconf.h (+3/-1)
runtime/rsyslog.h (+5/-2)
runtime/tcpsrv.c (+15/-0)
runtime/tcpsrv.h (+3/-0)
tests/Makefile.am (+46/-0)
tests/Makefile.in (+129/-84)
tests/diag.sh (+52/-4)
tests/es-execOnlyWhenPreviousSuspended.sh (+1/-1)
tests/imfile-basic-legacy.sh (+2/-0)
tests/imfile-endmsg.regex-vg.sh (+5/-3)
tests/imfile-endmsg.regex-with-example-vg.sh (+5/-2)
tests/imfile-endmsg.regex-with-example.sh (+4/-2)
tests/imfile-endmsg.regex.sh (+5/-3)
tests/imfile-endregex-save-lf-persist.sh (+3/-1)
tests/imfile-endregex-save-lf.sh (+3/-1)
tests/imfile-endregex-timeout-none-polling.sh (+3/-2)
tests/imfile-endregex-timeout-none.sh (+3/-1)
tests/imfile-endregex-timeout-polling.sh (+3/-3)
tests/imfile-endregex-timeout-with-shutdown-polling.sh (+2/-0)
tests/imfile-endregex-timeout.sh (+2/-0)
tests/imfile-endregex-vg.sh (+2/-0)
tests/imfile-endregex.sh (+3/-1)
tests/imfile-symlink-multi.sh (+2/-0)
tests/imfile-symlink.sh (+2/-0)
tests/imfile-wildcards-dirs-multi.sh (+3/-1)
tests/imfile-wildcards-dirs-multi2.sh (+3/-2)
tests/imfile-wildcards-dirs-multi3.sh (+3/-2)
tests/imfile-wildcards-dirs-multi4.sh (+3/-2)
tests/imfile-wildcards-dirs-multi5-polling.sh (+3/-3)
tests/imfile-wildcards-dirs-multi5.sh (+5/-5)
tests/imfile-wildcards-dirs.sh (+3/-2)
tests/imfile-wildcards-dirs2.sh (+3/-0)
tests/imfile-wildcards.sh (+3/-0)
tests/imjournal-basic.sh (+1/-0)
tests/imptcp_maxsessions.sh (+2/-1)
tests/lookup_table-hup-backgrounded.sh (+51/-0)
tests/omazureeventhubs-basic-vg.sh (+6/-0)
tests/omazureeventhubs-basic.sh (+123/-0)
tests/omazureeventhubs-interrupt-vg.sh (+5/-0)
tests/omazureeventhubs-interrupt.sh (+165/-0)
tests/omazureeventhubs-list.sh (+137/-0)
tests/omazureeventhubs-stress.sh (+137/-0)
tests/sndrcv_tls_certvalid_expired.sh (+7/-7)
tests/sndrcv_tls_certvalid_expired_defaultmode.sh (+1/-1)
tests/sndrcv_tls_certvalid_revoked.sh (+67/-0)
tests/sndrcv_tls_client_missing_cert.sh (+65/-0)
tests/sndrcv_tls_ossl_anon_rebind.sh (+6/-13)
tests/sndrcv_tls_ossl_certvalid_revoked.sh (+6/-0)
tests/tcpflood.c (+64/-19)
tests/testsuites/x.509/ca.srl (+1/-0)
tests/testsuites/x.509/client-cert-new.pem (+102/-0)
tests/testsuites/x.509/client-new.csr (+23/-0)
tests/testsuites/x.509/client-revoked-key.pem (+28/-0)
tests/testsuites/x.509/client-revoked-valid.pem (+92/-0)
tests/testsuites/x.509/client-revoked.csr (+18/-0)
tests/testsuites/x.509/client-revoked.pem (+92/-0)
tests/testsuites/x.509/crl.pem (+14/-0)
tests/testsuites/x.509/index.txt (+3/-0)
tests/testsuites/x.509/index.txt.attr (+1/-0)
tests/testsuites/x.509/newcerts/01.pem (+92/-0)
tests/testsuites/x.509/newcerts/02.pem (+92/-0)
tests/testsuites/x.509/newcerts/03.pem (+92/-0)
tests/testsuites/x.509/newcerts/04.pem (+102/-0)
tests/testsuites/x.509/openssl-cmds.sh (+11/-0)
tests/testsuites/x.509/openssl.cnf (+41/-0)
tests/testsuites/x.509/serial (+1/-0)
tools/Makefile.in (+4/-1)
tools/omfwd.c (+6/-0)
tools/omusrmsg.c (+110/-32)
tools/rsyslogd.8 (+1/-1)
tools/rsyslogd.c (+178/-53)
Heinrich Schuchardt (xypron)
Changed in rsyslog (Ubuntu):
assignee: nobody → Heinrich Schuchardt (xypron)
Revision history for this message
Heinrich Schuchardt (xypron) wrote :

Upstream merge request https://github.com/rsyslog/rsyslog/pull/5290 created to fix build issue.

Revision history for this message
Heinrich Schuchardt (xypron) wrote :

Merge request https://github.com/rsyslog/rsyslog/pull/5290 was merged upstream.

Heinrich Schuchardt (xypron)
summary: - Merge rsyslog 8.2310.0-2 from Debian
+ Merge rsyslog 8.2312.0-1 from Debian
Revision history for this message
Heinrich Schuchardt (xypron) wrote : Re: Merge rsyslog 8.2312.0-1 from Debian

Debian has released rsyslog 8.2312.0-1

Revision history for this message
Heinrich Schuchardt (xypron) wrote :

Upstream release 8.2312.0 introduced a double free bug:
https://github.com/rsyslog/rsyslog/issues/5294

A patch has been suggested:
https://github.com/rgerhards/rsyslog/commit/c7c16b935c4b3fb740eacbd5dbb043f5cd457acd

Revision history for this message
Heinrich Schuchardt (xypron) wrote :

Merge request created:
https://code.launchpad.net/~xypron/ubuntu/+source/rsyslog/+git/rsyslog/+merge/457541

Changed in rsyslog (Ubuntu):
assignee: Heinrich Schuchardt (xypron) → nobody
Revision history for this message
Heinrich Schuchardt (xypron) wrote :

rsyslog_8.2312.0-1ubuntu1 is building in ppa:xypron/merge-from-debian.

Revision history for this message
Simon Quigley (tsimonq2) wrote :

Unsubscribing sponsors, since there are merge conflicts.

Heinrich Schuchardt (xypron)
summary: - Merge rsyslog 8.2312.0-1 from Debian
+ Merge rsyslog 8.2312.0-2 from Debian
Revision history for this message
Heinrich Schuchardt (xypron) wrote :

Please, review https://code.launchpad.net/~xypron/ubuntu/+source/rsyslog/+git/rsyslog/+merge/457913

Changed in rsyslog (Ubuntu):
assignee: nobody → Heinrich Schuchardt (xypron)
Revision history for this message
Heinrich Schuchardt (xypron) wrote :

rsyslog - 8.2312.0-2ubuntu1 is available in ppa:xypron/merge-from-debian.

Changed in rsyslog (Ubuntu):
assignee: Heinrich Schuchardt (xypron) → nobody
Revision history for this message
Lukas Märdian (slyon) wrote :

https://launchpad.net/ubuntu/+source/rsyslog/8.2312.0-2ubuntu1

Changed in rsyslog (Ubuntu):
status: New → In Progress
Revision history for this message
Heinrich Schuchardt (xypron) wrote (last edit ):

The failure of rsyslog-mysql is due to the hostname in Launchpad having 64 characters while the FromHost column only has 60 columns.
https://github.com/rsyslog/rsyslog/issues/5309

Changed in rsyslog (Ubuntu):
assignee: nobody → Heinrich Schuchardt (xypron)
Revision history for this message
Heinrich Schuchardt (xypron) wrote :

Upstream merge request created
https://github.com/rsyslog/rsyslog/pull/5310

Revision history for this message
Heinrich Schuchardt (xypron) wrote :

Merge request resubmitted:
https://code.launchpad.net/~xypron/ubuntu/+source/rsyslog/+git/rsyslog/+merge/458718

Changed in rsyslog (Ubuntu):
assignee: Heinrich Schuchardt (xypron) → nobody
Revision history for this message
Graham Inggs (ginggs) wrote :

8.2312.0-3ubuntu1 was sponsored, setting status to fix committed and unsubscribing ubuntu-sponsors.

Changed in rsyslog (Ubuntu):
status: In Progress → Fix Committed
Bug Watch Updater (bug-watch-updater)
Changed in rsyslog:
status: Unknown → Confirmed
Revision history for this message
Launchpad Janitor (janitor) wrote :
Download full text (4.6 KiB)

This bug was fixed in the package rsyslog - 8.2312.0-3ubuntu1

---------------
rsyslog (8.2312.0-3ubuntu1) noble; urgency=medium

  Merge with Debian unstable (LP: #2045033). Remaining changes:
    - d/00rsyslog.conf, d/rsyslog.postinst, d/rsyslog.install: Install
      tmpfiles.d snippet to ensure that the syslog group can write into
      /var/log/.
    - debian/50-default.conf: set of default rules for syslog
      + debian/50-default.conf: separated default rules
      + d/rsyslog.install: install default rules
      + d/rsyslog.postrm: clear default rules on purge
      + d/rsyslog.postrm: remove conf file in postrm on purge. manage with ucf
      + d/rsyslog.postinst: Adapt script to use ucf for Ubuntu's config files
      + debian/control: Add Depends for ucf
    - debian/rsyslog.conf:
      + enable $RepeatedMsgReduction to avoid bloating the syslog file.
      + enable $KLogPermitNonKernelFacility for non-kernel klog messages
      + Run as syslog:syslog, set $FileOwner to syslog
      + Remove rules moved to 50-default.conf
    - Add AppArmor profile, enabled by default, with support for
      AppArmor configuration snippets:
      + d/rsyslog.install: install apparmor rule
      + d/rsyslog.postinst: remove disabling of apparmor on upgrades if
        we are upgrading from a version older than $now.
      + d/rules: use dh_apparmor to install profile before rsyslog is started
      + d/control: suggests apparmor (>= 2.3), Build-Depends on
        dh-apparmor
      + d/rsyslog.dirs: install /etc/apparmor.d/rsyslog.d
      + d/usr.sbin.rsyslogd apparmor profile for rsyslogd
      + d/{apparmor/rsyslog-mysql,rsyslog-mysql.install}: add apparmor
        profile for mysql plugin
      + d/{apparmor/rsyslog-pgsql,rsyslog-pgsql.install}: add apparmor
        profile for postgresql plugin
      + d/{apparmor/rsyslog-gnutls.apparmor,rsyslog-gnutls.install}: add
        apparmor profile for the gnutls plugin
      + d/{apparmor/rsyslog-openssl.apparmor,rsyslog-gnutls.install}: add
        apparmor profile for the openssl plugin
      + New script to reload apparmor profile:
        - d/rsyslog.service: reload apparmor profile in ExecStartPre and
          set StandardError to journal so we can see errors from the
          script
        - d/rsyslog.install: install reload-apparmor-profile
        - d/reload-apparmor-profile: script to reload the
          rsyslogd apparmor profile
      + d/NEWS: add info about apparmor changes in the Ubuntu packaging
      + d/rsyslog.docs, d/README.apparmor: explains how the dynamic
        component of the rsyslog apparmor profile is applied
      + d/README.apparmor.rsyslog.d, d/rsyslog.install: install a specific
        README file in the apparmor include directory for rsyslog
    - d/rules: Fix LDFLAGS to avoid segfault on receipt of first message
    - Drop [mm|pm]normalize modules, depending on liblognorm from universe.
      + d/rules: drop --enable-mmnormalize & --enable-pmnormalize
      + d/rsyslog.install: remove mmnormalize
    - run as user syslog
      + d/rsyslog.postinst: fix ownership of /var/spool/rsyslog.
      + d/rsyslog.postinst: Create syslog user and add it to adm group
      + d/...

Read more...

Changed in rsyslog (Ubuntu):
status: Fix Committed → Fix Released
Bug Watch Updater (bug-watch-updater)
Changed in rsyslog:
status: Confirmed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.