- add ET_DYN support for position independent executables

(Portage version: 2604-svn)

8 files changed, 104 insertions, 9 deletions

diff --git a/app-arch/upx-ucl/ChangeLog b/app-arch/upx-ucl/ChangeLog
index f9cc40445cca..2f8e143bc0b8 100644
--- a/app-arch/upx-ucl/ChangeLog
+++ b/app-arch/upx-ucl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/upx-ucl
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/ChangeLog,v 1.6 2005/01/01 12:02:01 eradicator Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/ChangeLog,v 1.7 2006/01/31 02:33:04 solar Exp $
+
+*upx-ucl-1.25-r1 (30 Jan 2006)
+
+  30 Jan 2006; <solar@gentoo.org> +metadata.xml,
+  +files/upx-ucl-1.25-pie.patch, +upx-ucl-1.25-r1.ebuild:
+  - add ET_DYN support for position independent executables
 
 *upx-ucl-1.25 (09 Jul 2004)
 
diff --git a/app-arch/upx-ucl/Manifest b/app-arch/upx-ucl/Manifest
index 101edb3d15fe..a23c2b0dec6d 100644
--- a/app-arch/upx-ucl/Manifest
+++ b/app-arch/upx-ucl/Manifest
@@ -1,5 +1,27 @@
-MD5 6560942676a9441ef87c03b89f6a4350 ChangeLog 708
-MD5 bbf3c534b8a75d9bbf6682888b749012 upx-ucl-1.24.ebuild 863
-MD5 e3f950bfaff116cfa1a1990930d9be08 upx-ucl-1.25.ebuild 839
+MD5 7866462b298805428e83b86f1779f75c ChangeLog 908
+RMD160 54422a38a2ade49caa5bc70d125833abc28c1545 ChangeLog 908
+SHA256 40b124e80f9f139041b90bb4721e87115499b4087793836eb62adffd8944052d ChangeLog 908
 MD5 7321411d8b47a0a94a230b0a338ca0d2 files/digest-upx-ucl-1.24 64
+RMD160 265e8fb15376284bdd40b3ea409bae67fb887f90 files/digest-upx-ucl-1.24 64
+SHA256 e63aa93365dae8011e285f45d3791de2c9b9fdee53b59643f7c0e1562482b608 files/digest-upx-ucl-1.24 64
 MD5 5d3006a2e612fcc16edb9cbe618bc1e7 files/digest-upx-ucl-1.25 64
+RMD160 5a106750350c2614af0905a205f6a9fb3366db19 files/digest-upx-ucl-1.25 64
+SHA256 6b2e9baf4da297e5cfca0bc171ca4b5ad1c52d6770f1b6488fc8c5a6f75aa939 files/digest-upx-ucl-1.25 64
+MD5 729cae49c80a67a4bf5c1df3f98e8427 files/digest-upx-ucl-1.25-r1 238
+RMD160 fcce59fb22a060d6994308543a150fe1975bba30 files/digest-upx-ucl-1.25-r1 238
+SHA256 57f913cee76a00012aa7f47101370574a201fc02e29b084c3827ee320f8ce271 files/digest-upx-ucl-1.25-r1 238
+MD5 ef26e703c2348a2f313a823bfb0770fb files/upx-ucl-1.25-pie.patch 782
+RMD160 c35d0c3b015586c8b4472e33be790f722daa5046 files/upx-ucl-1.25-pie.patch 782
+SHA256 edbb4eb5888822b6b70fd8b1e058c5315832811e815c8753fd90e9b1430f6d20 files/upx-ucl-1.25-pie.patch 782
+MD5 312f6535d251f402060ae25612f749e1 metadata.xml 269
+RMD160 012df6682364eb1b1a0830b6998f7d018b4fe097 metadata.xml 269
+SHA256 6d7bbf68b3c6b4f1376b55f09c57f15361152d288e698ee99715d116b3582977 metadata.xml 269
+MD5 b7bedcf414af4ca2c87fc36be605334b upx-ucl-1.24.ebuild 863
+RMD160 f0b37795a044ad8a4a66102bd84fbaca6b80f77d upx-ucl-1.24.ebuild 863
+SHA256 b7d9108d0c4b7584ab3bda1635fb317ce84d3436d53210e18de30c3397f8a6f1 upx-ucl-1.24.ebuild 863
+MD5 c77541a79d991512c7cbed98ebb23513 upx-ucl-1.25-r1.ebuild 968
+RMD160 a1ab98cdb07598001d24fb64eb5ff3afedf7e937 upx-ucl-1.25-r1.ebuild 968
+SHA256 904f1c941fe9e5d08241de09c13c2b6e4f7c11e4fd78da93a416e8efde57138f upx-ucl-1.25-r1.ebuild 968
+MD5 0273d9810ede62632dfa973bbd76e7ad upx-ucl-1.25.ebuild 839
+RMD160 6fe3088dd5d2223650006a7fe3ce61a97b10ca16 upx-ucl-1.25.ebuild 839
+SHA256 2f28e34ae547df3948399beef3b3e93d847a59f097011b6dccc701be66690659 upx-ucl-1.25.ebuild 839
diff --git a/app-arch/upx-ucl/files/digest-upx-ucl-1.25-r1 b/app-arch/upx-ucl/files/digest-upx-ucl-1.25-r1
new file mode 100644
index 000000000000..f82cef62186a
--- /dev/null
+++ b/app-arch/upx-ucl/files/digest-upx-ucl-1.25-r1
@@ -0,0 +1,3 @@
+MD5 6f20a62999a46a1864652454b3c8a5d8 upx-1.25-src.tar.gz 250849
+RMD160 1c73a1eb8d98d32ef63ed351ca494526f895a9de upx-1.25-src.tar.gz 250849
+SHA256 c0bf0b2eccd5766a1171733323ab79c9e4d21d66f4ef2ad8ea7387c72adeb6ed upx-1.25-src.tar.gz 250849
diff --git a/app-arch/upx-ucl/files/upx-ucl-1.25-pie.patch b/app-arch/upx-ucl/files/upx-ucl-1.25-pie.patch
new file mode 100644
index 000000000000..400f313edeeb
--- /dev/null
+++ b/app-arch/upx-ucl/files/upx-ucl-1.25-pie.patch
@@ -0,0 +1,18 @@
+--- upx-1.25.orig/src/p_unix.cpp	2005-06-03 13:00:09.000000000 -0400
++++ upx-1.25/src/p_unix.cpp	2005-06-03 13:51:24.000000000 -0400
+@@ -376,11 +376,12 @@ bool PackLinuxI386::canPack()
+     const unsigned l = get_le32(buf);
+     if (!memcmp(buf, "\x7f\x45\x4c\x46\x01\x01\x01", 7)) // ELF 32-bit LSB
+     {
++        unsigned int e_type = get_le16(buf+16);
+         exetype = 1;
+         // now check the ELF header
+         if (memcmp(buf+8, "FreeBSD", 7) == 0)   // branded
+             exetype = 0;
+-        if (get_le16(buf+16) != 2)              // e_type - executable
++        if ((e_type > 3) || (e_type < 2))       // e_type - ET_EXEC or ET_DYN
+             exetype = 0;
+         if (get_le16(buf+18) != 3)              // e_machine - Intel 80386
+             exetype = 0;
+
+
diff --git a/app-arch/upx-ucl/metadata.xml b/app-arch/upx-ucl/metadata.xml
new file mode 100644
index 000000000000..ce479404dfde
--- /dev/null
+++ b/app-arch/upx-ucl/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<longdescription>UPX is a versatile executable packer with a excellent compression ratio</longdescription>
+</pkgmetadata>
diff --git a/app-arch/upx-ucl/upx-ucl-1.24.ebuild b/app-arch/upx-ucl/upx-ucl-1.24.ebuild
index 41e2ecdb017a..436dcf00e4a8 100644
--- a/app-arch/upx-ucl/upx-ucl-1.24.ebuild
+++ b/app-arch/upx-ucl/upx-ucl-1.24.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/upx-ucl-1.24.ebuild,v 1.6 2005/01/01 12:02:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/upx-ucl-1.24.ebuild,v 1.7 2006/01/31 02:33:04 solar Exp $
 
 MY_P=${P/-ucl/}
 S=${WORKDIR}/${MY_P}
diff --git a/app-arch/upx-ucl/upx-ucl-1.25-r1.ebuild b/app-arch/upx-ucl/upx-ucl-1.25-r1.ebuild
new file mode 100644
index 000000000000..3496e9597bb4
--- /dev/null
+++ b/app-arch/upx-ucl/upx-ucl-1.25-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/upx-ucl-1.25-r1.ebuild,v 1.1 2006/01/31 02:33:04 solar Exp $
+
+MY_P=${P/-ucl/}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="upx is the Ultimate Packer for eXecutables."
+HOMEPAGE="http://upx.sourceforge.net"
+SRC_URI="http://upx.sourceforge.net/download/${MY_P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+
+IUSE=""
+
+DEPEND=">=dev-libs/ucl-1.02
+	>=dev-lang/perl-5.6
+	!app-arch/upx"
+
+RDEPEND=">=dev-libs/ucl-1.02 !app-arch/upx"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}"/${PN}-${PV}-pie.patch
+}
+
+src_compile() {
+	make -C src UCLDIR=/usr CFLAGS_O="${CFLAGS}" || die "Failed compiling"
+	make -C doc || "Failed making documentation"
+}
+
+src_install() {
+	dobin src/upx
+
+	dodoc BUGS LICENSE LOADER.TXT NEWS PROJECTS README* THANKS doc/upx.doc
+	dohtml doc/upx.html
+	doman doc/upx.1
+}
diff --git a/app-arch/upx-ucl/upx-ucl-1.25.ebuild b/app-arch/upx-ucl/upx-ucl-1.25.ebuild
index 599ac11273ed..b1ee146d5c05 100644
--- a/app-arch/upx-ucl/upx-ucl-1.25.ebuild
+++ b/app-arch/upx-ucl/upx-ucl-1.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/upx-ucl-1.25.ebuild,v 1.2 2005/01/01 12:02:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/upx-ucl-1.25.ebuild,v 1.3 2006/01/31 02:33:04 solar Exp $
 
 MY_P=${P/-ucl/}
 S=${WORKDIR}/${MY_P}