diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-28 14:32:37 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-28 14:33:33 +0000 |
| commit | ad3fc3792e72e273b78fd2c010e3a08c971d1b70 (patch) | |
| tree | 9c3947b61665c7f17865b95f21a9038e94e7fbe4 /main/abuild | |
| parent | cc8c7b8a27fb24c00eb372432da3f5192de6dd32 (diff) | |
| download | aports-ad3fc3792e72e273b78fd2c010e3a08c971d1b70.tar.bz2 aports-ad3fc3792e72e273b78fd2c010e3a08c971d1b70.tar.xz | |
main/abuild: fix div by zero when print huan size
happens on empty packages on btrfs
Diffstat (limited to 'main/abuild')
| -rw-r--r-- | main/abuild/0001-abuild-avoid-division-by-zero-when-input-is-zero-for.patch | 32 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 12 |
2 files changed, 40 insertions, 4 deletions
diff --git a/main/abuild/0001-abuild-avoid-division-by-zero-when-input-is-zero-for.patch b/main/abuild/0001-abuild-avoid-division-by-zero-when-input-is-zero-for.patch new file mode 100644 index 0000000000..fcf8c6f263 --- /dev/null +++ b/main/abuild/0001-abuild-avoid-division-by-zero-when-input-is-zero-for.patch @@ -0,0 +1,32 @@ +From b67dec210ad22b1ff9156ead892593c8a2f23925 Mon Sep 17 00:00:00 2001 +From: Christian Kampka <christian@kampka.net> +Date: Sat, 17 Oct 2015 15:49:27 +0200 +Subject: [PATCH] abuild: avoid division by zero when input is zero for + calculating human size for packages + +This occurs when building meta packages that do not have any package content. +--- + abuild.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/abuild.in b/abuild.in +index 3b6fe04..0dd8f9a 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -1253,7 +1253,7 @@ scan_pkgconfig_depends() { + # read size in bytes from stdin and show as human readable + human_size() { + awk '{ split("B KB MB GB TB PB", type) +- for(i=5; y < 1; i--) ++ for(i=5; y < 1 && $1 > 0; i--) + y = $1 / (2**(10*i)) + printf("%.1f %s\n", y, type[i+2]) }' + } +@@ -2209,4 +2209,3 @@ for i in $install_after; do + done + + cleanup +- +-- +2.6.1 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 708739c237..61626772a4 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,7 +2,7 @@ pkgname=abuild pkgver=2.24.0 _ver=${pkgver%_git*} -pkgrel=9 +pkgrel=10 pkgdesc="Script to build Alpine Packages" url="http://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -25,6 +25,7 @@ source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz 0001-abuild-fix-issue-in-maintainer-check.patch 0001-abuild-check-if-depends_dev-is-set-unnecessarily.patch 0001-abuild-fix-check_depends_dev.patch + 0001-abuild-avoid-division-by-zero-when-input-is-zero-for.patch " _builddir="$srcdir/$pkgname-$_ver" @@ -74,16 +75,19 @@ md5sums="7821eea872e86a768d881fecce95e934 abuild-2.24.0.tar.xz 8b647dd06b617d70250bbb3680aa9f82 0001-abuild-try-to-validate-maintainer-address.patch 430baf288b197ef4b5133ac8ba392ccf 0001-abuild-fix-issue-in-maintainer-check.patch 705ad3f7a598b2d5af58981f04773fbf 0001-abuild-check-if-depends_dev-is-set-unnecessarily.patch -4a93183e17d80b328f85dbc193fa02e5 0001-abuild-fix-check_depends_dev.patch" +4a93183e17d80b328f85dbc193fa02e5 0001-abuild-fix-check_depends_dev.patch +d2ec4031bff83d96c5e3a7307a70ef22 0001-abuild-avoid-division-by-zero-when-input-is-zero-for.patch" sha256sums="0e0c0c7579c3b8d6668fad9d93a42f3ea18da88679e1a12a178f2676c79e94d6 abuild-2.24.0.tar.xz 3f6d6f315c0531f900d7465abaf5f4bd0bbd59d884b2af363bc0105b0f2b3a95 0001-abuild-fix-fetch-lock-file-on-nfs.patch fcbdae9a224ed4705614e6c5f220e304e405e92d0a33c5dacca0d82fcf386aec 0001-abuild-try-to-validate-maintainer-address.patch ba588472ccc0ab86e42fd2f6a0a923cd8aa400f051e8c7acbd23f4d19a3dd93f 0001-abuild-fix-issue-in-maintainer-check.patch 8601ea92162b434d281a33b7b3a6ba56caf93ec69d2d6093e8c560efe2a522cc 0001-abuild-check-if-depends_dev-is-set-unnecessarily.patch -b308cb064e67a3aef02cda92f937af4aca23a6969fcf5f611503893fd22734ee 0001-abuild-fix-check_depends_dev.patch" +b308cb064e67a3aef02cda92f937af4aca23a6969fcf5f611503893fd22734ee 0001-abuild-fix-check_depends_dev.patch +326b4c1e0b40a3e0a2ec5008c4da43337f1bd0033d6e2f4097dd149a791f9d55 0001-abuild-avoid-division-by-zero-when-input-is-zero-for.patch" sha512sums="360d0164afed9c61576618d113d738327151c60f1bc1e6246fcf74f97db087ca2effb11a4ae045f1f288063d5311c6dddbe7721b3cbe65d11472b3d2b0f03ef6 abuild-2.24.0.tar.xz 620fbf17f48f2732b7e7fd10f4c02bedae6d0c5c7988cefc8e1f2f233efd49514d08b72a367203c977b11272397e713e7551029f85b0dfc79c55587551600ced 0001-abuild-fix-fetch-lock-file-on-nfs.patch cf14d49d9ac2d4dadca9687c96ae2fc9ef43c7f86e31706c942cefa508b9c075506194e87b0189970e59261072e8cd523e0ced6d4d932936adb1c2c747b14663 0001-abuild-try-to-validate-maintainer-address.patch d57fdf1c17b7b201b45bfe6f2362e212cea2a6e1ea586acc20cca301db8bc39c7bc204582d0f6827b715b6d299fc3495bc3530cd461639a3d21e93fda47d0ad9 0001-abuild-fix-issue-in-maintainer-check.patch 6b7927175dddd33e1e1b81a307f8b2b841a8c25e1467bc28dbcb894ea93caf693b1728100b587ea34830754aa30b13a165724f6261b3454c35b35aec35701e36 0001-abuild-check-if-depends_dev-is-set-unnecessarily.patch -6c14120f314804173bed97e7ce0fd125c4b28f35f21d532849778f580cda93ff898d773cee8a28cf4fbd1502c9c2f44e2d5b5a85c51a02e3e23a8338eafca0c8 0001-abuild-fix-check_depends_dev.patch" +6c14120f314804173bed97e7ce0fd125c4b28f35f21d532849778f580cda93ff898d773cee8a28cf4fbd1502c9c2f44e2d5b5a85c51a02e3e23a8338eafca0c8 0001-abuild-fix-check_depends_dev.patch +6598ceb721b1e203fd4104fe9381e8730829d10cb63e2b681c8202010b33ec7aa5f1134536954e639e45ecd3932ecf66ace8e6dd6640addac9d2d5d81ed279e0 0001-abuild-avoid-division-by-zero-when-input-is-zero-for.patch" |