Merge chrony from Debian unstable for 22.04

Bug #1946848 reported by Bryce Harrington
10
This bug affects 1 person
Affects Status Importance Assigned to Milestone
chrony (Ubuntu)
Fix Released
Undecided
Christian Ehrhardt 

Bug Description

Upstream: tbd
Debian: 4.1-4
Ubuntu: 4.1-3ubuntu1

Debian does new releases regularly, so it's likely there will be newer versions available before FF that we can pick up if this merge is done later in the cycle.

### New Debian Changes ###

chrony (4.1-4) unstable; urgency=medium

  * debian/:
    - Remove empty preinst maintainer script.

  * debian/chrony.lintian-overrides:
    - Remove unused overrides.

  * debian/control:
    - Bump Standards-Version to 4.6.0 (no changes needed).

  * debian/patches/*:
    - Add fix-seccomp-filter-for-BINDTODEVICE-socket-option.patch.
    (Closes: #995207)

  * debian/usr.sbin.chronyd:
    - Add 'vim:syntax=apparmor' modline.
    - Add feature ABI rule. Starting with AppArmor 3.0, policy needs to contain
    an abi rule to indicate which feature abi the policy was developed under.

 -- Vincent Blut <email address hidden> Thu, 07 Oct 2021 15:23:28 +0200

chrony (4.1-3) unstable; urgency=medium

  * Upload to unstable.

  * debian/patches/:
    - Add allow-clone3-and-pread64-in-seccomp-filter.patch.

  * debian/tests/upstream-simulation-test-suite:
    - Update clknetsim version.

 -- Vincent Blut <email address hidden> Sun, 15 Aug 2021 15:08:56 +0200

chrony (4.1-2) experimental; urgency=medium

  * Merge branch 'debian/unstable' into 'debian/latest'.

  * debian/rules:
    - Remove needless dh_auto_test override.

  [ Christian Ehrhardt ]
  * debian/tests/helper-functions:
    - Improve chronyd restart logic. While rendering the tests more readable,
    this also fixes ntp-server-and-nts-auth test on Ubuntu.

  [ Debian Janitor ]
  * debian/{control,chrony.maintscript}:
    - Remove constraints unnecessary since stretch.

 -- Vincent Blut <email address hidden> Sat, 26 Jun 2021 17:16:45 +0200

chrony (4.1-1) experimental; urgency=medium

  * Import upstream version 4.1:
    - Please see /usr/share/doc/chrony/NEWS.gz for the release notes.

  * debian/copyright:
    - Update copyright years.

  * debian/upstream/signing-key.asc:
    - Update Miroslav Lichvar's key.

  * debian/watch:
    - Add upstream version mangle to transform -pre to ~pre.

 -- Vincent Blut <email address hidden> Fri, 14 May 2021 00:25:34 +0200

chrony (4.1~pre1-1) experimental; urgency=medium

  * Import upstream version 4.1-pre1:
    - Please see /usr/share/doc/chrony/NEWS.gz for the release notes.

  * debian/control:
    - Now that the upstream system tests support 'ss', replace the net-tools
    build-dependency by iproute2.

  * debian/NEWS:
    - Mention that lines in *.sources files must be terminated by a trailing
    newline.

  * debian/patches/:
    - Drop allow-IP_TOS-socket-option-in-seccomp-filter.patch. Applied
    upstream.

  * debian/postinst:
    - Do not redirect 'chronyd -p' stderr to /dev/null. Not needed anymore.

  * debian/sources.d/README:
    - Mention that lines in *.sources files must be terminated by a trailing
    newline.

  * debian/tests/dynamically-add-source:
    - Terminate the line in dummy-server.sources with the newline control
    character.

  * debian/tests/fragmented-configuration:
    - Do not redirect 'chronyd -p' stderr to /dev/null. Not needed anymore.

  * debian/tests/upstream-simulation-test-suite:

### Old Ubuntu Delta ###

chrony (4.1-3ubuntu1) impish; urgency=medium

  * Merge with Debian unstable (LP: #1940252). Remaining changes:
    Remaining changes:
    - d/chrony.conf: use ubuntu ntp pool and server (LP 1744664 1754358)
    - Set -x as default if unable to set time (e.g. in containers) (LP 1589780)
      Chrony is a single service which acts as both NTP client (i.e. syncing the
      local clock) and NTP server (i.e. providing NTP services to the network),
      and that is both desired and expected in the vast majority of cases.
      But in containers syncing the local clock is usually impossible, but this
      shall not break the providing of NTP services to the network.
      To some extent this makes chrony's default config more similar to 'ntpd',
      which complained in syslog but still provided NTP server service in those
      cases.
      + debian/chrony.service: allow the service to run without CAP_SYS_TIME
      + debian/control: add new dependency libcap2-bin for capsh (usually
        installed anyway, but make them explicit to be sure).
      + debian/chrony.default: new option SYNC_IN_CONTAINER to not fall back
        (Default off) [fixed a minor typo in the comment in this update]
      + debian/chronyd-starter.sh: wrapper to handle special cases in containers
        and if CAP_SYS_TIME is missing. Effectively allows on to run NTP server
        in containers on a default installation and avoid failing to sync time
        (or if allowed to sync, avoid multiple containers to fight over it by
        accident).
      + debian/install: make chrony-starter.sh available on install.
      + debian/docs, debian/README.container: provide documentation about the
        handling of this case.
  * Dropped changes:
    - d/t/helper-functions: restart explicitly to fix test issues
  * Added changes:
    - d/p/lp-1940252-rtc-avoid-printing-and-scanning-time_t.patch: glibc 2.34
      compatibility

 -- Christian Ehrhardt <email address hidden> Tue, 17 Aug 2021 12:22:32 +0200

Tags: needs-merge
Changed in chrony (Ubuntu):
assignee: nobody → Christian Ehrhardt  (paelzer)
Bryce Harrington (bryce)
description: updated
Changed in chrony (Ubuntu):
milestone: none → ubuntu-22.01
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

We are not much behind (one minor version atm) and often need to adapt it late in the cycle due to the new glibc anyway. Therebe move this to February just before the feature freeze.

Changed in chrony (Ubuntu):
milestone: ubuntu-22.01 → ubuntu-22.02
Changed in chrony (Ubuntu):
status: New → In Progress
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package chrony - 4.2-0ubuntu1

---------------
chrony (4.2-0ubuntu1) jammy; urgency=medium

  * Merge with Debian testing (LP: #1946848) and upstream v4.2.
    Remaining changes:
    - d/chrony.conf: use ubuntu ntp pool and server (LP 1744664 1754358)
    - Set -x as default if unable to set time (e.g. in containers) (LP 1589780)
      Chrony is a single service which acts as both NTP client (i.e. syncing the
      local clock) and NTP server (i.e. providing NTP services to the network),
      and that is both desired and expected in the vast majority of cases.
      But in containers syncing the local clock is usually impossible, but this
      shall not break the providing of NTP services to the network.
      To some extent this makes chrony's default config more similar to 'ntpd',
      which complained in syslog but still provided NTP server service in those
      cases.
      + debian/chrony.service: allow the service to run without CAP_SYS_TIME
      + debian/control: add new dependency libcap2-bin for capsh (usually
        installed anyway, but make them explicit to be sure).
      + debian/chrony.default: new option SYNC_IN_CONTAINER to not fall back
        (Default off) [fixed a minor typo in the comment in this update]
      + debian/chronyd-starter.sh: wrapper to handle special cases in containers
        and if CAP_SYS_TIME is missing. Effectively allows on to run NTP server
        in containers on a default installation and avoid failing to sync time
        (or if allowed to sync, avoid multiple containers to fight over it by
        accident).
      + debian/install: make chrony-starter.sh available on install.
      + debian/docs, debian/README.container: provide documentation about the
        handling of this case.
  * Drop patches present in v4.2
    - d/p/allow-clone3-and-pread64-in-seccomp-filter.patch
    - d/p/fix-seccomp-filter-for-BINDTODEVICE-socket-option.patch
    - d/p/lp-1940252-rtc-avoid-printing-and-scanning-time_t.patch
  * Added changes:
    - d/t/upstream-simulation-test-suite: bump to the matching clknetsim

 -- Christian Ehrhardt <email address hidden> Thu, 06 Jan 2022 14:51:22 +0100

Changed in chrony (Ubuntu):
status: In Progress → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

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