1 |
commit: acc0d853a3f569092c6c2958223a4afb23c4fa3a |
2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 18 00:44:42 2022 +0000 |
4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 18 00:44:42 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=acc0d853 |
7 |
|
8 |
sys-block/parted: :: works as expected |
9 |
|
10 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
11 |
|
12 |
sys-block/parted/Manifest | 1 - |
13 |
sys-block/parted/files/parted-3.2-devmapper.patch | 60 -------------------- |
14 |
.../parted/files/parted-3.2-fix-includes.patch | 10 ---- |
15 |
.../files/parted-3.2-fix-resizing-FAT16.patch | 64 ---------------------- |
16 |
.../parted/files/parted-3.2-po4a-mandir.patch | 11 ---- |
17 |
sys-block/parted/files/parted-3.2-sysmacros.patch | 28 ---------- |
18 |
sys-block/parted/metadata.xml | 20 ------- |
19 |
sys-block/parted/parted-3.2-r2.ebuild | 64 ---------------------- |
20 |
sys-block/parted/parted-3.2.ebuild | 58 -------------------- |
21 |
9 files changed, 316 deletions(-) |
22 |
|
23 |
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest |
24 |
deleted file mode 100644 |
25 |
index 1f69f788..00000000 |
26 |
--- a/sys-block/parted/Manifest |
27 |
+++ /dev/null |
28 |
@@ -1 +0,0 @@ |
29 |
-DIST parted-3.2.tar.xz 1655244 SHA256 858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 SHA512 4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4 WHIRLPOOL af928177b893150ac6d5e0efcef542b6fa0df6b135f975078f7d8d5f7a4b109ef4c1f8eeaf6afc5c34448ff662ce4cbe5289e084f4ec05257666503a0cd3c93f |
30 |
|
31 |
diff --git a/sys-block/parted/files/parted-3.2-devmapper.patch b/sys-block/parted/files/parted-3.2-devmapper.patch |
32 |
deleted file mode 100644 |
33 |
index 0cd3e0e3..00000000 |
34 |
--- a/sys-block/parted/files/parted-3.2-devmapper.patch |
35 |
+++ /dev/null |
36 |
@@ -1,60 +0,0 @@ |
37 |
---- a/libparted/arch/linux.c |
38 |
-+++ b/libparted/arch/linux.c |
39 |
-@@ -2304,6 +2304,7 @@ |
40 |
- return r < 0 ? NULL : resultp; |
41 |
- } |
42 |
- |
43 |
-+#ifdef ENABLE_DEVICE_MAPPER |
44 |
- static char * |
45 |
- dm_canonical_path (PedDevice const *dev) |
46 |
- { |
47 |
-@@ -2326,12 +2327,22 @@ |
48 |
- err: |
49 |
- return NULL; |
50 |
- } |
51 |
-+#endif /* ENABLE_DEVICE_MAPPER */ |
52 |
- |
53 |
- static char* |
54 |
- _device_get_part_path (PedDevice const *dev, int num) |
55 |
- { |
56 |
-- char *devpath = (dev->type == PED_DEVICE_DM |
57 |
-- ? dm_canonical_path (dev) : dev->path); |
58 |
-+ char *devpath = |
59 |
-+#ifdef ENABLE_DEVICE_MAPPER |
60 |
-+ ( |
61 |
-+ dev->type == PED_DEVICE_DM |
62 |
-+ ? dm_canonical_path (dev) : |
63 |
-+#endif /* ENABLE_DEVICE_MAPPER */ |
64 |
-+ dev->path |
65 |
-+#ifdef ENABLE_DEVICE_MAPPER |
66 |
-+ ) |
67 |
-+#endif /* ENABLE_DEVICE_MAPPER */ |
68 |
-+ ; |
69 |
- size_t path_len = strlen (devpath); |
70 |
- char *result; |
71 |
- /* Check for devfs-style /disc => /partN transformation |
72 |
-@@ -2945,12 +2956,14 @@ |
73 |
- unsigned long long *length); |
74 |
- |
75 |
- |
76 |
-+#ifdef ENABLE_DEVICE_MAPPER |
77 |
- if (disk->dev->type == PED_DEVICE_DM) { |
78 |
- add_partition = _dm_add_partition; |
79 |
- remove_partition = _dm_remove_partition; |
80 |
- resize_partition = _dm_resize_partition; |
81 |
- get_partition_start_and_length = _dm_get_partition_start_and_length; |
82 |
- } else { |
83 |
-+#endif /* ENABLE_DEVICE_MAPPER */ |
84 |
- add_partition = _blkpg_add_partition; |
85 |
- remove_partition = _blkpg_remove_partition; |
86 |
- #ifdef BLKPG_RESIZE_PARTITION |
87 |
-@@ -2959,7 +2972,9 @@ |
88 |
- resize_partition = NULL; |
89 |
- #endif |
90 |
- get_partition_start_and_length = _kernel_get_partition_start_and_length; |
91 |
-+#ifdef ENABLE_DEVICE_MAPPER |
92 |
- } |
93 |
-+#endif /* ENABLE_DEVICE_MAPPER */ |
94 |
- |
95 |
- /* lpn = largest partition number. |
96 |
- * for remove pass, use greater of device or label limit */ |
97 |
|
98 |
diff --git a/sys-block/parted/files/parted-3.2-fix-includes.patch b/sys-block/parted/files/parted-3.2-fix-includes.patch |
99 |
deleted file mode 100644 |
100 |
index c6eff0eb..00000000 |
101 |
--- a/sys-block/parted/files/parted-3.2-fix-includes.patch |
102 |
+++ /dev/null |
103 |
@@ -1,10 +0,0 @@ |
104 |
---- parted-3.1.orig/libparted/fs/xfs/platform_defs.h |
105 |
-+++ parted-3.1/libparted/fs/xfs/platform_defs.h |
106 |
-@@ -35,6 +35,7 @@ |
107 |
- #define __XFS_PLATFORM_DEFS_H__ |
108 |
- |
109 |
- #include <stdio.h> |
110 |
-+#include <fcntl.h> |
111 |
- #include <stdarg.h> |
112 |
- #include <assert.h> |
113 |
- #include <endian.h> |
114 |
|
115 |
diff --git a/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch b/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch |
116 |
deleted file mode 100644 |
117 |
index 2a5a2311..00000000 |
118 |
--- a/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch |
119 |
+++ /dev/null |
120 |
@@ -1,64 +0,0 @@ |
121 |
-From 1e9e770f4bc7f3d80e09ecd1df58575fad064163 Mon Sep 17 00:00:00 2001 |
122 |
-From: Mike Fleetwood <mike.fleetwood@××××××××××.com> |
123 |
-Date: Sun, 28 Sep 2014 15:15:48 +0000 |
124 |
-Subject: lib-fs-resize: Prevent crash resizing FAT16 file systems |
125 |
- |
126 |
-Resizing FAT16 file system crashes in libparted/fs/r/fat/resize.c |
127 |
-create_resize_context() because it was dereferencing NULL pointer |
128 |
-fs_info->info_sector to copy the info_sector. |
129 |
- |
130 |
-Only FAT32 file systems have info_sector populated by fat_open() -> |
131 |
-fat_info_sector_read(). FAT12 and FAT16 file systems don't have an |
132 |
-info_sector so pointer fs_info->info_sector remains assigned NULL from |
133 |
-fat_alloc(). When resizing a FAT file system create_resize_context() |
134 |
-was always dereferencing fs_info->info_sector to memory copy the |
135 |
-info_sector, hence it crashed for FAT12 and FAT16. |
136 |
- |
137 |
-Make create_resize_context() only copy the info_sector for FAT32 file |
138 |
-systems. |
139 |
- |
140 |
-Reported by Christian Hesse in |
141 |
-https://bugzilla.gnome.org/show_bug.cgi?id=735669 |
142 |
---- |
143 |
-diff --git a/NEWS b/NEWS |
144 |
-index 297b0a5..da7db50 100644 |
145 |
---- a/NEWS |
146 |
-+++ b/NEWS |
147 |
-@@ -2,6 +2,10 @@ GNU parted NEWS -*- outline -*- |
148 |
- |
149 |
- * Noteworthy changes in release ?.? (????-??-??) [?] |
150 |
- |
151 |
-+** Bug Fixes |
152 |
-+ |
153 |
-+ libparted-fs-resize: Prevent crash resizing FAT16 file systems. |
154 |
-+ |
155 |
- |
156 |
- * Noteworthy changes in release 3.2 (2014-07-28) [stable] |
157 |
- |
158 |
-diff --git a/libparted/fs/r/fat/resize.c b/libparted/fs/r/fat/resize.c |
159 |
-index 919acf0..bfe60a0 100644 |
160 |
---- a/libparted/fs/r/fat/resize.c |
161 |
-+++ b/libparted/fs/r/fat/resize.c |
162 |
-@@ -668,11 +668,17 @@ create_resize_context (PedFileSystem* fs, const PedGeometry* new_geom) |
163 |
- |
164 |
- /* preserve boot code, etc. */ |
165 |
- new_fs_info->boot_sector = ped_malloc (new_geom->dev->sector_size); |
166 |
-- new_fs_info->info_sector = ped_malloc (new_geom->dev->sector_size); |
167 |
- memcpy (new_fs_info->boot_sector, fs_info->boot_sector, |
168 |
- new_geom->dev->sector_size); |
169 |
-- memcpy (new_fs_info->info_sector, fs_info->info_sector, |
170 |
-- new_geom->dev->sector_size); |
171 |
-+ new_fs_info->info_sector = NULL; |
172 |
-+ if (fs_info->fat_type == FAT_TYPE_FAT32) |
173 |
-+ { |
174 |
-+ PED_ASSERT (fs_info->info_sector != NULL); |
175 |
-+ new_fs_info->info_sector = |
176 |
-+ ped_malloc (new_geom->dev->sector_size); |
177 |
-+ memcpy (new_fs_info->info_sector, fs_info->info_sector, |
178 |
-+ new_geom->dev->sector_size); |
179 |
-+ } |
180 |
- |
181 |
- new_fs_info->logical_sector_size = fs_info->logical_sector_size; |
182 |
- new_fs_info->sector_count = new_geom->length; |
183 |
--- |
184 |
-cgit v0.9.0.2 |
185 |
|
186 |
diff --git a/sys-block/parted/files/parted-3.2-po4a-mandir.patch b/sys-block/parted/files/parted-3.2-po4a-mandir.patch |
187 |
deleted file mode 100644 |
188 |
index be0a9c69..00000000 |
189 |
--- a/sys-block/parted/files/parted-3.2-po4a-mandir.patch |
190 |
+++ /dev/null |
191 |
@@ -1,11 +0,0 @@ |
192 |
---- a/doc/po4a.mk |
193 |
-+++ b/doc/po4a.mk |
194 |
-@@ -23,7 +23,7 @@ |
195 |
- # threshold is 80%), it won't be distributed, and the build won't fail. |
196 |
- # |
197 |
- |
198 |
--mandir = $(mandir)/$(lang) |
199 |
-+mandir := $(mandir)/$(lang) |
200 |
- |
201 |
- # Inform automake that we want to install some man pages in section 1, 5 |
202 |
- # and 8. |
203 |
|
204 |
diff --git a/sys-block/parted/files/parted-3.2-sysmacros.patch b/sys-block/parted/files/parted-3.2-sysmacros.patch |
205 |
deleted file mode 100644 |
206 |
index a29e7619..00000000 |
207 |
--- a/sys-block/parted/files/parted-3.2-sysmacros.patch |
208 |
+++ /dev/null |
209 |
@@ -1,28 +0,0 @@ |
210 |
-https://bugs.gentoo.org/580022 |
211 |
- |
212 |
-From dec8995fe80508374beba6356f6ecbba8ef6b18b Mon Sep 17 00:00:00 2001 |
213 |
-From: Mike Frysinger <vapier@g.o> |
214 |
-Date: Tue, 21 Jun 2016 15:01:08 -0400 |
215 |
-Subject: [PATCH] include sysmacros.h for major/minor/makedev |
216 |
- |
217 |
-Linux C libs are moving away from including this header implicitly via |
218 |
-sys/types.h, so include it explicitly. |
219 |
---- |
220 |
- libparted/arch/linux.c | 1 + |
221 |
- 1 file changed, 1 insertion(+) |
222 |
- |
223 |
-diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c |
224 |
-index 326b95619d31..e5c168be3c68 100644 |
225 |
---- a/libparted/arch/linux.c |
226 |
-+++ b/libparted/arch/linux.c |
227 |
-@@ -37,6 +37,7 @@ |
228 |
- #include <dirent.h> |
229 |
- #include <sys/ioctl.h> |
230 |
- #include <sys/stat.h> |
231 |
-+#include <sys/sysmacros.h> |
232 |
- #include <sys/types.h> |
233 |
- #include <sys/utsname.h> /* for uname() */ |
234 |
- #include <scsi/scsi.h> |
235 |
--- |
236 |
-2.8.2 |
237 |
- |
238 |
|
239 |
diff --git a/sys-block/parted/metadata.xml b/sys-block/parted/metadata.xml |
240 |
deleted file mode 100644 |
241 |
index 2011c011..00000000 |
242 |
--- a/sys-block/parted/metadata.xml |
243 |
+++ /dev/null |
244 |
@@ -1,20 +0,0 @@ |
245 |
-<?xml version="1.0" encoding="UTF-8"?> |
246 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
247 |
-<pkgmetadata> |
248 |
- <maintainer type="project"> |
249 |
- <email>livecd@g.o</email> |
250 |
- <name>Gentoo LiveCD Project</name> |
251 |
- </maintainer> |
252 |
- <use> |
253 |
- <flag name="device-mapper"> |
254 |
- Enable device-mapper support from <pkg>sys-fs/lvm2</pkg> in parted |
255 |
- </flag> |
256 |
- <flag name="debug"> |
257 |
- Enable debugging as encouraged by upstream: [The default configuration] |
258 |
- includes --enable-debug (by default), which contains many assertions. |
259 |
- Obviously, these "waste" space, but in the past, they have caught |
260 |
- potentially dangerous bugs before they would have done damage, so we think |
261 |
- it's worth it. Also, it means we get more bug reports ;) |
262 |
- </flag> |
263 |
- </use> |
264 |
-</pkgmetadata> |
265 |
|
266 |
diff --git a/sys-block/parted/parted-3.2-r2.ebuild b/sys-block/parted/parted-3.2-r2.ebuild |
267 |
deleted file mode 100644 |
268 |
index 1a934862..00000000 |
269 |
--- a/sys-block/parted/parted-3.2-r2.ebuild |
270 |
+++ /dev/null |
271 |
@@ -1,64 +0,0 @@ |
272 |
-# Copyright 1999-2017 Gentoo Foundation |
273 |
-# Distributed under the terms of the GNU General Public License v2 |
274 |
- |
275 |
-EAPI=6 |
276 |
-inherit autotools eutils flag-o-matic |
277 |
- |
278 |
-DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" |
279 |
-HOMEPAGE="https://www.gnu.org/software/parted" |
280 |
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" |
281 |
- |
282 |
-LICENSE="GPL-3" |
283 |
-SLOT="0" |
284 |
-KEYWORDS="amd64 arm arm64 ~mips ppc x86" |
285 |
-IUSE="+debug device-mapper nls readline selinux static-libs" |
286 |
-RESTRICT="test" |
287 |
- |
288 |
-# specific version for gettext needed |
289 |
-# to fix bug 85999 |
290 |
-RDEPEND=" |
291 |
- >=sys-fs/e2fsprogs-1.27 |
292 |
- device-mapper? ( >=sys-fs/lvm2-2.02.45 ) |
293 |
- readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= ) |
294 |
- selinux? ( sys-libs/libselinux ) |
295 |
- elibc_uclibc? ( dev-libs/libiconv ) |
296 |
-" |
297 |
-DEPEND=" |
298 |
- ${RDEPEND} |
299 |
- nls? ( >=sys-devel/gettext-0.12.1-r2 ) |
300 |
- virtual/pkgconfig |
301 |
-" |
302 |
-PATCHES=( |
303 |
- "${FILESDIR}"/${PN}-3.2-devmapper.patch |
304 |
- "${FILESDIR}"/${PN}-3.2-po4a-mandir.patch |
305 |
- "${FILESDIR}"/${PN}-3.2-fix-resizing-FAT16.patch |
306 |
- "${FILESDIR}"/${PN}-3.2-sysmacros.patch |
307 |
- "${FILESDIR}"/${PN}-3.2-fix-includes.patch |
308 |
-) |
309 |
- |
310 |
-src_prepare() { |
311 |
- default |
312 |
- |
313 |
- eautoreconf |
314 |
-} |
315 |
- |
316 |
-src_configure() { |
317 |
- use elibc_uclibc && append-libs -liconv |
318 |
- econf \ |
319 |
- $(use_enable debug) \ |
320 |
- $(use_enable device-mapper) \ |
321 |
- $(use_enable nls) \ |
322 |
- $(use_enable selinux) \ |
323 |
- $(use_enable static-libs static) \ |
324 |
- $(use_with readline) \ |
325 |
- --disable-rpath \ |
326 |
- --disable-silent-rules |
327 |
-} |
328 |
- |
329 |
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} ) |
330 |
- |
331 |
-src_install() { |
332 |
- default |
333 |
- |
334 |
- prune_libtool_files |
335 |
-} |
336 |
|
337 |
diff --git a/sys-block/parted/parted-3.2.ebuild b/sys-block/parted/parted-3.2.ebuild |
338 |
deleted file mode 100644 |
339 |
index 55198ce3..00000000 |
340 |
--- a/sys-block/parted/parted-3.2.ebuild |
341 |
+++ /dev/null |
342 |
@@ -1,58 +0,0 @@ |
343 |
-# Copyright 1999-2015 Gentoo Foundation |
344 |
-# Distributed under the terms of the GNU General Public License v2 |
345 |
- |
346 |
-EAPI=5 |
347 |
- |
348 |
-inherit autotools eutils |
349 |
- |
350 |
-DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" |
351 |
-HOMEPAGE="https://www.gnu.org/software/parted" |
352 |
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" |
353 |
- |
354 |
-LICENSE="GPL-3" |
355 |
-SLOT="0" |
356 |
-KEYWORDS="amd64 arm arm64 ~mips ppc x86" |
357 |
-IUSE="+debug device-mapper nls readline selinux static-libs" |
358 |
-RESTRICT="test" |
359 |
- |
360 |
-# specific version for gettext needed |
361 |
-# to fix bug 85999 |
362 |
-RDEPEND=" |
363 |
- >=sys-fs/e2fsprogs-1.27 |
364 |
- >=sys-libs/ncurses-5.7-r7:0= |
365 |
- device-mapper? ( >=sys-fs/lvm2-2.02.45 ) |
366 |
- readline? ( >=sys-libs/readline-5.2:0= ) |
367 |
- selinux? ( sys-libs/libselinux ) |
368 |
-" |
369 |
-DEPEND=" |
370 |
- ${RDEPEND} |
371 |
- nls? ( >=sys-devel/gettext-0.12.1-r2 ) |
372 |
- virtual/pkgconfig |
373 |
-" |
374 |
- |
375 |
-src_prepare() { |
376 |
- epatch \ |
377 |
- "${FILESDIR}"/${PN}-3.2-devmapper.patch \ |
378 |
- "${FILESDIR}"/${PN}-3.2-po4a-mandir.patch \ |
379 |
- "${FILESDIR}"/${PN}-3.2-fix-includes.patch |
380 |
- eautoreconf |
381 |
-} |
382 |
- |
383 |
-src_configure() { |
384 |
- econf \ |
385 |
- $(use_enable debug) \ |
386 |
- $(use_enable device-mapper) \ |
387 |
- $(use_enable nls) \ |
388 |
- $(use_enable selinux) \ |
389 |
- $(use_enable static-libs static) \ |
390 |
- $(use_with readline) \ |
391 |
- --disable-rpath \ |
392 |
- --disable-silent-rules |
393 |
-} |
394 |
- |
395 |
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} ) |
396 |
- |
397 |
-src_install() { |
398 |
- default |
399 |
- prune_libtool_files |
400 |
-} |