summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2010-06-15 19:52:02 +0000
committertron <tron@pkgsrc.org>2010-06-15 19:52:02 +0000
commit3b18b97f713049b2d889e935570efd9dc2b59db2 (patch)
tree6007ef4c9ee25d4675bc36046df4c56d4feace93 /pkgtools
parent72f5dbd3c591ca03e181408180f219c52d495133 (diff)
downloadpkgsrc-3b18b97f713049b2d889e935570efd9dc2b59db2.tar.gz
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 (limited to 'pkgtools')
-rw-r--r--pkgtools/rpm2pkg/Makefile4
-rw-r--r--pkgtools/rpm2pkg/files/rpm2pkg.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile
index fb51839bc37..c78d615291f 100644
--- a/pkgtools/rpm2pkg/Makefile
+++ b/pkgtools/rpm2pkg/Makefile
@@ -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 --git a/pkgtools/rpm2pkg/files/rpm2pkg.c b/pkgtools/rpm2pkg/files/rpm2pkg.c
index 51d71057626..0f06669b309 100644
--- a/pkgtools/rpm2pkg/files/rpm2pkg.c
+++ b/pkgtools/rpm2pkg/files/rpm2pkg.c
@@ -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 @@ Open(int fd)
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 @@ Open(int fd)
gzMatch++;
if (gzMatch == sizeof(GZipMagic)) {
archive_type = 2;
- offset = i - bytes -
+ offset = (off_t)i - (off_t)bytes -
sizeof(GZipMagic) + 1;
break;
}