diff --git a/srcpkgs/rpmextract/files/rpm2cpio b/srcpkgs/rpmextract/files/rpm2cpio deleted file mode 100755 index a0eba24032b..00000000000 --- a/srcpkgs/rpmextract/files/rpm2cpio +++ /dev/null @@ -1,26 +0,0 @@ -#!/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 diff --git a/srcpkgs/rpmextract/files/rpmextract b/srcpkgs/rpmextract/files/rpmextract index 47ad01dfe1e..c42ce466dbc 100755 --- a/srcpkgs/rpmextract/files/rpmextract +++ b/srcpkgs/rpmextract/files/rpmextract @@ -1,6 +1,10 @@ #!/bin/sh -if [ "$1" = "" -o ! -e "$1" ]; then - echo "no package supplied" 1>&2 - exit 1 + +if [ -z "$1" ]; then + echo "no package supplied" >&2 + exit 1 +elif [ ! -f "$1" ]; then + echo "'$1': not found" >&2 + exit 1 fi -rpm2cpio $1 | bsdtar -xf - +rpm2cpio "$1" | bsdtar -xf - diff --git a/srcpkgs/rpmextract/template b/srcpkgs/rpmextract/template index 3a3cc432863..74c334afe31 100644 --- a/srcpkgs/rpmextract/template +++ b/srcpkgs/rpmextract/template @@ -1,14 +1,13 @@ # Template file for 'rpmextract' pkgname=rpmextract -version=1.1 -revision=4 -depends="bsdtar coreutils" -short_desc="Script to convert or extract RPM archives (contains rpm2cpio)" +version=1.2 +revision=1 +depends="bsdtar rpm>=4.17.1_3" +short_desc="Script to convert or extract RPM archives" maintainer="Orphaned " -license="GPL-1.0-or-later" -homepage="http://www.archlinux.org" +license="BSD-2-Clause" +homepage="http://www.voidlinux.org" do_install() { - vbin ${FILESDIR}/rpm2cpio vbin ${FILESDIR}/rpmextract }