head	1.2;
access;
symbols
	pkgsrc-2016Q4:1.1.0.76
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.74
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.72
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.70
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.68
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.66
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.64
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.62
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.60
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.58
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.56
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.54
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.52
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.50
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.48
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.46
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.44
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.42
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.40
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.38
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.36
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.34
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.32
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.30
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.28
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.26
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.24
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.22
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.20
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.18
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.16
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.14
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.12
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.10
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.8
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.6
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.4
	pkgsrc-2008Q1:1.1.0.2
	pkgsrc-2008Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2016.12.29.19.13.02;	author wiz;	state dead;
branches;
next	1.1;
commitid	kFYPk8EnajcmFUzz;

1.1
date	2008.03.03.16.45.27;	author hannken;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Remove xenkernel and tools versions 3, 33, and 41.

As discussed on pkgsrc-users.
@
text
@$NetBSD: patch-di,v 1.1 2008/03/03 16:45:27 hannken Exp $

--- libfsimage/common/fsimage_grub.c.orig	2008-01-31 11:06:54.000000000 +0100
+++ libfsimage/common/fsimage_grub.c	2008-03-01 18:59:27.000000000 +0100
@@@@ -204,6 +204,45 @@@@ int
 fsig_devread(fsi_file_t *ffi, unsigned int sector, unsigned int offset,
     unsigned int bufsize, char *buf)
 {
+#ifdef __NetBSD__
+	off_t off;
+	ssize_t ret;
+	int n, r;
+	char tmp[512];
+
+	off = ffi->ff_fsi->f_off + ((off_t)sector * 512) + offset;
+
+	/*
+	 * On NetBSD reads from a raw disk must be sector-aligned.
+	 * Split the read into up to three parts to meet this requirement.
+	 */
+
+	if ((n = (off & 511)) > 0) {
+		if ((r = 512 - n) > bufsize)
+			r = bufsize;
+		if ((ret = pread(ffi->ff_fsi->f_fd, tmp, 512, off - n)) < n + r)
+			return (0);
+		bcopy(tmp + n, buf, r);
+		buf += r;
+		bufsize -= r;
+		off += r;
+	}
+
+	if ((n = (bufsize & ~511)) > 0) {
+		if ((ret = pread(ffi->ff_fsi->f_fd, buf, n, off)) < n)
+			return (0);
+		buf += n;
+		bufsize -= n;
+		off += n;
+	}
+	if (bufsize > 0) {
+		if ((ret = pread(ffi->ff_fsi->f_fd, tmp, 512, off)) < bufsize)
+			return (0);
+		bcopy(tmp, buf, bufsize);
+	}
+
+	return (1);
+#else /* __NetBSD__ */
 	uint64_t off = ffi->ff_fsi->f_off + ((uint64_t)sector * 512) + offset;
 	ssize_t bytes_read = 0;
 
@@@@ -220,6 +259,7 @@@@ fsig_devread(fsi_file_t *ffi, unsigned i
 	}
 
 	return (1);
+#endif /* __NetBSD__ */
 }
 
 int
@


1.1
log
@Enable the build of pygrub.

Ok: Manuel Bouyer <bouyer@@netbsd.org>
@
text
@d1 1
a1 1
$NetBSD$
@