Ubuntu
rsyslog package

Please merge rsyslog 4.6.4-1 (main) from debian unstable (main)

Bug #671533 reported by Lorenzo De Liso
10
This bug affects 1 person
Affects Status Importance Assigned to Milestone
rsyslog (Debian)
New
Unknown
rsyslog (Ubuntu)
Fix Released
Wishlist
Unassigned

Bug Description

Binary package hint: rsyslog

rsyslog (4.6.4-1) unstable; urgency=low

   * New upstream release.
     - bugfix: programname filter in ! configuration can not be reset.
       Thanks to Kiss Gabor for the patch. Closes: #540807
   * Bump Standards-Version to 3.9.1. No further changes.

 -- Michael Biebl <email address hidden> Thu, 05 Aug 2010 18:35:37 +0200

rsyslog (4.6.3-1) unstable; urgency=low

   * New upstream release.
   * debian/patches/02-set-correct-default-for-buffered-writing.patch
     - Removed, merged upstream.
   * Switch to source format 3.0 (quilt).
     - Add debian/source/format.
     - Drop Build-Depends on quilt.
     - Remove debian/README.source.
     - Remove /usr/share/quilt/quilt.make include from debian/rules.
   * Switch to dh v7.
     - Bump Build-Depends on debhelper to (>= 7.0.50).
     - Bump Build-Depends on autotools-dev to (>= 20100122.1) for the
       autotools_dev dh addon.
     - Convert debian/rules to dh.
   * Bump Standards-Version to 3.9.0. Use Breaks instead of Conflicts as
     recommended by the new policy.

 -- Michael Biebl <email address hidden> Wed, 07 Jul 2010 19:07:03 +0200

rsyslog (4.6.2-1) unstable; urgency=low

   * New upstream release.
   * debian/patches/02-set-correct-default-for-buffered-writing.patch
     - The default for $OMFileFlushOnTXEnd was wrong ("off"). Patch pulled from
       upstream Git.

 -- Michael Biebl <email address hidden> Wed, 07 Apr 2010 16:42:56 +0200

rsyslog (4.6.1-1) unstable; urgency=low

   * New upstream release.
     - Fix error in rsyslog.conf(5) man page. The configuration variable
       $InputUDPServerRun does not exist, it should be $UDPServerRun instead.
       Thanks to Alexander Gerasiov for spotting this. Closes: #571202
   * debian/rsyslog-doc.install
     - Install png image files.
   * debian/patches/doc_typo_fix.patch
     - Removed, merged upstream.
   * debian/patches/no_create_db.patch
     - Refresh to apply cleanly.
   * debian/control
     - Bump Standards-Version to 3.8.4. No further changes.
   * debian/rsyslog.install
     - Install new lmstrmsrv.so and lmzlibw.so plugins.
   * debian/rsyslog.lintian-overrides
     - Add lintian override for init.d-script-missing-dependency-on-remote_fs
       false positive. See also the corresponding lintian bug: #571280.
   * debian/rules
     - Add call to dh_lintian.
   * debian/rsyslog.init
     - GNU/kFreeBSD does not allow to create pipes in /dev. So for xconsole
       create the pipe as /var/run/xconsole and a /dev/xconsole symlink.
       Closes: #537170

 -- Michael Biebl <email address hidden> Fri, 05 Mar 2010 01:07:53 +0100

rsyslog (4.4.2-2) unstable; urgency=low

   * debian/control
     - Demote mysql-server and postgresql from Recommends to Suggests. The
       server packages are not strictly necessary for dbconfig-common's
       autoconfiguration to work and one might want to use a remote server.
     - Add Recommends: mysql-client for rsyslog-mysql.
     - Add Recommends: postgresql-client for rsyslog-pgsql.
   * debian/patches/doc_typo_fix.patch
     - Fix a typo in the html documentation and man page regarding the syslog.h
       header file and the syslog(3) man page. Closes: #559334
       Thanks to Alexander Gerasiov for spotting this.

 -- Michael Biebl <email address hidden> Mon, 18 Jan 2010 15:31:40 +0100

rsyslog (4.4.2-1) unstable; urgency=low

   * New upstream release.

 -- Michael Biebl <email address hidden> Sat, 10 Oct 2009 14:08:16 +0200

rsyslog (4.4.1-1) unstable; urgency=low

   * New upstream release.
     - Fix invalid double-quoted PRI in log messages. Closes: #543505
   * debian/watch
     - Only check for stable upstream releases.
   * debian/patches/testbench-java.patch
     - Removed, merged upstream.

 -- Michael Biebl <email address hidden> Wed, 02 Sep 2009 17:19:05 +0200

rsyslog (4.4.0-1) unstable; urgency=low

   * New upstream release.
   * Removed patches
     - debian/patches/manpage_pidfile.patch (merged upstream)
     - debian/patches/close-stdout-stderr.patch (merged upstream)
   * Bump Standards-Version to 3.8.3. No further changes.
   * Disable testbench as it requires java.
   * debian/patches/testbench-java.patch
     - Move check_JAVA inside the ENABLE_TESTBENCH section so the tests are not
       run unless the testbench is enabled.

 -- Michael Biebl <email address hidden> Fri, 21 Aug 2009 23:08:45 +0200

Tags: patch

Related branches

lp:ubuntu/natty/rsyslog
Lorenzo De Liso (blackz)
Changed in rsyslog (Ubuntu):
importance: Undecided → Wishlist
Revision history for this message
Martin Pitt (pitti) wrote :

Lorenzo,

thanks for working on this. However, a lot of the existing delta isn't necessary any more, can you please clean up the merge a bit?

- sysklogd -> rsyslog upgrade was done pre-lucid (LTS), so all the upgrade handling can be dropped.
- init script changes are obsolete, even when actually using the init script (which we don't, we have the upstart script); rsyslog can read directly from /proc/kmsg now
- deroot.patch was introduced to support earlier kernels, at the time when the /proc/kmsg fix just made it upstream. I think it's safe to drop now, we don't support running natty on pre-karmic kernels.
- the splitout of 50-default.conf should be sent to Debian, or reverted if they reject it. We shouldn't carry this as a delta forever IMHO.

Thanks!

I'll unsubscribe sponsors, and subscribe myself, I'll handle the sponsoring once this is ready.

Changed in rsyslog (Ubuntu):
assignee: nobody → Lorenzo De Liso (blackz)
status: New → Incomplete
Bug Watch Updater (bug-watch-updater)
Changed in rsyslog (Debian):
status: Unknown → New
Brian Murray (brian-murray)
tags: added: patch
Revision history for this message
Lorenzo De Liso (blackz) wrote :

This debdiff should fix the issues described by you.

Changed in rsyslog (Ubuntu):
assignee: Lorenzo De Liso (blackz) → nobody
status: Incomplete → New
Revision history for this message
Martin Pitt (pitti) wrote :

Hello Lorenzo,

that already looks a lot nicer, thanks for the cleanup! Since you aspire to become a core-dev, I'll also ask you to clean up the "remaining changes" in the changelog, since you dropped most of them. E. g. the "dd blocksize" or "Allow reading /proc/kmsg" or postrm changes don't exist any more. Also, it would be great if you could add the Debian bug number as a reference (thanks for forwarding it!).

Revision history for this message
Lorenzo De Liso (blackz) wrote :

This other debdiff cleans the debian/changelog file from the dropped changes.

Revision history for this message
Martin Pitt (pitti) wrote :

Thanks! The changelog was still incorrect in some places, I fixed this now for the sponsoring.

Revision history for this message
Launchpad Janitor (janitor) wrote :
Download full text (4.9 KiB)

This bug was fixed in the package rsyslog - 4.6.4-1ubuntu1

---------------
rsyslog (4.6.4-1ubuntu1) natty; urgency=low

  * Merge from debian unstable (LP: #671533), remaining changes:
    - Run as rsyslog:rsyslog, set $FileOwner to syslog
    - Replace init script with debian/rsyslog.upstart.
    - debian/control: Bump build-dependency on debhelper for Upstart-aware
      dh_installinit
    - debian/rsyslog.logrotate: Use reload command to restart rsyslog
    - debian/rsyslog.conf: enable $RepeatedMsgReduction
      to avoid bloating the syslog file (LP #453444)
    - Add debian/rsyslog.dmesg.upstart to save initial dmesg into a file.
      Install it in debian/rules.
    - debian/50-default.conf: set of default rules for syslog (forwarded to
      Debian #603160)
  * Dropped changes:
    - debian/patches/deroot.patch: this patch was introduced to support
      earlier kernels and we don't support running natty on pre-karmic
      kernels
    - sysklogd → rsyslog upgrade was done pre-lucid (LTS) so drop all
      the upgrade handling
    - Restore to reading from /proc/kmsg: rsyslog can read directly from
      /proc/kmsg now; dropped init script changes as they're obsolete
      (even when actually using the init script which we don't, we have
      the upstart script)

rsyslog (4.6.4-1) unstable; urgency=low

  * New upstream release.
    - bugfix: programname filter in ! configuration can not be reset.
      Thanks to Kiss Gabor for the patch. Closes: #540807
  * Bump Standards-Version to 3.9.1. No further changes.

rsyslog (4.6.3-1) unstable; urgency=low

  * New upstream release.
  * debian/patches/02-set-correct-default-for-buffered-writing.patch
    - Removed, merged upstream.
  * Switch to source format 3.0 (quilt).
    - Add debian/source/format.
    - Drop Build-Depends on quilt.
    - Remove debian/README.source.
    - Remove /usr/share/quilt/quilt.make include from debian/rules.
  * Switch to dh v7.
    - Bump Build-Depends on debhelper to (>= 7.0.50).
    - Bump Build-Depends on autotools-dev to (>= 20100122.1) for the
      autotools_dev dh addon.
    - Convert debian/rules to dh.
  * Bump Standards-Version to 3.9.0. Use Breaks instead of Conflicts as
    recommended by the new policy.

rsyslog (4.6.2-1) unstable; urgency=low

  * New upstream release.
  * debian/patches/02-set-correct-default-for-buffered-writing.patch
    - The default for $OMFileFlushOnTXEnd was wrong ("off"). Patch pulled from
      upstream Git.

rsyslog (4.6.1-1) unstable; urgency=low

  * New upstream release.
    - Fix error in rsyslog.conf(5) man page. The configuration variable
      $InputUDPServerRun does not exist, it should be $UDPServerRun instead.
      Thanks to Alexander Gerasiov for spotting this. Closes: #571202
  * debian/rsyslog-doc.install
    - Install png image files.
  * debian/patches/doc_typo_fix.patch
    - Removed, merged upstream.
  * debian/patches/no_create_db.patch
    - Refresh to apply cleanly.
  * debian/control
    - Bump Standards-Version to 3.8.4. No further changes.
  * debian/rsyslog.install
    - Install new lmstrmsrv.so and lmzlibw.so plugins.
  * debian/rsyslog.lintian-overrides
    - Add lintian override for init.d...

Read more...

Changed in rsyslog (Ubuntu):
status: New → 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.