ohnobinki_overlay Changeset - 1e48b341ee7c

Changeset - 1e48b341ee7c

Parent rev.

Child rev.

[Not reviewed]

default

1 2 1

Nathan Brink (binki) - 15 years ago 2011-01-01 17:40:52
ohnobinki@ohnopublishing.net

sys-apps/abi-wrapper: Update abi-wrapper based on patch from vlooe which protects abi-wrapper from bad ABI and DEFAULT_ABI settings.

(Portage version: 2.2.0_alpha2-r1/hg/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 6BA81050)

3 files changed with 32 insertions and 24 deletions:

sys-apps/abi-wrapper/Manifest

sys-apps/abi-wrapper/abi-wrapper-1.0-r3.ebuild

sys-apps/abi-wrapper/files/abi-wrapper

0 comments (0 inline, 0 general)

sys-apps/abi-wrapper/Manifest

➞

Show inline comments

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 AUX abi-wrapper 620 RMD160 8e2994d7f83af7c5804665b4bf929b054f3e88f8 SHA1 843322074a712137f3a9cfcfaf9e8f4dd7155277 SHA256 da19d388743386418d8108966908bbc6377214dadda68f42b1397a84dd342500
 EBUILD abi-wrapper-1.0-r2.ebuild 488 RMD160 d0250acbc1aa0878964b1617824e409cb94119c2 SHA1 477828dd67bbb1f21064be9c19600e32f7509847 SHA256 a6c0a2c7ff12987772b85da633a5218bd7da20c757cf7c7eca21766d88550ced
 AUX abi-wrapper 779 RMD160 e16fe52ed4222c2feb237cd9f0e49ae3e9ad2caa SHA1 5ba8f7f9fc8d7544a21d214ba025ae46f9a91cf2 SHA256 2aa383dbf31fb6abaab14d3861d90a0086ac8cc7548cad363cf7a537b9997b17
 EBUILD abi-wrapper-1.0-r3.ebuild 474 RMD160 1f555f96e9c8bc454b408c3795a939dfab2f73e8 SHA1 81e1deef575b7f11829018e18f13775a08e3de11 SHA256 340b608295e960e8ba5a341ce35516e8814ceeffb8aeb115e099223baf6274b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 iQIcBAEBCAAGBQJNH6X8AAoJEHQ6UuhrqBBQ33cP/3urZiGmlyNRZIw2NQ3aDCos
 QNIy46lPivpZP3GlwHh3Ne3H53gbK1I564+v+HNSDX3eQjpzakQJq4cIlKllBsa
 E1ofcnNLFaHo2qnVORLTqSKHK4EkQ70HtBAD6VzeAy0uhIukv8ln+gniIUcgDFw4
 W9n5P4LkwQ7ZP92ldMtz16JLmCz7jaxLAX4QH6Gg0UOuRjrBTicPw6uazRZNPnsO
 YCE2eIaWrch81GVjjMKUTH7yngzUWAQ8WxZsT1Fkup16K0XHEOshxV3TsH5pLFlg
 igTMuOtuVqXqyykEa+dkXEhnQb0eyXusK2atdhZwqqFn5/8act7x4abUuZhAGox
 MDBIjN8U7z92nW0wxQ821Ta/tts7lZYqqhju1V3M6T0nBgs6PAkZsAyNTyvuu4O
 BNCYJNVyyFJ8yhyhxxT5GcQBogzkolbvDOyVubpy3JwUEB67jXc45nquwR/eS6I
 sPYm8DxeAIIQmpaFo4HMVsvRvbSmjja58waxflMOY05NZQNj6AqIWUZoe3B6hv8F
 EDhLwHXXlt3JjYOgH1Y4RpoXJXerWgBTMHDXVb2SUiFickbZX09lTSgHdXbBVMLx
 cgU6cQlAILDWkFoCDshgQc+I5vyI5a3t1B5dW83/VUvRh8NEibm4YX9+DvQQlE/X
 PyGHS84uaW1hExAVsxw6
 =si+F
 iQIcBAEBCAAGBQJNH610AAoJEHQ6UuhrqBBQumQP/iwO6xu6OMsR3jxk/2ZdbcPX
 zDKdHPKZ54KFSH/Fx6u8cdR9+NRKgdQjC+iqQmZHcSSg1QmF05d/zszOCx4RVMYp
 yiSV59EUr17suGG9SrLJAZxx8DD9HYkCsfZLWhWypQnfLOGMiC9zpB5uM6HMUTNU
 qLiFzJeoX4G7VmP3hdcrq5sY7M4w6iRFJJ8STvx9pvOImKvSnZMqKosBXCv4AWjO
 H6+1pGONGuEbGThtyRlj1SU5rfKSg7w9iCp6JPVJ7dosU2ClE/iMiDyLJf8/ouYv
 rGPC3N8dj9NoJDrMdaczXY77lYcjFw1w4P5/GB1r/d7STE9HUjjcZITnVZqv1KxL
 IQrGcFBUBoV5FWfROgVN1HgbR4AngkNPSgqwgl2mkQHGb8VczbOB2yyEdbA/N+fD
 Hjrr6nvphcUYVo7LRcT1s8JlyrwxKLb1/ZhDGTQey5CV/nvZX69ZOo5CfbczWtms
 EvBqq99YXxQ14dDKbd3qimi1GO2LWNq2DDee9wCiGOsQcvZTL9JWEucJ5iiP/jqG
 gDBg9Yviday6QcPI1Y3hnUFkSDYW/i796qppssV59CBczBravCT7NfiLXOa+ibrr
 U7o1rofZ0C74hSmcLiUkIglbQyDSrhpQfM/ch+BKyNPzPWOavY5NKOV5gFQbUvRj
 OQnk1MbgPsuFVTIXRp9n
 =+GDG
 -----END PGP SIGNATURE-----

sys-apps/abi-wrapper/abi-wrapper-1.0-r3.ebuild

➞

Show inline comments

 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 DESCRIPTION="Wraps binarys that behave abi dependand"
 HOMEPAGE="www.gentoo.org"
 SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE=""
 src_unpack() {
 	local abis="${DEFAULT_ABI} ${MULTILIB_ABIS/${DEFAULT_ABI}}"
-	sed "s/PLACEHOLDER_FOR_HARDCODED_ABIS/${abis}/" "${FILESDIR}"/abi-wrapper > "${WORKDIR}"/abi-wrapper
+	sed "s/@HARDCODED_ABIS@/${abis}/" "${FILESDIR}"/abi-wrapper > "${WORKDIR}"/abi-wrapper
+}
 src_install() {
 	dobin abi-wrapper || die
+}

sys-apps/abi-wrapper/files/abi-wrapper

➞

Show inline comments

 #!/bin/sh
 # Please be careful to keep this file sh compatible
 hardcoded_abis="@HARDCODED_ABIS@"
 if [ "${ABI}" ]; then
 	abi=${ABI}
 elif [ "${DEFAULT_ABI}" ]; then
 	abi=${DEFAULT_ABI}
 else
 	for abi in ${hardcoded_abis}; do
 		[ "${abi}" = "${ABI}" ] && break
 		abi=
 	done
 fi
 if [ ! "${abi}" -a "${DEFAULT_ABI}" ]; then
 	for abi in ${hardcoded_abis}; do
 		[ "${abi}" = "${DEFAULT_ABI}" ] && break
 		abi=
 	done
 fi
 if [ ! "${abi}" ]; then
 	# we're called from outside portage, so use the hardcoded abi list
 	hardcoded_abis="PLACEHOLDER_FOR_HARDCODED_ABIS"
 	for abi in ${hardcoded_abis}; do
 		[ -f "${0}-${abi}" ] && break
 		abi=
 	done
 fi
 if [ -f "${0}-${abi}" ]; then
 	exec "${0}-${abi}" ${1+"$@"}
 else
 	if [ -L "${0}" ]; then
 		LINK_TARGET="$(readlink "${0}")"
 		exec "${LINK_TARGET}" ${1+"$@"}
 	else
 		echo "${0}: abi-wrapper couldn't find an executable for current abi ${abi}" >&2
 		exit 1
 	fi
 fi

0 comments (0 inline, 0 general)