diff options
| -rw-r--r-- | system/parted/APKBUILD | 25 | ||||
| -rw-r--r-- | system/parted/bsd-endian.patch | 13 | ||||
| -rw-r--r-- | system/parted/disable-two-tests.patch | 16 | ||||
| -rw-r--r-- | system/parted/posix-shell.patch | 10 | ||||
| -rw-r--r-- | system/parted/tests-python3.patch | 68 |
5 files changed, 12 insertions, 120 deletions
diff --git a/system/parted/APKBUILD b/system/parted/APKBUILD index 63356d7b6..4d7dc058a 100644 --- a/system/parted/APKBUILD +++ b/system/parted/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=parted -pkgver=3.2 -pkgrel=2 +pkgver=3.4 +pkgrel=0 pkgdesc="Utility to create, destroy, resize, check and copy partitions" url="https://www.gnu.org/software/parted/parted.html" arch="all" @@ -10,22 +10,14 @@ license="GPL-3.0+" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" depends="" makedepends="ncurses-dev lvm2-dev bash util-linux-dev autoconf automake" -checkdepends="check-dev python3" +checkdepends="check-dev e2fsprogs python3" source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz - bsd-endian.patch - disable-two-tests.patch fix-includes.patch posix-shell.patch sysmacros.patch tests-call-name-correctly.patch - tests-python3.patch " -prepare() { - default_prepare - autoreconf -} - build() { ./configure \ --build=$CBUILD \ @@ -49,11 +41,8 @@ package() { rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true } -sha512sums="4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4 parted-3.2.tar.xz -d3c16548cac315dad100c992c0b8446d1f7978cb45e867c69e746b25781c06802d3b4aab7d9346e44e68f61bb07e41ff65ef75d0dc6613f6fa8472b2e67a76a7 bsd-endian.patch -b49eb0211c405a4ef69e1bb0079621c22fec4adf0309f0a58b5d881540913de01d05ccd3eb521f35c3cf6f4eb8aa0f4c5270ce3dea47270a5c3fe8fae635c6f0 disable-two-tests.patch +sha512sums="e69bd1b610778e980d4595d04892f2ea1faf4ae9bfc98cd62abfc70066423f08ddaa396f9461c7beb1330d023232274606b6b26091a0458aeedd0f3f57536690 parted-3.4.tar.xz 55ee63c218d1867c0f2c596e7c3eec5c42af160181456cc551fe3d432eabed0ac2dd3a3955ff0c375f76aeec8071e7f55a32834b87a0d39b8ef30361f671bfdd fix-includes.patch -6710a92cfb0a455de5e0c58f50c3c081c564307463c448fdc62521b868cb08fc10b2c558b284ec2e4ebbea7e940bda4b9e8e7aa7db58aec1b856451df9c54650 posix-shell.patch +507d19454aca6631fe387ca53b28f2925c325044efc7b506e81429a5b42914e56c39e1644c570840b4c4c153da742237428cba2a1ff651487f2ef8a0a8c64d1f posix-shell.patch 5d2e8f22b6cd5bdd3289996848279a945ca09acd2862e82283bb769c2e4d61a24a31e1793d81385e8f3f1f4d48417e2308c5ea39dac47e832666363dde044ba7 sysmacros.patch -8bd86d2b0401566e7757c43d849b7f913cc4ec1bf50d5641dc72d7e278ca38db2ac746cd8dcc756b245021ea1f9738875b6a831f05185b9217d3f1c287944748 tests-call-name-correctly.patch -7486f98d535380a9e6598b9ac6153564319d5effa25456dc393cf3540ea47ac5b462be79cbd7d8efbd1fc2d2ef240a00873a2e2b138d4b4b0bb1494893de1eac tests-python3.patch" +8bd86d2b0401566e7757c43d849b7f913cc4ec1bf50d5641dc72d7e278ca38db2ac746cd8dcc756b245021ea1f9738875b6a831f05185b9217d3f1c287944748 tests-call-name-correctly.patch" diff --git a/system/parted/bsd-endian.patch b/system/parted/bsd-endian.patch deleted file mode 100644 index 6e5e13c0e..000000000 --- a/system/parted/bsd-endian.patch +++ /dev/null @@ -1,13 +0,0 @@ -See-Also: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=31923 - ---- parted-3.2/libparted/labels/bsd.c.old 2014-06-15 18:17:43.000000000 +0000 -+++ parted-3.2/libparted/labels/bsd.c 2019-08-05 05:48:52.914401379 +0000 -@@ -364,7 +364,7 @@ - max_part = i; - } - -- label->d_npartitions = PED_CPU_TO_LE16 (max_part) + 1; -+ label->d_npartitions = PED_CPU_TO_LE16 (max_part + 1); - label->d_checksum = xbsd_dkcksum (label); - - alpha_bootblock_checksum (bsd_specific->boot_code); diff --git a/system/parted/disable-two-tests.patch b/system/parted/disable-two-tests.patch deleted file mode 100644 index a6481dde3..000000000 --- a/system/parted/disable-two-tests.patch +++ /dev/null @@ -1,16 +0,0 @@ -These tests do not appear to work right upstream. Disable for now. - ---- parted-3.2/tests/Makefile.am.old 2014-06-15 19:15:54.000000000 +0000 -+++ parted-3.2/tests/Makefile.am 2017-08-19 19:44:28.886245388 +0000 -@@ -24,11 +24,9 @@ - t0209-gpt-pmbr_boot.sh \ - t0210-gpt-resized-partition-entry-array.sh \ - t0211-gpt-rewrite-header.sh \ -- t0212-gpt-many-partitions.sh \ - t0220-gpt-msftres.sh \ - t0250-gpt.sh \ - t0251-gpt-unicode.sh \ -- t0280-gpt-corrupt.sh \ - t0281-gpt-grow.sh \ - t0282-gpt-move-backup.sh \ - t0283-overlap-partitions.sh \ diff --git a/system/parted/posix-shell.patch b/system/parted/posix-shell.patch index 3418e31c6..54a11d380 100644 --- a/system/parted/posix-shell.patch +++ b/system/parted/posix-shell.patch @@ -22,7 +22,7 @@ --- parted-3.2/tests/t-local.sh.old 2014-06-15 18:17:43.000000000 +0000 +++ parted-3.2/tests/t-local.sh 2019-10-04 23:48:32.670000000 +0000 -@@ -135,7 +135,7 @@ +@@ -138,7 +138,7 @@ peek_() { case $# in 2) ;; *) echo "usage: peek_ FILE 0_BASED_OFFSET" >&2; exit 1;; esac @@ -31,7 +31,7 @@ dd if="$1" bs=1 skip="$2" count=1 } -@@ -143,7 +143,7 @@ +@@ -146,7 +146,7 @@ { case $# in 3) ;; *) echo "usage: poke_ FILE 0_BASED_OFFSET BYTE" >&2; exit 1;; esac @@ -40,7 +40,7 @@ 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 } -@@ -152,7 +152,7 @@ +@@ -155,7 +155,7 @@ gpt1_pte_name_offset_() { local ss=$1 @@ -49,7 +49,7 @@ expr $ss \* 2 + 56 return 0 } -@@ -164,7 +164,7 @@ +@@ -167,7 +167,7 @@ case $# in 2) ;; *) echo "$0: expected 2 args, got $#" >&2; return 1;; esac local dev=$1 local ss=$2 @@ -58,7 +58,7 @@ # get the first byte of the name local orig_pte_name_byte -@@ -185,7 +185,7 @@ +@@ -188,7 +188,7 @@ case $# in 3) ;; *) echo "$0: expected 2 args, got $#" >&2; return 1;; esac local dev=$1 local ss=$2 diff --git a/system/parted/tests-python3.patch b/system/parted/tests-python3.patch deleted file mode 100644 index 8811b7237..000000000 --- a/system/parted/tests-python3.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- parted-3.2/tests/gpt-header-move.old 2014-06-15 18:27:30.000000000 +0000 -+++ parted-3.2/tests/gpt-header-move 2017-08-19 20:47:02.443283140 +0000 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python3 - - # open img file, subtract 33 from altlba address, and move the last 33 sectors - # back by 33 sectors -@@ -11,12 +11,12 @@ - file.seek(512) - gptheader = file.read(512) - altlba = unpack_from('<q', gptheader,offset=32)[0] --gptheader = array.array('c',gptheader) -+gptheader = array.array('B',gptheader) - pack_into('<Q', gptheader, 32, altlba-33) - #zero header crc - pack_into('<L', gptheader, 16, 0) - #compute new crc --newcrc = ((crc32(buffer(gptheader,0,92))) & 0xFFFFFFFF) -+newcrc = ((crc32(memoryview(gptheader[0:92]))) & 0xFFFFFFFF) - pack_into('<L', gptheader, 16, newcrc) - file.seek(512) - file.write(gptheader) -@@ -25,7 +25,7 @@ - file.seek(512*(altlba-32)) - backup = file.read(512*32) - altlba -= 33 --gptheader = array.array('c',gptheader) -+gptheader = array.array('B',gptheader) - #update mylba - pack_into('<Q', gptheader, 24, altlba) - #update table lba -@@ -33,7 +33,7 @@ - #zero header crc - pack_into('<L', gptheader, 16, 0) - #compute new crc --newcrc = ((crc32(buffer(gptheader,0,92))) & 0xFFFFFFFF) -+newcrc = ((crc32(memoryview(gptheader[0:92]))) & 0xFFFFFFFF) - pack_into('<L', gptheader, 16, newcrc) - file.seek(512*(altlba-32)) - file.write(backup) -@@ -38,4 +38,4 @@ - file.seek(512*(altlba-32)) - file.write(backup) - file.write(gptheader) --file.write("\0" * (512 * 33)) -+file.write(b"\0" * (512 * 33)) ---- parted-3.2/tests/msdos-overlap.old 2014-06-15 18:27:30.000000000 +0000 -+++ parted-3.2/tests/msdos-overlap 2017-08-19 20:48:16.279847771 +0000 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python3 - """ - Write an overlapping partition to a msdos disk - -@@ -14,10 +14,10 @@ - OFFSET = 0x1b8 - - if len(sys.argv) < 2: -- print "%s: <image or device>" -+ print("%s: <image or device>") - sys.exit(1) - --data = "".join(chr(c) for c in BAD_ENTRY) -+data = bytearray(BAD_ENTRY) - with open(sys.argv[1], "rb+") as f: - f.seek(OFFSET, 0) - f.write(data) |