diff -Nru xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/changelog xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/changelog --- xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/changelog 2018-06-18 15:10:38.000000000 +0000 +++ xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/changelog 2018-06-22 03:45:56.000000000 +0000 @@ -1,3 +1,16 @@ +xen (4.8.3+xsa267+shim4.10.1+xsa267-1+deb9u8+rpi1) stretch-staging; urgency=medium + + [changes brought forward from 4.4.1-9+rpi1 by Peter Michael Green at Sun, 30 Aug 2015 15:43:16 +0000] + * replace "dmb" with "mcr p15, #0, r0, c7, c10, #5" for armv6 + + [changes introduced in 4.6.0-1+rpi1 by Peter Michael Green] + * Use kernel 3.18 for now as I haven't dealt with 4.x yet. + + [changes introduced in 4.8.0-1+rpi1 by Peter Micheal Green] + * Add build-depends on ghostscript. + + -- Raspbian forward porter Fri, 22 Jun 2018 03:45:56 +0000 + xen (4.8.3+xsa267+shim4.10.1+xsa267-1+deb9u8) stretch-security; urgency=high * Update to new upstream version 4.8.3+xsa267+shim4.10.1+xsa267. diff -Nru xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/control.md5sum xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/control.md5sum --- xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/control.md5sum 2018-05-22 15:01:59.000000000 +0000 +++ xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/control.md5sum 2018-06-22 03:45:56.000000000 +0000 @@ -1,12 +1,12 @@ -414390ca652da67ac85ebd905500eb66 debian/changelog +fd4431defc3dba21534e5c87b6a54a0e debian/changelog dc7b5d9f0538e3180af4e9aff9b0bd57 debian/bin/gencontrol.py 20e336dbea44b1641802eff0dde9569b debian/templates/control.main.in a15fa64ce6deead28d33c1581b14dba7 debian/templates/xen-hypervisor.postinst.in fe9f3e8a9c9b716f7b4c5b7d7aec3128 debian/templates/control.system.latest.in 03f63e67cf2d915bfbb535f8c9d9e2e4 debian/templates/xen-utils.postinst.in 63ad8a975156f7bf2327f0e1dc7fc9e2 debian/templates/control.source.in -22492e0565a4754b5e008ca7cac871da debian/templates/xen-hypervisor.postrm.in a4fad0ec66d977759a362165bf8aa31d debian/templates/control.hypervisor.in +22492e0565a4754b5e008ca7cac871da debian/templates/xen-hypervisor.postrm.in df5a318ff90cd0ca3ac7f1a8976bae39 debian/templates/control.utils.in dcabf82578122540e0534f72750698d5 debian/templates/xen-utils.lintian-overrides.in b6acd21c3924e6ec6f9c547afbbc7d9e debian/templates/xen-utils.prerm.in diff -Nru xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/.gitignore xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/.gitignore --- xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/.gitignore 2018-05-22 15:01:59.000000000 +0000 +++ xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -.debhelper -build -files -*.debhelper.log -*.substvars -*.postinst.debhelper -*.postrm.debhelper -*.prerm.debhelper -stamps -libxen-*.* -xen-utils-*.* -xen-utils-common -xenstore-utils -libxen-dev -libxenstore3.0 -xen-hypervisor-*.*-* -xen-system-* diff -Nru xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/patches/armv6.diff xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/patches/armv6.diff --- xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/patches/armv6.diff 1970-01-01 00:00:00.000000000 +0000 +++ xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/patches/armv6.diff 2018-06-22 03:45:56.000000000 +0000 @@ -0,0 +1,20 @@ +Description: replace "dmb" with "mcr p15, #0, r0, c7, c10, #5" for armv6 +Author: Peter Michael Green + +Index: xen-4.6.0/tools/libxc/include/xenctrl.h +=================================================================== +--- xen-4.6.0.orig/tools/libxc/include/xenctrl.h ++++ xen-4.6.0/tools/libxc/include/xenctrl.h +@@ -78,9 +78,9 @@ + #define xen_rmb() xen_barrier() + #define xen_wmb() xen_barrier() + #elif defined(__arm__) +-#define xen_mb() asm volatile ("dmb" : : : "memory") +-#define xen_rmb() asm volatile ("dmb" : : : "memory") +-#define xen_wmb() asm volatile ("dmb" : : : "memory") ++#define xen_mb() asm volatile ("mcr p15, #0, r0, c7, c10, #5" : : : "memory") ++#define xen_rmb() asm volatile ("mcr p15, #0, r0, c7, c10, #5" : : : "memory") ++#define xen_wmb() asm volatile ("mcr p15, #0, r0, c7, c10, #5" : : : "memory") + #elif defined(__aarch64__) + #define xen_mb() asm volatile ("dmb sy" : : : "memory") + #define xen_rmb() asm volatile ("dmb sy" : : : "memory") diff -Nru xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/patches/series xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/patches/series --- xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/patches/series 2018-06-18 15:10:38.000000000 +0000 +++ xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/patches/series 2018-06-22 03:45:56.000000000 +0000 @@ -29,3 +29,4 @@ 0029-Copy-README.pti-and-README.comet-from-the-XSA-254-ad.patch 0030-tools-utility-to-dump-guest-grant-table-info.patch 0031-gitignore-add-tools-misc-xen-diag-to-.gitignore.patch +armv6.diff diff -Nru xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/rules.defs xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/rules.defs --- xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/rules.defs 2018-05-22 15:01:59.000000000 +0000 +++ xen-4.8.3+xsa267+shim4.10.1+xsa267/debian/rules.defs 2018-06-22 03:45:56.000000000 +0000 @@ -1,4 +1,4 @@ -KERNELVERSION := 4.7.0-1 +KERNELVERSION := 3.18.0-trunk BUILD_DIR = debian/build STAMPS_DIR = debian/stamps TEMPLATES_DIR = debian/templates