Merge ~paelzer/ubuntu/+source/chrony:merge-4.2-2-jammy into ubuntu/+source/chrony:debian/sid
- Git
- lp:~paelzer/ubuntu/+source/chrony
- merge-4.2-2-jammy
- Merge into debian/sid
Status: | Merged |
---|---|
Merge reported by: | Christian Ehrhardt |
Merged at revision: | fb15e128be5419d2f0d158e475d70f10412b30c6 |
Proposed branch: | ~paelzer/ubuntu/+source/chrony:merge-4.2-2-jammy |
Merge into: | ubuntu/+source/chrony:debian/sid |
Diff against target: |
1107 lines (+901/-5) 9 files modified
debian/README.container (+60/-0) debian/changelog (+746/-0) debian/chrony.conf (+17/-2) debian/chrony.default (+4/-0) debian/chrony.service (+1/-2) debian/chronyd-starter.sh (+68/-0) debian/control (+3/-1) debian/docs (+1/-0) debian/install (+1/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Utkarsh Gupta (community) | Approve | ||
Canonical Server | Pending | ||
git-ubuntu import | Pending | ||
Review via email: mp+415170@code.launchpad.net |
Commit message
Description of the change
Christian Ehrhardt (paelzer) wrote : | # |
Christian Ehrhardt (paelzer) wrote : | # |
Tests are good on amd64/ppc64/s390x - arm* is still running.
I'll post an update about that later.
Ready to start review IMHO
Christian Ehrhardt (paelzer) wrote : | # |
Arm tests complete as well now
Results from https:/
chrony @ amd64:
07.02.22 08:42:13 Log 🗒️ ✅ Triggers: ['chrony/
upstream-
time-
run_
run_
fragmente
dynamical
ntp-
chrony @ arm64:
07.02.22 09:08:27 Log 🗒️ ✅ Triggers: ['chrony/
upstream-
time-
run_
run_
fragmente
dynamical
ntp-
chrony @ armhf:
07.02.22 09:52:16 Log 🗒️ ✅ Triggers: ['chrony/
upstream-
run_
fragmente
dynamical
ntp-
chrony @ ppc64el:
07.02.22 08:37:53 Log 🗒️ ✅ Triggers: ['chrony/
upstream-
time-
run_
run_
fragmente
dynamical
ntp-
chrony @ s390x:
07.02.22 08:36:34 Log 🗒️ ✅ Triggers: ['chrony/
upstream-
time-
run_
run_
fragmente
dynamical
ntp-
Utkarsh Gupta (utkarsh) wrote : | # |
[04acd8b]: looks good, Ubuntu specific. +1.
[0526a15]: okay, long history. Fair enough. But why aren't we forwarding this to Debian? I think Debian would benefit from this, too, no? I don't think this is Ubuntu-specific, or is it?
[0e1ec67], [416c57b], [be6d2f1], [05fcb9a]: okayyyy? but is it really Ubuntu-specific (because of MIRs and such?)? or can we forward this to drop the delta? I know we've been carrying this for a while but if it's really Ubuntu-specific, can we add a comment about it (i.e. reasons behind it) in the commit message so this doesn't come up the next time and the reasons are clear before-hand?
[fb15e12]: quick comment in the d/ch entry about the "Dropped Changes" being slightly unclear. :(
Christian Ehrhardt (paelzer) wrote : | # |
Hi Utkarsh,
0526a15 and all the others you asked for were forwarded to Debian and there decided against it.
The reason behind that is that our container story around LXD being a system container is very different to theirs.
Without that motivation I can understand why they didn't want but we needed it.
So that is one of the "fair and ok on both sides" differences between Debian & Ubuntu.
All the other bits you have wondered belong to that context e.g. libcap2-bin is only needed for our container check. The call to the wrapper is only needed for our container handling, ...
---
Finally about d/ch "Drop patches present in v4.2" might seem short, but you'll see that in the former version we have used exactly that term. And all that I could do in the new changelog is repeating that file names which seemed superlfuous.
If you want them added it is just a copy of lines 90-92 up to 29 and done.
So let me know if you think this is really better.
Utkarsh Gupta (utkarsh) wrote : | # |
Hiya,
> 0526a15 and all the others you asked for were forwarded to Debian
> and there decided against it.
>
> The reason behind that is that our container story around LXD being
> a system container is very different to theirs.
>
> Without that motivation I can understand why they didn't want but
> we needed it.
> So that is one of the "fair and ok on both sides" differences
> between Debian & Ubuntu.
>
> All the other bits you have wondered belong to that context e.g.
> libcap2-bin is only needed for our container check. The call to
> the wrapper is only needed for our container handling, ...
Okay, fair enough. I'd like to propose adding a "[Ubuntu-specific]" tags to the commit (message) header so that the reviewer directly knows that it is more-or-less Ubuntu-only or/and equivalent. Maybe I'll bring this to our stand-up sometime this week.
> If you want them added it is just a copy of lines 90-92 up to
> 29 and done.
> So let me know if you think this is really better.
I don't have a problem, really. Either is fine now that there is context but maybe adding them would be better? But really, up to you. If you think it's not needed, so be it. \o/
Given everything has been answered/discussed, this looks good. +1.
- e82626a... by Christian Ehrhardt
-
changelog: make dropped patches more readable
Signed-off-by: Christian Ehrhardt <email address hidden>
Christian Ehrhardt (paelzer) wrote : | # |
Ok, I used that in other branches added a prefix "UBUNTU-only:" to all commits of that kind.
Also added the dropped patches in the changelog, if you miss them others might as well and three lines more changelog do not cost anything.
Christian Ehrhardt (paelzer) wrote : | # |
Uploading to ubuntu (via ftp to upload.ubuntu.com):
Uploading chrony_
Uploading chrony_
Uploading chrony_
Uploading chrony_
Uploading chrony_
Successfully uploaded packages.
Christian Ehrhardt (paelzer) wrote : | # |
Migrated
Preview Diff
1 | diff --git a/debian/README.container b/debian/README.container |
2 | new file mode 100644 |
3 | index 0000000..dcacf49 |
4 | --- /dev/null |
5 | +++ b/debian/README.container |
6 | @@ -0,0 +1,60 @@ |
7 | +Chrony in Containers |
8 | +-------------------- |
9 | + |
10 | +Currently in 99.9+% of the cases syncing the local clock in a container |
11 | +is wrong. Most of the time it will be unable to do so, because it is lacking |
12 | +CAP_SYS_TIME. Or worse, if the CAP_SYS_TIME privilege is granted, multiple |
13 | +containers could fight over the system's time, because the Linux kernel does |
14 | +not provide time namespaces (yet). |
15 | + |
16 | +There are two things a user installing chrony usually wants: |
17 | +1. synchronize my time (NTP client) |
18 | +2. serve NTP (NTP server) |
19 | + |
20 | +In a container the first makes (usually) no sense, so by default we enable -x |
21 | +there (as it would only crash otherwise). |
22 | +This will disable the control of the system clock. |
23 | +See `man chronyd` for more details on the -x option. |
24 | + |
25 | +Formerly, the check for Condition=CAP_SYS_TIME in the systemd service avoided |
26 | +the crash of the NTP client portion, but that means the server use case will |
27 | +not work by default in containers. It is still not recommended to use a |
28 | +container as an NTP server, but if the host clock is synchronised via NTP, |
29 | +adding the -x option to chronyd instances running in containers will allow |
30 | +them to function as NTP servers which do not adjust the system clock. |
31 | +The Condition=CAP_SYS_TIME check was a silent, no-log-entry stealing away |
32 | +leaving users often unclear what happened - especially if they were more after |
33 | +the NTP server than the NTP client. |
34 | + |
35 | +One could argue that someone who installs chrony expects the system time to be |
36 | +synchronised, so it should fail if it is not able to do so. On the other hand |
37 | +it could be argued that someone who installs chrony expects time to be served |
38 | +over the network via NTP. |
39 | +We can't know which expectation is applicable, so we assume that time should |
40 | +be synchronised unless chronyd is running in a container (or is without |
41 | +CAP_SYS_TIME in any other environment). |
42 | + |
43 | +To make things worse recent container implementations will offer CAP_SYS_TIME |
44 | +to the container. Since from the container's point of view, this capability is |
45 | +available for the container's user namespace. Just later on adjtimex and similar |
46 | +are actually evaluated against the host kernel where they will fail. Due to |
47 | +that without further precaution running chrony in Ubuntu in the future will |
48 | +likely have the service start (as Condition=CAP_SYS_TIME will be true) but |
49 | +then immediately fail. |
50 | +This will depend on the environment e.g. versions and types of containers and |
51 | +thereby feel just 'unreliable' from users point of view. |
52 | +Furthermore it will affect upgrades as the service has to be restarted for a |
53 | +package upgrade to be considered complete. |
54 | + |
55 | +Due to all of that Ubuntu decided (LP: #1589780) to default to -x (do not |
56 | +set the system clock) in containers. |
57 | + |
58 | +If one really wants to (try to) sync time in a container or CAP_SYS_TIME-less |
59 | +environment set SYNC_IN_CONTAINER="yes" in /etc/default/chrony to disable |
60 | +this special handling. |
61 | + |
62 | +It is important to mention that as soon as upstream provides a way to provide |
63 | +a default config working in those cases Ubuntu intends to use that and drop |
64 | +the current workaround. |
65 | + |
66 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Fri, 16 Mar 2018 12:25:44 +0100 |
67 | diff --git a/debian/changelog b/debian/changelog |
68 | index 2ea7ed3..5769883 100644 |
69 | --- a/debian/changelog |
70 | +++ b/debian/changelog |
71 | @@ -1,3 +1,39 @@ |
72 | +chrony (4.2-2ubuntu1) jammy; urgency=medium |
73 | + |
74 | + * Merge with Debian unstable. Remaining changes: |
75 | + Remaining changes: |
76 | + - d/chrony.conf: use ubuntu ntp pool and server (LP 1744664 1754358) |
77 | + - Set -x as default if unable to set time (e.g. in containers) (LP 1589780) |
78 | + Chrony is a single service which acts as both NTP client (i.e. syncing the |
79 | + local clock) and NTP server (i.e. providing NTP services to the network), |
80 | + and that is both desired and expected in the vast majority of cases. |
81 | + But in containers syncing the local clock is usually impossible, but this |
82 | + shall not break the providing of NTP services to the network. |
83 | + To some extent this makes chrony's default config more similar to 'ntpd', |
84 | + which complained in syslog but still provided NTP server service in those |
85 | + cases. |
86 | + + debian/chrony.service: allow the service to run without CAP_SYS_TIME |
87 | + + debian/control: add new dependency libcap2-bin for capsh (usually |
88 | + installed anyway, but make them explicit to be sure). |
89 | + + debian/chrony.default: new option SYNC_IN_CONTAINER to not fall back |
90 | + (Default off) [fixed a minor typo in the comment in this update] |
91 | + + debian/chronyd-starter.sh: wrapper to handle special cases in containers |
92 | + and if CAP_SYS_TIME is missing. Effectively allows on to run NTP server |
93 | + in containers on a default installation and avoid failing to sync time |
94 | + (or if allowed to sync, avoid multiple containers to fight over it by |
95 | + accident). |
96 | + + debian/install: make chrony-starter.sh available on install. |
97 | + + debian/docs, debian/README.container: provide documentation about the |
98 | + handling of this case. |
99 | + * Dropped changes [ in 4.2-1 ] |
100 | + - Drop patches present in v4.2 |
101 | + + d/p/allow-clone3-and-pread64-in-seccomp-filter.patch |
102 | + + d/p/fix-seccomp-filter-for-BINDTODEVICE-socket-option.patch |
103 | + + d/p/lp-1940252-rtc-avoid-printing-and-scanning-time_t.patch |
104 | + - d/t/upstream-simulation-test-suite: bump to the matching clknetsim |
105 | + |
106 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Fri, 04 Feb 2022 07:52:48 +0100 |
107 | + |
108 | chrony (4.2-2) unstable; urgency=medium |
109 | |
110 | * debian/usr.sbin.chronyd: |
111 | @@ -26,6 +62,42 @@ chrony (4.2-1) unstable; urgency=medium |
112 | |
113 | -- Vincent Blut <vincent.debian@free.fr> Thu, 13 Jan 2022 14:01:35 +0100 |
114 | |
115 | +chrony (4.2-0ubuntu1) jammy; urgency=medium |
116 | + |
117 | + * Merge with Debian testing (LP: #1946848) and upstream v4.2. |
118 | + Remaining changes: |
119 | + - d/chrony.conf: use ubuntu ntp pool and server (LP 1744664 1754358) |
120 | + - Set -x as default if unable to set time (e.g. in containers) (LP 1589780) |
121 | + Chrony is a single service which acts as both NTP client (i.e. syncing the |
122 | + local clock) and NTP server (i.e. providing NTP services to the network), |
123 | + and that is both desired and expected in the vast majority of cases. |
124 | + But in containers syncing the local clock is usually impossible, but this |
125 | + shall not break the providing of NTP services to the network. |
126 | + To some extent this makes chrony's default config more similar to 'ntpd', |
127 | + which complained in syslog but still provided NTP server service in those |
128 | + cases. |
129 | + + debian/chrony.service: allow the service to run without CAP_SYS_TIME |
130 | + + debian/control: add new dependency libcap2-bin for capsh (usually |
131 | + installed anyway, but make them explicit to be sure). |
132 | + + debian/chrony.default: new option SYNC_IN_CONTAINER to not fall back |
133 | + (Default off) [fixed a minor typo in the comment in this update] |
134 | + + debian/chronyd-starter.sh: wrapper to handle special cases in containers |
135 | + and if CAP_SYS_TIME is missing. Effectively allows on to run NTP server |
136 | + in containers on a default installation and avoid failing to sync time |
137 | + (or if allowed to sync, avoid multiple containers to fight over it by |
138 | + accident). |
139 | + + debian/install: make chrony-starter.sh available on install. |
140 | + + debian/docs, debian/README.container: provide documentation about the |
141 | + handling of this case. |
142 | + * Drop patches present in v4.2 |
143 | + - d/p/allow-clone3-and-pread64-in-seccomp-filter.patch |
144 | + - d/p/fix-seccomp-filter-for-BINDTODEVICE-socket-option.patch |
145 | + - d/p/lp-1940252-rtc-avoid-printing-and-scanning-time_t.patch |
146 | + * Added changes: |
147 | + - d/t/upstream-simulation-test-suite: bump to the matching clknetsim |
148 | + |
149 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 06 Jan 2022 14:51:22 +0100 |
150 | + |
151 | chrony (4.1-4) unstable; urgency=medium |
152 | |
153 | * debian/: |
154 | @@ -48,6 +120,41 @@ chrony (4.1-4) unstable; urgency=medium |
155 | |
156 | -- Vincent Blut <vincent.debian@free.fr> Thu, 07 Oct 2021 15:23:28 +0200 |
157 | |
158 | +chrony (4.1-3ubuntu1) impish; urgency=medium |
159 | + |
160 | + * Merge with Debian unstable (LP: #1940252). Remaining changes: |
161 | + Remaining changes: |
162 | + - d/chrony.conf: use ubuntu ntp pool and server (LP 1744664 1754358) |
163 | + - Set -x as default if unable to set time (e.g. in containers) (LP 1589780) |
164 | + Chrony is a single service which acts as both NTP client (i.e. syncing the |
165 | + local clock) and NTP server (i.e. providing NTP services to the network), |
166 | + and that is both desired and expected in the vast majority of cases. |
167 | + But in containers syncing the local clock is usually impossible, but this |
168 | + shall not break the providing of NTP services to the network. |
169 | + To some extent this makes chrony's default config more similar to 'ntpd', |
170 | + which complained in syslog but still provided NTP server service in those |
171 | + cases. |
172 | + + debian/chrony.service: allow the service to run without CAP_SYS_TIME |
173 | + + debian/control: add new dependency libcap2-bin for capsh (usually |
174 | + installed anyway, but make them explicit to be sure). |
175 | + + debian/chrony.default: new option SYNC_IN_CONTAINER to not fall back |
176 | + (Default off) [fixed a minor typo in the comment in this update] |
177 | + + debian/chronyd-starter.sh: wrapper to handle special cases in containers |
178 | + and if CAP_SYS_TIME is missing. Effectively allows on to run NTP server |
179 | + in containers on a default installation and avoid failing to sync time |
180 | + (or if allowed to sync, avoid multiple containers to fight over it by |
181 | + accident). |
182 | + + debian/install: make chrony-starter.sh available on install. |
183 | + + debian/docs, debian/README.container: provide documentation about the |
184 | + handling of this case. |
185 | + * Dropped changes: |
186 | + - d/t/helper-functions: restart explicitly to fix test issues |
187 | + * Added changes: |
188 | + - d/p/lp-1940252-rtc-avoid-printing-and-scanning-time_t.patch: glibc 2.34 |
189 | + compatibility |
190 | + |
191 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 17 Aug 2021 12:22:32 +0200 |
192 | + |
193 | chrony (4.1-3) unstable; urgency=medium |
194 | |
195 | * Upload to unstable. |
196 | @@ -78,6 +185,51 @@ chrony (4.1-2) experimental; urgency=medium |
197 | |
198 | -- Vincent Blut <vincent.debian@free.fr> Sat, 26 Jun 2021 17:16:45 +0200 |
199 | |
200 | +chrony (4.1-1ubuntu1) impish; urgency=medium |
201 | + |
202 | + * Merge new upstream 4.1 and yet unrelased changes from Debian salsa. |
203 | + Remaining changes: |
204 | + - d/chrony.conf: use ubuntu ntp pool and server (LP 1744664 1754358) |
205 | + - Set -x as default if unable to set time (e.g. in containers) (LP 1589780) |
206 | + Chrony is a single service which acts as both NTP client (i.e. syncing the |
207 | + local clock) and NTP server (i.e. providing NTP services to the network), |
208 | + and that is both desired and expected in the vast majority of cases. |
209 | + But in containers syncing the local clock is usually impossible, but this |
210 | + shall not break the providing of NTP services to the network. |
211 | + To some extent this makes chrony's default config more similar to 'ntpd', |
212 | + which complained in syslog but still provided NTP server service in those |
213 | + cases. |
214 | + + debian/chrony.service: allow the service to run without CAP_SYS_TIME |
215 | + + debian/control: add new dependency libcap2-bin for capsh (usually |
216 | + installed anyway, but make them explicit to be sure). |
217 | + + debian/chrony.default: new option SYNC_IN_CONTAINER to not fall back |
218 | + (Default off) [fixed a minor typo in the comment in this update] |
219 | + + debian/chronyd-starter.sh: wrapper to handle special cases in containers |
220 | + and if CAP_SYS_TIME is missing. Effectively allows on to run NTP server |
221 | + in containers on a default installation and avoid failing to sync time |
222 | + (or if allowed to sync, avoid multiple containers to fight over it by |
223 | + accident). |
224 | + + debian/install: make chrony-starter.sh available on install. |
225 | + + debian/docs, debian/README.container: provide documentation about the |
226 | + handling of this case. |
227 | + * Dropped changes: |
228 | + - d/t/helper-functions: reduce default ubuntu config, to make space for |
229 | + testcase config |
230 | + [ in Debian 4.0-6 ] |
231 | + - d/t/{dynamically-add-source,ntp-server-and-nts-auth,helper-functions}: |
232 | + unify tests to use reload and restart |
233 | + [ in Debian 4.0-6 ] |
234 | + - d/t/upstream-simulation-test-suite: Update clknetsim version to fix |
235 | + a test failure on s390x when LTO is enabled at build time (LP #1921377) |
236 | + [ in Debian 4.1~pre1-1 ] |
237 | + - d/p/lp-1915006-sys_linux-allow-statx-and-fstatat64-in-seccomp-filte.patch: |
238 | + add compatibility for glibc 2.33 (LP: 1915006) |
239 | + [ upstream in 4.1-pre1 ] |
240 | + * Added changes: |
241 | + - d/t/helper-functions: restart explicitly to fix test issues |
242 | + |
243 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 18 May 2021 08:12:59 +0200 |
244 | + |
245 | chrony (4.1-1) experimental; urgency=medium |
246 | |
247 | * Import upstream version 4.1: |
248 | @@ -168,6 +320,54 @@ chrony (4.0-6) unstable; urgency=medium |
249 | |
250 | -- Vincent Blut <vincent.debian@free.fr> Sun, 21 Feb 2021 21:59:22 +0100 |
251 | |
252 | +chrony (4.0-5ubuntu3) hirsute; urgency=medium |
253 | + |
254 | + * d/t/upstream-simulation-test-suite: Update clknetsim version to fix |
255 | + a test failure on s390x when LTO is enabled at build time (LP: #1921377) |
256 | + |
257 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 25 Mar 2021 15:45:47 +0100 |
258 | + |
259 | +chrony (4.0-5ubuntu2) hirsute; urgency=medium |
260 | + |
261 | + * d/p/lp-1915006-sys_linux-allow-statx-and-fstatat64-in-seccomp-filte.patch: |
262 | + add compatibility for glibc 2.33 (LP: 1915006) |
263 | + |
264 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Mon, 15 Feb 2021 12:50:29 +0100 |
265 | + |
266 | +chrony (4.0-5ubuntu1) hirsute; urgency=medium |
267 | + |
268 | + * Merge with Debian unstable (LP: #1915006). Remaining changes: |
269 | + - d/chrony.conf: use ubuntu ntp pool and server (LP 1744664 1754358) |
270 | + - Set -x as default if unable to set time (e.g. in containers) (LP 1589780) |
271 | + Chrony is a single service which acts as both NTP client (i.e. syncing the |
272 | + local clock) and NTP server (i.e. providing NTP services to the network), |
273 | + and that is both desired and expected in the vast majority of cases. |
274 | + But in containers syncing the local clock is usually impossible, but this |
275 | + shall not break the providing of NTP services to the network. |
276 | + To some extent this makes chrony's default config more similar to 'ntpd', |
277 | + which complained in syslog but still provided NTP server service in those |
278 | + cases. |
279 | + + debian/chrony.service: allow the service to run without CAP_SYS_TIME |
280 | + + debian/control: add new dependency libcap2-bin for capsh (usually |
281 | + installed anyway, but make them explicit to be sure). |
282 | + + debian/chrony.default: new option SYNC_IN_CONTAINER to not fall back |
283 | + (Default off) [fixed a minor typo in the comment in this update] |
284 | + + debian/chronyd-starter.sh: wrapper to handle special cases in containers |
285 | + and if CAP_SYS_TIME is missing. Effectively allows on to run NTP server |
286 | + in containers on a default installation and avoid failing to sync time |
287 | + (or if allowed to sync, avoid multiple containers to fight over it by |
288 | + accident). |
289 | + + debian/install: make chrony-starter.sh available on install. |
290 | + + debian/docs, debian/README.container: provide documentation about the |
291 | + handling of this case. |
292 | + * Added changes: |
293 | + - d/t/helper-functions: reduce default ubuntu config, to make space for |
294 | + testcase config |
295 | + - d/t/{dynamically-add-source,ntp-server-and-nts-auth,helper-functions}: |
296 | + unify tests to use reload and restart |
297 | + |
298 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Mon, 08 Feb 2021 12:45:05 +0100 |
299 | + |
300 | chrony (4.0-5) unstable; urgency=medium |
301 | |
302 | * Follow DEP-14 branch naming conventions: |
303 | @@ -284,6 +484,35 @@ chrony (4.0-3) unstable; urgency=medium |
304 | |
305 | -- Vincent Blut <vincent.debian@free.fr> Mon, 18 Jan 2021 21:58:52 +0100 |
306 | |
307 | +chrony (4.0-2ubuntu1) hirsute; urgency=medium |
308 | + |
309 | + * Merge with Debian unstable. Remaining changes: |
310 | + - d/chrony.conf: use ubuntu ntp pool and server (LP 1744664 1754358) |
311 | + - Set -x as default if unable to set time (e.g. in containers) (LP 1589780) |
312 | + Chrony is a single service which acts as both NTP client (i.e. syncing the |
313 | + local clock) and NTP server (i.e. providing NTP services to the network), |
314 | + and that is both desired and expected in the vast majority of cases. |
315 | + But in containers syncing the local clock is usually impossible, but this |
316 | + shall not break the providing of NTP services to the network. |
317 | + To some extent this makes chrony's default config more similar to 'ntpd', |
318 | + which complained in syslog but still provided NTP server service in those |
319 | + cases. |
320 | + + debian/chrony.service: allow the service to run without CAP_SYS_TIME |
321 | + + debian/control: add new dependency libcap2-bin for capsh (usually |
322 | + installed anyway, but make them explicit to be sure). |
323 | + + debian/chrony.default: new option SYNC_IN_CONTAINER to not fall back |
324 | + (Default off) [fixed a minor typo in the comment in this update] |
325 | + + debian/chronyd-starter.sh: wrapper to handle special cases in containers |
326 | + and if CAP_SYS_TIME is missing. Effectively allows on to run NTP server |
327 | + in containers on a default installation and avoid failing to sync time |
328 | + (or if allowed to sync, avoid multiple containers to fight over it by |
329 | + accident). |
330 | + + debian/install: make chrony-starter.sh available on install. |
331 | + + debian/docs, debian/README.container: provide documentation about the |
332 | + handling of this case. |
333 | + |
334 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 27 Oct 2020 10:55:19 +0100 |
335 | + |
336 | chrony (4.0-2) unstable; urgency=medium |
337 | |
338 | * Merge branch 'experimental' into 'master'. |
339 | @@ -419,6 +648,44 @@ chrony (4.0~pre4-1) experimental; urgency=medium |
340 | |
341 | -- Vincent Blut <vincent.debian@free.fr> Fri, 02 Oct 2020 21:21:08 +0200 |
342 | |
343 | +chrony (3.5.1-1ubuntu2) groovy; urgency=medium |
344 | + |
345 | + * d/chronyd-starter.sh: fix commandline argument parsing (LP: #1898000) |
346 | + |
347 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 06 Oct 2020 12:20:40 +0200 |
348 | + |
349 | +chrony (3.5.1-1ubuntu1) groovy; urgency=medium |
350 | + |
351 | + * Merge with Debian unstable. Remaining changes: |
352 | + - d/chrony.conf: use ubuntu ntp pool and server (LP 1744664 1754358) |
353 | + - Set -x as default if unable to set time (e.g. in containers) (LP 1589780) |
354 | + Chrony is a single service which acts as both NTP client (i.e. syncing the |
355 | + local clock) and NTP server (i.e. providing NTP services to the network), |
356 | + and that is both desired and expected in the vast majority of cases. |
357 | + But in containers syncing the local clock is usually impossible, but this |
358 | + shall not break the providing of NTP services to the network. |
359 | + To some extent this makes chrony's default config more similar to 'ntpd', |
360 | + which complained in syslog but still provided NTP server service in those |
361 | + cases. |
362 | + + debian/chrony.service: allow the service to run without CAP_SYS_TIME |
363 | + + debian/control: add new dependency libcap2-bin for capsh (usually |
364 | + installed anyway, but make them explicit to be sure). |
365 | + + debian/chrony.default: new option SYNC_IN_CONTAINER to not fall back |
366 | + (Default off) [fixed a minor typo in the comment in this update] |
367 | + + debian/chronyd-starter.sh: wrapper to handle special cases in containers |
368 | + and if CAP_SYS_TIME is missing. Effectively allows to run NTP server in |
369 | + containers on a default installation and avoid failing to sync time (or |
370 | + if allowed to sync, avoid multiple containers to fight over it by |
371 | + accident). |
372 | + + debian/install: make chrony-starter.sh available on install. |
373 | + + debian/docs, debian/README.container: provide documentation about the |
374 | + handling of this case. |
375 | + * Dropped changes |
376 | + - d/t/control: harden time-sources-from-dhcp-servers test for systemd change |
377 | + (LP: 1873031) [no more needed with recent systemd that is in groovy] |
378 | + |
379 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 26 Aug 2020 15:30:48 +0200 |
380 | + |
381 | chrony (3.5.1-1) unstable; urgency=medium |
382 | |
383 | * Import upstream version 3.5.1: |
384 | @@ -434,6 +701,50 @@ chrony (3.5.1-1) unstable; urgency=medium |
385 | |
386 | -- Vincent Blut <vincent.debian@free.fr> Thu, 20 Aug 2020 14:07:22 +0200 |
387 | |
388 | +chrony (3.5-9ubuntu2) groovy; urgency=medium |
389 | + |
390 | + * No change rebuild against new libnettle8 and libhogweed6 ABI. |
391 | + |
392 | + -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 29 Jun 2020 22:22:19 +0100 |
393 | + |
394 | +chrony (3.5-9ubuntu1) groovy; urgency=medium |
395 | + |
396 | + * Merge with Debian unstable (LP: #1878005). Remaining changes: |
397 | + - d/chrony.conf: use ubuntu ntp pool and server (LP 1744664 1754358) |
398 | + - Set -x as default if unable to set time (e.g. in containers) (LP 1589780) |
399 | + Chrony is a single service which acts as both NTP client (i.e. syncing the |
400 | + local clock) and NTP server (i.e. providing NTP services to the network), |
401 | + and that is both desired and expected in the vast majority of cases. |
402 | + But in containers syncing the local clock is usually impossible, but this |
403 | + shall not break the providing of NTP services to the network. |
404 | + To some extent this makes chrony's default config more similar to 'ntpd', |
405 | + which complained in syslog but still provided NTP server service in those |
406 | + cases. |
407 | + + debian/chrony.service: allow the service to run without CAP_SYS_TIME |
408 | + + debian/control: add new dependency libcap2-bin for capsh (usually |
409 | + installed anyway, but make them explicit to be sure). |
410 | + + debian/chrony.default: new option SYNC_IN_CONTAINER to not fall back |
411 | + (Default off) [fixed a minor typo in the comment in this update] |
412 | + + debian/chronyd-starter.sh: wrapper to handle special cases in containers |
413 | + and if CAP_SYS_TIME is missing. Effectively allows to run NTP server in |
414 | + containers on a default installation and avoid failing to sync time (or |
415 | + if allowed to sync, avoid multiple containers to fight over it by |
416 | + accident). |
417 | + + debian/install: make chrony-starter.sh available on install. |
418 | + + debian/docs, debian/README.container: provide documentation about the |
419 | + handling of this case. |
420 | + - d/t/control: harden time-sources-from-dhcp-servers test for systemd change |
421 | + (LP: 1873031) |
422 | + * Dropped changes [in Debian now] |
423 | + - d/t/upstream-system-tests: stop chrony/systemd-timesynd before tests |
424 | + - d/t/upstream-system-tests: fix stderr in case services do not exist |
425 | + - Stop starting systemd-timesyncd in postrm. This is no longer relevant |
426 | + since systemd-timesyncd is a standalone package declaring |
427 | + Conflicts/Replaces/Provides: time-daemon. (Closes 955773, LP: 1872183) |
428 | + - d/postrm: Reinstate the remove target (LP: 1873810) |
429 | + |
430 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 20 May 2020 09:57:39 +0200 |
431 | + |
432 | chrony (3.5-9) unstable; urgency=medium |
433 | |
434 | * debian/patches/: |
435 | @@ -496,6 +807,76 @@ chrony (3.5-7) unstable; urgency=medium |
436 | |
437 | -- Vincent Blut <vincent.debian@free.fr> Tue, 17 Mar 2020 15:21:53 +0100 |
438 | |
439 | +chrony (3.5-6ubuntu6) focal; urgency=medium |
440 | + |
441 | + * d/postrm: Reinstate the remove target (LP: #1873810) |
442 | + |
443 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Mon, 20 Apr 2020 15:58:52 +0200 |
444 | + |
445 | +chrony (3.5-6ubuntu5) focal; urgency=medium |
446 | + |
447 | + * d/t/control: harden time-sources-from-dhcp-servers test for systemd change |
448 | + (LP: #1873031) |
449 | + |
450 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 15 Apr 2020 18:23:10 +0200 |
451 | + |
452 | +chrony (3.5-6ubuntu4) focal; urgency=medium |
453 | + |
454 | + * debian/postrm: |
455 | + - Stop starting systemd-timesyncd in postrm. This is no longer relevant |
456 | + since systemd-timesyncd is a standalone package declaring |
457 | + Conflicts/Replaces/Provides: time-daemon. (Closes 955773, LP: #1872183) |
458 | + |
459 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 15 Apr 2020 09:01:30 +0200 |
460 | + |
461 | +chrony (3.5-6ubuntu3) focal; urgency=medium |
462 | + |
463 | + * avoid multiple time services running concurrently (LP: #1870144). |
464 | + This fixes the autopkgtests vs chrond itself, the issue of concurrent |
465 | + systemd-timesyncd will be fixed in systemd by (LP 1849156) |
466 | + - d/t/upstream-system-tests: stop chrony/systemd-timesynd before tests |
467 | + - d/t/upstream-system-tests: fix stderr in case services do not exist |
468 | + |
469 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 01 Apr 2020 09:25:45 +0200 |
470 | + |
471 | +chrony (3.5-6ubuntu2) focal; urgency=medium |
472 | + |
473 | + * fix capsh usage in focal avoiding to always fall back to -x (LP: #1867036) |
474 | + - d/control: add versioned dependency to libcap2-bin new enough to |
475 | + support --has-p |
476 | + - d/chronyd-starter.sh: update capsh usage to use --has-p |
477 | + |
478 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 31 Mar 2020 10:19:20 +0200 |
479 | + |
480 | +chrony (3.5-6ubuntu1) focal; urgency=medium |
481 | + |
482 | + * Merge with Debian unstable (LP: #1866753). Remaining changes: |
483 | + - d/chrony.conf: use ubuntu ntp pool and server (LP 1744664 1754358) |
484 | + - Set -x as default if unable to set time (e.g. in containers) (LP 1589780) |
485 | + Chrony is a single service which acts as both NTP client (i.e. syncing the |
486 | + local clock) and NTP server (i.e. providing NTP services to the network), |
487 | + and that is both desired and expected in the vast majority of cases. |
488 | + But in containers syncing the local clock is usually impossible, but this |
489 | + shall not break the providing of NTP services to the network. |
490 | + To some extent this makes chrony's default config more similar to 'ntpd', |
491 | + which complained in syslog but still provided NTP server service in those |
492 | + cases. |
493 | + + debian/chrony.service: allow the service to run without CAP_SYS_TIME |
494 | + + debian/control: add new dependency libcap2-bin for capsh (usually |
495 | + installed anyway, but make them explicit to be sure). |
496 | + + debian/chrony.default: new option SYNC_IN_CONTAINER to not fall back |
497 | + (Default off) [fixed a minor typo in the comment in this update] |
498 | + + debian/chronyd-starter.sh: wrapper to handle special cases in containers |
499 | + and if CAP_SYS_TIME is missing. Effectively allows to run NTP server in |
500 | + containers on a default installation and avoid failing to sync time (or |
501 | + if allowed to sync, avoid multiple containers to fight over it by |
502 | + accident). |
503 | + + debian/install: make chrony-starter.sh available on install. |
504 | + + debian/docs, debian/README.container: provide documentation about the |
505 | + handling of this case. |
506 | + |
507 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 12 Mar 2020 11:02:33 +0100 |
508 | + |
509 | chrony (3.5-6) unstable; urgency=medium |
510 | |
511 | * debian/chrony.service: |
512 | @@ -530,6 +911,41 @@ chrony (3.5-6) unstable; urgency=medium |
513 | |
514 | -- Vincent Blut <vincent.debian@free.fr> Tue, 10 Mar 2020 19:17:16 +0100 |
515 | |
516 | +chrony (3.5-5ubuntu1) focal; urgency=medium |
517 | + |
518 | + * Merge with Debian unstable (LP: #1859969). Remaining changes: |
519 | + - d/chrony.conf: use ubuntu ntp pool and server (LP 1744664 1754358) |
520 | + - Set -x as default if unable to set time (e.g. in containers) (LP 1589780) |
521 | + Chrony is a single service which acts as both NTP client (i.e. syncing the |
522 | + local clock) and NTP server (i.e. providing NTP services to the network), |
523 | + and that is both desired and expected in the vast majority of cases. |
524 | + But in containers syncing the local clock is usually impossible, but this |
525 | + shall not break the providing of NTP services to the network. |
526 | + To some extent this makes chrony's default config more similar to 'ntpd', |
527 | + which complained in syslog but still provided NTP server service in those |
528 | + cases. |
529 | + + debian/chrony.service: allow the service to run without CAP_SYS_TIME |
530 | + + debian/control: add new dependency libcap2-bin for capsh (usually |
531 | + installed anyway, but make them explicit to be sure). |
532 | + + debian/chrony.default: new option SYNC_IN_CONTAINER to not fall back |
533 | + (Default off) [fixed a minor typo in the comment in this update] |
534 | + + debian/chronyd-starter.sh: wrapper to handle special cases in containers |
535 | + and if CAP_SYS_TIME is missing. Effectively allows to run NTP server in |
536 | + containers on a default installation and avoid failing to sync time (or |
537 | + if allowed to sync, avoid multiple containers to fight over it by |
538 | + accident). |
539 | + + debian/install: make chrony-starter.sh available on install. |
540 | + + debian/docs, debian/README.container: provide documentation about the |
541 | + handling of this case. |
542 | + * Dropped changes: |
543 | + - d/t/control: destructive_system_tests only work on amd64 and s390x right |
544 | + now [fixed by backporting fixes from upstream in 3.5-5 ] |
545 | + - d/t/upstream-simulation-test-suite: ignore warnings on stderr while |
546 | + running clksim make |
547 | + [ in Debian 3.5-5 ] |
548 | + |
549 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 16 Jan 2020 12:55:32 +0100 |
550 | + |
551 | chrony (3.5-5) unstable; urgency=medium |
552 | |
553 | * debian/control: |
554 | @@ -557,6 +973,47 @@ chrony (3.5-5) unstable; urgency=medium |
555 | |
556 | -- Vincent Blut <vincent.debian@free.fr> Sun, 22 Dec 2019 17:30:40 +0100 |
557 | |
558 | +chrony (3.5-4ubuntu2) focal; urgency=medium |
559 | + |
560 | + * d/t/control: destructive_system_tests only work on amd64 and s390x right |
561 | + now |
562 | + * d/t/upstream-simulation-test-suite: ignore warnings on stderr while |
563 | + running clksim make |
564 | + |
565 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 03 Dec 2019 14:50:50 +0100 |
566 | + |
567 | +chrony (3.5-4ubuntu1) focal; urgency=medium |
568 | + |
569 | + * Merge with Debian unstable (LP: #1854328). Remaining changes: |
570 | + - d/chrony.conf: use ubuntu ntp pool and server (LP 1744664 1754358) |
571 | + - Set -x as default if unable to set time (e.g. in containers) (LP 1589780) |
572 | + Chrony is a single service which acts as both NTP client (i.e. syncing the |
573 | + local clock) and NTP server (i.e. providing NTP services to the network), |
574 | + and that is both desired and expected in the vast majority of cases. |
575 | + But in containers syncing the local clock is usually impossible, but this |
576 | + shall not break the providing of NTP services to the network. |
577 | + To some extent this makes chrony's default config more similar to 'ntpd', |
578 | + which complained in syslog but still provided NTP server service in those |
579 | + cases. |
580 | + + debian/chrony.service: allow the service to run without CAP_SYS_TIME |
581 | + + debian/control: add new dependency libcap2-bin for capsh (usually |
582 | + installed anyway, but make them explicit to be sure). |
583 | + + debian/chrony.default: new option SYNC_IN_CONTAINER to not fall back |
584 | + (Default off) [fixed a minor typo in the comment in this update] |
585 | + + debian/chronyd-starter.sh: wrapper to handle special cases in containers |
586 | + and if CAP_SYS_TIME is missing. Effectively allows to run NTP server in |
587 | + containers on a default installation and avoid failing to sync time (or |
588 | + if allowed to sync, avoid multiple containers to fight over it by |
589 | + accident). |
590 | + + debian/install: make chrony-starter.sh available on install. |
591 | + + debian/docs, debian/README.container: provide documentation about the |
592 | + handling of this case. |
593 | + * Dropped changes: |
594 | + - d/t/control: allow stderr for recent changes in resolved/iproute |
595 | + (LP 1836882) [no more needed] |
596 | + |
597 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 28 Nov 2019 10:31:36 +0100 |
598 | + |
599 | chrony (3.5-4) unstable; urgency=medium |
600 | |
601 | * debian/tests/control: |
602 | @@ -601,6 +1058,52 @@ chrony (3.5-3) unstable; urgency=medium |
603 | |
604 | -- Vincent Blut <vincent.debian@free.fr> Tue, 13 Aug 2019 17:57:47 +0200 |
605 | |
606 | +chrony (3.5-2ubuntu3) focal; urgency=medium |
607 | + |
608 | + * No-change rebuild against libnettle7 |
609 | + |
610 | + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 31 Oct 2019 22:07:56 +0000 |
611 | + |
612 | +chrony (3.5-2ubuntu2) eoan; urgency=medium |
613 | + |
614 | + * d/t/control: allow stderr for recent changes in resolved/iproute |
615 | + (LP: #1836882) |
616 | + |
617 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 17 Jul 2019 12:41:58 +0200 |
618 | + |
619 | +chrony (3.5-2ubuntu1) eoan; urgency=medium |
620 | + |
621 | + * Merge with Debian experimental (LP: #1835046). Remaining changes: |
622 | + - d/chrony.conf: use ubuntu ntp pool and server (LP 1744664 1754358) |
623 | + - Set -x as default if unable to set time (e.g. in containers) (LP 1589780) |
624 | + Chrony is a single service which acts as both NTP client (i.e. syncing the |
625 | + local clock) and NTP server (i.e. providing NTP services to the network), |
626 | + and that is both desired and expected in the vast majority of cases. |
627 | + But in containers syncing the local clock is usually impossible, but this |
628 | + shall not break the providing of NTP services to the network. |
629 | + To some extent this makes chrony's default config more similar to 'ntpd', |
630 | + which complained in syslog but still provided NTP server service in those |
631 | + cases. |
632 | + + debian/chrony.service: allow the service to run without CAP_SYS_TIME |
633 | + + debian/control: add new dependency libcap2-bin for capsh (usually |
634 | + installed anyway, but make them explicit to be sure). |
635 | + + debian/chrony.default: new option SYNC_IN_CONTAINER to not fall back |
636 | + (Default off) [fixed a minor typo in the comment in this update] |
637 | + + debian/chronyd-starter.sh: wrapper to handle special cases in containers |
638 | + and if CAP_SYS_TIME is missing. Effectively allows to run NTP server in |
639 | + containers on a default installation and avoid failing to sync time (or |
640 | + if allowed to sync, avoid multiple containers to fight over it by |
641 | + accident). |
642 | + + debian/install: make chrony-starter.sh available on install. |
643 | + + debian/docs, debian/README.container: provide documentation about the |
644 | + handling of this case. |
645 | + * Dropped changes (accepted in Debian now): |
646 | + - d/postrm: re-establish systemd-timesyncd on removal (LP 1764357) |
647 | + - d/postrm: respect policy-rc.d when restoring systemd-timesyncd |
648 | + (LP 1771994) |
649 | + |
650 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 02 Jul 2019 13:37:23 +0200 |
651 | + |
652 | chrony (3.5-2) unstable; urgency=medium |
653 | |
654 | * Merge branch “experimental” into “master”. |
655 | @@ -687,6 +1190,56 @@ chrony (3.5~pre1-1) experimental; urgency=medium |
656 | |
657 | -- Vincent Blut <vincent.debian@free.fr> Sun, 12 May 2019 22:16:14 +0200 |
658 | |
659 | +chrony (3.4-4ubuntu2) eoan; urgency=medium |
660 | + |
661 | + * Dropped sysV change added in 3.4-4ubuntu1 (LP: #1829700): |
662 | + - removed d/init to avoid weird interactions between sysV and systemd |
663 | + [With debhelper compat level 12 this isn't an issue anymore] |
664 | + |
665 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 22 May 2019 09:10:41 +0200 |
666 | + |
667 | +chrony (3.4-4ubuntu1) eoan; urgency=medium |
668 | + |
669 | + * Merge with Debian unstable (LP: #1828992). Remaining changes: |
670 | + - d/chrony.conf: use ubuntu ntp pool and server (LP 1744664 1754358) |
671 | + - Set -x as default if unable to set time (e.g. in containers) (LP 1589780) |
672 | + Chrony is a single service which acts as both NTP client (i.e. syncing the |
673 | + local clock) and NTP server (i.e. providing NTP services to the network), |
674 | + and that is both desired and expected in the vast majority of cases. |
675 | + But in containers syncing the local clock is usually impossible, but this |
676 | + shall not break the providing of NTP services to the network. |
677 | + To some extent this makes chrony's default config more similar to 'ntpd', |
678 | + which complained in syslog but still provided NTP server service in those |
679 | + cases. |
680 | + + debian/chrony.service: allow the service to run without CAP_SYS_TIME |
681 | + + debian/control: add new dependency libcap2-bin for capsh (usually |
682 | + installed anyway, but make them explicit to be sure). |
683 | + + debian/chrony.default: new option SYNC_IN_CONTAINER to not fall back |
684 | + (Default off) [fixed a minor typo in the comment in this update] |
685 | + + debian/chronyd-starter.sh: wrapper to handle special cases in containers |
686 | + and if CAP_SYS_TIME is missing. Effectively allows to run NTP server in |
687 | + containers on a default installation and avoid failing to sync time (or |
688 | + if allowed to sync, avoid multiple containers to fight over it by |
689 | + accident). |
690 | + + debian/install: make chrony-starter.sh available on install. |
691 | + + debian/docs, debian/README.container: provide documentation about the |
692 | + handling of this case. |
693 | + - d/postrm: re-establish systemd-timesyncd on removal (LP 1764357) |
694 | + - d/postrm: respect policy-rc.d when restoring systemd-timesyncd |
695 | + (LP 1771994) |
696 | + * Added Changes: |
697 | + - removed d/init to avoid weird interactions between sysV and systemd |
698 | + * Dropped Changes: |
699 | + - Notify chrony to update sources in response to systemd-networkd |
700 | + events (LP: 1718227) |
701 | + + d/links: link dispatcher script to networkd-dispatcher events routable |
702 | + and off |
703 | + + d/control: set Recommends to networkd-dispatcher |
704 | + [Those are in Debian, except that we agreed to have networkd-dispatcher |
705 | + to only be a Suggests] |
706 | + |
707 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 14 May 2019 12:49:30 +0200 |
708 | + |
709 | chrony (3.4-4) unstable; urgency=medium |
710 | |
711 | * debian/patches/*: |
712 | @@ -763,6 +1316,48 @@ chrony (3.4-2) unstable; urgency=medium |
713 | |
714 | -- Vincent Blut <vincent.debian@free.fr> Wed, 13 Feb 2019 17:08:17 +0100 |
715 | |
716 | +chrony (3.4-1ubuntu1) disco; urgency=medium |
717 | + |
718 | + * Merge with Debian unstable (LP: #1802886). Remaining changes: |
719 | + - d/chrony.conf: use ubuntu ntp pool and server (LP 1744664) |
720 | + - Set -x as default if unable to set time (e.g. in containers) (LP: 1589780) |
721 | + Chrony is a single service which acts as both NTP client (i.e. syncing the |
722 | + local clock) and NTP server (i.e. providing NTP services to the network), |
723 | + and that is both desired and expected in the vast majority of cases. |
724 | + But in containers syncing the local clock is usually impossible, but this |
725 | + shall not break the providing of NTP services to the network. |
726 | + To some extent this makes chrony's default config more similar to 'ntpd', |
727 | + which complained in syslog but still provided NTP server service in those |
728 | + cases. |
729 | + + debian/chrony.service: allow the service to run without CAP_SYS_TIME |
730 | + + debian/control: add new dependency libcap2-bin for capsh (usually |
731 | + installed anyway, but make them explicit to be sure). |
732 | + + debian/chrony.default: new option SYNC_IN_CONTAINER to not fall back |
733 | + (Default off). |
734 | + + debian/chronyd-starter.sh: wrapper to handle special cases in containers |
735 | + and if CAP_SYS_TIME is missing. Effectively allows to run NTP server in |
736 | + containers on a default installation and avoid failing to sync time (or |
737 | + if allowed to sync, avoid multiple containers to fight over it by |
738 | + accident). |
739 | + + debian/install: make chronyd-starter.sh available on install. |
740 | + + debian/docs, debian/README.container: provide documentation about the |
741 | + handling of this case. |
742 | + - d/postrm: re-establish systemd-timesyncd on removal (LP: 1764357) |
743 | + - Notify chrony to update sources in response to systemd-networkd |
744 | + events (LP: 1718227) |
745 | + + d/links: link dispatcher script to networkd-dispatcher events routable |
746 | + and off |
747 | + + d/control: set Recommends to networkd-dispatcher |
748 | + * Dropped Changes (upstream): |
749 | + - d/p/lp-1718227-nm-dispatcher-for-networkd.patch |
750 | + - d/p/lp-1787366-fall-back-to-urandom.patch: avoid hangs when starting |
751 | + the service on newer kernels by falling back to urandom. (LP: 1787366) |
752 | + * Added Changes: |
753 | + - d/postrm: respect policy-rc.d when restoring systemd-timesyncd |
754 | + (LP: #1771994) |
755 | + |
756 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Mon, 12 Nov 2018 11:39:08 +0100 |
757 | + |
758 | chrony (3.4-1) unstable; urgency=medium |
759 | |
760 | * Import upstream version 3.4: |
761 | @@ -839,6 +1434,66 @@ chrony (3.3-3) unstable; urgency=medium |
762 | |
763 | -- Vincent Blut <vincent.debian@free.fr> Sat, 18 Aug 2018 16:23:19 +0200 |
764 | |
765 | +chrony (3.3-2ubuntu2) cosmic; urgency=medium |
766 | + |
767 | + * - d/p/lp-1787366-fall-back-to-urandom.patch: avoid hangs when starting |
768 | + the service on newer kernels by falling back to urandom. |
769 | + (LP: #1787366, Closes: #906276) |
770 | + |
771 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 16 Aug 2018 11:48:38 +0200 |
772 | + |
773 | +chrony (3.3-2ubuntu1) cosmic; urgency=medium |
774 | + |
775 | + * Merge with Debian unstable (LP: #1771061). Remaining changes: |
776 | + - d/chrony.conf: use ubuntu ntp pool and server (LP 1744664) |
777 | + - Set -x as default if unable to set time (e.g. in containers) (LP: 1589780) |
778 | + Chrony is a single service which acts as both NTP client (i.e. syncing the |
779 | + local clock) and NTP server (i.e. providing NTP services to the network), |
780 | + and that is both desired and expected in the vast majority of cases. |
781 | + But in containers syncing the local clock is usually impossible, but this |
782 | + shall not break the providing of NTP services to the network. |
783 | + To some extent this makes chrony's default config more similar to 'ntpd', |
784 | + which complained in syslog but still provided NTP server service in those |
785 | + cases. |
786 | + - debian/chrony.service: allow the service to run without CAP_SYS_TIME |
787 | + - debian/control: add new dependency libcap2-bin for capsh (usually |
788 | + installed anyway, but make them explicit to be sure). |
789 | + - debian/chrony.default: new option SYNC_IN_CONTAINER to not fall back |
790 | + (Default off). |
791 | + - debian/chronyd-starter.sh: wrapper to handle special cases in containers |
792 | + and if CAP_SYS_TIME is missing. Effectively allows to run NTP server in |
793 | + containers on a default installation and avoid failing to sync time (or |
794 | + if allowed to sync, avoid multiple containers to fight over it by |
795 | + accident). |
796 | + - debian/install: make chronyd-starter.sh available on install. |
797 | + - debian/docs, debian/README.container: provide documentation about the |
798 | + handling of this case. |
799 | + - d/postrm: re-establish systemd-timesyncd on removal (LP: 1764357) |
800 | + - Notify chrony to update sources in response to systemd-networkd |
801 | + events (LP: 1718227) |
802 | + - d/links: link dispatcher script to networkd-dispatcher events routable |
803 | + and off |
804 | + - d/control: set Recommends to networkd-dispatcher |
805 | + - d/p/lp-1718227-nm-dispatcher-for-networkd.patch |
806 | + * Dropped changes |
807 | + - debian/usr.sbin.chronyd: ensure RTC/GPS usage isn't blocked by apparmor |
808 | + (LP: 1751241) (in Debian now) |
809 | + - debian/usr.sbin.chronyd: add cap net_admin for hwtimestamp (LP: 1761327) |
810 | + (in Debian now) |
811 | + - d/p/lp1589780-sys_linux-don-t-keep-CAP_SYS_TIME-with-x-option.patch: |
812 | + When dropping the root privileges, don't try to keep the CAP_SYS_TIME |
813 | + capability if the -x option was enabled. This allows chronyd to be |
814 | + started without the capability (e.g. in containers) and also drop the |
815 | + root privileges (This is upstream now). |
816 | + - d/p/lp-1718227-ignore-non-up-down-events-in-nm-dispatcher.patch (This is |
817 | + upstream now). |
818 | + - d/control: switch to nss instead of tomcrypt (Debian switched to nettle |
819 | + which is in main, so we can drop this) |
820 | + * Added changes |
821 | + - debian/README.container: fix typos |
822 | + |
823 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Mon, 14 May 2018 09:06:01 +0200 |
824 | + |
825 | chrony (3.3-2) unstable; urgency=medium |
826 | |
827 | * debian/chrony.service: |
828 | @@ -894,6 +1549,76 @@ chrony (3.2-5) unstable; urgency=medium |
829 | |
830 | -- Vincent Blut <vincent.debian@free.fr> Wed, 28 Feb 2018 17:31:08 +0100 |
831 | |
832 | +chrony (3.2-4ubuntu4) bionic; urgency=medium |
833 | + |
834 | + * d/postrm: re-establish systemd-timesyncd on removal (LP: #1764357) |
835 | + * Notify chrony to update sources in response to systemd-networkd |
836 | + events (LP: #1718227) |
837 | + - d/links: link dispatcher script to networkd-dispatcher events routable |
838 | + and off |
839 | + - d/control: set Recommends to networkd-dispatcher |
840 | + - d/p/lp-1718227-ignore-non-up-down-events-in-nm-dispatcher.patch |
841 | + - d/p/lp-1718227-nm-dispatcher-for-networkd.patch |
842 | + |
843 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Mon, 16 Apr 2018 17:04:06 +0200 |
844 | + |
845 | +chrony (3.2-4ubuntu3) bionic; urgency=medium |
846 | + |
847 | + * debian/usr.sbin.chronyd: add cap net_admin for hwtimestamp (LP: #1761327) |
848 | + |
849 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 05 Apr 2018 09:38:10 +0200 |
850 | + |
851 | +chrony (3.2-4ubuntu2) bionic; urgency=medium |
852 | + |
853 | + * Set -x as default if unable to set time (e.g. in containers) (LP: #1589780) |
854 | + Chrony is a single service which acts as both NTP client (i.e. syncing the |
855 | + local clock) and NTP server (i.e. providing NTP services to the network), |
856 | + and that is both desired and expected in the vast majority of cases. |
857 | + But in containers syncing the local clock is usually impossible, but this |
858 | + shall not break the providing of NTP services to the network. |
859 | + To some extent this makes chrony's default config more similar to 'ntpd', |
860 | + which complained in syslog but still provided NTP server service in those |
861 | + cases. |
862 | + - d/p/lp1589780-sys_linux-don-t-keep-CAP_SYS_TIME-with-x-option.patch: |
863 | + When dropping the root privileges, don't try to keep the CAP_SYS_TIME |
864 | + capability if the -x option was enabled. This allows chronyd to be |
865 | + started without the capability (e.g. in containers) and also drop the |
866 | + root privileges. |
867 | + - debian/chrony.service: allow the service to run without CAP_SYS_TIME |
868 | + - debian/control: add new dependency libcap2-bin for capsh (usually |
869 | + installed anyway, but make them explicit to be sure). |
870 | + - debian/chrony.default: new option SYNC_IN_CONTAINER to not fall back |
871 | + (Default off). |
872 | + - debian/chronyd-starter.sh: wrapper to handle special cases in containers |
873 | + and if CAP_SYS_TIME is missing. Effectively allows to run NTP server in |
874 | + containers on a default installation and avoid failing to sync time (or |
875 | + if allowed to sync, avoid multiple containers to fight over it by |
876 | + accident). |
877 | + - debian/install: make chronyd-starter.sh available on install. |
878 | + - debian/docs, debian/README.container: provide documentation about the |
879 | + handling of this case. |
880 | + * debian/chrony.conf: update default chrony.conf to not violate the policy |
881 | + of pool.ntp.org (to use no more than four of their servers) and to provide |
882 | + more ipv6 capable sources by default (LP: #1754358) |
883 | + |
884 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Fri, 16 Mar 2018 12:25:44 +0100 |
885 | + |
886 | +chrony (3.2-4ubuntu1) bionic; urgency=medium |
887 | + |
888 | + * Merge with Debian unstable. Remaining changes: |
889 | + - d/control: switch to nss instead of tomcrypt (nss is in main) |
890 | + - d/chrony.conf: use ubuntu ntp pool and server (LP 1744664) |
891 | + * Dropped changes (in Debian) |
892 | + - d/chrony.default, d/chrony.service: support /etc/default/chrony |
893 | + DAEMON_OPTS in systemd environment (LP: 1746081) |
894 | + - d/chrony.service: properly start after networking (LP: 1746458) |
895 | + - d/usr.sbin.chronyd: allow to create /run/chrony on demand (LP: 1746444) |
896 | + * Added Changes: |
897 | + - debian/usr.sbin.chronyd: ensure RTC/GPS usage isn't blocked by apparmor |
898 | + (LP: #1751241, Closes: #891201) |
899 | + |
900 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Mon, 26 Feb 2018 14:44:54 +0100 |
901 | + |
902 | chrony (3.2-4) unstable; urgency=medium |
903 | |
904 | * debian/changelog: |
905 | @@ -960,6 +1685,27 @@ chrony (3.2-3) unstable; urgency=medium |
906 | |
907 | -- Vincent Blut <vincent.debian@free.fr> Wed, 07 Feb 2018 21:27:09 +0100 |
908 | |
909 | +chrony (3.2-2ubuntu3) bionic; urgency=medium |
910 | + |
911 | + * Revert the changes of (LP 1746458) as in the follow on discussion |
912 | + it became clear that we want it to start early (for example for an |
913 | + early offset from drift file). iIf needed chrony will later on pick |
914 | + up that servers are online via retries (augmented by hooks on network |
915 | + events). |
916 | + |
917 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 08 Feb 2018 10:52:30 +0100 |
918 | + |
919 | +chrony (3.2-2ubuntu2) bionic; urgency=medium |
920 | + |
921 | + * d/control: use to nss instead of tomcrypt (in main) (LP: #1744072) |
922 | + * d/chrony.conf: use ubuntu ntp pool and server (LP: #1744664) |
923 | + * d/chrony.default, d/chrony.service: support /etc/default/chrony |
924 | + DAEMON_OPTS in systemd environment (LP: #1746081) |
925 | + * d/chrony.service: properly start after networking (LP: #1746458) |
926 | + * d/usr.sbin.chronyd: allow to create /run/chrony on demand (LP: #1746444) |
927 | + |
928 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Fri, 19 Jan 2018 09:45:38 +0100 |
929 | + |
930 | chrony (3.2-2) unstable; urgency=medium |
931 | |
932 | * Initial AppArmor profile for chronyd. Thanks to Jamie |
933 | diff --git a/debian/chrony.conf b/debian/chrony.conf |
934 | index b3a9510..793227a 100644 |
935 | --- a/debian/chrony.conf |
936 | +++ b/debian/chrony.conf |
937 | @@ -4,8 +4,23 @@ |
938 | # Include configuration files found in /etc/chrony/conf.d. |
939 | confdir /etc/chrony/conf.d |
940 | |
941 | -# Use Debian vendor zone. |
942 | -pool 2.debian.pool.ntp.org iburst |
943 | +# This will use (up to): |
944 | +# - 4 sources from ntp.ubuntu.com which some are ipv6 enabled |
945 | +# - 2 sources from 2.ubuntu.pool.ntp.org which is ipv6 enabled as well |
946 | +# - 1 source from [01].ubuntu.pool.ntp.org each (ipv4 only atm) |
947 | +# This means by default, up to 6 dual-stack and up to 2 additional IPv4-only |
948 | +# sources will be used. |
949 | +# At the same time it retains some protection against one of the entries being |
950 | +# down (compare to just using one of the lines). See (LP: #1754358) for the |
951 | +# discussion. |
952 | +# |
953 | +# About using servers from the NTP Pool Project in general see (LP: #104525). |
954 | +# Approved by Ubuntu Technical Board on 2011-02-08. |
955 | +# See http://www.pool.ntp.org/join.html for more information. |
956 | +pool ntp.ubuntu.com iburst maxsources 4 |
957 | +pool 0.ubuntu.pool.ntp.org iburst maxsources 1 |
958 | +pool 1.ubuntu.pool.ntp.org iburst maxsources 1 |
959 | +pool 2.ubuntu.pool.ntp.org iburst maxsources 2 |
960 | |
961 | # Use time sources from DHCP. |
962 | sourcedir /run/chrony-dhcp |
963 | diff --git a/debian/chrony.default b/debian/chrony.default |
964 | index 028f63d..6e4e02a 100644 |
965 | --- a/debian/chrony.default |
966 | +++ b/debian/chrony.default |
967 | @@ -4,3 +4,7 @@ |
968 | |
969 | # Options to pass to chrony. |
970 | DAEMON_OPTS="-F 1" |
971 | + |
972 | +# Sync system clock in containers or without CAP_SYS_TIME (likely to fail) |
973 | +# See /usr/share/doc/chrony/README.container for details. |
974 | +SYNC_IN_CONTAINER="no" |
975 | diff --git a/debian/chrony.service b/debian/chrony.service |
976 | index c3050fa..c06f3f7 100644 |
977 | --- a/debian/chrony.service |
978 | +++ b/debian/chrony.service |
979 | @@ -5,13 +5,12 @@ Conflicts=openntpd.service ntp.service ntpsec.service |
980 | Wants=time-sync.target |
981 | Before=time-sync.target |
982 | After=network.target |
983 | -ConditionCapability=CAP_SYS_TIME |
984 | |
985 | [Service] |
986 | Type=forking |
987 | PIDFile=/run/chrony/chronyd.pid |
988 | EnvironmentFile=-/etc/default/chrony |
989 | -ExecStart=/usr/sbin/chronyd $DAEMON_OPTS |
990 | +ExecStart=/usr/lib/systemd/scripts/chronyd-starter.sh $DAEMON_OPTS |
991 | |
992 | CapabilityBoundingSet=~CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE |
993 | CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_KILL CAP_LEASE CAP_LINUX_IMMUTABLE |
994 | diff --git a/debian/chronyd-starter.sh b/debian/chronyd-starter.sh |
995 | new file mode 100755 |
996 | index 0000000..2539ffe |
997 | --- /dev/null |
998 | +++ b/debian/chronyd-starter.sh |
999 | @@ -0,0 +1,68 @@ |
1000 | +#!/bin/sh |
1001 | +set -ue |
1002 | + |
1003 | +CONF="/etc/default/chrony" |
1004 | +DOC="/usr/share/doc/chrony/README.container" |
1005 | +CAP="cap_sys_time" |
1006 | +CMD="/usr/sbin/chronyd" |
1007 | +# Take any args passed, use none if nothing was specified |
1008 | +EFFECTIVE_DAEMON_OPTS=${@:-""} |
1009 | + |
1010 | +if [ -f "${CONF}" ]; then |
1011 | + . "${CONF}" |
1012 | +else |
1013 | + echo "<4>Warning: ${CONF} is missing" |
1014 | +fi |
1015 | +# take from conffile if available, default to no otherwise |
1016 | +EFFECTIVE_SYNC_IN_CONTAINER=${SYNC_IN_CONTAINER:-"no"} |
1017 | + |
1018 | +if [ ! -x "${CMD}" ]; then |
1019 | + echo "<3>Error: ${CMD} not executable" |
1020 | + # ugly, but works around https://github.com/systemd/systemd/issues/2913 |
1021 | + sleep 0.1 |
1022 | + exit 1 |
1023 | +fi |
1024 | + |
1025 | +# Check if -x is already set manually, don't process further if that is the case |
1026 | +X_SET=0 |
1027 | +for arg in $@; do |
1028 | + if echo "$arg" | grep -q -e '^-[a-zA-Z0-9]*x'; then |
1029 | + X_SET=1 |
1030 | + fi |
1031 | +done |
1032 | + |
1033 | +if [ ${X_SET} -ne 1 ]; then |
1034 | + # Assume it is not in a container |
1035 | + IS_CONTAINER=0 |
1036 | + if [ -x /usr/bin/systemd-detect-virt ]; then |
1037 | + if /usr/bin/systemd-detect-virt --quiet --container; then |
1038 | + IS_CONTAINER=1 |
1039 | + fi |
1040 | + fi |
1041 | + |
1042 | + |
1043 | + # Assume it has the cap |
1044 | + HAS_CAP=1 |
1045 | + CAPSH="/sbin/capsh" |
1046 | + if [ -x "${CAPSH}" ]; then |
1047 | + ${CAPSH} --has-p="${CAP}" || HAS_CAP=0 |
1048 | + fi |
1049 | + |
1050 | + if [ ${HAS_CAP} -eq 0 ]; then |
1051 | + echo "<4>Warning: Missing ${CAP}, syncing the system clock will fail" |
1052 | + fi |
1053 | + if [ ${IS_CONTAINER} -eq 1 ]; then |
1054 | + echo "<4>Warning: Running in a container, likely impossible and unintended to sync system clock" |
1055 | + fi |
1056 | + |
1057 | + if [ ${HAS_CAP} -eq 0 -o ${IS_CONTAINER} -eq 1 ]; then |
1058 | + if [ "${EFFECTIVE_SYNC_IN_CONTAINER}" != "yes" ]; then |
1059 | + echo "<5>Adding -x as fallback disabling control of the system clock, see ${DOC} to override this behavior" |
1060 | + EFFECTIVE_DAEMON_OPTS="${EFFECTIVE_DAEMON_OPTS} -x" |
1061 | + else |
1062 | + echo "<5>Not falling back to disable control of the system clock, see ${DOC} to change this behavior" |
1063 | + fi |
1064 | + fi |
1065 | +fi |
1066 | + |
1067 | +${CMD} ${EFFECTIVE_DAEMON_OPTS} |
1068 | diff --git a/debian/control b/debian/control |
1069 | index 4d0dbfd..123e334 100644 |
1070 | --- a/debian/control |
1071 | +++ b/debian/control |
1072 | @@ -1,7 +1,8 @@ |
1073 | Source: chrony |
1074 | Section: net |
1075 | Priority: optional |
1076 | -Maintainer: Vincent Blut <vincent.debian@free.fr> |
1077 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
1078 | +XSBC-Original-Maintainer: Vincent Blut <vincent.debian@free.fr> |
1079 | Standards-Version: 4.6.0 |
1080 | Build-Depends: asciidoctor, |
1081 | bison, |
1082 | @@ -27,6 +28,7 @@ Architecture: linux-any |
1083 | Pre-Depends: ${misc:Pre-Depends} |
1084 | Depends: adduser, |
1085 | iproute2 [linux-any], |
1086 | + libcap2-bin (>= 1:2.32-1), |
1087 | tzdata, |
1088 | ucf, |
1089 | ${misc:Depends}, |
1090 | diff --git a/debian/docs b/debian/docs |
1091 | index e12f653..3bfc9dc 100644 |
1092 | --- a/debian/docs |
1093 | +++ b/debian/docs |
1094 | @@ -1,3 +1,4 @@ |
1095 | FAQ |
1096 | NEWS |
1097 | README |
1098 | +debian/README.container |
1099 | diff --git a/debian/install b/debian/install |
1100 | index e7dc12a..2647461 100644 |
1101 | --- a/debian/install |
1102 | +++ b/debian/install |
1103 | @@ -5,3 +5,4 @@ debian/conf.d etc/chrony |
1104 | debian/ntp-units.d/50-chrony.list usr/lib/systemd/ntp-units.d |
1105 | debian/sources.d etc/chrony |
1106 | debian/usr.sbin.chronyd etc/apparmor.d |
1107 | +debian/chronyd-starter.sh usr/lib/systemd/scripts/ |
PPA: https:/ /launchpad. net/~ci- train-ppa- service/ +archive/ ubuntu/ 4774 launchpad. net/~paelzer/ ubuntu/ +source/ chrony 4.2-0ubuntu1 -> logical/ 4.2-0ubuntu1 4.2-0ubuntu1 -> reconstruct/ 4.2-0ubuntu1
Tags:
To ssh://git.
* [new tag] logical/
* [new tag] reconstruct/
* [new tag] split/4.2-0ubuntu1 -> split/4.2-0ubuntu1
Autopkgtests are running (I've done this merge as in the past libc has often triggered issues and that provides a change to run build & test for something more useful than just sniff testing).