Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1523995334227080"
MIME-Version: 1.0
Date: Tue, 17 Apr 2018 20:02:14 +0000
From: "Andreas Gustafsson" <gson@netbsd.org>
Subject: CVS commit: pkgsrc/emulators/qemu
To: pkgsrc-changes@NetBSD.org
Reply-To: gson@netbsd.org
Message-Id: <20180417200214.AD9ECFBEC@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	gson
Date:		Tue Apr 17 20:02:14 UTC 2018

Modified Files:
	pkgsrc/emulators/qemu: Makefile distinfo
Added Files:
	pkgsrc/emulators/qemu/patches: patch-chardev_char-mux.c

Log Message:
emulators/qemu: fix control-a b

Fix qemu bug 1654137, "Ctrl-A b not working in 2.8.0", by
backporting qemu mainline commit 1b2503fcf7b5932c5a3779ca2ceb92bd403c4ee7.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.182 -r1.183 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.133 -r1.134 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/qemu/patches/patch-chardev_char-mux.c

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


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

Modified files:

Index: pkgsrc/emulators/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.182 pkgsrc/emulators/qemu/Makefile:1.183
--- pkgsrc/emulators/qemu/Makefile:1.182	Mon Apr 16 14:34:26 2018
+++ pkgsrc/emulators/qemu/Makefile	Tue Apr 17 20:02:14 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.182 2018/04/16 14:34:26 wiz Exp $
+# $NetBSD: Makefile,v 1.183 2018/04/17 20:02:14 gson Exp $
 
 DISTNAME=	qemu-2.11.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.qemu-project.org/
 EXTRACT_SUFX=	.tar.xz

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.133 pkgsrc/emulators/qemu/distinfo:1.134
--- pkgsrc/emulators/qemu/distinfo:1.133	Thu Feb 15 08:32:22 2018
+++ pkgsrc/emulators/qemu/distinfo	Tue Apr 17 20:02:14 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.133 2018/02/15 08:32:22 adam Exp $
+$NetBSD: distinfo,v 1.134 2018/04/17 20:02:14 gson Exp $
 
 SHA1 (qemu-2.11.1.tar.xz) = e85cfbdff264510fd9bba73d83978ab4ecee3f41
 RMD160 (qemu-2.11.1.tar.xz) = 5e713f1fb5f742536211d0e27fc377b849730b1e
@@ -7,6 +7,7 @@ Size (qemu-2.11.1.tar.xz) = 28992188 byt
 SHA1 (patch-Makefile) = b3899fb8d0dd2f29bf3edd843836612e6e6c019c
 SHA1 (patch-audio_audio.c) = 98a1de2fd48638886b5d16f6a61dc72910e98b41
 SHA1 (patch-block.c) = 6f54da333696584067a7556b8cabfa8853758824
+SHA1 (patch-chardev_char-mux.c) = e597d4dc3889c00d001d899088c4c8cdc4e00474
 SHA1 (patch-configure) = 6d0acd72edb8c602ffbc98fdbc161bc10aa968e2
 SHA1 (patch-contrib_ivshmem-client_ivshmem-client.c) = 40c8751607cbf66a37e4c4e08f2664b864e2e984
 SHA1 (patch-contrib_ivshmem-server_ivshmem-server.c) = d8f53432b5752f4263dc4ef96108a976a05147a3

Added files:

Index: pkgsrc/emulators/qemu/patches/patch-chardev_char-mux.c
diff -u /dev/null pkgsrc/emulators/qemu/patches/patch-chardev_char-mux.c:1.1
--- /dev/null	Tue Apr 17 20:02:14 2018
+++ pkgsrc/emulators/qemu/patches/patch-chardev_char-mux.c	Tue Apr 17 20:02:14 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-chardev_char-mux.c,v 1.1 2018/04/17 20:02:14 gson Exp $
+
+Fix ctrl-a b again.  This is a backport of qemu git commit
+1b2503fcf7b5932c5a3779ca2ceb92bd403c4ee7.
+
+--- chardev/char-mux.c.orig	2018-02-14 21:53:22.000000000 +0000
++++ chardev/char-mux.c
+@@ -295,6 +295,7 @@ void mux_set_focus(Chardev *chr, int foc
+     }
+ 
+     d->focus = focus;
++    chr->be = d->backends[focus];
+     mux_chr_send_event(d, d->focus, CHR_EVENT_MUX_IN);
+ }
+ 


--_----------=_1523995334227080--