Last commit made on 2016-04-02
Get this branch:
git clone -b debian/wheezy 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


Recent commits

23db5de... by Kurt Roeckx on 2015-10-28

Import patches-unapplied version 1:4.2.6.p5+dfsg-2+deb7u6 to debian/wheezy

Imported using git-ubuntu import.

Changelog parent: 55a30d3655ee44b2cd5533fd828a7d44b22bf853

New changelog entries:
  * Fix errors in previous changelog entry
  * Fix CVE-2015-7850
  * Fix CVE-2015-7704
  * Fix CVE-2015-7701
  * Fix CVE-2015-7852
  * Fix CVE-2015-7851
  * Fix CVE-2015-7855
  * Fix CVE-2015-7871
  * Rename CVE-2014-9297.patch to CVE-2014-9750.patch
  * Rename CVE-2014-9298.patch to CVE-2014-9751.patch
  * Rename bug-2797.patch to CVE-2015-3405.patch
  * FIX CVE-2015-5146
  * FIX CVE-2015-5194
  * FIX CVE-2015-5195
  * FIX CVE-2015-7703
  * FIX CVE-2015-5219
  * FIX CVE-2015-5300
  * FIX CVE-2015-7691, CVE-2015-7692, CVE-2015-7702
  * Add build-depends on bison since one of the patches update the .y file.

55a30d3... by Kurt Roeckx on 2015-04-10

Import patches-unapplied version 1:4.2.6.p5+dfsg-2+deb7u4 to debian/wheezy

Imported using git-ubuntu import.

Changelog parent: 1e53749ca8689abaf80d7185c0109eec68c76043

New changelog entries:
  * Fix CVE-2015-1798 and CVE-2015-1799 (Closes: #782095)
  * Fix endless loop and non-random key generation using
    ntp-keygen on big endian machines.
  * Add missing fix for CVE-2014-9297
  * Fix CVE-2014-9297
  * Fix CVE-2014-9298

1e53749... by Florian Weimer on 2014-12-20

Import patches-unapplied version 1:4.2.6.p5+dfsg-2+deb7u1 to debian/wheezy

Imported using git-ubuntu import.

Changelog parent: a243583405ce90b8200562996d343d87821cc668

New changelog entries:
  * Apply patches from the Red Hat security update:
    + ntp-4.2.6p5-cve-2014-9293.patch
    + ntp-4.2.6p5-cve-2014-9294.patch
    + ntp-4.2.6p5-cve-2014-9295.patch
    + ntp-4.2.6p5-cve-2014-9296.patch

a243583... by Peter Eisentraut on 2012-05-12

Import patches-unapplied version 1:4.2.6.p5+dfsg-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 37a60388e8c7c16e30b4306fc6ec99d276cec752

New changelog entries:
  * Re-enable crypto support by pointing openssl libdir to multiarch dir.
    Also increase libssl-dev build dependency to the first multiarch
    version. (closes: #670662)

37a6038... by Peter Eisentraut on 2012-02-27

Import patches-unapplied version 1:4.2.6.p5+dfsg-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: a43d69264f70b9696843e02befc809438a45393b

New changelog entries:
  * New upstream release (closes: #644673)
  * Updated instructions on generating autotools.patch
  * Updated standards version

a43d692... by Peter Eisentraut on 2012-01-05

Import patches-unapplied version 1:4.2.6.p3+dfsg-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 31541ddde88303f2e4c5fdb6685c649b67442a0b

New changelog entries:
  * Update format-security.patch to include kfreebsd-specific fixes
    (closes: #653771)

31541dd... by Peter Eisentraut on 2011-12-17

Import patches-unapplied version 1:4.2.6.p3+dfsg-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: ebbc1b27c102909256df139b99d444f4c41787b0

New changelog entries:
  * Use architecture wildcard for libcap2-dev build dependency, removing
    type-handing dependency (closes: #528440, #587871)
  * Updated standards version
  * Get build flags from dpkg-buildflags, and fix the resulting
    -Wformat-security errors using patch from Colin Watson (closes:
    #542721, #627403)
  * Add -Wl,--as-needed to LDFLAGS, which drops the dependency of ntpdate
    on libcap2
  * Add sntp-manpage.patch to fix some errors in sntp man page pointed out
    by lintian
  * Re-remove tickadj. The previous method of achieving this by tweaking
    configure cache variables apparently broke at some point, so this time
    do it more directly.
  * Explicitly disable building ntpsnmpd and remove man page (closes:
    #608542; see also #622819)
  * ntpdate-debian: Improve parsing of ntp.conf (closes: #606349)
  * Add descriptions of -4/-6 options to ntpd man page (closes: #613349)
  * Update options list on ntptrace man page to match reality (closes:
  * Add build-arch and build-indep debian/rules targets, per lintian
  * Create ntp user and group separately, to handle the case where the
    user already exists but not the group (closes: #624275)
  * Don't ignore errors from adduser. If the system user or group already
    exist, this is ignored anyway. Anything else we want to know about.
  * Generalize ntp.cron.daily to cover all possible filegen stats files
    (closes: #644120)

ebbc1b2... by Kurt Roeckx on 2011-06-03

Import patches-unapplied version 1:4.2.6.p3+dfsg-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: ce1382a5ecc3c1e32dff420e01e08beb2a24c083

New changelog entries:
  * New upstream version
    - Require newer autogen version
  * Include sntp in source, it got rewritting and licensed changed.
  * Re-add neoclock4x driver, license got changed.
  * Drop nanokernel-status.patch. 2.6.26 was part of lenny, so everybody
    really should have nanokernel support now. The patch also didn't
    actually enable the nano kernel.
  * Drop mod_nano.patch, libc now provides the proper defines.
  * We now build against a libc that has NTP_API 4 support, which means
    that we get TAI offset support.

ce1382a... by Kurt Roeckx on 2010-07-13

Import patches-unapplied version 1:4.2.6.p2+dfsg-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 9ec7cc0014634da23a2b4368c1da39951b58225d

New changelog entries:
  [ Peter Eisentraut ]
  * Update command options section in ntp.conf(5) man page, drop "dynamic"
    option (closes: #553976, #439734)
  * Document ntpd -I option and ntp.conf interface command (closes: #506389)
  * Fix type in ntpdate man page (closes: #566621)
  * Added explanation of options to ntptrace man page (closes: #558289)
  * Removed no longer needed build conflict against libreadline-dev
  [ Kurt Roeckx ]
  * New upstream version.
    - Fixes problem with ipv6 multicast (Closes: #584927)
  * Move dhcp exit hooks from /etc/dhcp3/dhclient-enter-hooks.d to
    /etc/dhcp/dhclient-enter-hooks.d. Add dpkg-maintscript-helper
    to maintainer scripts to move them, and add a Breaks on
    dhcp3-client (<< 4.1.0-1) (Closes: #585054, #585055)
  * Remove ntp's Replaces on logcheck-database, we don't ship log
    logcheck entries anymore for ntp.

9ec7cc0... by Kurt Roeckx on 2010-05-24

Import patches-unapplied version 1:4.2.6.p1+dfsg-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: e082e71b7a00f3d0cdd35b27a4e032e68192ec30

New changelog entries:
  * New upstream version
    - They no longer ship arlib, adjust dfsg.patch.
    - Drop kfreebsd.patch, applied upstream
    - Update patches for upstream changes.
  * Remove the obsolete config files:
    for ntp:
    - /etc/logcheck/ignore.d.server/ntp, removed in 1:4.2.6+dfsg-1
    - /etc/dhcp3/dhclient-enter-hooks.d/ntp, replaced by exit hooks in
    - /etc/network/if-up.d/ntp, removed in 1:4.2.4p0+dfsg-1
    for ntpdate:
    - /etc/dhcp3/dhclient-enter-hooks.d/ntpdate, replaced by exit hooks in
    Use dpkg's dpkg-maintscript-helper. This needs
    a Pre-Depends to work, else it's never going to be removed.
    (Closes: #569530)
  * Add "Depends: ${misc:Depends}" to ntp-doc.