added bzip2 detection patch

4 files changed, 69 insertions, 2 deletions

diff --git a/app-arch/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
index 9f766ec31f97..5f3b3077c343 100644
--- a/app-arch/rpm2targz/Manifest
+++ b/app-arch/rpm2targz/Manifest
@@ -1,7 +1,7 @@
-MD5 21beaf05477958ad0cf9bd15073c01db ChangeLog 1741
+MD5 e5aced398c9947c1218fe8a6e164e6fb ChangeLog 1967
 MD5 00179eb24b8e3f49d583d10b22b6b68e rpm2targz-8.0.ebuild 1003
 MD5 9a826ac99eea485088465913563eef3a rpm2targz-9.0.ebuild 878
-MD5 f9d7335b19c7a506bc4fddda273fc874 rpm2targz-9.0-r1.ebuild 990
+MD5 7a7c3b364f34a97d6eac21bbbe276f9f rpm2targz-9.0-r1.ebuild 993
 MD5 242377a7ef1b45e246460cbbf4bb6984 files/digest-rpm2targz-8.0 163
 MD5 d0f2d521642a49ec038e441268ab6480 files/digest-rpm2targz-9.0 63
 MD5 a850046e92cebae159a1a554cdab3f91 files/rpm2targz-9.0-gentoo.patch 554
diff --git a/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r1 b/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r1
new file mode 100644
index 000000000000..154805e3f598
--- /dev/null
+++ b/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r1
@@ -0,0 +1 @@
+MD5 7b8ba680dcbe7e1e4e349698400bcea6 rpm2targz-9.0.tar.gz 2639
diff --git a/app-arch/rpm2targz/files/rpm2targz-9.0-bzip2.patch b/app-arch/rpm2targz/files/rpm2targz-9.0-bzip2.patch
new file mode 100644
index 000000000000..63aa755cc13e
--- /dev/null
+++ b/app-arch/rpm2targz/files/rpm2targz-9.0-bzip2.patch
@@ -0,0 +1,27 @@
+--- rpmoffset.c	2003-06-21 13:25:14.000000000 +0100
++++ rpmoffset.c.new	2003-06-26 00:27:31.000000000 +0100
+@@ -1,4 +1,3 @@
+-
+ /* Find how deeply inside an .RPM the real data is */
+ /* kept, and report the offset in bytes */
+ 
+@@ -16,8 +15,17 @@
+ {
+         char *buff = malloc(RPMBUFSIZ),*eb,*p;
+         for (p = buff, eb = buff + read(0,buff,RPMBUFSIZ); p < eb; p++)
+-                if (*p == '\037' && p[1] == '\213' && p[2] == '\010')
+-                        printf("%d\n",p - buff),
++	{
++                if (*p == '\037' && p[1] == '\213' && p[2] == '\010') 
++		{
++                        printf("%d\n",p - buff);
+                         exit(0);
++		}
++		else if (*p == 'B' && p[1] == 'Z' && p[2] == 'h' )
++		{
++		 	printf("%d\n",p - buff);
++			exit(0);
++		}
++        }
+         exit(1);
+ }
diff --git a/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild b/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild
new file mode 100644
index 000000000000..778958d0c6f3
--- /dev/null
+++ b/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild,v 1.1 2003/06/25 23:48:54 liquidx Exp $
+
+DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+HOMEPAGE="http://www.slackware.com/config/packages.php"
+
+IUSE=""
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa"
+
+# NOTE: rpm2targz autodetects rpm2cpio at runtime, and uses it if available,
+#       so we don't explicitly set it as a dependency.
+DEPEND="virtual/glibc
+	sys-apps/cpio
+	sys-apps/file"
+
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# makes rpm2targz extract in current dir
+	epatch ${FILESDIR}/${P}-gentoo.patch
+	# adds bzip2 detection (#23249)
+	epatch ${FILESDIR}/${P}-bzip2.patch
+}
+
+src_compile() {
+	${CC:-gcc} ${CFLAGS} -o rpmoffset rpmoffset.c || die
+}
+
+src_install() {
+	dobin rpmoffset rpm2targz
+	dodoc rpm2targz.README
+}