From 1f18bb0a23e9566aae5953a49983684ff8c0ee19 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sat, 14 Nov 2020 21:57:52 +0100 Subject: sys-block/parted: Remove old MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sys-block/parted/Manifest | 3 - sys-block/parted/files/parted-3.2-devmapper.patch | 60 ------------------- .../files/parted-3.2-fix-resizing-FAT16.patch | 64 -------------------- sys-block/parted/files/parted-3.2-sysmacros.patch | 28 --------- sys-block/parted/parted-3.2-r1.ebuild | 59 ------------------- sys-block/parted/parted-3.2_p23.ebuild | 68 ---------------------- sys-block/parted/parted-3.2_p25.ebuild | 68 ---------------------- 7 files changed, 350 deletions(-) delete mode 100644 sys-block/parted/files/parted-3.2-devmapper.patch delete mode 100644 sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch delete mode 100644 sys-block/parted/files/parted-3.2-sysmacros.patch delete mode 100644 sys-block/parted/parted-3.2-r1.ebuild delete mode 100644 sys-block/parted/parted-3.2_p23.ebuild delete mode 100644 sys-block/parted/parted-3.2_p25.ebuild (limited to 'sys-block') diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest index 5f56dd2b3869..50657888893e 100644 --- a/sys-block/parted/Manifest +++ b/sys-block/parted/Manifest @@ -1,4 +1 @@ -DIST parted-3.2.tar.xz 1655244 BLAKE2B 56608590b26a9b5266dacf3698d990b730bdb35d9374d1da57103fbef3ef5037e40dd2fe0f523ca8e0e75401a3b25cf543e5ca5c94cf410bbaa62ea15d6f0ba3 SHA512 4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4 DIST parted-3.3.tar.xz 1757432 BLAKE2B d1e248cd8fdce22d4957055d65f9f93333505229f92174f343897422a31a43f3d35ea06f8f1bdafd254e4629c5890ec38d6b75d3b499c39a9ada4a8d5f9d9d8f SHA512 d1384694a491aa53bab6206fdeccd1d192de2ed379fe25aa865dd6aa06ed945a728e85b2ccc2fb23f5aa9dfee4a8bd8f0f2be1dd386cb8e8861b73382c6a07e4 -DIST parted_3.2-23.debian.tar.xz 88152 BLAKE2B 5e69a5799cc909bf54d1dcd1c7a8f7fe5dd7ce46b03957406f4a6118480d5acca3a165cc16b720fd03a89339fcfb46844d470079c4e10a4683e270c9e804c245 SHA512 7f449a24d1ea75a185b5fd589fea73a2f0944f1276288ece2790c5889de6adf8354f94388046a25b2dbf5735759f6010397f140607320a4de348cf77f8c75b09 -DIST parted_3.2-25.debian.tar.xz 88524 BLAKE2B e994ca8a68f700773e0a67657d59793ea130a5c7e9eca31688fa48e7133a0c350446b8c0a175ac2f59aca8c2fe1ef419a94f3f6f0547b0b25cca329c6f569571 SHA512 2d4e52513b016ef67b203db577641cd56b4d2d013e1bc186b665ab47d0f6c673321b108f81d36caaa0fd14c555d8336a2556a60cccbeccb9d2cf98a85872d949 diff --git a/sys-block/parted/files/parted-3.2-devmapper.patch b/sys-block/parted/files/parted-3.2-devmapper.patch deleted file mode 100644 index 0cd3e0e3307f..000000000000 --- a/sys-block/parted/files/parted-3.2-devmapper.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/libparted/arch/linux.c -+++ b/libparted/arch/linux.c -@@ -2304,6 +2304,7 @@ - return r < 0 ? NULL : resultp; - } - -+#ifdef ENABLE_DEVICE_MAPPER - static char * - dm_canonical_path (PedDevice const *dev) - { -@@ -2326,12 +2327,22 @@ - err: - return NULL; - } -+#endif /* ENABLE_DEVICE_MAPPER */ - - static char* - _device_get_part_path (PedDevice const *dev, int num) - { -- char *devpath = (dev->type == PED_DEVICE_DM -- ? dm_canonical_path (dev) : dev->path); -+ char *devpath = -+#ifdef ENABLE_DEVICE_MAPPER -+ ( -+ dev->type == PED_DEVICE_DM -+ ? dm_canonical_path (dev) : -+#endif /* ENABLE_DEVICE_MAPPER */ -+ dev->path -+#ifdef ENABLE_DEVICE_MAPPER -+ ) -+#endif /* ENABLE_DEVICE_MAPPER */ -+ ; - size_t path_len = strlen (devpath); - char *result; - /* Check for devfs-style /disc => /partN transformation -@@ -2945,12 +2956,14 @@ - unsigned long long *length); - - -+#ifdef ENABLE_DEVICE_MAPPER - if (disk->dev->type == PED_DEVICE_DM) { - add_partition = _dm_add_partition; - remove_partition = _dm_remove_partition; - resize_partition = _dm_resize_partition; - get_partition_start_and_length = _dm_get_partition_start_and_length; - } else { -+#endif /* ENABLE_DEVICE_MAPPER */ - add_partition = _blkpg_add_partition; - remove_partition = _blkpg_remove_partition; - #ifdef BLKPG_RESIZE_PARTITION -@@ -2959,7 +2972,9 @@ - resize_partition = NULL; - #endif - get_partition_start_and_length = _kernel_get_partition_start_and_length; -+#ifdef ENABLE_DEVICE_MAPPER - } -+#endif /* ENABLE_DEVICE_MAPPER */ - - /* lpn = largest partition number. - * for remove pass, use greater of device or label limit */ 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 deleted file mode 100644 index 2a5a2311f1dd..000000000000 --- a/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 1e9e770f4bc7f3d80e09ecd1df58575fad064163 Mon Sep 17 00:00:00 2001 -From: Mike Fleetwood -Date: Sun, 28 Sep 2014 15:15:48 +0000 -Subject: lib-fs-resize: Prevent crash resizing FAT16 file systems - -Resizing FAT16 file system crashes in libparted/fs/r/fat/resize.c -create_resize_context() because it was dereferencing NULL pointer -fs_info->info_sector to copy the info_sector. - -Only FAT32 file systems have info_sector populated by fat_open() -> -fat_info_sector_read(). FAT12 and FAT16 file systems don't have an -info_sector so pointer fs_info->info_sector remains assigned NULL from -fat_alloc(). When resizing a FAT file system create_resize_context() -was always dereferencing fs_info->info_sector to memory copy the -info_sector, hence it crashed for FAT12 and FAT16. - -Make create_resize_context() only copy the info_sector for FAT32 file -systems. - -Reported by Christian Hesse in -https://bugzilla.gnome.org/show_bug.cgi?id=735669 ---- -diff --git a/NEWS b/NEWS -index 297b0a5..da7db50 100644 ---- a/NEWS -+++ b/NEWS -@@ -2,6 +2,10 @@ GNU parted NEWS -*- outline -*- - - * Noteworthy changes in release ?.? (????-??-??) [?] - -+** Bug Fixes -+ -+ libparted-fs-resize: Prevent crash resizing FAT16 file systems. -+ - - * Noteworthy changes in release 3.2 (2014-07-28) [stable] - -diff --git a/libparted/fs/r/fat/resize.c b/libparted/fs/r/fat/resize.c -index 919acf0..bfe60a0 100644 ---- a/libparted/fs/r/fat/resize.c -+++ b/libparted/fs/r/fat/resize.c -@@ -668,11 +668,17 @@ create_resize_context (PedFileSystem* fs, const PedGeometry* new_geom) - - /* preserve boot code, etc. */ - new_fs_info->boot_sector = ped_malloc (new_geom->dev->sector_size); -- new_fs_info->info_sector = ped_malloc (new_geom->dev->sector_size); - memcpy (new_fs_info->boot_sector, fs_info->boot_sector, - new_geom->dev->sector_size); -- memcpy (new_fs_info->info_sector, fs_info->info_sector, -- new_geom->dev->sector_size); -+ new_fs_info->info_sector = NULL; -+ if (fs_info->fat_type == FAT_TYPE_FAT32) -+ { -+ PED_ASSERT (fs_info->info_sector != NULL); -+ new_fs_info->info_sector = -+ ped_malloc (new_geom->dev->sector_size); -+ memcpy (new_fs_info->info_sector, fs_info->info_sector, -+ new_geom->dev->sector_size); -+ } - - new_fs_info->logical_sector_size = fs_info->logical_sector_size; - new_fs_info->sector_count = new_geom->length; --- -cgit v0.9.0.2 diff --git a/sys-block/parted/files/parted-3.2-sysmacros.patch b/sys-block/parted/files/parted-3.2-sysmacros.patch deleted file mode 100644 index a29e7619b148..000000000000 --- a/sys-block/parted/files/parted-3.2-sysmacros.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://bugs.gentoo.org/580022 - -From dec8995fe80508374beba6356f6ecbba8ef6b18b Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Tue, 21 Jun 2016 15:01:08 -0400 -Subject: [PATCH] include sysmacros.h for major/minor/makedev - -Linux C libs are moving away from including this header implicitly via -sys/types.h, so include it explicitly. ---- - libparted/arch/linux.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c -index 326b95619d31..e5c168be3c68 100644 ---- a/libparted/arch/linux.c -+++ b/libparted/arch/linux.c -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - #include - #include /* for uname() */ - #include --- -2.8.2 - diff --git a/sys-block/parted/parted-3.2-r1.ebuild b/sys-block/parted/parted-3.2-r1.ebuild deleted file mode 100644 index 5c7263071d8e..000000000000 --- a/sys-block/parted/parted-3.2-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils flag-o-matic ltprune - -DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" -HOMEPAGE="https://www.gnu.org/software/parted" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -IUSE="+debug device-mapper nls readline selinux static-libs" -RESTRICT="test" - -# specific version for gettext needed -# to fix bug 85999 -RDEPEND=" - >=sys-fs/e2fsprogs-1.27 - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) - readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= ) - selinux? ( sys-libs/libselinux ) - elibc_uclibc? ( dev-libs/libiconv ) -" -DEPEND=" - ${RDEPEND} - nls? ( >=sys-devel/gettext-0.12.1-r2 ) - virtual/pkgconfig -" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-3.2-devmapper.patch \ - "${FILESDIR}"/${PN}-3.2-po4a-mandir.patch \ - "${FILESDIR}"/${PN}-3.2-fix-resizing-FAT16.patch \ - "${FILESDIR}"/${PN}-3.2-sysmacros.patch - - eautoreconf -} - -src_configure() { - use elibc_uclibc && append-libs -liconv - econf \ - $(use_enable debug) \ - $(use_enable device-mapper) \ - $(use_enable nls) \ - $(use_enable selinux) \ - $(use_enable static-libs static) \ - $(use_with readline) \ - --disable-rpath -} - -DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} ) - -src_install() { - default - prune_libtool_files -} diff --git a/sys-block/parted/parted-3.2_p23.ebuild b/sys-block/parted/parted-3.2_p23.ebuild deleted file mode 100644 index c02bd5426f6d..000000000000 --- a/sys-block/parted/parted-3.2_p23.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic - -DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" -HOMEPAGE="https://www.gnu.org/software/parted" -SRC_URI=" - mirror://gnu/${PN}/${P/_p*/}.tar.xz - mirror://debian/pool/main/p/${PN}/${PN}_${PV/_p/-}.debian.tar.xz -" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="+debug device-mapper nls readline selinux static-libs" -RESTRICT="test" - -# specific version for gettext needed -# to fix bug 85999 -RDEPEND=" - >=sys-fs/e2fsprogs-1.27 - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) - readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= ) - selinux? ( sys-libs/libselinux ) - elibc_uclibc? ( dev-libs/libiconv ) -" -DEPEND=" - ${RDEPEND} - nls? ( >=sys-devel/gettext-0.12.1-r2 ) - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-3.2-devmapper.patch - "${FILESDIR}"/${PN}-3.2-po4a-mandir.patch -) -S=${WORKDIR}/${P/_p*/} - -src_prepare() { - default - sed -i -e '/atari\.patch/d' "${WORKDIR}"/debian/patches/series || die - for patch in $(< "${WORKDIR}"/debian/patches/series); do - eapply "${WORKDIR}/debian/patches/$patch" - done - - eautoreconf -} - -src_configure() { - use elibc_uclibc && append-libs -liconv - econf \ - $(use_enable debug) \ - $(use_enable device-mapper) \ - $(use_enable nls) \ - $(use_enable selinux) \ - $(use_enable static-libs static) \ - $(use_with readline) \ - --disable-rpath -} - -DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} ) - -src_install() { - default - - find "${D}" -name '*.la' -delete || die -} diff --git a/sys-block/parted/parted-3.2_p25.ebuild b/sys-block/parted/parted-3.2_p25.ebuild deleted file mode 100644 index fceabd18435f..000000000000 --- a/sys-block/parted/parted-3.2_p25.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic - -DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" -HOMEPAGE="https://www.gnu.org/software/parted" -SRC_URI=" - mirror://gnu/${PN}/${P/_p*/}.tar.xz - mirror://debian/pool/main/p/${PN}/${PN}_${PV/_p/-}.debian.tar.xz -" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="+debug device-mapper nls readline selinux static-libs" -RESTRICT="test" - -# specific version for gettext needed -# to fix bug 85999 -RDEPEND=" - >=sys-fs/e2fsprogs-1.27 - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) - readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= ) - selinux? ( sys-libs/libselinux ) - elibc_uclibc? ( dev-libs/libiconv ) -" -DEPEND=" - ${RDEPEND} - nls? ( >=sys-devel/gettext-0.12.1-r2 ) - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-3.2-devmapper.patch - "${FILESDIR}"/${PN}-3.2-po4a-mandir.patch -) -S=${WORKDIR}/${P/_p*/} - -src_prepare() { - default - sed -i -e '/atari\.patch/d' "${WORKDIR}"/debian/patches/series || die - for patch in $(< "${WORKDIR}"/debian/patches/series); do - eapply "${WORKDIR}/debian/patches/$patch" - done - - eautoreconf -} - -src_configure() { - use elibc_uclibc && append-libs -liconv - econf \ - $(use_enable debug) \ - $(use_enable device-mapper) \ - $(use_enable nls) \ - $(use_enable selinux) \ - $(use_enable static-libs static) \ - $(use_with readline) \ - --disable-rpath -} - -DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} ) - -src_install() { - default - - find "${D}" -name '*.la' -delete || die -} -- cgit v1.2.3-65-gdbad