diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-05-30 18:56:59 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-05-30 18:58:21 +0200 |
| commit | d089f392f1b48a8facd3f415e911f14d3c696d6a (patch) | |
| tree | 285556e3827c9a2e45bc74c6e79f55c62eeb833f /main/lddtree | |
| parent | cc4799003749e39fe7fef095045fe3fb797729af (diff) | |
| download | aports-d089f392f1b48a8facd3f415e911f14d3c696d6a.tar.bz2 aports-d089f392f1b48a8facd3f415e911f14d3c696d6a.tar.xz | |
main/lddtree: remove bashism
ref #5636
Diffstat (limited to 'main/lddtree')
| -rw-r--r-- | main/lddtree/0001-lddtree-remove-bashism.patch | 41 | ||||
| -rw-r--r-- | main/lddtree/APKBUILD | 12 |
2 files changed, 49 insertions, 4 deletions
diff --git a/main/lddtree/0001-lddtree-remove-bashism.patch b/main/lddtree/0001-lddtree-remove-bashism.patch new file mode 100644 index 0000000000..caf8e610f8 --- /dev/null +++ b/main/lddtree/0001-lddtree-remove-bashism.patch @@ -0,0 +1,41 @@ +From 10fa89cfedf1cdf826a3ded8fe2362ac02311240 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 21 Apr 2015 21:32:06 +0200 +Subject: [PATCH] lddtree: remove bashism + +Fixes #1. "Bad substitution" when running in dash. +--- + lddtree.sh | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/lddtree.sh b/lddtree.sh +index 28c06d0..1968d08 100755 +--- a/lddtree.sh ++++ b/lddtree.sh +@@ -1,8 +1,8 @@ + #!/bin/sh + # Copyright 2007-2013 Gentoo Foundation + # Copyright 2007-2013 Mike Frysinger <vapier@gentoo.org> ++# Copyright 2014-2015 Natanael Copa <ncopa@alpinelinux.org> + # Distributed under the terms of the GNU General Public License v2 +-# $Header: /var/cvsroot/gentoo-projects/pax-utils/lddtree.sh,v 1.22 2013/04/07 19:20:09 vapier Exp $ + + argv0=${0##*/} + version=1.25 +@@ -216,7 +216,12 @@ show_elf() { + allhits="${allhits},${interp},${libs}" + fi + +- for lib in ${libs//,/ } ; do ++ oifs="$IFS" ++ IFS=, ++ set -- ${libs} ++ IFS="$oifs" ++ ++ for lib; do + lib=${lib##*/} + case ",${my_allhits}," in + *,${lib},*) continue;; +-- +2.8.3 + diff --git a/main/lddtree/APKBUILD b/main/lddtree/APKBUILD index 1ec2b6223b..1f8df2fa7b 100644 --- a/main/lddtree/APKBUILD +++ b/main/lddtree/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lddtree pkgver=1.25 -pkgrel=1 +pkgrel=2 pkgdesc="List dynamic dependencies as a tree" url="https://github.com/ncopa/lddtree" arch="noarch" @@ -14,6 +14,7 @@ install="" subpackages="" source="lddtree-$pkgver.tar.gz::https://github.com/ncopa/lddtree/archive/v$pkgver.tar.gz 0001-lddtree-print-resolved-interp-symlinks.patch + 0001-lddtree-remove-bashism.patch " _builddir="$srcdir"/lddtree-$pkgver @@ -37,8 +38,11 @@ package() { } md5sums="ef9ba097371d41aa48c4b13d5bcb14e5 lddtree-1.25.tar.gz -fc518d16c5febcebcf9678c07362e021 0001-lddtree-print-resolved-interp-symlinks.patch" +fc518d16c5febcebcf9678c07362e021 0001-lddtree-print-resolved-interp-symlinks.patch +bf882ddabd2c6e8d983c723457b24684 0001-lddtree-remove-bashism.patch" sha256sums="e53c3ec6ae93f7e5caf9566ba2727f9cb383f4d239d5977b4e96d6628501cc14 lddtree-1.25.tar.gz -a35ca064c58ccba7b89715c158fab63b6d90f5ed76a271501f11d214312ba9ac 0001-lddtree-print-resolved-interp-symlinks.patch" +a35ca064c58ccba7b89715c158fab63b6d90f5ed76a271501f11d214312ba9ac 0001-lddtree-print-resolved-interp-symlinks.patch +3b9a5a273f88661e6317c8d86f5fd81e4a5f7f0cd75f6d24de1bf83c75441133 0001-lddtree-remove-bashism.patch" sha512sums="471a363292033592f4e0c5e32f68d79f37a9648b27d604dc78878726fa281c618a18ee2e92a0d3b7817ebdaf92f5af4a73eb33e53f8b48ee83ea98095150895c lddtree-1.25.tar.gz -11f05548053204979ca338b6310adae795d392f2ad0fb8c74f1b0dee289380b0e47d5f5da8a17e06d3f4389a927b14044570e584125e47dc0920b2b133b12ee9 0001-lddtree-print-resolved-interp-symlinks.patch" +11f05548053204979ca338b6310adae795d392f2ad0fb8c74f1b0dee289380b0e47d5f5da8a17e06d3f4389a927b14044570e584125e47dc0920b2b133b12ee9 0001-lddtree-print-resolved-interp-symlinks.patch +40bd32d3d669a9170b5c4f5f9c4d47b74b7fdfeb1ad195bc12b1650453826100a70d8b1aed15d4f3a8b4f317f85ffcd1ca80132631e361595c6c0a85eee505c5 0001-lddtree-remove-bashism.patch" |