1 |
commit: 713a51583500ffe09d91c167f7dc82dde50d8b3e |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 5 09:55:32 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 5 09:55:53 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=713a5158 |
7 |
|
8 |
sys-fs/squashfs-tools: Drop old versions |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
.../files/squashfs-tools-4.3-2gb.patch | 30 ----- |
13 |
.../files/squashfs-tools-4.3-aligned-data.patch | 15 --- |
14 |
.../files/squashfs-tools-4.3-extmatch.patch | 121 --------------------- |
15 |
.../files/squashfs-tools-4.3-local-cve-fix.patch | 19 ---- |
16 |
.../files/squashfs-tools-4.3-mem-overflow.patch | 35 ------ |
17 |
.../files/squashfs-tools-4.3-musl.patch | 24 ---- |
18 |
.../files/squashfs-tools-4.3-sysmacros.patch | 25 ----- |
19 |
.../files/squashfs-tools-4.3-xattrs.patch | 34 ------ |
20 |
sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild | 75 ------------- |
21 |
.../squashfs-tools/squashfs-tools-4.3_p12.ebuild | 84 -------------- |
22 |
sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild | 82 -------------- |
23 |
sys-fs/squashfs-tools/squashfs-tools-9999.ebuild | 4 - |
24 |
12 files changed, 548 deletions(-) |
25 |
|
26 |
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-2gb.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-2gb.patch |
27 |
deleted file mode 100644 |
28 |
index 467448f6263..00000000000 |
29 |
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-2gb.patch |
30 |
+++ /dev/null |
31 |
@@ -1,30 +0,0 @@ |
32 |
-From 9c1db6d13a51a2e009f0027ef336ce03624eac0d Mon Sep 17 00:00:00 2001 |
33 |
-From: "Guan, Xin" <guanx.bac@×××××.com> |
34 |
-Date: Sat, 13 Sep 2014 13:15:26 +0200 |
35 |
-Subject: [PATCH] Fix 2GB-limit of the is_fragment(...) function. |
36 |
- |
37 |
-Applies to squashfs-tools 4.3. |
38 |
- |
39 |
-Reported-by: Bruno Wolff III <bruno@×××××.to> |
40 |
-Signed-off-by: Guan, Xin <guanx.bac@×××××.com> |
41 |
-Signed-off-by: Phillip Lougher <phillip@××××××××××××.uk> |
42 |
---- |
43 |
- squashfs-tools/mksquashfs.c | 2 +- |
44 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
45 |
- |
46 |
-diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c |
47 |
-index f1fcff1cc284..d221c35865a0 100644 |
48 |
---- a/squashfs-tools/mksquashfs.c |
49 |
-+++ b/squashfs-tools/mksquashfs.c |
50 |
-@@ -2029,7 +2029,7 @@ struct file_info *duplicate(long long file_size, long long bytes, |
51 |
- |
52 |
- inline int is_fragment(struct inode_info *inode) |
53 |
- { |
54 |
-- int file_size = inode->buf.st_size; |
55 |
-+ off_t file_size = inode->buf.st_size; |
56 |
- |
57 |
- /* |
58 |
- * If this block is to be compressed differently to the |
59 |
--- |
60 |
-2.8.2 |
61 |
- |
62 |
|
63 |
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-aligned-data.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-aligned-data.patch |
64 |
deleted file mode 100644 |
65 |
index 024129ffa95..00000000000 |
66 |
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-aligned-data.patch |
67 |
+++ /dev/null |
68 |
@@ -1,15 +0,0 @@ |
69 |
-the mksquashfs code has an all_zeros func that does: |
70 |
- long *p = (long *) file_buffer->data; |
71 |
- |
72 |
-make sure we force the data field to be aligned so that still works. |
73 |
- |
74 |
---- a/squashfs-tools/caches-queues-lists.h |
75 |
-+++ b/squashfs-tools/caches-queues-lists.h |
76 |
-@@ -123,6 +123,7 @@ struct file_buffer { |
77 |
- char locked; |
78 |
- char wait_on_unlock; |
79 |
- char noD; |
80 |
-+ long _pad; |
81 |
- char data[0]; |
82 |
- }; |
83 |
- |
84 |
|
85 |
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-extmatch.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-extmatch.patch |
86 |
deleted file mode 100644 |
87 |
index 7ffc062006c..00000000000 |
88 |
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-extmatch.patch |
89 |
+++ /dev/null |
90 |
@@ -1,121 +0,0 @@ |
91 |
-From https://github.com/plougher/squashfs-tools/pull/9 |
92 |
- |
93 |
-From 4280e74de14070869787a9166242f9ce2dafd82e Mon Sep 17 00:00:00 2001 |
94 |
-From: Alexandru Ardelean <aa@×××××.com> |
95 |
-Date: Wed, 6 Jan 2016 15:33:43 +0200 |
96 |
-Subject: [PATCH] squashfs-tools: with fnmatch.h compatibility with musl |
97 |
- |
98 |
-musl does not define FNM_EXTMATCH |
99 |
- |
100 |
-Signed-off-by: Alexandru Ardelean <aa@×××××.com> |
101 |
---- |
102 |
- squashfs-tools/action.c | 2 +- |
103 |
- squashfs-tools/fnmatch_compat.h | 32 ++++++++++++++++++++++++++++++++ |
104 |
- squashfs-tools/mksquashfs.c | 2 +- |
105 |
- squashfs-tools/unsquashfs.c | 1 + |
106 |
- squashfs-tools/unsquashfs.h | 1 - |
107 |
- 5 files changed, 35 insertions(+), 3 deletions(-) |
108 |
- create mode 100644 squashfs-tools/fnmatch_compat.h |
109 |
- |
110 |
-diff --git a/squashfs-tools/action.c b/squashfs-tools/action.c |
111 |
-index 35889a4..4b06ccb 100644 |
112 |
---- a/squashfs-tools/action.c |
113 |
-+++ b/squashfs-tools/action.c |
114 |
-@@ -31,7 +31,6 @@ |
115 |
- #include <sys/stat.h> |
116 |
- #include <sys/types.h> |
117 |
- #include <unistd.h> |
118 |
--#include <fnmatch.h> |
119 |
- #include <pwd.h> |
120 |
- #include <grp.h> |
121 |
- #include <sys/wait.h> |
122 |
-@@ -43,6 +42,7 @@ |
123 |
- #include "mksquashfs.h" |
124 |
- #include "action.h" |
125 |
- #include "error.h" |
126 |
-+#include "fnmatch_compat.h" |
127 |
- |
128 |
- /* |
129 |
- * code to parse actions |
130 |
-diff --git a/squashfs-tools/fnmatch_compat.h b/squashfs-tools/fnmatch_compat.h |
131 |
-new file mode 100644 |
132 |
-index 0000000..7b4afd8 |
133 |
---- /dev/null |
134 |
-+++ b/squashfs-tools/fnmatch_compat.h |
135 |
-@@ -0,0 +1,32 @@ |
136 |
-+#ifndef FNMATCH_COMPAT |
137 |
-+#define FNMATCH_COMPAT |
138 |
-+/* |
139 |
-+ * Squashfs |
140 |
-+ * |
141 |
-+ * Copyright (c) 2015 |
142 |
-+ * Phillip Lougher <phillip@××××××××××××.uk> |
143 |
-+ * |
144 |
-+ * This program is free software; you can redistribute it and/or |
145 |
-+ * modify it under the terms of the GNU General Public License |
146 |
-+ * as published by the Free Software Foundation; either version 2, |
147 |
-+ * or (at your option) any later version. |
148 |
-+ * |
149 |
-+ * This program is distributed in the hope that it will be useful, |
150 |
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of |
151 |
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
152 |
-+ * GNU General Public License for more details. |
153 |
-+ * |
154 |
-+ * You should have received a copy of the GNU General Public License |
155 |
-+ * along with this program; if not, write to the Free Software |
156 |
-+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
157 |
-+ * |
158 |
-+ * fnmatch_compat.h |
159 |
-+ */ |
160 |
-+ |
161 |
-+#include <fnmatch.h> |
162 |
-+ |
163 |
-+#ifndef FNM_EXTMATCH |
164 |
-+#define FNM_EXTMATCH 0 |
165 |
-+#endif |
166 |
-+ |
167 |
-+#endif |
168 |
-diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c |
169 |
-index d221c35..4e7cbdd 100644 |
170 |
---- a/squashfs-tools/mksquashfs.c |
171 |
-+++ b/squashfs-tools/mksquashfs.c |
172 |
-@@ -46,7 +46,6 @@ |
173 |
- #include <sys/mman.h> |
174 |
- #include <pthread.h> |
175 |
- #include <regex.h> |
176 |
--#include <fnmatch.h> |
177 |
- #include <sys/wait.h> |
178 |
- #include <limits.h> |
179 |
- #include <ctype.h> |
180 |
-@@ -76,6 +75,7 @@ |
181 |
- #include "read_fs.h" |
182 |
- #include "restore.h" |
183 |
- #include "process_fragments.h" |
184 |
-+#include "fnmatch_compat.h" |
185 |
- |
186 |
- int delete = FALSE; |
187 |
- int fd; |
188 |
-diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c |
189 |
-index 1323dd6..2428baa 100644 |
190 |
---- a/squashfs-tools/unsquashfs.c |
191 |
-+++ b/squashfs-tools/unsquashfs.c |
192 |
-@@ -30,6 +30,7 @@ |
193 |
- #include "xattr.h" |
194 |
- #include "unsquashfs_info.h" |
195 |
- #include "stdarg.h" |
196 |
-+#include "fnmatch_compat.h" |
197 |
- |
198 |
- #include <sys/sysinfo.h> |
199 |
- #include <sys/types.h> |
200 |
-diff --git a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h |
201 |
-index ecd0bb4..0edbd25 100644 |
202 |
---- a/squashfs-tools/unsquashfs.h |
203 |
-+++ b/squashfs-tools/unsquashfs.h |
204 |
-@@ -40,7 +40,6 @@ |
205 |
- #include <grp.h> |
206 |
- #include <time.h> |
207 |
- #include <regex.h> |
208 |
--#include <fnmatch.h> |
209 |
- #include <signal.h> |
210 |
- #include <pthread.h> |
211 |
- #include <math.h> |
212 |
|
213 |
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-local-cve-fix.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-local-cve-fix.patch |
214 |
deleted file mode 100644 |
215 |
index dca6ab68e67..00000000000 |
216 |
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-local-cve-fix.patch |
217 |
+++ /dev/null |
218 |
@@ -1,19 +0,0 @@ |
219 |
-taken from Fedora |
220 |
- |
221 |
-commit af393379e34c5677f95bbec11645b6c3028195b4 |
222 |
-Author: Bruno Wolff III <bruno@×××××.to> |
223 |
-Date: Wed Jun 24 14:27:31 2015 -0500 |
224 |
- |
225 |
-Update printf formats to match datatypes after CVE patch |
226 |
- |
227 |
---- a/squashfs-tools/unsquash-4.c |
228 |
-+++ b/squashfs-tools/unsquash-4.c |
229 |
-@@ -35,7 +35,7 @@ |
230 |
- size_t indexes = SQUASHFS_FRAGMENT_INDEXES(sBlk.s.fragments); |
231 |
- long long *fragment_table_index; |
232 |
- |
233 |
-- TRACE("read_fragment_table: %d fragments, reading %d fragment indexes " |
234 |
-+ TRACE("read_fragment_table: %u fragments, reading %zu fragment indexes " |
235 |
- "from 0x%llx\n", sBlk.s.fragments, indexes, |
236 |
- sBlk.s.fragment_table_start); |
237 |
- |
238 |
|
239 |
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-mem-overflow.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-mem-overflow.patch |
240 |
deleted file mode 100644 |
241 |
index a9b000149e4..00000000000 |
242 |
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-mem-overflow.patch |
243 |
+++ /dev/null |
244 |
@@ -1,35 +0,0 @@ |
245 |
-taken from Fedora |
246 |
- |
247 |
-From 604b607d8ac91eb8afc0b6e3d917d5c073096103 Mon Sep 17 00:00:00 2001 |
248 |
-From: Phillip Lougher <phillip@××××××××××××.uk> |
249 |
-Date: Wed, 11 Jun 2014 04:51:37 +0100 |
250 |
-Subject: mksquashfs: ensure value does not overflow a signed int in -mem |
251 |
- option |
252 |
- |
253 |
-Signed-off-by: Phillip Lougher <phillip@××××××××××××.uk> |
254 |
- |
255 |
-diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c |
256 |
-index 5370ecf..9676dc8 100644 |
257 |
---- a/squashfs-tools/mksquashfs.c |
258 |
-+++ b/squashfs-tools/mksquashfs.c |
259 |
-@@ -5193,7 +5193,16 @@ print_compressor_options: |
260 |
- argv[0]); |
261 |
- exit(1); |
262 |
- } |
263 |
-- /* convert from bytes to Mbytes */ |
264 |
-+ |
265 |
-+ /* |
266 |
-+ * convert from bytes to Mbytes, ensuring the value |
267 |
-+ * does not overflow a signed int |
268 |
-+ */ |
269 |
-+ if(number >= (1LL << 51)) { |
270 |
-+ ERROR("%s: -mem invalid mem size\n", argv[0]); |
271 |
-+ exit(1); |
272 |
-+ } |
273 |
-+ |
274 |
- total_mem = number / 1048576; |
275 |
- if(total_mem < (SQUASHFS_LOWMEM / SQUASHFS_TAKE)) { |
276 |
- ERROR("%s: -mem should be %d Mbytes or " |
277 |
--- |
278 |
-cgit v0.10.1 |
279 |
- |
280 |
|
281 |
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-musl.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-musl.patch |
282 |
deleted file mode 100644 |
283 |
index 52b7f48c8ea..00000000000 |
284 |
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-musl.patch |
285 |
+++ /dev/null |
286 |
@@ -1,24 +0,0 @@ |
287 |
-From https://github.com/plougher/squashfs-tools/pull/9 |
288 |
- |
289 |
-From b0ca8a5c98ff73e70b2ab1bc24aa824aa2458287 Mon Sep 17 00:00:00 2001 |
290 |
-From: Alexandru Ardelean <aa@×××××.com> |
291 |
-Date: Wed, 6 Jan 2016 15:36:48 +0200 |
292 |
-Subject: [PATCH] pseudo.c: add explicit <sys/stat.h> include |
293 |
- |
294 |
-Signed-off-by: Alexandru Ardelean <aa@×××××.com> |
295 |
---- |
296 |
- squashfs-tools/pseudo.c | 1 + |
297 |
- 1 file changed, 1 insertion(+) |
298 |
- |
299 |
-diff --git a/squashfs-tools/pseudo.c b/squashfs-tools/pseudo.c |
300 |
-index f85fe60..83bfc97 100644 |
301 |
---- a/squashfs-tools/pseudo.c |
302 |
-+++ b/squashfs-tools/pseudo.c |
303 |
-@@ -32,6 +32,7 @@ |
304 |
- #include <stdlib.h> |
305 |
- #include <sys/types.h> |
306 |
- #include <sys/wait.h> |
307 |
-+#include <sys/stat.h> |
308 |
- #include <ctype.h> |
309 |
- |
310 |
- #include "pseudo.h" |
311 |
|
312 |
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch |
313 |
deleted file mode 100644 |
314 |
index 1430b1a2ee0..00000000000 |
315 |
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch |
316 |
+++ /dev/null |
317 |
@@ -1,25 +0,0 @@ |
318 |
-sys/types.h might not always include sys/sysmacros.h for major/minor/makedev |
319 |
- |
320 |
---- a/squashfs-tools/mksquashfs.c |
321 |
-+++ b/squashfs-tools/mksquashfs.c |
322 |
-@@ -59,6 +59,7 @@ |
323 |
- #else |
324 |
- #include <endian.h> |
325 |
- #include <sys/sysinfo.h> |
326 |
-+#include <sys/sysmacros.h> |
327 |
- #endif |
328 |
- |
329 |
- #include "squashfs_fs.h" |
330 |
---- a/squashfs-tools/unsquashfs.c |
331 |
-+++ b/squashfs-tools/unsquashfs.c |
332 |
-@@ -38,6 +38,10 @@ |
333 |
- #include <limits.h> |
334 |
- #include <ctype.h> |
335 |
- |
336 |
-+#ifdef linux |
337 |
-+#include <sys/sysmacros.h> |
338 |
-+#endif |
339 |
-+ |
340 |
- struct cache *fragment_cache, *data_cache; |
341 |
- struct queue *to_reader, *to_inflate, *to_writer, *from_writer; |
342 |
- pthread_t *thread, *inflator_thread; |
343 |
|
344 |
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-xattrs.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-xattrs.patch |
345 |
deleted file mode 100644 |
346 |
index 47b0ea5c985..00000000000 |
347 |
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-xattrs.patch |
348 |
+++ /dev/null |
349 |
@@ -1,34 +0,0 @@ |
350 |
-From ffe9e55c4993422ce36213fa86d4fc29c22646ea Mon Sep 17 00:00:00 2001 |
351 |
-From: Wessel Dankers <wsl-debian-804194@×××××.je> |
352 |
-Date: Fri, 17 Jun 2016 09:46:42 +0800 |
353 |
-Subject: [PATCH] unsquashfs: Correctly set file capabilities |
354 |
- |
355 |
-As posted on https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804194. |
356 |
---- |
357 |
- squashfs-tools/unsquashfs.c | 4 ++-- |
358 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
359 |
- |
360 |
-diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c |
361 |
-index 1323dd6..a5f0117 100644 |
362 |
---- a/squashfs-tools/unsquashfs.c |
363 |
-+++ b/squashfs-tools/unsquashfs.c |
364 |
-@@ -821,8 +821,6 @@ int set_attributes(char *pathname, int mode, uid_t uid, gid_t guid, time_t time, |
365 |
- { |
366 |
- struct utimbuf times = { time, time }; |
367 |
- |
368 |
-- write_xattr(pathname, xattr); |
369 |
-- |
370 |
- if(utime(pathname, ×) == -1) { |
371 |
- ERROR("set_attributes: failed to set time on %s, because %s\n", |
372 |
- pathname, strerror(errno)); |
373 |
-@@ -845,6 +843,8 @@ int set_attributes(char *pathname, int mode, uid_t uid, gid_t guid, time_t time, |
374 |
- return FALSE; |
375 |
- } |
376 |
- |
377 |
-+ write_xattr(pathname, xattr); |
378 |
-+ |
379 |
- return TRUE; |
380 |
- } |
381 |
- |
382 |
--- |
383 |
-2.8.0.rc3.226.g39d4020 |
384 |
|
385 |
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild |
386 |
deleted file mode 100644 |
387 |
index 815ea61e692..00000000000 |
388 |
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild |
389 |
+++ /dev/null |
390 |
@@ -1,75 +0,0 @@ |
391 |
-# Copyright 1999-2020 Gentoo Authors |
392 |
-# Distributed under the terms of the GNU General Public License v2 |
393 |
- |
394 |
-EAPI="5" |
395 |
- |
396 |
-inherit eutils flag-o-matic toolchain-funcs |
397 |
- |
398 |
-DEB_VER="3" |
399 |
- |
400 |
-DESCRIPTION="Tool for creating compressed filesystem type squashfs" |
401 |
-HOMEPAGE="http://squashfs.sourceforge.net" |
402 |
-SRC_URI="mirror://sourceforge/squashfs/squashfs${PV}.tar.gz |
403 |
- mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_VER}.debian.tar.xz" |
404 |
- |
405 |
-LICENSE="GPL-2" |
406 |
-SLOT="0" |
407 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" |
408 |
-IUSE="debug lz4 lzma lzo static xattr +xz" |
409 |
- |
410 |
-LIB_DEPEND="sys-libs/zlib[static-libs(+)] |
411 |
- !xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) ) |
412 |
- lz4? ( app-arch/lz4[static-libs(+)] ) |
413 |
- lzma? ( app-arch/xz-utils[static-libs(+)] ) |
414 |
- lzo? ( dev-libs/lzo[static-libs(+)] ) |
415 |
- xattr? ( sys-apps/attr[static-libs(+)] ) |
416 |
- xz? ( app-arch/xz-utils[static-libs(+)] )" |
417 |
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" |
418 |
-DEPEND="${RDEPEND} |
419 |
- static? ( ${LIB_DEPEND} )" |
420 |
- |
421 |
-S="${WORKDIR}/squashfs${PV}/${PN}" |
422 |
- |
423 |
-src_prepare() { |
424 |
- epatch "${WORKDIR}"/debian/patches/*.patch |
425 |
- epatch "${FILESDIR}"/${P}-sysmacros.patch |
426 |
- epatch "${FILESDIR}"/${P}-aligned-data.patch |
427 |
- epatch "${FILESDIR}"/${P}-2gb.patch |
428 |
- epatch "${FILESDIR}"/${P}-local-cve-fix.patch |
429 |
- epatch "${FILESDIR}"/${P}-mem-overflow.patch |
430 |
- epatch "${FILESDIR}"/${P}-xattrs.patch |
431 |
- epatch "${FILESDIR}"/${P}-extmatch.patch |
432 |
- epatch "${FILESDIR}"/${P}-musl.patch |
433 |
-} |
434 |
- |
435 |
-use10() { usex $1 1 0 ; } |
436 |
- |
437 |
-src_configure() { |
438 |
- # restore GNU89 inline semantics to |
439 |
- # emit function symbols, bug 595290 |
440 |
- append-cflags -std=gnu89 |
441 |
- |
442 |
- # set up make command line variables in EMAKE_SQUASHFS_CONF |
443 |
- EMAKE_SQUASHFS_CONF=( |
444 |
- LZMA_XZ_SUPPORT=$(use10 lzma) |
445 |
- LZO_SUPPORT=$(use10 lzo) |
446 |
- LZ4_SUPPORT=$(use10 lz4) |
447 |
- XATTR_SUPPORT=$(use10 xattr) |
448 |
- XZ_SUPPORT=$(use10 xz) |
449 |
- ) |
450 |
- |
451 |
- tc-export CC |
452 |
- use debug && append-cppflags -DSQUASHFS_TRACE |
453 |
- use static && append-ldflags -static |
454 |
-} |
455 |
- |
456 |
-src_compile() { |
457 |
- emake "${EMAKE_SQUASHFS_CONF[@]}" |
458 |
-} |
459 |
- |
460 |
-src_install() { |
461 |
- dobin mksquashfs unsquashfs |
462 |
- cd .. |
463 |
- dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/* |
464 |
- doman "${WORKDIR}"/debian/manpages/*.[0-9] |
465 |
-} |
466 |
|
467 |
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p12.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p12.ebuild |
468 |
deleted file mode 100644 |
469 |
index a27640c99e3..00000000000 |
470 |
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p12.ebuild |
471 |
+++ /dev/null |
472 |
@@ -1,84 +0,0 @@ |
473 |
-# Copyright 1999-2020 Gentoo Authors |
474 |
-# Distributed under the terms of the GNU General Public License v2 |
475 |
- |
476 |
-EAPI=7 |
477 |
-inherit flag-o-matic toolchain-funcs |
478 |
- |
479 |
-DESCRIPTION="tools to create and extract Squashfs filesystems" |
480 |
-HOMEPAGE="http://squashfs.sourceforge.net" |
481 |
-SRC_URI=" |
482 |
- mirror://sourceforge/squashfs/squashfs${PV/_p*}.tar.gz |
483 |
- mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz |
484 |
-" |
485 |
- |
486 |
-LICENSE="GPL-2" |
487 |
-SLOT="0" |
488 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
489 |
-IUSE="debug lz4 lzma lzo static xattr +xz zstd" |
490 |
- |
491 |
-LIB_DEPEND=" |
492 |
- sys-libs/zlib[static-libs(+)] |
493 |
- !xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) ) |
494 |
- lz4? ( app-arch/lz4[static-libs(+)] ) |
495 |
- lzma? ( app-arch/xz-utils[static-libs(+)] ) |
496 |
- lzo? ( dev-libs/lzo[static-libs(+)] ) |
497 |
- xattr? ( sys-apps/attr[static-libs(+)] ) |
498 |
- xz? ( app-arch/xz-utils[static-libs(+)] ) |
499 |
- zstd? ( app-arch/zstd[static-libs(+)] ) |
500 |
-" |
501 |
-RDEPEND=" |
502 |
- !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) |
503 |
-" |
504 |
-DEPEND=" |
505 |
- ${RDEPEND} |
506 |
- static? ( ${LIB_DEPEND} ) |
507 |
-" |
508 |
-PATCHES=( |
509 |
- "${FILESDIR}"/${P/_p*}-sysmacros.patch |
510 |
- "${FILESDIR}"/${P/_p*}-aligned-data.patch |
511 |
- "${FILESDIR}"/${P/_p*}-local-cve-fix.patch |
512 |
- "${FILESDIR}"/${P/_p*}-mem-overflow.patch |
513 |
- "${FILESDIR}"/${P/_p*}-extmatch.patch |
514 |
- "${FILESDIR}"/${P/_p*}-musl.patch |
515 |
-) |
516 |
- |
517 |
-S="${WORKDIR}/squashfs${PV/_p*}/${PN}" |
518 |
- |
519 |
-src_prepare() { |
520 |
- eapply -p2 "${WORKDIR}"/debian/patches/*.patch |
521 |
- eapply -p2 ${PATCHES[@]} |
522 |
- eapply_user |
523 |
-} |
524 |
- |
525 |
-use10() { usex $1 1 0 ; } |
526 |
- |
527 |
-src_configure() { |
528 |
- # restore GNU89 inline semantics to |
529 |
- # emit function symbols, bug 595290 |
530 |
- append-cflags -std=gnu89 |
531 |
- |
532 |
- # set up make command line variables in EMAKE_SQUASHFS_CONF |
533 |
- EMAKE_SQUASHFS_CONF=( |
534 |
- LZMA_XZ_SUPPORT=$(use10 lzma) |
535 |
- LZO_SUPPORT=$(use10 lzo) |
536 |
- LZ4_SUPPORT=$(use10 lz4) |
537 |
- XATTR_SUPPORT=$(use10 xattr) |
538 |
- XZ_SUPPORT=$(use10 xz) |
539 |
- ZSTD_SUPPORT=$(use10 zstd) |
540 |
- ) |
541 |
- |
542 |
- tc-export CC |
543 |
- use debug && append-cppflags -DSQUASHFS_TRACE |
544 |
- use static && append-ldflags -static |
545 |
-} |
546 |
- |
547 |
-src_compile() { |
548 |
- emake "${EMAKE_SQUASHFS_CONF[@]}" |
549 |
-} |
550 |
- |
551 |
-src_install() { |
552 |
- dobin mksquashfs unsquashfs |
553 |
- cd .. |
554 |
- dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/* |
555 |
- doman "${WORKDIR}"/debian/manpages/*.[0-9] |
556 |
-} |
557 |
|
558 |
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild |
559 |
deleted file mode 100644 |
560 |
index fb773fd1d5f..00000000000 |
561 |
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild |
562 |
+++ /dev/null |
563 |
@@ -1,82 +0,0 @@ |
564 |
-# Copyright 1999-2020 Gentoo Authors |
565 |
-# Distributed under the terms of the GNU General Public License v2 |
566 |
- |
567 |
-EAPI=7 |
568 |
-inherit flag-o-matic toolchain-funcs |
569 |
- |
570 |
-DESCRIPTION="tools to create and extract Squashfs filesystems" |
571 |
-HOMEPAGE="http://squashfs.sourceforge.net" |
572 |
-SRC_URI=" |
573 |
- mirror://sourceforge/squashfs/squashfs${PV/_p*}.tar.gz |
574 |
- mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz |
575 |
-" |
576 |
- |
577 |
-LICENSE="GPL-2" |
578 |
-SLOT="0" |
579 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" |
580 |
-IUSE="debug lz4 lzma lzo static xattr +xz" |
581 |
- |
582 |
-LIB_DEPEND=" |
583 |
- sys-libs/zlib[static-libs(+)] |
584 |
- !xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) ) |
585 |
- lz4? ( app-arch/lz4[static-libs(+)] ) |
586 |
- lzma? ( app-arch/xz-utils[static-libs(+)] ) |
587 |
- lzo? ( dev-libs/lzo[static-libs(+)] ) |
588 |
- xattr? ( sys-apps/attr[static-libs(+)] ) |
589 |
- xz? ( app-arch/xz-utils[static-libs(+)] ) |
590 |
-" |
591 |
-RDEPEND=" |
592 |
- !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) |
593 |
-" |
594 |
-DEPEND=" |
595 |
- ${RDEPEND} |
596 |
- static? ( ${LIB_DEPEND} ) |
597 |
-" |
598 |
-PATCHES=( |
599 |
- "${FILESDIR}"/${P/_p*}-sysmacros.patch |
600 |
- "${FILESDIR}"/${P/_p*}-aligned-data.patch |
601 |
- "${FILESDIR}"/${P/_p*}-local-cve-fix.patch |
602 |
- "${FILESDIR}"/${P/_p*}-mem-overflow.patch |
603 |
- "${FILESDIR}"/${P/_p*}-extmatch.patch |
604 |
- "${FILESDIR}"/${P/_p*}-musl.patch |
605 |
-) |
606 |
- |
607 |
-S="${WORKDIR}/squashfs${PV/_p*}/${PN}" |
608 |
- |
609 |
-src_prepare() { |
610 |
- eapply -p2 "${WORKDIR}"/debian/patches/*.patch |
611 |
- eapply -p2 ${PATCHES[@]} |
612 |
- eapply_user |
613 |
-} |
614 |
- |
615 |
-use10() { usex $1 1 0 ; } |
616 |
- |
617 |
-src_configure() { |
618 |
- # restore GNU89 inline semantics to |
619 |
- # emit function symbols, bug 595290 |
620 |
- append-cflags -std=gnu89 |
621 |
- |
622 |
- # set up make command line variables in EMAKE_SQUASHFS_CONF |
623 |
- EMAKE_SQUASHFS_CONF=( |
624 |
- LZMA_XZ_SUPPORT=$(use10 lzma) |
625 |
- LZO_SUPPORT=$(use10 lzo) |
626 |
- LZ4_SUPPORT=$(use10 lz4) |
627 |
- XATTR_SUPPORT=$(use10 xattr) |
628 |
- XZ_SUPPORT=$(use10 xz) |
629 |
- ) |
630 |
- |
631 |
- tc-export CC |
632 |
- use debug && append-cppflags -DSQUASHFS_TRACE |
633 |
- use static && append-ldflags -static |
634 |
-} |
635 |
- |
636 |
-src_compile() { |
637 |
- emake "${EMAKE_SQUASHFS_CONF[@]}" |
638 |
-} |
639 |
- |
640 |
-src_install() { |
641 |
- dobin mksquashfs unsquashfs |
642 |
- cd .. |
643 |
- dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/* |
644 |
- doman "${WORKDIR}"/debian/manpages/*.[0-9] |
645 |
-} |
646 |
|
647 |
diff --git a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild |
648 |
index 1234cc3f4c5..cb91a13dd1e 100644 |
649 |
--- a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild |
650 |
+++ b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild |
651 |
@@ -32,10 +32,6 @@ DEPEND=" |
652 |
${RDEPEND} |
653 |
static? ( ${LIB_DEPEND} ) |
654 |
" |
655 |
-PATCHES=( |
656 |
- "${FILESDIR}"/${PN}-4.3-sysmacros.patch |
657 |
-) |
658 |
- |
659 |
use10() { usex $1 1 0 ; } |
660 |
|
661 |
src_configure() { |