aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorkmoore <kmoore@FreeBSD.org>2014-04-22 22:09:10 +0800
committerkmoore <kmoore@FreeBSD.org>2014-04-22 22:09:10 +0800
commit3665383d5ae162e8d290a69736aecba91cf3bb14 (patch)
treee5672a5e57c67513758c8e24bac0edc6bed7343a /sysutils
parent641c1da26ed2407b071080dc00f1025b201c52d6 (diff)
downloadfreebsd-ports-gnome-3665383d5ae162e8d290a69736aecba91cf3bb14.tar.gz
freebsd-ports-gnome-3665383d5ae162e8d290a69736aecba91cf3bb14.tar.zst
freebsd-ports-gnome-3665383d5ae162e8d290a69736aecba91cf3bb14.zip
- 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>
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/grub2-bhyve/Makefile4
-rw-r--r--sysutils/grub2-bhyve/files/patch-grub-core-term-emu-console.c39
2 files changed, 42 insertions, 1 deletions
diff --git a/sysutils/grub2-bhyve/Makefile b/sysutils/grub2-bhyve/Makefile
index cc32dd37a330..06cd80536dbe 100644
--- a/sysutils/grub2-bhyve/Makefile
+++ b/sysutils/grub2-bhyve/Makefile
@@ -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>
diff --git a/sysutils/grub2-bhyve/files/patch-grub-core-term-emu-console.c b/sysutils/grub2-bhyve/files/patch-grub-core-term-emu-console.c
new file mode 100644
index 000000000000..79add1cfca2f
--- /dev/null
+++ b/sysutils/grub2-bhyve/files/patch-grub-core-term-emu-console.c
@@ -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;
+ }
+