Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 142817A167 for ; Sat, 1 Oct 2016 13:07:25 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id B1A0585EE0; Sat, 1 Oct 2016 13:07:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 42CDB85EB5 for ; Sat, 1 Oct 2016 13:07:24 +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 IP40irwXxQP1 for ; Sat, 1 Oct 2016 13:07:23 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7505A85E47 for ; Sat, 1 Oct 2016 13:07:23 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7330FFBD2; Sat, 1 Oct 2016 13:07:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1475327243246010" MIME-Version: 1.0 Date: Sat, 1 Oct 2016 13:07:23 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/sysutils To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20161001130723.7330FFBD2@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1475327243246010 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Sat Oct 1 13:07:23 UTC 2016 Modified Files: pkgsrc/sysutils/xentools41: distinfo pkgsrc/sysutils/xentools42: distinfo Added Files: pkgsrc/sysutils/xentools41/patches: patch-ocaml_libs_xb_xs__ring__stubs.c pkgsrc/sysutils/xentools42/patches: patch-ocaml_libs_xb_xs__ring__stubs.c Log Message: OCAML has switched to using normal uint32_t, so follow here. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 pkgsrc/sysutils/xentools41/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/sysutils/xentools41/patches/patch-ocaml_libs_xb_xs__ring__stubs.c cvs rdiff -u -r1.27 -r1.28 pkgsrc/sysutils/xentools42/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/sysutils/xentools42/patches/patch-ocaml_libs_xb_xs__ring__stubs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1475327243246010 Content-Disposition: inline Content-Length: 4948 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/xentools41/distinfo diff -u pkgsrc/sysutils/xentools41/distinfo:1.41 pkgsrc/sysutils/xentools41/distinfo:1.42 --- pkgsrc/sysutils/xentools41/distinfo:1.41 Thu Jan 7 17:55:55 2016 +++ pkgsrc/sysutils/xentools41/distinfo Sat Oct 1 13:07:23 2016 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.41 2016/01/07 17:55:55 bouyer Exp $ +$NetBSD: distinfo,v 1.42 2016/10/01 13:07:23 joerg Exp $ SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 @@ -62,6 +62,7 @@ SHA1 (patch-libxl_libxl_internal.h) = e1 SHA1 (patch-libxl_xl__cmdimpl.c) = 0e038b9702e131ec527d49cb2c21e4acf581cbfe SHA1 (patch-ocaml_Makefile.rules) = 104f9d40186e5e4ca6a2e6359bbb369c3c91d1dc SHA1 (patch-ocaml_common.make) = c59d32301198d65691ab23529dd791de5ac40199 +SHA1 (patch-ocaml_libs_xb_xs__ring__stubs.c) = 944ce96d18cefdc70babe83d3337ff94604b0f04 SHA1 (patch-ocaml_xenstored_define.ml) = f44841625554ceba6e83dbb41f688993c2a8d9a2 SHA1 (patch-ocaml_xenstored_utils.ml) = cc792a696743fa348b274b1c23783ea1a0d7da47 SHA1 (patch-qemu-phy-devices) = fef90e50ef0a58db2f2b49b6c23218f371791de5 Index: pkgsrc/sysutils/xentools42/distinfo diff -u pkgsrc/sysutils/xentools42/distinfo:1.27 pkgsrc/sysutils/xentools42/distinfo:1.28 --- pkgsrc/sysutils/xentools42/distinfo:1.27 Sat May 21 20:12:18 2016 +++ pkgsrc/sysutils/xentools42/distinfo Sat Oct 1 13:07:23 2016 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.27 2016/05/21 20:12:18 bad Exp $ +$NetBSD: distinfo,v 1.28 2016/10/01 13:07:23 joerg Exp $ SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 @@ -62,6 +62,7 @@ SHA1 (patch-libxl_libxl__internal.h) = b SHA1 (patch-libxl_libxl__save__helper.c) = 1592f07e30db119905ae1efa9bd272fa75f60651 SHA1 (patch-libxl_xl.c) = f7ca33eac8ce6c2383d985c82bf8cb406588e2c9 SHA1 (patch-ocaml_common.make) = a809e3bed475cdffea3cb7ae480c8fe7af6aa798 +SHA1 (patch-ocaml_libs_xb_xs__ring__stubs.c) = 944ce96d18cefdc70babe83d3337ff94604b0f04 SHA1 (patch-ocaml_xenstored_Makefile) = a0e91b946307a610490a492d4d56dfe426bddb63 SHA1 (patch-ocaml_xenstored_define.ml) = c0772dff8e59f495a0ebe17a905aed04a29f2469 SHA1 (patch-ocaml_xenstored_utils.ml) = b446e9428c676b70d6b9001c578f6de2048c88c2 Added files: Index: pkgsrc/sysutils/xentools41/patches/patch-ocaml_libs_xb_xs__ring__stubs.c diff -u /dev/null pkgsrc/sysutils/xentools41/patches/patch-ocaml_libs_xb_xs__ring__stubs.c:1.1 --- /dev/null Sat Oct 1 13:07:23 2016 +++ pkgsrc/sysutils/xentools41/patches/patch-ocaml_libs_xb_xs__ring__stubs.c Sat Oct 1 13:07:23 2016 @@ -0,0 +1,26 @@ +$NetBSD: patch-ocaml_libs_xb_xs__ring__stubs.c,v 1.1 2016/10/01 13:07:23 joerg Exp $ + +--- ocaml/libs/xb/xs_ring_stubs.c.orig 2016-09-30 12:57:34.000000000 +0000 ++++ ocaml/libs/xb/xs_ring_stubs.c +@@ -46,8 +46,8 @@ static int xs_ring_read(struct mmap_inte + XENSTORE_RING_IDX cons, prod; /* offsets only */ + int to_read; + +- cons = *(volatile uint32*)&intf->req_cons; +- prod = *(volatile uint32*)&intf->req_prod; ++ cons = *(volatile uint32_t*)&intf->req_cons; ++ prod = *(volatile uint32_t*)&intf->req_prod; + xen_mb(); + + if ((prod - cons) > XENSTORE_RING_SIZE) +@@ -76,8 +76,8 @@ static int xs_ring_write(struct mmap_int + XENSTORE_RING_IDX cons, prod; + int can_write; + +- cons = *(volatile uint32*)&intf->rsp_cons; +- prod = *(volatile uint32*)&intf->rsp_prod; ++ cons = *(volatile uint32_t*)&intf->rsp_cons; ++ prod = *(volatile uint32_t*)&intf->rsp_prod; + xen_mb(); + if ( (prod - cons) >= XENSTORE_RING_SIZE ) + return 0; Index: pkgsrc/sysutils/xentools42/patches/patch-ocaml_libs_xb_xs__ring__stubs.c diff -u /dev/null pkgsrc/sysutils/xentools42/patches/patch-ocaml_libs_xb_xs__ring__stubs.c:1.1 --- /dev/null Sat Oct 1 13:07:23 2016 +++ pkgsrc/sysutils/xentools42/patches/patch-ocaml_libs_xb_xs__ring__stubs.c Sat Oct 1 13:07:23 2016 @@ -0,0 +1,26 @@ +$NetBSD: patch-ocaml_libs_xb_xs__ring__stubs.c,v 1.1 2016/10/01 13:07:23 joerg Exp $ + +--- ocaml/libs/xb/xs_ring_stubs.c.orig 2016-09-30 12:57:34.000000000 +0000 ++++ ocaml/libs/xb/xs_ring_stubs.c +@@ -46,8 +46,8 @@ static int xs_ring_read(struct mmap_inte + XENSTORE_RING_IDX cons, prod; /* offsets only */ + int to_read; + +- cons = *(volatile uint32*)&intf->req_cons; +- prod = *(volatile uint32*)&intf->req_prod; ++ cons = *(volatile uint32_t*)&intf->req_cons; ++ prod = *(volatile uint32_t*)&intf->req_prod; + xen_mb(); + + if ((prod - cons) > XENSTORE_RING_SIZE) +@@ -76,8 +76,8 @@ static int xs_ring_write(struct mmap_int + XENSTORE_RING_IDX cons, prod; + int can_write; + +- cons = *(volatile uint32*)&intf->rsp_cons; +- prod = *(volatile uint32*)&intf->rsp_prod; ++ cons = *(volatile uint32_t*)&intf->rsp_cons; ++ prod = *(volatile uint32_t*)&intf->rsp_prod; + xen_mb(); + if ( (prod - cons) >= XENSTORE_RING_SIZE ) + return 0; --_----------=_1475327243246010--