aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2015-02-23 16:31:12 +0000
committerCarlo Landmeter <clandmeter@gmail.com>2015-02-23 16:31:12 +0000
commita2dcd024401b9e98925be1bf51fa5bcc3c9d9600 (patch)
tree3945d872a1b0bc8a1562c4d946567a12e6589fb2
parent43529205cccbc99a3c2a27d478f43ac5cd87b4bc (diff)
downloadaports-a2dcd024401b9e98925be1bf51fa5bcc3c9d9600.tar.gz
aports-a2dcd024401b9e98925be1bf51fa5bcc3c9d9600.tar.bz2
aports-a2dcd024401b9e98925be1bf51fa5bcc3c9d9600.tar.xz
main/pax-utils: upgrade to 1.9.1
-rw-r--r--main/pax-utils/APKBUILD14
-rw-r--r--main/pax-utils/lddtree-sh.patch209
-rw-r--r--main/pax-utils/musl-decl.patch24
3 files changed, 5 insertions, 242 deletions
diff --git a/main/pax-utils/APKBUILD b/main/pax-utils/APKBUILD
index 0d8ede5f97..e46d489e49 100644
--- a/main/pax-utils/APKBUILD
+++ b/main/pax-utils/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=pax-utils
-pkgver=0.8.1
+pkgver=0.9.1
pkgrel=0
pkgdesc="ELF related utils for ELF 32/64 binaries"
url="http://hardened.gentoo.org/pax-utils.xml"
@@ -8,8 +8,7 @@ arch="all"
license='GPL2'
depends="scanelf"
makedepends=
-source="http://dev.gentoo.org/~vapier/dist/pax-utils-$pkgver.tar.xz
- musl-decl.patch"
+source="http://dev.gentoo.org/~vapier/dist/pax-utils-$pkgver.tar.xz"
subpackages="$pkgname-doc scanelf:_scanelf"
_builddir="$srcdir"/pax-utils-$pkgver
@@ -40,9 +39,6 @@ _scanelf() {
mv "$pkgdir"/usr/bin/scanelf "$subpkgdir"/usr/bin/
}
-md5sums="bc42279c5aff3682c12be40f72805cec pax-utils-0.8.1.tar.xz
-1056671d887efe6b7b6882fe1aff2052 musl-decl.patch"
-sha256sums="844ff25b1a11bcef92ef34b22f576f226a772b67196818656f8874513438f5b9 pax-utils-0.8.1.tar.xz
-63ba759021a3a40ab978ef007d6517123286c48061127c15d1c1557b41ff49c4 musl-decl.patch"
-sha512sums="bd8ae0c35058b79a99bcbb5df234c8d4a02ccf0ebd4b06cc30cdb01bc50b7e5ba6cc5cbbf820a0d57dcdc751fd1ea81d5969a4447c4594ab170958edabe41740 pax-utils-0.8.1.tar.xz
-0ceac13c8d8a897408841c7cfc762670fe3ebc6732b7a0cdabb46afc6beec117a33abccddbaf3cc62ddef0355167baf41ecb6331aa907751b7a60cc177306f1c musl-decl.patch"
+md5sums="e47c9c59832e99fe9793d23610e3462c pax-utils-0.9.1.tar.xz"
+sha256sums="643ccaf6952f836c42aafcd5ad7e5f7de2d3472225a34603680b151a8b198b0c pax-utils-0.9.1.tar.xz"
+sha512sums="718cf371a2b14333fcc47e7c250ba4996bc2f4b3cab3373524215c74cdf979669cfd47b48f1b08214fb958e65e7ce83ecd74bd855f5e008d235fa6c4c57dad8e pax-utils-0.9.1.tar.xz"
diff --git a/main/pax-utils/lddtree-sh.patch b/main/pax-utils/lddtree-sh.patch
deleted file mode 100644
index 6967df81c6..0000000000
--- a/main/pax-utils/lddtree-sh.patch
+++ /dev/null
@@ -1,209 +0,0 @@
---- ./lddtree.sh.orig 2014-03-18 13:38:57.284756931 +0100
-+++ ./lddtree.sh 2014-03-18 13:22:47.296407170 +0100
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # Copyright 2007-2013 Gentoo Foundation
- # Copyright 2007-2013 Mike Frysinger <vapier@gentoo.org>
- # Distributed under the terms of the GNU General Public License v2
-@@ -7,8 +7,9 @@
- argv0=${0##*/}
-
- : ${ROOT:=/}
--[[ ${ROOT} != */ ]] && ROOT="${ROOT}/"
--[[ ${ROOT} != /* ]] && ROOT="${PWD}${ROOT}"
-+
-+[ "${ROOT}" = "${ROOT%/}" ] && ROOT="${ROOT}/"
-+[ "${ROOT}" = "${ROOT#/}" ] && ROOT="${PWD}/${ROOT}"
-
- usage() {
- cat <<-EOF
-@@ -54,7 +55,7 @@
- _find_elf=''
-
- local elf=$1 needed_by=$2
-- if [[ ${elf} == */* ]] && [[ -e ${elf} ]] ; then
-+ if [ "${elf}" != "${elf##*/}" ] && [ -e "${elf}" ] ; then
- _find_elf=${elf}
- return 0
- else
-@@ -63,8 +64,8 @@
- local path pe
- for path ; do
- pe="${path%/}/${elf#/}"
-- if [[ -e ${pe} ]] ; then
-- if [[ $(elf_specs "${pe}") == "${elf_specs}" ]] ; then
-+ if [ -e "${pe}" ] ; then
-+ if [ "$(elf_specs "${pe}")" = "${elf_specs}" ] ; then
- _find_elf=${pe}
- return 0
- fi
-@@ -73,52 +74,53 @@
- return 1
- }
-
-- if [[ ${c_last_needed_by} != ${needed_by} ]] ; then
-- c_last_needed_by=${needed_by}
-+ if [ "${c_last_needed_by}" != "${needed_by}" ] ; then
-+ c_last_needed_by="${needed_by}"
- c_last_needed_by_rpaths=$(scanelf -qF '#F%r' "${needed_by}" | \
- sed -e 's|:| |g' -e "s:[$]ORIGIN:${needed_by%/*}:")
- fi
- check_paths "${elf}" ${c_last_needed_by_rpaths} && return 0
-
-- if [[ -n ${LD_LIBRARY_PATH} ]] ; then
-+ if [ -n "${LD_LIBRARY_PATH}" ] ; then
- # Need to handle empty paths as $PWD,
- # and handle spaces in between the colons
- local p path=${LD_LIBRARY_PATH}
- while : ; do
- p=${path%%:*}
- check_paths "${elf}" "${p:-${PWD}}" && return 0
-- [[ ${path} == *:* ]] || break
-+ [ "${path}" = "${path#*:}" ] && break
- path=${path#*:}
- done
- fi
-
- if ! ${c_ldso_paths_loaded} ; then
- c_ldso_paths_loaded='true'
-- c_ldso_paths=()
-- if [[ -r ${ROOT}etc/ld.so.conf ]] ; then
-+ c_ldso_paths=
-+ if [ -r ${ROOT}etc/ld.so.conf ] ; then
- read_ldso_conf() {
- local line p
- for p ; do
- # if the glob didnt match anything #360041,
- # or the files arent readable, skip it
-- [[ -r ${p} ]] || continue
-+ [ -r "${p}" ] || continue
- while read line ; do
- case ${line} in
- "#"*) ;;
- "include "*) read_ldso_conf ${line#* } ;;
-- *) c_ldso_paths+=( "${ROOT}${line#/}" ) ;;
-+ *) c_ldso_paths="$c_ldso_paths:${ROOT}${line#/}";;
- esac
- done <"${p}"
- done
- }
- # the 'include' command is relative
-- pushd "${ROOT}"etc >/dev/null
-+ local _oldpwd="$PWD"
-+ cd "$ROOT"etc >/dev/null
- read_ldso_conf "${ROOT}"etc/ld.so.conf
-- popd >/dev/null
-+ cd "$_oldpwd"
- fi
- fi
-- if [[ ${#c_ldso_paths[@]} -gt 0 ]] ; then
-- check_paths "${elf}" "${c_ldso_paths[@]}" && return 0
-+ if [ -n "${c_ldso_paths}" ] ; then
-+ check_paths "${elf}" ${c_ldso_paths//:/ } && return 0
- fi
-
- check_paths "${elf}" ${lib_paths_ldso:-${lib_paths_fallback}} && return 0
-@@ -135,27 +137,29 @@
- elf=${elf##*/}
-
- ${LIST} || printf "%${indent}s%s => " "" "${elf}"
-- if [[ ,${parent_elfs}, == *,${elf},* ]] ; then
-+ case ",${parent_elfs}," in
-+ *,${elf},*)
- ${LIST} || printf "!!! circular loop !!!\n" ""
- return
-- fi
-+ ;;
-+ esac
- parent_elfs="${parent_elfs},${elf}"
- if ${LIST} ; then
- echo "${resolved:-$1}"
- else
- printf "${resolved:-not found}"
- fi
-- if [[ ${indent} -eq 0 ]] ; then
-+ if [ ${indent} -eq 0 ] ; then
- elf_specs=$(elf_specs "${resolved}")
- interp=$(scanelf -qF '#F%i' "${resolved}")
-- [[ -n ${interp} ]] && interp="${ROOT}${interp#/}"
-+ [ -n "${interp}" ] && interp="${ROOT}${interp#/}"
-
- if ${LIST} ; then
-- [[ -n ${interp} ]] && echo "${interp}"
-+ [ -n "${interp}" ] && echo "${interp}"
- else
- printf " (interpreter => ${interp:-none})"
- fi
-- if [[ -r ${interp} ]] ; then
-+ if [ -r "${interp}" ] ; then
- # Extract the default lib paths out of the ldso.
- lib_paths_ldso=$(
- strings "${interp}" | \
-@@ -166,7 +170,7 @@
- fi
- ${LIST} || printf "\n"
-
-- [[ -z ${resolved} ]] && return
-+ [ -z "${resolved}" ] && return
-
- libs=$(scanelf -qF '#F%n' "${resolved}")
-
-@@ -178,16 +182,15 @@
-
- for lib in ${libs//,/ } ; do
- lib=${lib##*/}
-- [[ ,${my_allhits}, == *,${lib},* ]] && continue
-+ case ",${my_allhits}," in
-+ *,${lib},*) continue;;
-+ esac
- find_elf "${lib}" "${resolved}"
- rlib=${_find_elf}
- show_elf "${rlib:-${lib}}" $((indent + 4)) "${parent_elfs}"
- done
- }
-
--# XXX: internal hack
--if [[ $1 != "/../..source.lddtree" ]] ; then
--
- SHOW_ALL=false
- SET_X=false
- LIST=false
-@@ -210,8 +213,8 @@
- ?) usage 1;;
- esac
- done
--shift $((OPTIND - 1))
--[[ -z $1 ]] && usage 1
-+shift $(( $OPTIND - 1))
-+[ -z "$1" ] && usage 1
-
- ${SET_X} && set -x
-
-@@ -219,21 +222,20 @@
- for elf ; do
- unset lib_paths_ldso
- unset c_last_needed_by
-- if ${AUTO_ROOT} && [[ ${elf} == /* ]] ; then
-+ if ${AUTO_ROOT} && [ -z "${elf##/*}" ] ; then
- elf="${ROOT}${elf#/}"
- fi
-- if [[ ! -e ${elf} ]] ; then
-+ if [ ! -e "${elf}" ] ; then
- error "${elf}: file does not exist"
-- elif [[ ! -r ${elf} ]] ; then
-+ elif [ ! -r "${elf}" ] ; then
- error "${elf}: file is not readable"
-- elif [[ -d ${elf} ]] ; then
-+ elif [ -d "${elf}" ] ; then
- error "${elf}: is a directory"
- else
- allhits=""
-- [[ ${elf} != */* ]] && elf="./${elf}"
-+ [ "${elf##*/*}" = "${elf}" ] && elf="./${elf}"
- show_elf "${elf}" 0 ""
- fi
- done
- exit ${ret}
-
--fi
diff --git a/main/pax-utils/musl-decl.patch b/main/pax-utils/musl-decl.patch
deleted file mode 100644
index cbb23ada63..0000000000
--- a/main/pax-utils/musl-decl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./elf.h.orig
-+++ ./elf.h
-@@ -21,7 +21,9 @@
-
- #include <features.h>
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- /* Standard ELF types. */
-
-@@ -3374,7 +3376,8 @@
-
- #define R_TILEGX_NUM 130
-
--
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif /* elf.h */