CVS commit: pkgsrc/sysutils/xentools411

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Tue Jun 23 13:22:31 UTC 2020

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

Log Message:
Fix loading of LZ4 compressed kernels


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/sysutils/xentools411/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/xentools411/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/xentools411/patches/patch-xen_common_lz4_dexompress.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.18 pkgsrc/sysutils/xentools411/Makefile:1.19
--- pkgsrc/sysutils/xentools411/Makefile:1.18   Thu Jun 18 13:48:54 2020
+++ pkgsrc/sysutils/xentools411/Makefile        Tue Jun 23 13:22:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2020/06/18 13:48:54 plunky Exp $
+# $NetBSD: Makefile,v 1.19 2020/06/23 13:22:30 manu Exp $
 #
 VERSION=       4.11.3
 VERSION_IPXE=  356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d
@@ -7,7 +7,7 @@ DIST_IPXE=      ipxe-git-${VERSION_IPXE}.tar.
 DIST_SUBDIR=           xen411
 DISTNAME=              xen-${VERSION}
 PKGNAME=               xentools411-${VERSION}
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            sysutils
 MASTER_SITES=          https://downloads.xenproject.org/release/xen/${VERSION}/
 

Index: pkgsrc/sysutils/xentools411/distinfo
diff -u pkgsrc/sysutils/xentools411/distinfo:1.12 pkgsrc/sysutils/xentools411/distinfo:1.13
--- pkgsrc/sysutils/xentools411/distinfo:1.12   Thu Jun 18 13:48:28 2020
+++ pkgsrc/sysutils/xentools411/distinfo        Tue Jun 23 13:22:30 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2020/06/18 13:48:28 plunky Exp $
+$NetBSD: distinfo,v 1.13 2020/06/23 13:22:30 manu Exp $
 
 SHA1 (xen411/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz) = 272b8c904dc0127690eca2c5c20c67479e40da34
 RMD160 (xen411/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz) = cfcb4a314c15da19b36132b27126f3bd9699d0e5
@@ -81,4 +81,5 @@ SHA1 (patch-tools_xenstore_xs_lib.c) = e
 SHA1 (patch-tools_xentrace_xentrace.c) = f964c7555f454358a39f28a2e75db8ee100a4243
 SHA1 (patch-tools_xl_Makefile) = dd4fa8cc66c74eea8b022cd6129aa2831776f2a8
 SHA1 (patch-xen_Rules.mk) = c743dc63f51fc280d529a7d9e08650292c171dac
+SHA1 (patch-xen_common_lz4_dexompress.c) = 521a247c2d36980b3433c4be92c77308a2d3f3b9
 SHA1 (patch-xen_tools_symbols.c) = 67b5a38312095029631e00457abc0e4bb633aaf8

Added files:

Index: pkgsrc/sysutils/xentools411/patches/patch-xen_common_lz4_dexompress.c
diff -u /dev/null pkgsrc/sysutils/xentools411/patches/patch-xen_common_lz4_dexompress.c:1.1
--- /dev/null   Tue Jun 23 13:22:31 2020
+++ pkgsrc/sysutils/xentools411/patches/patch-xen_common_lz4_dexompress.c       Tue Jun 23 13:22:30 2020
@@ -0,0 +1,24 @@
+--- ./xen/common/lz4/decompress.c.orig 2020-06-23 03:41:56.777396819 +0200
++++ ./xen/common/lz4/decompress.c      2020-06-23 03:42:40.735064865 +0200
+@@ -146,9 +146,9 @@
+                       if (op == oend)
+                               goto _output_error;
+                       continue;
+               }
+-              if (unlikely((unsigned long)cpy < (unsigned long)op))
++              if (unlikely((unsigned long)cpy < (unsigned long)op - (STEPSIZE - 4)))
+                       goto _output_error;
+               LZ4_SECURECOPY(ref, op, cpy);
+               op = cpy; /* correction */
+       }
+@@ -278,9 +278,9 @@
+                       if (op == oend)
+                               goto _output_error;
+                       continue;
+               }
+-              if (unlikely((unsigned long)cpy < (unsigned long)op))
++              if (unlikely((unsigned long)cpy < (unsigned long)op - (STEPSIZE - 4)))
+                       goto _output_error;
+               LZ4_SECURECOPY(ref, op, cpy);
+               op = cpy; /* correction */
+       }