From: Markos Chandras Date: Wed, 3 Mar 2010 17:19:52 +0000 (+0000) Subject: Revbump fixes multiple issues wrt bug #265575 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c87cd20622a7267189a8b58ffb182964f21ba61c;p=gentoo.git Revbump fixes multiple issues wrt bug #265575 Package-Manager: portage-2.2_rc63/cvs/Linux x86_64 --- diff --git a/app-admin/chrpath/ChangeLog b/app-admin/chrpath/ChangeLog index 9a8fb2457c2f..5b39e188f3ad 100644 --- a/app-admin/chrpath/ChangeLog +++ b/app-admin/chrpath/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-admin/chrpath -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/ChangeLog,v 1.11 2009/12/07 12:13:28 grobian Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/ChangeLog,v 1.12 2010/03/03 17:19:52 hwoarang Exp $ + +*chrpath-0.13-r1 (03 Mar 2010) + + 03 Mar 2010; Markos Chandras + +chrpath-0.13-r1.ebuild, +files/chrpath-keepgoing.patch, + +files/chrpath-multilib.patch: + Revbump fixes multiple issues wrt bug #265575 thanks to Mario Fetka + (geos_one) for the patches and the ebuild 07 Dec 2009; Fabian Groffen chrpath-0.13.ebuild: Add Prefix keywords diff --git a/app-admin/chrpath/Manifest b/app-admin/chrpath/Manifest index 9177d0e864bb..8287a6de809a 100644 --- a/app-admin/chrpath/Manifest +++ b/app-admin/chrpath/Manifest @@ -1,4 +1,7 @@ +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-r1.ebuild 916 RMD160 e03d12170ef4ed5effeea4a6d3a927d8c2249c85 SHA1 3dfbcf554743c3a56d1b92f20d439fbfdf893165 SHA256 5893b94635600a60314fc9da4dd36c873e90cbe2429519f5736e4ca3b10884f6 EBUILD chrpath-0.13.ebuild 777 RMD160 c866c1dea58ce705a286aac74fdc2e74bbcd28da SHA1 932ac7854d6b67618c8a050d10f1d4b8cfb9cfe6 SHA256 4dd3ad86be94f3a13a57e561b9038da08931cbd3654f9c9a6b96e172a5961b53 -MISC ChangeLog 1584 RMD160 b5e8544b8c67ea038748b84752a2bfcc20cbcdbd SHA1 30a1e0b811e5bd5e87060d0c9243dec7253e7d6d SHA256 a7feb27fc16915bc53e2e64dba5916a3d06c1e48d1ad12715fb9b66a23cdaabf +MISC ChangeLog 1901 RMD160 f7ef202ca6d643ffccef0b16078b23d45896600a SHA1 335c4a720dd98be0118a8163698a5c9f7d2764c3 SHA256 f2c00679cc981ea6cb456a1095a8a04e15eca9e18ca44565d7e9520c210ac3ed MISC metadata.xml 225 RMD160 64d906ab1e771348a42813c979ca57263c640dc4 SHA1 ab1badf0dc60ef92417bf6b220dd37dcb4239e1a SHA256 3c78c095ab816f7d77c844d89c690163c08b505d6d7382195271b54a6b645d99 diff --git a/app-admin/chrpath/chrpath-0.13-r1.ebuild b/app-admin/chrpath/chrpath-0.13-r1.ebuild new file mode 100644 index 000000000000..a708833a30b1 --- /dev/null +++ b/app-admin/chrpath/chrpath-0.13-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/chrpath-0.13-r1.ebuild,v 1.1 2010/03/03 17:19:52 hwoarang Exp $ + +EAPI="2" + +inherit eutils autotools + +DESCRIPTION="chrpath can modify the rpath and runpath of ELF executables" +HOMEPAGE="http://directory.fsf.org/project/chrpath/" +# original upstream no longer exists (ftp://ftp.hungry.com/pub/hungry) +SRC_URI="http://ftp.tux.org/pub/X-Windows/ftp.hungry.com/chrpath/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux +~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-multilib.patch + epatch "${FILESDIR}"/${PN}-keepgoing.patch + eautoreconf +} + +src_install() { + einstall + dodoc ChangeLog AUTHORS NEWS README || die "dodoc failed" +} diff --git a/app-admin/chrpath/files/chrpath-keepgoing.patch b/app-admin/chrpath/files/chrpath-keepgoing.patch new file mode 100644 index 000000000000..d8f6965729ff --- /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 000000000000..a1c45a5447f3 --- /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; + }