~alpine/aports

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
1

[alpine-aports] [PATCH] main/lddtree: Make lddtree canonicalize symlinks when resolving them.

Linus Swälas
Details
Message ID
<20161011234700.GA1247@borderlessmail>
Sender timestamp
1476229621
DKIM signature
missing
Download raw message
Patch: +19 -4
---
 main/lddtree/0001-lddtree-canonicalize-symlinks.patch | 11 +++++++++++
 main/lddtree/APKBUILD                                 | 12 ++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 main/lddtree/0001-lddtree-canonicalize-symlinks.patch

diff --git a/main/lddtree/0001-lddtree-canonicalize-symlinks.patch b/main/lddtree/0001-lddtree-canonicalize-symlinks.patch
new file mode 100644
index 0000000..ea65434
--- /dev/null
+++ b/main/lddtree/0001-lddtree-canonicalize-symlinks.patch
@@ -0,0 +1,11 @@
+--- lddtree-1.25.orig/lddtree.sh	2016-10-10 03:28:25.941861438 +0200
+@@ -148,7 +148,7 @@
+ 	list_existing_file "${_resolv_links}"
+ 	cd "${_resolv_links%/*}"
+ 	while [ -L "$_resolv_links" ]; do
+-		_resolv_links=$(readlink "$_resolv_links")
++		_resolv_links=$(readlink -f "$_resolv_links")
+ 		case "$_resolv_links" in
+ 		/*)	_resolv_links="${ROOT}${_resolv_links#/}"
+ 			cd "${_resolv_links%/*}"
diff --git a/main/lddtree/APKBUILD b/main/lddtree/APKBUILD
index 1f8df2f..3309454 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=2
+pkgrel=3
 pkgdesc="List dynamic dependencies as a tree"
 url="https://github.com/ncopa/lddtree"
 arch="noarch"
@@ -15,6 +15,7 @@ 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
+	0001-lddtree-canonicalize-symlinks.patch
 	"
 
 _builddir="$srcdir"/lddtree-$pkgver
@@ -39,10 +40,13 @@ package() {
 
 md5sums="ef9ba097371d41aa48c4b13d5bcb14e5  lddtree-1.25.tar.gz
 fc518d16c5febcebcf9678c07362e021  0001-lddtree-print-resolved-interp-symlinks.patch
-bf882ddabd2c6e8d983c723457b24684  0001-lddtree-remove-bashism.patch"
+bf882ddabd2c6e8d983c723457b24684  0001-lddtree-remove-bashism.patch
+4b84184cdae090d98e5ebdb05b086f98  0001-lddtree-canonicalize-symlinks.patch"
 sha256sums="e53c3ec6ae93f7e5caf9566ba2727f9cb383f4d239d5977b4e96d6628501cc14  lddtree-1.25.tar.gz
 a35ca064c58ccba7b89715c158fab63b6d90f5ed76a271501f11d214312ba9ac  0001-lddtree-print-resolved-interp-symlinks.patch
-3b9a5a273f88661e6317c8d86f5fd81e4a5f7f0cd75f6d24de1bf83c75441133  0001-lddtree-remove-bashism.patch"
+3b9a5a273f88661e6317c8d86f5fd81e4a5f7f0cd75f6d24de1bf83c75441133  0001-lddtree-remove-bashism.patch
+f59946e55e13b2ab1964bd72a65cc37498df9fc87931b1a6d9f2c666656ab052  0001-lddtree-canonicalize-symlinks.patch"
 sha512sums="471a363292033592f4e0c5e32f68d79f37a9648b27d604dc78878726fa281c618a18ee2e92a0d3b7817ebdaf92f5af4a73eb33e53f8b48ee83ea98095150895c  lddtree-1.25.tar.gz
 11f05548053204979ca338b6310adae795d392f2ad0fb8c74f1b0dee289380b0e47d5f5da8a17e06d3f4389a927b14044570e584125e47dc0920b2b133b12ee9  0001-lddtree-print-resolved-interp-symlinks.patch
-40bd32d3d669a9170b5c4f5f9c4d47b74b7fdfeb1ad195bc12b1650453826100a70d8b1aed15d4f3a8b4f317f85ffcd1ca80132631e361595c6c0a85eee505c5  0001-lddtree-remove-bashism.patch"
+40bd32d3d669a9170b5c4f5f9c4d47b74b7fdfeb1ad195bc12b1650453826100a70d8b1aed15d4f3a8b4f317f85ffcd1ca80132631e361595c6c0a85eee505c5  0001-lddtree-remove-bashism.patch
+3886b10c2e16b2a538f0eb0d868f52a45cd77b7dae0cacc0f6d2fe126f561d16bba3096a18d668764ad7681eadae3b1fb550055ba3d29f03bdd02c9cf7a696e9  0001-lddtree-canonicalize-symlinks.patch"
-- 
2.10.0


-- 
A: Because it messes up the order in which people normally read text. 
Q: Why is top-posting such a bad thing? 


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Timo Teras
Details
Message ID
<20161104091917.135d9758@vostro.util.wtbts.net>
In-Reply-To
<20161011234700.GA1247@borderlessmail> (view parent)
Sender timestamp
1478243957
DKIM signature
missing
Download raw message
On Wed, 12 Oct 2016 01:47:01 +0200
Linus Swälas <linus.swalas@borderless.se> wrote:

> diff --git a/main/lddtree/0001-lddtree-canonicalize-symlinks.patch
> b/main/lddtree/0001-lddtree-canonicalize-symlinks.patch new file mode
> 100644 index 0000000..ea65434
> --- /dev/null
> +++ b/main/lddtree/0001-lddtree-canonicalize-symlinks.patch
> @@ -0,0 +1,11 @@
> +--- lddtree-1.25.orig/lddtree.sh	2016-10-10
> 03:28:25.941861438 +0200 ++++ lddtree-1.25/lddtree.sh
> 2016-10-10 03:29:03.838528005 +0200 +@@ -148,7 +148,7 @@
> + 	list_existing_file "${_resolv_links}"
> + 	cd "${_resolv_links%/*}"
> + 	while [ -L "$_resolv_links" ]; do
> +-		_resolv_links=$(readlink "$_resolv_links")
> ++		_resolv_links=$(readlink -f "$_resolv_links")
> + 		case "$_resolv_links" in
> + 		/*)	_resolv_links="${ROOT}${_resolv_links#/}"
> + 			cd "${_resolv_links%/*}"

Could you submit this as pull request to the upstream project first?
Would be nice to have in the commit message a description what this
fixes, or why this should be used.

Thanks.


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---