From f3cb42f70d12c6d90d612574b27b07951bdfd9ed Mon Sep 17 00:00:00 2001 From: geos_one Date: Thu, 9 Apr 2009 22:12:29 +0000 Subject: [PATCH] add multilib aware chrpath git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1003 6952d904-891a-0410-993b-d76249ca496b --- app-admin/chrpath/ChangeLog | 38 +++++ app-admin/chrpath/Manifest | 6 + app-admin/chrpath/chrpath-0.13.ebuild | 28 ++++ .../chrpath/files/chrpath-keepgoing.patch | 20 +++ .../chrpath/files/chrpath-multilib.patch | 141 ++++++++++++++++++ app-admin/chrpath/metadata.xml | 8 + 6 files changed, 241 insertions(+) create mode 100644 app-admin/chrpath/ChangeLog create mode 100644 app-admin/chrpath/Manifest create mode 100644 app-admin/chrpath/chrpath-0.13.ebuild create mode 100644 app-admin/chrpath/files/chrpath-keepgoing.patch create mode 100644 app-admin/chrpath/files/chrpath-multilib.patch create mode 100644 app-admin/chrpath/metadata.xml diff --git a/app-admin/chrpath/ChangeLog b/app-admin/chrpath/ChangeLog new file mode 100644 index 00000000..56711cec --- /dev/null +++ b/app-admin/chrpath/ChangeLog @@ -0,0 +1,38 @@ +# ChangeLog for app-admin/chrpath +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 23 Nov 2008; Patrick Lauer chrpath-0.13.ebuild: + Homepage fix + + 11 May 2008; chrpath-0.13.ebuild: + - keyworded for ~arm + + 25 Dec 2007; Christian Heim metadata.xml: + Removing taviso from metadata.xml as per #202471. Assigning to + maintainer-needed. + + 03 Jul 2007; Roy Marples chrpath-0.13.ebuild: + Added ~x86-fbsd keyword. + + 09 Feb 2007; Diego Pettenò ChangeLog: + Regenerate digest in Manifest2 format. + + 08 Feb 2007; Diego Pettenò ChangeLog: + Regenerate digest in Manifest2 format. + + 01 May 2005; Michael Hanselmann chrpath-0.13.ebuild: + Stable on ppc. + + 23 Apr 2005; Stephanie Lockwood-Childs + chrpath-0.13.ebuild: + added ~ppc + +*chrpath-0.13 (10 Feb 2005) + + 10 Feb 2005; Chris Gianelloni chrpath-0.13.ebuild: + Added amd64 to KEYWORDS. + + 05 Feb 2005; Tavis Ormandy +metadata.xml: + initial import + diff --git a/app-admin/chrpath/Manifest b/app-admin/chrpath/Manifest new file mode 100644 index 00000000..d87ba8dc --- /dev/null +++ b/app-admin/chrpath/Manifest @@ -0,0 +1,6 @@ +AUX chrpath-keepgoing.patch 1041 RMD160 9c454d96245d434b69db0b176a792f50eb882429 SHA1 a213403888ca21aa7730b4957b8f9f7e6c4b05b6 SHA256 6c45aa896835cea3df7b0edcadea2171e8e5833b4d40c99babab15b5648d219a +AUX chrpath-multilib.patch 3549 RMD160 1ebe77532319fd4877fbea019b519b4b78cb1427 SHA1 2a1189a4e7743b3707de929bacc162c73ac0549d SHA256 36241db7e559ed8cfa0d239d63d17e4c33d63d58a10981f18dfa6e7c2004aac7 +DIST chrpath-0.13.tar.gz 125129 RMD160 89b91919e3f629173388f10469dc94fadd46aa56 SHA1 11ff3e3dda2acaf1e529475f394f74f2ef7a8204 SHA256 c1aa5342eac0daad81b8da05aa282ae1ccd6f68bc75ca94064304f541eed071b +EBUILD chrpath-0.13.ebuild 721 RMD160 ac373b24a5e5674f87ffe56d659a357a4ad91951 SHA1 dcf9ec2e5f513f15e318946f76eae977fe3a325f SHA256 5fe76170380ec1182a0a4723b684e6f6d2213931f1924a319fd6c87882dd9c43 +MISC ChangeLog 1239 RMD160 41cf4e7ee716922b9d8e75a8c62deb954332cd3b SHA1 ee9afb21b92518e573b9a77775d8c0c64a35c27f SHA256 a1843f4ed331ceaad0e16507a6c9a598af9e8bd3d61656bf6307fd0b45cb0b7c +MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 diff --git a/app-admin/chrpath/chrpath-0.13.ebuild b/app-admin/chrpath/chrpath-0.13.ebuild new file mode 100644 index 00000000..b3163744 --- /dev/null +++ b/app-admin/chrpath/chrpath-0.13.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit eutils autotools + +DESCRIPTION="chrpath can modify the rpath and runpath of ELF executables" +HOMEPAGE="http://directory.fsf.org/project/chrpath/" +SRC_URI="ftp://ftp.hungry.com/pub/hungry/chrpath/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm ppc x86 ~x86-fbsd" +IUSE="" + +src_prepare() { + epatch ${FILESDIR}/chrpath-multilib.patch + epatch ${FILESDIR}/chrpath-keepgoing.patch + eautoreconf +} + +src_install() { + einstall + doman chrpath.1 + dodoc ChangeLog AUTHORS NEWS README +} \ No newline at end of file diff --git a/app-admin/chrpath/files/chrpath-keepgoing.patch b/app-admin/chrpath/files/chrpath-keepgoing.patch new file mode 100644 index 00000000..d8f69657 --- /dev/null +++ b/app-admin/chrpath/files/chrpath-keepgoing.patch @@ -0,0 +1,20 @@ +--- chrpath-0.13/main.c.orig 2006-02-27 20:21:06.000000000 +0100 ++++ chrpath-0.13/main.c 2006-02-27 21:07:16.027641500 +0100 +@@ -57,6 +57,7 @@ + printf(" -r |--replace Replace current rpath/runpath setting\n"); + printf(" with the path given\n"); + printf(" -l|--list List the current rpath/runpath (default)\n"); ++ printf(" -k|--keepgoing Continue as much as possible after an error.\n"); + printf(" -h|--help Show this usage information.\n"); + #ifndef HAVE_GETOPT_LONG + printf("\n *** The long options are not available on this platform"); +--- chrpath-0.13/chrpath.1.orig 2004-09-19 10:35:44.000000000 +0200 ++++ chrpath-0.13/chrpath.1 2006-02-28 10:06:28.187060500 +0100 +@@ -22,6 +22,7 @@ + [ \fB-r\fP \fI\fP |\ \fB--replace\fP \fI\fP ] + [ \fB-c\fP | \fB--convert\fP ] + [ \fB-l\fP | \fB--list\fP ] ++[ \fB-k\fP | \fB--keepgoing\fP ] + [ \fB-h\fP | \fB--help\fP ] + \fI\fP [ \fI\fP ... ] + .SH DESCRIPTION diff --git a/app-admin/chrpath/files/chrpath-multilib.patch b/app-admin/chrpath/files/chrpath-multilib.patch new file mode 100644 index 00000000..a1c45a54 --- /dev/null +++ b/app-admin/chrpath/files/chrpath-multilib.patch @@ -0,0 +1,141 @@ +--- a/configure.ac 2004-09-19 10:28:33.000000000 +0200 ++++ b/configure.ac 2006-02-27 16:12:00.282066250 +0100 +@@ -16,6 +16,7 @@ + dnl Checks for programs. + AC_PROG_CC + AC_PROG_INSTALL ++AC_PROG_LIBTOOL + + dnl Checks for libraries. + +@@ -26,7 +27,6 @@ + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST + AC_C_BIGENDIAN +-AC_CHECK_SIZEOF(void *) + + dnl Checks for library functions. + AC_CHECK_FUNCS(getopt_long) +--- a/Makefile.am 2004-09-19 10:29:28.000000000 +0200 ++++ b/Makefile.am 2006-02-27 16:57:31.166290750 +0100 +@@ -12,12 +12,19 @@ + fakeroot debian/rules binary + + chrpath_SOURCES = \ +- chrpath.c \ +- killrpath.c \ + main.c \ +- elf.c \ + protos.h + ++chrpath_LDADD = -ldl ++ ++lib_LTLIBRARIES = libchrpath32.la libchrpath64.la ++libchrpath32_la_SOURCES = chrpath.c killrpath.c elf.c protos.h ++libchrpath32_la_CFLAGS = -DSIZEOF_VOID_P=4 ++libchrpath32_la_LDFLAGS = -avoid-version ++libchrpath64_la_SOURCES = chrpath.c killrpath.c elf.c protos.h ++libchrpath64_la_CFLAGS = -DSIZEOF_VOID_P=8 ++libchrpath64_la_LDFLAGS = -avoid-version ++ + EXTRA_DIST = ChangeLog.usermap $(man_MANS) + + CLEANFILES = *.bb *.bbg *.da *.gcov testsuite/*.bb testsuite/*.bbg +--- a/main.c 2004-09-19 10:33:37.000000000 +0200 ++++ b/main.c 2006-02-27 17:23:39.400267750 +0100 +@@ -12,13 +12,19 @@ + # include "config.h" + #endif + ++#include ++#include ++#include + #include + #include ++#include + #include + #ifdef HAVE_GETOPT_H + #include + #endif +-#include "protos.h" ++ ++typedef int (*killrpath_t)(const char *filename); ++typedef int (*chrpath_t)(const char *filename, const char *newpath, int convert); + + #ifdef HAVE_GETOPT_LONG + # define GETOPT_LONG getopt_long +@@ -61,6 +67,30 @@ + printf("\n"); + } + ++static unsigned ++elf_class(const char *filename) ++{ ++ Elf32_Ehdr ehdr; ++ int fd; ++ ++ fd = open(filename, O_RDONLY); ++ if (fd == -1) ++ return 0; ++ if (read(fd, &ehdr, sizeof(ehdr)) != sizeof(ehdr)) ++ { ++ close(fd); ++ return 0; ++ } ++ close(fd); ++ if ((memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0) ++ || (ehdr.e_ident[EI_VERSION] != EV_CURRENT)) ++ { ++ fprintf(stderr, "`%s' probably isn't an ELF file.\n", filename); ++ return 0; ++ } ++ return ehdr.e_ident[EI_CLASS]; ++} ++ + int + main(int argc, char * const argv[]) + { +@@ -73,6 +103,9 @@ + #ifdef HAVE_GETOPT_LONG + int option_index = 0; + #endif /* HAVE_GETOPT_LONG */ ++ void* dll[2]; ++ killrpath_t killrpath[2]; ++ chrpath_t chrpath[2]; + + if (argc < 2) + { +@@ -116,14 +149,31 @@ + } + } while (-1 != opt); + ++ dll[0] = dlopen("libchrpath32.so", RTLD_LAZY); ++ killrpath[0] = (killrpath_t)dlsym(dll[0], "killrpath"); ++ chrpath[0] = (chrpath_t)dlsym(dll[0], "chrpath"); ++ ++ dll[1] = dlopen("libchrpath64.so", RTLD_LAZY); ++ killrpath[1] = (killrpath_t)dlsym(dll[1], "killrpath"); ++ chrpath[1] = (chrpath_t)dlsym(dll[1], "chrpath"); ++ + while (optind < argc && (!retval || keep_going)) + { ++ const char* program = argv[optind++]; ++ unsigned eclass = elf_class(program); ++ if (!eclass) ++ { ++ retval = 1; ++ continue; ++ } + if (remove) +- retval |= killrpath(argv[optind++]); ++ retval |= killrpath[eclass - ELFCLASS32](program); + else + /* list by default, replace if path is set */ +- retval |= chrpath(argv[optind++], newpath, convert); ++ retval |= chrpath[eclass - ELFCLASS32](program, newpath, convert); + } + ++ dlclose(dll[0]); ++ dlclose(dll[1]); + return retval; + } diff --git a/app-admin/chrpath/metadata.xml b/app-admin/chrpath/metadata.xml new file mode 100644 index 00000000..9f3fdee2 --- /dev/null +++ b/app-admin/chrpath/metadata.xml @@ -0,0 +1,8 @@ + + + + no-herd + + maintainer-needed@gentoo.org + +