Merge ~paelzer/ubuntu/+source/tgt:merge-1.0.79-2-gcc-10-FTFBS-GROOVY into ubuntu/+source/tgt:debian/sid
- Git
- lp:~paelzer/ubuntu/+source/tgt
- merge-1.0.79-2-gcc-10-FTFBS-GROOVY
- Merge into debian/sid
Status: | Superseded |
---|---|
Proposed branch: | ~paelzer/ubuntu/+source/tgt:merge-1.0.79-2-gcc-10-FTFBS-GROOVY |
Merge into: | ubuntu/+source/tgt:debian/sid |
Diff against target: |
737 lines (+534/-0) (has conflicts) 9 files modified
debian/changelog (+405/-0) debian/control (+18/-0) debian/copyright (+4/-0) debian/patches/0008-Fix-build-with-gcc-10.patch (+46/-0) debian/patches/0009-Replace-__packed-with-__attribute__.patch (+39/-0) debian/patches/series (+5/-0) debian/rules (+9/-0) debian/tests/control (+4/-0) debian/tests/storage (+4/-0) Conflict in debian/changelog Conflict in debian/control Conflict in debian/copyright Conflict in debian/patches/series Conflict in debian/rules Conflict in debian/tests/control Conflict in debian/tests/storage |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Canonical Server | Pending | ||
Canonical Server packageset reviewers | Pending | ||
git-ubuntu developers | Pending | ||
Review via email: mp+391614@code.launchpad.net |
This proposal supersedes a proposal from 2020-09-30.
This proposal has been superseded by a proposal from 2020-09-30.
Commit message
Description of the change
Christian Ehrhardt (paelzer) wrote : Posted in a previous version of this proposal | # |
Christian Ehrhardt (paelzer) wrote : Posted in a previous version of this proposal | # |
s390x FTFBS fix added to the MP
Unmerged commits
- 08811b7... by Christian Ehrhardt
-
changelog: avoid FTFBS due to glibc 2.32 (s390x)
Signed-off-by: Christian Ehrhardt <email address hidden>
- 37282e9... by Christian Ehrhardt
-
d/rules: avoid FTFBS due to glibc 2.32 triggering more gcc-10 errors on tgt build
Signed-off-by: Christian Ehrhardt <email address hidden>
- fb711ca... by Christian Ehrhardt
-
update-maintainer
Signed-off-by: Christian Ehrhardt <email address hidden>
- 54f1f1a... by Christian Ehrhardt
-
changelog: 1:1.0.79-3ubuntu1
Signed-off-by: Christian Ehrhardt <email address hidden>
- f854f68... by Andreas Hasenack
-
merge-changelogs
- e4594f3... by Christian Ehrhardt
-
- Drop glusterfs support, package not in main.
+ debian/control: drop build depends and package
+ debian/rules: disable feature
+ debian/tests/{ control, storage}: remove related tests
+ debian/tgt-glusterfs. install (Deleted) - 413a540... by Apollon Oikonomopoulos <email address hidden>
-
1:1.0.79-3 (patches unapplied)
Imported using git-ubuntu import.
- 18195ed... by Apollon Oikonomopoulos <email address hidden>
-
1:1.0.79-2 (patches unapplied)
Imported using git-ubuntu import.
- ce00767... by Apollon Oikonomopoulos <email address hidden>
-
1:1.0.79-1 (patches unapplied)
Imported using git-ubuntu import.
- e7dbd58... by Apollon Oikonomopoulos <email address hidden>
-
1:1.0.74-1 (patches unapplied)
Imported using git-ubuntu import.
Preview Diff
1 | diff --git a/debian/changelog b/debian/changelog |
2 | index 2c433fe..33cd5db 100644 |
3 | --- a/debian/changelog |
4 | +++ b/debian/changelog |
5 | @@ -1,3 +1,40 @@ |
6 | +<<<<<<< debian/changelog |
7 | +======= |
8 | +tgt (1:1.0.79-3ubuntu1) groovy; urgency=medium |
9 | + |
10 | + * Merge with Debian unstable. Remaining changes: |
11 | + - Drop glusterfs support, package not in main. |
12 | + + debian/control: drop build depends and package |
13 | + + debian/rules: disable feature |
14 | + + debian/tests/{control, storage}: remove related tests |
15 | + + debian/tgt-glusterfs.install (Deleted) |
16 | + * Add changes: |
17 | + - d/rules: avoid FTFBS on s390x due to glibc 2.32 triggering more |
18 | + gcc-10 errors on tgt build |
19 | + |
20 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 30 Sep 2020 13:30:55 +0200 |
21 | + |
22 | +tgt (1:1.0.79-3) unstable; urgency=medium |
23 | + |
24 | + * Fix FTBFS with GCC 10 (Closes: #957874) |
25 | + * Bump Standards-Version to 4.5.0; no changes needed |
26 | + * Bump debhelper-compat to 13; no changes needed |
27 | + * d/copyright: bump debian/ years |
28 | + |
29 | + -- Apollon Oikonomopoulos <apoikos@debian.org> Thu, 17 Sep 2020 12:38:22 +0300 |
30 | + |
31 | +tgt (1:1.0.79-2ubuntu1) eoan; urgency=medium |
32 | + |
33 | + * Merge with Debian unstable. Remaining changes: |
34 | + - Drop glusterfs support, package not in main. |
35 | + + debian/control: drop build depends and package |
36 | + + debian/rules: disable feature |
37 | + + debian/tests/{control, storage}: remove related tests |
38 | + + debian/tgt-glusterfs.install (Deleted) |
39 | + |
40 | + -- Andreas Hasenack <andreas@canonical.com> Wed, 31 Jul 2019 16:25:34 -0300 |
41 | + |
42 | +>>>>>>> debian/changelog |
43 | tgt (1:1.0.79-2) unstable; urgency=medium |
44 | |
45 | * Allow env to override pkg-config. |
46 | @@ -20,6 +57,20 @@ tgt (1:1.0.79-1) unstable; urgency=medium |
47 | |
48 | -- Apollon Oikonomopoulos <apoikos@debian.org> Wed, 17 Jul 2019 13:19:03 -0300 |
49 | |
50 | +<<<<<<< debian/changelog |
51 | +======= |
52 | +tgt (1:1.0.74-1ubuntu1) disco; urgency=medium |
53 | + |
54 | + * Merge with Debian unstable (LP: #1810736). Remaining changes: |
55 | + - Drop glusterfs support, package not in main. |
56 | + - debian/control: drop build depends and package |
57 | + - debian/rules: disable feature |
58 | + - debian/tests/{control, storage}: remove related tests |
59 | + - debian/tgt-glusterfs.install (Deleted) |
60 | + |
61 | + -- Karl Stenerud <kstenerud@gmail.com> Mon, 07 Jan 2019 13:52:58 +0100 |
62 | + |
63 | +>>>>>>> debian/changelog |
64 | tgt (1:1.0.74-1) unstable; urgency=medium |
65 | |
66 | [ Ondřej Nový ] |
67 | @@ -35,6 +86,20 @@ tgt (1:1.0.74-1) unstable; urgency=medium |
68 | |
69 | -- Apollon Oikonomopoulos <apoikos@debian.org> Sat, 08 Dec 2018 22:30:32 +0200 |
70 | |
71 | +<<<<<<< debian/changelog |
72 | +======= |
73 | +tgt (1:1.0.73-1ubuntu1) cosmic; urgency=medium |
74 | + |
75 | + * Merge with Debian unstable. Remaining changes: |
76 | + - Drop glusterfs support, package not in main. |
77 | + - debian/control: drop build depends and package |
78 | + - debian/rules: disable feature |
79 | + - debian/tests/{control, storage}: remove related tests |
80 | + - debian/tgt-glusterfs.install (Deleted) |
81 | + |
82 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 30 May 2018 11:45:12 +0200 |
83 | + |
84 | +>>>>>>> debian/changelog |
85 | tgt (1:1.0.73-1) unstable; urgency=medium |
86 | |
87 | * New upstream version 1.0.73 |
88 | @@ -47,12 +112,58 @@ tgt (1:1.0.73-1) unstable; urgency=medium |
89 | |
90 | -- Apollon Oikonomopoulos <apoikos@debian.org> Tue, 06 Mar 2018 00:12:22 +0200 |
91 | |
92 | +<<<<<<< debian/changelog |
93 | +======= |
94 | +tgt (1:1.0.72-1ubuntu1) bionic; urgency=medium |
95 | + |
96 | + * Merge with Debian unstable. Remaining changes: |
97 | + - Drop glusterfs support, package not in main. |
98 | + - debian/control: drop build depends and package |
99 | + - debian/rules: disable feature |
100 | + - debian/tests/{control, storage}: remove related tests |
101 | + - debian/tgt-glusterfs.install (Deleted) |
102 | + * Dropped changes (in new upstream version) |
103 | + - Fix FTBFS with gcc7 by backporting upstream patches (LP 1723055) |
104 | + |
105 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 16 Nov 2017 10:28:25 +0100 |
106 | + |
107 | +>>>>>>> debian/changelog |
108 | tgt (1:1.0.72-1) unstable; urgency=medium |
109 | |
110 | * New upstream version (closes: #853680) |
111 | |
112 | -- Apollon Oikonomopoulos <apoikos@debian.org> Wed, 02 Aug 2017 20:12:08 -0400 |
113 | |
114 | +<<<<<<< debian/changelog |
115 | +======= |
116 | +tgt (1:1.0.71-1ubuntu2) artful; urgency=medium |
117 | + |
118 | + * Fix FTBFS with gcc7 by backporting upstream patches (LP: #1723055) |
119 | + - d/p/GCC-FTBFS-1-Fix-header-warning-with-GCC-7-for-major.patch |
120 | + - d/p/GCC-FTBFS-2-Remove-incorrect-size-specifier-in-spc_lu_init.patch |
121 | + - d/p/GCC-FTBFS-3-smc-fix-snprintf-warnings-with-gcc7.patch |
122 | + - Those patches are unchanged from upstream and make tgt effectively |
123 | + almost 1.0.72, so on that merge they can be dropped. |
124 | + |
125 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 19 Oct 2017 14:55:37 +0200 |
126 | + |
127 | +tgt (1:1.0.71-1ubuntu1) artful; urgency=medium |
128 | + |
129 | + * Merge with Debian unstable. Remaining changes: |
130 | + - Drop glusterfs support, package not in main. |
131 | + - debian/control: drop build depends and package |
132 | + - debian/rules: disable feature |
133 | + - debian/tests/{control, storage}: remove related tests |
134 | + - debian/tgt-glusterfs.install (Deleted) |
135 | + * Dropped changes (in Debian now): |
136 | + - fix tgt being killed when serving many targets (LP 1559088) |
137 | + - d/t/localtgt, d/t/control: add dep8 test that sets up targets and luns |
138 | + via iscsi using rdwr/aio backends and runs fio read/write/verify |
139 | + (LP 1640785) |
140 | + |
141 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Sun, 09 Jul 2017 14:48:45 +0200 |
142 | + |
143 | +>>>>>>> debian/changelog |
144 | tgt (1:1.0.71-1) unstable; urgency=medium |
145 | |
146 | [ Christian Ehrhardt ] |
147 | @@ -69,6 +180,23 @@ tgt (1:1.0.71-1) unstable; urgency=medium |
148 | |
149 | -- Apollon Oikonomopoulos <apoikos@debian.org> Tue, 04 Jul 2017 22:09:50 +0300 |
150 | |
151 | +<<<<<<< debian/changelog |
152 | +======= |
153 | +tgt (1:1.0.69-1ubuntu1) zesty; urgency=medium |
154 | + |
155 | + * Merge from Debian. Remaining changes: |
156 | + - Drop glusterfs support, package not in main. |
157 | + - debian/control |
158 | + - debian/rules |
159 | + - debian/tests/{control, storage} |
160 | + - debian/tgt-glusterfs.install (Deleted) |
161 | + - fix tgt being killed when serving many targets |
162 | + - d/t/localtgt, d/t/control: add dep8 test that sets up targets and luns via |
163 | + iscsi using rdwr/aio backends and runs fio read/write/verify |
164 | + |
165 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 25 Jan 2017 11:25:55 +0100 |
166 | + |
167 | +>>>>>>> debian/changelog |
168 | tgt (1:1.0.69-1) unstable; urgency=medium |
169 | |
170 | * New upstream release: |
171 | @@ -85,6 +213,31 @@ tgt (1:1.0.68-1) unstable; urgency=medium |
172 | |
173 | -- Apollon Oikonomopoulos <apoikos@debian.org> Tue, 01 Nov 2016 01:05:03 +0200 |
174 | |
175 | +<<<<<<< debian/changelog |
176 | +======= |
177 | +tgt (1:1.0.67-1ubuntu1) zesty; urgency=medium |
178 | + |
179 | + * Merge from Debian. Remaining changes: |
180 | + - Drop glusterfs support, package not in main. |
181 | + - debian/control |
182 | + - debian/rules |
183 | + - debian/tests/{control, storage} |
184 | + - debian/tgt-glusterfs.install (Deleted) |
185 | + * Drop changes: |
186 | + - debian/patches/util_strtoull_errno.patch by Stas Sergeev (now upstream) |
187 | + - Disable AIO backend support. This was done to reduce risk in a previous |
188 | + feature freeze; Now that we are before Zesty's feature freeze, we |
189 | + can introduce it this cycle. |
190 | + - changing file modes of debian/tests/{admin, daemon} (missing in |
191 | + changelog, not needed) |
192 | + * Add changes: |
193 | + - fix tgt being killed when serving many targets (LP: #1559088) |
194 | + - d/t/localtgt, d/t/control: add dep8 test that sets up targets and luns via |
195 | + iscsi using rdwr/aio backends and runs fio read/write/verify (LP: #1640785) |
196 | + |
197 | + -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 10 Nov 2016 10:35:15 +0100 |
198 | + |
199 | +>>>>>>> debian/changelog |
200 | tgt (1:1.0.67-1) unstable; urgency=medium |
201 | |
202 | * New upstream release: |
203 | @@ -128,6 +281,32 @@ tgt (1:1.0.64-1) unstable; urgency=medium |
204 | |
205 | -- Apollon Oikonomopoulos <apoikos@debian.org> Tue, 24 May 2016 12:04:40 +0300 |
206 | |
207 | +<<<<<<< debian/changelog |
208 | +======= |
209 | +tgt (1:1.0.63-1ubuntu2) yakkety; urgency=medium |
210 | + |
211 | + * debian/patches/util_strtoull_errno.patch by Stas Sergeev |
212 | + - Fix errno handling for number * parsing (LP: #1547060) |
213 | + |
214 | + -- Ryan Harper <ryan.harper@canonical.com> Thu, 21 Apr 2016 09:13:09 -0500 |
215 | + |
216 | +tgt (1:1.0.63-1ubuntu1) xenial; urgency=medium |
217 | + |
218 | + * Merge from Debian (LP: #1555700). Remaining changes: |
219 | + - Drop glusterfs support, package not in main. |
220 | + - debian/control |
221 | + - debian/rules |
222 | + - debian/tests/{admin, control, daemon, storage} |
223 | + - debian/tgt-glusterfs.install (Deleted) |
224 | + - Disable AIO backend support: untested new feature |
225 | + - debian/control |
226 | + - debian/tests/storage |
227 | + * Dropped changes |
228 | + - debian/patches/tgtd_dont_fail_on_eacces.patch: included in new release |
229 | + |
230 | + -- Ryan Harper <ryan.harper@canonical.com> Wed, 09 Mar 2016 16:51:44 -0600 |
231 | + |
232 | +>>>>>>> debian/changelog |
233 | tgt (1:1.0.63-1) unstable; urgency=medium |
234 | |
235 | * New upstream release: |
236 | @@ -144,6 +323,37 @@ tgt (1:1.0.62-2) unstable; urgency=medium |
237 | |
238 | -- Apollon Oikonomopoulos <apoikos@debian.org> Tue, 19 Jan 2016 11:22:35 +0200 |
239 | |
240 | +<<<<<<< debian/changelog |
241 | +======= |
242 | +tgt (1:1.0.62-1ubuntu2) xenial; urgency=medium |
243 | + |
244 | + * debian/patches/tgtd_dont_fail_on_eacces.patch |
245 | + tgtd: fix root-under-userns errors when attempting oom_score_adj |
246 | + (Closes: LP:#1518440) |
247 | + |
248 | + -- Ryan Harper <ryan.harper@canonical.com> Mon, 01 Feb 2016 02:18:57 -0600 |
249 | + |
250 | +tgt (1:1.0.62-1ubuntu1) xenial; urgency=low |
251 | + |
252 | + * Merge from Debian unstable (LP: #1524982, LP: #1518440). Remaining |
253 | + changes: |
254 | + - Drop glusterfs support, since it is not in main. |
255 | + * debian/upstart: |
256 | + - Dropped, we no longer use upstart (except on Touch, where tgt |
257 | + isn't used). Isn't worth a delta. |
258 | + * debian/watch: |
259 | + - Drop merge conflict markers accidentally left in. |
260 | + * debian/tests/*: |
261 | + - Drop delta with Debian here, they imported our tests and improved |
262 | + them a while back. |
263 | + * debian/tgt.service: |
264 | + - Drop delta here, Debian made the same change. |
265 | + * debian/bash-completion: |
266 | + - Dropped, Debian has the same thing, just as tgt.bash-completion. |
267 | + |
268 | + -- Michael Terry <mterry@ubuntu.com> Mon, 21 Dec 2015 14:20:23 -0500 |
269 | + |
270 | +>>>>>>> debian/changelog |
271 | tgt (1:1.0.62-1) unstable; urgency=medium |
272 | |
273 | * New upstream version. |
274 | @@ -193,6 +403,29 @@ tgt (1:1.0.58-1) unstable; urgency=medium |
275 | |
276 | -- Apollon Oikonomopoulos <apoikos@debian.org> Tue, 26 May 2015 12:35:44 +0300 |
277 | |
278 | +<<<<<<< debian/changelog |
279 | +======= |
280 | +tgt (1:1.0.57-1ubuntu2) wily; urgency=medium |
281 | + |
282 | + * debian/tgt.service: remove spaces between key, = and value for WantedBy, |
283 | + since it appears to confuse deb-systemd-helper. |
284 | + |
285 | + -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Mon, 06 Jul 2015 21:21:58 -0400 |
286 | + |
287 | +tgt (1:1.0.57-1ubuntu1) wily; urgency=low |
288 | + |
289 | + * Merge from Debian unstable. Remaining changes: |
290 | + - Drop glusterfs support, since it is not in main. |
291 | + - debian/patches/fix-config-regression.patch: Dropped no longer |
292 | + needed. |
293 | + - debian/patches/fix_delayed_management_request.patch: Dropped |
294 | + no longer needed. |
295 | + - debian/patches/fix_leak_of_task_in_scsi_flag.patch: Dropped |
296 | + no longer needed. |
297 | + |
298 | + -- Chuck Short <zulcss@ubuntu.com> Thu, 07 May 2015 09:29:12 -0400 |
299 | + |
300 | +>>>>>>> debian/changelog |
301 | tgt (1:1.0.57-1) unstable; urgency=medium |
302 | |
303 | * New upstream version: |
304 | @@ -318,6 +551,81 @@ tgt (1:1.0.46-1) unstable; urgency=medium |
305 | |
306 | -- Apollon Oikonomopoulos <apoikos@debian.org> Mon, 19 May 2014 15:41:46 +0300 |
307 | |
308 | +<<<<<<< debian/changelog |
309 | +======= |
310 | +tgt (1:1.0.43-0ubuntu4) trusty; urgency=medium |
311 | + |
312 | + * debian/patches/fix_delayed_management_request.patch: Adjust patch to fix |
313 | + a FTBFS. |
314 | + * debian/patches/fix_leak_of_task_in_scsi_flag.patch: Adjust patch to fix |
315 | + a FTBFS. |
316 | + |
317 | + -- Chuck Short <zulcss@ubuntu.com> Fri, 11 Apr 2014 09:14:03 -0400 |
318 | + |
319 | +tgt (1:1.0.43-0ubuntu3) trusty; urgency=medium |
320 | + |
321 | + * Fix tgt connection issues under heavy load (LP: #1305343) |
322 | + - debian/patches/fix_delayed_management_request.patch: Fix a crash |
323 | + of tgtd which occured when removing a target with the --force option |
324 | + (https://github.com/fujita/tgt/commit/e6e8d0fd3b83208278fb7ed765c3665ae7c5ab49) |
325 | + - debian/patches/fix_leak_of_task_in_scsi_flag.patch: Clear task_in_scsi flag |
326 | + when exiting iscsi_tm_execute() and iser_tm_exec() functions. |
327 | + (https://github.com/fujita/tgt/commit/05fc2cb424863fbf2f3c60a8b617308ef1e370c5) |
328 | + |
329 | + -- Chuck Short <zulcss@ubuntu.com> Wed, 09 Apr 2014 19:35:20 -0400 |
330 | + |
331 | +tgt (1:1.0.43-0ubuntu2) trusty; urgency=medium |
332 | + |
333 | + * d/p/fix-config-regression.patch: Cherry picked fix from upstream VCS |
334 | + to resolve regression on configuration of control port. |
335 | + |
336 | + -- James Page <james.page@ubuntu.com> Tue, 14 Jan 2014 15:11:35 +0000 |
337 | + |
338 | +tgt (1:1.0.43-0ubuntu1) trusty; urgency=medium |
339 | + |
340 | + * New upstream release. |
341 | + |
342 | + -- James Page <james.page@ubuntu.com> Tue, 14 Jan 2014 12:05:08 +0000 |
343 | + |
344 | +tgt (1:1.0.41-0ubuntu1) trusty; urgency=low |
345 | + |
346 | + * New upstream release: |
347 | + - debian/patches/fix-tgt-admin-bashism: Dropped, included upstream. |
348 | + * d/control,rules,bash-completion: Enable bash completion support |
349 | + for tgt commands. |
350 | + |
351 | + -- James Page <james.page@ubuntu.com> Mon, 11 Nov 2013 15:00:10 +0000 |
352 | + |
353 | +tgt (1:1.0.38-0ubuntu1) saucy; urgency=low |
354 | + |
355 | + * New upstream release: |
356 | + - d/p/include-rbd-docs.patch,example-config-use-conf-dot-dee: |
357 | + Dropped, included upstream. |
358 | + - Refreshed other patches. |
359 | + * d/watch: Really update to track github repository for releases. |
360 | + |
361 | + -- James Page <james.page@ubuntu.com> Tue, 06 Aug 2013 17:38:27 +0100 |
362 | + |
363 | +tgt (1:1.0.37-0ubuntu1) saucy; urgency=low |
364 | + |
365 | + * Merge from Debian unstable: |
366 | + - d/control: Drop depends on lsb-base; handled by debhelper. |
367 | + * d/watch: Updated to track github upstream repository. |
368 | + * New upstream release (LP: #1191180): |
369 | + - d/control: Add xsltproc and docbook-xsl to BD's. |
370 | + - d/p: Refreshed and tidied patches. |
371 | + * Enable support for Ceph RBD backend: |
372 | + - d/rules: Add CEPH_RBD=1 to options. |
373 | + - d/control: Add BD on librbd-dev. |
374 | + - d/p/include-rbd-docs.patch: Include README.rbd docs. |
375 | + * Switch to debhelper compat level 8: |
376 | + - d/rules: Rewrite to use debhelper overrides. |
377 | + - d/compat,control: Bump compat level and minimum version |
378 | + requirement for debhelper. |
379 | + |
380 | + -- James Page <james.page@ubuntu.com> Tue, 18 Jun 2013 13:08:34 +0100 |
381 | + |
382 | +>>>>>>> debian/changelog |
383 | tgt (1:1.0.17-1.1) unstable; urgency=low |
384 | |
385 | * Non-maintainer upload. |
386 | @@ -328,6 +636,39 @@ tgt (1:1.0.17-1.1) unstable; urgency=low |
387 | |
388 | -- Thomas Goirand <zigo@debian.org> Thu, 11 Apr 2013 23:25:08 +0800 |
389 | |
390 | +<<<<<<< debian/changelog |
391 | +======= |
392 | +tgt (1:1.0.17-1ubuntu4) saucy; urgency=low |
393 | + |
394 | + * d/tests: added dep-8-tests |
395 | + |
396 | + -- Yolanda <yolanda.robla@canonical.com> Tue, 21 May 2013 10:41:18 +0200 |
397 | + |
398 | +tgt (1:1.0.17-1ubuntu3) quantal; urgency=low |
399 | + |
400 | + * Rebuild for new armel compiler default of ARMv5t. |
401 | + |
402 | + -- Colin Watson <cjwatson@ubuntu.com> Mon, 08 Oct 2012 23:02:42 +0100 |
403 | + |
404 | +tgt (1:1.0.17-1ubuntu2) precise; urgency=low |
405 | + |
406 | + * change /etc/tgt/tgt.conf to support adding config.d format |
407 | + snippets in /etc/tgt/conf.d (LP: #978507) |
408 | + * start tgt on installation (LP: #977621) |
409 | + * stop tgt on shutdown (LP: #820699) |
410 | + |
411 | + -- Scott Moser <smoser@ubuntu.com> Tue, 10 Apr 2012 23:11:00 -0400 |
412 | + |
413 | +tgt (1:1.0.17-1ubuntu1) oneiric; urgency=low |
414 | + |
415 | + * Merge from debian remaining changes: |
416 | + - debian/usptart: Add upstart job. |
417 | + - Dropped: |
418 | + - debian/patches/CVE-2011-0001.patch: No longer needed, use debian instead. |
419 | + |
420 | + -- Chuck Short <zulcss@ubuntu.com> Mon, 08 Aug 2011 04:45:03 -0400 |
421 | + |
422 | +>>>>>>> debian/changelog |
423 | tgt (1:1.0.17-1) unstable; urgency=low |
424 | |
425 | * New upstream release. |
426 | @@ -340,12 +681,76 @@ tgt (1:1.0.4-3) unstable; urgency=high |
427 | |
428 | -- Ben Hutchings <ben@decadent.org.uk> Mon, 21 Mar 2011 03:32:59 +0000 |
429 | |
430 | +<<<<<<< debian/changelog |
431 | +======= |
432 | +tgt (1:1.0.13-0ubuntu3) oneiric; urgency=low |
433 | + |
434 | + * SECURITY UPDATE: denial of service and possible code execution via |
435 | + double free in iscsi_rx_handler function |
436 | + - debian/patches/CVE-2011-0001.patch: make sure the received data isn't |
437 | + larger than INCOMING_BUFSIZE in usr/iscsi/iscsid.c. |
438 | + - CVE-2011-0001 |
439 | + |
440 | + -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Tue, 21 Jun 2011 09:01:03 -0400 |
441 | + |
442 | +tgt (1:1.0.13-0ubuntu2) natty; urgency=low |
443 | + |
444 | + * debian/upstart: Add respawn to upstart job. (LP: #715686) |
445 | + |
446 | + -- Chuck Short <zulcss@ubuntu.com> Mon, 14 Feb 2011 10:31:26 -0500 |
447 | + |
448 | +tgt (1:1.0.13-0ubuntu1) natty; urgency=low |
449 | + |
450 | + * New upstream release. |
451 | + * debian/patches/make-tgt-setup-lun-executable: Dropped no longer needed. |
452 | + |
453 | + -- Chuck Short <zulcss@ubuntu.com> Tue, 08 Feb 2011 10:31:04 -0500 |
454 | + |
455 | +tgt (1:1.0.4-2ubuntu1) natty; urgency=low |
456 | + |
457 | + * Merge from debian unstable. Remaining changes: |
458 | + - debian/upstart: Add upstart job. |
459 | + - Dropped: |
460 | + + debian/patches/scripts-tgt-admin: Use debian's instead. |
461 | + |
462 | + -- Chuck Short <zulcss@ubuntu.com> Fri, 10 Sep 2010 16:19:59 +0100 |
463 | + |
464 | +>>>>>>> debian/changelog |
465 | tgt (1:1.0.4-2) unstable; urgency=low |
466 | |
467 | * Fix bashism in tgt-admin, thanks to Chris Cheney (Closes: #589716) |
468 | |
469 | -- Ben Hutchings <ben@decadent.org.uk> Sun, 05 Sep 2010 22:13:52 +0100 |
470 | |
471 | +<<<<<<< debian/changelog |
472 | +======= |
473 | +tgt (1:1.0.4-1ubuntu4) maverick; urgency=low |
474 | + |
475 | + * debian/upstart: Corrected typo with post-start command; Resolving |
476 | + "unknown job" error. (LP: #574554) |
477 | + |
478 | + -- Dave Walker (Daviey) <DaveWalker@ubuntu.com> Mon, 09 Aug 2010 23:49:42 +0100 |
479 | + |
480 | +tgt (1:1.0.4-1ubuntu3) maverick; urgency=low |
481 | + |
482 | + * tgtd target will not start unless it's configured with "allow-in-use yes" |
483 | + (LP: 605721) |
484 | + |
485 | + -- Chris Cheney <ccheney@ubuntu.com> Tue, 20 Jul 2010 04:29:56 -0500 |
486 | + |
487 | +tgt (1:1.0.4-1ubuntu2) maverick; urgency=low |
488 | + |
489 | + * debian/usptart: Add post-start exec to upstart script. (LP: #574554) |
490 | + |
491 | + -- Chuck Short <zulcss@ubuntu.com> Fri, 16 Jul 2010 10:47:33 -0400 |
492 | + |
493 | +tgt (1:1.0.4-1ubuntu1) maverick; urgency=low |
494 | + |
495 | + * debian/rules, debian/tgt.tgtd.upstart: Add upstart script. (LP: #574554) |
496 | + |
497 | + -- Chuck Short <zulcss@ubuntu.com> Thu, 17 Jun 2010 10:22:39 -0400 |
498 | + |
499 | +>>>>>>> debian/changelog |
500 | tgt (1:1.0.4-1) unstable; urgency=low |
501 | |
502 | * New upstream release. |
503 | diff --git a/debian/control b/debian/control |
504 | index d56bd26..74a1aa9 100644 |
505 | --- a/debian/control |
506 | +++ b/debian/control |
507 | @@ -1,6 +1,7 @@ |
508 | Source: tgt |
509 | Section: net |
510 | Priority: optional |
511 | +<<<<<<< debian/control |
512 | Maintainer: Apollon Oikonomopoulos <apoikos@debian.org> |
513 | Build-Depends: debhelper (>= 12~), libibverbs-dev, librdmacm-dev (>= 1.0.16), |
514 | xsltproc, docbook-xsl, librbd-dev, libglusterfs-dev, uuid-dev, |
515 | @@ -8,13 +9,27 @@ Build-Depends: debhelper (>= 12~), libibverbs-dev, librdmacm-dev (>= 1.0.16), |
516 | Vcs-Git: https://salsa.debian.org/debian/tgt.git |
517 | Vcs-Browser: https://salsa.debian.org/debian/tgt |
518 | Standards-Version: 4.4.0 |
519 | +======= |
520 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
521 | +XSBC-Original-Maintainer: Apollon Oikonomopoulos <apoikos@debian.org> |
522 | +Build-Depends: debhelper-compat (= 13), libibverbs-dev, librdmacm-dev (>= 1.0.16), |
523 | + xsltproc, docbook-xsl, librbd-dev, uuid-dev, |
524 | + bash-completion, libsystemd-dev, libaio-dev, pkg-config |
525 | +Vcs-Git: https://salsa.debian.org/debian/tgt.git |
526 | +Vcs-Browser: https://salsa.debian.org/debian/tgt |
527 | +Standards-Version: 4.5.0 |
528 | +>>>>>>> debian/control |
529 | Homepage: http://stgt.sourceforge.net/ |
530 | |
531 | Package: tgt |
532 | Architecture: linux-any |
533 | Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, libconfig-general-perl, sg3-utils |
534 | Pre-Depends: ${misc:Pre-Depends} |
535 | +<<<<<<< debian/control |
536 | Suggests: tgt-glusterfs, tgt-rbd |
537 | +======= |
538 | +Suggests: tgt-rbd |
539 | +>>>>>>> debian/control |
540 | Description: Linux SCSI target user-space daemon and tools |
541 | The Linux target framework (tgt) allows a Linux system to provide SCSI |
542 | devices (targets) over networked SCSI transports. |
543 | @@ -56,6 +71,7 @@ Description: Linux SCSI target user-space daemon and tools - RBD support |
544 | . |
545 | This package enables tgt to use Ceph/RADOS block devices (RBD) as backing |
546 | store for SCSI Logical Units. |
547 | +<<<<<<< debian/control |
548 | |
549 | Package: tgt-glusterfs |
550 | Architecture: linux-any |
551 | @@ -79,3 +95,5 @@ Description: Linux SCSI target user-space daemon and tools - GlusterFS support |
552 | . |
553 | This package enables tgt to use GlusterFS volumes as backing store for SCSI |
554 | Logical Units. |
555 | +======= |
556 | +>>>>>>> debian/control |
557 | diff --git a/debian/copyright b/debian/copyright |
558 | index 8f350de..0a94fd7 100644 |
559 | --- a/debian/copyright |
560 | +++ b/debian/copyright |
561 | @@ -10,7 +10,11 @@ License: GPL-2 |
562 | Files: debian/* |
563 | Copyright: Copyright © 2007-2011 Frederik Schüler <fs@debian.org> |
564 | Copyright © 2007-2011 Ben Hutchings <ben@decadent.org.uk> |
565 | +<<<<<<< debian/copyright |
566 | Copyright © 2014-2018 Apollon Oikonomopoulos <apoikos@debian.org> |
567 | +======= |
568 | + Copyright © 2014-2020 Apollon Oikonomopoulos <apoikos@debian.org> |
569 | +>>>>>>> debian/copyright |
570 | License: GPL-2+ |
571 | |
572 | Files: usr/bs_aio.c usr/work.c |
573 | diff --git a/debian/patches/0008-Fix-build-with-gcc-10.patch b/debian/patches/0008-Fix-build-with-gcc-10.patch |
574 | new file mode 100644 |
575 | index 0000000..5a43776 |
576 | --- /dev/null |
577 | +++ b/debian/patches/0008-Fix-build-with-gcc-10.patch |
578 | @@ -0,0 +1,46 @@ |
579 | +From: Apollon Oikonomopoulos <apoikos@debian.org> |
580 | +Date: Thu, 17 Sep 2020 12:12:56 +0300 |
581 | +Subject: Fix build with gcc-10 |
582 | + |
583 | +iscsi_add_portal sometimes passes a NULL pointer as a %s argument to |
584 | +printf. This is considered an error by -Werror=format-overflow and GCC-10 has |
585 | +become much smarter in detecting these cases: |
586 | + |
587 | + In file included from iscsi/iscsid.h:29, |
588 | + from iscsi/iscsi_tcp.c:35: |
589 | + In function 'iscsi_add_portal', |
590 | + inlined from 'iscsi_add_portal' at iscsi/iscsi_tcp.c:408:5, |
591 | + inlined from 'iscsi_tcp_init' at iscsi/iscsi_tcp.c:449:3: |
592 | + ./log.h:90:2: error: '%s' directive argument is null [-Werror=format-overflow=] |
593 | + 90 | log_error("%s(%d) " fmt, __FUNCTION__, __LINE__, ##args); \ |
594 | + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
595 | + iscsi/iscsi_tcp.c:411:3: note: in expansion of macro 'eprintf' |
596 | + 411 | eprintf("failed to create/bind to portal %s:%d\n", addr, port); |
597 | + | ^~~~~~~ |
598 | + |
599 | +Fix this by passing the empty string to eprintf() if addr is NULL. |
600 | + |
601 | +Closes: #957874 |
602 | +--- |
603 | + usr/iscsi/iscsi_tcp.c | 7 ++++++- |
604 | + 1 file changed, 6 insertions(+), 1 deletion(-) |
605 | + |
606 | +diff --git a/usr/iscsi/iscsi_tcp.c b/usr/iscsi/iscsi_tcp.c |
607 | +index 2bb8356..cb4e23c 100644 |
608 | +--- a/usr/iscsi/iscsi_tcp.c |
609 | ++++ b/usr/iscsi/iscsi_tcp.c |
610 | +@@ -407,8 +407,13 @@ int iscsi_tcp_init_portal(char *addr, int port, int tpgt) |
611 | + |
612 | + int iscsi_add_portal(char *addr, int port, int tpgt) |
613 | + { |
614 | ++ const char *addr_str = ""; |
615 | ++ |
616 | + if (iscsi_tcp_init_portal(addr, port, tpgt)) { |
617 | +- eprintf("failed to create/bind to portal %s:%d\n", addr, port); |
618 | ++ if (addr) { |
619 | ++ addr_str = addr; |
620 | ++ } |
621 | ++ eprintf("failed to create/bind to portal %s:%d\n", addr_str, port); |
622 | + return -1; |
623 | + } |
624 | + |
625 | diff --git a/debian/patches/0009-Replace-__packed-with-__attribute__.patch b/debian/patches/0009-Replace-__packed-with-__attribute__.patch |
626 | new file mode 100644 |
627 | index 0000000..caf839c |
628 | --- /dev/null |
629 | +++ b/debian/patches/0009-Replace-__packed-with-__attribute__.patch |
630 | @@ -0,0 +1,39 @@ |
631 | +From: Apollon Oikonomopoulos <apoikos@debian.org> |
632 | +Date: Thu, 17 Sep 2020 12:45:19 +0300 |
633 | +Subject: Replace __packed with __attribute__(...) |
634 | + |
635 | +GCC 10 changed the default from -fcommon to -fno-common. This makes the |
636 | +tgt build fail because of multiple definitions of __packed. Change all |
637 | +instances of __packed to __attribute__((__packed__)), which is the |
638 | +canonical attribute form. |
639 | +--- |
640 | + usr/iscsi/iscsid.c | 2 +- |
641 | + usr/iscsi/iser.c | 2 +- |
642 | + 2 files changed, 2 insertions(+), 2 deletions(-) |
643 | + |
644 | +diff --git a/usr/iscsi/iscsid.c b/usr/iscsi/iscsid.c |
645 | +index a54a46e..476a760 100644 |
646 | +--- a/usr/iscsi/iscsid.c |
647 | ++++ b/usr/iscsi/iscsid.c |
648 | +@@ -1074,7 +1074,7 @@ void iscsi_rsp_set_residual(struct iscsi_cmd_rsp *rsp, struct scsi_cmd *scmd) |
649 | + struct iscsi_sense_data { |
650 | + uint16_t length; |
651 | + uint8_t data[0]; |
652 | +-} __packed; |
653 | ++} __attribute__((__packed__)); |
654 | + |
655 | + static int iscsi_cmd_rsp_build(struct iscsi_task *task) |
656 | + { |
657 | +diff --git a/usr/iscsi/iser.c b/usr/iscsi/iser.c |
658 | +index c7c43b2..2abb872 100644 |
659 | +--- a/usr/iscsi/iser.c |
660 | ++++ b/usr/iscsi/iser.c |
661 | +@@ -92,7 +92,7 @@ char *iser_portal_addr; |
662 | + struct iscsi_sense_data { |
663 | + uint16_t length; |
664 | + uint8_t data[0]; |
665 | +-} __packed; |
666 | ++} __attribute__((__packed__)); |
667 | + |
668 | + static size_t buf_pool_sz_mb = DEFAULT_POOL_SIZE_MB; |
669 | + static int cq_vector = -1; |
670 | diff --git a/debian/patches/series b/debian/patches/series |
671 | index d533c5e..484b9cc 100644 |
672 | --- a/debian/patches/series |
673 | +++ b/debian/patches/series |
674 | @@ -5,3 +5,8 @@ |
675 | 0005-fix-aio-detection.patch |
676 | 0006-fix-pie-build |
677 | 0007-Fix-compilation-with-glusterfs-6.patch |
678 | +<<<<<<< debian/patches/series |
679 | +======= |
680 | +0008-Fix-build-with-gcc-10.patch |
681 | +0009-Replace-__packed-with-__attribute__.patch |
682 | +>>>>>>> debian/patches/series |
683 | diff --git a/debian/rules b/debian/rules |
684 | index 15484a4..8996676 100755 |
685 | --- a/debian/rules |
686 | +++ b/debian/rules |
687 | @@ -1,9 +1,18 @@ |
688 | #!/usr/bin/make -f |
689 | #export DH_VERBOSE=1 |
690 | |
691 | +<<<<<<< debian/rules |
692 | FEATURES = ISCSI_RDMA=1 CEPH_RBD=1 GLFS_BD=1 SD_NOTIFY=1 |
693 | |
694 | export DEB_BUILD_MAINT_OPTIONS = hardening=+all |
695 | +======= |
696 | +FEATURES = ISCSI_RDMA=1 CEPH_RBD=1 SD_NOTIFY=1 |
697 | + |
698 | +export DEB_BUILD_MAINT_OPTIONS = hardening=+all |
699 | +# avoid FTFBS due to glibc 2.32 triggering more gcc-10 errors |
700 | +# in the usage of its functions by tgt |
701 | +export DEB_CFLAGS_MAINT_APPEND = -Wno-maybe-uninitialized -Wno-stringop-truncation |
702 | +>>>>>>> debian/rules |
703 | |
704 | %: |
705 | dh $@ --with bash-completion |
706 | diff --git a/debian/tests/control b/debian/tests/control |
707 | index 1e1d3c7..98ea7a5 100644 |
708 | --- a/debian/tests/control |
709 | +++ b/debian/tests/control |
710 | @@ -2,7 +2,11 @@ Tests: daemon admin |
711 | Depends: tgt |
712 | |
713 | Tests: storage |
714 | +<<<<<<< debian/tests/control |
715 | Depends: tgt, tgt-rbd, tgt-glusterfs |
716 | +======= |
717 | +Depends: tgt, tgt-rbd |
718 | +>>>>>>> debian/tests/control |
719 | Restrictions: needs-root isolation-container allow-stderr |
720 | |
721 | Tests: localtgt |
722 | diff --git a/debian/tests/storage b/debian/tests/storage |
723 | index 2c24b7a..52f17ed 100755 |
724 | --- a/debian/tests/storage |
725 | +++ b/debian/tests/storage |
726 | @@ -13,7 +13,11 @@ supported_bs=$(tgtadm --mode sys --op show | \ |
727 | }') |
728 | ret=0 |
729 | |
730 | +<<<<<<< debian/tests/storage |
731 | for bs in glfs rbd aio; do |
732 | +======= |
733 | +for bs in rbd aio; do |
734 | +>>>>>>> debian/tests/storage |
735 | if echo "$supported_bs" | grep -q "\b$bs\b"; then |
736 | echo "OK - $bs supported" |
737 | else |
commit 413a540caf9e2f6 2e0974f649a3de0 dbcf76c4e7 1%1.0.79- 3, pkg/debian/sid)
has (tag: pkg/import/
But https:/ /code.launchpad .net/~usd- import- team/ubuntu/ +source/ tgt/+git/ tgt/+ref/ debian/ sid misses that.
Therefore the LP diff is odd, but the actual change is a no-change-rebase that fixes an FTBFS with gcc-10.
PPA: https:/ /launchpad. net/~ci- train-ppa- service/ +archive/ ubuntu/ 4287/+packages
There is actually a s390x FTFBS left that Debian has not fixed yet, I'll look into that after lunch.