Received: by mail.netbsd.org (Postfix, from userid 605)
	id 8A13E84EAE; Fri,  6 Jan 2023 14:21:18 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id BA9C384D39
	for <pkgsrc-changes@NetBSD.org>; Fri,  6 Jan 2023 14:21:17 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([IPv6:::1])
	by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025)
	with ESMTP id kW0_TdjHZToF for <pkgsrc-changes@netbsd.org>;
	Fri,  6 Jan 2023 14:21:17 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id 3895F84D0C
	for <pkgsrc-changes@NetBSD.org>; Fri,  6 Jan 2023 14:21:17 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id 32101FA90; Fri,  6 Jan 2023 14:21:17 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_167301487740660"
MIME-Version: 1.0
Date: Fri, 6 Jan 2023 14:21:17 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc/sysutils/bsdinstall
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
X-Mailer: log_accum
Message-Id: <20230106142117.32101FA90@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: <pkgsrc-changes.NetBSD.org>
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_167301487740660
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jperkin
Date:		Fri Jan  6 14:21:17 UTC 2023

Modified Files:
	pkgsrc/sysutils/bsdinstall/files: bsdinstall.c
Removed Files:
	pkgsrc/sysutils/bsdinstall: distinfo
	pkgsrc/sysutils/bsdinstall/patches: patch-bsdinstall.c

Log Message:
bsdinstall: Apply patch directly to sources.

Packages that have unpacked sources that are in the bootstrap path must never
have patches as it causes bootstrap issues with requiring digest and nbpatch.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/bsdinstall/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/bsdinstall/files/bsdinstall.c
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/bsdinstall/patches/patch-bsdinstall.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_167301487740660
Content-Disposition: inline
Content-Length: 1407
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/sysutils/bsdinstall/files/bsdinstall.c
diff -u pkgsrc/sysutils/bsdinstall/files/bsdinstall.c:1.3 pkgsrc/sysutils/bsdinstall/files/bsdinstall.c:1.4
--- pkgsrc/sysutils/bsdinstall/files/bsdinstall.c:1.3	Wed Nov 18 12:12:49 2015
+++ pkgsrc/sysutils/bsdinstall/files/bsdinstall.c	Fri Jan  6 14:21:16 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: bsdinstall.c,v 1.3 2015/11/18 12:12:49 jperkin Exp $	*/
+/*	$NetBSD: bsdinstall.c,v 1.4 2023/01/06 14:21:16 jperkin Exp $	*/
 /*	NetBSD: xinstall.c,v 1.114 2009/11/12 10:10:49 tron Exp	*/
 
 /*
@@ -73,9 +73,9 @@ __RCSID("NetBSD: xinstall.c,v 1.114 2009
 #include <fcntl.h>
 #include <libgen.h>
 #include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat/string.h>
+#include <nbcompat/unistd.h>
 #include <nbcompat/grp.h>
 #include <nbcompat/paths.h>
 #include <nbcompat/pwd.h>
@@ -83,6 +83,8 @@ __RCSID("NetBSD: xinstall.c,v 1.114 2009
 #include <nbcompat/util.h>
 #include <nbcompat/vis.h>
 #else
+#include <string.h>
+#include <unistd.h>
 #include <grp.h>
 #include <paths.h>
 #include <pwd.h>
@@ -110,6 +112,10 @@ __RCSID("NetBSD: xinstall.c,v 1.114 2009
 #define STRIP_ARGS_MAX 32
 #define BACKUP_SUFFIX ".old"
 
+#ifndef MAXBSIZE
+#define MAXBSIZE (64 * 1024)
+#endif
+
 extern void *setmode(const char *p);
 
 static int	dobackup, dodir, dostrip, dolink, dopreserve, dorename, dounpriv;


--_----------=_167301487740660--