Fri Aug 24 19:04:59 2012 UTC ()
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.


(marino)
diff -r1.59 -r1.60 pkgsrc/pkgtools/rpm2pkg/Makefile
diff -r1.1 -r1.2 pkgsrc/pkgtools/rpm2pkg/files/fileio-zlib.c
cvs diff -r1.59 -r1.60 pkgsrc/pkgtools/rpm2pkg/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/rpm2pkg/Makefile 2011/04/12 22:36:11 1.59
+++ pkgsrc/pkgtools/rpm2pkg/Makefile 2012/08/24 19:04:58 1.60
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.59 2011/04/12 22:36:11 tron Exp $ 1# $NetBSD: Makefile,v 1.60 2012/08/24 19:04:58 marino Exp $
2 2
3DISTNAME= rpm2pkg-3.2.2 3DISTNAME= rpm2pkg-3.2.2
4CATEGORIES= pkgtools 4CATEGORIES= pkgtools
 5PKGREVISION= 1
5MASTER_SITES= # empty 6MASTER_SITES= # empty
6DISTFILES= # empty 7DISTFILES= # empty
7NO_CHECKSUM= yes 8NO_CHECKSUM= yes
8 9
9OWNER= tron@NetBSD.org 10OWNER= tron@NetBSD.org
10HOMEPAGE= http://www.pkgsrc.org/ 11HOMEPAGE= http://www.pkgsrc.org/
11COMMENT= Convert RPM archives to NetBSD packages 12COMMENT= Convert RPM archives to NetBSD packages
12LICENSE= modified-bsd 13LICENSE= modified-bsd
13 14
14CONFLICTS+= suse-base<=6.4 15CONFLICTS+= suse-base<=6.4
15 16
16PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
17 18
cvs diff -r1.1 -r1.2 pkgsrc/pkgtools/rpm2pkg/files/fileio-zlib.c (expand / switch to unified diff)

--- pkgsrc/pkgtools/rpm2pkg/files/fileio-zlib.c 2011/01/12 00:26:33 1.1
+++ pkgsrc/pkgtools/rpm2pkg/files/fileio-zlib.c 2012/08/24 19:04:59 1.2
@@ -26,35 +26,35 @@ @@ -26,35 +26,35 @@
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27 * POSSIBILITY OF SUCH DAMAGE. 27 * POSSIBILITY OF SUCH DAMAGE.
28 */ 28 */
29 29
30#define FILEIO_INTERNAL /**/ 30#define FILEIO_INTERNAL /**/
31 31
32#include "fileio.h" 32#include "fileio.h"
33 33
34#include <zlib.h> 34#include <zlib.h>
35 35
36static void 36static void
37ZLibCloseFunc(FileHandle *fh) 37ZLibCloseFunc(FileHandle *fh)
38{ 38{
39 gzFile *mygzfile = fh->fh_InstData; 39 gzFile mygzfile = fh->fh_InstData;
40 if (mygzfile != NULL) 40 if (mygzfile != NULL)
41 (void)gzclose(mygzfile); 41 (void)gzclose(mygzfile);
42} 42}
43 43
44static ssize_t 44static ssize_t
45ZLibReadFunc(FileHandle *fh, void *buffer, size_t bytes) 45ZLibReadFunc(FileHandle *fh, void *buffer, size_t bytes)
46{ 46{
47 gzFile *mygzfile = fh->fh_InstData; 47 gzFile mygzfile = fh->fh_InstData;
48 return gzread(mygzfile, buffer, bytes); 48 return gzread(mygzfile, buffer, bytes);
49} 49}
50 50
51FileHandle * 51FileHandle *
52FileHandleZLib(int *fd_p) 52FileHandleZLib(int *fd_p)
53{ 53{
54 FileHandle *fh; 54 FileHandle *fh;
55 55
56 fh = FileHandleCreate(ZLibCloseFunc, ZLibReadFunc, 0); 56 fh = FileHandleCreate(ZLibCloseFunc, ZLibReadFunc, 0);
57 if (fh != NULL) { 57 if (fh != NULL) {
58 fh->fh_InstData = gzdopen(*fd_p, "r"); 58 fh->fh_InstData = gzdopen(*fd_p, "r");
59 if (fh->fh_InstData != NULL) { 59 if (fh->fh_InstData != NULL) {
60 *fd_p = -1; 60 *fd_p = -1;