Sun Sep 5 00:24:30 2010 UTC ()

Update "rpm2pkg" package to version 3.1.1:
- Fix start of "lzcat" if "LZCAT" is not defined as a full pathname.
- Handle short reads on the pipe to "lzcat".


(tron)

diff -r1.47 -r1.48 pkgsrc/pkgtools/rpm2pkg/Makefile
diff -r1.12 -r1.13 pkgsrc/pkgtools/rpm2pkg/files/rpm2pkg.c

--- pkgsrc/pkgtools/rpm2pkg/Makefile 2010/09/04 19:23:00 1.47
+++ pkgsrc/pkgtools/rpm2pkg/Makefile 2010/09/05 00:24:30 1.48

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.47 2010/09/04 19:23:00 tron Exp $
+# $NetBSD: Makefile,v 1.48 2010/09/05 00:24:30 tron Exp $
-DISTNAME=	rpm2pkg-3.1
+DISTNAME=	rpm2pkg-3.1.1
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 NO_CHECKSUM=	yes
 OWNER=		tron@NetBSD.org
 HOMEPAGE=	http://www.NetBSD.org/docs/pkgsrc/
 COMMENT=	Convert RPM archives to NetBSD packages
 LICENSE=	modified-bsd
 CONFLICTS+=	suse-base<=6.4
 PKG_DESTDIR_SUPPORT=	user-destdir

--- pkgsrc/pkgtools/rpm2pkg/files/rpm2pkg.c 2010/09/04 19:23:00 1.12
+++ pkgsrc/pkgtools/rpm2pkg/files/rpm2pkg.c 2010/09/05 00:24:30 1.13

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rpm2pkg.c,v 1.12 2010/09/04 19:23:00 tron Exp $	*/
+/*	$NetBSD: rpm2pkg.c,v 1.13 2010/09/05 00:24:30 tron Exp $	*/
 /*-
  * Copyright (c) 2001-2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthias Scheler.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -322,27 +322,27 @@ Open(int fd)
 			(void)close(pfds[1]);
 			free(fh);
 			return NULL;
 		case 0:
 			(void)close(pfds[0]);
 			if (dup2(fd, STDIN_FILENO) == -1 ||
 			    dup2(pfds[1], STDOUT_FILENO) == -1) {
 				exit(EXIT_FAILURE);
+			}
 			(void)close(fd);
 			(void)close(pfds[1]);
-			(void)execl(LZCAT, LZCAT, "-f", NULL);
+			(void)execlp(LZCAT, LZCAT, "-f", NULL);
 			exit(EXIT_FAILURE);
 		default:
 			(void)close(pfds[1]);
 			fh->fh_Pipe = pfds[0];
 			fh->fh_Child = pid;
 			return fh;
+		}
 #else
 		return NULL;
 #endif
+	}
 @@ -350,27 +350,41 @@ Open(int fd)
+}
 static bool
 Read(FileHandle *fh, void *buffer, size_t length)
+{
 	ssize_t bytes;
 	if (fh->fh_BZFile != NULL) {
 		int bzerror;
 		bytes = BZ2_bzRead(&bzerror, fh->fh_BZFile, buffer, length);
 	} else if (fh->fh_GZFile != NULL) {
 		bytes = gzread(fh->fh_GZFile, buffer, length);
 	} else if (fh->fh_Pipe >= 0) {
-		bytes = read(fh->fh_Pipe, buffer, length);
+		bytes = 0;
 		while (length > 0) {
 			ssize_t chunk = read(fh->fh_Pipe, buffer, length);
 			if (chunk < 0) {
 				bytes = -1;
 				break;
 			} else if (chunk == 0) {
 				break;
+			}
 			buffer += chunk;
 			length -= chunk;
 			bytes += chunk;
+		}
 	} else {
 		bytes = -1;
+	}
 	if (bytes > 0)
 		fh->fh_Pos += bytes;
 	return (bytes == (ssize_t)length);
+}
 static bool
 SkipAndAlign(FileHandle *fh, off_t Skip)