[arch-commits] Commit in rpmextract/repos (4 files)

[Jan de Groot]

    Date: Sunday, December 21, 2008 @ 12:53:37
  Author: jgc
Revision: 22079

Merged revisions 356,22078 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/rpmextract/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r22078 | jgc | 2008-12-21 17:53:06 +0000 (Sun, 21 Dec 2008) | 2 lines
  
  upgpkg: rpmextract 1.0-1
      Split rpm extraction into two scripts. rpm2cpio can be used by tools like file-roller
........

Added:
  rpmextract/repos/extra-i686/rpm2cpio
    (from rev 22078, rpmextract/trunk/rpm2cpio)
Modified:
  rpmextract/repos/extra-i686/	(properties)
  rpmextract/repos/extra-i686/PKGBUILD
  rpmextract/repos/extra-i686/rpmextract.sh

---------------+
 PKGBUILD      |   18 +++++++++++-------
 rpm2cpio      |   26 ++++++++++++++++++++++++++
 rpmextract.sh |   23 +----------------------
 3 files changed, 38 insertions(+), 29 deletions(-)


Property changes on: rpmextract/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /rpmextract/trunk:1
   + /rpmextract/trunk:1-22078

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-21 17:53:06 UTC (rev 22078)
+++ extra-i686/PKGBUILD	2008-12-21 17:53:37 UTC (rev 22079)
@@ -2,15 +2,19 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=rpmextract
-pkgver=0
-pkgrel=2
-pkgdesc="This script extracts rpm archives"
+pkgver=1.0
+pkgrel=1
+pkgdesc="Script to convert or extract RPM archives (contains rpm2cpio)"
 arch=(i686 x86_64)
 license=('GPL')
-source=(rpmextract.sh)
+source=(rpmextract.sh rpm2cpio)
 url="http://www.archlinux.org"
-depends=('bash' 'libarchive')
+depends=('bash' 'libarchive' 'coreutils')
+md5sums=('a7b527e4c210e66ef72532c606072e0d'
+         '57a4e99bedcefadc2f89006ce98d2e60')
+
 build() {
-install -D -m755 $startdir/src/rpmextract.sh $startdir/pkg/usr/bin/rpmextract.sh
+  install -m755 -d ${pkgdir}/usr/bin
+  install -m755 ${srcdir}/rpmextract.sh ${pkgdir}/usr/bin/ || return 1
+  install -m755 ${srcdir}/rpm2cpio ${pkgdir}/usr/bin/ || return 1
 }
-md5sums=('e90e363350c0b334f858385c52cf7559')

Copied: rpmextract/repos/extra-i686/rpm2cpio (from rev 22078, rpmextract/trunk/rpm2cpio)
===================================================================
--- extra-i686/rpm2cpio	                        (rev 0)
+++ extra-i686/rpm2cpio	2008-12-21 17:53:37 UTC (rev 22079)
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+pkg=$1
+if [ "$pkg" = "" -o ! -e "$pkg" ]; then
+  echo "no package supplied" 1>&2
+  exit 1
+fi
+
+leadsize=96
+o=`expr $leadsize + 8`
+set `od -j $o -N 8 -t u1 $pkg`
+il=`expr 256 \* \( 256 \* \( 256 \* $2 + $3 \) + $4 \) + $5`
+dl=`expr 256 \* \( 256 \* \( 256 \* $6 + $7 \) + $8 \) + $9`
+# echo "sig il: $il dl: $dl"
+
+sigsize=`expr 8 + 16 \* $il + $dl`
+o=`expr $o + $sigsize + \( 8 - \( $sigsize \% 8 \) \) \% 8 + 8`
+set `od -j $o -N 8 -t u1 $pkg`
+il=`expr 256 \* \( 256 \* \( 256 \* $2 + $3 \) + $4 \) + $5`
+dl=`expr 256 \* \( 256 \* \( 256 \* $6 + $7 \) + $8 \) + $9`
+# echo "hdr il: $il dl: $dl"
+
+hdrsize=`expr 8 + 16 \* $il + $dl`
+o=`expr $o + $hdrsize`
+
+dd if=$pkg ibs=$o skip=1 2>/dev/null

Modified: extra-i686/rpmextract.sh
===================================================================
--- extra-i686/rpmextract.sh	2008-12-21 17:53:06 UTC (rev 22078)
+++ extra-i686/rpmextract.sh	2008-12-21 17:53:37 UTC (rev 22079)
@@ -1,26 +1,6 @@
 #!/bin/sh
-
-pkg=$1
-if [ "$pkg" = "" -o ! -e "$pkg" ]; then
+if [ "$1" = "" -o ! -e "$1" ]; then
     echo "no package supplied" 1>&2
    exit 1
 fi
-
-leadsize=96
-o=`expr $leadsize + 8`
-set `od -j $o -N 8 -t u1 $pkg`
-il=`expr 256 \* \( 256 \* \( 256 \* $2 + $3 \) + $4 \) + $5`
-dl=`expr 256 \* \( 256 \* \( 256 \* $6 + $7 \) + $8 \) + $9`
-# echo "sig il: $il dl: $dl"
-
-sigsize=`expr 8 + 16 \* $il + $dl`
-o=`expr $o + $sigsize + \( 8 - \( $sigsize \% 8 \) \) \% 8 + 8`
-set `od -j $o -N 8 -t u1 $pkg`
-il=`expr 256 \* \( 256 \* \( 256 \* $2 + $3 \) + $4 \) + $5`
-dl=`expr 256 \* \( 256 \* \( 256 \* $6 + $7 \) + $8 \) + $9`
-# echo "hdr il: $il dl: $dl"
-
-hdrsize=`expr 8 + 16 \* $il + $dl`
-o=`expr $o + $hdrsize`
-
-dd if=$pkg ibs=$o skip=1 2>/dev/null | bsdtar -xf -
\ No newline at end of file
+rpm2cpio $1 | bsdtar -xf -