Revision bump to make rpm2targz compatible with non-bash shells. See bug #168253 by Emanuele Bagnaschi; thanks to Emanuele Giaquinta (exg) for the suggestions too. As I'm here, I've also removed the warnings during build and the QA notice about poor programming practices.

Package-Manager: portage-2.1.2.9

6 files changed, 142 insertions, 9 deletions

diff --git a/app-arch/rpm2targz/ChangeLog b/app-arch/rpm2targz/ChangeLog
index 18922e923ab4..25b7880db264 100644
--- a/app-arch/rpm2targz/ChangeLog
+++ b/app-arch/rpm2targz/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-arch/rpm2targz
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/ChangeLog,v 1.53 2007/01/21 17:02:28 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/ChangeLog,v 1.54 2007/06/18 11:52:18 flameeyes Exp $
+
+*rpm2targz-9.0-r6 (18 Jun 2007)
+
+  18 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/rpm2targz-9.0-sh.patch, +files/rpm2targz-9.0-warnings.patch,
+  +rpm2targz-9.0-r6.ebuild:
+  Revision bump to make rpm2targz compatible with non-bash shells. See bug
+  #168253 by Emanuele Bagnaschi; thanks to Emanuele Giaquinta (exg) for the
+  suggestions too. As I'm here, I've also removed the warnings during build
+  and the QA notice about poor programming practices.
 
   21 Jan 2007; Alexander H. Færøy <eroyf@gentoo.org>
   rpm2targz-9.0-r5.ebuild:
diff --git a/app-arch/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
index 71a1789111b3..3a464a63e0d4 100644
--- a/app-arch/rpm2targz/Manifest
+++ b/app-arch/rpm2targz/Manifest
@@ -25,6 +25,14 @@ AUX rpm2targz-9.0-secure_temp_handling.patch 3410 RMD160 5c78aad704bec385edff0bc
 MD5 11b0ab5dce2eb1954aeb1aad5dd7faa4 files/rpm2targz-9.0-secure_temp_handling.patch 3410
 RMD160 5c78aad704bec385edff0bcf617142500cc1a24f files/rpm2targz-9.0-secure_temp_handling.patch 3410
 SHA256 5f309cdd4de04552fd0c33263b36a036c59f50620cc042d184ba5335050ce6e8 files/rpm2targz-9.0-secure_temp_handling.patch 3410
+AUX rpm2targz-9.0-sh.patch 871 RMD160 e34da01719a6ae0325990b1ec1b2922c10ba39b9 SHA1 dd5d89eb024ed8fd99584ee375345fdfc1430b1d SHA256 ea6f98a5c5a0a4d8025bb227d0312b3e451ee3df88984fd371f1ccd2c8736d36
+MD5 19f7ed69e633f5d35673a7072bda6089 files/rpm2targz-9.0-sh.patch 871
+RMD160 e34da01719a6ae0325990b1ec1b2922c10ba39b9 files/rpm2targz-9.0-sh.patch 871
+SHA256 ea6f98a5c5a0a4d8025bb227d0312b3e451ee3df88984fd371f1ccd2c8736d36 files/rpm2targz-9.0-sh.patch 871
+AUX rpm2targz-9.0-warnings.patch 819 RMD160 472eefea003cdbca4283c6eb8f53d38a5dbdf802 SHA1 1712c333e04fb93a9c3a101aeb6a5669fd223a3b SHA256 9185dc55a1131f3f8b0052421dd60a19a2545dc252f3c0c5845c968059b68400
+MD5 c8975aee60dd61c68a19978f729a817a files/rpm2targz-9.0-warnings.patch 819
+RMD160 472eefea003cdbca4283c6eb8f53d38a5dbdf802 files/rpm2targz-9.0-warnings.patch 819
+SHA256 9185dc55a1131f3f8b0052421dd60a19a2545dc252f3c0c5845c968059b68400 files/rpm2targz-9.0-warnings.patch 819
 DIST rpm2targz-9.0.tar.gz 2639 RMD160 443f405a17dc6fd4128ed98e2aeb0d6cb6a3a8bf SHA1 b62685f5330e4a15998a99a9f560689a67bfdfb9 SHA256 ddc2a8728edaf137f887a7cf0404c46df1454c758052e9323ec878fa0b2c9c56
 EBUILD rpm2targz-9.0-r2.ebuild 1203 RMD160 bf4ccfac72719ceed8862e5f7ffa8a338d0f83cc SHA1 2d6a0b9df4d13744a4ee22126d04d258e8aae1b7 SHA256 96e1141502c7004c460874915155522eba96040c2f04d5f4147f05897782fae8
 MD5 448bca5e5f0e53872f20fc4464e9e0aa rpm2targz-9.0-r2.ebuild 1203
@@ -42,10 +50,14 @@ EBUILD rpm2targz-9.0-r5.ebuild 1502 RMD160 4be5f9204c6ba8d9e1e6054b05a70ac9b3e27
 MD5 b8f3605bca9aab1eab54a3f099cb610a rpm2targz-9.0-r5.ebuild 1502
 RMD160 4be5f9204c6ba8d9e1e6054b05a70ac9b3e27644 rpm2targz-9.0-r5.ebuild 1502
 SHA256 314b22728f29cc184594c122dc8558ae88b969d90000715540a54c252a030e87 rpm2targz-9.0-r5.ebuild 1502
-MISC ChangeLog 6917 RMD160 e39fbd618a6f55041470c431e72f64b03ecc9462 SHA1 afdc0da4a0e053e9bb68cae6c08e57862ad805cb SHA256 d7263195d900b8aa7df0de2cd278406e9b69d8c72bcc2210299bc7de39c52f41
-MD5 f92d1f81f333e3dd79e8ed4e10589bec ChangeLog 6917
-RMD160 e39fbd618a6f55041470c431e72f64b03ecc9462 ChangeLog 6917
-SHA256 d7263195d900b8aa7df0de2cd278406e9b69d8c72bcc2210299bc7de39c52f41 ChangeLog 6917
+EBUILD rpm2targz-9.0-r6.ebuild 1705 RMD160 51cd6edff64a71c8e3b7c0821cbef82d775132bd SHA1 33f761714b4852ad2e02bca71c0b36903f375acc SHA256 fb394e605388c21e8870182c68e838f096ad8a3c6144e3005ec588e0b18c3b7d
+MD5 75b5eeebbc8ea6502b4b41fb470f6c71 rpm2targz-9.0-r6.ebuild 1705
+RMD160 51cd6edff64a71c8e3b7c0821cbef82d775132bd rpm2targz-9.0-r6.ebuild 1705
+SHA256 fb394e605388c21e8870182c68e838f096ad8a3c6144e3005ec588e0b18c3b7d rpm2targz-9.0-r6.ebuild 1705
+MISC ChangeLog 7387 RMD160 d9129b13af85f28991110cda054a423f7111da3d SHA1 0d48e27d689801dcc3020e489b8fbbae2905c062 SHA256 ecc81cf49f4f5a1b32f82bb3829da4e47d3a81fa525011c5a49b1f84d2bfa1fc
+MD5 77ba4d42d854d1fd5ca4751f2b1d70ac ChangeLog 7387
+RMD160 d9129b13af85f28991110cda054a423f7111da3d ChangeLog 7387
+SHA256 ecc81cf49f4f5a1b32f82bb3829da4e47d3a81fa525011c5a49b1f84d2bfa1fc ChangeLog 7387
 MISC metadata.xml 219 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 SHA1 aad05fa7d0ab2c9304502d4843d10f775afad2a8 SHA256 f39a99f0777bf9eac2d5a444a392d3b93da834a6de01613747bad25c84637138
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 metadata.xml 219
@@ -62,10 +74,13 @@ SHA256 43ee4ddb04df7e95dc1a70954e661ad40d6a5cf00296a9ff964091a95bf3b10a files/di
 MD5 3a54053fb2f77d2d968fad47adcf8c2c files/digest-rpm2targz-9.0-r5 235
 RMD160 95f55e45b54d60dc1c7a4375087ff19ecbbf1493 files/digest-rpm2targz-9.0-r5 235
 SHA256 43ee4ddb04df7e95dc1a70954e661ad40d6a5cf00296a9ff964091a95bf3b10a files/digest-rpm2targz-9.0-r5 235
+MD5 3a54053fb2f77d2d968fad47adcf8c2c files/digest-rpm2targz-9.0-r6 235
+RMD160 95f55e45b54d60dc1c7a4375087ff19ecbbf1493 files/digest-rpm2targz-9.0-r6 235
+SHA256 43ee4ddb04df7e95dc1a70954e661ad40d6a5cf00296a9ff964091a95bf3b10a files/digest-rpm2targz-9.0-r6 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFFs5yG6Xxn2nLwtdQRAhWRAJ9c5jr4E6lrYfdcNMbZUPRgGK931QCeMu3Z
-RD3Yf43sSEhE5f9CAwQYkiI=
-=Mo98
+iD8DBQFGdnIaAiZjviIA2XgRAklBAKC1MDCD9CKu944VRa9YLKSLb8iJQgCgxdhu
+eULgn5j8lfp1wyKnGcJGNTM=
+=+55f
 -----END PGP SIGNATURE-----
diff --git a/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r6 b/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r6
new file mode 100644
index 000000000000..338d1be8e9d6
--- /dev/null
+++ b/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r6
@@ -0,0 +1,3 @@
+MD5 7b8ba680dcbe7e1e4e349698400bcea6 rpm2targz-9.0.tar.gz 2639
+RMD160 443f405a17dc6fd4128ed98e2aeb0d6cb6a3a8bf rpm2targz-9.0.tar.gz 2639
+SHA256 ddc2a8728edaf137f887a7cf0404c46df1454c758052e9323ec878fa0b2c9c56 rpm2targz-9.0.tar.gz 2639
diff --git a/app-arch/rpm2targz/files/rpm2targz-9.0-sh.patch b/app-arch/rpm2targz/files/rpm2targz-9.0-sh.patch
new file mode 100644
index 000000000000..c78c9ca6b22f
--- /dev/null
+++ b/app-arch/rpm2targz/files/rpm2targz-9.0-sh.patch
@@ -0,0 +1,22 @@
+Index: work/rpm2targz
+===================================================================
+--- work.orig/rpm2targz
++++ work/rpm2targz
+@@ -23,7 +23,7 @@
+ 
+ # debug switch to allow to bypass use of rpm2cpio provided by the rpm package
+ USERPM2CPIO=true
+-[ "$TMPDIR" == "" ] && TMPDIR=/tmp
++[ "$TMPDIR" = "" ] && TMPDIR=/tmp
+ if [ ! -d "$TMPDIR" ]; then
+ 	echo "TMPDIR=$TMPDIR is not a dir" > /dev/stderr
+ 	exit 1
+@@ -88,7 +88,7 @@ for i in $* ; do
+     PAYLOADOFFSET=`rpmoffset < $i` 
+     #identify compression
+     PAYLOADHEAD=`dd ibs=${PAYLOADOFFSET} skip=1 if=$i 2> /dev/null | dd bs=10 count=1 2> /dev/null`
+-    if echo ${PAYLOADHEAD} | grep -e $'^\037\213' > /dev/null ; then 
++    if echo ${PAYLOADHEAD} | od -c | grep '037.213' > /dev/null ; then 
+    	echo "found gzip magic bytes"
+ 	decomp="gzip"
+     elif echo ${PAYLOADHEAD} | grep -e "^BZh" > /dev/null ; then
diff --git a/app-arch/rpm2targz/files/rpm2targz-9.0-warnings.patch b/app-arch/rpm2targz/files/rpm2targz-9.0-warnings.patch
new file mode 100644
index 000000000000..301b772fb499
--- /dev/null
+++ b/app-arch/rpm2targz/files/rpm2targz-9.0-warnings.patch
@@ -0,0 +1,27 @@
+Index: work/rpmoffset.c
+===================================================================
+--- work.orig/rpmoffset.c
++++ work/rpmoffset.c
+@@ -5,6 +5,7 @@
+ /* Wouldn't it be a lot more sane if we could just untar these things? */
+ 
+ #include <stdlib.h>
++#include <stdio.h>
+ 
+ /* These offsets keep getting bigger, so we're going to just bite a 2MB */
+ /* chunk of RAM right away so that we have enough.  Yeah, horrible */
+@@ -19,12 +20,12 @@ main()
+ 	{
+                 if (*p == '\037' && p[1] == '\213' && p[2] == '\010') 
+ 		{
+-                        printf("%d\n",p - buff);
++                        printf("%ld\n",p - buff);
+                         exit(0);
+ 		}
+ 		else if (*p == 'B' && p[1] == 'Z' && p[2] == 'h' )
+ 		{
+-		 	printf("%d\n",p - buff);
++		 	printf("%ld\n",p - buff);
+ 			exit(0);
+ 		}
+         }
diff --git a/app-arch/rpm2targz/rpm2targz-9.0-r6.ebuild b/app-arch/rpm2targz/rpm2targz-9.0-r6.ebuild
new file mode 100644
index 000000000000..0f5a2946849a
--- /dev/null
+++ b/app-arch/rpm2targz/rpm2targz-9.0-r6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0-r6.ebuild,v 1.1 2007/06/18 11:52:18 flameeyes Exp $
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
+HOMEPAGE="http://www.slackware.com/config/packages.php"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+# NOTE: rpm2targz autodetects rpm2cpio at runtime, and uses it if available,
+#       so we don't explicitly set it as a dependency.
+DEPEND="app-arch/cpio
+	sys-apps/file"
+RDEPEND="${DEPEND}
+	userland_GNU? (
+		sys-apps/util-linux
+		sys-apps/which )"
+
+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
+	# adds bzip2 decompression to rpm2targz (#31164)
+	epatch "${FILESDIR}"/${P}-bzip2_rpm2targz.patch
+	# secures temp file handling (#96192)
+	epatch "${FILESDIR}"/${P}-secure_temp_handling.patch
+	# add supprot for a quicker rpm2tar
+	epatch "${FILESDIR}"/${P}-rpm2tar.patch
+	# non-gnu portability with which
+	epatch "${FILESDIR}"/${P}-portability.patch
+	# remove bashisms to be compatible with other sh
+	epatch "${FILESDIR}"/${P}-sh.patch
+	# remove warnings from the compiler (and QA warnings too)
+	epatch "${FILESDIR}"/${P}-warnings.patch
+}
+
+src_compile() {
+	emake rpmoffset CC=$(tc-getCC) || die
+}
+
+src_install() {
+	dobin rpmoffset rpm2targz || die
+	dosym rpm2targz /usr/bin/rpm2tar
+	dodoc rpm2targz.README
+}