diff options
| author | marino <marino@pkgsrc.org> | 2012-08-24 19:04:58 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-08-24 19:04:58 +0000 |
| commit | a36747e9eb30e6488886535c00e59e713cc8d12a (patch) | |
| tree | 0c784ac08690a7d2c0343bc5ea7d9fb499790bc2 /pkgtools/rpm2pkg | |
| parent | fa975ab596543e59577a92505ab0499195109123 (diff) | |
| download | pkgsrc-a36747e9eb30e6488886535c00e59e713cc8d12a.tar.gz | |
pkgtools/rpm2pkg: Fix broken zlib 1.26+ support
gzFile wasn't used currently. Trying to build rpm2pkg on zlib 1.27
exposed the misuse. rpm2pkg should build on all version of zlib now.
Diffstat (limited to 'pkgtools/rpm2pkg')
| -rw-r--r-- | pkgtools/rpm2pkg/Makefile | 3 | ||||
| -rw-r--r-- | pkgtools/rpm2pkg/files/fileio-zlib.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile index 88901479833..ad20f1d731b 100644 --- a/pkgtools/rpm2pkg/Makefile +++ b/pkgtools/rpm2pkg/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.59 2011/04/12 22:36:11 tron Exp $ +# $NetBSD: Makefile,v 1.60 2012/08/24 19:04:58 marino Exp $ DISTNAME= rpm2pkg-3.2.2 CATEGORIES= pkgtools +PKGREVISION= 1 MASTER_SITES= # empty DISTFILES= # empty NO_CHECKSUM= yes diff --git a/pkgtools/rpm2pkg/files/fileio-zlib.c b/pkgtools/rpm2pkg/files/fileio-zlib.c index 7be8679af1f..0112ec36ed6 100644 --- a/pkgtools/rpm2pkg/files/fileio-zlib.c +++ b/pkgtools/rpm2pkg/files/fileio-zlib.c @@ -36,7 +36,7 @@ static void ZLibCloseFunc(FileHandle *fh) { - gzFile *mygzfile = fh->fh_InstData; + gzFile mygzfile = fh->fh_InstData; if (mygzfile != NULL) (void)gzclose(mygzfile); } @@ -44,7 +44,7 @@ ZLibCloseFunc(FileHandle *fh) static ssize_t ZLibReadFunc(FileHandle *fh, void *buffer, size_t bytes) { - gzFile *mygzfile = fh->fh_InstData; + gzFile mygzfile = fh->fh_InstData; return gzread(mygzfile, buffer, bytes); } |