 @@ -1,39 +1,40 @@
-# $NetBSD: Makefile,v 1.40 2009/04/09 00:48:14 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2009/04/23 21:38:02 tron Exp $
-DISTNAME=	rpm2pkg-2.1.1
+DISTNAME=	rpm2pkg-2.2
 PKGREVISION=	2
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 OWNER=		tron@NetBSD.org
 HOMEPAGE=	http://www.NetBSD.org/docs/pkgsrc/
 COMMENT=	Convert RPM archives to NetBSD packages
 CONFLICTS+=	suse-base<=6.4
 LICENSE=	modified-bsd
 PKG_DESTDIR_SUPPORT=	user-destdir
 WRKSRC=		${WRKDIR}
 CPPFLAGS+=	${BUILDLINK_CPPFLAGS.bzip2} ${BUILDLINK_CPPFLAGS.rpm} \
 		${BUILDLINK_CPPFLAGS.zlib}
 LIBS+=		-lrpm -lintl -lz -lbz2
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/compiler.mk"
-.if (${CC} == gcc)
+.if !empty(CC_VERSION:Mgcc-*)
-CFLAGS+=	-Wall
+CFLAGS+=	-Wall -Wshadow -Wsign-compare -Wunused-value
 .endif
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 do-build:
 	cd ${WRKSRC}; ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o rpm2pkg \
 		${FILESDIR}/rpm2pkg.c ${LIBS}
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rpm2pkg ${DESTDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${FILESDIR}/rpm2pkg.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 .include "../../archivers/bzip2/buildlink3.mk"

 @@ -1,33 +1,30 @@
-/*	$NetBSD: rpm2pkg.c,v 1.6 2006/01/21 20:46:29 tron Exp $	*/
+/*	$NetBSD: rpm2pkg.c,v 1.7 2009/04/23 21:38:02 tron Exp $	*/
 /*-
- * Copyright (c) 2004 The NetBSD Foundation, Inc.
+ * Copyright (c) 2004-2009 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of The NetBSD Foundation nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 @@ -118,30 +115,30 @@ typedef void PListEntryFunc(PListEntry *
 #define	PLIST_ORDER_FORWARD	0
 #define	PLIST_ORDER_BACKWARD	1
 #define INVERT_PLIST_ORDER(o)	(1 - (o))
 typedef struct FileHandleStruct {
 	FILE	*fh_File;
 	BZFILE	*fh_BZFile;
 	gzFile	*fh_GZFile;
 	off_t	fh_Pos;
 } FileHandle;
 static int
-InitBuffer(void **Buffer, int *BufferSizePtr)
+InitBuffer(void **Buffer, size_t *BufferSizePtr)
+{
 	if (*Buffer == NULL) {
-		int	BufferSize;
+		size_t BufferSize;
 		BufferSize = sysconf(_SC_PAGESIZE) * 256;
 		while ((*Buffer = malloc(BufferSize)) == NULL) {
 			BufferSize >>= 1;
 			if (BufferSize == 0)
 				return FALSE;
+		}
 		*BufferSizePtr = BufferSize;
+	}
 	return TRUE;
+}
 static void
 @@ -226,37 +223,38 @@ SkipAndAlign(FileHandle *fh, off_t Skip)
 	NewPos = (fh->fh_Pos + Skip + 3) & ~3;
 	if (fh->fh_Pos == NewPos)
 		return TRUE;
 	if (fh->fh_GZFile != NULL) {
 		if (gzseek(fh->fh_GZFile, NewPos, SEEK_SET) == NewPos) {
 			fh->fh_Pos = NewPos;
 			return TRUE;
+		}
 		return FALSE;
 	} else {
 		static void	*Buffer = NULL;
-		static int	BufferSize = 0;
+		static size_t	BufferSize = 0;
 		if (!InitBuffer(&Buffer, &BufferSize))
 			return FALSE;
 		while (fh->fh_Pos < NewPos) {
 			off_t	Length;
 			int	Chunk;
 			Length = NewPos - fh->fh_Pos;
-			Chunk = (Length > BufferSize) ? BufferSize : Length;
+			Chunk = (Length > (off_t)BufferSize) ?
 			    (off_t)BufferSize : Length;
 			if (!Read(fh, Buffer, Chunk))
 				return FALSE;
+		}
+	}
 	return TRUE;
+}
 static PListEntry *
 InsertPListEntry(PListEntry **Tree,char *Name)
+{
 	PListEntry *Node;
 @@ -549,27 +547,27 @@ MakeSymLink(char *Link, char *Name)
 		return FALSE;
+	}
 	return ((unlink(Name) == 0) && (symlink(Link, Name) == 0));
+}
 static int
 WriteFile(FileHandle *In, char *Name, mode_t Mode, unsigned long Length,
     char *Link)
+{
 	int		Out;
 	struct stat	Stat;
 	static void	*Buffer = NULL;
-	static int	BufferSize = 0;
+	static size_t	BufferSize = 0;
 	if ((lstat(Name, &Stat) == 0) &&
 	    (!S_ISREG(Stat.st_mode) || (unlink(Name) < 0))) {
 		return FALSE;
+	}
 	if (!InitBuffer(&Buffer, &BufferSize))
 		return FALSE;
 	if (Link != NULL) {
 		if (link(Link, Name) < 0)
 			return FALSE;
 		Out = open(Name, O_WRONLY, Mode);