Please merge rsyslog 8.12.0-1 (main) from Debian unstable (main)

[Louis Bouchard]

debian unstable has rsyslog-8.12.0-1 Ubuntu available version is quite behind

[Louis Bouchard (louis)]

This is the debdiff for the merge of rsyslog-8.9.0-3.

The debdiff between 7.4.4 and 8.9.0 being rather big, it can be made available upon request

[Martin Pitt (pitti)]

From changelog describing Ubuntu delta:
+ - Remove upstart job. Upstream's systemd service file will be used.

Please don't do that. We still use upstart on the phone. It's also not what the package actually does: It *adds* an upstart job, but removes the SysV init script. Please don't do that either, we need the init script for insserv's dependency calculation, and it also reduces our delta.

Please also consider not dropping the debian/*.install files for disabled binary packages in Ubuntu -- it's enough to drop them from debian/control, or even just "dh -Nbinaryname" them in debian/rules. This will further simplify the delta and make it more robust against changes in Debian. (This is a non-blocker though).

Otherwise looks good, many thanks for working on this!

[Louis Bouchard (louis)]

New debdiff for the merge with pitti's requests implemented.

[Martin Pitt (pitti)]

Two more issues:

 - This is against the old version 8.9.0 which isn't even in testing any more. Can you please adjust to 8.12.0-1? (There are some patch failures)
 - "Replace debian/rsyslog.dmesg.upstart by equivalent systemd service to save initial dmesg into a file." - don't do that; we still need to keep the upstart job for touch. Under systemd you don't really need this as dmesg is saved in the journal. If you really want to add such a job, please just add it (and document it like that).
 - If you want to add/keep rsyslog-dmesg.service, please fix the unit: The After= is a no-op (unless you specify DefaultDependencies=no), the unit should be of type oneshot, and the call to savellog seems a bit pointless? I thought the idea was to keep the dmesg for the current boot only, not rotate it. Log rotation (or explicit logging) should really be a thing of the past with journal.

------------- 8< ------------
[Unit]
Description=Save kernel messages

[Service]
Type=oneshot
ExecStart=/bin/sh -ec "savelog -q -p -c 5 /var/log/dmesg;dmesg -s 524288 > /var/log/dmesg;chgrp adm /var/log/dmesg"

[Install]
WantedBy=multi-user.target
------------- 8< ------------

But again, I would like you to reconsider if this is really necessary.

[Louis Bouchard (louis)]

Hello pitti,

Following your advice, I did a new merge of 8.12 from debian. As it turns out, it was beneficial in the sense that this very new 8.12 has modification that I had sent upstream which required a specific patch.

I disabled the build of the kafka & mongo db packages in debian/rules as suggested, and dropped the rsyslog-dmesg service alltogether.

Here is the latest debdiff tested against the debian package. I also tested install & reran the tests outlined in the FFE bug just to be sure.

[Martin Pitt (pitti)]

Hey Louis,

thanks! I cleaned up some further unnecessary delta:

 * Calling init_is_upstart in debian/rsyslog.init is unnecessary, already done by /lib/lsb/init-functions.d/01-upstart-lsb.
 * Dropping debian/rsyslog-mongodb.install is unnecessary as the binary doesn't get built in the first place.

and added the bug ref to the changelog. I tested this myself, and it works fine. Uploaded now, many thanks for your work!

It's really a shame that we still have to carry this silly "DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions" workaround (four years old) which apparently has never been fully understood or analyzed. Is that really still necessary? It doesn't seem to affect Debian?

[Louis Bouchard (louis)]

The upload triggered FTBS on i386 and powerpc. This is caused by failure of test while running rsyslog testbench. The fix has been forwarded upstream and added here to fix the FTBS.

[Launchpad Janitor (janitor)]

This bug was fixed in the package rsyslog - 8.12.0-1ubuntu2

---------------
rsyslog (8.12.0-1ubuntu2) wily; urgency=medium

  * debian/patches/fix-testbench-buffer-overflow-ftbs.patch
    - Fix FTBS on i386 and powerpc caused by buffer overflow
      detection while running rsyslog testbench.

 -- Louis Bouchard <email address hidden> Wed, 02 Sep 2015 14:41:01 +0200