From owner-svn-ports-all@freebsd.org Thu Dec 17 10:53:26 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DF59BA49C3A; Thu, 17 Dec 2015 10:53:26 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 96ED917E9; Thu, 17 Dec 2015 10:53:26 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBHArP6K017081; Thu, 17 Dec 2015 10:53:25 GMT (envelope-from ak@FreeBSD.org) Received: (from ak@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBHArP7J017079; Thu, 17 Dec 2015 10:53:25 GMT (envelope-from ak@FreeBSD.org) Message-Id: <201512171053.tBHArP7J017079@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ak set sender to ak@FreeBSD.org using -f From: Alex Kozlov Date: Thu, 17 Dec 2015 10:53:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403903 - in head/archivers/rpm2cpio: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2015 10:53:27 -0000 Author: ak Date: Thu Dec 17 10:53:25 2015 New Revision: 403903 URL: https://svnweb.freebsd.org/changeset/ports/403903 Log: - Minor fixes - Take maintainership RIP nox@ Modified: head/archivers/rpm2cpio/Makefile head/archivers/rpm2cpio/files/rpm2cpio Modified: head/archivers/rpm2cpio/Makefile ============================================================================== --- head/archivers/rpm2cpio/Makefile Thu Dec 17 10:38:18 2015 (r403902) +++ head/archivers/rpm2cpio/Makefile Thu Dec 17 10:53:25 2015 (r403903) @@ -3,12 +3,12 @@ PORTNAME= rpm2cpio PORTVERSION= 1.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= archivers MASTER_SITES= # none DISTFILES= # none -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ak@FreeBSD.org COMMENT= Convert .rpm files for extraction with /usr/bin/cpio, needs just perl NO_WRKSUBDIR= yes Modified: head/archivers/rpm2cpio/files/rpm2cpio ============================================================================== --- head/archivers/rpm2cpio/files/rpm2cpio Thu Dec 17 10:38:18 2015 (r403902) +++ head/archivers/rpm2cpio/files/rpm2cpio Thu Dec 17 10:53:25 2015 (r403903) @@ -44,14 +44,14 @@ if ($#ARGV == -1) { exit 0; } -read $f, $rpm, 96; +die "No header\n" unless (96 == 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 and $major != 4; -read $f, $rpm, 16 or die "No header\n"; +die "No header\n" unless (16 == read $f, $rpm, 16); while(1) { ($magic, undef, my $sections, my $bytes) = unpack("N4", $rpm); my ($smagic, $smagic2) = unpack("nN", $rpm); @@ -82,9 +82,9 @@ while(1) { # skip the headers seek $f, 16 * $sections + $bytes, 1 or die "File is too small\n"; do { - read $f, $rpm, 1 or die "No header\n" ; + read $f, $rpm, 1 or die "No header\n"; } while(0 == unpack("C", $rpm)); - read $f, $rpm, 15, 1 or die "No header\n" ; + die "No header\n" unless (15 == read $f, $rpm, 15, 1); } open(ZCAT, "| $filter") or die "can't pipe to $filter\n";