Date: Tue, 22 Apr 2014 14:09:11 +0000 (UTC) From: Kris Moore <kmoore@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351837 - in head/sysutils/grub2-bhyve: . files Message-ID: <201404221409.s3ME9Bfc057547@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmoore Date: Tue Apr 22 14:09:10 2014 New Revision: 351837 URL: http://svnweb.freebsd.org/changeset/ports/351837 QAT: https://qat.redports.org/buildarchive/r351837/ Log: - Patch to restrict terminal size to 255x255 max to avoid uint8 overflow. - Bump PORTREV https://github.com/grehan-freebsd/grub2-bhyve/commit/70ace4fd43f5017d4aacc920017b5641c9d45431 Submitted by: Oleg Ginzburg <olevole@olevole.ru> Added: head/sysutils/grub2-bhyve/files/ head/sysutils/grub2-bhyve/files/patch-grub-core-term-emu-console.c (contents, props changed) Modified: head/sysutils/grub2-bhyve/Makefile Modified: head/sysutils/grub2-bhyve/Makefile ============================================================================== --- head/sysutils/grub2-bhyve/Makefile Tue Apr 22 13:57:09 2014 (r351836) +++ head/sysutils/grub2-bhyve/Makefile Tue Apr 22 14:09:10 2014 (r351837) @@ -3,6 +3,7 @@ PORTNAME= grub2-bhyve DISTVERSION= 0.22 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= kmoore@FreeBSD.org @@ -24,7 +25,8 @@ USES= bison gettext gmake PLIST_FILES= sbin/grub-bhyve MAKE_JOBS_UNSAFE= yes CONFIGURE_ARGS= --with-platform=emu CC=${CC} LEX=${LOCALBASE}/bin/flex \ - --enable-grub-mount=no --enable-grub-mkfont=no + --enable-grub-mount=no --enable-grub-mkfont=no \ + --enable-grub-emu-sdl=no .include <bsd.port.pre.mk> Added: head/sysutils/grub2-bhyve/files/patch-grub-core-term-emu-console.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/grub2-bhyve/files/patch-grub-core-term-emu-console.c Tue Apr 22 14:09:10 2014 (r351837) @@ -0,0 +1,39 @@ +--- grub-core/term/emu/console.c.bak 2014-04-17 20:03:51.000000000 +0400 ++++ grub-core/term/emu/console.c 2014-04-17 20:03:13.000000000 +0400 +@@ -42,6 +42,12 @@ + #error What the hell? + #endif + ++#ifdef BHYVE /* should include <sys/param.h> */ ++#ifndef MIN ++#define MIN(a,b) (((a)<(b))?(a):(b)) ++#endif ++#endif ++ + static int grub_console_attr = A_NORMAL; + + grub_uint8_t grub_console_cur_color = 7; +@@ -176,6 +182,11 @@ + + getyx (stdscr, y, x); + ++#ifdef BHYVE ++ x = MIN(x, 255); ++ y = MIN(y, 255); ++#endif ++ + return (x << 8) | y; + } + +@@ -187,6 +198,11 @@ + + getmaxyx (stdscr, y, x); + ++#ifdef BHYVE ++ x = MIN(x, 255); ++ y = MIN(y, 255); ++#endif ++ + return (x << 8) | y; + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404221409.s3ME9Bfc057547>