mirrors/aports
3
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-05-10 21:44:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

main/parted: upgrade to 3.5

Browse source
This commit is contained in:
Dominika Liberda 2022-04-19 12:52:25 +00:00 • committed by alice
parent 477579df3e
commit cb83768bdc
4 changed files with 73 additions and 20 deletions

12
main/parted/APKBUILD
View file

@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=parted
pkgver=3.4
pkgver=3.5
pkgrel=0
pkgdesc="Utility to create, destroy, resize, check and copy partitions"
url="https://www.gnu.org/software/parted/parted.html"
@ -13,6 +13,7 @@ source="https://ftp.gnu.org/gnu/parted/parted-$pkgver.tar.xz
fix-includes.patch
fix-libintl-header-s390x.patch
parted-include-sysmacros.patch
fix-truncate-tests.patch
make-tests.patch
skip-duplicate-bsd-test-on-s390x.patch
"
@ -38,9 +39,12 @@ package() {
rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
}
sha512sums="e69bd1b610778e980d4595d04892f2ea1faf4ae9bfc98cd62abfc70066423f08ddaa396f9461c7beb1330d023232274606b6b26091a0458aeedd0f3f57536690 parted-3.4.tar.xz
sha512sums="
87fc69e947de5f0b670ee5373a7cdf86180cd782f6d7280f970f217f73f55ee1b1b018563f48954f3a54fdde5974b33e07eee68c9ccdf08e621d3dc0e3ce126a parted-3.5.tar.xz
55ee63c218d1867c0f2c596e7c3eec5c42af160181456cc551fe3d432eabed0ac2dd3a3955ff0c375f76aeec8071e7f55a32834b87a0d39b8ef30361f671bfdd fix-includes.patch
444a7e2fb3235dfd218f6b71fb25adde107d001f638d988ee1fa79686d8efee94a9499e27bdfdd75f9718760b448938b70a90a74285b93a39338d21f4ab4c9dc fix-libintl-header-s390x.patch
ba86cd2591d8e920e474faf28a32f9eaca9482e168c53eae5d392276aefaf6c46b66a0d5fc4a18b7186bf38f7288bd79de8ba8019c1cd38a5e2102904ce75723 parted-include-sysmacros.patch
a8995b87f1bb1c9c357fc4729a17b629291f918df2b65548789d41537af5c3972238b2ad65d845738bd76f8b63673d075227c0de0bbf7f7f061cc36adec0c19d make-tests.patch
d19ad61cffb6434f1433c2da29dc6c137076125ddd23936ca26298db5d120dc8ec64788556599a1a8522d10630bca48258d7dfa9fd633551b791275bdc2c68d0 skip-duplicate-bsd-test-on-s390x.patch"
cca125b891739fd65c38a05638105ea15f77a71b9780af891bb56523b67e9ec3188be18109c3166be445bc03409de85d09e994d7dbbe13d663312df7dda2a2fa fix-truncate-tests.patch
8bf7fce435092baba6855cefca75b701124941741417e2f7f5b78f68da5c0f33013232b411fa04b3532c37c347d75bbfa9279221985d0f0080d1b2a48863e6c1 make-tests.patch
42120158f44705b416162edd5e2d61635d34ff88878d84fc8110a169fd927ec3d714376a52e60e55d041e80afd8edad6429b1b5897e0738d23c6583a7bfc09bc skip-duplicate-bsd-test-on-s390x.patch
"

48
main/parted/fix-truncate-tests.patch Normal file
View file

@ -0,0 +1,48 @@
Fixes for BusyBox's truncate
--- a/tests/t0290-gpt-name.sh
+++ b/tests/t0290-gpt-name_.sh
@@ -21,7 +21,7 @@
dev=loop-file
-truncate --size 50MiB "$dev" || fail=1
+truncate -s 50M "$dev" || fail=1
# create partition with empty name
parted --script "$dev" mklabel gpt mkpart '""' ext4 1MiB 49MiB > out 2>&1 || fail=1
--- a/tests/t0215-gpt-attrs.sh
+++ b/tests/t0215-gpt-attrs.sh
@@ -23,7 +23,7 @@
dev=loop-file
# create device
-truncate --size 50MiB "$dev" || fail=1
+truncate -s 50M "$dev" || fail=1
# create gpt label and one partitions
parted --script "$dev" mklabel gpt > out 2>&1 || fail=1
--- a/tests/t0801-json-msdos.sh
+++ b/tests/t0801-json-msdos.sh
@@ -23,7 +23,7 @@
dev=loop-file
# create device
-truncate --size 50MiB "$dev" || fail=1
+truncate -s 50M "$dev" || fail=1
# create msdos label and some partitions
parted --script "$dev" mklabel msdos > out 2>&1 || fail=1
--- a/tests/t0800-json-gpt.sh
+++ b/tests/t0800-json-gpt.sh
@@ -23,7 +23,7 @@
dev=loop-file
# create device
-truncate --size 50MiB "$dev" || fail=1
+truncate -s 50M "$dev" || fail=1
# create gpt label and some partitions
parted --script "$dev" mklabel gpt > out 2>&1 || fail=1

13
main/parted/make-tests.patch
View file

@ -1,8 +1,6 @@
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 11baba0..2288cc7 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1622,16 +1622,12 @@ TEST_EXTENSIONS = .sh
@@ -1771,16 +1771,12 @@
SH_LOG_COMPILER = $(SHELL)
TESTS = \
help-version.sh \
@ -19,8 +17,10 @@ index 11baba0..2288cc7 100644
t0203-gpt-create-on-min-sized-device.sh \
t0205-gpt-list-clobbers-pmbr.sh \
t0206-gpt-print-with-corrupt-primary-clobbers-pmbr.sh \
@@ -1644,14 +1640,9 @@ TESTS = \
@@ -1792,17 +1788,11 @@
t0212-gpt-many-partitions.sh \
t0213-mkpart-start-negative.sh \
- t0215-gpt-attrs.sh \
t0220-gpt-msftres.sh \
t0250-gpt.sh \
- t0251-gpt-unicode.sh \
@ -28,15 +28,16 @@ index 11baba0..2288cc7 100644
- t0281-gpt-grow.sh \
- t0282-gpt-move-backup.sh \
- t0283-overlap-partitions.sh \
t0290-gpt-name.sh \
t0300-dos-on-gpt.sh \
t0301-overwrite-gpt-pmbr.sh \
- t0350-mac-PT-increases-sector-size.sh \
t0400-loop-clobber-infloop.sh \
t0500-dup-clobber.sh \
t0501-duplicate.sh \
@@ -1673,8 +1664,6 @@ TESTS = \
t3200-resize-partition.sh \
@@ -1827,8 +1818,6 @@
t3200-type-change.sh \
t3210-gpt-type-change.sh \
t3300-palo-prep.sh \
- t3310-flags.sh \
- t3400-whole-disk-FAT-partition.sh \

20
main/parted/skip-duplicate-bsd-test-on-s390x.patch
View file

@ -1,16 +1,16 @@
diff --git a/tests/t0501-duplicate.sh b/tests/t0501-duplicate.sh
index 66d321a..0520131 100644
--- a/tests/t0501-duplicate.sh
+++ b/tests/t0501-duplicate.sh
@@ -18,7 +18,11 @@
@@ -18,9 +18,13 @@
. "${srcdir=.}/init.sh"; path_prepend_ ../parted .
+arch=$(uname -m)
for t in msdos gpt bsd; do
+ if [ "$t" = bsd ] && [ "$arch" = "s390x" ]; then
+ continue
+ fi
duplicate $t || fail=1
done
for t in msdos gpt bsd sun atari mac pc98; do
case $t in
atari) [ $ss -ne 512 ] && continue
+ ;;
+ bsd) [ "$arch" = "s390x" ] && continue
+ duplicate $t || fail=1
;;
*) duplicate $t || fail=1
;;