ubuntu/+source/ntp:ubuntu/zesty

Last commit made on 2016-12-16
Get this branch:
git clone -b ubuntu/zesty https://git.launchpad.net/ubuntu/+source/ntp
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
ubuntu/zesty
Repository:
lp:ubuntu/+source/ntp

Recent commits

5cba552... by Christian Ehrhardt  on 2016-12-01

Import patches-unapplied version 1:4.2.8p9+dfsg-2ubuntu1 to ubuntu/zesty-proposed

Imported using git-ubuntu import.

Changelog parent: 871afc8a50675e64655a4a67725be95caf7c7d4c
Upload parent: 815dbeb605d91aee23c8aeabb4ff44c91f6f6890

New changelog entries:
  * Merge from Debian testing. Remaining changes (LP: #427775):
    + d/rules: enable debugging
    + d/rules, d/ntp.dirs, d/source_ntp.py: Add apport hook.
    + d/ntpdate.if-up: Fix interaction with openntpd. Stop ntp before
      running ntpdate when an interface comes up, then start again afterwards.
    + d/ntp.init: Only stop when entering single user mode
    + d/ntp.init don't use /var/lib/ntp/ntp.conf.dhcp if /etc/ntp.conf is
      newer, it can get stale. Patch by Simon Déziel. (refreshed to apply to
      new path /run/ntp.conf.dhcp)
    + d/ntp.conf, d/ntpdate.default: Change default server to ntp.ubuntu.com.
    + d/control: Add bison to Build-Depends (for ntpd/ntp_parser.y).
    + Fix ntpdate-debian to be able to parse new config of ntp
    + Add PPS support:
      - d/README.Debian: Add a PPS section to the README.Debian,
        removed all PPSkit one.
      - d/ntp.conf: Add some configuration examples from the offical
        documentation.
    + Add Apparmor bits not yet accepted in Debian
      - d/control: Add Suggests on apparmor.
      - d/source_ntp.py: Add filter on AppArmor profile names to prevent
        false positives from denials originating in other packages
      - d/apparmor-profile add samba winbindd pipe
      - Create etc/apparmor.d/{force-complain,tunables}/
  * Drop Changes:
    + SECURITY UPDATE: NTP statsdir cleanup cronjob insecure
      (was accepted in Debian).
    + d/control: different conflicts/replaces versions on apparmor (was a
      dependency on a higher apparmor version, but today all releases are newer)

815dbeb... by Christian Ehrhardt  on 2016-12-16

drop old bug numbers from changelog

Signed-off-by: Christian Ehrhardt <email address hidden>

a8dd179... by Christian Ehrhardt  on 2016-12-01

Mark release for zesty

Signed-off-by: Christian Ehrhardt <email address hidden>

580c0d2... by Christian Ehrhardt  on 2016-12-01

mention closing of 427775

Signed-off-by: Christian Ehrhardt <email address hidden>

f67eff5... by Christian Ehrhardt  on 2016-12-01

update-maintainer

fe49cb5... by Christian Ehrhardt  on 2016-12-01

reconstruct-changelog

d001471... by Christian Ehrhardt  on 2016-12-01

Revert d/control: different conflicts/replaces versions on apparmor (was a
dependency on a higher apparmor version, but today all releases are newer)
Note: That change was part of 1f3c0eba5d543bb07d299df727a9364e143d0e40 which
actually should have been split when creating logical in Yakkety cycle
(now it is taken out by this partial revert).

Signed-off-by: Christian Ehrhardt <email address hidden>

6850a9b... by Christian Ehrhardt  on 2016-12-01

merge-changelogs

924d598... by Christian Ehrhardt  on 2016-12-01

Fix ntpdate-debian to be able to parse new config of ntp (LP: #1576698)

8c884e7... by Robie Basak on 2016-07-29

Create etc/apparmor.d/{force-complain,tunables}/

It looks like these were inadvertently dropped.

14:01 <rbasak> tyhicks: I'm reviewing a merge for cpaelzer and the
Ubuntu->Ubuntu diff includes this: http://paste.ubuntu.com/21398245/

14:01 <rbasak> tyhicks: do you know if this is OK please? Does
apparmor/dh-apparmor require the package to drop in these directories?

14:01 <rbasak> I suspect it's fine, but I thought I'd check.

14:05 <jdstrand> I can answer that

14:05 <jdstrand> unless someone changed dh_apparmor very recently
without us knowing, ntp.dirs should not have dropped those entries

14:05 <jdstrand> tyhicks: ^ (I answered rbasak)
(cherry picked from commit 6a24fa2f8caed8c7892b0289a1b1ff1a1aeecdce)