* [gentoo-commits] repo/gentoo:master commit in: sys-block/parted/files/, sys-block/parted/
@ 2020-01-03 15:14 Jeroen Roovers
0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2020-01-03 15:14 UTC (permalink / raw
To: gentoo-commits
commit: 4bab6569878f89180d50a40524a675712b0cec2a
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 3 15:13:06 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jan 3 15:14:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bab6569
sys-block/parted: Reintroduce PED_ASSERT with correct assertion
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Bug: https://bugs.gentoo.org/704704
Fixes: 1af57544e419afdbc54cb6dc76e053593e4bb088
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
sys-block/parted/files/parted-3.3-atari.patch | 2 +-
sys-block/parted/{parted-3.3-r1.ebuild => parted-3.3-r2.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-block/parted/files/parted-3.3-atari.patch b/sys-block/parted/files/parted-3.3-atari.patch
index 41771d02d4e..af9c488d48d 100644
--- a/sys-block/parted/files/parted-3.3-atari.patch
+++ b/sys-block/parted/files/parted-3.3-atari.patch
@@ -5,7 +5,7 @@
PED_ASSERT (sizeof (AtariRawTable) == 512);
/* GNU Libc doesn't support NULL instead of the locale name */
- PED_ASSERT ((atr_c_locale = newlocale(LC_ALL_MASK, "C", NULL)) != NULL);
-+ atr_c_locale = newlocale(LC_ALL_MASK, "C", NULL);
++ PED_ASSERT ((atr_c_locale = newlocale(LC_ALL_MASK, "C", (locale_t) 0)) != (locale_t) 0);
ped_disk_type_register (&atari_disk_type);
}
diff --git a/sys-block/parted/parted-3.3-r1.ebuild b/sys-block/parted/parted-3.3-r2.ebuild
similarity index 100%
rename from sys-block/parted/parted-3.3-r1.ebuild
rename to sys-block/parted/parted-3.3-r2.ebuild
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-block/parted/files/, sys-block/parted/
@ 2023-06-16 3:05 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-06-16 3:05 UTC (permalink / raw
To: gentoo-commits
commit: 8489bdccc712eb390d43de5f3b0918bb839e8361
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 16 02:56:01 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 16 02:56:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8489bdcc
sys-block/parted: fix test portability issues
Closes: https://bugs.gentoo.org/753677
Closes: https://bugs.gentoo.org/890869
Thanks-to: Kerin Millar <kfm <AT> plushkava.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../parted/files/parted-3.6-tests-non-bash.patch | 86 ++++++++++++++++++++++
.../parted/files/parted-3.6-tests-unicode.patch | 59 +++++++++++++++
sys-block/parted/parted-3.6.ebuild | 6 +-
3 files changed, 150 insertions(+), 1 deletion(-)
diff --git a/sys-block/parted/files/parted-3.6-tests-non-bash.patch b/sys-block/parted/files/parted-3.6-tests-non-bash.patch
new file mode 100644
index 000000000000..02c44f68998a
--- /dev/null
+++ b/sys-block/parted/files/parted-3.6-tests-non-bash.patch
@@ -0,0 +1,86 @@
+https://debbugs.gnu.org/61128
+
+From c7b5c04083b8fc21c3e0d044375631d559e122e3 Mon Sep 17 00:00:00 2001
+From: Kerin Millar <kfm@plushkava.net>
+Date: Wed, 25 Jan 2023 15:26:46 +0000
+Subject: [PATCH] Use complementation correctly in shell globs
+
+Negation should be performed by using the <exclamation-mark> character.
+Attempting to use the <circumflex> shall result in undefined behaviour.
+
+Dash used to tolerate this violation of the spec but the following
+commit put a stop to it.
+
+https://git.kernel.org/pub/scm/utils/dash/dash.git/commit/?id=8f9cca0
+
+Signed-off-by: Kerin Millar <kfm@plushkava.net>
+Link: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_13
+Bug: https://bugs.gentoo.org/890869
+--- a/m4/o-direct.m4
++++ b/m4/o-direct.m4
+@@ -47,14 +47,14 @@ frobnozzle
+ /dev/shm) ;;
+ /*) case $pe_dir in
+ # Accept $HOME or $TMP only if the value is nice and boring.
+- *[^/a-zA-Z0-9_.-]*) ;;
++ *[!/a-zA-Z0-9_.-]*) ;;
+ *) pe_cand_dirs="$pe_cand_dirs $pe_dir";;
+ esac
+ esac
+ done
+
+ case $PARTED_TMPDIR in
+- *[^/a-zA-Z0-9_.-]*) ;;
++ *[!/a-zA-Z0-9_.-]*) ;;
+ *) pe_cand_dirs="$PARTED_TMPDIR $pe_cand_dirs";;
+ esac
+
+--- a/tests/t-local.sh
++++ b/tests/t-local.sh
+@@ -138,7 +138,7 @@ require_512_byte_sector_size_()
+ peek_()
+ {
+ case $# in 2) ;; *) echo "usage: peek_ FILE 0_BASED_OFFSET" >&2; exit 1;; esac
+- case $2 in *[^0-9]*) echo "peek_: invalid offset: $2" >&2; exit 1 ;; esac
++ case $2 in *[!0-9]*) echo "peek_: invalid offset: $2" >&2; exit 1 ;; esac
+ dd if="$1" bs=1 skip="$2" count=1
+ }
+
+@@ -146,7 +146,7 @@ poke_()
+ {
+ case $# in 3) ;; *) echo "usage: poke_ FILE 0_BASED_OFFSET BYTE" >&2; exit 1;;
+ esac
+- case $2 in *[^0-9]*) echo "poke_: invalid offset: $2" >&2; exit 1 ;; esac
++ case $2 in *[!0-9]*) echo "poke_: invalid offset: $2" >&2; exit 1 ;; esac
+ case $3 in ?) ;; *) echo "poke_: invalid byte: '$3'" >&2; exit 1 ;; esac
+ printf %s "$3" | dd of="$1" bs=1 seek="$2" count=1 conv=notrunc
+ }
+@@ -155,7 +155,7 @@ poke_()
+ gpt1_pte_name_offset_()
+ {
+ local ss=$1
+- case $ss in *[^0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; esac
++ case $ss in *[!0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; esac
+ expr $ss \* 2 + 56
+ return 0
+ }
+@@ -167,7 +167,7 @@ gpt_corrupt_primary_table_()
+ case $# in 2) ;; *) echo "$0: expected 2 args, got $#" >&2; return 1;; esac
+ local dev=$1
+ local ss=$2
+- case $ss in *[^0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; esac
++ case $ss in *[!0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; esac
+
+ # get the first byte of the name
+ local orig_pte_name_byte
+@@ -188,7 +188,7 @@ gpt_restore_primary_table_()
+ case $# in 3) ;; *) echo "$0: expected 2 args, got $#" >&2; return 1;; esac
+ local dev=$1
+ local ss=$2
+- case $ss in *[^0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; esac
++ case $ss in *[!0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; esac
+ local orig_byte=$3
+ poke_ $dev $(gpt1_pte_name_offset_ $ss) "$orig_byte" || return 1
+ }
+--
+2.39.1
diff --git a/sys-block/parted/files/parted-3.6-tests-unicode.patch b/sys-block/parted/files/parted-3.6-tests-unicode.patch
new file mode 100644
index 000000000000..316c184f460d
--- /dev/null
+++ b/sys-block/parted/files/parted-3.6-tests-unicode.patch
@@ -0,0 +1,59 @@
+https://debbugs.gnu.org/61129
+
+From af8ed66e00bfac4a189ea32c62199bffaa3eb836 Mon Sep 17 00:00:00 2001
+From: Kerin Millar <kfm@plushkava.net>
+Date: Sun, 29 Jan 2023 00:34:27 +0000
+Subject: [PATCH] Use any available UTF-8 locale in t0251; skip if none found
+
+The "t0251-gpt-unicode.sh" test presently suffers from several issues
+which are addressed herewith.
+
+Do not begin by trying to match the "en_US.utf8" locale specifically.
+The only requirement for the test to be conducted correctly is that the
+system character type be set to UTF-8. For this, _any_ UTF-8 supporting
+locale will do. Simply select the first locale that ends with ".utf8"
+or "UTF-8". After all, not everyone is American, nor do all systems
+using GNU glibc yet have a C.UTF-8 locale.
+
+Escape the dot/period in the locale-matching regular expression.
+
+Skip the test outright if no UTF-8 supporting locale can be found,
+rather than spuriously fail.
+
+Assign the locale found to LC_CTYPE. There is no need to set any of the
+other locale-related environment variables for the purpose of this
+test. To guarantee that LC_CTYPE takes effect, unset LC_ALL also.
+
+Signed-off-by: Kerin Millar <kfm@plushkava.net>
+Bug: https://bugs.gentoo.org/753677
+--- a/tests/t0251-gpt-unicode.sh
++++ b/tests/t0251-gpt-unicode.sh
+@@ -17,16 +17,21 @@
+
+ . "${srcdir=.}/init.sh"; path_prepend_ ../parted
+
++# LC_CTYPE must not be overridden
++unset LC_ALL
++
++# any UTF-8 locale will suffice for setting the character type
++LC_CTYPE=$(locale -a | awk '/\.(utf8|UTF-8)$/ { print; exit; }')
++if [ -z "$LC_CTYPE" ]; then
++ skip_ 'no UTF-8 supporting locale is available'
++fi
++export LC_CTYPE
++
+ dev=loop-file
+
+ # create zeroed device
+ truncate -s 10m $dev || fail=1
+
+-LC_ALL=$(locale -a | grep en_US.utf8)
+-if [ -z "$LC_ALL" ]; then
+- LC_ALL=C.UTF-8
+-fi
+-export LC_ALL="$LC_ALL"
+ # create gpt label with named partition
+ part_name=$(printf 'foo\341\264\244')
+ parted -s $dev mklabel gpt mkpart primary ext2 1MiB 2MiB name 1 $part_name > empty 2>&1 || fail=1
+--
+2.39.1
diff --git a/sys-block/parted/parted-3.6.ebuild b/sys-block/parted/parted-3.6.ebuild
index a6fac85ad7db..e70d45603592 100644
--- a/sys-block/parted/parted-3.6.ebuild
+++ b/sys-block/parted/parted-3.6.ebuild
@@ -45,6 +45,10 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.3-atari.patch
# https://lists.gnu.org/archive/html/bug-parted/2022-02/msg00000.html
"${FILESDIR}"/${PN}-3.4-posix-printf.patch
+ # https://debbugs.gnu.org/61129
+ "${FILESDIR}"/${PN}-3.6-tests-unicode.patch
+ # https://debbugs.gnu.org/61128
+ "${FILESDIR}"/${PN}-3.6-tests-non-bash.patch
)
# false positive
@@ -52,7 +56,7 @@ QA_CONFIG_IMPL_DECL_SKIP="MIN"
src_prepare() {
default
- eautoconf
+ eautoreconf
touch doc/pt_BR/Makefile.in || die
}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-block/parted/files/, sys-block/parted/
@ 2022-02-05 21:52 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2022-02-05 21:52 UTC (permalink / raw
To: gentoo-commits
commit: d5bc17a97c9c2c6fe6026f719e3dc6f73c75b329
Author: Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Sat Feb 5 21:52:41 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 5 21:52:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5bc17a9
sys-block/parted: replace non-portable printf in tests
Closes: https://bugs.gentoo.org/774363
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../parted/files/parted-3.4-posix-printf.patch | 63 ++++++++++++++++++++++
sys-block/parted/parted-3.4.ebuild | 2 +
2 files changed, 65 insertions(+)
diff --git a/sys-block/parted/files/parted-3.4-posix-printf.patch b/sys-block/parted/files/parted-3.4-posix-printf.patch
new file mode 100644
index 000000000000..9aeb37c2cf27
--- /dev/null
+++ b/sys-block/parted/files/parted-3.4-posix-printf.patch
@@ -0,0 +1,63 @@
+From 9665bdd5d6756058bb3b767eacc1c195667bf276 Mon Sep 17 00:00:00 2001
+From: Kerin Millar <kfm@plushkava.net>
+Date: Sat, 5 Feb 2022 03:29:34 +0000
+Subject: [PATCH] tests: have printf(1) use octal numbers for POSIX conformance
+
+Per https://pubs.opengroup.org/onlinepubs/9699919799/utilities/printf.html,
+backslash-escape sequences incorporating hexadecimal numbers are non-standard.
+
+Signed-off-by: Kerin Millar <kfm@plushkava.net>
+---
+ tests/t0205-gpt-list-clobbers-pmbr.sh | 4 ++--
+ tests/t0206-gpt-print-with-corrupt-primary-clobbers-pmbr.sh | 4 ++--
+ tests/t2500-probe-corrupt-hfs.sh | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tests/t0205-gpt-list-clobbers-pmbr.sh b/tests/t0205-gpt-list-clobbers-pmbr.sh
+index 52f60cc..b1664fb 100644
+--- a/tests/t0205-gpt-list-clobbers-pmbr.sh
++++ b/tests/t0205-gpt-list-clobbers-pmbr.sh
+@@ -36,8 +36,8 @@ parted -m -s $dev u s p || fail=1
+
+ # Write non-NUL bytes all over the MBR, so we're likely to see any change.
+ # However, be careful to leave the type of the first partition, 0xEE,
+-# as well as the final two magic bytes.
+-printf '%0450d\xee%059d\x55\xaa' 0 0 | dd of=$dev count=1 conv=notrunc || fail=1
++# as well as the final two magic bytes, 0x55 0xAA.
++printf '%0450d\356%059d\125\252' 0 0 | dd of=$dev count=1 conv=notrunc || fail=1
+
+ dd if=$dev of=before count=1 || fail=1
+
+diff --git a/tests/t0206-gpt-print-with-corrupt-primary-clobbers-pmbr.sh b/tests/t0206-gpt-print-with-corrupt-primary-clobbers-pmbr.sh
+index 83c2a9c..8f2a4ef 100755
+--- a/tests/t0206-gpt-print-with-corrupt-primary-clobbers-pmbr.sh
++++ b/tests/t0206-gpt-print-with-corrupt-primary-clobbers-pmbr.sh
+@@ -32,8 +32,8 @@ parted -m -s $dev u s p || fail=1
+
+ # Write non-NUL bytes all over the MBR, so we're likely to see any change.
+ # However, be careful to leave the type of the first partition, 0xEE,
+-# as well as the final two magic bytes.
+-printf '%0450d\xee%059d\x55\xaa' 0 0 | dd of=$dev count=1 conv=notrunc || fail=1
++# as well as the final two magic bytes, 0x55 0xAA.
++printf '%0450d\356%059d\125\252' 0 0 | dd of=$dev count=1 conv=notrunc || fail=1
+
+ dd if=$dev of=before count=1 || fail=1
+
+diff --git a/tests/t2500-probe-corrupt-hfs.sh b/tests/t2500-probe-corrupt-hfs.sh
+index 3b4ade8..32ddcfc 100755
+--- a/tests/t2500-probe-corrupt-hfs.sh
++++ b/tests/t2500-probe-corrupt-hfs.sh
+@@ -29,8 +29,8 @@ compare /dev/null out || fail=1
+
+ parted -s "$dev" u s p || fail=1
+
+-# Poke an HFS+ signature into place
+-printf '\x48\x2b' | dd of=$dev seek=$((2048+2)) conv=notrunc || fail=1
++# Poke an HFS+ signature into place (0x48 0x2B)
++printf '\110\053' | dd of=$dev seek=$((2048+2)) conv=notrunc || fail=1
+
+ # Or, if starting from a valid HFS/HFS+ file system, poke these:
+ # offset 18 total_blocks=0(16b)
+--
+2.35.1
+
diff --git a/sys-block/parted/parted-3.4.ebuild b/sys-block/parted/parted-3.4.ebuild
index 67d60f004ca8..338886d0c62d 100644
--- a/sys-block/parted/parted-3.4.ebuild
+++ b/sys-block/parted/parted-3.4.ebuild
@@ -37,6 +37,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/bcl.asc
PATCHES=(
"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
"${FILESDIR}"/${PN}-3.3-atari.patch
+ # https://lists.gnu.org/archive/html/bug-parted/2022-02/msg00000.html
+ "${FILESDIR}"/${P}-posix-printf.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-block/parted/files/, sys-block/parted/
@ 2020-11-14 21:02 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2020-11-14 21:02 UTC (permalink / raw
To: gentoo-commits
commit: 1f18bb0a23e9566aae5953a49983684ff8c0ee19
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 20:57:52 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 21:02:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f18bb0a
sys-block/parted: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
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(-)
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index 5f56dd2b386..50657888893 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 0cd3e0e3307..00000000000
--- 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 2a5a2311f1d..00000000000
--- 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 <mike.fleetwood@googlemail.com>
-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 a29e7619b14..00000000000
--- 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 <vapier@gentoo.org>
-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 <dirent.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/utsname.h> /* for uname() */
- #include <scsi/scsi.h>
---
-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 5c7263071d8..00000000000
--- 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 c02bd5426f6..00000000000
--- 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 fceabd18435..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-block/parted/files/, sys-block/parted/
@ 2018-02-23 22:31 Andreas Hüttel
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Hüttel @ 2018-02-23 22:31 UTC (permalink / raw
To: gentoo-commits
commit: 3571d8bf77ab6a3ae461f2faa15e3ad9521b32b9
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 22:31:11 2018 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 22:31:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3571d8bf
sys-block/parted: Drop old, bug 575232
Bug: https://bugs.gentoo.org/580022
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sys-block/parted/Manifest | 2 -
sys-block/parted/files/parted-2.4-no-gets.patch | 10 --
sys-block/parted/files/parted-2.4-readline.patch | 11 --
sys-block/parted/files/parted-3.1-readline.patch | 11 --
sys-block/parted/files/parted-3.1-zfs.patch | 170 -----------------------
sys-block/parted/parted-2.4-r1.ebuild | 54 -------
sys-block/parted/parted-2.4.ebuild | 55 --------
sys-block/parted/parted-3.1-r1.ebuild | 81 -----------
sys-block/parted/parted-3.1-r2.ebuild | 85 ------------
9 files changed, 479 deletions(-)
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index 9e17484a69a..fbf95dc359e 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -1,5 +1,3 @@
-DIST parted-2.4.tar.xz 1516412 BLAKE2B fdc489ba9e0636b6f3e67d3863acf88ab3143e60aab2a75765502347e644954014530b7b1ad6dd625e6504abf936d367e65d418ba13379f57b4ba1c386583a23 SHA512 1f7ac11079981b176c1157bd6d858e67394bb4be9b622f91d4e78412a41c696809ed60912b8b94f3a2a924b2f43638dd5d6cb6f4c28e8dc63a2d421380cb5477
-DIST parted-3.1.tar.xz 1524344 BLAKE2B 51f6cb84fb0a08dc5c9f634e265e4ac7778cde9f5400771af897a8661bf6dcdcfac2b2dec817c7d0f61d3fd5f8408c065754ea756ed59491dff75595d4306a2d SHA512 f29a67a16cf79f08abbfc5eeb6ad0480d834aa50e715378626dc89e3b12ce71f19202e9f38429e5521ebe877c4e74ff1e08f0b0ecbdbe79ba1c51fdcbef6e852
DIST parted-3.2.tar.xz 1655244 BLAKE2B 56608590b26a9b5266dacf3698d990b730bdb35d9374d1da57103fbef3ef5037e40dd2fe0f523ca8e0e75401a3b25cf543e5ca5c94cf410bbaa62ea15d6f0ba3 SHA512 4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4
DIST parted_3.2-19.debian.tar.xz 87288 BLAKE2B f0cef2978ead9edca3e952849deb36526eea0a050d45ab480b2aa62d02ba0a1750c28e93c28a714df6629f02ccf5a1e4fbb33a6e42b82bf6685c05aeaad1756c SHA512 de3e55545d7d94668eb608c8c31440f550baaf7b664836d199f73f7a8c75bba4ff59b4c06a23459c7d522250d7c03d29fa7f727f7d1a2b1e5a0366e83a2d871a
DIST parted_3.2-20.debian.tar.xz 87496 BLAKE2B 4409826b35b42093f16f80b1ab2f41b4caf2264c9dcfe9572fa1ddf5f51eeffa2208fc187bd7a98290ee2df92604928eae84fd2fdee78d688ec19e81f8b9efac SHA512 83f14befdd7d048976572b3e2eebfaa42649458cbcfd659db704737dce991980ddb2bc65013c5b31b04a17fc17fb756da0dda76edbcba93708afca34c56e0d22
diff --git a/sys-block/parted/files/parted-2.4-no-gets.patch b/sys-block/parted/files/parted-2.4-no-gets.patch
deleted file mode 100644
index efa6e00b8d4..00000000000
--- a/sys-block/parted/files/parted-2.4-no-gets.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -735,7 +735,6 @@
- /* It is very rare that the developer ever has full control of stdin,
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-
-
diff --git a/sys-block/parted/files/parted-2.4-readline.patch b/sys-block/parted/files/parted-2.4-readline.patch
deleted file mode 100644
index 5873ed1e5d4..00000000000
--- a/sys-block/parted/files/parted-2.4-readline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/parted/ui.c
-+++ b/parted/ui.c
-@@ -1440,7 +1440,7 @@
- #ifdef HAVE_LIBREADLINE
- if (!opt_script_mode) {
- rl_initialize ();
-- rl_attempted_completion_function = (CPPFunction*) complete_function;
-+ rl_attempted_completion_function = (rl_completion_func_t*) complete_function;
- readline_state.in_readline = 0;
- }
- #endif
diff --git a/sys-block/parted/files/parted-3.1-readline.patch b/sys-block/parted/files/parted-3.1-readline.patch
deleted file mode 100644
index 936ec00cbef..00000000000
--- a/sys-block/parted/files/parted-3.1-readline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/parted/ui.c
-+++ b/parted/ui.c
-@@ -1474,7 +1474,7 @@
- #ifdef HAVE_LIBREADLINE
- if (!opt_script_mode) {
- rl_initialize ();
-- rl_attempted_completion_function = (CPPFunction*) complete_function;
-+ rl_attempted_completion_function = (rl_completion_func_t*) complete_function;
- readline_state.in_readline = 0;
- }
- #endif
diff --git a/sys-block/parted/files/parted-3.1-zfs.patch b/sys-block/parted/files/parted-3.1-zfs.patch
deleted file mode 100644
index a87d6d34655..00000000000
--- a/sys-block/parted/files/parted-3.1-zfs.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-commit 65f838008107a688751dd5a2753c9073e9353daf
-Author: root <root@desktop.(none)>
-Date: Fri Jun 1 16:26:34 2012 -0400
-
- Add ZFS Support
-
-diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
-index 8d48ea1..51b4151 100644
---- a/libparted/fs/Makefile.am
-+++ b/libparted/fs/Makefile.am
-@@ -49,7 +49,8 @@ libfs_la_SOURCES = \
- xfs/platform_defs.h \
- xfs/xfs.c \
- xfs/xfs_sb.h \
-- xfs/xfs_types.h
-+ xfs/xfs_types.h \
-+ zfs/zfs.c
-
- lib_LTLIBRARIES = libparted-fs-resize.la
-
-diff --git a/libparted/fs/Makefile.in b/libparted/fs/Makefile.in
-index 4335eb1..e3a134b 100644
---- a/libparted/fs/Makefile.in
-+++ b/libparted/fs/Makefile.in
-@@ -1112,7 +1112,8 @@ libfs_la_SOURCES = \
- xfs/platform_defs.h \
- xfs/xfs.c \
- xfs/xfs_sb.h \
-- xfs/xfs_types.h
-+ xfs/xfs_types.h \
-+ zfs/zfs.c
-
- lib_LTLIBRARIES = libparted-fs-resize.la
- EXTRA_DIST = hfs/DOC hfs/HISTORY hfs/TODO fsresize.sym
-diff --git a/libparted/fs/zfs/Makefile.am b/libparted/fs/zfs/Makefile.am
-new file mode 100644
-index 0000000..3273c6a
---- /dev/null
-+++ b/libparted/fs/zfs/zfs.c
-@@ -0,0 +1,81 @@
-+/*
-+ libparted - a library for manipulating disk partitions
-+ Copyright (C) 2000, 2007, 2009-2010 Free Software Foundation, Inc.
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 3 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program. If not, see <http://www.gnu.org/licenses/>.
-+*/
-+
-+#include <config.h>
-+
-+#include <parted/parted.h>
-+#include <parted/endian.h>
-+
-+#if ENABLE_NLS
-+# include <libintl.h>
-+# define _(String) dgettext (PACKAGE, String)
-+#else
-+# define _(String) (String)
-+#endif /* ENABLE_NLS */
-+
-+#include <unistd.h>
-+
-+#define ZFS_BLOCK_SIZES ((int[2]){512, 0})
-+
-+#define ZFS_SIGNATURE 0x00bab10c
-+
-+struct zfs_uberblock
-+{
-+ uint64_t signature;
-+ uint64_t version;
-+};
-+
-+static PedGeometry*
-+zfs_probe (PedGeometry* geom)
-+{
-+ uint8_t buf[512];
-+ struct zfs_uberblock *uber = (void *) buf;
-+
-+ if (!ped_geometry_read (geom, buf, 256, 1))
-+ return 0;
-+
-+ if ((le64toh (uber->signature) == ZFS_SIGNATURE
-+ || be64toh (uber->signature) == ZFS_SIGNATURE)
-+ && uber->version != 0)
-+ return ped_geometry_new (geom->dev, geom->start, geom->length);
-+ else
-+ return NULL;
-+}
-+
-+static PedFileSystemOps zfs_ops = {
-+ probe: zfs_probe,
-+};
-+
-+static PedFileSystemType zfs_type = {
-+ next: NULL,
-+ ops: &zfs_ops,
-+ name: "zfs",
-+ block_sizes: ZFS_BLOCK_SIZES
-+};
-+
-+void
-+ped_file_system_zfs_init ()
-+{
-+ ped_file_system_type_register (&zfs_type);
-+}
-+
-+void
-+ped_file_system_zfs_done ()
-+{
-+ ped_file_system_type_unregister (&zfs_type);
-+}
-diff --git a/libparted/libparted.c b/libparted/libparted.c
-index a6d86f0..6545989 100644
---- a/libparted/libparted.c
-+++ b/libparted/libparted.c
-@@ -109,6 +109,7 @@ extern void ped_file_system_hfs_init (void);
- extern void ped_file_system_fat_init (void);
- extern void ped_file_system_ext2_init (void);
- extern void ped_file_system_nilfs2_init (void);
-+extern void ped_file_system_zfs_init (void);
-
- static void
- init_file_system_types ()
-@@ -124,6 +125,7 @@ init_file_system_types ()
- ped_file_system_fat_init ();
- ped_file_system_ext2_init ();
- ped_file_system_nilfs2_init ();
-+ ped_file_system_zfs_init ();
- }
-
- extern void ped_disk_aix_done ();
-@@ -186,6 +188,7 @@ extern void ped_file_system_reiserfs_done (void);
- extern void ped_file_system_ufs_done (void);
- extern void ped_file_system_xfs_done (void);
- extern void ped_file_system_amiga_done (void);
-+extern void ped_file_system_zfs_done (void);
-
- static void
- done_file_system_types ()
-@@ -201,6 +204,7 @@ done_file_system_types ()
- ped_file_system_ufs_done ();
- ped_file_system_xfs_done ();
- ped_file_system_amiga_done ();
-+ ped_file_system_zfs_done ();
- }
-
- static void _done() __attribute__ ((destructor));
-diff --git a/scripts/data/abi/baseline_symbols.txt b/scripts/data/abi/baseline_symbols.txt
-index 9162f1a..8bb87e6 100644
---- a/scripts/data/abi/baseline_symbols.txt
-+++ b/scripts/data/abi/baseline_symbols.txt
-@@ -344,6 +344,8 @@ FUNC:ped_file_system_ufs_done
- FUNC:ped_file_system_ufs_init
- FUNC:ped_file_system_xfs_done
- FUNC:ped_file_system_xfs_init
-+FUNC:ped_file_system_zfs_done
-+FUNC:ped_file_system_zfs_init
- FUNC:ped_geometry_check
- FUNC:ped_geometry_destroy
- FUNC:ped_geometry_duplicate
diff --git a/sys-block/parted/parted-2.4-r1.ebuild b/sys-block/parted/parted-2.4-r1.ebuild
deleted file mode 100644
index 2e24db5fe76..00000000000
--- a/sys-block/parted/parted-2.4-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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
- >=sys-libs/ncurses-5.2:0=
- device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- readline? ( >=sys-libs/readline-5.2:0= )
- selinux? ( sys-libs/libselinux )
-"
-DEPEND="
- ${RDEPEND}
- nls? ( >=sys-devel/gettext-0.12.1-r2 )
- virtual/pkgconfig
-"
-PATCHES=(
- "${FILESDIR}"/${P}-no-gets.patch
- "${FILESDIR}"/${P}-readline.patch
-)
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable device-mapper) \
- $(use_enable nls) \
- $(use_enable selinux) \
- $(use_enable static-libs static) \
- $(use_with readline) \
- --disable-Werror \
- --disable-rpath \
- --disable-silent-rules
-}
-
-src_install() {
- default
-
- prune_libtool_files
-}
diff --git a/sys-block/parted/parted-2.4.ebuild b/sys-block/parted/parted-2.4.ebuild
deleted file mode 100644
index eb161766ad3..00000000000
--- a/sys-block/parted/parted-2.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-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 hppa ia64 ~mips ppc ppc64 s390 ~sh 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
- >=sys-libs/ncurses-5.2:0=
- device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- readline? ( >=sys-libs/readline-5.2:0= )
- selinux? ( sys-libs/libselinux )
-"
-DEPEND="
- ${RDEPEND}
- nls? ( >=sys-devel/gettext-0.12.1-r2 )
- virtual/pkgconfig
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-no-gets.patch
- epatch "${FILESDIR}"/${P}-readline.patch
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable device-mapper) \
- $(use_enable nls) \
- $(use_enable selinux) \
- $(use_enable static-libs static) \
- $(use_with readline) \
- --disable-Werror \
- --disable-rpath \
- --disable-silent-rules
-}
-
-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.1-r1.ebuild b/sys-block/parted/parted-3.1-r1.ebuild
deleted file mode 100644
index 011ec68857d..00000000000
--- a/sys-block/parted/parted-3.1-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils
-
-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 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="+debug device-mapper nls readline selinux static-libs test"
-
-# specific version for gettext needed
-# to fix bug 85999
-RDEPEND="
- >=sys-fs/e2fsprogs-1.27
- >=sys-libs/ncurses-5.7-r7
- device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- readline? ( >=sys-libs/readline-5.2 )
- selinux? ( sys-libs/libselinux )
-"
-DEPEND="
- ${RDEPEND}
- nls? ( >=sys-devel/gettext-0.12.1-r2 )
- virtual/pkgconfig
- test? (
- >=dev-libs/check-0.9.3
- dev-perl/Digest-CRC
- )
-"
-
-src_prepare() {
- # Remove tests known to FAIL instead of SKIP without OS/userland support
- sed -i libparted/tests/Makefile.am \
- -e 's|t3000-symlink.sh||g' || die "sed failed"
- sed -i tests/Makefile.am \
- -e '/t4100-msdos-partition-limits.sh/d' \
- -e '/t4100-dvh-partition-limits.sh/d' \
- -e '/t6000-dm.sh/d' || die "sed failed"
- # there is no configure flag for controlling the dev-libs/check test
- sed -i configure.ac \
- -e "s:have_check=[a-z]*:have_check=$(usex test):g" || die
-
- epatch "${FILESDIR}"/${PN}-3.1-zfs.patch
- epatch "${FILESDIR}"/${PN}-3.1-readline.patch
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable device-mapper) \
- $(use_enable nls) \
- $(use_enable selinux) \
- $(use_enable static-libs static) \
- $(use_with readline) \
- --disable-rpath \
- --disable-silent-rules
-}
-
-src_test() {
- if use debug; then
- # Do not die when tests fail - some requirements are not
- # properly checked and should not lead to the ebuild failing.
- emake check
- else
- ewarn "Skipping tests because USE=-debug is set."
- fi
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
- dodoc doc/{API,FAT,USER.jp}
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/sys-block/parted/parted-3.1-r2.ebuild b/sys-block/parted/parted-3.1-r2.ebuild
deleted file mode 100644
index 92ce2da8bcb..00000000000
--- a/sys-block/parted/parted-3.1-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="+debug device-mapper nls readline selinux static-libs test"
-
-# specific version for gettext needed
-# to fix bug 85999
-RDEPEND="
- >=sys-fs/e2fsprogs-1.27
- >=sys-libs/ncurses-5.7-r7
- device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- readline? ( >=sys-libs/readline-5.2 )
- selinux? ( sys-libs/libselinux )
-"
-DEPEND="
- ${RDEPEND}
- nls? ( >=sys-devel/gettext-0.12.1-r2 )
- virtual/pkgconfig
- test? (
- >=dev-libs/check-0.9.3
- dev-perl/Digest-CRC
- )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1-zfs.patch
- "${FILESDIR}"/${PN}-3.1-readline.patch
-)
-DOCS=(
- AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp}
-)
-
-src_prepare() {
- default
-
- # Remove tests known to FAIL instead of SKIP without OS/userland support
- sed -i libparted/tests/Makefile.am \
- -e 's|t3000-symlink.sh||g' || die "sed failed"
- sed -i tests/Makefile.am \
- -e '/t4100-msdos-partition-limits.sh/d' \
- -e '/t4100-dvh-partition-limits.sh/d' \
- -e '/t6000-dm.sh/d' || die "sed failed"
- # there is no configure flag for controlling the dev-libs/check test
- sed -i configure.ac \
- -e "s:have_check=[a-z]*:have_check=$(usex test):g" || die
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable device-mapper) \
- $(use_enable nls) \
- $(use_enable selinux) \
- $(use_enable static-libs static) \
- $(use_with readline) \
- --disable-rpath \
- --disable-silent-rules
-}
-
-src_test() {
- if use debug; then
- # Do not die when tests fail - some requirements are not
- # properly checked and should not lead to the ebuild failing.
- emake check
- else
- ewarn "Skipping tests because USE=-debug is set."
- fi
-}
-
-src_install() {
- default
-
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-06-16 3:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-03 15:14 [gentoo-commits] repo/gentoo:master commit in: sys-block/parted/files/, sys-block/parted/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2023-06-16 3:05 Sam James
2022-02-05 21:52 David Seifert
2020-11-14 21:02 Michał Górny
2018-02-23 22:31 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox