diff options
| author | Juergen Lock <nox@FreeBSD.org> | 2010-08-22 15:29:21 +0000 |
|---|---|---|
| committer | Juergen Lock <nox@FreeBSD.org> | 2010-08-22 15:29:21 +0000 |
| commit | 9e0f0f60d6a33245b45a5e77cb2eccb80b2484bb (patch) | |
| tree | 8fae415c5527c0422be2e64ed11f3c1d54deb9ee /archivers/rpm2cpio | |
| parent | 5ecc8daa2908caa8776ddd0941d51ce116fbaf3b (diff) | |
Notes
Diffstat (limited to 'archivers/rpm2cpio')
| -rw-r--r-- | archivers/rpm2cpio/Makefile | 1 | ||||
| -rw-r--r-- | archivers/rpm2cpio/files/rpm2cpio | 10 |
2 files changed, 4 insertions, 7 deletions
diff --git a/archivers/rpm2cpio/Makefile b/archivers/rpm2cpio/Makefile index 00b1c6e87085..ba5913b62526 100644 --- a/archivers/rpm2cpio/Makefile +++ b/archivers/rpm2cpio/Makefile @@ -7,6 +7,7 @@ PORTNAME= rpm2cpio PORTVERSION= 1.3 +PORTREVISION= 1 CATEGORIES= archivers MASTER_SITES= # none DISTFILES= # none diff --git a/archivers/rpm2cpio/files/rpm2cpio b/archivers/rpm2cpio/files/rpm2cpio index 24a4c15795f4..8f75375af53c 100644 --- a/archivers/rpm2cpio/files/rpm2cpio +++ b/archivers/rpm2cpio/files/rpm2cpio @@ -44,16 +44,12 @@ if ($#ARGV == -1) { exit 0; } -# gobble the file up -undef $/; -$|=1; - read $f, $rpm, 96; my ($magic, $major, undef) = unpack("NCC", $rpm); die "Not an RPM\n" if $magic != 0xedabeedb; -die "Not a version 3 or 4 RPM\n" if $major != 3 && $major != 4; +die "Not a version 3 or 4 RPM\n" if $major != 3 and $major != 4; read $f, $rpm, 16 or die "No header\n"; while(1) { @@ -73,7 +69,7 @@ while(1) { last; } # 0xFD, '7zXZ', 0x0 - if ($smagic == 0xfd37 and $smagic2== 0x7a585a00) { + if ($smagic == 0xfd37 and $smagic2 == 0x7a585a00) { $filter = "xz -cd"; last; } @@ -84,7 +80,7 @@ while(1) { } # skip the headers - seek $f, 16*$sections+$bytes, 1 or die "File is too small\n"; + seek $f, 16 * $sections + $bytes, 1 or die "File is too small\n"; do { read $f, $rpm, 1 or die "No header\n" ; } while(0 == unpack("C", $rpm)); |