Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/udftools/, sys-fs/udftools/files/
Date: Tue, 02 Jan 2018 14:43:42
Message-Id: 1514904209.b20208c774651e06b36cd9619b5869aef13505b9.polynomial-c@gentoo
1 commit: b20208c774651e06b36cd9619b5869aef13505b9
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 2 14:43:03 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 2 14:43:29 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b20208c7
7
8 sys-fs/udftools: Removed old.
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 sys-fs/udftools/Manifest | 3 -
13 .../udftools/files/cdrwtool-linux2.6-fix-v2.patch | 22 ---
14 .../udftools/files/udftools-1.0.0b-bigendian.patch | 28 ----
15 sys-fs/udftools/files/udftools-1.0.0b-gcc4.patch | 15 --
16 .../udftools/files/udftools-1.0.0b-limits_h.patch | 23 ---
17 .../udftools/files/udftools-1.0.0b-openflags.patch | 15 --
18 .../udftools/files/udftools-1.0.0b3-extsize.patch | 44 ------
19 .../udftools-1.0.0b3-man-missing-options.patch | 57 -------
20 .../files/udftools-1.0.0b3-mkudffs-bigendian.patch | 115 ---------------
21 .../files/udftools-1.0.0b3-staticanal.patch | 164 ---------------------
22 .../files/udftools-1.0.0b3-warningfixes.patch | 94 ------------
23 .../files/udftools-1.0.0b3-warningfixes2.patch | 160 --------------------
24 .../files/udftools-1.0.0b3-wrudf_help.patch | 52 -------
25 sys-fs/udftools/udftools-1.0.0b-r10.ebuild | 48 ------
26 sys-fs/udftools/udftools-1.0.0b-r9.ebuild | 42 ------
27 sys-fs/udftools/udftools-1.2.ebuild | 24 ---
28 16 files changed, 906 deletions(-)
29
30 diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
31 index 98d397193bb..c83a663c239 100644
32 --- a/sys-fs/udftools/Manifest
33 +++ b/sys-fs/udftools/Manifest
34 @@ -1,6 +1,3 @@
35 -DIST udftools-1.0.0b3.patch.bz2 3372 BLAKE2B 8e919e381e18700943beb89401f36de9199e2274f2e231f36e84a93c9f84043fe9a8013adc189af9d80d9ad88aa9e99e1c232c4c03365f6b58dc2048f47de8b6 SHA512 2b30741ffb7bab0139f6a3fb55911517c7f0489b76bc3453c3e0c519356689a8a9ad9c2b7e954267e8e14a6840498cd3c93641c5eb69f373f7bb19d35ffe9f19
36 -DIST udftools-1.0.0b3.tar.gz 293257 BLAKE2B c4bb1433d5ecd7dd382aad06cb192d2fbef2438b45eadf095f7cade2d94c3ee8eabb09a2c1efd20a9d899523af23a0da3c223fa7f70fd600fc8967fa799d7715 SHA512 4b45ff2e389ce93c3ac372f74daa3e2a43e02434c1e3d9df8cf050e137799491ac88d7aedd2b61c6d79a7ab8878042689c948c0b2aeb4be0a172c64844f07068
37 DIST udftools-1.1.tar.gz 656865 BLAKE2B 6e76251368c121ab07e02071bfddde5c4f4523cc858a7ffcc86063b48adbc03233fab18a3ff50b840fc603e7f48f386e15b4ca556046116d4b42f43c06927dc5 SHA512 9c415d1cae1d79d49b4f9e3e6881f0b44b31d59f6d722571badd78ee68c422899ee8b95caed0ac50e76c13d8ed118f58f79efe5cbf775438a163d68160a30742
38 -DIST udftools-1.2.tar.gz 657310 BLAKE2B 269cb4a45f5eb61f780c81821fc0942c23650bda221f031199bde2b08c221d08f57559742d03c5d0217cb6a4f1cb0273ee969352d48fc34431f00ddfff608584 SHA512 b36e08b7adc0246f2a8024f6ee95117f5cba03566103a501acd1fb1ab31152da6345584ad36156a94ce5a29818e38333d81e3307ba73cef08355c300b79af199
39 DIST udftools-1.3.tar.gz 447063 BLAKE2B ff23f23dd5b9753d9e4cba6e326d302346233ed0a836ccf35372e61ca1d7a5c14ff8f1d1505f2f9fba779f4379adf472b64ce60aa4ca0d3e51679ea863db2f0f SHA512 d67f74640cc600fbdf3d7a67caee1342c15507357e155c5e1066aa6f6b3e2667483107edd663eaed5ebb690c13337598a75c1955e69cbc782bd481af783837e7
40 DIST udftools-2.0.tar.gz 541231 BLAKE2B 8e43f4b1ab0940d607987e972dc0244ad086e088441bf462e6ce75a668af62041b1c4d8bac5da6046d2943ace753498aeb721d9524b4442a84f1901fd92066e6 SHA512 178a20405de6cd48e5f58b0ed61565e2a463479cf6d40fd7d5895d7af768b814bf1d5849873740aa409eb8cb3e7cd480c07198f6b340c612a271241c737f76e5
41
42 diff --git a/sys-fs/udftools/files/cdrwtool-linux2.6-fix-v2.patch b/sys-fs/udftools/files/cdrwtool-linux2.6-fix-v2.patch
43 deleted file mode 100644
44 index 602c808a1b0..00000000000
45 --- a/sys-fs/udftools/files/cdrwtool-linux2.6-fix-v2.patch
46 +++ /dev/null
47 @@ -1,22 +0,0 @@
48 -Fix CD blanking for kernels 2.6.8 and newer
49 -(write access is required to perform blanking commands)
50 -
51 -The original version broke support on Linux 2.4, thanks to Ben Peddell for pointing
52 -this out to me, and for the updated patch.
53 -
54 - - Daniel Drake <dsd@g.o>
55 - - Ben Peddell <klightspeed@×××××××××××××××××××××.net>
56 -
57 ---- udftools-1.0.0b3/cdrwtool/main.c.orig 2004-12-30 22:53:52.000000000 +0000
58 -+++ udftools-1.0.0b3/cdrwtool/main.c 2004-12-30 22:54:36.000000000 +0000
59 -@@ -242,7 +242,9 @@ int main(int argc, char *argv[])
60 - udf_init_disc(&disc.udf_disc);
61 - strcpy(filename, CDROM_DEVICE);
62 - parse_args(argc, argv, &disc, filename);
63 -- if ((fd = open(filename, O_RDONLY | O_NONBLOCK)) < 0)
64 -+ if (((fd = open(filename, O_RDWR | O_NONBLOCK)) < 0) &&
65 -+ ((errno != EROFS) ||
66 -+ ((fd = open(filename, O_RDONLY | O_NONBLOCK)) < 0)))
67 - {
68 - perror("open cdrom device");
69 - return fd;
70
71 diff --git a/sys-fs/udftools/files/udftools-1.0.0b-bigendian.patch b/sys-fs/udftools/files/udftools-1.0.0b-bigendian.patch
72 deleted file mode 100644
73 index d49b2561e4e..00000000000
74 --- a/sys-fs/udftools/files/udftools-1.0.0b-bigendian.patch
75 +++ /dev/null
76 @@ -1,28 +0,0 @@
77 -http://bugs.gentoo.org/120245
78 -
79 -BE fix
80 -
81 -===================================================================
82 -RCS file: /cvsroot/linux-udf/udftools/mkudffs/mkudffs.c,v
83 -retrieving revision 1.3
84 -retrieving revision 1.4
85 -diff -u -r1.3 -r1.4
86 ---- linux-udf/udftools/mkudffs/mkudffs.c 2004/02/23 03:35:33 1.3
87 -+++ linux-udf/udftools/mkudffs/mkudffs.c 2004/03/02 02:09:39 1.4
88 -@@ -250,14 +250,14 @@
89 - if (size % offsets[PSPACE_SIZE])
90 - size -= (size % offsets[PSPACE_SIZE]);
91 - set_extent(disc, PSPACE, start, size);
92 -- for (i=0; i<disc->udf_lvd[0]->numPartitionMaps; i++)
93 -+ for (i=0; i<le32_to_cpu(disc->udf_lvd[0]->numPartitionMaps); i++)
94 - {
95 - if (i == 1)
96 - disc->udf_lvid->freeSpaceTable[i] = cpu_to_le32(0xFFFFFFFF);
97 - else
98 - disc->udf_lvid->freeSpaceTable[i] = cpu_to_le32(size);
99 - }
100 -- for (j=0; j<disc->udf_lvd[0]->numPartitionMaps; j++)
101 -+ for (j=0; j<le32_to_cpu(disc->udf_lvd[0]->numPartitionMaps); j++)
102 - {
103 - if (j == 1)
104 - disc->udf_lvid->sizeTable[i+j] = cpu_to_le32(0xFFFFFFFF);
105
106 diff --git a/sys-fs/udftools/files/udftools-1.0.0b-gcc4.patch b/sys-fs/udftools/files/udftools-1.0.0b-gcc4.patch
107 deleted file mode 100644
108 index 3b58f20f017..00000000000
109 --- a/sys-fs/udftools/files/udftools-1.0.0b-gcc4.patch
110 +++ /dev/null
111 @@ -1,15 +0,0 @@
112 -http://bugs.gentoo.org/112122
113 -
114 -gcc4 compat
115 -
116 ---- a/wrudf/wrudf.c
117 -+++ b/wrudf/wrudf.c
118 -@@ -245,7 +245,7 @@
119 - } else if( strncmp( spm->partIdent.ident, UDF_ID_VIRTUAL, strlen(UDF_ID_VIRTUAL)) == 0 )
120 - virtualPartitionNum = i;
121 - }
122 -- (char*)spm += spm->partitionMapLength;
123 -+ spm = (char*)spm + spm->partitionMapLength;
124 - }
125 -
126 - if( medium == CDR ) {
127
128 diff --git a/sys-fs/udftools/files/udftools-1.0.0b-limits_h.patch b/sys-fs/udftools/files/udftools-1.0.0b-limits_h.patch
129 deleted file mode 100644
130 index 74dddf9e012..00000000000
131 --- a/sys-fs/udftools/files/udftools-1.0.0b-limits_h.patch
132 +++ /dev/null
133 @@ -1,23 +0,0 @@
134 -http://bugs.gentoo.org/335511
135 -
136 ---- cdrwtool/cdrwtool.c
137 -+++ cdrwtool/cdrwtool.c
138 -@@ -31,6 +31,7 @@
139 - #include <sys/ioctl.h>
140 - #include <asm/param.h>
141 -
142 -+#include <limits.h> /* INT_MAX */
143 - #include <linux/cdrom.h>
144 -
145 - #include "cdrwtool.h"
146 ---- pktsetup/pktsetup.c
147 -+++ pktsetup/pktsetup.c
148 -@@ -26,6 +26,8 @@
149 - #include <bits/types.h>
150 - #include <sys/types.h>
151 -
152 -+#include <limits.h> /* INT_MAX */
153 -+#include <stdlib.h> /* system */
154 - #include <linux/cdrom.h>
155 -
156 - /*
157
158 diff --git a/sys-fs/udftools/files/udftools-1.0.0b-openflags.patch b/sys-fs/udftools/files/udftools-1.0.0b-openflags.patch
159 deleted file mode 100644
160 index 88803e43d6f..00000000000
161 --- a/sys-fs/udftools/files/udftools-1.0.0b-openflags.patch
162 +++ /dev/null
163 @@ -1,15 +0,0 @@
164 -From: Magnus Granberg <zorry@×××.nu>
165 -https://bugs.gentoo.org/232100
166 -Remove nonsense O_CREAT flag
167 -
168 ---- pktsetup/pktsetup.c 2008-06-19 00:27:08.000000000 +0200
169 -+++ pktsetup/pktsetup.c 2008-06-19 00:20:31.000000000 +0200
170 -@@ -85,7 +85,7 @@
171 - {
172 - int pkt_fd, dev_fd, cmd;
173 -
174 -- if ((pkt_fd = open(pkt_device, O_RDONLY | O_CREAT)) == -1) {
175 -+ if ((pkt_fd = open(pkt_device, O_RDONLY)) == -1) {
176 - perror("open packet device");
177 - return;
178 - }
179
180 diff --git a/sys-fs/udftools/files/udftools-1.0.0b3-extsize.patch b/sys-fs/udftools/files/udftools-1.0.0b3-extsize.patch
181 deleted file mode 100644
182 index 8e7e0d13a7f..00000000000
183 --- a/sys-fs/udftools/files/udftools-1.0.0b3-extsize.patch
184 +++ /dev/null
185 @@ -1,44 +0,0 @@
186 -taken from Fedora, but with minor return type fixes: changed NULL to 0
187 -
188 -http://pkgs.fedoraproject.org/cgit/udftools.git/tree/udftools-1.0.0b3-extsize.patch?h=f22
189 -
190 -diff -up udftools-1.0.0b3/libudffs/extent.c.extsize udftools-1.0.0b3/libudffs/extent.c
191 ---- udftools-1.0.0b3/libudffs/extent.c.extsize 2012-01-26 09:45:22.217856499 +0100
192 -+++ udftools-1.0.0b3/libudffs/extent.c 2012-01-26 09:45:43.142855067 +0100
193 -@@ -50,7 +50,7 @@ cont:
194 - while (start_ext != NULL && start_ext->blocks < blocks)
195 - start_ext = next_extent(start_ext->next, type);
196 -
197 -- if (start_ext->start % offset)
198 -+ if (start_ext != NULL && start_ext->start % offset)
199 - {
200 - inc = offset - (start_ext->start % offset);
201 - if (start_ext->blocks - inc < blocks)
202 -@@ -62,7 +62,7 @@ cont:
203 - else
204 - inc = 0;
205 -
206 -- return start_ext->start + inc;
207 -+ return start_ext ? start_ext->start + inc : 0;
208 - }
209 -
210 - struct udf_extent *prev_extent(struct udf_extent *start_ext, enum udf_space_type type)
211 -@@ -81,7 +81,7 @@ cont:
212 - while (start_ext != NULL && start_ext->blocks < blocks)
213 - start_ext = prev_extent(start_ext->prev, type);
214 -
215 -- if ((start_ext->start + start_ext->blocks) % offset)
216 -+ if (start_ext != NULL && (start_ext->start + start_ext->blocks) % offset)
217 - {
218 - dec = (start_ext->start + start_ext->blocks) % offset;
219 - if (start_ext->blocks - dec < blocks)
220 -@@ -93,7 +93,7 @@ cont:
221 - else
222 - dec = 0;
223 -
224 -- return start_ext->start + start_ext->blocks - dec - blocks;
225 -+ return start_ext ? start_ext->start + start_ext->blocks - dec - blocks : 0;
226 - }
227 -
228 - struct udf_extent *find_extent(struct udf_disc *disc, uint32_t start)
229 -
230
231 diff --git a/sys-fs/udftools/files/udftools-1.0.0b3-man-missing-options.patch b/sys-fs/udftools/files/udftools-1.0.0b3-man-missing-options.patch
232 deleted file mode 100644
233 index afda3bd00d3..00000000000
234 --- a/sys-fs/udftools/files/udftools-1.0.0b3-man-missing-options.patch
235 +++ /dev/null
236 @@ -1,57 +0,0 @@
237 -taken from Fedora
238 -
239 -http://pkgs.fedoraproject.org/cgit/udftools.git/tree/udftools-1.0.0b3-man-missing-options.patch?h=f22
240 -
241 -diff -up wrk/doc/cdrwtool.1.wrk wrk/doc/cdrwtool.1
242 ---- wrk/doc/cdrwtool.1.wrk 2014-01-29 15:23:18.623940293 +0100
243 -+++ wrk/doc/cdrwtool.1 2014-01-29 15:24:27.027471222 +0100
244 -@@ -97,6 +97,10 @@ Close track.
245 - .IP "\fB\-r \fItrack\fP"
246 - Reserve track.
247 -
248 -+.IP "\fB\-z \fIlength\fP"
249 -+Fixed packet length.
250 -+
251 -+
252 - .IP \fB\-s\fP
253 - Set write parameters determined by
254 - .BR "\-l" , " \-w" ", and" " \-p"
255 -diff -up wrk/doc/mkudffs.8.wrk wrk/doc/mkudffs.8
256 ---- wrk/doc/mkudffs.8.wrk 2014-01-29 15:47:54.095408327 +0100
257 -+++ wrk/doc/mkudffs.8 2014-01-29 15:51:18.115200882 +0100
258 -@@ -151,6 +151,13 @@ Use 16-bit unicode for file names
259 - .TP
260 - .B \-\-utf8
261 - Use UTF-8 for file names
262 -+.TP
263 -+.B \-\-closed
264 -+.TP
265 -+.B \-\-bridge
266 -+.TP
267 -+.BI \-\-packetlen= " length "
268 -+
269 -
270 - .SH "EXIT STATUS"
271 - .B mkudffs
272 -diff -up wrk/doc/pktsetup.8.wrk wrk/doc/pktsetup.8
273 ---- wrk/doc/pktsetup.8.wrk 2002-11-26 08:18:51.000000000 +0100
274 -+++ wrk/doc/pktsetup.8 2014-01-29 15:36:29.509665177 +0100
275 -@@ -37,6 +37,9 @@ pktsetup \- set up and tear down packet
276 - .B pktsetup
277 - .B \-d
278 - .I packet_device
279 -+.br
280 -+.B pktsetup
281 -+.B \-s
282 - .ad b
283 - .SH DESCRIPTION
284 - .B Pktsetup
285 -@@ -58,6 +61,8 @@ returns 0 on success, nonzero on failure
286 - .IP "\fB\-d \fIpacket-device\fP"
287 - Delete the association between the specified \fIpacket-device\fP
288 - and its block device.
289 -+.IP "\fB\-s"
290 -+Show device mappings.
291 -
292 - .SH EXAMPLE
293 - The following commands provide an example of using the
294
295 diff --git a/sys-fs/udftools/files/udftools-1.0.0b3-mkudffs-bigendian.patch b/sys-fs/udftools/files/udftools-1.0.0b3-mkudffs-bigendian.patch
296 deleted file mode 100644
297 index 68c637cd89f..00000000000
298 --- a/sys-fs/udftools/files/udftools-1.0.0b3-mkudffs-bigendian.patch
299 +++ /dev/null
300 @@ -1,115 +0,0 @@
301 -taken from Fedora, but parts removed due to conflicts w/udftools-1.0.0b-bigendian.patch
302 -
303 -http://pkgs.fedoraproject.org/cgit/udftools.git/tree/udftools-1.0.0b3-mkudffs-bigendian.patch?h=f22
304 -
305 -diff -up udftools-1.0.0b3/mkudffs/defaults.c.mkudffs-bigendian udftools-1.0.0b3/mkudffs/defaults.c
306 ---- udftools-1.0.0b3/mkudffs/defaults.c.mkudffs-bigendian 2007-08-23 13:41:29.000000000 +0200
307 -+++ udftools-1.0.0b3/mkudffs/defaults.c 2007-08-23 13:42:16.000000000 +0200
308 -@@ -69,7 +69,7 @@ struct primaryVolDesc default_pvd =
309 - {
310 - tagIdent : constant_cpu_to_le16(TAG_IDENT_PVD),
311 - descVersion : constant_cpu_to_le16(3),
312 -- tagSerialNum : 1,
313 -+ tagSerialNum : constant_cpu_to_le16(1),
314 - descCRC : constant_cpu_to_le16(sizeof(struct primaryVolDesc) - sizeof(tag)),
315 - },
316 - volDescSeqNum : constant_cpu_to_le32(1),
317 -@@ -119,7 +119,7 @@ struct logicalVolDesc default_lvd =
318 - {
319 - tagIdent : constant_cpu_to_le16(TAG_IDENT_LVD),
320 - descVersion : constant_cpu_to_le16(3),
321 -- tagSerialNum : 1,
322 -+ tagSerialNum : constant_cpu_to_le16(1),
323 - descCRC : constant_cpu_to_le16(sizeof(struct logicalVolDesc) - sizeof(tag)),
324 - },
325 - volDescSeqNum : constant_cpu_to_le32(2),
326 -@@ -157,7 +157,7 @@ struct volDescPtr default_vdp =
327 - {
328 - tagIdent : constant_cpu_to_le16(TAG_IDENT_VDP),
329 - descVersion : constant_cpu_to_le16(3),
330 -- tagSerialNum : 1,
331 -+ tagSerialNum : constant_cpu_to_le16(1),
332 - descCRC : constant_cpu_to_le16(sizeof(struct volDescPtr) - sizeof(tag)),
333 - },
334 - volDescSeqNum : constant_cpu_to_le32(3),
335 -@@ -192,7 +192,7 @@ struct impUseVolDesc default_iuvd =
336 - {
337 - tagIdent : constant_cpu_to_le16(TAG_IDENT_IUVD),
338 - descVersion : constant_cpu_to_le16(3),
339 -- tagSerialNum : 1,
340 -+ tagSerialNum : constant_cpu_to_le16(1),
341 - descCRC : constant_cpu_to_le16(sizeof(struct impUseVolDesc) - sizeof(tag)),
342 - },
343 - volDescSeqNum : constant_cpu_to_le32(4),
344 -@@ -215,7 +215,7 @@ struct partitionDesc default_pd =
345 - {
346 - tagIdent : constant_cpu_to_le16(TAG_IDENT_PD),
347 - descVersion : constant_cpu_to_le16(3),
348 -- tagSerialNum : 1,
349 -+ tagSerialNum : constant_cpu_to_le16(1),
350 - descCRC : constant_cpu_to_le16(sizeof(struct partitionDesc) - sizeof(tag)),
351 - },
352 - volDescSeqNum : constant_cpu_to_le32(5),
353 -@@ -242,7 +242,7 @@ struct unallocSpaceDesc default_usd =
354 - {
355 - tagIdent : constant_cpu_to_le16(TAG_IDENT_USD),
356 - descVersion : constant_cpu_to_le16(3),
357 -- tagSerialNum : 1,
358 -+ tagSerialNum : constant_cpu_to_le16(1),
359 - descCRC : constant_cpu_to_le16(sizeof(struct unallocSpaceDesc) - sizeof(tag)),
360 - },
361 - volDescSeqNum : constant_cpu_to_le32(6),
362 -@@ -254,7 +254,7 @@ struct terminatingDesc default_td =
363 - {
364 - tagIdent : constant_cpu_to_le16(TAG_IDENT_TD),
365 - descVersion : constant_cpu_to_le16(3),
366 -- tagSerialNum : 1,
367 -+ tagSerialNum : constant_cpu_to_le16(1),
368 - descCRC : constant_cpu_to_le16(sizeof(struct terminatingDesc) - sizeof(tag)),
369 - },
370 - };
371 -@@ -265,7 +265,7 @@ struct logicalVolIntegrityDesc default_l
372 - {
373 - tagIdent : constant_cpu_to_le16(TAG_IDENT_LVID),
374 - descVersion : constant_cpu_to_le16(3),
375 -- tagSerialNum : 1,
376 -+ tagSerialNum : constant_cpu_to_le16(1),
377 - descCRC : constant_cpu_to_le16(sizeof(struct logicalVolIntegrityDesc) - sizeof(tag)),
378 - },
379 - integrityType : constant_cpu_to_le32(LVID_INTEGRITY_TYPE_CLOSE),
380 -@@ -295,7 +295,7 @@ struct sparingTable default_stable =
381 - {
382 - tagIdent : constant_cpu_to_le16(0),
383 - descVersion : constant_cpu_to_le16(3),
384 -- tagSerialNum : 1,
385 -+ tagSerialNum : constant_cpu_to_le16(1),
386 - descCRC : constant_cpu_to_le16(sizeof(struct sparingTable) - sizeof(tag)),
387 - },
388 - sparingIdent :
389 -@@ -387,7 +387,7 @@ struct fileSetDesc default_fsd =
390 - {
391 - tagIdent : constant_cpu_to_le16(TAG_IDENT_FSD),
392 - descVersion : constant_cpu_to_le16(3),
393 -- tagSerialNum : 1,
394 -+ tagSerialNum : constant_cpu_to_le16(1),
395 - descCRC : constant_cpu_to_le16(sizeof(struct fileSetDesc) - sizeof(tag)),
396 - },
397 - interchangeLvl : constant_cpu_to_le16(2),
398 -@@ -426,7 +426,7 @@ struct fileEntry default_fe =
399 - {
400 - tagIdent : constant_cpu_to_le16(TAG_IDENT_LVID),
401 - descVersion : constant_cpu_to_le16(3),
402 -- tagSerialNum : 1,
403 -+ tagSerialNum : constant_cpu_to_le16(1),
404 - descCRC : constant_cpu_to_le16(sizeof(struct primaryVolDesc) - sizeof(tag)),
405 - },
406 - icbTag :
407 -@@ -458,7 +458,7 @@ struct extendedFileEntry default_efe =
408 - {
409 - tagIdent : constant_cpu_to_le16(TAG_IDENT_LVID),
410 - descVersion : constant_cpu_to_le16(3),
411 -- tagSerialNum : 1,
412 -+ tagSerialNum : constant_cpu_to_le16(1),
413 - descCRC : constant_cpu_to_le16(sizeof(struct primaryVolDesc) - sizeof(tag)),
414 - },
415 - icbTag :
416
417 diff --git a/sys-fs/udftools/files/udftools-1.0.0b3-staticanal.patch b/sys-fs/udftools/files/udftools-1.0.0b3-staticanal.patch
418 deleted file mode 100644
419 index 9ff411b2452..00000000000
420 --- a/sys-fs/udftools/files/udftools-1.0.0b3-staticanal.patch
421 +++ /dev/null
422 @@ -1,164 +0,0 @@
423 -taken from Fedora
424 -
425 -http://pkgs.fedoraproject.org/cgit/udftools.git/tree/udftools-1.0.0b3-staticanal.patch?h=f22
426 -
427 -Error: CONSTANT_EXPRESSION_RESULT:
428 -/builddir/build/BUILD/udftools-1.0.0b3/cdrwtool/cdrwtool.c:626: result_independent_of_operands: (ret == ioctl(fd, 21289, 1)) < 0 is always false regardless of the values of its operands. This occurs as the logical operand of if.
429 -
430 -Possible buffer overflow of static allocated variable "device".
431 -
432 -diff -up udftools-1.0.0b3/cdrwtool/cdrwtool.c.staticanal udftools-1.0.0b3/cdrwtool/cdrwtool.c
433 ---- udftools-1.0.0b3/cdrwtool/cdrwtool.c.staticanal 2012-01-26 16:20:44.518234366 +0100
434 -+++ udftools-1.0.0b3/cdrwtool/cdrwtool.c 2012-01-26 16:20:44.537234366 +0100
435 -@@ -623,7 +623,7 @@ int cdrom_open_check(int fd)
436 - if ((ret = ioctl(fd, CDROM_CLEAR_OPTIONS, CDO_LOCK)) < 0)
437 - return ret;
438 -
439 -- if ((ret == ioctl(fd, CDROM_LOCKDOOR, 1)) < 0) {
440 -+ if ((ret = ioctl(fd, CDROM_LOCKDOOR, 1)) < 0) {
441 - fprintf(stderr, "CD-ROM appears to already be opened\n");
442 - return 1;
443 - }
444 -diff -up udftools-1.0.0b3/cdrwtool/options.c.staticanal udftools-1.0.0b3/cdrwtool/options.c
445 ---- udftools-1.0.0b3/cdrwtool/options.c.staticanal 2012-01-26 16:26:11.288212023 +0100
446 -+++ udftools-1.0.0b3/cdrwtool/options.c 2012-01-26 16:27:24.125207040 +0100
447 -@@ -135,7 +135,8 @@ void parse_args(int argc, char *argv[],
448 - }
449 - case 'd':
450 - {
451 -- strcpy(device, optarg);
452 -+ strncpy(device, optarg, NAME_MAX-1);
453 -+ device[NAME_MAX-1] = '\0';
454 - printf("using device %s\n", device);
455 - break;
456 - }
457 -
458 -
459 -==========================================================================
460 -Error: NEGATIVE_RETURNS:
461 -/builddir/build/BUILD/udftools-1.0.0b3/mkudffs/main.c:161: negative_return_fn: Function "open64(filename, 66, 432)" returns a negative number.
462 -/builddir/build/BUILD/udftools-1.0.0b3/mkudffs/main.c:161: var_assign: Assigning: signed variable "fd" = "open64".
463 -/builddir/build/BUILD/udftools-1.0.0b3/mkudffs/main.c:165: negative_returns: "fd" is passed to a parameter that cannot be negative.
464 -/builddir/build/BUILD/udftools-1.0.0b3/mkudffs/main.c:85: neg_sink_parm_call: Passing "fd" to "valid_offset", which cannot accept a negative.
465 -/builddir/build/BUILD/udftools-1.0.0b3/mkudffs/main.c:55: neg_sink_parm_call: Passing "fd" to "udf_lseek64", which cannot accept a negative.
466 -/builddir/build/BUILD/udftools-1.0.0b3/mkudffs/main.c:43: neg_sink_parm_call: Passing "fd" to "lseek64", which cannot accept a negative.
467 -
468 -diff -up udftools-1.0.0b3/mkudffs/main.c.staticanal udftools-1.0.0b3/mkudffs/main.c
469 ---- udftools-1.0.0b3/mkudffs/main.c.staticanal 2004-02-23 04:33:11.000000000 +0100
470 -+++ udftools-1.0.0b3/mkudffs/main.c 2012-01-26 16:29:17.605199282 +0100
471 -@@ -162,6 +162,10 @@ int main(int argc, char *argv[])
472 - #else
473 - fd = open(filename, O_RDWR | O_CREAT | O_LARGEFILE, 0660);
474 - #endif
475 -+ if (fd == NULL) {
476 -+ fprintf(stderr, "mkudffs: cannot open '%s' for writing\n", filename);
477 -+ exit(1);
478 -+ }
479 - disc.head->blocks = get_blocks(fd, disc.blocksize, disc.head->blocks);
480 - disc.write = write_func;
481 - disc.write_data = &fd;
482 -
483 -
484 -==========================================================================
485 -Error: BAD_SIZEOF:
486 -/builddir/build/BUILD/udftools-1.0.0b3/mkudffs/mkudffs.c:45: bad_sizeof: Taking the size of pointer parameter "disc" is suspicious.
487 -
488 -Possible buffer overflow of static allocated variable "device".
489 -
490 -diff -up udftools-1.0.0b3/mkudffs/mkudffs.c.staticanal udftools-1.0.0b3/mkudffs/mkudffs.c
491 ---- udftools-1.0.0b3/mkudffs/mkudffs.c.staticanal 2012-01-26 16:20:44.526234367 +0100
492 -+++ udftools-1.0.0b3/mkudffs/mkudffs.c 2012-01-26 16:20:44.539234366 +0100
493 -@@ -42,7 +42,7 @@ void udf_init_disc(struct udf_disc *disc
494 - struct tm *tm;
495 - int altzone;
496 -
497 -- memset(disc, 0x00, sizeof(disc));
498 -+ memset(disc, 0x00, sizeof(*disc));
499 -
500 - disc->blocksize = 2048;
501 - disc->blocksize_bits = 11;
502 -diff -up udftools-1.0.0b3/mkudffs/options.c.staticanal udftools-1.0.0b3/mkudffs/options.c
503 ---- udftools-1.0.0b3/mkudffs/options.c.staticanal 2012-01-26 16:24:14.082220036 +0100
504 -+++ udftools-1.0.0b3/mkudffs/options.c 2012-01-26 16:27:29.086206703 +0100
505 -@@ -320,7 +320,8 @@ void parse_args(int argc, char *argv[],
506 - }
507 - if (optind == argc)
508 - usage();
509 -- strcpy(device, argv[optind]);
510 -+ strncpy(device, argv[optind], NAME_MAX-1);
511 -+ device[NAME_MAX-1] = '\0';
512 - optind ++;
513 - if (optind < argc)
514 - disc->head->blocks = strtoul(argv[optind++], NULL, 0);
515 -
516 -
517 -==========================================================================
518 -Error: OVERRUN_STATIC:
519 -/builddir/build/BUILD/udftools-1.0.0b3/wrudf/wrudf-cdrw.c:378: overrun-local: Overrunning static array "spm->locSparingTable", with 4 elements, at position 4 with index variable "i".
520 -
521 -Error: NEGATIVE_RETURNS:
522 -/builddir/build/BUILD/udftools-1.0.0b3/wrudf/wrudf-cdrw.c:769: negative_return_fn: Function "open(filename, 2)" returns a negative number.
523 -/builddir/build/BUILD/udftools-1.0.0b3/wrudf/wrudf-cdrw.c:769: var_assign: Assigning: signed variable "device" = "open".
524 -/builddir/build/BUILD/udftools-1.0.0b3/wrudf/wrudf-cdrw.c:773: negative_returns: "device" is passed to a parameter that cannot be negative.
525 -
526 -diff -up udftools-1.0.0b3/wrudf/wrudf-cdrw.c.staticanal udftools-1.0.0b3/wrudf/wrudf-cdrw.c
527 ---- udftools-1.0.0b3/wrudf/wrudf-cdrw.c.staticanal 2012-01-26 16:20:44.529234367 +0100
528 -+++ udftools-1.0.0b3/wrudf/wrudf-cdrw.c 2012-01-26 16:35:29.729173836 +0100
529 -@@ -374,7 +374,7 @@ void updateSparingTable() {
530 - struct packetbuf *pb;
531 - struct sparablePartitionMap *spm = (struct sparablePartitionMap*)lvd->partitionMaps;
532 -
533 -- for( i = 0; i <= 4; i++ ) {
534 -+ for( i = 0; i < sizeof(spm->locSparingTable); i++ ) {
535 - pbn = spm->locSparingTable[i];
536 - if( pbn == 0 )
537 - return;
538 -@@ -682,6 +682,8 @@ readExtents(char* dest, int usesShort, v
539 - dest += 2048;
540 - if( len < 2048 )
541 - break;
542 -+ /* dead code, len couldn't be 0 at this point
543 -+ (break was called in this case) */
544 - if( len == 0 ) {
545 - if( usesShort ) {
546 - sh++;
547 -@@ -766,8 +768,10 @@ initIO(char *filename)
548 -
549 - if( S_ISREG(filestat.st_mode) ) { /* disk image of a UDF volume */
550 - devicetype = DISK_IMAGE;
551 -- if( !(device = open(filename, O_RDWR)) )
552 -+ if( !(device = open(filename, O_RDWR)) ) {
553 - fail("initIO: open %s failed\n", filename);
554 -+ return 0;
555 -+ }
556 -
557 - /* heuristically determine medium imitated on disk image based on VAT FileEntry in block 512 */
558 - rv = lseek(device, 2048 * 512, SEEK_SET);
559 -
560 -==========================================================================
561 -Error: CONSTANT_EXPRESSION_RESULT:
562 -/builddir/build/BUILD/udftools-1.0.0b3/wrudf/wrudf-cmnd.c:699: missing_parentheses: !(*fid)->fileCharacteristics & 2 is always 0 regardless of the values of its operands. This occurs as the logical operand of if. Did you intend to apply '&' to (*fid)->fileCharacteristics and 2? If so, parentheses would be required to force this interpretation.
563 -
564 -diff -up udftools-1.0.0b3/wrudf/wrudf-cmnd.c.staticanal udftools-1.0.0b3/wrudf/wrudf-cmnd.c
565 ---- udftools-1.0.0b3/wrudf/wrudf-cmnd.c.staticanal 2012-01-26 16:20:44.530234366 +0100
566 -+++ udftools-1.0.0b3/wrudf/wrudf-cmnd.c 2012-01-26 16:20:44.543234366 +0100
567 -@@ -696,7 +696,7 @@ analyzeDest(char* arg, struct fileIdentD
568 - *fid = findFileIdentDesc(curDir, comp);
569 - if( *fid == NULL )
570 - return DIR_INVALID;
571 -- if( ! (*fid)->fileCharacteristics & FID_FILE_CHAR_DIRECTORY )
572 -+ if( ! ((*fid)->fileCharacteristics & FID_FILE_CHAR_DIRECTORY ))
573 - return DIR_INVALID;
574 - if( (*fid)->fileCharacteristics & FID_FILE_CHAR_DELETED )
575 - return DIR_INVALID;
576 -diff -up udftools-1.0.0b3/wrudf/wrudf.c.staticanal udftools-1.0.0b3/wrudf/wrudf.c
577 ---- udftools-1.0.0b3/wrudf/wrudf.c.staticanal 2012-01-26 16:20:44.528234367 +0100
578 -+++ udftools-1.0.0b3/wrudf/wrudf.c 2012-01-26 16:20:44.545234365 +0100
579 -@@ -158,6 +158,7 @@ initialise(char *devicename)
580 -
581 - if( (p = readTaggedBlock(blkno, ABSOLUTE)) == NULL ) {
582 - if( !inMainSeq )
583 -+ /* dead code - the condition "inMainSeq" cannot be false */
584 - fail("Volume Descriptor Sequences read failure\n");
585 - blkno = extentRsrvVolDescSeq.extLocation;
586 - len = extentRsrvVolDescSeq.extLength;
587
588 diff --git a/sys-fs/udftools/files/udftools-1.0.0b3-warningfixes.patch b/sys-fs/udftools/files/udftools-1.0.0b3-warningfixes.patch
589 deleted file mode 100644
590 index 5b530c6041e..00000000000
591 --- a/sys-fs/udftools/files/udftools-1.0.0b3-warningfixes.patch
592 +++ /dev/null
593 @@ -1,94 +0,0 @@
594 -taken from Fedora
595 -
596 -http://pkgs.fedoraproject.org/cgit/udftools.git/tree/udftools-1.0.0b3-warningfixes.patch?h=f22
597 -
598 -diff -Naupr udftools-1.0.0b3.orig/cdrwtool/cdrwtool.h udftools-1.0.0b3/cdrwtool/cdrwtool.h
599 ---- udftools-1.0.0b3.orig/cdrwtool/cdrwtool.h 2002-11-26 08:18:50.000000000 +0100
600 -+++ udftools-1.0.0b3/cdrwtool/cdrwtool.h 2006-07-27 14:16:06.000000000 +0200
601 -@@ -226,6 +226,7 @@ int read_disc_info(int, disc_info_t *);
602 - int read_track_info(int, track_info_t *, int);
603 - int reserve_track(int, struct cdrw_disc *);
604 - int close_track(int, unsigned int);
605 -+int close_session(int, unsigned int);
606 - int read_buffer_cap(int, struct cdrw_disc *);
607 - int set_cd_speed(int, int);
608 - void cdrom_close(int);
609 -@@ -236,5 +237,6 @@ int print_disc_track_info(int);
610 - void make_write_page(write_params_t *, struct cdrw_disc *);
611 - void print_params(write_params_t *);
612 - void cdrw_init_disc(struct cdrw_disc *);
613 -+int udf_set_version(struct udf_disc *, int);
614 -
615 - #endif /* _CDRWTOOL_H */
616 -diff -Naupr udftools-1.0.0b3.orig/include/udf_endian.h udftools-1.0.0b3/include/udf_endian.h
617 ---- udftools-1.0.0b3.orig/include/udf_endian.h 2002-11-26 08:18:51.000000000 +0100
618 -+++ udftools-1.0.0b3/include/udf_endian.h 2006-07-27 14:09:30.000000000 +0200
619 -@@ -23,6 +23,8 @@
620 - #ifndef __UDF_ENDIAN_H
621 - #define __UDF_ENDIAN_H
622 -
623 -+#include <string.h>
624 -+
625 - #include "bswap.h"
626 -
627 - static inline lb_addr lelb_to_cpu(lb_addr in)
628 -diff -Naupr udftools-1.0.0b3.orig/libudffs/unicode.c udftools-1.0.0b3/libudffs/unicode.c
629 ---- udftools-1.0.0b3.orig/libudffs/unicode.c 2002-11-26 08:18:51.000000000 +0100
630 -+++ udftools-1.0.0b3/libudffs/unicode.c 2006-07-27 14:11:17.000000000 +0200
631 -@@ -169,8 +169,6 @@ error_out:
632 -
633 - int decode_string(struct udf_disc *disc, char *in, char *out, int inlen)
634 - {
635 -- int i;
636 --
637 - if (disc->flags & FLAG_UTF8)
638 - return decode_utf8(in, out, inlen);
639 - else if (disc->flags & (FLAG_UNICODE8 | FLAG_UNICODE16))
640 -diff -Naupr udftools-1.0.0b3.orig/pktsetup/pktsetup.c udftools-1.0.0b3/pktsetup/pktsetup.c
641 ---- udftools-1.0.0b3.orig/pktsetup/pktsetup.c 2002-11-26 08:18:51.000000000 +0100
642 -+++ udftools-1.0.0b3/pktsetup/pktsetup.c 2006-07-27 14:18:24.000000000 +0200
643 -@@ -23,6 +23,7 @@
644 - #include <getopt.h>
645 - #include <bits/types.h>
646 - #include <sys/types.h>
647 -+#include <string.h>
648 -
649 - #include <linux/cdrom.h>
650 -
651 -diff -Naupr udftools-1.0.0b3.orig/wrudf/Makefile.am udftools-1.0.0b3/wrudf/Makefile.am
652 ---- udftools-1.0.0b3.orig/wrudf/Makefile.am 2002-11-26 08:18:51.000000000 +0100
653 -+++ udftools-1.0.0b3/wrudf/Makefile.am 2006-07-27 14:21:24.000000000 +0200
654 -@@ -1,5 +1,5 @@
655 - bin_PROGRAMS = wrudf
656 - wrudf_LDADD = $(top_builddir)/libudffs/libudffs.la -lreadline -lncurses
657 --wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h
658 -+wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h ../include/libudffs.h
659 -
660 - AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DDEBUG
661 -diff -Naupr udftools-1.0.0b3.orig/wrudf/Makefile.in udftools-1.0.0b3/wrudf/Makefile.in
662 ---- udftools-1.0.0b3.orig/wrudf/Makefile.in 2004-02-23 10:33:48.000000000 +0100
663 -+++ udftools-1.0.0b3/wrudf/Makefile.in 2006-07-27 14:21:44.000000000 +0200
664 -@@ -85,7 +85,7 @@ am__quote = @am__quote@
665 - install_sh = @install_sh@
666 - bin_PROGRAMS = wrudf
667 - wrudf_LDADD = $(top_builddir)/libudffs/libudffs.la -lreadline -lncurses
668 --wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h
669 -+wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h ../include/libudffs.h
670 -
671 - AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DDEBUG
672 - subdir = wrudf
673 -diff -Naupr udftools-1.0.0b3.orig/wrudf/wrudf.h udftools-1.0.0b3/wrudf/wrudf.h
674 ---- udftools-1.0.0b3.orig/wrudf/wrudf.h 2002-11-26 08:18:51.000000000 +0100
675 -+++ udftools-1.0.0b3/wrudf/wrudf.h 2006-07-27 14:22:33.000000000 +0200
676 -@@ -23,9 +23,11 @@
677 - #include <sys/time.h>
678 - #include <time.h>
679 - #include <stdint.h>
680 -+#include <string.h>
681 -
682 - #include "ecma_167.h"
683 - #include "osta_udf.h"
684 -+#include "libudffs.h"
685 -
686 - struct generic_desc
687 - {
688
689 diff --git a/sys-fs/udftools/files/udftools-1.0.0b3-warningfixes2.patch b/sys-fs/udftools/files/udftools-1.0.0b3-warningfixes2.patch
690 deleted file mode 100644
691 index 1593eb600fa..00000000000
692 --- a/sys-fs/udftools/files/udftools-1.0.0b3-warningfixes2.patch
693 +++ /dev/null
694 @@ -1,160 +0,0 @@
695 -taken from Fedora
696 -
697 -http://pkgs.fedoraproject.org/cgit/udftools.git/tree/udftools-1.0.0b3-warningfixes2.patch?h=f22
698 -
699 -diff -ur udftools-1.0.0b3/libudffs/file.c udftools-1.0.0b3-new/libudffs/file.c
700 ---- udftools-1.0.0b3/libudffs/file.c 2002-11-26 08:18:51.000000000 +0100
701 -+++ udftools-1.0.0b3-new/libudffs/file.c 2007-08-23 14:02:07.000000000 +0200
702 -@@ -576,7 +576,7 @@
703 - tmp = leBPL_to_cpup(p);
704 - found_first:
705 - tmp |= (~0UL << size);
706 -- if (tmp == ~0UL) /* Are any bits zero? */
707 -+ if (tmp == (uintBPL)~0UL) /* Are any bits zero? */
708 - return result + size; /* Nope. */
709 - found_middle:
710 - return result + ffz(tmp);
711 -diff -ur udftools-1.0.0b3/mkudffs/mkudffs.c udftools-1.0.0b3-new/mkudffs/mkudffs.c
712 ---- udftools-1.0.0b3/mkudffs/mkudffs.c 2007-08-23 14:32:38.000000000 +0200
713 -+++ udftools-1.0.0b3-new/mkudffs/mkudffs.c 2007-08-23 14:14:42.000000000 +0200
714 -@@ -72,7 +72,7 @@
715 - disc->udf_pvd[0] = malloc(sizeof(struct primaryVolDesc));
716 - memcpy(disc->udf_pvd[0], &default_pvd, sizeof(struct primaryVolDesc));
717 - memcpy(&disc->udf_pvd[0]->recordingDateAndTime, &ts, sizeof(timestamp));
718 -- sprintf(&disc->udf_pvd[0]->volSetIdent[1], "%08lx%s",
719 -+ sprintf((char *)&disc->udf_pvd[0]->volSetIdent[1], "%08lx%s",
720 - mktime(tm), &disc->udf_pvd[0]->volSetIdent[9]);
721 - disc->udf_pvd[0]->volIdent[31] = strlen(disc->udf_pvd[0]->volIdent);
722 - disc->udf_pvd[0]->volSetIdent[127] = strlen(disc->udf_pvd[0]->volSetIdent);
723 -@@ -289,7 +289,7 @@
724 - int write_disc(struct udf_disc *disc)
725 - {
726 - struct udf_extent *start_ext;
727 -- int ret;
728 -+ int ret=0;
729 -
730 - start_ext = disc->head;
731 -
732 -@@ -299,6 +299,7 @@
733 - return ret;
734 - start_ext = start_ext->next;
735 - }
736 -+ return ret;
737 - }
738 -
739 - void setup_vrs(struct udf_disc *disc)
740 -@@ -450,7 +451,7 @@
741 - struct unallocSpaceEntry *use;
742 - short_ad *sad;
743 - int max = (0x3FFFFFFF / disc->blocksize) * disc->blocksize;
744 -- int pos;
745 -+ int pos=0;
746 - long long rem;
747 -
748 - if (disc->flags & FLAG_STRATEGY4096)
749 -diff -ur udftools-1.0.0b3/wrudf/ide-pc.c udftools-1.0.0b3-new/wrudf/ide-pc.c
750 ---- udftools-1.0.0b3/wrudf/ide-pc.c 2002-11-26 08:18:51.000000000 +0100
751 -+++ udftools-1.0.0b3-new/wrudf/ide-pc.c 2007-08-23 14:32:09.000000000 +0200
752 -@@ -31,6 +31,7 @@
753 - #include <sys/types.h> /* for u_char etc. */
754 - #include <linux/cdrom.h>
755 - #include <unistd.h> /* sleep() */
756 -+#include <stdlib.h>
757 -
758 - #include "bswap.h"
759 - #include "ide-pc.h"
760 -diff -ur udftools-1.0.0b3/wrudf/wrudf.c udftools-1.0.0b3-new/wrudf/wrudf.c
761 ---- udftools-1.0.0b3/wrudf/wrudf.c 2007-08-23 14:32:38.000000000 +0200
762 -+++ udftools-1.0.0b3-new/wrudf/wrudf.c 2007-08-23 14:26:41.000000000 +0200
763 -@@ -245,7 +245,7 @@
764 - } else if( strncmp( spm->partIdent.ident, UDF_ID_VIRTUAL, strlen(UDF_ID_VIRTUAL)) == 0 )
765 - virtualPartitionNum = i;
766 - }
767 -- spm = (char*)spm + spm->partitionMapLength;
768 -+ spm = (struct sparablePartitionMap*)((char*)spm + spm->partitionMapLength);
769 - }
770 -
771 - if( medium == CDR ) {
772 -@@ -300,7 +300,7 @@
773 - fail("SpaceBitmap not found\n");
774 - }
775 -
776 -- if (fsdLen = decode_utf8(fsd->fileSetIdent, fsdOut, fsd->fileSetIdent[31]))
777 -+ if ((fsdLen = decode_utf8(fsd->fileSetIdent, fsdOut, fsd->fileSetIdent[31]))>=0)
778 - fsdOut[fsdLen] = '\0';
779 -
780 - printf("You are going to update fileset '%s'\nProceed (y/N) : ", &fsdOut[1]);
781 -@@ -605,7 +605,7 @@
782 - int
783 - main(int argc, char** argv)
784 - {
785 -- int rv;
786 -+ int rv=0;
787 - int cmnd;
788 - char prompt[256];
789 - Directory *d;
790 -diff -ur udftools-1.0.0b3/wrudf/wrudf-cdrw.c udftools-1.0.0b3-new/wrudf/wrudf-cdrw.c
791 ---- udftools-1.0.0b3/wrudf/wrudf-cdrw.c 2002-11-26 08:18:51.000000000 +0100
792 -+++ udftools-1.0.0b3-new/wrudf/wrudf-cdrw.c 2007-08-23 14:30:14.000000000 +0200
793 -@@ -614,7 +614,6 @@
794 - readTaggedBlock(uint32_t lbn, uint16_t partition)
795 - {
796 - int i;
797 -- uint32_t blkno;
798 - uint8_t sum, *p;
799 - struct generic_desc *block;
800 -
801 -@@ -634,7 +633,7 @@
802 - if( strncmp(((struct sparingTable*)block)->sparingIdent.ident, UDF_ID_SPARING, strlen(UDF_ID_SPARING)) != 0 ) {
803 - for( i = 0; i < 2048; i++ ) {
804 - if( ((uint8_t*)block)[i] != 0 ) {
805 -- printf("readTaggedBlock: Empty block %d not all zeroes\n", blkno);
806 -+ printf("readTaggedBlock: Empty block %d not all zeroes\n", lbn);
807 - break;
808 - }
809 - }
810 -@@ -647,10 +646,10 @@
811 - sum += *(p + i);
812 -
813 - if( block->descTag.tagChecksum != sum )
814 -- fail("readTagged: Checksum error in block %d\n", blkno);
815 -+ fail("readTagged: Checksum error in block %d\n", lbn);
816 -
817 - if( block->descTag.descCRC != udf_crc((uint8_t*)block + sizeof(tag), ((tag*)block)->descCRCLength, 0) )
818 -- fail("readTagged: CRC error in block %d\n", blkno);
819 -+ fail("readTagged: CRC error in block %d\n", lbn);
820 -
821 - return block;
822 - }
823 -@@ -709,8 +708,8 @@
824 - writeExtents(char* src, int usesShort, void* extents)
825 - {
826 - uint len, blkno, partitionNumber;
827 -- long_ad *lo;
828 -- short_ad *sh;
829 -+ long_ad *lo=NULL;
830 -+ short_ad *sh=NULL;
831 -
832 - if( usesShort ) {
833 - sh = (short_ad*) extents;
834 -diff -ur udftools-1.0.0b3/wrudf/wrudf-cmnd.c udftools-1.0.0b3-new/wrudf/wrudf-cmnd.c
835 ---- udftools-1.0.0b3/wrudf/wrudf-cmnd.c 2002-11-26 08:18:51.000000000 +0100
836 -+++ udftools-1.0.0b3-new/wrudf/wrudf-cmnd.c 2007-08-23 14:22:41.000000000 +0200
837 -@@ -45,7 +45,7 @@
838 - int
839 - copyFile(Directory *dir, char* inName, char*newName, struct stat *fileStat)
840 - {
841 -- int fd, i, blkno;
842 -+ int fd, i=0, blkno;
843 - uint32_t nBytes, blkInPkt;
844 - uint32_t maxVarPktSize; // in bytes
845 - struct fileIdentDesc *fid;
846 -@@ -54,7 +54,7 @@
847 -
848 - fd = open(inName, O_RDONLY);
849 - if( fd == 0 ) {
850 -- printf("'%s' does not exist\n", cmndv[i]);
851 -+ printf("'%s' does not exist\n", inName);
852 - return CMND_FAILED;
853 - }
854 -
855
856 diff --git a/sys-fs/udftools/files/udftools-1.0.0b3-wrudf_help.patch b/sys-fs/udftools/files/udftools-1.0.0b3-wrudf_help.patch
857 deleted file mode 100644
858 index 06d9c3f616f..00000000000
859 --- a/sys-fs/udftools/files/udftools-1.0.0b3-wrudf_help.patch
860 +++ /dev/null
861 @@ -1,52 +0,0 @@
862 -taken from Fedora
863 -
864 -http://pkgs.fedoraproject.org/cgit/udftools.git/tree/udftools-1.0.0b3-wrudf_help.patch?h=f22
865 -
866 -diff -up wrk/wrudf/wrudf.c.wrk wrk/wrudf/wrudf.c
867 ---- wrk/wrudf/wrudf.c.wrk 2013-04-15 15:32:03.395528452 +0200
868 -+++ wrk/wrudf/wrudf.c 2013-04-15 16:06:37.535546730 +0200
869 -@@ -603,6 +603,28 @@ parseCmnd(char* line)
870 - return cmnd;
871 - }
872 -
873 -+int show_help()
874 -+{
875 -+ char *msg =
876 -+ "Interactive tool to maintain an UDF filesystem.\n"
877 -+ "Usage:\n"
878 -+ "\twrudf [device]\n"
879 -+ "Available commands:\n"
880 -+ "\tcp\n"
881 -+ "\trm\n"
882 -+ "\tmkdir\n"
883 -+ "\trmdir\n"
884 -+ "\tlsc\n"
885 -+ "\tlsh\n"
886 -+ "\tcdc\n"
887 -+ "\tcdh\n"
888 -+ "Specify cdh/lsh or cdc/lsc to do cd or ls for Harddisk or CompactDisc.\n"
889 -+ "\tquit\n"
890 -+ "\texit\n";
891 -+ printf("%s", msg);
892 -+ return 0;
893 -+}
894 -+
895 - int
896 - main(int argc, char** argv)
897 - {
898 -@@ -614,8 +636,14 @@ main(int argc, char** argv)
899 - printf("wrudf " WRUDF_VERSION "\n");
900 - devicename= "/dev/cdrom";
901 -
902 -- if(argc > 1 )
903 -+ if(argc > 1 ) {
904 -+ if (strcmp(argv[1], "-h")==0 || strcmp(argv[1], "-help")==0 || strcmp(argv[1], "--help")==0) {
905 -+ return show_help();
906 -+ }
907 -+ }
908 -+ else {
909 - devicename = argv[1]; /* can specify disk image filename */
910 -+ }
911 -
912 - if( setpriority(PRIO_PROCESS, 0, -10) ) {
913 - printf("setpriority(): %m\n");
914
915 diff --git a/sys-fs/udftools/udftools-1.0.0b-r10.ebuild b/sys-fs/udftools/udftools-1.0.0b-r10.ebuild
916 deleted file mode 100644
917 index 871fc46344f..00000000000
918 --- a/sys-fs/udftools/udftools-1.0.0b-r10.ebuild
919 +++ /dev/null
920 @@ -1,48 +0,0 @@
921 -# Copyright 1999-2015 Gentoo Foundation
922 -# Distributed under the terms of the GNU General Public License v2
923 -
924 -EAPI="5"
925 -
926 -inherit eutils flag-o-matic
927 -
928 -MY_P=${P}3
929 -
930 -DESCRIPTION="Ben Fennema's tools for packet writing and the UDF filesystem"
931 -HOMEPAGE="https://sourceforge.net/projects/linux-udf/"
932 -SRC_URI="mirror://sourceforge/linux-udf/${MY_P}.tar.gz
933 - http://w1.894.telia.com/~u89404340/patches/packet/${MY_P}.patch.bz2"
934 -
935 -LICENSE="GPL-2"
936 -SLOT="0"
937 -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
938 -IUSE=""
939 -
940 -RDEPEND="sys-libs/readline"
941 -DEPEND="${RDEPEND}"
942 -
943 -S=${WORKDIR}/${MY_P}
944 -
945 -src_prepare() {
946 - # For new kernel packet writing driver
947 - epatch "${WORKDIR}"/${MY_P}.patch
948 - epatch "${FILESDIR}"/cdrwtool-linux2.6-fix-v2.patch
949 - epatch "${FILESDIR}"/${P}-gcc4.patch #112122
950 - epatch "${FILESDIR}"/${P}-bigendian.patch #120245
951 - epatch "${FILESDIR}"/${P}-openflags.patch #232100
952 - epatch "${FILESDIR}"/${P}-limits_h.patch
953 - epatch "${FILESDIR}"/${P}3-extsize.patch
954 - epatch "${FILESDIR}"/${P}3-man-missing-options.patch
955 - epatch "${FILESDIR}"/${P}3-mkudffs-bigendian.patch
956 - epatch "${FILESDIR}"/${P}3-staticanal.patch
957 - epatch "${FILESDIR}"/${P}3-warningfixes.patch
958 - epatch "${FILESDIR}"/${P}3-warningfixes2.patch
959 - epatch "${FILESDIR}"/${P}3-wrudf_help.patch
960 - # Force older C standard as the code relies on static inline behavior. #548324
961 - append-flags -std=gnu89
962 -}
963 -
964 -src_install() {
965 - default
966 - newinitd "${FILESDIR}"/pktcdvd.init pktcdvd
967 - dosym /usr/bin/udffsck /usr/sbin/fsck.udf
968 -}
969
970 diff --git a/sys-fs/udftools/udftools-1.0.0b-r9.ebuild b/sys-fs/udftools/udftools-1.0.0b-r9.ebuild
971 deleted file mode 100644
972 index af812aa19e1..00000000000
973 --- a/sys-fs/udftools/udftools-1.0.0b-r9.ebuild
974 +++ /dev/null
975 @@ -1,42 +0,0 @@
976 -# Copyright 1999-2015 Gentoo Foundation
977 -# Distributed under the terms of the GNU General Public License v2
978 -
979 -EAPI="2"
980 -
981 -inherit eutils flag-o-matic
982 -
983 -MY_P=${P}3
984 -
985 -DESCRIPTION="Ben Fennema's tools for packet writing and the UDF filesystem"
986 -HOMEPAGE="https://sourceforge.net/projects/linux-udf/"
987 -SRC_URI="mirror://sourceforge/linux-udf/${MY_P}.tar.gz
988 - http://w1.894.telia.com/~u89404340/patches/packet/${MY_P}.patch.bz2"
989 -
990 -LICENSE="GPL-2"
991 -SLOT="0"
992 -KEYWORDS="amd64 ~ppc sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
993 -IUSE=""
994 -
995 -RDEPEND="sys-libs/readline"
996 -DEPEND="${RDEPEND}"
997 -
998 -S=${WORKDIR}/${MY_P}
999 -
1000 -src_prepare() {
1001 - # For new kernel packet writing driver
1002 - epatch "${WORKDIR}"/${MY_P}.patch
1003 - epatch "${FILESDIR}"/cdrwtool-linux2.6-fix-v2.patch
1004 - epatch "${FILESDIR}"/${P}-gcc4.patch #112122
1005 - epatch "${FILESDIR}"/${P}-bigendian.patch #120245
1006 - epatch "${FILESDIR}"/${P}-openflags.patch #232100
1007 - epatch "${FILESDIR}"/${P}-limits_h.patch
1008 - # Force older C standard as the code relies on static inline behavior. #548324
1009 - append-flags -std=gnu89
1010 -}
1011 -
1012 -src_install() {
1013 - emake DESTDIR="${D}" install || die
1014 - dodoc ChangeLog
1015 - newinitd "${FILESDIR}"/pktcdvd.init pktcdvd
1016 - dosym /usr/bin/udffsck /usr/sbin/fsck.udf
1017 -}
1018
1019 diff --git a/sys-fs/udftools/udftools-1.2.ebuild b/sys-fs/udftools/udftools-1.2.ebuild
1020 deleted file mode 100644
1021 index 85ccd12101c..00000000000
1022 --- a/sys-fs/udftools/udftools-1.2.ebuild
1023 +++ /dev/null
1024 @@ -1,24 +0,0 @@
1025 -# Copyright 1999-2016 Gentoo Foundation
1026 -# Distributed under the terms of the GNU General Public License v2
1027 -
1028 -EAPI="5"
1029 -
1030 -inherit eutils flag-o-matic
1031 -
1032 -DESCRIPTION="Ben Fennema's tools for packet writing and the UDF filesystem"
1033 -HOMEPAGE="https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/"
1034 -SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
1035 -
1036 -LICENSE="GPL-2"
1037 -SLOT="0"
1038 -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
1039 -IUSE=""
1040 -
1041 -RDEPEND="sys-libs/readline:0="
1042 -DEPEND="${RDEPEND}"
1043 -
1044 -src_install() {
1045 - default
1046 - newinitd "${FILESDIR}"/pktcdvd.init pktcdvd
1047 - dosym mkudffs.8 /usr/share/man/man8/mkfs.udf.8
1048 -}