CVS commit: pkgsrc/sysutils/xentools411

["Manuel Bouyer" <bouyer%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Sun May  3 08:54:29 UTC 2020

Modified Files:
        pkgsrc/sysutils/xentools411: Makefile distinfo
Added Files:
        pkgsrc/sysutils/xentools411/patches:
            patch-tools_debugger_gdbsx_xg_xg_main.c

Log Message:
On NetBSD, privcmd is in /kern/xen/.  Fixes gdbsx.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/xentools411/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/xentools411/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/xentools411/patches/patch-tools_debugger_gdbsx_xg_xg_main.c

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

Modified files:

Index: pkgsrc/sysutils/xentools411/Makefile
diff -u pkgsrc/sysutils/xentools411/Makefile:1.13 pkgsrc/sysutils/xentools411/Makefile:1.14
--- pkgsrc/sysutils/xentools411/Makefile:1.13   Sun Mar  8 16:51:25 2020
+++ pkgsrc/sysutils/xentools411/Makefile        Sun May  3 08:54:28 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/03/08 16:51:25 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2020/05/03 08:54:28 bouyer Exp $
 #
 VERSION=       4.11.3
 VERSION_IPXE=  356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d
@@ -7,8 +7,7 @@ DIST_IPXE=      ipxe-git-${VERSION_IPXE}.tar.
 DIST_SUBDIR=           xen411
 DISTNAME=              xen-${VERSION}
 PKGNAME=               xentools411-${VERSION}
-PKGREVISION=           1
-#PKGREVISION=          0
+PKGREVISION=           2
 CATEGORIES=            sysutils
 MASTER_SITES=          https://downloads.xenproject.org/release/xen/${VERSION}/
 

Index: pkgsrc/sysutils/xentools411/distinfo
diff -u pkgsrc/sysutils/xentools411/distinfo:1.10 pkgsrc/sysutils/xentools411/distinfo:1.11
--- pkgsrc/sysutils/xentools411/distinfo:1.10   Sat Jan 18 21:58:44 2020
+++ pkgsrc/sysutils/xentools411/distinfo        Sun May  3 08:54:28 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2020/01/18 21:58:44 prlw1 Exp $
+$NetBSD: distinfo,v 1.11 2020/05/03 08:54:28 bouyer Exp $
 
 SHA1 (xen411/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz) = 272b8c904dc0127690eca2c5c20c67479e40da34
 RMD160 (xen411/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz) = cfcb4a314c15da19b36132b27126f3bd9699d0e5
@@ -31,6 +31,7 @@ SHA1 (patch-tools_Rules.mk) = c15994d1e0
 SHA1 (patch-tools_configure) = aa0838a1eadf70f5ed99748926234c0376989ff5
 SHA1 (patch-tools_console_daemon_utils.c) = 1c954e1edadad2607f7b87eaf2d6285be7f968ff
 SHA1 (patch-tools_debugger_gdbsx_Makefile) = 88960adedd258af3278ef105204ab97c662b8e61
+SHA1 (patch-tools_debugger_gdbsx_xg_xg_main.c) = 059551256e95858d7ade25e7637667862bd92499
 SHA1 (patch-tools_examples_Makefile) = fe258fc26e4507ca2fb4363c5e2197ee06e89d64
 SHA1 (patch-tools_firmware_etherboot_Makefile) = cc37708336c0a496511926327cfe807ac9f33ce0
 SHA1 (patch-tools_firmware_hvmloader_Makefile) = 02cac5e9314c4c71105f15a3c1c303c573d6583a

Added files:

Index: pkgsrc/sysutils/xentools411/patches/patch-tools_debugger_gdbsx_xg_xg_main.c
diff -u /dev/null pkgsrc/sysutils/xentools411/patches/patch-tools_debugger_gdbsx_xg_xg_main.c:1.1
--- /dev/null   Sun May  3 08:54:29 2020
+++ pkgsrc/sysutils/xentools411/patches/patch-tools_debugger_gdbsx_xg_xg_main.c Sun May  3 08:54:29 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-tools_debugger_gdbsx_xg_xg_main.c,v 1.1 2020/05/03 08:54:29 bouyer Exp $
+
+--- tools/debugger/gdbsx/xg/xg_main.c.orig     2020-04-30 09:57:45.000000000 +0200
++++ tools/debugger/gdbsx/xg/xg_main.c  2020-04-30 09:58:43.000000000 +0200
+@@ -126,12 +126,19 @@
+     int flags, saved_errno;
+ 
+     XGTRC("E\n");
++#ifdef __NetBSD__
++    if ((_dom0_fd=open("/kern/xen/privcmd", O_RDWR)) == -1) {
++        perror("Failed to open /kern/xen/privcmd\n");
++        return -1;
++    }
++#else
+     if ((_dom0_fd=open("/dev/xen/privcmd", O_RDWR)) == -1) {
+         if ((_dom0_fd=open("/proc/xen/privcmd", O_RDWR)) == -1) {
+             perror("Failed to open /dev/xen/privcmd or /proc/xen/privcmd\n");
+             return -1;
+         }
+     }
++#endif
+     /* Although we return the file handle as the 'xc handle' the API
+      * does not specify / guarentee that this integer is in fact
+      * a file handle. Thus we must take responsiblity to ensure