[pkgsrc/trunk]: pkgsrc/pkgtools/rpm2pkg Update "rpm2pkg" package to version 3...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d3f40763a6b1
branches:  trunk
changeset: 576637:d3f40763a6b1
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Jun 15 19:52:02 2010 +0000

description:
Update "rpm2pkg" package to version 3.0.2. Changes since 3.0.1:
Avoid problems on 32-bit platforms by gently hinting the compiler how
to do type expansion properly.

This fixes PR pkg/43478 by Greg Oster.

diffstat:

 pkgtools/rpm2pkg/Makefile        |  4 ++--
 pkgtools/rpm2pkg/files/rpm2pkg.c |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r 90cbcb231568 -r d3f40763a6b1 pkgtools/rpm2pkg/Makefile
--- a/pkgtools/rpm2pkg/Makefile Tue Jun 15 19:23:55 2010 +0000
+++ b/pkgtools/rpm2pkg/Makefile Tue Jun 15 19:52:02 2010 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2010/06/14 11:24:47 tron Exp $
+# $NetBSD: Makefile,v 1.46 2010/06/15 19:52:02 tron Exp $
 
-DISTNAME=      rpm2pkg-3.0.1
+DISTNAME=      rpm2pkg-3.0.2
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 90cbcb231568 -r d3f40763a6b1 pkgtools/rpm2pkg/files/rpm2pkg.c
--- a/pkgtools/rpm2pkg/files/rpm2pkg.c  Tue Jun 15 19:23:55 2010 +0000
+++ b/pkgtools/rpm2pkg/files/rpm2pkg.c  Tue Jun 15 19:52:02 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpm2pkg.c,v 1.10 2010/06/14 11:24:48 tron Exp $        */
+/*     $NetBSD: rpm2pkg.c,v 1.11 2010/06/15 19:52:02 tron Exp $        */
 
 /*-
  * Copyright (c) 2004-2009 The NetBSD Foundation, Inc.
@@ -206,7 +206,7 @@
                                bzMatch++;
                                if (bzMatch == sizeof(BZipMagic)) {
                                        archive_type = 1;
-                                       offset = i - bytes -
+                                       offset = (off_t)i - (off_t)bytes -
                                            sizeof(BZipMagic) + 1;
                                        break;
                                }
@@ -219,7 +219,7 @@
                                gzMatch++;
                                if (gzMatch == sizeof(GZipMagic)) {
                                        archive_type = 2;
-                                       offset = i - bytes -
+                                       offset = (off_t)i - (off_t)bytes -
                                            sizeof(GZipMagic) + 1;
                                        break;
                                }