update to 4.1.3 also add security patches from upstream changes: -fixes for vulnerabilities were integrated -many bug fixes and improvements, Highlights are: -Bug fixes and improvements to the libxl tool stack approved by maintainerdiff -r1.20 -r1.21 pkgsrc/sysutils/xentools41/Makefile
(drochner)
@@ -1,21 +1,20 @@ | @@ -1,21 +1,20 @@ | |||
1 | # $NetBSD: Makefile,v 1.20 2012/07/16 22:55:25 jym Exp $ | 1 | # $NetBSD: Makefile,v 1.21 2012/09/12 11:09:32 drochner Exp $ | |
2 | # | 2 | # | |
3 | # VERSION is set in version.mk as it is shared with other packages | 3 | # VERSION is set in version.mk as it is shared with other packages | |
4 | .include "version.mk" | 4 | .include "version.mk" | |
5 | 5 | |||
6 | DISTNAME= xen-${VERSION} | 6 | DISTNAME= xen-${VERSION} | |
7 | PKGNAME= xentools41-${VERSION} | 7 | PKGNAME= xentools41-${VERSION} | |
8 | PKGREVISION= 8 | |||
9 | CATEGORIES= sysutils | 8 | CATEGORIES= sysutils | |
10 | MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ | 9 | MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ | |
11 | 10 | |||
12 | DISTFILES= ${DISTNAME}.tar.gz | 11 | DISTFILES= ${DISTNAME}.tar.gz | |
13 | DISTFILES+= ipxe-git-v1.0.0.tar.gz | 12 | DISTFILES+= ipxe-git-v1.0.0.tar.gz | |
14 | SITES.ipxe-git-v1.0.0.tar.gz += http://xenbits.xensource.com/xen-extfiles/ | 13 | SITES.ipxe-git-v1.0.0.tar.gz += http://xenbits.xensource.com/xen-extfiles/ | |
15 | 14 | |||
16 | MAINTAINER= cegger@NetBSD.org | 15 | MAINTAINER= cegger@NetBSD.org | |
17 | HOMEPAGE= http://xen.org/ | 16 | HOMEPAGE= http://xen.org/ | |
18 | COMMENT= Userland Tools for Xen 4.1.x | 17 | COMMENT= Userland Tools for Xen 4.1.x | |
19 | 18 | |||
20 | LICENSE= gnu-gpl-v2 | 19 | LICENSE= gnu-gpl-v2 | |
21 | 20 |
@@ -1,21 +1,23 @@ | @@ -1,21 +1,23 @@ | |||
1 | $NetBSD: distinfo,v 1.21 2012/05/30 08:29:43 bouyer Exp $ | 1 | $NetBSD: distinfo,v 1.22 2012/09/12 11:09:32 drochner Exp $ | |
2 | 2 | |||
3 | SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 | 3 | SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 | |
4 | RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 | 4 | RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 | |
5 | Size (ipxe-git-v1.0.0.tar.gz) = 1996881 bytes | 5 | Size (ipxe-git-v1.0.0.tar.gz) = 1996881 bytes | |
6 | SHA1 (xen-4.1.2.tar.gz) = db584cb0a0cc614888d7df3b196d514fdb2edd6e | 6 | SHA1 (xen-4.1.3.tar.gz) = 0f688955262d08fba28361ca338f3ad0c0f53d74 | |
7 | RMD160 (xen-4.1.2.tar.gz) = 457797ec4be286afbbcad940a9ce04e44f3f40d6 | 7 | RMD160 (xen-4.1.3.tar.gz) = a6296a16579fd628a1ff2aa64b6b800e4913eeae | |
8 | Size (xen-4.1.2.tar.gz) = 10365786 bytes | 8 | Size (xen-4.1.3.tar.gz) = 10382132 bytes | |
9 | SHA1 (patch-CVE-2012-3515) = ab861e94a23e87f6e2f1338c9b7b2c61818a6943 | |||
10 | SHA1 (patch-CVE-2012-4411) = 4ede574c9d97a0553631ac94b48f2d7a5cb68628 | |||
9 | SHA1 (patch-aa) = 9b53ba4a809dad7a1de34c8fa0dbe493d7256ada | 11 | SHA1 (patch-aa) = 9b53ba4a809dad7a1de34c8fa0dbe493d7256ada | |
10 | SHA1 (patch-ab) = 0906a5ec3a7450fc987b01289e2560e60966d00d | 12 | SHA1 (patch-ab) = 0906a5ec3a7450fc987b01289e2560e60966d00d | |
11 | SHA1 (patch-ac) = c3cc5335a1d6b066307c5f03fe72f513a9eb2bdb | 13 | SHA1 (patch-ac) = c3cc5335a1d6b066307c5f03fe72f513a9eb2bdb | |
12 | SHA1 (patch-ad) = 5eb15470bff85d30b6d26d8fe094f59fc8e34175 | 14 | SHA1 (patch-ad) = 5eb15470bff85d30b6d26d8fe094f59fc8e34175 | |
13 | SHA1 (patch-ae) = 400bd6cac23af1e75f45c3e4e88e3130a3517129 | 15 | SHA1 (patch-ae) = 400bd6cac23af1e75f45c3e4e88e3130a3517129 | |
14 | SHA1 (patch-af) = e866e7d96766b735a53432350275810803eeb510 | 16 | SHA1 (patch-af) = e866e7d96766b735a53432350275810803eeb510 | |
15 | SHA1 (patch-ag) = 90893326dcce4e3e2ef273f22ec5ddf5af0f7cd8 | 17 | SHA1 (patch-ag) = 90893326dcce4e3e2ef273f22ec5ddf5af0f7cd8 | |
16 | SHA1 (patch-ah) = ab91c41ef6bbdd7f7f3d992b9f81e43056a765e2 | 18 | SHA1 (patch-ah) = ab91c41ef6bbdd7f7f3d992b9f81e43056a765e2 | |
17 | SHA1 (patch-ai) = 8da6bba38bd7677ea829ca35058f7d2d1d7acad4 | 19 | SHA1 (patch-ai) = 8da6bba38bd7677ea829ca35058f7d2d1d7acad4 | |
18 | SHA1 (patch-aj) = d0999d8dcbc1eef4de7037db0e54dcd8d2f706eb | 20 | SHA1 (patch-aj) = d0999d8dcbc1eef4de7037db0e54dcd8d2f706eb | |
19 | SHA1 (patch-ak) = 722a6b0541b036d84c703037134e25bc47f3eb65 | 21 | SHA1 (patch-ak) = 722a6b0541b036d84c703037134e25bc47f3eb65 | |
20 | SHA1 (patch-al) = d9a310c16db708dd86170a13946f87e4cd21eb7a | 22 | SHA1 (patch-al) = d9a310c16db708dd86170a13946f87e4cd21eb7a | |
21 | SHA1 (patch-ba) = 2c65e4b4b85e91e92dfb3aa402ebc44694bdff06 | 23 | SHA1 (patch-ba) = 2c65e4b4b85e91e92dfb3aa402ebc44694bdff06 | |
@@ -35,17 +37,15 @@ SHA1 (patch-db) = 4766f9925462023332793b | @@ -35,17 +37,15 @@ SHA1 (patch-db) = 4766f9925462023332793b | |||
35 | SHA1 (patch-dc) = d860fe3725978227278d58f09e7d5157001e463e | 37 | SHA1 (patch-dc) = d860fe3725978227278d58f09e7d5157001e463e | |
36 | SHA1 (patch-dd) = e66d9cc0028ba922b050fc142862b4095cd018f3 | 38 | SHA1 (patch-dd) = e66d9cc0028ba922b050fc142862b4095cd018f3 | |
37 | SHA1 (patch-de) = fae94b61a430a1a7dd98c9a6a04e4513824c6d8d | 39 | SHA1 (patch-de) = fae94b61a430a1a7dd98c9a6a04e4513824c6d8d | |
38 | SHA1 (patch-df) = d20bf9d3fd05f5334f77c9154bf0fb9944c1292c | 40 | SHA1 (patch-df) = d20bf9d3fd05f5334f77c9154bf0fb9944c1292c | |
39 | SHA1 (patch-ioemu-qemu-xen_hw_pass-through.c) = 76185c239078f29cb42b953d6c2cd1f59e240989 | 41 | SHA1 (patch-ioemu-qemu-xen_hw_pass-through.c) = 76185c239078f29cb42b953d6c2cd1f59e240989 | |
40 | SHA1 (patch-ioemu-qemu-xen_hw_pass-through.h) = 98c26798d1ad99d3eee8b33deb08f747c958c886 | 42 | SHA1 (patch-ioemu-qemu-xen_hw_pass-through.h) = 98c26798d1ad99d3eee8b33deb08f747c958c886 | |
41 | SHA1 (patch-ioemu-qemu-xen_hw_piix4acpi.c) = ca19457e9bde2d844a86a866960ac6de1f3d084c | 43 | SHA1 (patch-ioemu-qemu-xen_hw_piix4acpi.c) = ca19457e9bde2d844a86a866960ac6de1f3d084c | |
42 | SHA1 (patch-ioemu-qemu-xen_hw_pt-graphics.c) = 3c03404f1d711c667559a1332e717a5f1b5ceda8 | 44 | SHA1 (patch-ioemu-qemu-xen_hw_pt-graphics.c) = 3c03404f1d711c667559a1332e717a5f1b5ceda8 | |
43 | SHA1 (patch-ioemu-qemu-xen_hw_pt-msi.c) = 2dcebc65f591988bb95dea74c3b21f7066154a9f | 45 | SHA1 (patch-ioemu-qemu-xen_hw_pt-msi.c) = 2dcebc65f591988bb95dea74c3b21f7066154a9f | |
44 | SHA1 (patch-ioemu-qemu-xen_hw_pt-msi.h) = d1bb1a8ad90d6577056f11df96f5469ffe74a3b0 | 46 | SHA1 (patch-ioemu-qemu-xen_hw_pt-msi.h) = d1bb1a8ad90d6577056f11df96f5469ffe74a3b0 | |
45 | SHA1 (patch-ioemu-qemu-xen_xen-hooks.mak) = a00d9a9fd0fbb9fd89788b9dfaf5b389a28d47e2 | 47 | SHA1 (patch-ioemu-qemu-xen_xen-hooks.mak) = a00d9a9fd0fbb9fd89788b9dfaf5b389a28d47e2 | |
46 | SHA1 (patch-libxl_libxl_create.c) = 02b661ca684609939c6ef762c0ddd1c5e62ad4d0 | 48 | SHA1 (patch-libxl_libxl_create.c) = 02b661ca684609939c6ef762c0ddd1c5e62ad4d0 | |
47 | SHA1 (patch-libxl_libxl_internal.h) = e126e5e998117903f0c66cc370d350c504ed33d9 | 49 | SHA1 (patch-libxl_libxl_internal.h) = e126e5e998117903f0c66cc370d350c504ed33d9 | |
48 | SHA1 (patch-ocaml-include-path) = 959df25b0aae78d525b25f223190203d3c1185a6 | |||
49 | SHA1 (patch-qemu-e1000-CVSE-2012-0029) = 064ba74795e7a1ceb863d1f7bc171f3841c81b8a | |||
50 | SHA1 (patch-qemu-phy-devices) = fef90e50ef0a58db2f2b49b6c23218f371791de5 | 50 | SHA1 (patch-qemu-phy-devices) = fef90e50ef0a58db2f2b49b6c23218f371791de5 | |
51 | SHA1 (patch-xenstore_Makefile) = 4fa0ed7b76a96011c3cca9c5017be4b5151489f7 | 51 | SHA1 (patch-xenstore_Makefile) = 4fa0ed7b76a96011c3cca9c5017be4b5151489f7 |
@@ -1,5 +1,5 @@ | @@ -1,5 +1,5 @@ | |||
1 | # $NetBSD: version.mk,v 1.2 2011/10/21 18:27:21 cegger Exp $ | 1 | # $NetBSD: version.mk,v 1.3 2012/09/12 11:09:32 drochner Exp $ | |
2 | 2 | |||
3 | # Version number is used by xentool41 and xenstoretools | 3 | # Version number is used by xentool41 and xenstoretools | |
4 | 4 | |||
5 | VERSION= 4.1.2 | 5 | VERSION= 4.1.3 |
$NetBSD: patch-CVE-2012-3515,v 1.1 2012/09/12 11:09:32 drochner Exp $
see http://lists.xen.org/archives/html/xen-devel/2012-09/msg00199.html
--- ioemu-qemu-xen/console.c.orig 2012-04-24 17:35:40.000000000 +0000
+++ ioemu-qemu-xen/console.c
@@ -794,6 +794,26 @@ static void console_clear_xy(TextConsole
update_xy(s, x, y);
}
+/* set cursor, checking bounds */
+static void set_cursor(TextConsole *s, int x, int y)
+{
+ if (x < 0) {
+ x = 0;
+ }
+ if (y < 0) {
+ y = 0;
+ }
+ if (y >= s->height) {
+ y = s->height - 1;
+ }
+ if (x >= s->width) {
+ x = s->width - 1;
+ }
+
+ s->x = x;
+ s->y = y;
+}
+
static void console_putchar(TextConsole *s, int ch)
{
TextCell *c;
@@ -869,7 +889,8 @@ static void console_putchar(TextConsole
s->esc_params[s->nb_esc_params] * 10 + ch - '0';
}
} else {
- s->nb_esc_params++;
+ if (s->nb_esc_params < MAX_ESC_PARAMS)
+ s->nb_esc_params++;
if (ch == ';')
break;
#ifdef DEBUG_CONSOLE
@@ -883,59 +904,37 @@ static void console_putchar(TextConsole
if (s->esc_params[0] == 0) {
s->esc_params[0] = 1;
}
- s->y -= s->esc_params[0];
- if (s->y < 0) {
- s->y = 0;
- }
+ set_cursor(s, s->x, s->y - s->esc_params[0]);
break;
case 'B':
/* move cursor down */
if (s->esc_params[0] == 0) {
s->esc_params[0] = 1;
}
- s->y += s->esc_params[0];
- if (s->y >= s->height) {
- s->y = s->height - 1;
- }
+ set_cursor(s, s->x, s->y + s->esc_params[0]);
break;
case 'C':
/* move cursor right */
if (s->esc_params[0] == 0) {
s->esc_params[0] = 1;
}
- s->x += s->esc_params[0];
- if (s->x >= s->width) {
- s->x = s->width - 1;
- }
+ set_cursor(s, s->x + s->esc_params[0], s->y);
break;
case 'D':
/* move cursor left */
if (s->esc_params[0] == 0) {
s->esc_params[0] = 1;
}
- s->x -= s->esc_params[0];
- if (s->x < 0) {
- s->x = 0;
- }
+ set_cursor(s, s->x - s->esc_params[0], s->y);
break;
case 'G':
/* move cursor to column */
- s->x = s->esc_params[0] - 1;
- if (s->x < 0) {
- s->x = 0;
- }
+ set_cursor(s, s->esc_params[0] - 1, s->y);
break;
case 'f':
case 'H':
/* move cursor to row, column */
- s->x = s->esc_params[1] - 1;
- if (s->x < 0) {
- s->x = 0;
- }
- s->y = s->esc_params[0] - 1;
- if (s->y < 0) {
- s->y = 0;
- }
+ set_cursor(s, s->esc_params[1] - 1, s->esc_params[0] - 1);
break;
case 'J':
switch (s->esc_params[0]) {
$NetBSD: patch-CVE-2012-4411,v 1.1 2012/09/12 11:09:33 drochner Exp $
see http://lists.xen.org/archives/html/xen-devel/2012-09/msg00465.html
--- ioemu-qemu-xen/vl.c.orig 2012-04-24 17:35:40.000000000 +0000
+++ ioemu-qemu-xen/vl.c
@@ -4910,7 +4910,7 @@ int main(int argc, char **argv, char **e
kernel_cmdline = "";
cyls = heads = secs = 0;
translation = BIOS_ATA_TRANSLATION_AUTO;
- monitor_device = "vc:80Cx24C";
+ monitor_device = "null";
serial_devices[0] = "vc:80Cx24C";
for(i = 1; i < MAX_SERIAL_PORTS; i++)