diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-03-19 12:46:44 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-03-19 12:50:13 +0000 |
| commit | 888b332e55b42f91e3052de5d047fbb087c7ea7b (patch) | |
| tree | 7b59208f77b6b582844565a1c790e5b5d1dd2e2a | |
| parent | fe56e13542964e210a6503e4b61f3e9448b17100 (diff) | |
| download | aports-888b332e55b42f91e3052de5d047fbb087c7ea7b.tar.bz2 aports-888b332e55b42f91e3052de5d047fbb087c7ea7b.tar.xz | |
main/alpine-conf: fix setup-apkcache
fixes #3976
(cherry picked from commit 8751d8eebf4ec79352ab99ea542e4ff8e7611ff1)
| -rw-r--r-- | main/alpine-conf/0001-setup-apkcache-fix-infinite-loop-when-non-existing-d.patch | 33 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 12 |
2 files changed, 41 insertions, 4 deletions
diff --git a/main/alpine-conf/0001-setup-apkcache-fix-infinite-loop-when-non-existing-d.patch b/main/alpine-conf/0001-setup-apkcache-fix-infinite-loop-when-non-existing-d.patch new file mode 100644 index 000000000..ed3191d2b --- /dev/null +++ b/main/alpine-conf/0001-setup-apkcache-fix-infinite-loop-when-non-existing-d.patch @@ -0,0 +1,33 @@ +From b0b109a06f1f890b8833c6afa38c357a084c65bc Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 19 Mar 2015 12:44:41 +0000 +Subject: [PATCH] setup-apkcache: fix infinite loop when non-existing dir + specified + +to reproduce: setup-apkcache /ponies + +ref #3976 +--- + setup-apkcache.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup-apkcache.in b/setup-apkcache.in +index 0e578c8..5210d82 100644 +--- a/setup-apkcache.in ++++ b/setup-apkcache.in +@@ -47,10 +47,10 @@ find_mount_point() { + fi + + local dir="$1" +- while ! [ -d "$dir" ]; do ++ while [ -n "$dir" ] && ! [ -d "$dir" ]; do + dir=${dir%/*} + done +- local fs_id=$(stat -f -c %i "$dir") ++ local fs_id=$(stat -f -c %i "${dir:-/}") + local parent="${dir%/*}" + while [ -n "$dir" ] && [ "$(stat -f -c %i $parent/)" = "$fs_id" ]; do + dir=$parent +-- +2.3.3 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 3b5854dd9..e0224c933 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=3.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" @@ -11,6 +11,7 @@ source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.x 0001-update-kernel-fix-typo.patch 0001-setup-disk-pass-nomodeset-boot-option.patch 0001-setup-disk-fix-typo.patch + 0001-setup-apkcache-fix-infinite-loop-when-non-existing-d.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -40,12 +41,15 @@ package() { md5sums="d48adaa13dbba0e4c461b39a59fb1c10 alpine-conf-3.1.0.tar.xz fe4a81cdf9d30c1f0bbcc9977e96410a 0001-update-kernel-fix-typo.patch 4b7844387da57e3ffdcd1e09c0a45fb6 0001-setup-disk-pass-nomodeset-boot-option.patch -968fac093f66bb6e92f24cbf1d1cbeaf 0001-setup-disk-fix-typo.patch" +968fac093f66bb6e92f24cbf1d1cbeaf 0001-setup-disk-fix-typo.patch +2f5532e2447ba7af4549fb3826cfbda4 0001-setup-apkcache-fix-infinite-loop-when-non-existing-d.patch" sha256sums="5c5c3081fba18c0303bd29ccf8caab5d550c0a767f9b3b1e6a0644b717661122 alpine-conf-3.1.0.tar.xz cc1a2254eae01c2cde362cc7cf65d6e5ba7d53a7ced8a170b0502130af6877be 0001-update-kernel-fix-typo.patch a5e486f41dafdca904e1d67b2bb26d871e6ec9597295e1fc21ea5d8995986570 0001-setup-disk-pass-nomodeset-boot-option.patch -e03066193c158d489b0169c6ec7fbbce2fedba23e28e92d40a5d9ab4920c8102 0001-setup-disk-fix-typo.patch" +e03066193c158d489b0169c6ec7fbbce2fedba23e28e92d40a5d9ab4920c8102 0001-setup-disk-fix-typo.patch +0e07cae6ac39618a6da6393bcbc7e9c4bb74524376b5f1beaee02bb8d0a99659 0001-setup-apkcache-fix-infinite-loop-when-non-existing-d.patch" sha512sums="22ce9a149171cf8503937b60d36ec2b69fb95123d3e3f7776cc3c9e0f14cdc8a9a2338be8c223233652cd1456f6b55bbc71ed0deda2efb75f0e62b67a4c40088 alpine-conf-3.1.0.tar.xz 7f30c7ecb696b4fbf815802bd9d369f2d21a2b2502efdeac3af260df72195c19199fddc81702eb204746146433a23c0649bcf1b8a71c57a34971c4457f0ac33f 0001-update-kernel-fix-typo.patch 3ff38ab78bc0a07762c7c3668cf4daaa4ca2d030ef148e61de6dbb1df4589fd2c844c992f35ce64aa9cc3125d7422ba9deb727259cc68a61e7f6d6ff22de16f7 0001-setup-disk-pass-nomodeset-boot-option.patch -c6f32b0b03d0d9eadc6206fadeeaf8c7e0880dc5e556374bbf9334ed7ec8f38257f6afe4ddbc7c634c6cc722609ab8bfcd1897d586661d33b2cc6dd087edc4c1 0001-setup-disk-fix-typo.patch" +c6f32b0b03d0d9eadc6206fadeeaf8c7e0880dc5e556374bbf9334ed7ec8f38257f6afe4ddbc7c634c6cc722609ab8bfcd1897d586661d33b2cc6dd087edc4c1 0001-setup-disk-fix-typo.patch +23be2445278768e0ed830290a569206b1cdc9941abe2d2fa1b6a7aa120f580e974d8df75fb218b70ac3ddccffd9450d2ce64b334a5e3ec004c8c369f2c3c87d4 0001-setup-apkcache-fix-infinite-loop-when-non-existing-d.patch" |