X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=scripts%2Fbundle-libraries.sh;h=dfc2b85a47a922f6544e0c95206b0b15260a4ba7;hb=e3d09e78980ee1954e536f9fccd2804f5f681973;hp=aba1cd6268e35adafee312a8855935371ee27342;hpb=24a7ccb0562a867e363a10ebdc64e3aaa6f01cd2;p=openwrt%2Fopenwrt.git

diff --git a/scripts/bundle-libraries.sh b/scripts/bundle-libraries.sh
index aba1cd6268..dfc2b85a47 100755
--- a/scripts/bundle-libraries.sh
+++ b/scripts/bundle-libraries.sh
@@ -2,7 +2,7 @@
 #
 #   Script to install host system binaries along with required libraries.
 #
-#   Copyright (C) 2012-2013 Jo-Philipp Wich <jo@mein.io>
+#   Copyright (C) 2012-2017 Jo-Philipp Wich <jo@mein.io>
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -27,6 +27,13 @@ _cp() {
 	}
 }
 
+_mv() {
+	mv ${VERBOSE:+-v} "$1" "$2" || {
+		echo "mv($1 $2) failed" >&2
+		exit 1
+	}
+}
+
 _md() {
 	mkdir ${VERBOSE:+-v} -p "$1" || {
 		echo "mkdir($1) failed" >&2
@@ -41,6 +48,52 @@ _ln() {
 	}
 }
 
+_relpath() {
+	local base="$(readlink -f "$1")"
+	local dest="$(readlink -f "$2")"
+	local up
+
+	[ -d "$base" ] || base="${base%/*}"
+	[ -d "$dest" ] || dest="${dest%/*}"
+
+	while true; do
+		case "$base"
+			in "$dest"/*)
+				echo "$up/${base#$dest/}"
+				break
+			;;
+			*)
+				dest="${dest%/*}"
+				up="${up:+$up/}.."
+			;;
+		esac
+	done
+}
+
+_wrapper() {
+	cat <<-EOT | ${CC:-gcc} -x c -o "$1" -
+		#include <unistd.h>
+		#include <stdio.h>
+
+		int main(int argc, char **argv) {
+			const char *self   = argv[0];
+			const char *target = argv[1];
+
+			if (argc < 3) {
+				fprintf(stderr, "Usage: %s executable arg0 [args...]\n", self);
+				return 1;
+			}
+
+			return execv(target, argv + 2);
+		}
+	EOT
+
+	[ -x "$1" ] || {
+		echo "compiling wrapper failed" >&2
+		exit 5
+	}
+}
+
 for LDD in ${PATH//://ldd }/ldd; do
 	"$LDD" --version >/dev/null 2>/dev/null && break
 	LDD=""
@@ -49,29 +102,31 @@ done
 [ -n "$LDD" -a -x "$LDD" ] || LDD=
 
 for BIN in "$@"; do
-	[ -n "$BIN" -a -x "$BIN" -a -n "$DIR" ] || {
+	[ -n "$BIN" -a -n "$DIR" ] || {
 		echo "Usage: $0 <destdir> <executable> ..." >&2
 		exit 1
 	}
 
-	[ ! -d "$DIR/bundled/lib" ] && {
-		_md "$DIR/bundled/lib"
-		_md "$DIR/bundled/usr"
-		_ln "../lib" "$DIR/bundled/usr/lib"
+	[ ! -d "$DIR/lib" ] && {
+		_md "$DIR/lib"
+		_md "$DIR/usr"
+		_ln "../lib" "$DIR/usr/lib"
+	}
+
+	[ ! -x "$DIR/lib/runas" ] && {
+		_wrapper "$DIR/lib/runas"
 	}
 
 	LDSO=""
 
-	echo "Bundling ${BIN##*/}"
-	[ -n "$LDD" ] && {
+	[ -n "$LDD" ] && [ -x "$BIN" ] && file "$BIN" | grep -sqE "ELF.*executable" && {
 		for token in $("$LDD" "$BIN" 2>/dev/null); do
 			case "$token" in */*.so*)
 				case "$token" in
 					*ld-*.so*) LDSO="${token##*/}" ;;
-					*) echo " * lib: ${token##*/}" ;;
 				esac
 
-				dest="$DIR/bundled/lib/${token##*/}"
+				dest="$DIR/lib/${token##*/}"
 				ddir="${dest%/*}"
 
 				[ -f "$token" -a ! -f "$dest" ] && {
@@ -82,29 +137,22 @@ for BIN in "$@"; do
 		done
 	}
 
-	_md "$DIR"
-
 	# is a dynamically linked executable
 	if [ -n "$LDSO" ]; then
-		_cp "$BIN" "$DIR/bundled/${BIN##*/}"
+		echo "Bundling ${BIN##*/}"
 
+		RUNDIR="$(readlink -f "$BIN")"; RUNDIR="${RUNDIR%/*}"
 		RUN="${LDSO#ld-}"; RUN="run-${RUN%%.so*}.sh"
+		REL="$(_relpath "$DIR/lib" "$BIN")"
 
-		[ -x "$DIR/bundled/$RUN" ] || {
-			cat <<-EOF > "$DIR/bundled/$RUN"
-				#!/usr/bin/env bash
-				dir="\$(dirname "\$0")"
-				bin="\$(basename "\$0")"
-				exec -a "\$0" "\$dir/bundled/lib/$LDSO" --library-path "\$dir/bundled/lib" "\$dir/bundled/\$bin" "\$@"
-			EOF
-			chmod ${VERBOSE:+-v} 0755 "$DIR/bundled/$RUN"
-		}
+		_mv "$BIN" "$RUNDIR/.${BIN##*/}.bin"
 
-		_ln "./bundled/$RUN" "$DIR/${BIN##*/}"
+		cat <<-EOF > "$BIN"
+			#!/usr/bin/env bash
+			dir="\$(dirname "\$0")"
+			exec "\$dir/${REL:+$REL/}$LDSO" --library-path "\$dir/${REL:+$REL/}" "\$dir/${REL:+$REL/}runas" "\$dir/.${BIN##*/}.bin" "\$0" "\$@"
+		EOF
 
-	# is a static executable or non-elf binary
-	else
-		[ -n "$LDD" ] && echo " * not dynamically linked"
-		_cp "$BIN" "$DIR/${BIN##*/}"
+		chmod ${VERBOSE:+-v} 0755 "$BIN"
 	fi
 done