Merge ~mkukri/ubuntu/+source/cryptsetup:merge into ubuntu/+source/cryptsetup:debian/sid
- Git
- lp:~mkukri/ubuntu/+source/cryptsetup
- merge
- Merge into debian/sid
Proposed by
Mate Kukri
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Merge reported by: | Mate Kukri | ||||||||
Merged at revision: | 5092a322e94ccbf5a2e97f9d42070bda8dec8d1c | ||||||||
Proposed branch: | ~mkukri/ubuntu/+source/cryptsetup:merge | ||||||||
Merge into: | ubuntu/+source/cryptsetup:debian/sid | ||||||||
Diff against target: |
2709 lines (+2061/-27) 14 files modified
debian/changelog (+1931/-0) debian/control (+7/-5) debian/functions (+9/-1) debian/initramfs/cryptroot-unlock (+12/-6) debian/initramfs/hooks/cryptroot (+5/-3) debian/rules (+3/-0) debian/tests/control (+3/-2) debian/tests/cryptroot-lvm.d/mock (+7/-2) debian/tests/cryptroot-nested.d/config (+7/-0) debian/tests/cryptroot-sysvinit.d/config (+7/-2) debian/tests/initramfs-hook (+16/-2) debian/tests/utils/cryptroot-common (+27/-3) debian/tests/utils/mkinitramfs (+2/-0) debian/tests/utils/mock.pm (+25/-1) |
||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Lukas Märdian (community) | Approve | ||
Simon Quigley | Pending | ||
Review via email:
|
This proposal supersedes a proposal from 2024-01-03.
Commit message
Merge with Debian sid. Rebased the previously split Ubuntu changes.
Description of the change
To post a comment you must log in.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Simon Quigley (tsimonq2) wrote : Posted in a previous version of this proposal | # |
review:
Needs Fixing
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Lukas Märdian (slyon) wrote : | # |
Test build available in https:/
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Lukas Märdian (slyon) wrote : | # |
Diff against ubuntu/noble-devel and debian/sid are looking good. Delta got split up nicely.
Test builds are looking good, passing the build-time tests.
Autopkgtests need investigation, but this is unrelated to this merge (they have been failing for a while).
LGTM.
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/debian/changelog b/debian/changelog | |||
2 | index 78803a1..edadf8b 100644 | |||
3 | --- a/debian/changelog | |||
4 | +++ b/debian/changelog | |||
5 | @@ -1,3 +1,34 @@ | |||
6 | 1 | cryptsetup (2:2.6.1-6ubuntu1) noble; urgency=medium | ||
7 | 2 | |||
8 | 3 | * Merge with Debian unstable. Remaining changes: | ||
9 | 4 | - Support zstd compressed modules for the self test. | ||
10 | 5 | - Compile-in support for a FIPS mode. LP #2032659 | ||
11 | 6 | - debian/control: | ||
12 | 7 | + Recommend plymouth. | ||
13 | 8 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
14 | 9 | + Move cryptsetup-initramfs back to cryptsetup's Recommends. | ||
15 | 10 | + Do not build cryptsetup-suspend binary package on i386. | ||
16 | 11 | - Fix cryptroot-unlock for busybox compatibility. | ||
17 | 12 | - Fix warning and error when running on ZFS on root | ||
18 | 13 | + d/functions: Return an empty devno for ZFS devices as they don't have | ||
19 | 14 | major:minor device numbers. | ||
20 | 15 | + d/initramfs/hooks/cryptroot: Ignore and don't print an error message | ||
21 | 16 | when devices don't have a devno. | ||
22 | 17 | - Fix cryptroot-* autopkgtests on Ubuntu. (LP #1983522) | ||
23 | 18 | + debian/tests/utils/mock.pm: return from consume() function if select() | ||
24 | 19 | times out or fails | ||
25 | 20 | + debian/tests/utils/cryptroot-common: fix apt source and kernel package | ||
26 | 21 | names for Ubuntu | ||
27 | 22 | + debian/tests/cryptroot-sysvinit.d: use systemd-sysv init for Ubuntu | ||
28 | 23 | cryptroot-sysvinit package test | ||
29 | 24 | + debian/tests/cryptroot-nested.d: fix cryptsetup-nested test, add | ||
30 | 25 | workaround for LP1831747 by adding a e2fsprogs dependency | ||
31 | 26 | + debian/tests/initramfs-hook: fix test's initramfs layout for Ubuntu and | ||
32 | 27 | allow blowfish test use 64Mb of provisioned space (drop --size) | ||
33 | 28 | + debian/tests/control: disable cryptdisks test | ||
34 | 29 | |||
35 | 30 | -- Mate Kukri <mate.kukri@canonical.com> Wed, 03 Jan 2024 10:38:16 +0000 | ||
36 | 31 | |||
37 | 1 | cryptsetup (2:2.6.1-6) unstable; urgency=medium | 32 | cryptsetup (2:2.6.1-6) unstable; urgency=medium |
38 | 2 | 33 | ||
39 | 3 | [ Kevin Locke ] | 34 | [ Kevin Locke ] |
40 | @@ -11,6 +42,37 @@ cryptsetup (2:2.6.1-6) unstable; urgency=medium | |||
41 | 11 | 42 | ||
42 | 12 | -- Guilhem Moulin <guilhem@debian.org> Tue, 05 Dec 2023 17:48:58 +0100 | 43 | -- Guilhem Moulin <guilhem@debian.org> Tue, 05 Dec 2023 17:48:58 +0100 |
43 | 13 | 44 | ||
44 | 45 | cryptsetup (2:2.6.1-5ubuntu1) noble; urgency=medium | ||
45 | 46 | |||
46 | 47 | * Merge with Debian unstable. Remaining changes: | ||
47 | 48 | - Support zstd compressed modules for the self test. | ||
48 | 49 | - Compile-in support for a FIPS mode. LP #2032659 | ||
49 | 50 | - debian/control: | ||
50 | 51 | + Recommend plymouth. | ||
51 | 52 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
52 | 53 | + Move cryptsetup-initramfs back to cryptsetup's Recommends. | ||
53 | 54 | + Do not build cryptsetup-suspend binary package on i386. | ||
54 | 55 | - Fix cryptroot-unlock for busybox compatibility. | ||
55 | 56 | - Fix warning and error when running on ZFS on root | ||
56 | 57 | + d/functions: Return an empty devno for ZFS devices as they don't have | ||
57 | 58 | major:minor device numbers. | ||
58 | 59 | + d/initramfs/hooks/cryptroot: Ignore and don't print an error message | ||
59 | 60 | when devices don't have a devno. | ||
60 | 61 | - Fix cryptroot-* autopkgtests on Ubuntu. (LP #1983522) | ||
61 | 62 | + debian/tests/utils/mock.pm: return from consume() function if select() | ||
62 | 63 | times out or fails | ||
63 | 64 | + debian/tests/utils/cryptroot-common: fix apt source and kernel package | ||
64 | 65 | names for Ubuntu | ||
65 | 66 | + debian/tests/cryptroot-sysvinit.d: use systemd-sysv init for Ubuntu | ||
66 | 67 | cryptroot-sysvinit package test | ||
67 | 68 | + debian/tests/cryptroot-nested.d: fix cryptsetup-nested test, add | ||
68 | 69 | workaround for LP1831747 by adding a e2fsprogs dependency | ||
69 | 70 | + debian/tests/initramfs-hook: fix test's initramfs layout for Ubuntu and | ||
70 | 71 | allow blowfish test use 64Mb of provisioned space (drop --size) | ||
71 | 72 | + debian/tests/control: disable cryptdisks test | ||
72 | 73 | |||
73 | 74 | -- Mate Kukri <mate.kukri@canonical.com> Mon, 20 Nov 2023 09:50:25 +0000 | ||
74 | 75 | |||
75 | 14 | cryptsetup (2:2.6.1-5) unstable; urgency=medium | 76 | cryptsetup (2:2.6.1-5) unstable; urgency=medium |
76 | 15 | 77 | ||
77 | 16 | [ Guilhem Moulin ] | 78 | [ Guilhem Moulin ] |
78 | @@ -24,6 +86,49 @@ cryptsetup (2:2.6.1-5) unstable; urgency=medium | |||
79 | 24 | 86 | ||
80 | 25 | -- Guilhem Moulin <guilhem@debian.org> Sun, 27 Aug 2023 12:24:57 +0200 | 87 | -- Guilhem Moulin <guilhem@debian.org> Sun, 27 Aug 2023 12:24:57 +0200 |
81 | 26 | 88 | ||
82 | 89 | cryptsetup (2:2.6.1-4ubuntu3) mantic; urgency=medium | ||
83 | 90 | |||
84 | 91 | * Support zstd compressed modules for the self test. | ||
85 | 92 | |||
86 | 93 | -- Andrea Righi <andrea.righi@canonical.com> Mon, 11 Sep 2023 15:05:35 +0000 | ||
87 | 94 | |||
88 | 95 | cryptsetup (2:2.6.1-4ubuntu2) mantic; urgency=medium | ||
89 | 96 | |||
90 | 97 | * Compile-in support for a FIPS mode. LP: #2032659 | ||
91 | 98 | |||
92 | 99 | -- Dimitri John Ledkov <dimitri.ledkov@canonical.com> Tue, 22 Aug 2023 16:06:53 +0100 | ||
93 | 100 | |||
94 | 101 | cryptsetup (2:2.6.1-4ubuntu1) mantic; urgency=medium | ||
95 | 102 | |||
96 | 103 | * Merge with Debian unstable (LP: #2019292). Remaining changes: | ||
97 | 104 | - debian/control: | ||
98 | 105 | + Recommend plymouth. | ||
99 | 106 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
100 | 107 | + Move cryptsetup-initramfs back to cryptsetup's Recommends. | ||
101 | 108 | + Do not build cryptsetup-suspend binary package on i386. | ||
102 | 109 | - Fix cryptroot-unlock for busybox compatibility. | ||
103 | 110 | - Fix warning and error when running on ZFS on root | ||
104 | 111 | - d/functions: Return an empty devno for ZFS devices as they don't have | ||
105 | 112 | major:minor device numbers. | ||
106 | 113 | - d/initramfs/hooks/cryptroot: Ignore and don't print an error message | ||
107 | 114 | when devices don't have a devno. | ||
108 | 115 | - debian/patches/decrease_memlock_ulimit.patch | ||
109 | 116 | Fixed FTBFS due to a restricted build environment | ||
110 | 117 | - Fix cryptroot-* autopkgtests on Ubuntu. (LP: #1983522) | ||
111 | 118 | + debian/tests/utils/mock.pm: return from consume() function if select() | ||
112 | 119 | times out or fails | ||
113 | 120 | + debian/tests/utils/cryptroot-common: fix apt source and kernel package | ||
114 | 121 | names for Ubuntu | ||
115 | 122 | + debian/tests/cryptroot-sysvinit.d: use systemd-sysv init for Ubuntu | ||
116 | 123 | cryptroot-sysvinit package test | ||
117 | 124 | + debian/tests/cryptroot-nested.d: fix cryptsetup-nested test, add | ||
118 | 125 | workaround for LP1831747 by adding a e2fsprogs dependency | ||
119 | 126 | + debian/tests/initramfs-hook: fix test's initramfs layout for Ubuntu and | ||
120 | 127 | allow blowfish test use 64Mb of provisioned space (drop --size) | ||
121 | 128 | + debian/tests/control: disable cryptdisks test | ||
122 | 129 | |||
123 | 130 | -- Vladimir Petko <vladimir.petko@canonical.com> Mon, 15 May 2023 09:55:25 +1200 | ||
124 | 131 | |||
125 | 27 | cryptsetup (2:2.6.1-4) unstable; urgency=medium | 132 | cryptsetup (2:2.6.1-4) unstable; urgency=medium |
126 | 28 | 133 | ||
127 | 29 | * Backport upstream MR !498, see #1028250: | 134 | * Backport upstream MR !498, see #1028250: |
128 | @@ -58,6 +163,37 @@ cryptsetup (2:2.6.1-2) unstable; urgency=medium | |||
129 | 58 | 163 | ||
130 | 59 | -- Guilhem Moulin <guilhem@debian.org> Thu, 02 Mar 2023 05:01:53 +0100 | 164 | -- Guilhem Moulin <guilhem@debian.org> Thu, 02 Mar 2023 05:01:53 +0100 |
131 | 60 | 165 | ||
132 | 166 | cryptsetup (2:2.6.1-1ubuntu1) lunar; urgency=low | ||
133 | 167 | |||
134 | 168 | * Merge with Debian unstable (LP: #2004423). Remaining changes: | ||
135 | 169 | - debian/control: | ||
136 | 170 | + Recommend plymouth. | ||
137 | 171 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
138 | 172 | + Move cryptsetup-initramfs back to cryptsetup's Recommends. | ||
139 | 173 | + Do not build cryptsetup-suspend binary package on i386. | ||
140 | 174 | - Fix cryptroot-unlock for busybox compatibility. | ||
141 | 175 | - Fix warning and error when running on ZFS on root | ||
142 | 176 | - d/functions: Return an empty devno for ZFS devices as they don't have | ||
143 | 177 | major:minor device numbers. | ||
144 | 178 | - d/initramfs/hooks/cryptroot: Ignore and don't print an error message | ||
145 | 179 | when devices don't have a devno. | ||
146 | 180 | - debian/patches/decrease_memlock_ulimit.patch | ||
147 | 181 | Fixed FTBFS due to a restricted build environment | ||
148 | 182 | - Fix cryptroot-* autopkgtests on Ubuntu. (LP: #1983522) | ||
149 | 183 | + debian/tests/utils/mock.pm: return from consume() function if select() | ||
150 | 184 | times out or fails | ||
151 | 185 | + debian/tests/utils/cryptroot-common: fix apt source and kernel package | ||
152 | 186 | names for Ubuntu | ||
153 | 187 | + debian/tests/cryptroot-sysvinit.d: use systemd-sysv init for Ubuntu | ||
154 | 188 | cryptroot-sysvinit package test | ||
155 | 189 | + debian/tests/cryptroot-nested.d: fix cryptsetup-nested test, add | ||
156 | 190 | workaround for LP1831747 by adding a e2fsprogs dependency | ||
157 | 191 | + debian/tests/initramfs-hook: fix test's initramfs layout for Ubuntu and | ||
158 | 192 | allow blowfish test use 64Mb of provisioned space (drop --size) | ||
159 | 193 | + debian/tests/control: disable cryptdisks test | ||
160 | 194 | |||
161 | 195 | -- Vladimir Petko <vladimir.petko@canonical.com> Mon, 13 Feb 2023 15:57:18 +1300 | ||
162 | 196 | |||
163 | 61 | cryptsetup (2:2.6.1-1) unstable; urgency=medium | 197 | cryptsetup (2:2.6.1-1) unstable; urgency=medium |
164 | 62 | 198 | ||
165 | 63 | * New upstream bugfix release. | 199 | * New upstream bugfix release. |
166 | @@ -107,6 +243,54 @@ cryptsetup (2:2.6.0~rc0-1) experimental; urgency=medium | |||
167 | 107 | 243 | ||
168 | 108 | -- Guilhem Moulin <guilhem@debian.org> Sat, 19 Nov 2022 17:30:40 +0100 | 244 | -- Guilhem Moulin <guilhem@debian.org> Sat, 19 Nov 2022 17:30:40 +0100 |
169 | 109 | 245 | ||
170 | 246 | cryptsetup (2:2.5.0-6ubuntu3) lunar; urgency=medium | ||
171 | 247 | |||
172 | 248 | * Fix cryptroot-lvm autopkgtest on Ubuntu. (LP: #1983522) | ||
173 | 249 | - debian/tests/control: enable cryptroot-lvm | ||
174 | 250 | - debian/tests/utils/mock.pm: return from consume() function if select() | ||
175 | 251 | times out or fails | ||
176 | 252 | |||
177 | 253 | -- Vladimir Petko <vladimir.petko@canonical.com> Fri, 02 Dec 2022 15:53:42 +1300 | ||
178 | 254 | |||
179 | 255 | cryptsetup (2:2.5.0-6ubuntu2) lunar; urgency=medium | ||
180 | 256 | |||
181 | 257 | * Fix cryptroot-* autopkgtests on Ubuntu. (LP: #1983522) | ||
182 | 258 | - debian/tests/utils/cryptroot-common: fix apt source and kernel package | ||
183 | 259 | names for Ubuntu | ||
184 | 260 | - debian/tests/cryptroot-sysvinit.d: use systemd-sysv init for Ubuntu | ||
185 | 261 | cryptroot-sysvinit package test | ||
186 | 262 | - debian/tests/cryptroot-nested.d: fix cryptsetup-nested test, add | ||
187 | 263 | workaround for LP1831747 by adding a e2fsprogs dependency | ||
188 | 264 | - debian/tests/control: disable cryptdisks, cryptroot-lvm due to CI | ||
189 | 265 | failures and update comments | ||
190 | 266 | - debian/tests/utils/mock.pm: fix cryptoroot-lvm test adding retries to the | ||
191 | 267 | suspend operation and consuming the console buffer before making | ||
192 | 268 | assertions. It still hangs in CI and requires further work. | ||
193 | 269 | - debian/tests/initramfs-hook: fix test's initramfs layout for Ubuntu and | ||
194 | 270 | allow blowfish test use 64Mb of provisioned space (drop --size) | ||
195 | 271 | |||
196 | 272 | -- Vladimir Petko <vladimir.petko@canonical.com> Fri, 02 Dec 2022 14:14:42 +1300 | ||
197 | 273 | |||
198 | 274 | cryptsetup (2:2.5.0-6ubuntu1) lunar; urgency=low | ||
199 | 275 | |||
200 | 276 | * Merge from Debian unstable. Remaining changes: | ||
201 | 277 | - debian/control: | ||
202 | 278 | + Recommend plymouth. | ||
203 | 279 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
204 | 280 | + Move cryptsetup-initramfs back to cryptsetup's Recommends. | ||
205 | 281 | + Do not build cryptsetup-suspend binary package on i386. | ||
206 | 282 | - Fix cryptroot-unlock for busybox compatibility. | ||
207 | 283 | - Fix warning and error when running on ZFS on root | ||
208 | 284 | - d/functions: Return an empty devno for ZFS devices as they don't have | ||
209 | 285 | major:minor device numbers. | ||
210 | 286 | - d/initramfs/hooks/cryptroot: Ignore and don't print an error message | ||
211 | 287 | when devices don't have a devno. | ||
212 | 288 | - debian/patches/decrease_memlock_ulimit.patch | ||
213 | 289 | Fixed FTBFS due to a restricted build environment | ||
214 | 290 | - Disable failing Debian-tailored cryptroot-* autopkgtests | ||
215 | 291 | |||
216 | 292 | -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 07 Nov 2022 08:36:38 -0800 | ||
217 | 293 | |||
218 | 110 | cryptsetup (2:2.5.0-6) unstable; urgency=medium | 294 | cryptsetup (2:2.5.0-6) unstable; urgency=medium |
219 | 111 | 295 | ||
220 | 112 | * d/t/cryptroot-*: Mask systemd-firstboot.service. | 296 | * d/t/cryptroot-*: Mask systemd-firstboot.service. |
221 | @@ -202,6 +386,26 @@ cryptsetup (2:2.5.0-3) unstable; urgency=low | |||
222 | 202 | 386 | ||
223 | 203 | -- Guilhem Moulin <guilhem@debian.org> Sun, 18 Sep 2022 23:01:46 +0200 | 387 | -- Guilhem Moulin <guilhem@debian.org> Sun, 18 Sep 2022 23:01:46 +0200 |
224 | 204 | 388 | ||
225 | 389 | cryptsetup (2:2.5.0-2ubuntu1) kinetic; urgency=medium | ||
226 | 390 | |||
227 | 391 | * Merge from Debian unstable. Remaining changes: | ||
228 | 392 | - debian/control: | ||
229 | 393 | + Recommend plymouth. | ||
230 | 394 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
231 | 395 | + Move cryptsetup-initramfs back to cryptsetup's Recommends. | ||
232 | 396 | + Do not build cryptsetup-suspend binary package on i386. | ||
233 | 397 | - Fix cryptroot-unlock for busybox compatibility. | ||
234 | 398 | - Fix warning and error when running on ZFS on root: (LP: #1830110) | ||
235 | 399 | - d/functions: Return an empty devno for ZFS devices as they don't have | ||
236 | 400 | major:minor device numbers. | ||
237 | 401 | - d/initramfs/hooks/cryptroot: Ignore and don't print an error message | ||
238 | 402 | when devices don't have a devno. | ||
239 | 403 | - debian/patches/decrease_memlock_ulimit.patch | ||
240 | 404 | Fixed FTBFS due to a restricted build environment | ||
241 | 405 | * Disable failing Debian-tailored cryptroot-* autopkgtests, see bug #1983522 | ||
242 | 406 | |||
243 | 407 | -- Benjamin Drung <bdrung@ubuntu.com> Wed, 24 Aug 2022 00:56:28 +0200 | ||
244 | 408 | |||
245 | 205 | cryptsetup (2:2.5.0-2) unstable; urgency=low | 409 | cryptsetup (2:2.5.0-2) unstable; urgency=low |
246 | 206 | 410 | ||
247 | 207 | [ Matthias Klose ] | 411 | [ Matthias Klose ] |
248 | @@ -260,6 +464,29 @@ cryptsetup (2:2.5.0-2) unstable; urgency=low | |||
249 | 260 | 464 | ||
250 | 261 | -- Guilhem Moulin <guilhem@debian.org> Tue, 09 Aug 2022 01:40:50 +0200 | 465 | -- Guilhem Moulin <guilhem@debian.org> Tue, 09 Aug 2022 01:40:50 +0200 |
251 | 262 | 466 | ||
252 | 467 | cryptsetup (2:2.5.0-1ubuntu1) kinetic; urgency=medium | ||
253 | 468 | |||
254 | 469 | * Merge from Debian unstable. Remaining changes: | ||
255 | 470 | - debian/control: | ||
256 | 471 | + Recommend plymouth. | ||
257 | 472 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
258 | 473 | + Move cryptsetup-initramfs back to cryptsetup's Recommends. | ||
259 | 474 | + Do not build cryptsetup-suspend binary package on i386. | ||
260 | 475 | - Fix cryptroot-unlock for busybox compatibility. | ||
261 | 476 | - Fix warning and error when running on ZFS on root: (LP: #1830110) | ||
262 | 477 | - d/functions: Return an empty devno for ZFS devices as they don't have | ||
263 | 478 | major:minor device numbers. | ||
264 | 479 | - d/initramfs/hooks/cryptroot: Ignore and don't print an error message | ||
265 | 480 | when devices don't have a devno. | ||
266 | 481 | - debian/patches/decrease_memlock_ulimit.patch | ||
267 | 482 | Fixed FTBFS due to a restricted build environment | ||
268 | 483 | - Stop building the udeb on request. | ||
269 | 484 | * d/initramfs/hooks/cryptroot: Include OpenSSL legacy.so for ripemd160 and | ||
270 | 485 | whirlpool hash algorithms (LP: #1979159) | ||
271 | 486 | * Disable failing Debian-tailored cryptroot-* autopkgtests, see bug #1983522 | ||
272 | 487 | |||
273 | 488 | -- Benjamin Drung <bdrung@ubuntu.com> Thu, 04 Aug 2022 12:30:02 +0200 | ||
274 | 489 | |||
275 | 263 | cryptsetup (2:2.5.0-1) unstable; urgency=medium | 490 | cryptsetup (2:2.5.0-1) unstable; urgency=medium |
276 | 264 | 491 | ||
277 | 265 | * New upstream release. (Closes: #1000634, #1011128) | 492 | * New upstream release. (Closes: #1000634, #1011128) |
278 | @@ -338,6 +565,26 @@ cryptsetup (2:2.5.0~rc1-1) experimental; urgency=low | |||
279 | 338 | 565 | ||
280 | 339 | -- Guilhem Moulin <guilhem@debian.org> Fri, 15 Jul 2022 01:49:59 +0200 | 566 | -- Guilhem Moulin <guilhem@debian.org> Fri, 15 Jul 2022 01:49:59 +0200 |
281 | 340 | 567 | ||
282 | 568 | cryptsetup (2:2.4.3-1ubuntu1) jammy; urgency=low | ||
283 | 569 | |||
284 | 570 | * Merge from Debian unstable (LP: #1959427). Remaining changes: | ||
285 | 571 | - debian/control: | ||
286 | 572 | + Recommend plymouth. | ||
287 | 573 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
288 | 574 | + Move cryptsetup-initramfs back to cryptsetup's Recommends. | ||
289 | 575 | + Do not build cryptsetup-suspend binary package on i386. | ||
290 | 576 | - Fix cryptroot-unlock for busybox compatibility. | ||
291 | 577 | - Fix warning and error when running on ZFS on root: (LP: #1830110) | ||
292 | 578 | - d/functions: Return an empty devno for ZFS devices as they don't have | ||
293 | 579 | major:minor device numbers. | ||
294 | 580 | - d/initramfs/hooks/cryptroot: Ignore and don't print an error message | ||
295 | 581 | when devices don't have a devno. | ||
296 | 582 | - debian/patches/decrease_memlock_ulimit.patch | ||
297 | 583 | Fixed FTBFS due to a restricted build environment | ||
298 | 584 | - Stop building the udeb on request. | ||
299 | 585 | |||
300 | 586 | -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 28 Jan 2022 12:14:06 -0800 | ||
301 | 587 | |||
302 | 341 | cryptsetup (2:2.4.3-1) unstable; urgency=high | 588 | cryptsetup (2:2.4.3-1) unstable; urgency=high |
303 | 342 | 589 | ||
304 | 343 | [ Guilhem Moulin ] | 590 | [ Guilhem Moulin ] |
305 | @@ -351,6 +598,64 @@ cryptsetup (2:2.4.3-1) unstable; urgency=high | |||
306 | 351 | 598 | ||
307 | 352 | -- Guilhem Moulin <guilhem@debian.org> Thu, 13 Jan 2022 19:07:05 +0100 | 599 | -- Guilhem Moulin <guilhem@debian.org> Thu, 13 Jan 2022 19:07:05 +0100 |
308 | 353 | 600 | ||
309 | 601 | cryptsetup (2:2.4.2-1ubuntu4) jammy; urgency=medium | ||
310 | 602 | |||
311 | 603 | * Move cryptsetup-initramfs back to cryptsetup's Recommends (from Suggests). | ||
312 | 604 | |||
313 | 605 | -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Thu, 09 Dec 2021 12:53:00 +1300 | ||
314 | 606 | |||
315 | 607 | cryptsetup (2:2.4.2-1ubuntu3) jammy; urgency=medium | ||
316 | 608 | |||
317 | 609 | * Fix build on i386. | ||
318 | 610 | |||
319 | 611 | -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Tue, 07 Dec 2021 13:17:48 +1300 | ||
320 | 612 | |||
321 | 613 | cryptsetup (2:2.4.2-1ubuntu2) jammy; urgency=medium | ||
322 | 614 | |||
323 | 615 | * Do not build new cryptsetup-suspend binary package on i386. | ||
324 | 616 | |||
325 | 617 | -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Tue, 07 Dec 2021 11:47:55 +1300 | ||
326 | 618 | |||
327 | 619 | cryptsetup (2:2.4.2-1ubuntu1) jammy; urgency=medium | ||
328 | 620 | |||
329 | 621 | * Merge from Debian unstable. Remaining changes: | ||
330 | 622 | - debian/control: | ||
331 | 623 | + Recommend plymouth. | ||
332 | 624 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
333 | 625 | - Fix cryptroot-unlock for busybox compatibility. | ||
334 | 626 | - Fix warning and error when running on ZFS on root: (LP: #1830110) | ||
335 | 627 | - d/functions: Return an empty devno for ZFS devices as they don't have | ||
336 | 628 | major:minor device numbers. | ||
337 | 629 | - d/initramfs/hooks/cryptroot: Ignore and don't print an error message when | ||
338 | 630 | devices don't have a devno. | ||
339 | 631 | Submitted to debian upstream as bug #902449. | ||
340 | 632 | - debian/patches/decrease_memlock_ulimit.patch | ||
341 | 633 | Fixed FTBFS due a restrict environment in the new Bionic Builder (LP: #1891473) | ||
342 | 634 | tests/luks2-validation.test, tests/compat-test, tests/tcrypt-compat-test. | ||
343 | 635 | - Thanks Guilherme G. Piccoli. | ||
344 | 636 | - Stop building the udeb on request. | ||
345 | 637 | * Dropped change, included in Debian: | ||
346 | 638 | - Introduce retry logic for external invocations after mdadm (LP: #1879980) | ||
347 | 639 | - Currently, if an encrypted rootfs is configured on top of a MD RAID1 | ||
348 | 640 | array and such array gets degraded (e.g., a member is removed/failed) | ||
349 | 641 | the cryptsetup scripts cannot mount the rootfs, and the boot fails. | ||
350 | 642 | We fix that issue here by allowing the cryptroot script to be re-run | ||
351 | 643 | by initramfs-tools/local-block stage, as mdadm can activate degraded | ||
352 | 644 | arrays at that stage. | ||
353 | 645 | There is an initramfs-tools counter-part for this fix, but alone the | ||
354 | 646 | cryptsetup portion is harmless. | ||
355 | 647 | - d/cryptsetup-initramfs.install: ship the new local-bottom script. | ||
356 | 648 | - d/functions: declare variables for local-top|block|bottom scripts | ||
357 | 649 | (flag that local-block is running and external invocation counter.) | ||
358 | 650 | - d/i/s/local-block/cryptroot: set flag that local-block is running. | ||
359 | 651 | - d/i/s/local-bottom/cryptroot: clean up the flag and counter files. | ||
360 | 652 | - d/i/s/local-top/cryptroot: change the logic from just waiting 180 | ||
361 | 653 | seconds to waiting 5 seconds first, then allowing initramfs-tools | ||
362 | 654 | to run mdadm (to activate degraded arrays) and call back at least | ||
363 | 655 | 30 times/seconds more. | ||
364 | 656 | |||
365 | 657 | -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Thu, 02 Dec 2021 11:58:05 +1300 | ||
366 | 658 | |||
367 | 354 | cryptsetup (2:2.4.2-1) unstable; urgency=high | 659 | cryptsetup (2:2.4.2-1) unstable; urgency=high |
368 | 355 | 660 | ||
369 | 356 | * New upstream bugfix release 2.4.2. | 661 | * New upstream bugfix release 2.4.2. |
370 | @@ -469,6 +774,18 @@ cryptsetup (2:2.3.6-1+exp1) experimental; urgency=medium | |||
371 | 469 | 774 | ||
372 | 470 | -- Guilhem Moulin <guilhem@debian.org> Fri, 28 May 2021 22:54:20 +0200 | 775 | -- Guilhem Moulin <guilhem@debian.org> Fri, 28 May 2021 22:54:20 +0200 |
373 | 471 | 776 | ||
374 | 777 | cryptsetup (2:2.3.6-0ubuntu2) jammy; urgency=medium | ||
375 | 778 | |||
376 | 779 | * No-change rebuild against openssl3 | ||
377 | 780 | |||
378 | 781 | -- Simon Chopin <simon.chopin@canonical.com> Thu, 25 Nov 2021 14:22:07 +0200 | ||
379 | 782 | |||
380 | 783 | cryptsetup (2:2.3.6-0ubuntu1) impish; urgency=medium | ||
381 | 784 | |||
382 | 785 | * New upstream release. | ||
383 | 786 | |||
384 | 787 | -- Matthieu Clemenceau <matthieu.clemenceau@canonical.com> Fri, 20 Aug 2021 11:32:12 +1200 | ||
385 | 788 | |||
386 | 472 | cryptsetup (2:2.3.5-1+exp1) experimental; urgency=medium | 789 | cryptsetup (2:2.3.5-1+exp1) experimental; urgency=medium |
387 | 473 | 790 | ||
388 | 474 | * Upload to experimental. | 791 | * Upload to experimental. |
389 | @@ -541,6 +858,69 @@ cryptsetup (2:2.3.4-1+exp1) experimental; urgency=medium | |||
390 | 541 | 858 | ||
391 | 542 | -- Guilhem Moulin <guilhem@debian.org> Fri, 04 Sep 2020 00:55:41 +0200 | 859 | -- Guilhem Moulin <guilhem@debian.org> Fri, 04 Sep 2020 00:55:41 +0200 |
392 | 543 | 860 | ||
393 | 861 | cryptsetup (2:2.3.4-1ubuntu3) hirsute; urgency=medium | ||
394 | 862 | |||
395 | 863 | * Stop building the udeb on request. | ||
396 | 864 | |||
397 | 865 | -- Matthias Klose <doko@ubuntu.com> Mon, 22 Feb 2021 12:10:36 +0100 | ||
398 | 866 | |||
399 | 867 | cryptsetup (2:2.3.4-1ubuntu2) hirsute; urgency=medium | ||
400 | 868 | |||
401 | 869 | * No-change rebuild to drop the udeb package. | ||
402 | 870 | |||
403 | 871 | -- Matthias Klose <doko@ubuntu.com> Mon, 22 Feb 2021 10:30:38 +0100 | ||
404 | 872 | |||
405 | 873 | cryptsetup (2:2.3.4-1ubuntu1) hirsute; urgency=medium | ||
406 | 874 | |||
407 | 875 | * Merge with Debian unstable. Remaining changes: | ||
408 | 876 | - debian/control: | ||
409 | 877 | + Recommend plymouth. | ||
410 | 878 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
411 | 879 | - Fix cryptroot-unlock for busybox compatibility. | ||
412 | 880 | - Fix warning and error when running on ZFS on root: (LP #1830110) | ||
413 | 881 | - d/functions: Return an empty devno for ZFS devices as they don't have | ||
414 | 882 | major:minor device numbers. | ||
415 | 883 | - d/initramfs/hooks/cryptroot: Ignore and don't print an error message when | ||
416 | 884 | devices don't have a devno. | ||
417 | 885 | Submitted to debian upstream as bug #902449. | ||
418 | 886 | - debian/patches/decrease_memlock_ulimit.patch | ||
419 | 887 | Fixed FTBFS due a restrict environment in the new Bionic Builder (LP #1891473) | ||
420 | 888 | tests/luks2-validation.test, tests/compat-test, tests/tcrypt-compat-test. | ||
421 | 889 | - Thanks Guilherme G. Piccoli. | ||
422 | 890 | - Introduce retry logic for external invocations after mdadm (LP #1879980) | ||
423 | 891 | - Currently, if an encrypted rootfs is configured on top of a MD RAID1 | ||
424 | 892 | array and such array gets degraded (e.g., a member is removed/failed) | ||
425 | 893 | the cryptsetup scripts cannot mount the rootfs, and the boot fails. | ||
426 | 894 | We fix that issue here by allowing the cryptroot script to be re-run | ||
427 | 895 | by initramfs-tools/local-block stage, as mdadm can activate degraded | ||
428 | 896 | arrays at that stage. | ||
429 | 897 | There is an initramfs-tools counter-part for this fix, but alone the | ||
430 | 898 | cryptsetup portion is harmless. | ||
431 | 899 | - d/cryptsetup-initramfs.install: ship the new local-bottom script. | ||
432 | 900 | - d/functions: declare variables for local-top|block|bottom scripts | ||
433 | 901 | (flag that local-block is running and external invocation counter.) | ||
434 | 902 | - d/i/s/local-block/cryptroot: set flag that local-block is running. | ||
435 | 903 | - d/i/s/local-bottom/cryptroot: clean up the flag and counter files. | ||
436 | 904 | - d/i/s/local-top/cryptroot: change the logic from just waiting 180 | ||
437 | 905 | seconds to waiting 5 seconds first, then allowing initramfs-tools | ||
438 | 906 | to run mdadm (to activate degraded arrays) and call back at least | ||
439 | 907 | 30 times/seconds more. | ||
440 | 908 | * Dropped changes: | ||
441 | 909 | - Included in new upstream version: | ||
442 | 910 | - SECURITY UPDATE: Out-of-bounds write | ||
443 | 911 | - debian/patches/CVE-2020-14382-*.patch: check segment gaps regardless of | ||
444 | 912 | heap space in lib/luks2/luks2_json_metadata.c. | ||
445 | 913 | - CVE-2020-14382 | ||
446 | 914 | - included in Debian: | ||
447 | 915 | - debian/cryptsetup-bin.install: | ||
448 | 916 | - Fix FTBFS due to dh_missing detecting crypsetup.conf in debian/tmp where | ||
449 | 917 | it was installed from ./scripts/crypsetup.conf. | ||
450 | 918 | - debian/rules: | ||
451 | 919 | - fix FTBFS on riscv64 adding --with-tmpfilesdir to ensure all archs, even | ||
452 | 920 | without systemd knows how to ship cryptsetup.conf | ||
453 | 921 | |||
454 | 922 | -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Tue, 10 Nov 2020 10:37:25 +1300 | ||
455 | 923 | |||
456 | 544 | cryptsetup (2:2.3.4-1) unstable; urgency=high | 924 | cryptsetup (2:2.3.4-1) unstable; urgency=high |
457 | 545 | 925 | ||
458 | 546 | * New upstream bugfix release, including fix for CVE-2020-14382: | 926 | * New upstream bugfix release, including fix for CVE-2020-14382: |
459 | @@ -608,6 +988,80 @@ cryptsetup (2:2.3.3-2) unstable; urgency=medium | |||
460 | 608 | 988 | ||
461 | 609 | -- Guilhem Moulin <guilhem@debian.org> Wed, 12 Aug 2020 00:22:59 +0200 | 989 | -- Guilhem Moulin <guilhem@debian.org> Wed, 12 Aug 2020 00:22:59 +0200 |
462 | 610 | 990 | ||
463 | 991 | cryptsetup (2:2.3.3-1ubuntu6) groovy; urgency=medium | ||
464 | 992 | |||
465 | 993 | * Introduce retry logic for external invocations after mdadm (LP: #1879980) | ||
466 | 994 | - Currently, if an encrypted rootfs is configured on top of a MD RAID1 | ||
467 | 995 | array and such array gets degraded (e.g., a member is removed/failed) | ||
468 | 996 | the cryptsetup scripts cannot mount the rootfs, and the boot fails. | ||
469 | 997 | We fix that issue here by allowing the cryptroot script to be re-run | ||
470 | 998 | by initramfs-tools/local-block stage, as mdadm can activate degraded | ||
471 | 999 | arrays at that stage. | ||
472 | 1000 | There is an initramfs-tools counter-part for this fix, but alone the | ||
473 | 1001 | cryptsetup portion is harmless. | ||
474 | 1002 | - d/cryptsetup-initramfs.install: ship the new local-bottom script. | ||
475 | 1003 | - d/functions: declare variables for local-top|block|bottom scripts | ||
476 | 1004 | (flag that local-block is running and external invocation counter.) | ||
477 | 1005 | - d/i/s/local-block/cryptroot: set flag that local-block is running. | ||
478 | 1006 | - d/i/s/local-bottom/cryptroot: clean up the flag and counter files. | ||
479 | 1007 | - d/i/s/local-top/cryptroot: change the logic from just waiting 180 | ||
480 | 1008 | seconds to waiting 5 seconds first, then allowing initramfs-tools | ||
481 | 1009 | to run mdadm (to activate degraded arrays) and call back at least | ||
482 | 1010 | 30 times/seconds more. | ||
483 | 1011 | |||
484 | 1012 | -- Guilherme G. Piccoli <gpiccoli@canonical.com> Wed, 16 Sep 2020 17:35:59 -0300 | ||
485 | 1013 | |||
486 | 1014 | cryptsetup (2:2.3.3-1ubuntu5) groovy; urgency=medium | ||
487 | 1015 | |||
488 | 1016 | * SECURITY UPDATE: Out-of-bounds write | ||
489 | 1017 | - debian/patches/CVE-2020-14382-*.patch: check segment gaps regardless of | ||
490 | 1018 | heap space in lib/luks2/luks2_json_metadata.c. | ||
491 | 1019 | - CVE-2020-14382 | ||
492 | 1020 | * debian/patches/decrease_memlock_ulimit.patch | ||
493 | 1021 | Fixed FTBFS due a restrict environment in the new Bionic Builder (LP: #1891473) | ||
494 | 1022 | tests/luks2-validation.test, tests/compat-test, tests/tcrypt-compat-test. | ||
495 | 1023 | - Thanks Guilherme G. Piccoli. | ||
496 | 1024 | |||
497 | 1025 | -- Leonidas S. Barbosa <leo.barbosa@canonical.com> Wed, 09 Sep 2020 09:29:17 -0300 | ||
498 | 1026 | |||
499 | 1027 | cryptsetup (2:2.3.3-1ubuntu4) groovy; urgency=medium | ||
500 | 1028 | |||
501 | 1029 | * No change rebuild against new json-c ABI. | ||
502 | 1030 | |||
503 | 1031 | -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 28 Jul 2020 17:42:50 +0100 | ||
504 | 1032 | |||
505 | 1033 | cryptsetup (2:2.3.3-1ubuntu3) groovy; urgency=medium | ||
506 | 1034 | |||
507 | 1035 | * debian/rules: | ||
508 | 1036 | - fix FTBFS on riscv64 adding --with-tmpfilesdir to ensure all archs, even | ||
509 | 1037 | without systemd knows how to ship cryptsetup.conf | ||
510 | 1038 | |||
511 | 1039 | -- Didier Roche <didrocks@ubuntu.com> Thu, 18 Jun 2020 11:44:50 +0200 | ||
512 | 1040 | |||
513 | 1041 | cryptsetup (2:2.3.3-1ubuntu2) groovy; urgency=medium | ||
514 | 1042 | |||
515 | 1043 | * debian/cryptsetup-bin.install: | ||
516 | 1044 | - Fix FTBFS due to dh_missing detecting crypsetup.conf in debian/tmp where | ||
517 | 1045 | it was installed from ./scripts/crypsetup.conf. | ||
518 | 1046 | * Fix warning and error when running on ZFS on root: (LP: #1830110) | ||
519 | 1047 | - d/functions: Return an empty devno for ZFS devices as they don't have | ||
520 | 1048 | major:minor device numbers. | ||
521 | 1049 | - d/initramfs/hooks/cryptroot: Ignore and don't print an error message when | ||
522 | 1050 | devices don't have a devno. | ||
523 | 1051 | Submitted to debian upstream as bug #902449. | ||
524 | 1052 | |||
525 | 1053 | -- Didier Roche <didrocks@ubuntu.com> Thu, 18 Jun 2020 10:12:10 +0200 | ||
526 | 1054 | |||
527 | 1055 | cryptsetup (2:2.3.3-1ubuntu1) groovy; urgency=low | ||
528 | 1056 | |||
529 | 1057 | * Merge from Debian unstable. Remaining changes: | ||
530 | 1058 | - debian/control: | ||
531 | 1059 | + Recommend plymouth. | ||
532 | 1060 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
533 | 1061 | - Fix cryptroot-unlock for busybox compatibility. | ||
534 | 1062 | |||
535 | 1063 | -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 09 Jun 2020 10:40:32 -0700 | ||
536 | 1064 | |||
537 | 611 | cryptsetup (2:2.3.3-1) unstable; urgency=medium | 1065 | cryptsetup (2:2.3.3-1) unstable; urgency=medium |
538 | 612 | 1066 | ||
539 | 613 | [ Guilhem Moulin ] | 1067 | [ Guilhem Moulin ] |
540 | @@ -636,6 +1090,16 @@ cryptsetup (2:2.3.2-1) unstable; urgency=medium | |||
541 | 636 | 1090 | ||
542 | 637 | -- Guilhem Moulin <guilhem@debian.org> Wed, 06 May 2020 16:22:01 +0200 | 1091 | -- Guilhem Moulin <guilhem@debian.org> Wed, 06 May 2020 16:22:01 +0200 |
543 | 638 | 1092 | ||
544 | 1093 | cryptsetup (2:2.3.1-1ubuntu1) groovy; urgency=low | ||
545 | 1094 | |||
546 | 1095 | * Merge from Debian unstable. Remaining changes: | ||
547 | 1096 | - debian/control: | ||
548 | 1097 | + Recommend plymouth. | ||
549 | 1098 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
550 | 1099 | - Fix cryptroot-unlock for busybox compatibility. | ||
551 | 1100 | |||
552 | 1101 | -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 01 May 2020 07:07:58 -0700 | ||
553 | 1102 | |||
554 | 639 | cryptsetup (2:2.3.1-1) unstable; urgency=medium | 1103 | cryptsetup (2:2.3.1-1) unstable; urgency=medium |
555 | 640 | 1104 | ||
556 | 641 | * New upstream release. | 1105 | * New upstream release. |
557 | @@ -671,6 +1135,23 @@ cryptsetup (2:2.3.0-1) unstable; urgency=low | |||
558 | 671 | 1135 | ||
559 | 672 | -- Guilhem Moulin <guilhem@debian.org> Wed, 04 Mar 2020 00:48:19 +0100 | 1136 | -- Guilhem Moulin <guilhem@debian.org> Wed, 04 Mar 2020 00:48:19 +0100 |
560 | 673 | 1137 | ||
561 | 1138 | cryptsetup (2:2.2.2-3ubuntu2) focal; urgency=medium | ||
562 | 1139 | |||
563 | 1140 | * Depend on cryptsetup from cryptsetup-initramfs instead of the dummy | ||
564 | 1141 | cryptsetup-run package. LP: #1864360. | ||
565 | 1142 | |||
566 | 1143 | -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 27 Feb 2020 00:16:14 -0600 | ||
567 | 1144 | |||
568 | 1145 | cryptsetup (2:2.2.2-3ubuntu1) focal; urgency=medium | ||
569 | 1146 | |||
570 | 1147 | * Merge from Debian unstable. Remaining changes: | ||
571 | 1148 | - debian/control: | ||
572 | 1149 | + Recommend plymouth. | ||
573 | 1150 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
574 | 1151 | - Fix cryptroot-unlock for busybox compatibility. | ||
575 | 1152 | |||
576 | 1153 | -- Matthias Klose <doko@ubuntu.com> Mon, 10 Feb 2020 09:20:12 +0100 | ||
577 | 1154 | |||
578 | 674 | cryptsetup (2:2.2.2-3) unstable; urgency=high | 1155 | cryptsetup (2:2.2.2-3) unstable; urgency=high |
579 | 675 | 1156 | ||
580 | 676 | * initramfs hook: Workaround fix for the libgcc_s's source location. | 1157 | * initramfs hook: Workaround fix for the libgcc_s's source location. |
581 | @@ -679,6 +1160,16 @@ cryptsetup (2:2.2.2-3) unstable; urgency=high | |||
582 | 679 | 1160 | ||
583 | 680 | -- Guilhem Moulin <guilhem@debian.org> Tue, 04 Feb 2020 14:11:12 +0100 | 1161 | -- Guilhem Moulin <guilhem@debian.org> Tue, 04 Feb 2020 14:11:12 +0100 |
584 | 681 | 1162 | ||
585 | 1163 | cryptsetup (2:2.2.2-2ubuntu1) focal; urgency=low | ||
586 | 1164 | |||
587 | 1165 | * Merge from Debian unstable. Remaining changes: | ||
588 | 1166 | - debian/control: | ||
589 | 1167 | + Recommend plymouth. | ||
590 | 1168 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
591 | 1169 | - Fix cryptroot-unlock for busybox compatibility. | ||
592 | 1170 | |||
593 | 1171 | -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 01 Feb 2020 22:11:22 -0800 | ||
594 | 1172 | |||
595 | 682 | cryptsetup (2:2.2.2-2) unstable; urgency=medium | 1173 | cryptsetup (2:2.2.2-2) unstable; urgency=medium |
596 | 683 | 1174 | ||
597 | 684 | [ Guilhem Moulin ] | 1175 | [ Guilhem Moulin ] |
598 | @@ -696,6 +1187,16 @@ cryptsetup (2:2.2.2-2) unstable; urgency=medium | |||
599 | 696 | 1187 | ||
600 | 697 | -- Guilhem Moulin <guilhem@debian.org> Sat, 18 Jan 2020 20:53:19 +0100 | 1188 | -- Guilhem Moulin <guilhem@debian.org> Sat, 18 Jan 2020 20:53:19 +0100 |
601 | 698 | 1189 | ||
602 | 1190 | cryptsetup (2:2.2.2-1ubuntu1) focal; urgency=low | ||
603 | 1191 | |||
604 | 1192 | * Merge from Debian unstable. Remaining changes: | ||
605 | 1193 | - debian/control: | ||
606 | 1194 | + Recommend plymouth. | ||
607 | 1195 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
608 | 1196 | - Fix cryptroot-unlock for busybox compatibility. | ||
609 | 1197 | |||
610 | 1198 | -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 11 Nov 2019 22:07:44 -0800 | ||
611 | 1199 | |||
612 | 699 | cryptsetup (2:2.2.2-1) unstable; urgency=medium | 1200 | cryptsetup (2:2.2.2-1) unstable; urgency=medium |
613 | 700 | 1201 | ||
614 | 701 | * New upstream bugfix release. | 1202 | * New upstream bugfix release. |
615 | @@ -706,6 +1207,16 @@ cryptsetup (2:2.2.2-1) unstable; urgency=medium | |||
616 | 706 | 1207 | ||
617 | 707 | -- Guilhem Moulin <guilhem@debian.org> Fri, 01 Nov 2019 19:32:36 +0100 | 1208 | -- Guilhem Moulin <guilhem@debian.org> Fri, 01 Nov 2019 19:32:36 +0100 |
618 | 708 | 1209 | ||
619 | 1210 | cryptsetup (2:2.2.1-1ubuntu1) focal; urgency=low | ||
620 | 1211 | |||
621 | 1212 | * Merge from Debian unstable. Remaining changes: | ||
622 | 1213 | - debian/control: | ||
623 | 1214 | + Recommend plymouth. | ||
624 | 1215 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
625 | 1216 | - Fix cryptroot-unlock for busybox compatibility. | ||
626 | 1217 | |||
627 | 1218 | -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 18 Oct 2019 15:14:29 -0700 | ||
628 | 1219 | |||
629 | 709 | cryptsetup (2:2.2.1-1) unstable; urgency=medium | 1220 | cryptsetup (2:2.2.1-1) unstable; urgency=medium |
630 | 710 | 1221 | ||
631 | 711 | * New upstream bugfix release. | 1222 | * New upstream bugfix release. |
632 | @@ -713,6 +1224,16 @@ cryptsetup (2:2.2.1-1) unstable; urgency=medium | |||
633 | 713 | 1224 | ||
634 | 714 | -- Guilhem Moulin <guilhem@debian.org> Fri, 06 Sep 2019 13:28:55 +0200 | 1225 | -- Guilhem Moulin <guilhem@debian.org> Fri, 06 Sep 2019 13:28:55 +0200 |
635 | 715 | 1226 | ||
636 | 1227 | cryptsetup (2:2.2.0-3ubuntu1) eoan; urgency=low | ||
637 | 1228 | |||
638 | 1229 | * Merge from Debian unstable. Remaining changes: | ||
639 | 1230 | - debian/control: | ||
640 | 1231 | + Recommend plymouth. | ||
641 | 1232 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
642 | 1233 | - Fix cryptroot-unlock for busybox compatibility. | ||
643 | 1234 | |||
644 | 1235 | -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 28 Aug 2019 16:13:22 -0700 | ||
645 | 1236 | |||
646 | 716 | cryptsetup (2:2.2.0-3) unstable; urgency=medium | 1237 | cryptsetup (2:2.2.0-3) unstable; urgency=medium |
647 | 717 | 1238 | ||
648 | 718 | * Cherry pick upstream commit 8f8f0b32: Fix mapped segments overflow on | 1239 | * Cherry pick upstream commit 8f8f0b32: Fix mapped segments overflow on |
649 | @@ -720,6 +1241,16 @@ cryptsetup (2:2.2.0-3) unstable; urgency=medium | |||
650 | 720 | 1241 | ||
651 | 721 | -- Guilhem Moulin <guilhem@debian.org> Mon, 26 Aug 2019 12:53:45 +0200 | 1242 | -- Guilhem Moulin <guilhem@debian.org> Mon, 26 Aug 2019 12:53:45 +0200 |
652 | 722 | 1243 | ||
653 | 1244 | cryptsetup (2:2.2.0-2ubuntu1) eoan; urgency=low | ||
654 | 1245 | |||
655 | 1246 | * Merge from Debian unstable. Remaining changes: | ||
656 | 1247 | - debian/control: | ||
657 | 1248 | + Recommend plymouth. | ||
658 | 1249 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
659 | 1250 | - Fix cryptroot-unlock for busybox compatibility. | ||
660 | 1251 | |||
661 | 1252 | -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 25 Aug 2019 12:25:55 -0700 | ||
662 | 1253 | |||
663 | 723 | cryptsetup (2:2.2.0-2) unstable; urgency=medium | 1254 | cryptsetup (2:2.2.0-2) unstable; urgency=medium |
664 | 724 | 1255 | ||
665 | 725 | * debian/control: Add 'Multi-Arch: foreign' tag to the transitional dummy | 1256 | * debian/control: Add 'Multi-Arch: foreign' tag to the transitional dummy |
666 | @@ -731,6 +1262,25 @@ cryptsetup (2:2.2.0-2) unstable; urgency=medium | |||
667 | 731 | 1262 | ||
668 | 732 | -- Guilhem Moulin <guilhem@debian.org> Wed, 21 Aug 2019 22:45:12 +0200 | 1263 | -- Guilhem Moulin <guilhem@debian.org> Wed, 21 Aug 2019 22:45:12 +0200 |
669 | 733 | 1264 | ||
670 | 1265 | cryptsetup (2:2.2.0-1ubuntu2) eoan; urgency=medium | ||
671 | 1266 | |||
672 | 1267 | * debian/initramfs/cryptroot-unlock: canonicalize executable paths. | ||
673 | 1268 | Thanks to Paride Legovini <paride.legovini@canonical.com> for the patch. | ||
674 | 1269 | LP: #1840752. | ||
675 | 1270 | |||
676 | 1271 | -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 20 Aug 2019 15:34:10 -0700 | ||
677 | 1272 | |||
678 | 1273 | cryptsetup (2:2.2.0-1ubuntu1) eoan; urgency=low | ||
679 | 1274 | |||
680 | 1275 | * Merge from Debian unstable. Remaining changes: | ||
681 | 1276 | - debian/control: | ||
682 | 1277 | + Recommend plymouth. | ||
683 | 1278 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
684 | 1279 | - Apply patch from Trent Nelson to fix cryptroot-unlock for busybox | ||
685 | 1280 | compatibility. | ||
686 | 1281 | |||
687 | 1282 | -- Gianfranco Costamagna <locutusofborg@debian.org> Tue, 20 Aug 2019 14:21:34 +0200 | ||
688 | 1283 | |||
689 | 734 | cryptsetup (2:2.2.0-1) unstable; urgency=medium | 1284 | cryptsetup (2:2.2.0-1) unstable; urgency=medium |
690 | 735 | 1285 | ||
691 | 736 | * New upstream release 2.2.0. Highlights include: | 1286 | * New upstream release 2.2.0. Highlights include: |
692 | @@ -808,6 +1358,23 @@ cryptsetup (2:2.1.0-6) unstable; urgency=low | |||
693 | 808 | 1358 | ||
694 | 809 | -- Guilhem Moulin <guilhem@debian.org> Sat, 20 Jul 2019 22:15:04 -0300 | 1359 | -- Guilhem Moulin <guilhem@debian.org> Sat, 20 Jul 2019 22:15:04 -0300 |
695 | 810 | 1360 | ||
696 | 1361 | cryptsetup (2:2.1.0-5ubuntu2) eoan; urgency=medium | ||
697 | 1362 | |||
698 | 1363 | * Rebuild against new libjson-c4. | ||
699 | 1364 | |||
700 | 1365 | -- Gianfranco Costamagna <locutusofborg@debian.org> Sat, 29 Jun 2019 13:48:37 +0200 | ||
701 | 1366 | |||
702 | 1367 | cryptsetup (2:2.1.0-5ubuntu1) eoan; urgency=low | ||
703 | 1368 | |||
704 | 1369 | * Merge from Debian unstable. Remaining changes: | ||
705 | 1370 | - debian/control: | ||
706 | 1371 | + Recommend plymouth. | ||
707 | 1372 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
708 | 1373 | - Apply patch from Trent Nelson to fix cryptroot-unlock for busybox | ||
709 | 1374 | compatibility. | ||
710 | 1375 | |||
711 | 1376 | -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 14 Jun 2019 14:09:31 -0700 | ||
712 | 1377 | |||
713 | 811 | cryptsetup (2:2.1.0-5) unstable; urgency=medium | 1378 | cryptsetup (2:2.1.0-5) unstable; urgency=medium |
714 | 812 | 1379 | ||
715 | 813 | [ Jonas Meurer ] | 1380 | [ Jonas Meurer ] |
716 | @@ -820,6 +1387,17 @@ cryptsetup (2:2.1.0-5) unstable; urgency=medium | |||
717 | 820 | 1387 | ||
718 | 821 | -- Guilhem Moulin <guilhem@debian.org> Mon, 10 Jun 2019 14:51:15 +0200 | 1388 | -- Guilhem Moulin <guilhem@debian.org> Mon, 10 Jun 2019 14:51:15 +0200 |
719 | 822 | 1389 | ||
720 | 1390 | cryptsetup (2:2.1.0-4ubuntu1) eoan; urgency=low | ||
721 | 1391 | |||
722 | 1392 | * Merge from Debian unstable. Remaining changes: | ||
723 | 1393 | - debian/control: | ||
724 | 1394 | + Recommend plymouth. | ||
725 | 1395 | + Depend on busybox-initramfs instead of busybox | busybox-static. | ||
726 | 1396 | - Apply patch from Trent Nelson to fix cryptroot-unlock for busybox | ||
727 | 1397 | compatibility. | ||
728 | 1398 | |||
729 | 1399 | -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 28 May 2019 18:32:08 -0700 | ||
730 | 1400 | |||
731 | 823 | cryptsetup (2:2.1.0-4) unstable; urgency=medium | 1401 | cryptsetup (2:2.1.0-4) unstable; urgency=medium |
732 | 824 | 1402 | ||
733 | 825 | [Guilhem Moulin] | 1403 | [Guilhem Moulin] |
734 | @@ -839,6 +1417,26 @@ cryptsetup (2:2.1.0-4) unstable; urgency=medium | |||
735 | 839 | 1417 | ||
736 | 840 | -- Guilhem Moulin <guilhem@debian.org> Tue, 28 May 2019 17:04:16 +0200 | 1418 | -- Guilhem Moulin <guilhem@debian.org> Tue, 28 May 2019 17:04:16 +0200 |
737 | 841 | 1419 | ||
738 | 1420 | cryptsetup (2:2.1.0-3ubuntu2) eoan; urgency=medium | ||
739 | 1421 | |||
740 | 1422 | * Depend on busybox-initramfs, which is the implementation we actually use | ||
741 | 1423 | for the initramfs and is guaranteed to always be present, instead of | ||
742 | 1424 | busybox-static. | ||
743 | 1425 | |||
744 | 1426 | -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 09 May 2019 14:47:04 -0700 | ||
745 | 1427 | |||
746 | 1428 | cryptsetup (2:2.1.0-3ubuntu1) eoan; urgency=low | ||
747 | 1429 | |||
748 | 1430 | * Merge from Debian unstable. Remaining changes: | ||
749 | 1431 | - debian/control: | ||
750 | 1432 | + Recommend plymouth. | ||
751 | 1433 | + Invert the "busybox | busybox-static" Recommends, as the latter | ||
752 | 1434 | is the one we ship in main as part of the ubuntu-standard task. | ||
753 | 1435 | - Apply patch from Trent Nelson to fix cryptroot-unlock for busybox | ||
754 | 1436 | compatibility. LP: #1651818 | ||
755 | 1437 | |||
756 | 1438 | -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 03 May 2019 16:22:03 -0700 | ||
757 | 1439 | |||
758 | 842 | cryptsetup (2:2.1.0-3) unstable; urgency=medium | 1440 | cryptsetup (2:2.1.0-3) unstable; urgency=medium |
759 | 843 | 1441 | ||
760 | 844 | * d/scripts/decrypt_opensc: Fix standard output poisoning. Thanks to Nils | 1442 | * d/scripts/decrypt_opensc: Fix standard output poisoning. Thanks to Nils |
761 | @@ -862,6 +1460,19 @@ cryptsetup (2:2.1.0-2) unstable; urgency=medium | |||
762 | 862 | 1460 | ||
763 | 863 | -- Guilhem Moulin <guilhem@debian.org> Thu, 28 Feb 2019 22:32:43 +0100 | 1461 | -- Guilhem Moulin <guilhem@debian.org> Thu, 28 Feb 2019 22:32:43 +0100 |
764 | 864 | 1462 | ||
765 | 1463 | cryptsetup (2:2.1.0-1ubuntu1) disco; urgency=medium | ||
766 | 1464 | |||
767 | 1465 | * Merge from Debian unstable. LP: #1815484 | ||
768 | 1466 | * Remaining changes: | ||
769 | 1467 | - debian/control: | ||
770 | 1468 | + Recommend plymouth. | ||
771 | 1469 | + Invert the "busybox | busybox-static" Recommends, as the latter | ||
772 | 1470 | is the one we ship in main as part of the ubuntu-standard task. | ||
773 | 1471 | - Apply patch from Trent Nelson to fix cryptroot-unlock for busybox | ||
774 | 1472 | compatibility. LP: #1651818 | ||
775 | 1473 | |||
776 | 1474 | -- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 13 Feb 2019 21:28:23 +0000 | ||
777 | 1475 | |||
778 | 865 | cryptsetup (2:2.1.0-1) unstable; urgency=medium | 1476 | cryptsetup (2:2.1.0-1) unstable; urgency=medium |
779 | 866 | 1477 | ||
780 | 867 | * New upstream release. Highlights include: | 1478 | * New upstream release. Highlights include: |
781 | @@ -904,6 +1515,20 @@ cryptsetup (2:2.1.0-1) unstable; urgency=medium | |||
782 | 904 | 1515 | ||
783 | 905 | -- Guilhem Moulin <guilhem@debian.org> Sat, 09 Feb 2019 00:40:17 +0100 | 1516 | -- Guilhem Moulin <guilhem@debian.org> Sat, 09 Feb 2019 00:40:17 +0100 |
784 | 906 | 1517 | ||
785 | 1518 | cryptsetup (2:2.0.6-1ubuntu1) disco; urgency=medium | ||
786 | 1519 | |||
787 | 1520 | * Merge from Debian unstable. | ||
788 | 1521 | * Remaining changes: | ||
789 | 1522 | - debian/control: | ||
790 | 1523 | + Recommend plymouth. | ||
791 | 1524 | + Invert the "busybox | busybox-static" Recommends, as the latter | ||
792 | 1525 | is the one we ship in main as part of the ubuntu-standard task. | ||
793 | 1526 | - Apply patch from Trent Nelson to fix cryptroot-unlock for busybox | ||
794 | 1527 | compatibility. LP: #1651818 | ||
795 | 1528 | * Dropped delta sector_size support, merged in Debian. | ||
796 | 1529 | |||
797 | 1530 | -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 05 Feb 2019 13:43:25 +0000 | ||
798 | 1531 | |||
799 | 907 | cryptsetup (2:2.0.6-1) unstable; urgency=medium | 1532 | cryptsetup (2:2.0.6-1) unstable; urgency=medium |
800 | 908 | 1533 | ||
801 | 909 | * New upstream bugfix release. Highlights include: | 1534 | * New upstream bugfix release. Highlights include: |
802 | @@ -968,6 +1593,27 @@ cryptsetup (2:2.0.4-3) unstable; urgency=medium | |||
803 | 968 | 1593 | ||
804 | 969 | -- Guilhem Moulin <guilhem@debian.org> Mon, 22 Oct 2018 17:45:35 +0200 | 1594 | -- Guilhem Moulin <guilhem@debian.org> Mon, 22 Oct 2018 17:45:35 +0200 |
805 | 970 | 1595 | ||
806 | 1596 | cryptsetup (2:2.0.4-2ubuntu2) cosmic; urgency=medium | ||
807 | 1597 | |||
808 | 1598 | * Implement support for --sector-size cryptsetup plain mode option in | ||
809 | 1599 | crypttab. Matching support is also proposed to systemd-cryptsetup as | ||
810 | 1600 | well. LP: #1776626 | ||
811 | 1601 | |||
812 | 1602 | -- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 31 Aug 2018 17:00:07 +0100 | ||
813 | 1603 | |||
814 | 1604 | cryptsetup (2:2.0.4-2ubuntu1) cosmic; urgency=low | ||
815 | 1605 | |||
816 | 1606 | * Merge from Debian unstable. LP: #1785610. | ||
817 | 1607 | * Remaining changes: | ||
818 | 1608 | - debian/control: | ||
819 | 1609 | + Recommend plymouth. | ||
820 | 1610 | + Invert the "busybox | busybox-static" Recommends, as the latter | ||
821 | 1611 | is the one we ship in main as part of the ubuntu-standard task. | ||
822 | 1612 | - Apply patch from Trent Nelson to fix cryptroot-unlock for busybox | ||
823 | 1613 | compatibility. LP: #1651818 | ||
824 | 1614 | |||
825 | 1615 | -- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 22 Aug 2018 22:51:47 +0100 | ||
826 | 1616 | |||
827 | 971 | cryptsetup (2:2.0.4-2) unstable; urgency=medium | 1617 | cryptsetup (2:2.0.4-2) unstable; urgency=medium |
828 | 972 | 1618 | ||
829 | 973 | * debian/cryptsetup-initramfs.preinst: Don't try to overwrite | 1619 | * debian/cryptsetup-initramfs.preinst: Don't try to overwrite |
830 | @@ -1000,6 +1646,28 @@ cryptsetup (2:2.0.3-7) unstable; urgency=medium | |||
831 | 1000 | 1646 | ||
832 | 1001 | -- Guilhem Moulin <guilhem@debian.org> Mon, 30 Jul 2018 16:32:07 +0800 | 1647 | -- Guilhem Moulin <guilhem@debian.org> Mon, 30 Jul 2018 16:32:07 +0800 |
833 | 1002 | 1648 | ||
834 | 1649 | cryptsetup (2:2.0.3-6ubuntu1) cosmic; urgency=low | ||
835 | 1650 | |||
836 | 1651 | * Merge from Debian unstable. LP: #1781912. | ||
837 | 1652 | * Remaining changes: | ||
838 | 1653 | - debian/control: | ||
839 | 1654 | + Recommend plymouth. | ||
840 | 1655 | + Invert the "busybox | busybox-static" Recommends, as the latter | ||
841 | 1656 | is the one we ship in main as part of the ubuntu-standard task. | ||
842 | 1657 | - Apply patch from Trent Nelson to fix cryptroot-unlock for busybox | ||
843 | 1658 | compatibility. LP: #1651818 | ||
844 | 1659 | * Dropped changes, included in Debian: | ||
845 | 1660 | - Drop explicit libgcrypt20 dependency from libcryptsetup4. | ||
846 | 1661 | - Drop the CRYPTSETUP variable warning from the initramfs hook, as | ||
847 | 1662 | overlayroot package ships a dropin in conf-hooks.d triggering false | ||
848 | 1663 | warnings. | ||
849 | 1664 | - Drop _BSD_SOURCE in favor of _DEFAULT_SOURCE | ||
850 | 1665 | - Drop c99 std, as the default is now higher than that | ||
851 | 1666 | * Dropped changes, no longer needed: | ||
852 | 1667 | - Add maintscript to drop removed upstart system jobs. | ||
853 | 1668 | |||
854 | 1669 | -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 16 Jul 2018 08:27:58 -0400 | ||
855 | 1670 | |||
856 | 1003 | cryptsetup (2:2.0.3-6) unstable; urgency=medium | 1671 | cryptsetup (2:2.0.3-6) unstable; urgency=medium |
857 | 1004 | 1672 | ||
858 | 1005 | * debian/TODO.md: Remove mention of parent device detection for mdadm | 1673 | * debian/TODO.md: Remove mention of parent device detection for mdadm |
859 | @@ -1284,6 +1952,45 @@ cryptsetup (2:2.0.3-1) unstable; urgency=medium | |||
860 | 1284 | 1952 | ||
861 | 1285 | -- Jonas Meurer <jonas@freesources.org> Fri, 15 Jun 2018 15:32:16 +0200 | 1953 | -- Jonas Meurer <jonas@freesources.org> Fri, 15 Jun 2018 15:32:16 +0200 |
862 | 1286 | 1954 | ||
863 | 1955 | cryptsetup (2:2.0.2-1ubuntu3) cosmic; urgency=medium | ||
864 | 1956 | |||
865 | 1957 | * No-change rebuild against libargon2-1 | ||
866 | 1958 | |||
867 | 1959 | -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 10 Jul 2018 17:01:23 +0000 | ||
868 | 1960 | |||
869 | 1961 | cryptsetup (2:2.0.2-1ubuntu2) cosmic; urgency=medium | ||
870 | 1962 | |||
871 | 1963 | * Apply patch from Trent Nelson to fix cryptroot-unlock for busybox | ||
872 | 1964 | compatibility. LP: #1651818 | ||
873 | 1965 | |||
874 | 1966 | -- Dimitri John Ledkov 🌈 <xnox@ubuntu.com> Thu, 21 Jun 2018 16:38:31 +0100 | ||
875 | 1967 | |||
876 | 1968 | cryptsetup (2:2.0.2-1ubuntu1) bionic; urgency=low | ||
877 | 1969 | |||
878 | 1970 | * Merge from Debian unstable. | ||
879 | 1971 | - bugfix upstream release, which solves problems with luks2 format | ||
880 | 1972 | disks not unlocking. LP: #1755322. | ||
881 | 1973 | * Remaining changes: | ||
882 | 1974 | - debian/control: | ||
883 | 1975 | + Depend on plymouth. | ||
884 | 1976 | + Invert the "busybox | busybox-static" Recommends, as the latter | ||
885 | 1977 | is the one we ship in main as part of the ubuntu-standard task. | ||
886 | 1978 | + Drop explicit libgcrypt20 dependency from libcryptsetup4. | ||
887 | 1979 | - Drop _BSD_SOURCE in favor of _DEFAULT_SOURCE | ||
888 | 1980 | - Drop c99 std, as the default is now higher than that | ||
889 | 1981 | - Drop upstart system jobs. | ||
890 | 1982 | - Add maintscript to drop removed upstart system jobs. | ||
891 | 1983 | - debian has its own now, but we have different version numbers. | ||
892 | 1984 | this delta can be dropped after 18.04 release. | ||
893 | 1985 | - Drop the CRYPTSETUP variable warning from the initramfs hook, as | ||
894 | 1986 | overlayroot package ships a dropin in conf-hooks.d triggering false | ||
895 | 1987 | warnings. | ||
896 | 1988 | * Dropped changes: | ||
897 | 1989 | - debian/cryptdisks{,-udev}.maintscript: drop, there is no package named | ||
898 | 1990 | 'cryptdisks' or 'cryptdisks-udev'. | ||
899 | 1991 | |||
900 | 1992 | -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 06 Apr 2018 10:23:53 -0700 | ||
901 | 1993 | |||
902 | 1287 | cryptsetup (2:2.0.2-1) unstable; urgency=low | 1994 | cryptsetup (2:2.0.2-1) unstable; urgency=low |
903 | 1288 | 1995 | ||
904 | 1289 | * New upstream release 2.0.2 | 1996 | * New upstream release 2.0.2 |
905 | @@ -1313,6 +2020,40 @@ cryptsetup (2:2.0.1-1) unstable; urgency=low | |||
906 | 1313 | 2020 | ||
907 | 1314 | -- Guilhem Moulin <guilhem@debian.org> Sun, 11 Feb 2018 00:02:05 +0100 | 2021 | -- Guilhem Moulin <guilhem@debian.org> Sun, 11 Feb 2018 00:02:05 +0100 |
908 | 1315 | 2022 | ||
909 | 2023 | cryptsetup (2:2.0.1-0ubuntu2) bionic; urgency=medium | ||
910 | 2024 | |||
911 | 2025 | * Drop the CRYPTSETUP variable warning from the initramfs hook, as | ||
912 | 2026 | overlayroot package ships a dropin in conf-hooks.d triggering false | ||
913 | 2027 | warnings. | ||
914 | 2028 | |||
915 | 2029 | -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 22 Feb 2018 14:49:16 +0000 | ||
916 | 2030 | |||
917 | 2031 | cryptsetup (2:2.0.1-0ubuntu1) bionic; urgency=medium | ||
918 | 2032 | |||
919 | 2033 | * Merge from Debian unstable. Remaining changes: | ||
920 | 2034 | - debian/control: | ||
921 | 2035 | + Depend on plymouth. | ||
922 | 2036 | + Invert the "busybox | busybox-static" Recommends, as the latter | ||
923 | 2037 | is the one we ship in main as part of the ubuntu-standard task. | ||
924 | 2038 | + Drop explicit libgcrypt20 dependency from libcryptsetup4. | ||
925 | 2039 | - Drop _BSD_SOURCE in favor of _DEFAULT_SOURCE | ||
926 | 2040 | - Drop c99 std, as the default is now higher than that | ||
927 | 2041 | - Drop upstart system jobs. | ||
928 | 2042 | - Add maintscript to drop removed upstart system jobs. | ||
929 | 2043 | - debian has its own now, but we have different version numbers | ||
930 | 2044 | * New upstream release | ||
931 | 2045 | * Cherry-pick Guilhem Moulin's changes below from Debian git | ||
932 | 2046 | |||
933 | 2047 | [ Guilhem Moulin ] | ||
934 | 2048 | * New upstream release 2.0.1: | ||
935 | 2049 | - Use /run/cryptsetup as default for cryptsetup locking dir. | ||
936 | 2050 | - Add missing symbols for new functions to debian/libcryptsetup12.symbols. | ||
937 | 2051 | * debian/copyright: update copyright years. | ||
938 | 2052 | * debian/patches: backport upstream's 8728ba08 to fix opening of loop-AES | ||
939 | 2053 | devices using --key-file=-. (Closes: #888162.) | ||
940 | 2054 | |||
941 | 2055 | -- Julian Andres Klode <juliank@ubuntu.com> Mon, 29 Jan 2018 13:48:55 +0100 | ||
942 | 2056 | |||
943 | 1316 | cryptsetup (2:2.0.0-1) unstable; urgency=low | 2057 | cryptsetup (2:2.0.0-1) unstable; urgency=low |
944 | 1317 | 2058 | ||
945 | 1318 | [ Guilhem Moulin ] | 2059 | [ Guilhem Moulin ] |
946 | @@ -1362,6 +2103,26 @@ cryptsetup (2:2.0.0~rc0-1) experimental; urgency=low | |||
947 | 1362 | 2103 | ||
948 | 1363 | -- Guilhem Moulin <guilhem@debian.org> Tue, 03 Oct 2017 03:37:36 +0200 | 2104 | -- Guilhem Moulin <guilhem@debian.org> Tue, 03 Oct 2017 03:37:36 +0200 |
949 | 1364 | 2105 | ||
950 | 2106 | cryptsetup (2:1.7.5-1ubuntu1) bionic; urgency=low | ||
951 | 2107 | |||
952 | 2108 | * Merge from Debian unstable. Remaining changes: | ||
953 | 2109 | - debian/control: | ||
954 | 2110 | + Depend on plymouth. | ||
955 | 2111 | + Invert the "busybox | busybox-static" Recommends, as the latter | ||
956 | 2112 | is the one we ship in main as part of the ubuntu-standard task. | ||
957 | 2113 | + Drop explicit libgcrypt20 dependency from libcryptsetup4. | ||
958 | 2114 | - Drop _BSD_SOURCE in favor of _DEFAULT_SOURCE | ||
959 | 2115 | - Drop c99 std, as the default is now higher than that | ||
960 | 2116 | - Drop upstart system jobs. | ||
961 | 2117 | - Add maintscript to drop removed upstart system jobs. | ||
962 | 2118 | * Merged upstream: | ||
963 | 2119 | - d/p/fips-fix-luksformat-with-recent-kernels -- fix luksFormat | ||
964 | 2120 | with recent FIPS enabled kernels. | ||
965 | 2121 | * Merged in Debian: | ||
966 | 2122 | - Use DEB_VERSION from dpkg/default.mk for pod2man release variable | ||
967 | 2123 | |||
968 | 2124 | -- Julian Andres Klode <juliank@ubuntu.com> Wed, 17 Jan 2018 21:39:10 +0100 | ||
969 | 2125 | |||
970 | 1365 | cryptsetup (2:1.7.5-1) unstable; urgency=low | 2126 | cryptsetup (2:1.7.5-1) unstable; urgency=low |
971 | 1366 | 2127 | ||
972 | 1367 | * New upstream release 1.7.5. | 2128 | * New upstream release 1.7.5. |
973 | @@ -1384,6 +2145,25 @@ cryptsetup (2:1.7.5-1) unstable; urgency=low | |||
974 | 1384 | 2145 | ||
975 | 1385 | -- Guilhem Moulin <guilhem@debian.org> Thu, 14 Sep 2017 13:00:23 +0200 | 2146 | -- Guilhem Moulin <guilhem@debian.org> Thu, 14 Sep 2017 13:00:23 +0200 |
976 | 1386 | 2147 | ||
977 | 2148 | cryptsetup (2:1.7.3-4ubuntu1) artful; urgency=low | ||
978 | 2149 | |||
979 | 2150 | * New upstream release, merge from Debian unstable. Remaining | ||
980 | 2151 | Ubuntu changes: | ||
981 | 2152 | - debian/control: | ||
982 | 2153 | + Depend on plymouth. | ||
983 | 2154 | + Invert the "busybox | busybox-static" Recommends, as the latter | ||
984 | 2155 | is the one we ship in main as part of the ubuntu-standard task. | ||
985 | 2156 | + Drop explicit libgcrypt20 dependency from libcryptsetup4. | ||
986 | 2157 | * d/p/fips-fix-luksformat-with-recent-kernels -- fix luksFormat | ||
987 | 2158 | with recent FIPS enabled kernels. | ||
988 | 2159 | * Drop _BSD_SOURCE in favor of _DEFAULT_SOURCE | ||
989 | 2160 | * Drop c99 std, as the default is now higher than that | ||
990 | 2161 | * Use DEB_VERSION from dpkg/default.mk for pod2man release variable | ||
991 | 2162 | * Drop upstart system jobs. | ||
992 | 2163 | * Add maintscript to drop removed upstart system jobs. | ||
993 | 2164 | |||
994 | 2165 | -- Andy Whitcroft <apw@ubuntu.com> Thu, 10 Aug 2017 14:07:29 +0100 | ||
995 | 2166 | |||
996 | 1387 | cryptsetup (2:1.7.3-4) unstable; urgency=high | 2167 | cryptsetup (2:1.7.3-4) unstable; urgency=high |
997 | 1388 | 2168 | ||
998 | 1389 | [ Guilhem Moulin ] | 2169 | [ Guilhem Moulin ] |
999 | @@ -1596,6 +2376,40 @@ cryptsetup (2:1.7.2-1) unstable; urgency=medium | |||
1000 | 1596 | 2376 | ||
1001 | 1597 | -- Jonas Meurer <mejo@debian.org> Wed, 05 Oct 2016 20:53:09 +0200 | 2377 | -- Jonas Meurer <mejo@debian.org> Wed, 05 Oct 2016 20:53:09 +0200 |
1002 | 1598 | 2378 | ||
1003 | 2379 | cryptsetup (2:1.7.2-0ubuntu4) artful; urgency=medium | ||
1004 | 2380 | |||
1005 | 2381 | * Add maintscript to drop removed upstart system jobs. | ||
1006 | 2382 | |||
1007 | 2383 | -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 21 Aug 2017 11:36:04 +0100 | ||
1008 | 2384 | |||
1009 | 2385 | cryptsetup (2:1.7.2-0ubuntu3) artful; urgency=medium | ||
1010 | 2386 | |||
1011 | 2387 | * Drop _BSD_SOURCE in favor of _DEFAULT_SOURCe | ||
1012 | 2388 | * Drop c99 std, as the default is now higher than that | ||
1013 | 2389 | * Use DEB_VERSION from dpkg/default.mk for pod2man release variable | ||
1014 | 2390 | |||
1015 | 2391 | -- Dimitri John Ledkov <xnox@ubuntu.com> Sat, 19 Aug 2017 21:46:19 +0100 | ||
1016 | 2392 | |||
1017 | 2393 | cryptsetup (2:1.7.2-0ubuntu2) artful; urgency=medium | ||
1018 | 2394 | |||
1019 | 2395 | * Drop upstart system jobs. | ||
1020 | 2396 | |||
1021 | 2397 | -- Dimitri John Ledkov <xnox@ubuntu.com> Sat, 19 Aug 2017 20:57:17 +0100 | ||
1022 | 2398 | |||
1023 | 2399 | cryptsetup (2:1.7.2-0ubuntu1) yakkety; urgency=medium | ||
1024 | 2400 | |||
1025 | 2401 | * New upstream release, merge from Debian unstable (LP: #1548137). Remaining | ||
1026 | 2402 | Ubuntu changes: | ||
1027 | 2403 | - debian/control: | ||
1028 | 2404 | + Bump initramfs-tools Suggests to Depends: so system is not | ||
1029 | 2405 | potentially rendered unbootable. | ||
1030 | 2406 | + Depend on plymouth. | ||
1031 | 2407 | + Invert the "busybox | busybox-static" Recommends, as the latter | ||
1032 | 2408 | is the one we ship in main as part of the ubuntu-standard task. | ||
1033 | 2409 | + Drop explicit libgcrypt20 dependency from libcryptsetup4. | ||
1034 | 2410 | |||
1035 | 2411 | -- Unit 193 <unit193@ubuntu.com> Wed, 22 Jun 2016 16:30:01 -0400 | ||
1036 | 2412 | |||
1037 | 1599 | cryptsetup (2:1.7.0-2) unstable; urgency=medium | 2413 | cryptsetup (2:1.7.0-2) unstable; urgency=medium |
1038 | 1600 | 2414 | ||
1039 | 1601 | [ Guilhem Moulin ] | 2415 | [ Guilhem Moulin ] |
1040 | @@ -1670,6 +2484,35 @@ cryptsetup (2:1.7.0-1) unstable; urgency=medium | |||
1041 | 1670 | 2484 | ||
1042 | 1671 | -- Jonas Meurer <mejo@debian.org> Thu, 07 Jan 2016 02:22:33 +0100 | 2485 | -- Jonas Meurer <mejo@debian.org> Thu, 07 Jan 2016 02:22:33 +0100 |
1043 | 1672 | 2486 | ||
1044 | 2487 | cryptsetup (2:1.6.6-5ubuntu2) wily; urgency=medium | ||
1045 | 2488 | |||
1046 | 2489 | * Fix stupid typo in Recommends "busybox | busybox-static" inversion. | ||
1047 | 2490 | Fixes binary moves for busybox into main. | ||
1048 | 2491 | |||
1049 | 2492 | -- Andy Whitcroft <apw@ubuntu.com> Fri, 21 Aug 2015 08:56:34 +0100 | ||
1050 | 2493 | |||
1051 | 2494 | cryptsetup (2:1.6.6-5ubuntu1) wily; urgency=low | ||
1052 | 2495 | |||
1053 | 2496 | * Merge from Debian unstable. Remaining changes: | ||
1054 | 2497 | - debian/control: | ||
1055 | 2498 | + Bump initramfs-tools Suggests to Depends: so system is not | ||
1056 | 2499 | potentially rendered unbootable. | ||
1057 | 2500 | + Depend on plymouth. | ||
1058 | 2501 | + Invert the "busybox | busybox-static" Recommends, as the latter | ||
1059 | 2502 | is the one we ship in main as part of the ubuntu-standard task. | ||
1060 | 2503 | + Drop explicit libgcrypt11 dependency from libcryptsetup4. | ||
1061 | 2504 | * Dropped changes, now in Debian: | ||
1062 | 2505 | - Remove hardcoded paths to udevadm. | ||
1063 | 2506 | - debian/initramfs/cryptroot-hook: | ||
1064 | 2507 | + Do not unconditionally include cryptsetup utils in the initramfs. | ||
1065 | 2508 | + Do not include any modules or utils in the initramfs, unless | ||
1066 | 2509 | rootfs/resume devices are encrypted or CRYPTSETUP is set to 'y' in | ||
1067 | 2510 | the initramfs.conf configuration file. | ||
1068 | 2511 | - debian/cryptsetup.maintscripts: | ||
1069 | 2512 | + Migrate upstart jobs to new names. | ||
1070 | 2513 | |||
1071 | 2514 | -- Andy Whitcroft <apw@ubuntu.com> Tue, 07 Jul 2015 16:58:45 +0100 | ||
1072 | 2515 | |||
1073 | 1673 | cryptsetup (2:1.6.6-5) unstable; urgency=high | 2516 | cryptsetup (2:1.6.6-5) unstable; urgency=high |
1074 | 1674 | 2517 | ||
1075 | 1675 | * debian/cryptdisks.functions: fix the precheck for ubuntu+upstart | 2518 | * debian/cryptdisks.functions: fix the precheck for ubuntu+upstart |
1076 | @@ -1822,6 +2665,71 @@ cryptsetup (2:1.6.4-1) unstable; urgency=low | |||
1077 | 1822 | 2665 | ||
1078 | 1823 | -- Jonas Meurer <mejo@debian.org> Fri, 28 Jun 2013 12:14:55 +0200 | 2666 | -- Jonas Meurer <mejo@debian.org> Fri, 28 Jun 2013 12:14:55 +0200 |
1079 | 1824 | 2667 | ||
1080 | 2668 | cryptsetup (2:1.6.1-1ubuntu7) vivid; urgency=medium | ||
1081 | 2669 | |||
1082 | 2670 | * Drop explicit libgcrypt11 dependency from libcryptsetup4. | ||
1083 | 2671 | |||
1084 | 2672 | -- Adam Conrad <adconrad@ubuntu.com> Fri, 27 Mar 2015 18:24:38 -0600 | ||
1085 | 2673 | |||
1086 | 2674 | cryptsetup (2:1.6.1-1ubuntu6) vivid; urgency=medium | ||
1087 | 2675 | |||
1088 | 2676 | * No-change rebuild for the libgcrypt20 transition. | ||
1089 | 2677 | |||
1090 | 2678 | -- Adam Conrad <adconrad@ubuntu.com> Fri, 27 Mar 2015 06:16:08 -0600 | ||
1091 | 2679 | |||
1092 | 2680 | cryptsetup (2:1.6.1-1ubuntu5) vivid; urgency=medium | ||
1093 | 2681 | |||
1094 | 2682 | * ./debian/scripts/luksformat: Drop luksFormat -s and --ciper options. They | ||
1095 | 2683 | aren't necessary any more, and aes-cbc-essiv:sha256 is obsolete. This will | ||
1096 | 2684 | now use aes-xts-plain64 by default. (LP: #1414719) | ||
1097 | 2685 | |||
1098 | 2686 | -- Martin Pitt <martin.pitt@ubuntu.com> Fri, 27 Feb 2015 09:37:05 +0100 | ||
1099 | 2687 | |||
1100 | 2688 | cryptsetup (2:1.6.1-1ubuntu4) vivid; urgency=medium | ||
1101 | 2689 | |||
1102 | 2690 | * No change rebuild to get debug symbols for all architectures. | ||
1103 | 2691 | |||
1104 | 2692 | -- Brian Murray <brian@ubuntu.com> Wed, 03 Dec 2014 08:03:31 -0800 | ||
1105 | 2693 | |||
1106 | 2694 | cryptsetup (2:1.6.1-1ubuntu3) utopic; urgency=high | ||
1107 | 2695 | |||
1108 | 2696 | * No change rebuild against new dh_installinit, to call update-rc.d at | ||
1109 | 2697 | postinst. | ||
1110 | 2698 | |||
1111 | 2699 | -- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 28 May 2014 10:39:30 +0100 | ||
1112 | 2700 | |||
1113 | 2701 | cryptsetup (2:1.6.1-1ubuntu2) utopic; urgency=medium | ||
1114 | 2702 | |||
1115 | 2703 | * debian/askpass.c: | ||
1116 | 2704 | - Fix bug (LP: #1301086) where askpass fails to restore terminal | ||
1117 | 2705 | settings. | ||
1118 | 2706 | |||
1119 | 2707 | -- Robert Barabas <dc@0xdc.org> Fri, 18 Apr 2014 14:08:51 -0400 | ||
1120 | 2708 | |||
1121 | 2709 | cryptsetup (2:1.6.1-1ubuntu1) trusty; urgency=low | ||
1122 | 2710 | |||
1123 | 2711 | * Merge from debian unstable, remaining changes: | ||
1124 | 2712 | - debian/control: | ||
1125 | 2713 | + Bump initramfs-tools Suggests to Depends: so system is not | ||
1126 | 2714 | potentially rendered unbootable. | ||
1127 | 2715 | + Depend on plymouth. | ||
1128 | 2716 | |||
1129 | 2717 | - Invert the "busybox | busybox-static" Recommends, as the latter is | ||
1130 | 2718 | the one we ship in main as part of the ubuntu-standard task. | ||
1131 | 2719 | |||
1132 | 2720 | - Remove hardcoded paths to udevadm (LP: #1184066). | ||
1133 | 2721 | |||
1134 | 2722 | - debian/initramfs/cryptroot-hook: | ||
1135 | 2723 | + Do not unconditionally include cryptsetup utils in the initramfs. | ||
1136 | 2724 | + Do not include any modules or utils in the initramfs, unless | ||
1137 | 2725 | rootfs/resume devices are encrypted or CRYPTSETUP is set to 'y' in | ||
1138 | 2726 | the initramfs.conf configuration file. | ||
1139 | 2727 | |||
1140 | 2728 | - debian/cryptsetup.maintscripts: | ||
1141 | 2729 | + Migrate upstart jobs to new names. | ||
1142 | 2730 | |||
1143 | 2731 | -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Fri, 01 Nov 2013 16:48:57 +0000 | ||
1144 | 2732 | |||
1145 | 1825 | cryptsetup (2:1.6.1-1) unstable; urgency=low | 2733 | cryptsetup (2:1.6.1-1) unstable; urgency=low |
1146 | 1826 | 2734 | ||
1147 | 1827 | [ Milan Broz ] | 2735 | [ Milan Broz ] |
1148 | @@ -1863,6 +2771,50 @@ cryptsetup (2:1.6.1-1) unstable; urgency=low | |||
1149 | 1863 | 2771 | ||
1150 | 1864 | -- Jonas Meurer <mejo@debian.org> Fri, 28 Jun 2013 12:10:41 +0200 | 2772 | -- Jonas Meurer <mejo@debian.org> Fri, 28 Jun 2013 12:10:41 +0200 |
1151 | 1865 | 2773 | ||
1152 | 2774 | cryptsetup (2:1.4.3-4ubuntu4) saucy; urgency=low | ||
1153 | 2775 | |||
1154 | 2776 | * debian/initramfs/cryptroot-hook: | ||
1155 | 2777 | - Do not unconditionally include cryptsetup utils in the initramfs. | ||
1156 | 2778 | - Do not include any modules or utils in the initramfs, unless | ||
1157 | 2779 | rootfs/resume devices are encrypted or CRYPTSETUP is set to 'y' in | ||
1158 | 2780 | the initramfs.conf configuration file. | ||
1159 | 2781 | |||
1160 | 2782 | -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Mon, 10 Jun 2013 16:25:46 +0100 | ||
1161 | 2783 | |||
1162 | 2784 | cryptsetup (2:1.4.3-4ubuntu3) saucy; urgency=low | ||
1163 | 2785 | |||
1164 | 2786 | * Remove hardcoded paths to udevadm (LP: #1184066). | ||
1165 | 2787 | |||
1166 | 2788 | -- Colin Watson <cjwatson@ubuntu.com> Tue, 28 May 2013 11:27:27 +0100 | ||
1167 | 2789 | |||
1168 | 2790 | cryptsetup (2:1.4.3-4ubuntu2) raring; urgency=low | ||
1169 | 2791 | |||
1170 | 2792 | * Invert the "busybox | busybox-static" Recommends, as the latter | ||
1171 | 2793 | is the one we ship in main as part of the ubuntu-standard task. | ||
1172 | 2794 | |||
1173 | 2795 | -- Adam Conrad <adconrad@ubuntu.com> Fri, 16 Nov 2012 01:14:35 -0700 | ||
1174 | 2796 | |||
1175 | 2797 | cryptsetup (2:1.4.3-4ubuntu1) raring; urgency=low | ||
1176 | 2798 | |||
1177 | 2799 | * Merge from debian unstable, remaining changes: | ||
1178 | 2800 | - debian/control: | ||
1179 | 2801 | + Bump initramfs-tools Suggests to Depends: so system is not | ||
1180 | 2802 | potentially rendered unbootable. | ||
1181 | 2803 | + Depend on plymouth. | ||
1182 | 2804 | |||
1183 | 2805 | - init/upstart jobs: | ||
1184 | 2806 | + Rename cryptddisks{,-early}.upstart jobs to | ||
1185 | 2807 | cryptdisks-{enable,udev}.upstart, as we need both init & upstart jobs | ||
1186 | 2808 | for now. | ||
1187 | 2809 | + debian/cryptdisks{,-early}.init: Make the 'start' action of the init | ||
1188 | 2810 | script a no-op, this should be handled entirely by the upstart job; | ||
1189 | 2811 | and fix the LSB header to not declare this should be started in | ||
1190 | 2812 | runlevel 'S'. | ||
1191 | 2813 | + Do not install start symlinks for init scripts | ||
1192 | 2814 | + NB! shutdown is still handled by the SystemV init scripts | ||
1193 | 2815 | |||
1194 | 2816 | -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Tue, 13 Nov 2012 11:17:57 +0000 | ||
1195 | 2817 | |||
1196 | 1866 | cryptsetup (2:1.4.3-4) unstable; urgency=medium | 2818 | cryptsetup (2:1.4.3-4) unstable; urgency=medium |
1197 | 1867 | 2819 | ||
1198 | 1868 | * change recommends for busybox to busybox | busybox-static. Thanks to | 2820 | * change recommends for busybox to busybox | busybox-static. Thanks to |
1199 | @@ -1895,6 +2847,50 @@ cryptsetup (2:1.4.3-3) unstable; urgency=medium | |||
1200 | 1895 | 2847 | ||
1201 | 1896 | -- Jonas Meurer <mejo@debian.org> Thu, 01 Nov 2012 15:34:09 +0100 | 2848 | -- Jonas Meurer <mejo@debian.org> Thu, 01 Nov 2012 15:34:09 +0100 |
1202 | 1897 | 2849 | ||
1203 | 2850 | cryptsetup (2:1.4.3-2ubuntu1) quantal; urgency=low | ||
1204 | 2851 | |||
1205 | 2852 | * Merge from debian unstable (LP: #1015753), remaining changes: | ||
1206 | 2853 | - debian/control: | ||
1207 | 2854 | + Bump initramfs-tools Suggests to Depends: so system is not | ||
1208 | 2855 | potentially rendered unbootable. | ||
1209 | 2856 | + Depend on plymouth. | ||
1210 | 2857 | |||
1211 | 2858 | - init/upstart jobs: | ||
1212 | 2859 | + Add debian/cryptdisks-{enable,udev}.upstart for bootup. | ||
1213 | 2860 | + debian/cryptdisks{,-early}.init: Make the 'start' action of the init | ||
1214 | 2861 | script a no-op, this should be handled entirely by the upstart job; | ||
1215 | 2862 | and fix the LSB header to not declare this should be started in | ||
1216 | 2863 | runlevel 'S'. | ||
1217 | 2864 | + Do not install start symlinks for init scripts | ||
1218 | 2865 | + NB! shutdown is still handled by the SystemV init scripts | ||
1219 | 2866 | |||
1220 | 2867 | * Rename cryptddisks{,-early}.upstart jobs back to | ||
1221 | 2868 | cryptdisks-{enable,udev}.upstart, as we need both init & upstart jobs | ||
1222 | 2869 | for now. | ||
1223 | 2870 | |||
1224 | 2871 | * Dropped Changes, included in Debian: | ||
1225 | 2872 | - debian/control: | ||
1226 | 2873 | + Split up package in cryptsetup and cryptsetup-bin. (LP: #343363). | ||
1227 | 2874 | |||
1228 | 2875 | - debian/cryptdisks.functions: | ||
1229 | 2876 | + Do not overwrite existing filesystems when creating swap (LP: #474258). | ||
1230 | 2877 | + Add aesni module when we have hardware encryption. | ||
1231 | 2878 | + Call 'udevadm settle' before 'dmsetup rename' http://pad.lv/874774 | ||
1232 | 2879 | + Suppress "Starting init crypto disks" message in "init" phase, to | ||
1233 | 2880 | avoid writing over fsck progress text. | ||
1234 | 2881 | + new function, crypttab_start_one_disk, to look for the named source | ||
1235 | 2882 | device in /etc/crypttab (by device name, UUID, or label) and start it | ||
1236 | 2883 | if configured to do so | ||
1237 | 2884 | + handle the case where crypttab contains a name for the source | ||
1238 | 2885 | device that is not the kernel's preferred name for it (as is the case | ||
1239 | 2886 | for LVs). | ||
1240 | 2887 | |||
1241 | 2888 | - debian/initramfs/cryptroot-hook: | ||
1242 | 2889 | + Quiet warnings from find on arches that don't have all the | ||
1243 | 2890 | kernel/{arch,crypto} bits we're testing for. | ||
1244 | 2891 | |||
1245 | 2892 | -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Tue, 21 Aug 2012 11:57:28 +0100 | ||
1246 | 2893 | |||
1247 | 1898 | cryptsetup (2:1.4.3-2) unstable; urgency=medium | 2894 | cryptsetup (2:1.4.3-2) unstable; urgency=medium |
1248 | 1899 | 2895 | ||
1249 | 1900 | * fix the shared library symbols magic: so far, the symbols file for | 2896 | * fix the shared library symbols magic: so far, the symbols file for |
1250 | @@ -1970,6 +2966,64 @@ cryptsetup (2:1.4.1-3) unstable; urgency=low | |||
1251 | 1970 | 2966 | ||
1252 | 1971 | -- Jonas Meurer <mejo@debian.org> Wed, 11 Apr 2012 23:55:35 +0200 | 2967 | -- Jonas Meurer <mejo@debian.org> Wed, 11 Apr 2012 23:55:35 +0200 |
1253 | 1972 | 2968 | ||
1254 | 2969 | cryptsetup (2:1.4.1-2ubuntu4) precise; urgency=low | ||
1255 | 2970 | |||
1256 | 2971 | * Our swap creation can trigger udev change events, which means udev may be | ||
1257 | 2972 | holding the device open at the time we try to call 'dmsetup rename' and | ||
1258 | 2973 | cause the /subsequent/ events to be missed because of dmsetup creating | ||
1259 | 2974 | device nodes by hand. So call 'udevadm settle' before 'dmsetup rename', | ||
1260 | 2975 | to ensure blkid is out of the way first. This should ensure swap | ||
1261 | 2976 | partitions are found by mountall in a non-racy manner. LP: #874774. | ||
1262 | 2977 | |||
1263 | 2978 | -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 13 Apr 2012 20:23:21 -0700 | ||
1264 | 2979 | |||
1265 | 2980 | cryptsetup (2:1.4.1-2ubuntu3) precise; urgency=low | ||
1266 | 2981 | |||
1267 | 2982 | * Start cryptdisks-enable upstart job on 'or container', to let us | ||
1268 | 2983 | simplify the udevtrigger job. | ||
1269 | 2984 | |||
1270 | 2985 | -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 04 Apr 2012 17:02:00 -0700 | ||
1271 | 2986 | |||
1272 | 2987 | cryptsetup (2:1.4.1-2ubuntu2) precise; urgency=low | ||
1273 | 2988 | |||
1274 | 2989 | * Split up package in cryptsetup and cryptsetup-bin. (LP: #343363). | ||
1275 | 2990 | * Do not overwrite existing filesystems when creating swap (LP: #474258). | ||
1276 | 2991 | * Add aesni module when we have hardware encryption. | ||
1277 | 2992 | |||
1278 | 2993 | -- Jean-Louis Dupond <jean-louis@dupond.be> Mon, 12 Mar 2012 10:14:30 +0100 | ||
1279 | 2994 | |||
1280 | 2995 | cryptsetup (2:1.4.1-2ubuntu1) precise; urgency=low | ||
1281 | 2996 | |||
1282 | 2997 | [ Jean-Louis Dupond ] | ||
1283 | 2998 | * Merge from debian unstable (LP: #776264), remaining changes: | ||
1284 | 2999 | - debian/cryptdisks.functions: Suppress "Starting init crypto disks" message | ||
1285 | 3000 | in "init" phase, to avoid writing over fsck progress text. | ||
1286 | 3001 | - debian/cryptroot-hook: Quiet warnings from find on arches that | ||
1287 | 3002 | don't have all the kernel/{arch,crypto} bits we're testing for. | ||
1288 | 3003 | - debian/control: | ||
1289 | 3004 | + Bump initramfs-tools Suggests to Depends: so system is not | ||
1290 | 3005 | potentially rendered unbootable. | ||
1291 | 3006 | + Depend on plymouth. | ||
1292 | 3007 | - Add debian/cryptdisks-{enable,udev}.upstart. | ||
1293 | 3008 | - debian/cryptdisks.functions: | ||
1294 | 3009 | + new function, crypttab_start_one_disk, to look for the named source | ||
1295 | 3010 | device in /etc/crypttab (by device name, UUID, or label) and start it | ||
1296 | 3011 | if configured to do so | ||
1297 | 3012 | - debian/cryptdisks{,-early}.init: Make the 'start' action of the init | ||
1298 | 3013 | script a no-op, this should be handled entirely by the upstart job; | ||
1299 | 3014 | and fix the LSB header to not declare this should be started in | ||
1300 | 3015 | runlevel 'S' | ||
1301 | 3016 | - debian/rules: | ||
1302 | 3017 | + Do not install start symlinks for init scripts, and | ||
1303 | 3018 | install debian/cryptdisks-{enable,udev}.upstart scripts. | ||
1304 | 3019 | |||
1305 | 3020 | [ Steve Langasek ] | ||
1306 | 3021 | * debian/cryptdisks.functions: handle the case where crypttab contains a | ||
1307 | 3022 | name for the source device that is not the kernel's preferred name for | ||
1308 | 3023 | it (as is the case for LVs). | ||
1309 | 3024 | |||
1310 | 3025 | -- Jean-Louis Dupond <jean-louis@dupond.be> Thu, 08 Mar 2012 07:32:40 +0100 | ||
1311 | 3026 | |||
1312 | 1973 | cryptsetup (2:1.4.1-2) unstable; urgency=low | 3027 | cryptsetup (2:1.4.1-2) unstable; urgency=low |
1313 | 1974 | 3028 | ||
1314 | 1975 | * acknowledge NMU. Thanks to Michael Biebl. (closes: #659182) | 3029 | * acknowledge NMU. Thanks to Michael Biebl. (closes: #659182) |
1315 | @@ -2179,6 +3233,56 @@ cryptsetup (2:1.2.0-1) experimental; urgency=low | |||
1316 | 2179 | 3233 | ||
1317 | 2180 | -- Jonas Meurer <mejo@debian.org> Sun, 16 Jan 2011 01:01:03 +0100 | 3234 | -- Jonas Meurer <mejo@debian.org> Sun, 16 Jan 2011 01:01:03 +0100 |
1318 | 2181 | 3235 | ||
1319 | 3236 | cryptsetup (2:1.1.3-4ubuntu3) precise; urgency=low | ||
1320 | 3237 | |||
1321 | 3238 | [ Pali Rohar ] | ||
1322 | 3239 | * debian/cryptdisks.functions: Suppress "Starting init crypto disks" message | ||
1323 | 3240 | in "init" phase, to avoid writing over fsck progress text. | ||
1324 | 3241 | |||
1325 | 3242 | -- Martin Pitt <martin.pitt@ubuntu.com> Wed, 26 Oct 2011 09:16:15 +0200 | ||
1326 | 3243 | |||
1327 | 3244 | cryptsetup (2:1.1.3-4ubuntu2) oneiric; urgency=low | ||
1328 | 3245 | |||
1329 | 3246 | * debian/cryptroot-hook: Quiet warnings from find on arches that | ||
1330 | 3247 | don't have all the kernel/{arch,crypto} bits we're testing for. | ||
1331 | 3248 | |||
1332 | 3249 | -- Adam Conrad <adconrad@ubuntu.com> Sat, 01 Oct 2011 00:33:00 -0600 | ||
1333 | 3250 | |||
1334 | 3251 | cryptsetup (2:1.1.3-4ubuntu1) natty; urgency=low | ||
1335 | 3252 | |||
1336 | 3253 | * Merge from debian unstable (LP: #682177), remaining changes: | ||
1337 | 3254 | - debian/control: | ||
1338 | 3255 | + Bump initramfs-tools Suggests to Depends: so system is not | ||
1339 | 3256 | potentially rendered unbootable. | ||
1340 | 3257 | + Depend on plymouth. | ||
1341 | 3258 | - Add debian/cryptdisks-{enable,udev}.upstart. | ||
1342 | 3259 | - debian/cryptdisks.functions: | ||
1343 | 3260 | + new function, crypttab_start_one_disk, to look for the named source | ||
1344 | 3261 | device in /etc/crypttab (by device name, UUID, or label) and start it | ||
1345 | 3262 | if configured to do so | ||
1346 | 3263 | + wrap the call to /lib/cryptsetup/askpass with watershed, to make sure | ||
1347 | 3264 | we only ever have one of these running at a time; otherwise multiple | ||
1348 | 3265 | invocations could steal each other's input and/or write over each | ||
1349 | 3266 | other's output | ||
1350 | 3267 | + when called by cryptdisks-enable, check that we don't already have a | ||
1351 | 3268 | corresponding cryptdisks-udev job running (probably waiting for a | ||
1352 | 3269 | passphrase); if there is, wait until it's finished before continuing. | ||
1353 | 3270 | - debian/cryptdisks{,-early}.init: Make the 'start' action of the init | ||
1354 | 3271 | script a no-op, this should be handled entirely by the upstart job; | ||
1355 | 3272 | and fix the LSB header to not declare this should be started in | ||
1356 | 3273 | runlevel 'S' | ||
1357 | 3274 | - debian/cryptsetup.postinst: Remove any symlinks from /etc/rcS.d on | ||
1358 | 3275 | upgrade. | ||
1359 | 3276 | - debian/rules: | ||
1360 | 3277 | + Do not install start symlinks for init scripts, and | ||
1361 | 3278 | install debian/cryptdisks-{enable,udev}.upstart scripts. | ||
1362 | 3279 | + link dynamically against libgcrypt and libgpg-error. | ||
1363 | 3280 | - Add debian/cryptsetup.apport: Apport package hook. Install in | ||
1364 | 3281 | debian/rules and create dir in debian/cryptsetup.dirs. | ||
1365 | 3282 | - debian/cryptsetup.postrm: call update-initramfs on package removal. | ||
1366 | 3283 | |||
1367 | 3284 | -- Lorenzo De Liso <blackz@ubuntu.com> Sat, 27 Nov 2010 17:37:43 +0100 | ||
1368 | 3285 | |||
1369 | 2182 | cryptsetup (2:1.1.3-4) unstable; urgency=high | 3286 | cryptsetup (2:1.1.3-4) unstable; urgency=high |
1370 | 2183 | 3287 | ||
1371 | 2184 | * bump standards-version to 3.9.1, no changes required | 3288 | * bump standards-version to 3.9.1, no changes required |
1372 | @@ -2284,6 +3388,69 @@ cryptsetup (2:1.1.3-1) unstable; urgency=low | |||
1373 | 2284 | 3388 | ||
1374 | 2285 | -- Jonas Meurer <mejo@debian.org> Sat, 10 Jul 2010 14:32:40 +0200 | 3389 | -- Jonas Meurer <mejo@debian.org> Sat, 10 Jul 2010 14:32:40 +0200 |
1375 | 2286 | 3390 | ||
1376 | 3391 | cryptsetup (2:1.1.2-1ubuntu1) maverick; urgency=low | ||
1377 | 3392 | |||
1378 | 3393 | * Merge from Debian unstable (LP: #594365). Remaining changes: | ||
1379 | 3394 | - debian/control: | ||
1380 | 3395 | + Bump initramfs-tools Suggests to Depends: so system is not | ||
1381 | 3396 | potentially rendered unbootable. | ||
1382 | 3397 | + Depend on plymouth. | ||
1383 | 3398 | - Add debian/cryptdisks-{enable,udev}.upstart. | ||
1384 | 3399 | - debian/cryptdisks.functions: | ||
1385 | 3400 | + new function, crypttab_start_one_disk, to look for the named source | ||
1386 | 3401 | device in /etc/crypttab (by device name, UUID, or label) and start it | ||
1387 | 3402 | if configured to do so | ||
1388 | 3403 | + wrap the call to /lib/cryptsetup/askpass with watershed, to make sure | ||
1389 | 3404 | we only ever have one of these running at a time; otherwise multiple | ||
1390 | 3405 | invocations could steal each other's input and/or write over each | ||
1391 | 3406 | other's output | ||
1392 | 3407 | + initially create the device under a temporary name and rename it only | ||
1393 | 3408 | at the end using 'dmsetup rename', to ensure that upstart/mountall | ||
1394 | 3409 | doesn't see our device before it's ready to go. | ||
1395 | 3410 | + do_tmp should mount under /var/run/cryptsetup for changing the | ||
1396 | 3411 | permissions of the filesystem root, not directly on /tmp, since | ||
1397 | 3412 | mounting on /tmp a) is racy, b) confuses mountall something fierce. | ||
1398 | 3413 | + when called by cryptdisks-enable, check that we don't already have a | ||
1399 | 3414 | corresponding cryptdisks-udev job running (probably waiting for a | ||
1400 | 3415 | passphrase); if there is, wait until it's finished before continuing. | ||
1401 | 3416 | - debian/cryptdisks{,-early}.init: Make the 'start' action of the init | ||
1402 | 3417 | script a no-op, this should be handled entirely by the upstart job; | ||
1403 | 3418 | and fix the LSB header to not declare this should be started in | ||
1404 | 3419 | runlevel 'S' | ||
1405 | 3420 | - debian/cryptsetup.postinst: Remove any symlinks from /etc/rcS.d on | ||
1406 | 3421 | upgrade. | ||
1407 | 3422 | - debian/rules: Do not install start symlinks for init scripts, and | ||
1408 | 3423 | install debian/cryptdisks-{enable,udev}.upstart scripts. | ||
1409 | 3424 | - Add debian/cryptsetup.apport: Apport package hook. Install in | ||
1410 | 3425 | debian/rules and create dir in debian/cryptsetup.dirs. | ||
1411 | 3426 | - debian/rules: link dynamically against libgcrypt and libgpg-error. | ||
1412 | 3427 | - debian/cryptsetup.postrm: call update-initramfs on package removal. | ||
1413 | 3428 | * Dropped changes, merged/superseded in Debian: | ||
1414 | 3429 | - Add ext4 support to passdev. | ||
1415 | 3430 | - cryptroot-hook: don't call copy_modules_dir with empty arguments when | ||
1416 | 3431 | archcrypto isn't found | ||
1417 | 3432 | - Set USPLASH=y and FRAMEBUFFER=y in the hook config to pull plymouth into | ||
1418 | 3433 | the initramfs. | ||
1419 | 3434 | - change interaction to use plymouth directly if present, and if not, to | ||
1420 | 3435 | fall back to /lib/cryptsetup/askpass as before | ||
1421 | 3436 | - cryptdisks.functions: replace 'echo -e' bashism with 'printf'. | ||
1422 | 3437 | - debian/initramfs/cryptroot-script: if plymouth is present in the | ||
1423 | 3438 | initramfs, use this directly, bypassing the cryptsetup askpass script | ||
1424 | 3439 | - debian/initramfs/cryptroot-hook: Properly anchor our regexps when | ||
1425 | 3440 | grepping /etc/crypttab so that we don't incorrectly match device names | ||
1426 | 3441 | that are substrings of one another. | ||
1427 | 3442 | - debian/initramfs/cryptroot-script: Don't leak /conf/conf.d/cryptroot | ||
1428 | 3443 | file descriptor to subprocesses. | ||
1429 | 3444 | - Fix grammar error in debian/initramfs/cryptroot-script | ||
1430 | 3445 | ("setup" -> "set up") | ||
1431 | 3446 | - debian/initramfs/cryptroot-script: Fix this to work with current | ||
1432 | 3447 | initramfs-tools: | ||
1433 | 3448 | + Source /scripts/functions after checking for prerequisites. | ||
1434 | 3449 | + prereqs(): Do not assume we are running within initramfs, and | ||
1435 | 3450 | calculate relative path correctly. | ||
1436 | 3451 | |||
1437 | 3452 | -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 14 Jun 2010 21:47:28 -0700 | ||
1438 | 3453 | |||
1439 | 2287 | cryptsetup (2:1.1.2-1) unstable; urgency=low | 3454 | cryptsetup (2:1.1.2-1) unstable; urgency=low |
1440 | 2288 | 3455 | ||
1441 | 2289 | * new upstream release, changes include: | 3456 | * new upstream release, changes include: |
1442 | @@ -2401,6 +3568,171 @@ cryptsetup (2:1.1.0-1) unstable; urgency=low | |||
1443 | 2401 | 3568 | ||
1444 | 2402 | -- Jonas Meurer <mejo@debian.org> Mon, 08 Mar 2010 14:15:35 +0100 | 3569 | -- Jonas Meurer <mejo@debian.org> Mon, 08 Mar 2010 14:15:35 +0100 |
1445 | 2403 | 3570 | ||
1446 | 3571 | cryptsetup (2:1.1.0~rc2-1ubuntu14) maverick; urgency=low | ||
1447 | 3572 | |||
1448 | 3573 | [ David Stansby ] | ||
1449 | 3574 | * Fix grammar error in debian/initramfs/cryptroot-script | ||
1450 | 3575 | ("setup" -> "set up") (LP: #578896) | ||
1451 | 3576 | |||
1452 | 3577 | -- James Westby <james.westby@ubuntu.com> Mon, 17 May 2010 13:33:40 +0100 | ||
1453 | 3578 | |||
1454 | 3579 | cryptsetup (2:1.1.0~rc2-1ubuntu13) lucid; urgency=low | ||
1455 | 3580 | |||
1456 | 3581 | * debian/initramfs/cryptroot-script: Don't leak /conf/conf.d/cryptroot | ||
1457 | 3582 | file descriptor to subprocesses. | ||
1458 | 3583 | |||
1459 | 3584 | -- Colin Watson <cjwatson@ubuntu.com> Mon, 29 Mar 2010 22:18:36 +0100 | ||
1460 | 3585 | |||
1461 | 3586 | cryptsetup (2:1.1.0~rc2-1ubuntu12) lucid; urgency=low | ||
1462 | 3587 | |||
1463 | 3588 | * debian/initramfs/cryptroot-hook: Properly anchor our regexps when | ||
1464 | 3589 | grepping /etc/crypttab so that we don't incorrectly match device names | ||
1465 | 3590 | that are substrings of one another. | ||
1466 | 3591 | * debian/cryptdisks-{enable,udev}.conf, debian/control: drop | ||
1467 | 3592 | 'console output' and add a hard dependency on plymouth instead of | ||
1468 | 3593 | watershed, to avoid spitting extra messages to the console. | ||
1469 | 3594 | |||
1470 | 3595 | -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 18 Feb 2010 06:19:19 -0800 | ||
1471 | 3596 | |||
1472 | 3597 | cryptsetup (2:1.1.0~rc2-1ubuntu11) lucid; urgency=low | ||
1473 | 3598 | |||
1474 | 3599 | * Set FRAMEBUFFER=y in the file that we actually ship. | ||
1475 | 3600 | * debian/cryptsetup.postrm: call update-initramfs on package removal. | ||
1476 | 3601 | LP: #468228. | ||
1477 | 3602 | |||
1478 | 3603 | -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 25 Jan 2010 03:07:52 -0800 | ||
1479 | 3604 | |||
1480 | 3605 | cryptsetup (2:1.1.0~rc2-1ubuntu10) lucid; urgency=low | ||
1481 | 3606 | |||
1482 | 3607 | * cryptdisks.functions: replace 'echo -e' bashism with 'printf'. | ||
1483 | 3608 | * cryptdisks.functions: when called by cryptdisks-enable, check that we | ||
1484 | 3609 | don't already have a corresponding cryptdisks-udev job running (probably | ||
1485 | 3610 | waiting for a passphrase); if there is, wait until it's finished before | ||
1486 | 3611 | continuing. | ||
1487 | 3612 | |||
1488 | 3613 | -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 21 Jan 2010 14:57:21 +0000 | ||
1489 | 3614 | |||
1490 | 3615 | cryptsetup (2:1.1.0~rc2-1ubuntu9) lucid; urgency=low | ||
1491 | 3616 | |||
1492 | 3617 | * Set FRAMEBUFFER=y in the hook config as well, to pull plymouth into the | ||
1493 | 3618 | initramfs. | ||
1494 | 3619 | * cryptdisks.functions, debian/initramfs/cryptroot-script: fix the | ||
1495 | 3620 | invocation of plymouth, so that we actually get proper passphrase prompts | ||
1496 | 3621 | (once bug #496765 is fixed). | ||
1497 | 3622 | |||
1498 | 3623 | -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 16 Jan 2010 02:32:41 -0800 | ||
1499 | 3624 | |||
1500 | 3625 | cryptsetup (2:1.1.0~rc2-1ubuntu8) lucid; urgency=low | ||
1501 | 3626 | |||
1502 | 3627 | * cryptdisks.functions: do_tmp should mount under /var/run/cryptsetup for | ||
1503 | 3628 | changing the permissions of the filesystem root, not directly on /tmp, | ||
1504 | 3629 | since mounting on /tmp a) is racy, b) confuses mountall something fierce. | ||
1505 | 3630 | LP: #475936. | ||
1506 | 3631 | |||
1507 | 3632 | -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 22 Dec 2009 20:24:28 +0000 | ||
1508 | 3633 | |||
1509 | 3634 | cryptsetup (2:1.1.0~rc2-1ubuntu7) lucid; urgency=low | ||
1510 | 3635 | |||
1511 | 3636 | * Depend on watershed. | ||
1512 | 3637 | |||
1513 | 3638 | -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 22 Dec 2009 01:37:36 +0000 | ||
1514 | 3639 | |||
1515 | 3640 | cryptsetup (2:1.1.0~rc2-1ubuntu6) lucid; urgency=low | ||
1516 | 3641 | |||
1517 | 3642 | [ Steve Langasek ] | ||
1518 | 3643 | * Fix the LSB header in the init scripts, now that we don't install to | ||
1519 | 3644 | rcS.d. | ||
1520 | 3645 | |||
1521 | 3646 | [ Martin Pitt ] | ||
1522 | 3647 | * debian/initramfs/cryptroot-script: Fix this to work with current | ||
1523 | 3648 | initramfs-tools: | ||
1524 | 3649 | - Source /scripts/functions after checking for prerequisites. | ||
1525 | 3650 | - prereqs(): Do not assume we are running within initramfs, and calculate | ||
1526 | 3651 | relative path correctly. | ||
1527 | 3652 | |||
1528 | 3653 | -- Martin Pitt <martin.pitt@ubuntu.com> Fri, 18 Dec 2009 17:07:07 +0100 | ||
1529 | 3654 | |||
1530 | 3655 | cryptsetup (2:1.1.0~rc2-1ubuntu5) lucid; urgency=low | ||
1531 | 3656 | |||
1532 | 3657 | * Rename the upstart job introduced in the previous upload to | ||
1533 | 3658 | cryptdisks-udev and restore the previous version of the job as | ||
1534 | 3659 | cryptdisks-enable, to run at the end of udev coldplugging as before; | ||
1535 | 3660 | this isn't entirely race-free, but should nevertheless give us the | ||
1536 | 3661 | two passes needed to cover devices that are decrypted using keys stored | ||
1537 | 3662 | on other encrypted disks. LP: #443980. | ||
1538 | 3663 | |||
1539 | 3664 | -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 16 Dec 2009 06:41:30 +0000 | ||
1540 | 3665 | |||
1541 | 3666 | cryptsetup (2:1.1.0~rc2-1ubuntu4) lucid; urgency=low | ||
1542 | 3667 | |||
1543 | 3668 | [ Steve Langasek ] | ||
1544 | 3669 | * debian/initramfs/cryptroot-script: if plymouth is present in the | ||
1545 | 3670 | initramfs, use this directly, bypassing the cryptsetup askpass script; | ||
1546 | 3671 | but keep support for these other frontends around on a transitional | ||
1547 | 3672 | basis. | ||
1548 | 3673 | * debian/cryptdisks.functions: | ||
1549 | 3674 | - change interaction to use plymouth directly if present, and if not, to | ||
1550 | 3675 | fall back to /lib/cryptsetup/askpass as before | ||
1551 | 3676 | - wrap the call to /lib/cryptsetup/askpass with watershed, to make sure | ||
1552 | 3677 | we only ever have one of these running at a time; otherwise multiple | ||
1553 | 3678 | invocations could steal each other's input and/or write over each | ||
1554 | 3679 | other's output | ||
1555 | 3680 | - new function, crypttab_start_one_disk, to look for the named source | ||
1556 | 3681 | device in /etc/crypttab (by device name, UUID, or label) and start it | ||
1557 | 3682 | if configured to do so | ||
1558 | 3683 | * debian/cryptdisks-enable.upstart: run the upstart job once for each block | ||
1559 | 3684 | device, using the new crypttab_start_one_disk function, triggered by udev; | ||
1560 | 3685 | this doesn't eliminate the possibility of a race with gdm when the | ||
1561 | 3686 | decrypted volume isn't a 'bootwait' mount point (since gdm kills | ||
1562 | 3687 | plymouth), but it does eliminate the race between udev and cryptsetup. | ||
1563 | 3688 | LP: #454898. | ||
1564 | 3689 | * debian/cryptdisks-enable.upstart: check that the package is installed | ||
1565 | 3690 | and exit gracefully if it's not. LP: #435814 | ||
1566 | 3691 | * debian/cryptdisk.functions: initially create the device under a temporary | ||
1567 | 3692 | name and rename it only at the end using 'dmsetup rename', to ensure that | ||
1568 | 3693 | upstart/mountall doesn't see our device before it's ready to go. | ||
1569 | 3694 | LP: #475936. | ||
1570 | 3695 | |||
1571 | 3696 | [ Colin Watson ] | ||
1572 | 3697 | * Add ext4 support to passdev. | ||
1573 | 3698 | |||
1574 | 3699 | -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 15 Dec 2009 18:05:45 -0800 | ||
1575 | 3700 | |||
1576 | 3701 | cryptsetup (2:1.1.0~rc2-1ubuntu3) lucid; urgency=low | ||
1577 | 3702 | |||
1578 | 3703 | * cryptroot-hook: Use if [ -n … ] instead of if ! test -z …. | ||
1579 | 3704 | |||
1580 | 3705 | -- Loïc Minier <loic.minier@ubuntu.com> Sat, 12 Dec 2009 11:32:52 +0100 | ||
1581 | 3706 | |||
1582 | 3707 | cryptsetup (2:1.1.0~rc2-1ubuntu2) lucid; urgency=low | ||
1583 | 3708 | |||
1584 | 3709 | * cryptroot-hook: dont call copy_modules_dir with empty arguments when | ||
1585 | 3710 | archcrypto isnt found (LP: #495161) | ||
1586 | 3711 | |||
1587 | 3712 | -- Oliver Grawert <ogra@ubuntu.com> Fri, 11 Dec 2009 14:39:00 +0100 | ||
1588 | 3713 | |||
1589 | 3714 | cryptsetup (2:1.1.0~rc2-1ubuntu1) lucid; urgency=low | ||
1590 | 3715 | |||
1591 | 3716 | * Merge with Debian testing. Remaining Ubuntu changes: | ||
1592 | 3717 | - debian/rules: cryptsetup is linked dynamically against libgcrypt and | ||
1593 | 3718 | libgpg-error. | ||
1594 | 3719 | - Upstart migration: | ||
1595 | 3720 | + Add debian/cryptdisks-enable.upstart. | ||
1596 | 3721 | + debian/cryptdisks{,-early}.init: Make the 'start' action of the init | ||
1597 | 3722 | script a no-op, this should be handled entirely by the upstart job. | ||
1598 | 3723 | (LP #473615) | ||
1599 | 3724 | + debian/cryptsetup.postinst: Remove any symlinks from /etc/rcS.d on | ||
1600 | 3725 | upgrade. | ||
1601 | 3726 | + debian/rules: Do not install start symlinks for those two, and install | ||
1602 | 3727 | debian/cryptdisks-enable.upstart scripts. | ||
1603 | 3728 | - Add debian/cryptsetup.apport: Apport package hook. Install in | ||
1604 | 3729 | debian/rules, and create dir in debian/cryptsetup.dirs. | ||
1605 | 3730 | - Start usplash in initramfs, since we need it for fancy passphrase input: | ||
1606 | 3731 | + debian/initramfs/cryptroot-conf, debian/initramfs-conf.d: USPLASH=y | ||
1607 | 3732 | + debian/control: Bump initramfs-tools Suggests to Depends:. | ||
1608 | 3733 | |||
1609 | 3734 | -- Martin Pitt <martin.pitt@ubuntu.com> Wed, 11 Nov 2009 15:04:27 +0100 | ||
1610 | 3735 | |||
1611 | 2404 | cryptsetup (2:1.1.0~rc2-1) unstable; urgency=low | 3736 | cryptsetup (2:1.1.0~rc2-1) unstable; urgency=low |
1612 | 2405 | 3737 | ||
1613 | 2406 | * new upstream release candidate (1.1.0-rc2), highlights include: | 3738 | * new upstream release candidate (1.1.0-rc2), highlights include: |
1614 | @@ -2574,6 +3906,80 @@ cryptsetup (2:1.0.7~rc1-1) unstable; urgency=low | |||
1615 | 2574 | 3906 | ||
1616 | 2575 | -- Jonas Meurer <mejo@debian.org> Sat, 04 Jul 2009 15:52:06 +0200 | 3907 | -- Jonas Meurer <mejo@debian.org> Sat, 04 Jul 2009 15:52:06 +0200 |
1617 | 2576 | 3908 | ||
1618 | 3909 | cryptsetup (2:1.0.6+20090405.svn49-1ubuntu8) lucid; urgency=low | ||
1619 | 3910 | |||
1620 | 3911 | [ Steve Langasek ] | ||
1621 | 3912 | * Make the 'start' action of the init script a no-op, this should be | ||
1622 | 3913 | handled entirely by the upstart job now; and remove any symlinks from | ||
1623 | 3914 | /etc/rcS.d on upgrade. LP: #473615. | ||
1624 | 3915 | |||
1625 | 3916 | [ Reinhard Tartler ] | ||
1626 | 3917 | * Add an apport hook | ||
1627 | 3918 | * import the blkid and un_blkid from debian, LP: #446517 | ||
1628 | 3919 | * also use this script by default (setting in /etc/default/cryptdisks) | ||
1629 | 3920 | |||
1630 | 3921 | -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 04 Nov 2009 12:06:47 +0000 | ||
1631 | 3922 | |||
1632 | 3923 | cryptsetup (2:1.0.6+20090405.svn49-1ubuntu7) karmic; urgency=low | ||
1633 | 3924 | |||
1634 | 3925 | * Reupload previous version, siretart had left changes in bzr which | ||
1635 | 3926 | weren't documented in the changelog and caused FTBFS. | ||
1636 | 3927 | |||
1637 | 3928 | -- Scott James Remnant <scott@ubuntu.com> Wed, 14 Oct 2009 13:57:59 +0100 | ||
1638 | 3929 | |||
1639 | 3930 | cryptsetup (2:1.0.6+20090405.svn49-1ubuntu6) karmic; urgency=low | ||
1640 | 3931 | |||
1641 | 3932 | [ Steve Langasek ] | ||
1642 | 3933 | * Move the Debian Vcs- fields aside. | ||
1643 | 3934 | |||
1644 | 3935 | [ Scott James Remnant ] | ||
1645 | 3936 | * debian/cryptdisks-enable.upstart: Don't overcompensate for my idiocy, | ||
1646 | 3937 | cryptsetup should not need a controlling terminal, just a terminal | ||
1647 | 3938 | is fine. May fix LP: #439138. | ||
1648 | 3939 | |||
1649 | 3940 | -- Scott James Remnant <scott@ubuntu.com> Wed, 14 Oct 2009 04:52:16 +0100 | ||
1650 | 3941 | |||
1651 | 3942 | cryptsetup (2:1.0.6+20090405.svn49-1ubuntu4) karmic; urgency=low | ||
1652 | 3943 | |||
1653 | 3944 | * debian/cryptdisks-enable.upstart: Things that often help include | ||
1654 | 3945 | not setting stdin/out to /dev/null, so you can actually type the | ||
1655 | 3946 | passphrase. I am an idiot. LP: #430496. | ||
1656 | 3947 | |||
1657 | 3948 | -- Scott James Remnant <scott@ubuntu.com> Thu, 17 Sep 2009 17:58:01 +0100 | ||
1658 | 3949 | |||
1659 | 3950 | cryptsetup (2:1.0.6+20090405.svn49-1ubuntu3) karmic; urgency=low | ||
1660 | 3951 | |||
1661 | 3952 | * debian/cryptdisks-enable.upstart: add upstart job to enable encrypted | ||
1662 | 3953 | disks once we've finished probing for udev devices, so that mountall | ||
1663 | 3954 | can use them. LP: #430496. | ||
1664 | 3955 | |||
1665 | 3956 | -- Scott James Remnant <scott@ubuntu.com> Thu, 17 Sep 2009 00:04:00 +0100 | ||
1666 | 3957 | |||
1667 | 3958 | cryptsetup (2:1.0.6+20090405.svn49-1ubuntu2) karmic; urgency=low | ||
1668 | 3959 | |||
1669 | 3960 | * debian/initramfs/cryptroot-conf: declare that we want usplash included | ||
1670 | 3961 | in the initramfs whenever this package is installed. LP: #427356. | ||
1671 | 3962 | |||
1672 | 3963 | -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 15 Sep 2009 08:43:15 -0700 | ||
1673 | 3964 | |||
1674 | 3965 | cryptsetup (2:1.0.6+20090405.svn49-1ubuntu1) karmic; urgency=low | ||
1675 | 3966 | |||
1676 | 3967 | * Merge from debian unstable, remaining changes: | ||
1677 | 3968 | - Ubuntu specific: | ||
1678 | 3969 | + debian/rules: link dynamically for better security supportability and | ||
1679 | 3970 | smaller packages. | ||
1680 | 3971 | + debian/control: Depend on initramfs-tools so system is not potentially | ||
1681 | 3972 | rendered unbootable. | ||
1682 | 3973 | - debian/initramfs/cryptroot-script wait for encrypted device to appear, | ||
1683 | 3974 | report with log_*_msg (debian bug 488271). | ||
1684 | 3975 | - debian/initramfs/cryptroot-hook: fix support for UUID and LABEL | ||
1685 | 3976 | correlation between fstab and crypttab (debian bug 522041). | ||
1686 | 3977 | - debian/askpass.c, debian/initramfs/cryptroot-script: using newline | ||
1687 | 3978 | escape in passphrase prompt to avoid line-wrapping (debian bug 528133). | ||
1688 | 3979 | * Drop 04_fix_udevsettle_call.patch: fixed upstream differently. | ||
1689 | 3980 | |||
1690 | 3981 | -- Kees Cook <kees@ubuntu.com> Sun, 10 May 2009 17:29:32 -0700 | ||
1691 | 3982 | |||
1692 | 2577 | cryptsetup (2:1.0.6+20090405.svn49-1) unstable; urgency=low | 3983 | cryptsetup (2:1.0.6+20090405.svn49-1) unstable; urgency=low |
1693 | 2578 | 3984 | ||
1694 | 2579 | * New upstream svn snapshot. Highlights include: | 3985 | * New upstream svn snapshot. Highlights include: |
1695 | @@ -2615,6 +4021,67 @@ cryptsetup (2:1.0.6+20090405.svn49-1) unstable; urgency=low | |||
1696 | 2615 | 4021 | ||
1697 | 2616 | -- Jonas Meurer <mejo@debian.org> Mon, 06 Apr 2009 08:49:14 +0200 | 4022 | -- Jonas Meurer <mejo@debian.org> Mon, 06 Apr 2009 08:49:14 +0200 |
1698 | 2617 | 4023 | ||
1699 | 4024 | cryptsetup (2:1.0.6-7ubuntu7) jaunty; urgency=low | ||
1700 | 4025 | |||
1701 | 4026 | * debian/control: Depend on initramfs-tools so system is not potentially | ||
1702 | 4027 | rendered unbootable (LP: #358654). | ||
1703 | 4028 | |||
1704 | 4029 | -- Kees Cook <kees@ubuntu.com> Thu, 09 Apr 2009 12:29:31 -0700 | ||
1705 | 4030 | |||
1706 | 4031 | cryptsetup (2:1.0.6-7ubuntu6) jaunty; urgency=low | ||
1707 | 4032 | |||
1708 | 4033 | * debian/initramfs/cryptroot-script: we don't require vol_id to understand | ||
1709 | 4034 | the encrypted device, but we should check the device is fully up first | ||
1710 | 4035 | before continuing by calling udevadm settle. LP: #291752. | ||
1711 | 4036 | |||
1712 | 4037 | -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 07 Mar 2009 21:39:14 -0800 | ||
1713 | 4038 | |||
1714 | 4039 | cryptsetup (2:1.0.6-7ubuntu5) jaunty; urgency=low | ||
1715 | 4040 | |||
1716 | 4041 | * debian/initramfs/cryptroot-hook: fix support for UUID and LABEL correlation | ||
1717 | 4042 | between fstab and crypttab (LP: #287879). | ||
1718 | 4043 | |||
1719 | 4044 | -- TJ <ubuntu@tjworld.net> Mon, 16 Feb 2009 23:00:00 +0000 | ||
1720 | 4045 | |||
1721 | 4046 | cryptsetup (2:1.0.6-7ubuntu4) jaunty; urgency=low | ||
1722 | 4047 | |||
1723 | 4048 | * debian/askpass.c: also handle newline escape code in console prompt. | ||
1724 | 4049 | |||
1725 | 4050 | -- Kees Cook <kees@ubuntu.com> Sun, 15 Feb 2009 08:57:05 -0800 | ||
1726 | 4051 | |||
1727 | 4052 | cryptsetup (2:1.0.6-7ubuntu3) jaunty; urgency=low | ||
1728 | 4053 | |||
1729 | 4054 | [ https://launchpad.net/~svenkata ] | ||
1730 | 4055 | * debian/checks/un_vol_id: dynamically build the "unknown volume type" | ||
1731 | 4056 | string, to allow for encrypted swap, LP: #316607 | ||
1732 | 4057 | |||
1733 | 4058 | -- Dustin Kirkland <kirkland@ubuntu.com> Thu, 12 Feb 2009 16:57:30 -0600 | ||
1734 | 4059 | |||
1735 | 4060 | cryptsetup (2:1.0.6-7ubuntu2) jaunty; urgency=low | ||
1736 | 4061 | |||
1737 | 4062 | * debian/askpass.c: handle newline escape code in password prompt. | ||
1738 | 4063 | * debian/initramfs/cryptroot-script: add newline to split cryptroot | ||
1739 | 4064 | password prompt onto two lines for readability (LP: #326900). | ||
1740 | 4065 | |||
1741 | 4066 | -- Kees Cook <kees@ubuntu.com> Sun, 08 Feb 2009 07:26:01 -0800 | ||
1742 | 4067 | |||
1743 | 4068 | cryptsetup (2:1.0.6-7ubuntu1) jaunty; urgency=low | ||
1744 | 4069 | |||
1745 | 4070 | * Merge from debian unstable, remaining changes: | ||
1746 | 4071 | - debian/initramfs/cryptroot-script: | ||
1747 | 4072 | - must source /scripts/functions to get the log_*_msg() functions. | ||
1748 | 4073 | - wait for encrypted device to show up (LP 164044, 291752). | ||
1749 | 4074 | - disable error message 'failed to setup lvm device' (LP 151532). | ||
1750 | 4075 | - debian/rules: | ||
1751 | 4076 | - fix location of ltmain.sh (Ubuntu-specific until libtool 2.2.x is | ||
1752 | 4077 | in Debian unstable). | ||
1753 | 4078 | - link dynamically (LP 62751). | ||
1754 | 4079 | - add 04_fix_udevsettle_call.patch: fix path to binary for udevsettle. | ||
1755 | 4080 | * Revert versioned build-depency on libdevmapper-dev, since Ubuntu's | ||
1756 | 4081 | version is higher now. | ||
1757 | 4082 | |||
1758 | 4083 | -- Kees Cook <kees@ubuntu.com> Tue, 06 Jan 2009 13:00:16 -0800 | ||
1759 | 4084 | |||
1760 | 2618 | cryptsetup (2:1.0.6-7) unstable; urgency=medium | 4085 | cryptsetup (2:1.0.6-7) unstable; urgency=medium |
1761 | 2619 | 4086 | ||
1762 | 2620 | * Add patches/01_gettext_package.patch: Remove -luks from GETTEXT_PACKAGE | 4087 | * Add patches/01_gettext_package.patch: Remove -luks from GETTEXT_PACKAGE |
1763 | @@ -2659,6 +4126,38 @@ cryptsetup (2:1.0.6-7) unstable; urgency=medium | |||
1764 | 2659 | 4126 | ||
1765 | 2660 | -- Jonas Meurer <mejo@debian.org> Wed, 17 Dec 2008 21:25:45 +0100 | 4127 | -- Jonas Meurer <mejo@debian.org> Wed, 17 Dec 2008 21:25:45 +0100 |
1766 | 2661 | 4128 | ||
1767 | 4129 | cryptsetup (2:1.0.6-6ubuntu2.1) intrepid-proposed; urgency=low | ||
1768 | 4130 | |||
1769 | 4131 | * debian/initramfs/cryptroot-script: do not require that vol_id | ||
1770 | 4132 | can parse the encrypted device as valid (LP: #291752). | ||
1771 | 4133 | |||
1772 | 4134 | -- Kees Cook <kees@ubuntu.com> Fri, 31 Oct 2008 13:10:06 -0700 | ||
1773 | 4135 | |||
1774 | 4136 | cryptsetup (2:1.0.6-6ubuntu2) intrepid; urgency=low | ||
1775 | 4137 | |||
1776 | 4138 | * Fixes for (LP: #272301) | ||
1777 | 4139 | * debian/initramfs/cryptroot-script: must source /scripts/functions to get | ||
1778 | 4140 | the log_*_msg() functions | ||
1779 | 4141 | * 04_fix_udevsettle_call.patch: fix path to binary for udevsettle | ||
1780 | 4142 | |||
1781 | 4143 | -- Dustin Kirkland <kirkland@ubuntu.com> Fri, 19 Sep 2008 18:03:28 -0500 | ||
1782 | 4144 | |||
1783 | 4145 | cryptsetup (2:1.0.6-6ubuntu1) intrepid; urgency=low | ||
1784 | 4146 | |||
1785 | 4147 | * drop almost all ubuntu specific changes from the cryptsetup package, | ||
1786 | 4148 | because they have been merged in debian. Thanks a lot! | ||
1787 | 4149 | * merge from debian, remaining changes: | ||
1788 | 4150 | - remove versioned build-depency on libdevmapper-dev, we are using a | ||
1789 | 4151 | rather sophisticated loop for making sure the root filesystem appears. | ||
1790 | 4152 | * debian/rules: fix location of ltmain.sh | ||
1791 | 4153 | * don't exit usplash anymore in the init script. LP: #110970, #139363 | ||
1792 | 4154 | * Disable error message 'failed to setup lvm device'. It is harmless, and | ||
1793 | 4155 | caused by the fact that the udev rules provided by lvm2 are setting up | ||
1794 | 4156 | the lvm on their own. In debian the scripts here are responsible for this | ||
1795 | 4157 | but obviously fail in ubuntu. LP: #151532 | ||
1796 | 4158 | |||
1797 | 4159 | -- Reinhard Tartler <siretart@tauware.de> Sat, 30 Aug 2008 17:52:16 +0200 | ||
1798 | 4160 | |||
1799 | 2662 | cryptsetup (2:1.0.6-6) unstable; urgency=high | 4161 | cryptsetup (2:1.0.6-6) unstable; urgency=high |
1800 | 2663 | 4162 | ||
1801 | 2664 | * Don't cat keyfile into pipe for do_noluks(). cryptsetup handles | 4163 | * Don't cat keyfile into pipe for do_noluks(). cryptsetup handles |
1802 | @@ -2760,6 +4259,79 @@ cryptsetup (2:1.0.6-3) unstable; urgency=low | |||
1803 | 2760 | 4259 | ||
1804 | 2761 | -- Jonas Meurer <mejo@debian.org> Mon, 07 Jul 2008 00:30:07 +0200 | 4260 | -- Jonas Meurer <mejo@debian.org> Mon, 07 Jul 2008 00:30:07 +0200 |
1805 | 2762 | 4261 | ||
1806 | 4262 | cryptsetup (2:1.0.6-2ubuntu7) intrepid; urgency=low | ||
1807 | 4263 | |||
1808 | 4264 | * reintroduce changes from 2:1.0.6-2ubuntu5 that have been accidentally | ||
1809 | 4265 | dropped in version 2:1.0.6-2ubuntu6. | ||
1810 | 4266 | |||
1811 | 4267 | -- Reinhard Tartler <siretart@tauware.de> Fri, 20 Jun 2008 15:15:54 +0200 | ||
1812 | 4268 | |||
1813 | 4269 | cryptsetup (2:1.0.6-2ubuntu6) intrepid; urgency=low | ||
1814 | 4270 | |||
1815 | 4271 | [ Kjell Braden ] | ||
1816 | 4272 | * load scripts/functions for log_{begin,end}_msg | ||
1817 | 4273 | * debian/initramfs/cryptroot-script: wait for the cryptsource, not the resulting mapped root device | ||
1818 | 4274 | * debian/initramfs/cryptroot-hook: copy binaries to the right directory | ||
1819 | 4275 | |||
1820 | 4276 | [ Reinhard Tartler ] | ||
1821 | 4277 | * remove versioned build-depency on libdevmapper-dev, we are using a | ||
1822 | 4278 | rather sophisticated loop for making sure the root filesystem appears. | ||
1823 | 4279 | |||
1824 | 4280 | -- Reinhard Tartler <siretart@tauware.de> Wed, 18 Jun 2008 00:26:43 +0200 | ||
1825 | 4281 | |||
1826 | 4282 | cryptsetup (2:1.0.6-2ubuntu5) intrepid; urgency=low | ||
1827 | 4283 | |||
1828 | 4284 | * Okay, I give up. include preprocessed manpages and adapt | ||
1829 | 4285 | debian/rules to easily produce those. | ||
1830 | 4286 | ATTENTION: on subsequent uploads, make sure that the manpages are | ||
1831 | 4287 | available and up-to-date. | ||
1832 | 4288 | |||
1833 | 4289 | -- Reinhard Tartler <siretart@tauware.de> Sun, 15 Jun 2008 13:33:07 +0200 | ||
1834 | 4290 | |||
1835 | 4291 | cryptsetup (2:1.0.6-2ubuntu4) intrepid; urgency=low | ||
1836 | 4292 | |||
1837 | 4293 | * also use local dtd in debian/doc/variables.xml.in. | ||
1838 | 4294 | |||
1839 | 4295 | -- Reinhard Tartler <siretart@tauware.de> Sun, 15 Jun 2008 12:55:42 +0200 | ||
1840 | 4296 | |||
1841 | 4297 | cryptsetup (2:1.0.6-2ubuntu3) intrepid; urgency=low | ||
1842 | 4298 | |||
1843 | 4299 | * try harder to fix FTBFS. | ||
1844 | 4300 | |||
1845 | 4301 | -- Reinhard Tartler <siretart@tauware.de> Sun, 15 Jun 2008 11:42:54 +0200 | ||
1846 | 4302 | |||
1847 | 4303 | cryptsetup (2:1.0.6-2ubuntu2) intrepid; urgency=low | ||
1848 | 4304 | |||
1849 | 4305 | * build docbook documentation using local dtds instead of trying to | ||
1850 | 4306 | download them at buildtime. Fixes FTBFS. | ||
1851 | 4307 | |||
1852 | 4308 | -- Reinhard Tartler <siretart@tauware.de> Sun, 15 Jun 2008 11:12:28 +0200 | ||
1853 | 4309 | |||
1854 | 4310 | cryptsetup (2:1.0.6-2ubuntu1) intrepid; urgency=low | ||
1855 | 4311 | |||
1856 | 4312 | * Merge new debian version. Remaining changes: | ||
1857 | 4313 | - Add XSBC-Vcs-Bzr tag to indicate that this package is managed using | ||
1858 | 4314 | bzr on launchpad. | ||
1859 | 4315 | - debian/rules: cryptsetup is linked dynamically against libgcrypt and | ||
1860 | 4316 | libgpg-error. | ||
1861 | 4317 | - cryptdisks.functions: stop usplash on user input. LP #62751 | ||
1862 | 4318 | - Parse comments in lines not starting with '#', LP #185380 | ||
1863 | 4319 | - If the encrypted source device hasn't shown up yet, give it a | ||
1864 | 4320 | little while to deal with removable devices. LP #164044 | ||
1865 | 4321 | * Depend on race-free version of libdevmapper, thus making udevsettle | ||
1866 | 4322 | call from cryptsetup binary unnecessary. Dropping patch | ||
1867 | 4323 | debian/patches/06_run_udevsettle.patch | ||
1868 | 4324 | * remove patch from LP #73862, loading optimized modules has been solved | ||
1869 | 4325 | in debian in another way. | ||
1870 | 4326 | * cryptdisk.functions: remove spurious call to load_optimized_module. | ||
1871 | 4327 | LP: #239946 | ||
1872 | 4328 | * bugfix: make regex work if keyfile has extended attributes. LP: #231339. | ||
1873 | 4329 | * remove patch in cryptdisks.functions for rexecing the script itself for | ||
1874 | 4330 | ensuring that a tty is always available. (See LP #58794.) According to | ||
1875 | 4331 | Scott, this is not necessary anymore. | ||
1876 | 4332 | |||
1877 | 4333 | -- Reinhard Tartler <siretart@tauware.de> Sat, 14 Jun 2008 23:28:51 +0200 | ||
1878 | 4334 | |||
1879 | 2763 | cryptsetup (2:1.0.6-2) unstable; urgency=low | 4335 | cryptsetup (2:1.0.6-2) unstable; urgency=low |
1880 | 2764 | 4336 | ||
1881 | 2765 | [ Jonas Meurer ] | 4337 | [ Jonas Meurer ] |
1882 | @@ -2785,6 +4357,54 @@ cryptsetup (2:1.0.6-2) unstable; urgency=low | |||
1883 | 2785 | 4357 | ||
1884 | 2786 | -- David Härdeman <david@hardeman.nu> Mon, 26 May 2008 08:12:32 +0200 | 4358 | -- David Härdeman <david@hardeman.nu> Mon, 26 May 2008 08:12:32 +0200 |
1885 | 2787 | 4359 | ||
1886 | 4360 | cryptsetup (2:1.0.6-1ubuntu4) intrepid; urgency=low | ||
1887 | 4361 | |||
1888 | 4362 | [ Kjell Braden ] | ||
1889 | 4363 | * Fix configuration parsing (LP: #239808) | ||
1890 | 4364 | |||
1891 | 4365 | [ Reinhard Tartler ] | ||
1892 | 4366 | * cryptroot-script: use 'echo' instead of 'log_begin_msg' (LP: #237723) | ||
1893 | 4367 | |||
1894 | 4368 | -- Reinhard Tartler <siretart@tauware.de> Fri, 13 Jun 2008 21:26:17 +0200 | ||
1895 | 4369 | |||
1896 | 4370 | cryptsetup (2:1.0.6-1ubuntu3) intrepid; urgency=low | ||
1897 | 4371 | |||
1898 | 4372 | * Parse comments in lines not starting with '#', LP: #185380 | ||
1899 | 4373 | * in cryptroot hook, don't rely on 'udevadm settle' to wait long enough | ||
1900 | 4374 | for the cryptdevice to appear. Reimplement the busy waiting loop found | ||
1901 | 4375 | while waiting for the root file system. Patch based on work by Swâmi | ||
1902 | 4376 | Petaramesh. LP: #164044 | ||
1903 | 4377 | * debian/crypdisks.functions: call 'env' with full path. LP: #178829. | ||
1904 | 4378 | |||
1905 | 4379 | -- Reinhard Tartler <siretart@tauware.de> Mon, 26 May 2008 22:12:32 +0200 | ||
1906 | 4380 | |||
1907 | 4381 | cryptsetup (2:1.0.6-1ubuntu2) intrepid; urgency=low | ||
1908 | 4382 | |||
1909 | 4383 | * Simplify the patch in debian/cryptdisks.functions that stops usplash | ||
1910 | 4384 | before asking for a passphrase. | ||
1911 | 4385 | |||
1912 | 4386 | -- Reinhard Tartler <siretart@tauware.de> Mon, 26 May 2008 20:18:14 +0200 | ||
1913 | 4387 | |||
1914 | 4388 | cryptsetup (2:1.0.6-1ubuntu1) intrepid; urgency=low | ||
1915 | 4389 | |||
1916 | 4390 | * Merge new debian version. Remaining changes: | ||
1917 | 4391 | - cryptsetup is linked dynamically against libgcrypt and libgpg-error. | ||
1918 | 4392 | - stop usplash on user input. LP #62751 | ||
1919 | 4393 | - debian/cryptdisks.functions: Always output and read from the console. | ||
1920 | 4394 | LP #58794. | ||
1921 | 4395 | - Add XSBC-Vcs-Bzr tag to indicate that this package is managed using | ||
1922 | 4396 | bzr on launchpad. | ||
1923 | 4397 | - debian/initramfs/cryptroot-hook: LP #73862 | ||
1924 | 4398 | Added patch to install aes optimized cypher module | ||
1925 | 4399 | - try to load optimized cypher module in cryptsetup.functions as well, | ||
1926 | 4400 | because cryptroot-hook is only executed when we really have a | ||
1927 | 4401 | cryptoroot. | ||
1928 | 4402 | * other ubuntu changes have been merged into debian. Please report bugs | ||
1929 | 4403 | if you believe some patches have been dropped. | ||
1930 | 4404 | * removed 07_typos_fix.patch, has been reviewed and applied upstream. | ||
1931 | 4405 | |||
1932 | 4406 | -- Reinhard Tartler <siretart@tauware.de> Sun, 25 May 2008 22:52:30 +0200 | ||
1933 | 4407 | |||
1934 | 2788 | cryptsetup (2:1.0.6-1) unstable; urgency=low | 4408 | cryptsetup (2:1.0.6-1) unstable; urgency=low |
1935 | 2789 | 4409 | ||
1936 | 2790 | [ Jonas Meurer ] | 4410 | [ Jonas Meurer ] |
1937 | @@ -2916,6 +4536,138 @@ cryptsetup (2:1.0.6~pre1-1) unstable; urgency=low | |||
1938 | 2916 | 4536 | ||
1939 | 2917 | -- Jonas Meurer <mejo@debian.org> Thu, 06 Dec 2007 15:56:05 +0100 | 4537 | -- Jonas Meurer <mejo@debian.org> Thu, 06 Dec 2007 15:56:05 +0100 |
1940 | 2918 | 4538 | ||
1941 | 4539 | cryptsetup (2:1.0.5-2ubuntu12) hardy; urgency=low | ||
1942 | 4540 | |||
1943 | 4541 | * added debian/patches/07_typos_fix.dpatch: fixed typos in man pages. (LP: #164181) | ||
1944 | 4542 | |||
1945 | 4543 | -- Bruno Barrera Yever <bbyever@gmail.com> Mon, 07 Apr 2008 18:43:05 -0500 | ||
1946 | 4544 | |||
1947 | 4545 | cryptsetup (2:1.0.5-2ubuntu11) hardy; urgency=low | ||
1948 | 4546 | |||
1949 | 4547 | * debian/initramfs/cryptroot-script: Do show the disk name after all, since | ||
1950 | 4548 | some people use multiple encrypted partitions as LVM PVs. (LP: #201413) | ||
1951 | 4549 | |||
1952 | 4550 | -- Martin Pitt <martin.pitt@ubuntu.com> Sun, 06 Apr 2008 11:54:41 -0600 | ||
1953 | 4551 | |||
1954 | 4552 | cryptsetup (2:1.0.5-2ubuntu10) hardy; urgency=low | ||
1955 | 4553 | |||
1956 | 4554 | * debian/initramfs/cryptroot-script: Do not mention the name of the | ||
1957 | 4555 | encrypted device. It is just technobabble anyway (sda4_crypt), and there | ||
1958 | 4556 | is just one root partition ever, so it is not needed to tell apart | ||
1959 | 4557 | different partitions. From a security POV, someone who can change your | ||
1960 | 4558 | initramfs to boot a different root partition can just as well change the | ||
1961 | 4559 | strings, too. (LP: #201413) | ||
1962 | 4560 | |||
1963 | 4561 | -- Martin Pitt <martin.pitt@ubuntu.com> Wed, 02 Apr 2008 15:51:53 +0200 | ||
1964 | 4562 | |||
1965 | 4563 | cryptsetup (2:1.0.5-2ubuntu9) hardy; urgency=low | ||
1966 | 4564 | |||
1967 | 4565 | * debian/scripts/luksformat: Use 256 bit key size by default. | ||
1968 | 4566 | (LP: #78508) | ||
1969 | 4567 | * debian/patches/02_manpage.dpatch: Clarify default key sizes (128 for | ||
1970 | 4568 | luksFormat and 256 for create) in cryptsetup.8. (side-note in LP #78508) | ||
1971 | 4569 | |||
1972 | 4570 | -- Martin Pitt <martin.pitt@ubuntu.com> Wed, 27 Feb 2008 17:43:46 +0100 | ||
1973 | 4571 | |||
1974 | 4572 | cryptsetup (2:1.0.5-2ubuntu8) hardy; urgency=low | ||
1975 | 4573 | |||
1976 | 4574 | * Fix -x calls and access() call. | ||
1977 | 4575 | |||
1978 | 4576 | -- Scott James Remnant <scott@ubuntu.com> Fri, 14 Dec 2007 16:54:53 +0000 | ||
1979 | 4577 | |||
1980 | 4578 | cryptsetup (2:1.0.5-2ubuntu7) hardy; urgency=low | ||
1981 | 4579 | |||
1982 | 4580 | * debian/initramfs/cryptroot-script: call udevadm instead of udevsettle | ||
1983 | 4581 | * debian/patches/06_call_udevsettle.dpatch: likewise | ||
1984 | 4582 | |||
1985 | 4583 | -- Scott James Remnant <scott@ubuntu.com> Fri, 14 Dec 2007 16:11:36 +0000 | ||
1986 | 4584 | |||
1987 | 4585 | cryptsetup (2:1.0.5-2ubuntu6) hardy; urgency=low | ||
1988 | 4586 | |||
1989 | 4587 | * Make cryptsetup understand devices specified by UUID=... or LABEL= | ||
1990 | 4588 | in crypttab. (LP: #153597) | ||
1991 | 4589 | |||
1992 | 4590 | -- Andrea Colangelo <warp10@libero.it> Mon, 29 Oct 2007 18:22:51 +0100 | ||
1993 | 4591 | |||
1994 | 4592 | cryptsetup (2:1.0.5-2ubuntu5) hardy; urgency=low | ||
1995 | 4593 | |||
1996 | 4594 | * reenable additional udevsettle calls in cryptroot hook from | ||
1997 | 4595 | https://launchpad.net/bugs/85640, LP: #132373. | ||
1998 | 4596 | * change maintainer to ubuntu-core-dev. | ||
1999 | 4597 | * use Vcs-Bzr instead of XSCB-Vcs-Bzr header in debian/control. | ||
2000 | 4598 | |||
2001 | 4599 | -- Reinhard Tartler <siretart@tauware.de> Thu, 08 Nov 2007 23:52:19 +0100 | ||
2002 | 4600 | |||
2003 | 4601 | cryptsetup (2:1.0.5-2ubuntu4) hardy; urgency=low | ||
2004 | 4602 | |||
2005 | 4603 | * reapply changes from version 2:1.0.5-2ubuntu2, got dropped with last | ||
2006 | 4604 | upload. Sorry, pitti. | ||
2007 | 4605 | * convert patch to lib/libdevmapper.c to a dpatch. | ||
2008 | 4606 | |||
2009 | 4607 | -- Reinhard Tartler <siretart@tauware.de> Sun, 04 Nov 2007 21:42:43 +0100 | ||
2010 | 4608 | |||
2011 | 4609 | cryptsetup (2:1.0.5-2ubuntu3) hardy; urgency=low | ||
2012 | 4610 | |||
2013 | 4611 | * RELIABILY FIX: lib/libdevmapper.c: Ensure that pending device creation | ||
2014 | 4612 | events are being processed by calling /sbin/udevsettle. Patch based on | ||
2015 | 4613 | OpenSUSE bug #285478, LP: #132373. | ||
2016 | 4614 | * Based on the change above, the patch from LP #85640 is no longer needed. | ||
2017 | 4615 | dropping the relevant parts. | ||
2018 | 4616 | * Fix debian/rules to not fail to build if autom4te.cache is left behind | ||
2019 | 4617 | from a previous incomplete build. | ||
2020 | 4618 | |||
2021 | 4619 | -- Reinhard Tartler <siretart@tauware.de> Fri, 02 Nov 2007 20:53:31 +0100 | ||
2022 | 4620 | |||
2023 | 4621 | cryptsetup (2:1.0.5-2ubuntu2) gutsy; urgency=low | ||
2024 | 4622 | |||
2025 | 4623 | * debian/initramfs/cryptroot-script: | ||
2026 | 4624 | - If the supplied password worked, remove the prompt from usplash again, | ||
2027 | 4625 | so that the user has some visual feedback that everything is alright. | ||
2028 | 4626 | (LP: #151305) | ||
2029 | 4627 | - Do not show the UUID device node of the outer physical device. It is | ||
2030 | 4628 | scary ("/dev/disk/by-uuid/1234yadayada") and displaying it does not | ||
2031 | 4629 | improve security at all: If attackers can tamper with your initramfs, | ||
2032 | 4630 | they can also change the prompt, and if the UUID of the physical device | ||
2033 | 4631 | changes, then booting will not even get that far. Now it is a much more | ||
2034 | 4632 | friendly "Enter passphrase for sda5_crypt:" which is still technical, | ||
2035 | 4633 | but it's necessary to point out which device will be unlocked in case | ||
2036 | 4634 | there are several. | ||
2037 | 4635 | |||
2038 | 4636 | -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 11 Oct 2007 19:51:58 +0200 | ||
2039 | 4637 | |||
2040 | 4638 | cryptsetup (2:1.0.5-2ubuntu1) gutsy; urgency=low | ||
2041 | 4639 | |||
2042 | 4640 | * Merge new debian version. Remaining changes: | ||
2043 | 4641 | - cryptsetup is linked dynamically against libgcrypt and libgpg-error. | ||
2044 | 4642 | This will break systems where /usr is a separate encrypted filesystem | ||
2045 | 4643 | but not have other bad consequences (in particular, systems with | ||
2046 | 4644 | encrypted root are still fine). The upsides include better | ||
2047 | 4645 | security supportability and smaller packages. | ||
2048 | 4646 | - libcryptsetup.so et al removed from the binary packages. They have | ||
2049 | 4647 | no stable ABI and are not suitable for use by other packages, and | ||
2050 | 4648 | were in violation of library policies etc. They're not needed since | ||
2051 | 4649 | the cryptsetup executable statically contains the relevant parts of | ||
2052 | 4650 | libcryptsetup. | ||
2053 | 4651 | - cryptdisks.functions: remove #!/bin/bash as it isn't a script | ||
2054 | 4652 | by itself; it's only sourced by other scripts. This gets rid | ||
2055 | 4653 | of the lintian warning `script-not-executable' for this file. | ||
2056 | 4654 | - stop usplash on user input. LP #62751 | ||
2057 | 4655 | - Always output and read from the console. LP #58794. | ||
2058 | 4656 | - Add XSBC-Vcs-Bzr tag to indicate that this package is managed using | ||
2059 | 4657 | bzr on launchpad. | ||
2060 | 4658 | - Bump libgcrypt11 build-dependency again to 1.2.4-2ubuntu2 to eliminate | ||
2061 | 4659 | libnsl linkage; | ||
2062 | 4660 | - debian/initramfs/cryptroot-hook: (LP: #73862) | ||
2063 | 4661 | Added patch to install aes optimized cypher module | ||
2064 | 4662 | - try to load optimized cypher module in cryptsetup.functions as well, | ||
2065 | 4663 | because cryptroot-hook is only executed when we really have a | ||
2066 | 4664 | cryptoroot. | ||
2067 | 4665 | - apply patch from pitti for allowing UUIDs in /etc/crypttab. | ||
2068 | 4666 | This allowes crypted PVs! LP: #144390. | ||
2069 | 4667 | - remove README.ubuntu, since it contains old and obsolete information. | ||
2070 | 4668 | |||
2071 | 4669 | -- Reinhard Tartler <siretart@tauware.de> Tue, 02 Oct 2007 21:31:28 +0200 | ||
2072 | 4670 | |||
2073 | 2919 | cryptsetup (2:1.0.5-2) unstable; urgency=low | 4671 | cryptsetup (2:1.0.5-2) unstable; urgency=low |
2074 | 2920 | 4672 | ||
2075 | 2921 | [ Jonas Meurer ] | 4673 | [ Jonas Meurer ] |
2076 | @@ -2964,6 +4716,68 @@ cryptsetup (2:1.0.5-2) unstable; urgency=low | |||
2077 | 2964 | 4716 | ||
2078 | 2965 | -- Jonas Meurer <mejo@debian.org> Mon, 24 Sep 2007 15:42:06 +0200 | 4717 | -- Jonas Meurer <mejo@debian.org> Mon, 24 Sep 2007 15:42:06 +0200 |
2079 | 2966 | 4718 | ||
2080 | 4719 | cryptsetup (2:1.0.5-1ubuntu5) UNRELEASED; urgency=low | ||
2081 | 4720 | |||
2082 | 4721 | * apply patch from pitti for allowing UUIDs in /etc/crypttab. | ||
2083 | 4722 | This allowes crypted PVs! LP: #144390. | ||
2084 | 4723 | * remove README.ubuntu, since it contains old and obsolete information. | ||
2085 | 4724 | |||
2086 | 4725 | -- Reinhard Tartler <siretart@tauware.de> Tue, 02 Oct 2007 19:59:24 +0200 | ||
2087 | 4726 | |||
2088 | 4727 | cryptsetup (2:1.0.5-1ubuntu4) gutsy; urgency=low | ||
2089 | 4728 | |||
2090 | 4729 | [ Stephan Hermann ] | ||
2091 | 4730 | * debian/initramfs/cryptroot-hook: (LP: #73862) | ||
2092 | 4731 | - Added patch to install aes optimized cypher module | ||
2093 | 4732 | |||
2094 | 4733 | [ Reinhard Tartler ] | ||
2095 | 4734 | * re-applying old patch to new package version | ||
2096 | 4735 | * try to load optimized cypher module in cryptsetup.functions as well, | ||
2097 | 4736 | because cryptroot-hook is only executed when we really have a | ||
2098 | 4737 | cryptoroot. | ||
2099 | 4738 | |||
2100 | 4739 | -- Reinhard Tartler <siretart@tauware.de> Thu, 27 Sep 2007 19:38:48 +0200 | ||
2101 | 4740 | |||
2102 | 4741 | cryptsetup (2:1.0.5-1ubuntu3) gutsy; urgency=low | ||
2103 | 4742 | |||
2104 | 4743 | * Bump libgcrypt11 build-dependency again to 1.2.4-2ubuntu2 to eliminate | ||
2105 | 4744 | libnsl linkage; should finally produce a usable cryptsetup binary for | ||
2106 | 4745 | the udeb. | ||
2107 | 4746 | |||
2108 | 4747 | -- Colin Watson <cjwatson@ubuntu.com> Wed, 19 Sep 2007 15:28:52 +0100 | ||
2109 | 4748 | |||
2110 | 4749 | cryptsetup (2:1.0.5-1ubuntu2) gutsy; urgency=low | ||
2111 | 4750 | |||
2112 | 4751 | * Bump libgcrypt11 build-dependency to 1.2.4-2ubuntu1 and rebuild for | ||
2113 | 4752 | proper udeb dependencies. | ||
2114 | 4753 | |||
2115 | 4754 | -- Colin Watson <cjwatson@ubuntu.com> Wed, 19 Sep 2007 01:37:02 +0100 | ||
2116 | 4755 | |||
2117 | 4756 | cryptsetup (2:1.0.5-1ubuntu1) gutsy; urgency=low | ||
2118 | 4757 | |||
2119 | 4758 | * Merge new debian version. Remaining changes: | ||
2120 | 4759 | - cryptsetup is linked dynamically against libgcrypt and libgpg-error. | ||
2121 | 4760 | This will break systems where /usr is a separate encrypted filesystem | ||
2122 | 4761 | but not have other bad consequences (in particular, systems with | ||
2123 | 4762 | encrypted root are still fine). The upsides include better | ||
2124 | 4763 | security supportability and smaller packages. | ||
2125 | 4764 | - libcryptsetup.so et al removed from the binary packages. They have | ||
2126 | 4765 | no stable ABI and are not suitable for use by other packages, and | ||
2127 | 4766 | were in violation of library policies etc. They're not needed since | ||
2128 | 4767 | the cryptsetup executable statically contains the relevant parts of | ||
2129 | 4768 | libcryptsetup. | ||
2130 | 4769 | - cryptdisks.functions: remove #!/bin/bash as it isn't a script | ||
2131 | 4770 | by itself; it's only sourced by other scripts. This gets rid | ||
2132 | 4771 | of the lintian warning `script-not-executable' for this file. | ||
2133 | 4772 | - stop usplash on user input. LP #62751 | ||
2134 | 4773 | - Always output and read from the console. LP #58794. | ||
2135 | 4774 | * Add XSBC-Vcs-Bzr tag to indicate that this package is managed using | ||
2136 | 4775 | bzr on launchpad. | ||
2137 | 4776 | * UVF exception request granted by Scott Kitterman and Chuck Short | ||
2138 | 4777 | LP: #138295 | ||
2139 | 4778 | |||
2140 | 4779 | -- Reinhard Tartler <siretart@tauware.de> Sat, 08 Sep 2007 19:04:54 +0200 | ||
2141 | 4780 | |||
2142 | 2967 | cryptsetup (2:1.0.5-1) unstable; urgency=low | 4781 | cryptsetup (2:1.0.5-1) unstable; urgency=low |
2143 | 2968 | 4782 | ||
2144 | 2969 | [ Jonas Meurer ] | 4783 | [ Jonas Meurer ] |
2145 | @@ -2984,6 +4798,66 @@ cryptsetup (2:1.0.5-1) unstable; urgency=low | |||
2146 | 2984 | 4798 | ||
2147 | 2985 | -- Jonas Meurer <mejo@debian.org> Fri, 27 Jul 2007 04:59:33 +0200 | 4799 | -- Jonas Meurer <mejo@debian.org> Fri, 27 Jul 2007 04:59:33 +0200 |
2148 | 2986 | 4800 | ||
2149 | 4801 | cryptsetup (2:1.0.4+svn29-1ubuntu6) gutsy; urgency=low | ||
2150 | 4802 | |||
2151 | 4803 | * Add notes by Ilkka Tuohela in a new file debian/README.ubuntu | ||
2152 | 4804 | |||
2153 | 4805 | -- Reinhard Tartler <siretart@tauware.de> Sat, 08 Sep 2007 18:43:56 +0200 | ||
2154 | 4806 | |||
2155 | 4807 | cryptsetup (2:1.0.4+svn29-1ubuntu5) gutsy; urgency=low | ||
2156 | 4808 | |||
2157 | 4809 | * cryptsetup is linked dynamically against libgcrypt and libgpg-error. | ||
2158 | 4810 | This will break systems where /usr is a separate encrypted filesystem | ||
2159 | 4811 | but not have other bad consequences (in particular, systems with | ||
2160 | 4812 | encrypted root are still fine). The upsides include better | ||
2161 | 4813 | security supportability and smaller packages. | ||
2162 | 4814 | * libcryptsetup.so et al removed from the binary packages. They have | ||
2163 | 4815 | no stable ABI and are not suitable for use by other packages, and | ||
2164 | 4816 | were in violation of library policies etc. They're not needed since | ||
2165 | 4817 | the cryptsetup executable statically contains the relevant parts of | ||
2166 | 4818 | libcryptsetup. | ||
2167 | 4819 | * cryptdisks.functions: remove #!/bin/bash as it isn't a script | ||
2168 | 4820 | by itself; it's only sourced by other scripts. This gets rid | ||
2169 | 4821 | of the lintian warning `script-not-executable' for this file. | ||
2170 | 4822 | |||
2171 | 4823 | -- Ian Jackson <iwj@ubuntu.com> Fri, 31 Aug 2007 12:05:33 +0100 | ||
2172 | 4824 | |||
2173 | 4825 | cryptsetup (2:1.0.4+svn29-1ubuntu4) gutsy; urgency=low | ||
2174 | 4826 | |||
2175 | 4827 | * s/$CRYPTCMD/cryptsetup/ in debian/cryptdisks.functions | ||
2176 | 4828 | (LP: #115617) | ||
2177 | 4829 | |||
2178 | 4830 | -- Reinhard Tartler <siretart@ubuntu.com> Tue, 29 May 2007 17:04:05 +0200 | ||
2179 | 4831 | |||
2180 | 4832 | cryptsetup (2:1.0.4+svn29-1ubuntu3) gutsy; urgency=low | ||
2181 | 4833 | |||
2182 | 4834 | * make luksformat check if filesystem is already mounted to prevent a | ||
2183 | 4835 | strange error message. thanks to mvo for the patch (LP: #116633) | ||
2184 | 4836 | * remove file debian/initramfs-cryptroot-script from source. it is not | ||
2185 | 4837 | installed anywhere, and a leftover from the last merge. | ||
2186 | 4838 | * add missing hunk of cryptsetup.functions compared to debian package. | ||
2187 | 4839 | * reapply http://librarian.launchpad.net/7329604/bug85640.debdiff to | ||
2188 | 4840 | debian/initramfs/cryptroot-script, since stgraber's patch has been | ||
2189 | 4841 | lost in the last merge. (LP: #85640) | ||
2190 | 4842 | |||
2191 | 4843 | -- Reinhard Tartler <siretart@ubuntu.com> Tue, 29 May 2007 15:02:57 +0200 | ||
2192 | 4844 | |||
2193 | 4845 | cryptsetup (2:1.0.4+svn29-1ubuntu2) gutsy; urgency=low | ||
2194 | 4846 | |||
2195 | 4847 | * modprobe dm-mod from cryptsetup.functions. (LP: #64625, #91405) | ||
2196 | 4848 | |||
2197 | 4849 | -- Reinhard Tartler <siretart@ubuntu.com> Tue, 29 May 2007 13:31:39 +0200 | ||
2198 | 4850 | |||
2199 | 4851 | cryptsetup (2:1.0.4+svn29-1ubuntu1) gutsy; urgency=low | ||
2200 | 4852 | |||
2201 | 4853 | * Merge from Debian unstable. Remaining Ubuntu changes: | ||
2202 | 4854 | - stop usplash on user input. Ubuntu: #62751 | ||
2203 | 4855 | - Always output and read from the console. Ubuntu: #58794. | ||
2204 | 4856 | - Wait for Udev to be ready to avoid partition non-detection. (LP: #85640) | ||
2205 | 4857 | * Modify Maintainer value to match Debian-Maintainer-Field Spec | ||
2206 | 4858 | |||
2207 | 4859 | -- Andrea Veri <bluekuja@ubuntu.com> Sun, 6 May 2007 22:33:25 +0200 | ||
2208 | 4860 | |||
2209 | 2987 | cryptsetup (2:1.0.4+svn29-1) unstable; urgency=low | 4861 | cryptsetup (2:1.0.4+svn29-1) unstable; urgency=low |
2210 | 2988 | 4862 | ||
2211 | 2989 | * New upstream svn snapshot with several bugfixes | 4863 | * New upstream svn snapshot with several bugfixes |
2212 | @@ -3036,6 +4910,20 @@ cryptsetup (2:1.0.4+svn26-2) unstable; urgency=low | |||
2213 | 3036 | 4910 | ||
2214 | 3037 | -- Jonas Meurer <mejo@debian.org> Sat, 28 Apr 2007 20:45:50 +0200 | 4911 | -- Jonas Meurer <mejo@debian.org> Sat, 28 Apr 2007 20:45:50 +0200 |
2215 | 3038 | 4912 | ||
2216 | 4913 | cryptsetup (2:1.0.4+svn26-1ubuntu2) feisty; urgency=low | ||
2217 | 4914 | |||
2218 | 4915 | * Wait for Udev to be ready to avoid partition non-detection. (LP: #85640) | ||
2219 | 4916 | |||
2220 | 4917 | -- Stéphane Graber <stgraber@ubuntu.com> Thu, 14 Apr 2007 10:03:41 +0200 | ||
2221 | 4918 | |||
2222 | 4919 | cryptsetup (2:1.0.4+svn26-1ubuntu1) feisty; urgency=low | ||
2223 | 4920 | |||
2224 | 4921 | * merge debian changes. Remaining ubuntu changes: | ||
2225 | 4922 | - stop usplash on user input. Ubuntu: #62751 | ||
2226 | 4923 | - Always output and read from the console. Ubuntu: #58794. | ||
2227 | 4924 | |||
2228 | 4925 | -- Reinhard Tartler <siretart@tauware.de> Sat, 3 Feb 2007 21:30:03 +0100 | ||
2229 | 4926 | |||
2230 | 3039 | cryptsetup (2:1.0.4+svn26-1) unstable; urgency=high | 4927 | cryptsetup (2:1.0.4+svn26-1) unstable; urgency=high |
2231 | 3040 | 4928 | ||
2232 | 3041 | [ Jonas Meurer ] | 4929 | [ Jonas Meurer ] |
2233 | @@ -3085,6 +4973,28 @@ cryptsetup (2:1.0.4+svn16-1) unstable; urgency=medium | |||
2234 | 3085 | 4973 | ||
2235 | 3086 | -- Jonas Meurer <mejo@debian.org> Tue, 28 Nov 2006 18:17:12 +0100 | 4974 | -- Jonas Meurer <mejo@debian.org> Tue, 28 Nov 2006 18:17:12 +0100 |
2236 | 3087 | 4975 | ||
2237 | 4976 | cryptsetup (2:1.0.4-8ubuntu2) feisty; urgency=low | ||
2238 | 4977 | |||
2239 | 4978 | * fix and improve initramfs hook: terminate usplash if running, since | ||
2240 | 4979 | adequate secure text input is not possible with usplash ATM | ||
2241 | 4980 | * usplash support: Terminate usplash before asking a password. | ||
2242 | 4981 | Closes https://bugs.launchpad.net/ubuntu/+source/cryptsetup/+bug/62751 | ||
2243 | 4982 | |||
2244 | 4983 | -- Reinhard Tartler <siretart@tauware.de> Wed, 24 Jan 2007 22:43:28 +0100 | ||
2245 | 4984 | |||
2246 | 4985 | cryptsetup (2:1.0.4-8ubuntu1) feisty; urgency=low | ||
2247 | 4986 | |||
2248 | 4987 | * merge debian changes, remaining patches: | ||
2249 | 4988 | - Always output and read from the console. Ubuntu: #58794. | ||
2250 | 4989 | * other changes have been merged or do noy apply anymore | ||
2251 | 4990 | * read password via usplash if available in initramfs for rootfs. based on a patch from | ||
2252 | 4991 | Swen Thümmler (Thanks for that!) Ubuntu #62751 | ||
2253 | 4992 | * read password from initscript via usplash if running. should fix the | ||
2254 | 4993 | rest of Ubuntu #62751. Only problem with that patch: It asks only once | ||
2255 | 4994 | for the password! improvements welcome! | ||
2256 | 4995 | |||
2257 | 4996 | -- Reinhard Tartler <siretart@tauware.de> Sun, 19 Nov 2006 20:04:19 +0100 | ||
2258 | 4997 | |||
2259 | 3088 | cryptsetup (2:1.0.4-8) unstable; urgency=high | 4998 | cryptsetup (2:1.0.4-8) unstable; urgency=high |
2260 | 3089 | 4999 | ||
2261 | 3090 | [ Jonas Meurer ] | 5000 | [ Jonas Meurer ] |
2262 | @@ -3242,6 +5152,27 @@ cryptsetup (2:1.0.4~rc2-1) unstable; urgency=low | |||
2263 | 3242 | 5152 | ||
2264 | 3243 | -- Jonas Meurer <mejo@debian.org> Mon, 4 Sep 2006 03:55:35 +0200 | 5153 | -- Jonas Meurer <mejo@debian.org> Mon, 4 Sep 2006 03:55:35 +0200 |
2265 | 3244 | 5154 | ||
2266 | 5155 | cryptsetup (2:1.0.3-3ubuntu3) edgy; urgency=low | ||
2267 | 5156 | |||
2268 | 5157 | * Always output and read from the console. Ubuntu: #58794. | ||
2269 | 5158 | |||
2270 | 5159 | -- Scott James Remnant <scott@ubuntu.com> Thu, 21 Sep 2006 03:05:18 +0100 | ||
2271 | 5160 | |||
2272 | 5161 | cryptsetup (2:1.0.3-3ubuntu2) edgy; urgency=low | ||
2273 | 5162 | |||
2274 | 5163 | * Load the dm-crypt module on startup. Ubuntu: #53475. | ||
2275 | 5164 | |||
2276 | 5165 | -- Scott James Remnant <scott@ubuntu.com> Wed, 23 Aug 2006 11:53:49 +0200 | ||
2277 | 5166 | |||
2278 | 5167 | cryptsetup (2:1.0.3-3ubuntu1) edgy; urgency=low | ||
2279 | 5168 | |||
2280 | 5169 | * Sync with Debian: | ||
2281 | 5170 | Remaining Ubuntu Changes | ||
2282 | 5171 | + debian/cryptdisks.functions: | ||
2283 | 5172 | - Tell usplash to quit if we ask for a passphrase | ||
2284 | 5173 | |||
2285 | 5174 | -- Sebastian Dröge <slomo@ubuntu.com> Tue, 11 Jul 2006 20:03:27 +0200 | ||
2286 | 5175 | |||
2287 | 3245 | cryptsetup (2:1.0.3-3) unstable; urgency=low | 5176 | cryptsetup (2:1.0.3-3) unstable; urgency=low |
2288 | 3246 | 5177 | ||
2289 | 3247 | [ Jonas Meurer ] | 5178 | [ Jonas Meurer ] |
2290 | diff --git a/debian/control b/debian/control | |||
2291 | index 4b0278c..4319a20 100644 | |||
2292 | --- a/debian/control | |||
2293 | +++ b/debian/control | |||
2294 | @@ -1,7 +1,8 @@ | |||
2295 | 1 | Source: cryptsetup | 1 | Source: cryptsetup |
2296 | 2 | Section: admin | 2 | Section: admin |
2297 | 3 | Priority: optional | 3 | Priority: optional |
2299 | 4 | Maintainer: Debian Cryptsetup Team <pkg-cryptsetup-devel@alioth-lists.debian.net> | 4 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
2300 | 5 | XSBC-Original-Maintainer: Debian Cryptsetup Team <pkg-cryptsetup-devel@alioth-lists.debian.net> | ||
2301 | 5 | Uploaders: Jonas Meurer <jonas@freesources.org>, | 6 | Uploaders: Jonas Meurer <jonas@freesources.org>, |
2302 | 6 | Guilhem Moulin <guilhem@debian.org> | 7 | Guilhem Moulin <guilhem@debian.org> |
2303 | 7 | Rules-Requires-Root: no | 8 | Rules-Requires-Root: no |
2304 | @@ -43,7 +44,8 @@ Depends: cryptsetup-bin (>= 2:1.6.0), | |||
2305 | 43 | dmsetup, | 44 | dmsetup, |
2306 | 44 | ${misc:Depends}, | 45 | ${misc:Depends}, |
2307 | 45 | ${shlibs:Depends} | 46 | ${shlibs:Depends} |
2309 | 46 | Suggests: cryptsetup-initramfs, dosfstools, keyutils, liblocale-gettext-perl | 47 | Recommends: cryptsetup-initramfs |
2310 | 48 | Suggests: dosfstools, keyutils, liblocale-gettext-perl | ||
2311 | 47 | Description: disk encryption support - startup scripts | 49 | Description: disk encryption support - startup scripts |
2312 | 48 | Cryptsetup provides an interface for configuring encryption on block | 50 | Cryptsetup provides an interface for configuring encryption on block |
2313 | 49 | devices (such as /home or swap partitions), using the Linux kernel | 51 | devices (such as /home or swap partitions), using the Linux kernel |
2314 | @@ -92,11 +94,11 @@ Description: disk encryption support - experimental SSH token handler | |||
2315 | 92 | 94 | ||
2316 | 93 | Package: cryptsetup-initramfs | 95 | Package: cryptsetup-initramfs |
2317 | 94 | Architecture: all | 96 | Architecture: all |
2319 | 95 | Depends: busybox | busybox-static, | 97 | Depends: busybox-initramfs, |
2320 | 96 | cryptsetup (>= ${source:Version}), | 98 | cryptsetup (>= ${source:Version}), |
2321 | 97 | initramfs-tools (>= 0.137) | linux-initramfs-tool, | 99 | initramfs-tools (>= 0.137) | linux-initramfs-tool, |
2322 | 98 | ${misc:Depends} | 100 | ${misc:Depends} |
2324 | 99 | Recommends: console-setup, kbd | 101 | Recommends: console-setup, kbd, plymouth |
2325 | 100 | Breaks: cryptsetup (<< 2:2.0.3-1) | 102 | Breaks: cryptsetup (<< 2:2.0.3-1) |
2326 | 101 | Replaces: cryptsetup (<< 2:2.0.3-1) | 103 | Replaces: cryptsetup (<< 2:2.0.3-1) |
2327 | 102 | Conflicts: lvm2 (<< 2.03.15-1) | 104 | Conflicts: lvm2 (<< 2.03.15-1) |
2328 | @@ -109,7 +111,7 @@ Description: disk encryption support - initramfs integration | |||
2329 | 109 | This package provides initramfs integration for cryptsetup. | 111 | This package provides initramfs integration for cryptsetup. |
2330 | 110 | 112 | ||
2331 | 111 | Package: cryptsetup-suspend | 113 | Package: cryptsetup-suspend |
2333 | 112 | Architecture: linux-any | 114 | Architecture: amd64 arm64 armhf ppc64el riscv64 s390x |
2334 | 113 | Multi-Arch: foreign | 115 | Multi-Arch: foreign |
2335 | 114 | Depends: cryptsetup-initramfs (>= ${source:Version}), | 116 | Depends: cryptsetup-initramfs (>= ${source:Version}), |
2336 | 115 | initramfs-tools-core, | 117 | initramfs-tools-core, |
2337 | diff --git a/debian/functions b/debian/functions | |||
2338 | index 917abad..73f5f2a 100644 | |||
2339 | --- a/debian/functions | |||
2340 | +++ b/debian/functions | |||
2341 | @@ -603,6 +603,7 @@ _resolve_device() { | |||
2342 | 603 | # Print the major:minor device ID(s) holding the file system currently | 603 | # Print the major:minor device ID(s) holding the file system currently |
2343 | 604 | # mounted currenty mounted on $mountpoint. | 604 | # mounted currenty mounted on $mountpoint. |
2344 | 605 | # Return 0 on success, 1 on error (if $mountpoint is not a mountpoint). | 605 | # Return 0 on success, 1 on error (if $mountpoint is not a mountpoint). |
2345 | 606 | # devno will be empty if the filesystem must be excluded. | ||
2346 | 606 | get_mnt_devno() { | 607 | get_mnt_devno() { |
2347 | 607 | local wantmount="$1" devnos="" uuid dev IFS | 608 | local wantmount="$1" devnos="" uuid dev IFS |
2348 | 608 | local spec mountpoint fstype _ DEV MAJ MIN | 609 | local spec mountpoint fstype _ DEV MAJ MIN |
2349 | @@ -616,8 +617,15 @@ get_mnt_devno() { | |||
2350 | 616 | # take the last mountpoint if used several times (shadowed) | 617 | # take the last mountpoint if used several times (shadowed) |
2351 | 617 | unset -v devnos | 618 | unset -v devnos |
2352 | 618 | spec="$(printf '%b' "$spec")" | 619 | spec="$(printf '%b' "$spec")" |
2353 | 619 | _resolve_device "$spec" || continue # _resolve_device() already warns on error | ||
2354 | 620 | fstype="$(printf '%b' "$fstype")" | 620 | fstype="$(printf '%b' "$fstype")" |
2355 | 621 | if [ "$fstype" = "zfs" ]; then | ||
2356 | 622 | # Ignore ZFS entries as they don't have a major/minor and won't | ||
2357 | 623 | # be imported when local-top cryptroot script will ran. | ||
2358 | 624 | # Returns success with empty devno | ||
2359 | 625 | printf '' | ||
2360 | 626 | return 0 | ||
2361 | 627 | fi | ||
2362 | 628 | _resolve_device "$spec" || continue # _resolve_device() already warns on error | ||
2363 | 621 | if [ "$fstype" = "btrfs" ]; then | 629 | if [ "$fstype" = "btrfs" ]; then |
2364 | 622 | # btrfs can span over multiple devices | 630 | # btrfs can span over multiple devices |
2365 | 623 | if uuid="$(_device_uuid "$DEV")"; then | 631 | if uuid="$(_device_uuid "$DEV")"; then |
2366 | diff --git a/debian/initramfs/cryptroot-unlock b/debian/initramfs/cryptroot-unlock | |||
2367 | index dbc2ad0..0e91701 100644 | |||
2368 | --- a/debian/initramfs/cryptroot-unlock | |||
2369 | +++ b/debian/initramfs/cryptroot-unlock | |||
2370 | @@ -40,8 +40,14 @@ fi | |||
2371 | 40 | pgrep_exe() { | 40 | pgrep_exe() { |
2372 | 41 | local exe pid | 41 | local exe pid |
2373 | 42 | exe="$(readlink -f -- "$1" 2>/dev/null)" && [ -f "$exe" ] || return 0 | 42 | exe="$(readlink -f -- "$1" 2>/dev/null)" && [ -f "$exe" ] || return 0 |
2376 | 43 | ps -eo pid= | while read pid; do | 43 | ps | awk '{print $1, $5}' | while read LINE; do |
2377 | 44 | [ "$(readlink -f "/proc/$pid/exe")" != "$exe" ] || printf '%d\n' "$pid" | 44 | set $LINE |
2378 | 45 | local pid=$1 | ||
2379 | 46 | local cmd=$(readlink -f -- "$2") | ||
2380 | 47 | if [ "$cmd" == "$exe" ]; then | ||
2381 | 48 | echo $pid | ||
2382 | 49 | break | ||
2383 | 50 | fi | ||
2384 | 45 | done | 51 | done |
2385 | 46 | } | 52 | } |
2386 | 47 | 53 | ||
2387 | @@ -101,7 +107,7 @@ wait_for_prompt() { | |||
2388 | 101 | break | 107 | break |
2389 | 102 | fi | 108 | fi |
2390 | 103 | 109 | ||
2392 | 104 | usleep 100000 | 110 | sleep 0.1 |
2393 | 105 | timer=$(( $timer - 1 )) | 111 | timer=$(( $timer - 1 )) |
2394 | 106 | if [ $timer -le 0 ]; then | 112 | if [ $timer -le 0 ]; then |
2395 | 107 | echo "Error: Timeout reached while waiting for askpass." >&2 | 113 | echo "Error: Timeout reached while waiting for askpass." >&2 |
2396 | @@ -112,7 +118,7 @@ wait_for_prompt() { | |||
2397 | 112 | # find the cryptsetup process with same $CRYPTTAB_NAME | 118 | # find the cryptsetup process with same $CRYPTTAB_NAME |
2398 | 113 | local o v | 119 | local o v |
2399 | 114 | for o in NAME TRIED OPTION_tries; do | 120 | for o in NAME TRIED OPTION_tries; do |
2401 | 115 | if v="$(grep -z -m1 "^CRYPTTAB_$o=" "/proc/$pid/environ")"; then | 121 | if v="$(tr '\0' '\n' < "/proc/$pid/environ" | grep -m1 "^CRYPTTAB_$o=")"; then |
2402 | 116 | eval "CRYPTTAB_$o"="\${v#CRYPTTAB_$o=}" | 122 | eval "CRYPTTAB_$o"="\${v#CRYPTTAB_$o=}" |
2403 | 117 | else | 123 | else |
2404 | 118 | eval unset -v "CRYPTTAB_$o" | 124 | eval unset -v "CRYPTTAB_$o" |
2405 | @@ -128,7 +134,7 @@ wait_for_prompt() { | |||
2406 | 128 | fi | 134 | fi |
2407 | 129 | 135 | ||
2408 | 130 | for pid in $(pgrep_exe "/sbin/cryptsetup"); do | 136 | for pid in $(pgrep_exe "/sbin/cryptsetup"); do |
2410 | 131 | if grep -Fxqz "CRYPTTAB_NAME=$CRYPTTAB_NAME" "/proc/$pid/environ"; then | 137 | if tr '\0' '\n' < "/proc/$pid/environ" | grep -Fxq "CRYPTTAB_NAME=$CRYPTTAB_NAME"; then |
2411 | 132 | PID=$pid | 138 | PID=$pid |
2412 | 133 | BIRTH=$(stat -c"%Z" "/proc/$PID" 2>/dev/null) || break | 139 | BIRTH=$(stat -c"%Z" "/proc/$PID" 2>/dev/null) || break |
2413 | 134 | return 0 | 140 | return 0 |
2414 | @@ -148,7 +154,7 @@ wait_for_prompt() { | |||
2415 | 148 | wait_for_answer() { | 154 | wait_for_answer() { |
2416 | 149 | local timer=$(( 10 * $TIMEOUT )) b | 155 | local timer=$(( 10 * $TIMEOUT )) b |
2417 | 150 | while [ -d "/proc/$PID" ] && b=$(stat -c"%Z" "/proc/$PID" 2>/dev/null) && [ $b -le $BIRTH ]; do | 156 | while [ -d "/proc/$PID" ] && b=$(stat -c"%Z" "/proc/$PID" 2>/dev/null) && [ $b -le $BIRTH ]; do |
2419 | 151 | usleep 100000 | 157 | sleep 0.1 |
2420 | 152 | timer=$(( $timer - 1 )) | 158 | timer=$(( $timer - 1 )) |
2421 | 153 | if [ $timer -le 0 ]; then | 159 | if [ $timer -le 0 ]; then |
2422 | 154 | echo "Error: Timeout reached while waiting for PID $PID." >&2 | 160 | echo "Error: Timeout reached while waiting for PID $PID." >&2 |
2423 | diff --git a/debian/initramfs/hooks/cryptroot b/debian/initramfs/hooks/cryptroot | |||
2424 | index c16f7c2..87a3589 100644 | |||
2425 | --- a/debian/initramfs/hooks/cryptroot | |||
2426 | +++ b/debian/initramfs/hooks/cryptroot | |||
2427 | @@ -178,16 +178,18 @@ generate_initrd_crypttab() { | |||
2428 | 178 | 178 | ||
2429 | 179 | { | 179 | { |
2430 | 180 | if devnos="$(get_mnt_devno /)"; then | 180 | if devnos="$(get_mnt_devno /)"; then |
2432 | 181 | usage=rootfs foreach_cryptdev crypttab_find_and_print_entry $devnos | 181 | if [ -n "$devnos" ]; then |
2433 | 182 | usage=rootfs foreach_cryptdev crypttab_find_and_print_entry $devnos | ||
2434 | 183 | fi | ||
2435 | 182 | else | 184 | else |
2436 | 183 | cryptsetup_message "WARNING: Couldn't determine root device" | 185 | cryptsetup_message "WARNING: Couldn't determine root device" |
2437 | 184 | fi | 186 | fi |
2438 | 185 | 187 | ||
2440 | 186 | if devnos="$(get_resume_devno)"; then | 188 | if devnos="$(get_resume_devno)" && [ -n "$devnos" ]; then |
2441 | 187 | usage=resume foreach_cryptdev crypttab_find_and_print_entry $devnos | 189 | usage=resume foreach_cryptdev crypttab_find_and_print_entry $devnos |
2442 | 188 | fi | 190 | fi |
2443 | 189 | 191 | ||
2445 | 190 | if devnos="$(get_mnt_devno /usr)"; then | 192 | if devnos="$(get_mnt_devno /usr)" && [ -n "$devnos" ]; then |
2446 | 191 | usage="" foreach_cryptdev crypttab_find_and_print_entry $devnos | 193 | usage="" foreach_cryptdev crypttab_find_and_print_entry $devnos |
2447 | 192 | fi | 194 | fi |
2448 | 193 | 195 | ||
2449 | diff --git a/debian/rules b/debian/rules | |||
2450 | index 757085c..461e844 100755 | |||
2451 | --- a/debian/rules | |||
2452 | +++ b/debian/rules | |||
2453 | @@ -29,6 +29,7 @@ override_dh_auto_configure: | |||
2454 | 29 | --with-tmpfilesdir=/usr/lib/tmpfiles.d \ | 29 | --with-tmpfilesdir=/usr/lib/tmpfiles.d \ |
2455 | 30 | --enable-libargon2 \ | 30 | --enable-libargon2 \ |
2456 | 31 | --enable-shared \ | 31 | --enable-shared \ |
2457 | 32 | --enable-fips \ | ||
2458 | 32 | --enable-cryptsetup-reencrypt | 33 | --enable-cryptsetup-reencrypt |
2459 | 33 | 34 | ||
2460 | 34 | execute_after_dh_auto_build: | 35 | execute_after_dh_auto_build: |
2461 | @@ -87,8 +88,10 @@ override_dh_bugfiles: | |||
2462 | 87 | execute_after_dh_fixperms-arch: | 88 | execute_after_dh_fixperms-arch: |
2463 | 88 | chmod 0755 debian/cryptsetup/lib/cryptsetup/checks/* | 89 | chmod 0755 debian/cryptsetup/lib/cryptsetup/checks/* |
2464 | 89 | chmod 0755 debian/cryptsetup/lib/cryptsetup/scripts/decrypt_* | 90 | chmod 0755 debian/cryptsetup/lib/cryptsetup/scripts/decrypt_* |
2465 | 91 | ifneq ($(DEB_HOST_ARCH),i386) | ||
2466 | 90 | chmod 0755 debian/cryptsetup-suspend/lib/cryptsetup/scripts/suspend/cryptsetup-suspend-wrapper | 92 | chmod 0755 debian/cryptsetup-suspend/lib/cryptsetup/scripts/suspend/cryptsetup-suspend-wrapper |
2467 | 91 | chmod 0755 debian/cryptsetup-suspend/lib/systemd/system-shutdown/cryptsetup-suspend.shutdown | 93 | chmod 0755 debian/cryptsetup-suspend/lib/systemd/system-shutdown/cryptsetup-suspend.shutdown |
2468 | 94 | endif | ||
2469 | 92 | ifeq (,$(filter noudeb, $(DEB_BUILD_PROFILES))) | 95 | ifeq (,$(filter noudeb, $(DEB_BUILD_PROFILES))) |
2470 | 93 | chmod 0755 debian/cryptsetup-udeb/lib/cryptsetup/checks/* | 96 | chmod 0755 debian/cryptsetup-udeb/lib/cryptsetup/checks/* |
2471 | 94 | chmod 0755 debian/cryptsetup-udeb/lib/cryptsetup/scripts/decrypt_* | 97 | chmod 0755 debian/cryptsetup-udeb/lib/cryptsetup/scripts/decrypt_* |
2472 | diff --git a/debian/tests/control b/debian/tests/control | |||
2473 | index 52752a3..0b7e9be 100644 | |||
2474 | --- a/debian/tests/control | |||
2475 | +++ b/debian/tests/control | |||
2476 | @@ -42,8 +42,9 @@ Depends: cryptsetup-bin, | |||
2477 | 42 | sshpass | 42 | sshpass |
2478 | 43 | Restrictions: needs-root, isolation-machine | 43 | Restrictions: needs-root, isolation-machine |
2479 | 44 | 44 | ||
2482 | 45 | 45 | # cryptdisks test is disabled - it fails to open /dev/tty in CI | |
2483 | 46 | Tests: cryptdisks, cryptdisks.init | 46 | #Tests: cryptdisks, cryptdisks.init |
2484 | 47 | Tests: cryptdisks.init | ||
2485 | 47 | Depends: cryptsetup, xxd | 48 | Depends: cryptsetup, xxd |
2486 | 48 | Restrictions: allow-stderr, needs-root, isolation-machine | 49 | Restrictions: allow-stderr, needs-root, isolation-machine |
2487 | 49 | 50 | ||
2488 | diff --git a/debian/tests/cryptroot-lvm.d/mock b/debian/tests/cryptroot-lvm.d/mock | |||
2489 | index f57e42f..f777763 100755 | |||
2490 | --- a/debian/tests/cryptroot-lvm.d/mock | |||
2491 | +++ b/debian/tests/cryptroot-lvm.d/mock | |||
2492 | @@ -36,8 +36,13 @@ else { | |||
2493 | 36 | expect($SERIAL => qr/(?:^|\s)?PM: suspend exit\r\n/m); | 36 | expect($SERIAL => qr/(?:^|\s)?PM: suspend exit\r\n/m); |
2494 | 37 | unlock_disk("topsecret"); | 37 | unlock_disk("topsecret"); |
2495 | 38 | 38 | ||
2498 | 39 | # consume PS1 to make sure we're at a shell prompt | 39 | # suspend() leaves clutter in the console due to the retries |
2499 | 40 | expect($CONSOLE => qr/\A $PS1 \z/aamsx); | 40 | # that prevents test from succeeding. |
2500 | 41 | consume($CONSOLE); | ||
2501 | 42 | |||
2502 | 43 | # ensure that shell is available | ||
2503 | 44 | shell(q{echo ready}, rv => 0); | ||
2504 | 45 | |||
2505 | 41 | my $out = shell(q{dmsetup info -c --noheadings -omangled_name,suspended --separator ' '}); | 46 | my $out = shell(q{dmsetup info -c --noheadings -omangled_name,suspended --separator ' '}); |
2506 | 42 | die if grep !/[:[:blank:]]Active$/i, split(/\r?\n/, $out); | 47 | die if grep !/[:[:blank:]]Active$/i, split(/\r?\n/, $out); |
2507 | 43 | 48 | ||
2508 | diff --git a/debian/tests/cryptroot-nested.d/config b/debian/tests/cryptroot-nested.d/config | |||
2509 | index 995200c..fcfba32 100644 | |||
2510 | --- a/debian/tests/cryptroot-nested.d/config | |||
2511 | +++ b/debian/tests/cryptroot-nested.d/config | |||
2512 | @@ -1,6 +1,13 @@ | |||
2513 | 1 | PKGS_EXTRA+=( btrfs-progs lvm2 mdadm ) | 1 | PKGS_EXTRA+=( btrfs-progs lvm2 mdadm ) |
2514 | 2 | PKGS_EXTRA+=( cryptsetup-initramfs ) | 2 | PKGS_EXTRA+=( cryptsetup-initramfs ) |
2515 | 3 | 3 | ||
2516 | 4 | # "$DISTRIBUTOR_ID" is defined in ../utils/cryptroot-common | ||
2517 | 5 | # Workaround for LP1831747 https://bugs.launchpad.net/ubuntu/+source/initramfs-tools/+bug/1831747 | ||
2518 | 6 | # Add implicit dependency of cryptsetup-initramfs | ||
2519 | 7 | if [ "$DISTRIBUTOR_ID" = "ubuntu" ]; then | ||
2520 | 8 | PKGS_EXTRA+=( e2fsprogs ) | ||
2521 | 9 | fi | ||
2522 | 10 | |||
2523 | 4 | # /dev/mapper/testvg-lv1_crypt and /dev/vdc are both 1G and used in RAID1 mode | 11 | # /dev/mapper/testvg-lv1_crypt and /dev/vdc are both 1G and used in RAID1 mode |
2524 | 5 | DRIVE_SIZES=( "1G" "264M" "1G" "512M" ) | 12 | DRIVE_SIZES=( "1G" "264M" "1G" "512M" ) |
2525 | 6 | 13 | ||
2526 | diff --git a/debian/tests/cryptroot-sysvinit.d/config b/debian/tests/cryptroot-sysvinit.d/config | |||
2527 | index f6b7392..1d41c24 100644 | |||
2528 | --- a/debian/tests/cryptroot-sysvinit.d/config | |||
2529 | +++ b/debian/tests/cryptroot-sysvinit.d/config | |||
2530 | @@ -1,5 +1,10 @@ | |||
2531 | 1 | PKGS_EXTRA+=( e2fsprogs ) # for fsck.ext4 | 1 | PKGS_EXTRA+=( e2fsprogs ) # for fsck.ext4 |
2532 | 2 | PKGS_EXTRA+=( cryptsetup-initramfs cryptsetup ) | 2 | PKGS_EXTRA+=( cryptsetup-initramfs cryptsetup ) |
2535 | 3 | PKG_INIT="sysvinit-core" | 3 | # "$DISTRIBUTOR_ID" is defined in ../utils/cryptroot-common |
2536 | 4 | 4 | case "$DISTRIBUTOR_ID" in | |
2537 | 5 | debian) PKG_INIT="sysvinit-core";; | ||
2538 | 6 | ubuntu) PKG_INIT="systemd-sysv";; | ||
2539 | 7 | *) echo "ERROR: Unknown distributor ID '$DISTRIBUTOR_ID', can't determine default init package" >&2; | ||
2540 | 8 | exit 1;; | ||
2541 | 9 | esac | ||
2542 | 5 | # vim: set filetype=bash : | 10 | # vim: set filetype=bash : |
2543 | diff --git a/debian/tests/initramfs-hook b/debian/tests/initramfs-hook | |||
2544 | index 4171102..f58e6f5 100755 | |||
2545 | --- a/debian/tests/initramfs-hook | |||
2546 | +++ b/debian/tests/initramfs-hook | |||
2547 | @@ -63,6 +63,20 @@ mkinitramfs() { | |||
2548 | 63 | # `mkinitramfs -k` would be better but we can't set $DESTDIR in advance | 63 | # `mkinitramfs -k` would be better but we can't set $DESTDIR in advance |
2549 | 64 | cleanup_initrd_dir | 64 | cleanup_initrd_dir |
2550 | 65 | command unmkinitramfs "$INITRD_IMG" "$INITRD_DIR" | 65 | command unmkinitramfs "$INITRD_IMG" "$INITRD_DIR" |
2551 | 66 | |||
2552 | 67 | # find subdirectory with the root file system relative to the cryptsetup location | ||
2553 | 68 | CRYPTSETUP_PATH=sbin/cryptsetup | ||
2554 | 69 | ROOTFS_DIR=`find "$INITRD_DIR" -name cryptsetup | grep "/usr/$CRYPTSETUP_PATH" | sed -e "s|/usr/$CRYPTSETUP_PATH||"` | ||
2555 | 70 | |||
2556 | 71 | if [[ -z "$ROOTFS_DIR" ]]; then | ||
2557 | 72 | ROOTFS_DIR=`find "$INITRD_DIR" -name cryptsetup | grep "/$CRYPTSETUP_PATH" | sed -e "s|/$CRYPTSETUP_PATH||"` | ||
2558 | 73 | fi | ||
2559 | 74 | |||
2560 | 75 | if [[ ! -z "$ROOTFS_DIR" ]] && [[ "$ROOTFS_DIR" != "$INITRD_DIR" ]] && [[ -d "$ROOTFS_DIR" ]]; then | ||
2561 | 76 | echo move root filesystem from "$ROOTFS_DIR" to "$INITRD_DIR" | ||
2562 | 77 | mv "$ROOTFS_DIR"/* "$INITRD_DIR" | ||
2563 | 78 | fi | ||
2564 | 79 | |||
2565 | 66 | for d in dev proc sys; do | 80 | for d in dev proc sys; do |
2566 | 67 | mkdir -p "$INITRD_DIR/$d" | 81 | mkdir -p "$INITRD_DIR/$d" |
2567 | 68 | mount --bind "/$d" "$INITRD_DIR/$d" | 82 | mount --bind "/$d" "$INITRD_DIR/$d" |
2568 | @@ -190,9 +204,9 @@ cryptsetup close test3_crypt | |||
2569 | 190 | # plain, blowfish + ripemd160 (ignored due to keyfile) | 204 | # plain, blowfish + ripemd160 (ignored due to keyfile) |
2570 | 191 | disk_setup | 205 | disk_setup |
2571 | 192 | head -c32 /dev/urandom >"$TMPDIR/keyfile" | 206 | head -c32 /dev/urandom >"$TMPDIR/keyfile" |
2573 | 193 | cryptsetup open --type=plain --cipher="blowfish" --key-file="$TMPDIR/keyfile" --size=256 --hash="ripemd160" "$CRYPT_DEV" test3_crypt | 207 | cryptsetup open --type=plain --cipher="blowfish" --key-file="$TMPDIR/keyfile" --hash="ripemd160" "$CRYPT_DEV" test3_crypt |
2574 | 194 | mkfs.ext2 -m0 /dev/mapper/test3_crypt | 208 | mkfs.ext2 -m0 /dev/mapper/test3_crypt |
2576 | 195 | echo "test3_crypt $CRYPT_DEV $TMPDIR/keyfile plain,cipher=blowfish,hash=ripemd160,size=256,initramfs" >/etc/crypttab | 209 | echo "test3_crypt $CRYPT_DEV $TMPDIR/keyfile plain,cipher=blowfish,hash=ripemd160,initramfs" >/etc/crypttab |
2577 | 196 | mkinitramfs | 210 | mkinitramfs |
2578 | 197 | legacy_so="$(find "$INITRD_DIR" -xdev -type f -path "*/ossl-modules/legacy.so")" | 211 | legacy_so="$(find "$INITRD_DIR" -xdev -type f -path "*/ossl-modules/legacy.so")" |
2579 | 198 | test -z "$legacy_so" || exit 1 # don't need legacy.so here | 212 | test -z "$legacy_so" || exit 1 # don't need legacy.so here |
2580 | diff --git a/debian/tests/utils/cryptroot-common b/debian/tests/utils/cryptroot-common | |||
2581 | index a7df37f..8cedda0 100755 | |||
2582 | --- a/debian/tests/utils/cryptroot-common | |||
2583 | +++ b/debian/tests/utils/cryptroot-common | |||
2584 | @@ -81,6 +81,7 @@ load_os_release() { | |||
2585 | 81 | } | 81 | } |
2586 | 82 | case "${DISTRIBUTOR_ID:="$(load_os_release && printf "%s" "${ID,,[A-Z]}")"}" in | 82 | case "${DISTRIBUTOR_ID:="$(load_os_release && printf "%s" "${ID,,[A-Z]}")"}" in |
2587 | 83 | debian) APT_REPO_ORIGIN="Debian"; APT_REPO_URI="http://deb.debian.org/debian";; | 83 | debian) APT_REPO_ORIGIN="Debian"; APT_REPO_URI="http://deb.debian.org/debian";; |
2588 | 84 | ubuntu) APT_REPO_ORIGIN="Ubuntu"; APT_REPO_URI="http://archive.ubuntu.com/ubuntu";; | ||
2589 | 84 | # suitable values for derivative can be added here | 85 | # suitable values for derivative can be added here |
2590 | 85 | *) echo "ERROR: Unknown distributor ID '$DISTRIBUTOR_ID', can't extract APT origin" >&2; | 86 | *) echo "ERROR: Unknown distributor ID '$DISTRIBUTOR_ID', can't extract APT origin" >&2; |
2591 | 86 | exit 1;; | 87 | exit 1;; |
2592 | @@ -164,6 +165,12 @@ case "$BOOT" in | |||
2593 | 164 | efi) PKG_BOOTLOADER="grub-efi";; | 165 | efi) PKG_BOOTLOADER="grub-efi";; |
2594 | 165 | *) echo "ERROR unknown boot method '$BOOT'" >&2; exit 1;; | 166 | *) echo "ERROR unknown boot method '$BOOT'" >&2; exit 1;; |
2595 | 166 | esac | 167 | esac |
2596 | 168 | |||
2597 | 169 | if [ "$DISTRIBUTOR_ID" = "ubuntu" ]; then | ||
2598 | 170 | echo "Overriding kernel arch to generic" | ||
2599 | 171 | KERNEL_ARCH="generic" | ||
2600 | 172 | fi | ||
2601 | 173 | |||
2602 | 167 | PKG_KERNEL="linux-image-$KERNEL_ARCH" | 174 | PKG_KERNEL="linux-image-$KERNEL_ARCH" |
2603 | 168 | PKG_INIT="systemd-sysv" # default pid1 | 175 | PKG_INIT="systemd-sysv" # default pid1 |
2604 | 169 | MERGED_USR="" # use default layout for the target version | 176 | MERGED_USR="" # use default layout for the target version |
2605 | @@ -301,6 +308,12 @@ setup_apt() { | |||
2606 | 301 | esac >"$TEMPDIR/apt/sources.list" | 308 | esac >"$TEMPDIR/apt/sources.list" |
2607 | 302 | fi | 309 | fi |
2608 | 303 | 310 | ||
2609 | 311 | # ubuntu CI populates sources.list.d with PPA source, append them to the list | ||
2610 | 312 | if [ "$DISTRIBUTOR_ID" = "ubuntu" -a -d /etc/apt/sources.list.d ]; then | ||
2611 | 313 | echo "Append contents of /etc/apt/sources.list.d to $TEMPDIR/apt/sources.list" | ||
2612 | 314 | find /etc/apt/sources.list.d -type f | xargs cat >> "$TEMPDIR/apt/sources.list" | ||
2613 | 315 | fi | ||
2614 | 316 | |||
2615 | 304 | local apt_repo | 317 | local apt_repo |
2616 | 305 | for apt_repo in "${EXTRA_REPOS[@]}"; do | 318 | for apt_repo in "${EXTRA_REPOS[@]}"; do |
2617 | 306 | printf "%s\\n" "$apt_repo" >>"$TEMPDIR/apt/sources.list" | 319 | printf "%s\\n" "$apt_repo" >>"$TEMPDIR/apt/sources.list" |
2618 | @@ -416,9 +429,20 @@ extract_kernel() { | |||
2619 | 416 | fi | 429 | fi |
2620 | 417 | 430 | ||
2621 | 418 | mkdir "$destdir" | 431 | mkdir "$destdir" |
2625 | 419 | dpkg-deb --fsys-tarfile "$APT_CACHE/archives/$KERNEL_DEB" | tar -C "$destdir" -xf- \ | 432 | if [ "$DISTRIBUTOR_ID" == "debian" ]; then |
2626 | 420 | "./boot/vmlinuz-$KERNEL_VERSION" \ | 433 | dpkg-deb --fsys-tarfile "$APT_CACHE/archives/$KERNEL_DEB" | tar -C "$destdir" -xf- \ |
2627 | 421 | "./lib/modules/$KERNEL_VERSION" | 434 | "./boot/vmlinuz-$KERNEL_VERSION" \ |
2628 | 435 | "./lib/modules/$KERNEL_VERSION" | ||
2629 | 436 | elif [ "$DISTRIBUTOR_ID" == "ubuntu" ]; then | ||
2630 | 437 | dpkg-deb --fsys-tarfile "$APT_CACHE/archives/$KERNEL_DEB" | tar -C "$destdir" -xf- \ | ||
2631 | 438 | "./boot/vmlinuz-$KERNEL_VERSION"; MODULES_DEB="$(echo $KERNEL_DEB | sed s/-image-/-modules-/)"; \ | ||
2632 | 439 | dpkg-deb --fsys-tarfile "$APT_CACHE/archives/$MODULES_DEB" | tar -C "$destdir" -xf- \ | ||
2633 | 440 | "./lib/modules/$KERNEL_VERSION" | ||
2634 | 441 | else | ||
2635 | 442 | echo "ERROR: Unknown distributor ID '$DISTRIBUTOR_ID', can't extract kernel" >&2 | ||
2636 | 443 | exit 1 | ||
2637 | 444 | fi | ||
2638 | 445 | |||
2639 | 422 | ln -T -- "$destdir/boot/vmlinuz-$KERNEL_VERSION" "$TEMPDIR/vmlinuz-$KERNEL_VERSION" | 446 | ln -T -- "$destdir/boot/vmlinuz-$KERNEL_VERSION" "$TEMPDIR/vmlinuz-$KERNEL_VERSION" |
2640 | 423 | } | 447 | } |
2641 | 424 | 448 | ||
2642 | diff --git a/debian/tests/utils/mkinitramfs b/debian/tests/utils/mkinitramfs | |||
2643 | index 6bc70f4..84eeb4b 100755 | |||
2644 | --- a/debian/tests/utils/mkinitramfs | |||
2645 | +++ b/debian/tests/utils/mkinitramfs | |||
2646 | @@ -65,6 +65,8 @@ if [ "$BOOT" = "efi" ]; then | |||
2647 | 65 | MODULES="$MODULES efivarfs nls_ascii nls_cp437 vfat" | 65 | MODULES="$MODULES efivarfs nls_ascii nls_cp437 vfat" |
2648 | 66 | fi | 66 | fi |
2649 | 67 | 67 | ||
2650 | 68 | find "$EXTRACT_DIR" -name '*.zst' -exec zstd -d {} \; | ||
2651 | 69 | |||
2652 | 68 | depmod -ab "$EXTRACT_DIR" "$KERNEL_VERSION" | 70 | depmod -ab "$EXTRACT_DIR" "$KERNEL_VERSION" |
2653 | 69 | for kmod in virtio_console virtio_blk virtio_pci virtio_rng \ | 71 | for kmod in virtio_console virtio_blk virtio_pci virtio_rng \ |
2654 | 70 | "$EXTRACT_DIR/lib/modules/$KERNEL_VERSION"/kernel/arch/*/crypto/*.ko* \ | 72 | "$EXTRACT_DIR/lib/modules/$KERNEL_VERSION"/kernel/arch/*/crypto/*.ko* \ |
2655 | diff --git a/debian/tests/utils/mock.pm b/debian/tests/utils/mock.pm | |||
2656 | index 10db3e6..2425d87 100644 | |||
2657 | --- a/debian/tests/utils/mock.pm | |||
2658 | +++ b/debian/tests/utils/mock.pm | |||
2659 | @@ -97,6 +97,26 @@ sub expect(;$$) { | |||
2660 | 97 | #print STDERR "INFO done reading\n"; | 97 | #print STDERR "INFO done reading\n"; |
2661 | 98 | } | 98 | } |
2662 | 99 | 99 | ||
2663 | 100 | sub consume($) { | ||
2664 | 101 | my $chan = shift; | ||
2665 | 102 | my $buffer = defined $chan ? \$BUFFER{$chan} : undef; | ||
2666 | 103 | if (! defined $buffer) { | ||
2667 | 104 | return; | ||
2668 | 105 | } | ||
2669 | 106 | |||
2670 | 107 | while(unpack("b*", $RBITS) != 0) { | ||
2671 | 108 | my $rout = $RBITS; | ||
2672 | 109 | if (select($rout, undef, undef, 1) == -1) { | ||
2673 | 110 | return; | ||
2674 | 111 | } | ||
2675 | 112 | read_data($rout); | ||
2676 | 113 | if (length($$buffer) == 0) { | ||
2677 | 114 | return; | ||
2678 | 115 | } | ||
2679 | 116 | $$buffer = ""; | ||
2680 | 117 | } | ||
2681 | 118 | } | ||
2682 | 119 | |||
2683 | 100 | sub write_data($$%) { | 120 | sub write_data($$%) { |
2684 | 101 | my $chan = shift; | 121 | my $chan = shift; |
2685 | 102 | my $data = shift; | 122 | my $data = shift; |
2686 | @@ -167,11 +187,13 @@ BEGIN { | |||
2687 | 167 | hibernate | 187 | hibernate |
2688 | 168 | poweroff | 188 | poweroff |
2689 | 169 | expect | 189 | expect |
2690 | 190 | consume | ||
2691 | 170 | /; | 191 | /; |
2692 | 171 | } | 192 | } |
2693 | 172 | 193 | ||
2694 | 173 | *expect = \&CryptrootTest::Utils::expect; | 194 | *expect = \&CryptrootTest::Utils::expect; |
2695 | 174 | *write_data = \&CryptrootTest::Utils::write_data; | 195 | *write_data = \&CryptrootTest::Utils::write_data; |
2696 | 196 | *consume = \&CryptrootTest::Utils::consume; | ||
2697 | 175 | 197 | ||
2698 | 176 | sub unlock_disk($) { | 198 | sub unlock_disk($) { |
2699 | 177 | my $passphrase = shift; | 199 | my $passphrase = shift; |
2700 | @@ -228,7 +250,9 @@ sub shell($%) { | |||
2701 | 228 | 250 | ||
2702 | 229 | # enter S3 sleep state (suspend to ram aka standby) | 251 | # enter S3 sleep state (suspend to ram aka standby) |
2703 | 230 | sub suspend() { | 252 | sub suspend() { |
2705 | 231 | write_data($CONSOLE => q{systemctl suspend}); | 253 | # there is a race condition that causes suspend to fail. |
2706 | 254 | # retry until success. Note, this may leave clutter in the console | ||
2707 | 255 | write_data($CONSOLE => q{until systemctl suspend; do sleep 1; done}); | ||
2708 | 232 | # while the command is asynchronous the system might suspend before | 256 | # while the command is asynchronous the system might suspend before |
2709 | 233 | # we have a chance to read the next $PS1 | 257 | # we have a chance to read the next $PS1 |
2710 | 234 | 258 |
would you mind also submitting this against debian/sid for a cleaner review?
may be personal preference :)