diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
| commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
| tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /sys-block/parted | |
| parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) | |
gentoo resync : 20.03.2022
Diffstat (limited to 'sys-block/parted')
| -rw-r--r-- | sys-block/parted/Manifest | 3 | ||||
| -rw-r--r-- | sys-block/parted/files/parted-3.4-posix-printf.patch | 63 | ||||
| -rw-r--r-- | sys-block/parted/parted-3.4.ebuild | 2 |
3 files changed, 67 insertions, 1 deletions
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest index 282563b9a6c2..5967d1809887 100644 --- a/sys-block/parted/Manifest +++ b/sys-block/parted/Manifest @@ -1,6 +1,7 @@ AUX parted-3.2-po4a-mandir.patch 275 BLAKE2B 5342cc776f557c9ef95604eb2c15ad484c4dbf102d4093dcb1d4005f2f6d4f90db2ff0fc3ceae59fd22c3442604b2abbdac48594f860ba810dc4d8dce89d6fc0 SHA512 5ef686f56d8c3939da3f24fdb6196d8858c2f980805f1cb06020d6f6996158f62b8372a233ec3ec98aae30b41034046d615e415b3abf2648db7be88e3b45a872 AUX parted-3.3-atari.patch 421 BLAKE2B 9048176f882e66cf89cc2d79aa0ea7a550f9c649d8f54f4df102eb361c6e0be473a2e07e1ab8f63dc446422a92ced10cfb4858a27b7988c1b5a960e6e8e1d518 SHA512 59738de6f89dd6d407eef139ffe4d0925d418f4d33a30a1ead1e1f05ab7ad93e13294412d5061dd40302b9592a33b97f137089f477dc6a2febd3fe60eae77ca0 +AUX parted-3.4-posix-printf.patch 2872 BLAKE2B 55c1bef638a88f7d3b5b1f90ca28df1d0ccb40590536c0a0f10416509c3d90a2a329dd530ebbcc9945b2eefb7a3540a113d27a73c7d636b372eb9fc8e19f7eed SHA512 d16bb7e3cfccaa8b40ece90b507559857fb1a4f5a08bc93da61b7afde4b69e06de363948426cec66cbb1135d6d1d5a50206cee6cec9973e1cb02aefe50697670 DIST parted-3.4.tar.xz 1860300 BLAKE2B c724d3d1490c62d440b9e5dc359fef7ff623bc77ae5f867d8905245cb279ec391fa07a1a774488ad3bf7a2c477007264d7bab2635a544be8f94dc706a654a711 SHA512 e69bd1b610778e980d4595d04892f2ea1faf4ae9bfc98cd62abfc70066423f08ddaa396f9461c7beb1330d023232274606b6b26091a0458aeedd0f3f57536690 DIST parted-3.4.tar.xz.sig 508 BLAKE2B 112ad0158b1100bd9150a7c87e8f93e67d42870b82a17d4d0aa8bb5e46306f837f3f99feabaf301f8cd640c299174e5f5acf152dd1f20ea2b7ace73d57d31f14 SHA512 6b11812267e66470ba2908ee1cc78b232b0bc2519787f5a17b92cd5f8ba904b1a836833f19c5244b23d4c7810437eeb26fbbd68fac819391b342709682345472 -EBUILD parted-3.4.ebuild 1419 BLAKE2B 40b01ca5bc5c56ccbd557e93eed1e194118e8fb26c9bb85a08b473e593ebb87a21047a459dafd4084b208c617c2c9857b2a6f762ac2bdeb71bee911580b81ecd SHA512 a4bc047cf7a78124d5bfc443a13e6c13d6ca521630125fb7d4715557f52911d44049d876ca05203f7e056a043da0452e3ca9a392fc17fc7e77552199b3ffb466 +EBUILD parted-3.4.ebuild 1529 BLAKE2B bcf56fbeb5c6fffa1c591e1fac4ee20e08e12746d696cfec201f8db7573104260b72d9926863ee09871c78d70746f18c5a37a39be584fde2b033c360ba950ed6 SHA512 2ca888cc646023fa8eb65ab154cc0213793956e510226cbbc27888c18e9a77b7b5c0283bfb7079ef92abbb5936ebbc1f9b702564cf5b8db799d57ad03710e1ca MISC metadata.xml 887 BLAKE2B 04b4f255209a5d1c26fe4d84eb6a2d0fe7b87ff30fb2cb0425685c277eecbc498a7886ec328fdf2456bc02af4d787cd7eed16e2a9a02c5b8ef8f146d3c551d77 SHA512 6cacc6560766381699e0c46241a9446260e984a78eb9c8d39486e699d4880e2ae712b199b628a3fcdfe9cd98cfe18b47198675e8546cf84d89fbe464e2ab1997 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() { |