8 files changed, 106 insertions, 14 deletions
diff --git a/app-arch/rpm2targz/ChangeLog b/app-arch/rpm2targz/ChangeLog
index 9381a228ebd7..d6c54622f52d 100644
--- a/app-arch/rpm2targz/ChangeLog
+++ b/app-arch/rpm2targz/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/rpm2targz
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/ChangeLog,v 1.40 2006/03/31 00:01:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/ChangeLog,v 1.41 2006/04/24 21:47:18 liquidx Exp $
+
+*rpm2targz-9.0-r5 (24 Apr 2006)
+
+  24 Apr 2006; Alastair Tse <liquidx@gentoo.org>
+  +files/rpm2targz-9.0-portability.patch,
+  files/rpm2targz-9.0-secure_temp_handling.patch, +rpm2targz-9.0-r5.ebuild:
+  version bump with darwin fixes (thanks to exg@gentoo.org)
 
   31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   rpm2targz-9.0-r4.ebuild:
diff --git a/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r2 b/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r2
index 154805e3f598..338d1be8e9d6 100644
--- a/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r2
+++ b/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r2
@@ -1 +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/digest-rpm2targz-9.0-r3 b/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r3
index 154805e3f598..338d1be8e9d6 100644
--- a/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r3
+++ b/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r3
@@ -1 +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/digest-rpm2targz-9.0-r4 b/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r4
index 154805e3f598..338d1be8e9d6 100644
--- a/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r4
+++ b/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r4
@@ -1 +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/digest-rpm2targz-9.0-r5 b/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r5
new file mode 100644
index 000000000000..338d1be8e9d6
--- /dev/null
+++ b/app-arch/rpm2targz/files/digest-rpm2targz-9.0-r5
@@ -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-portability.patch b/app-arch/rpm2targz/files/rpm2targz-9.0-portability.patch
new file mode 100644
index 000000000000..9ab75e63685d
--- /dev/null
+++ b/app-arch/rpm2targz/files/rpm2targz-9.0-portability.patch
@@ -0,0 +1,29 @@
+--- rpm2targz	2006-04-24 14:55:23.000000000 +0200
++++ rpm2targz	2006-04-24 15:02:02.000000000 +0200
+@@ -58,7 +58,7 @@
+ 
+   # Determine if this is a source or binary RPM.
+   # If we have getrpmtype, use that.  Otherwise, try "file".
+-  if which getrpmtype 1> /dev/null 2> /dev/null; then
++  if command -v getrpmtype 1> /dev/null 2> /dev/null; then
+     if getrpmtype -n $i | grep source 1> /dev/null 2> /dev/null ; then
+       isSource=1
+     else
+@@ -73,7 +73,7 @@
+   fi
+ 
+   ofn=${WORKDIR}/`basename $i .rpm`.cpio
+-  if $USERPM2CPIO && which rpm2cpio 1> /dev/null 2> /dev/null ; then
++  if $USERPM2CPIO && command -v rpm2cpio 1> /dev/null 2> /dev/null ; then
+     rpm2cpio $i > $ofn 2> /dev/null
+     if [ ! $? = 0 ]; then
+       echo "... rpm2cpio failed.  (maybe $i is not an RPM?)"
+@@ -113,7 +113,7 @@
+   #fi
+   mkdir -p $DEST
+   ( cd $DEST
+-    cpio --extract --preserve-modification-time --make-directories < $ofn 1> /dev/null 2> /dev/null
++    cpio -i -m -d < $ofn 1> /dev/null 2> /dev/null
+     rm -f $ofn
+     find . -type d -perm 700 -exec chmod 755 {} \; )
+   ( cd ${WORKDIR} ; tar cf - . ) > `basename $i .rpm`.tar
diff --git a/app-arch/rpm2targz/files/rpm2targz-9.0-secure_temp_handling.patch b/app-arch/rpm2targz/files/rpm2targz-9.0-secure_temp_handling.patch
index 4a6cc2bf0b88..7d2b9f22b163 100644
--- a/app-arch/rpm2targz/files/rpm2targz-9.0-secure_temp_handling.patch
+++ b/app-arch/rpm2targz/files/rpm2targz-9.0-secure_temp_handling.patch
@@ -1,6 +1,6 @@
---- rpm2targz
-+++ rpm2targz
-@@ -23,20 +24,24 @@
+--- rpm2targz	2006-04-24 14:36:40.000000000 +0200
++++ rpm2targz	2006-04-24 14:37:08.000000000 +0200
+@@ -23,20 +23,24 @@
  
  # debug switch to allow to bypass use of rpm2cpio provided by the rpm package
  USERPM2CPIO=true
@@ -35,7 +35,7 @@
    echo
    echo "Usage:      $0 <file.rpm>"
    if [ "`basename $0`" = "rpm2tgz" ]; then
-@@ -50,12 +55,11 @@
+@@ -50,8 +54,7 @@
    if [ ! "$1" = "$*" ]; then
      echo "Processing file: $i"
    fi
@@ -45,12 +45,7 @@
  
    # Determine if this is a source or binary RPM.
    # If we have getrpmtype, use that.  Otherwise, try "file".
--  if which getrpmtype 1> /dev/null 2> /dev/null; then
-+  if type -p getrpmtype 1> /dev/null 2> /dev/null; then
-     if getrpmtype -n $i | grep source 1> /dev/null 2> /dev/null ; then
-       isSource=1
-     else
-@@ -69,12 +73,12 @@
+@@ -69,12 +72,12 @@
      fi
    fi
  
@@ -65,7 +60,7 @@
        continue
      fi
    else # less reliable than rpm2cpio...
-@@ -90,7 +94,7 @@
+@@ -90,7 +93,7 @@
  	decomp="bzip2"
      else
          echo  " $i - no magic compression identifier found - skipping file"
@@ -74,7 +69,7 @@
          continue
      fi
      echo -n "  trying to decompress with ${decomp}..."
-@@ -100,11 +104,11 @@
+@@ -100,11 +103,11 @@
      else
        echo "  FAILED"
        echo  " $i  failed to decompress - skipping file"
@@ -88,7 +83,7 @@
    #if [ "$isSource" = "1" ]; then
    #   DEST=$DEST/$(basename $(basename $i .rpm) .src)
    #fi
-@@ -113,11 +117,12 @@
+@@ -113,11 +116,12 @@
      cpio --extract --preserve-modification-time --make-directories < $ofn 1> /dev/null 2> /dev/null
      rm -f $ofn
      find . -type d -perm 700 -exec chmod 755 {} \; )
diff --git a/app-arch/rpm2targz/rpm2targz-9.0-r5.ebuild b/app-arch/rpm2targz/rpm2targz-9.0-r5.ebuild
new file mode 100644
index 000000000000..a8c63c27ea12
--- /dev/null
+++ b/app-arch/rpm2targz/rpm2targz-9.0-r5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0-r5.ebuild,v 1.1 2006/04/24 21:47:18 liquidx 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
+}
+
+src_compile() {
+	emake rpmoffset CC=$(tc-getCC) || die
+}
+
+src_install() {
+	dobin rpmoffset rpm2targz || die
+	dosym rpm2targz /usr/bin/rpm2tar
+	dodoc rpm2targz.README
+}