diff options
| author | drochner <drochner@pkgsrc.org> | 2012-07-28 12:02:16 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2012-07-28 12:02:16 +0000 |
| commit | 8c2e41899bbce955ea8d8adc193bc2cd6ff698a4 (patch) | |
| tree | 9f32c8e5687d534383e67fd0423e7a5c6faa88f8 | |
| parent | 6969a18cd43a87c0990ab2715f41aa47818a89cf (diff) | |
| download | pkgsrc-8c2e41899bbce955ea8d8adc193bc2cd6ff698a4.tar.gz | |
copy security patch from xenkernel41 - it also applies to 3.3
(noticed by Daniel Horecki)
bump PKGREV
| -rw-r--r-- | sysutils/xenkernel33/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/xenkernel33/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/xenkernel33/patches/patch-CVE-2012-3432 | 15 |
3 files changed, 19 insertions, 3 deletions
diff --git a/sysutils/xenkernel33/Makefile b/sysutils/xenkernel33/Makefile index 4c98f927766..48fc211f475 100644 --- a/sysutils/xenkernel33/Makefile +++ b/sysutils/xenkernel33/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.17 2012/01/05 12:02:38 cegger Exp $ +# $NetBSD: Makefile,v 1.18 2012/07/28 12:02:16 drochner Exp $ # VERSION= 3.3.2 DISTNAME= xen-${VERSION} PKGNAME= xenkernel33-${VERSION} -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= sysutils MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ EXTRACT_SUFX= .tar.gz diff --git a/sysutils/xenkernel33/distinfo b/sysutils/xenkernel33/distinfo index 15da8ca5908..2ad0a4eeb68 100644 --- a/sysutils/xenkernel33/distinfo +++ b/sysutils/xenkernel33/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.15 2012/01/05 12:02:38 cegger Exp $ +$NetBSD: distinfo,v 1.16 2012/07/28 12:02:16 drochner Exp $ SHA1 (xen-3.3.2.tar.gz) = 7f438e73ac81b25cf5e1570709e87001066bafe4 RMD160 (xen-3.3.2.tar.gz) = 28faa56286f2a418e35dcba6079570ea871d6c7b Size (xen-3.3.2.tar.gz) = 11357576 bytes +SHA1 (patch-CVE-2012-3432) = aed03164e9d05379c0a768bf29643c3e94eefce1 SHA1 (patch-SA45835) = 7d27c26ba947354bb5e279f3add9eb073a151477 SHA1 (patch-aa) = 0d11c758ad0a0ca657bf2e0f89ca23ff67b76bb7 SHA1 (patch-ab) = bba70c6a0f884a4bbfd2ce56e41ce0d649300edc diff --git a/sysutils/xenkernel33/patches/patch-CVE-2012-3432 b/sysutils/xenkernel33/patches/patch-CVE-2012-3432 new file mode 100644 index 00000000000..82cd57fba5b --- /dev/null +++ b/sysutils/xenkernel33/patches/patch-CVE-2012-3432 @@ -0,0 +1,15 @@ +$NetBSD: patch-CVE-2012-3432,v 1.1 2012/07/28 12:02:16 drochner Exp $ + +see http://lists.xen.org/archives/html/xen-devel/2012-07/msg01649.html + +--- xen/arch/x86/hvm/io.c.orig 2009-08-06 12:56:41.000000000 +0000 ++++ xen/arch/x86/hvm/io.c +@@ -181,6 +181,8 @@ int handle_mmio(void) + + rc = hvm_emulate_one(&ctxt); + ++ if ( rc != X86EMUL_RETRY ) ++ curr->arch.hvm_vcpu.io_state = HVMIO_none; + if ( curr->arch.hvm_vcpu.io_state == HVMIO_awaiting_completion ) + curr->arch.hvm_vcpu.io_state = HVMIO_handle_mmio_awaiting_completion; + else |