Attachment #173858 for bug #211850




# $FreeBSD: head/devel/tig/Makefile 412346 2016-04-01 14:00:51Z mat $

PORTNAME=	tig
PORTVERSION=	2.2
CATEGORIES=	devel
MASTER_SITES=	http://jonas.nitro.dk/tig/releases/



RUN_DEPENDS=	git:devel/git

USES=	autoreconf iconv gmake ncurses readline:port
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE}

MAKE_ARGS=	V=1

ALL_TARGET=	all strip
INSTALL_TARGET=	install

Lines 1-2 Link Here

(-)tig/distinfo (-2 / +3 lines)
1	SHA256 (tig-2.1.1.tar.gz) = 50c5179fd564b829b6b2cec087e66f10cf8799601de19350df0772ae77e4852f	1	TIMESTAMP = 1470883142
2	SIZE (tig-2.1.1.tar.gz) = 641710	2	SHA256 (tig-2.2.tar.gz) = 8f5213d3abb45ca9a79810b8d2a2a12d941112bc4682bcfa91f34db74942754c
		3	SIZE (tig-2.2.tar.gz) = 1030062

Lines 1-11 Link Here

(-)tig/files/patch-config.make.in (-11 lines)
1	--- config.make.in.orig 2015-04-09 00:19:11 UTC
2	+++ config.make.in
3	@@ -12,7 +12,7 @@ CC = @CC@
4	CFLAGS = @CFLAGS@ @COVERAGE_CFLAGS@
5	CPPFLAGS = @CPPFLAGS@ -DHAVE_CONFIG_H
6	LDFLAGS = @LDFLAGS@
7	-LDLIBS = @LIBS@ @CURSES_LIB@
8	+LDLIBS = @CURSES_LIB@ @LIBS@
9
10	ASCIIDOC = @ASCIIDOC@
11	XMLTO = @XMLTO@




# Origin: https://github.com/jonas/tig/commit/718c6e94fcc111e5607d6ca0bf3d15271adc0d97
# Subject: ui: fix crash due to out-of-bounds array access

--- src/ui.c.orig	2015-04-09 00:19:11 UTC
+++ src/ui.c
@@ -293,7 +293,7 @@ open_file_finder(const char *commit)
 	finder.keymap = get_keymap("search", STRING_SIZE("search")),
 	file_finder_update(&finder);
 	file_finder_draw(&finder);
-	if (read_prompt_incremental("Find file: ", FALSE, file_finder_input_handler, &finder))
+	if (read_prompt_incremental("Find file: ", FALSE, file_finder_input_handler, &finder) && finder.pos.lineno < finder.lines)
 		file = get_path(finder.line[finder.pos.lineno]->text);
 
 	file_finder_done(&finder);




--- tools/ax_lib_readline.m4.orig	2016-08-11 02:38:59 UTC
+++ tools/ax_lib_readline.m4
@@ -33,17 +33,19 @@ _bash_needmsg=
 fi
 AC_CACHE_VAL(bash_cv_termcap_lib,
 [AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc,
-  [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
-    [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
-        bash_cv_termcap_lib=gnutermcap
 if test "$ax_cv_curses_which" = "ncursesw"; then
         [AC_CHECK_LIB(ncursesw, tgetent, bash_cv_termcap_lib=libncursesw)]
 elif test "$ax_cv_curses_which" = "ncurses"; then
         [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses)]
 elif test "$ax_cv_curses_which" = "plaincurses"; then
         [AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses)]
+else
+  [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
+    [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
+        bash_cv_termcap_lib=gnutermcap
+  )])])
 fi
-)])])])
+])
 if test "X$_bash_needmsg" = "Xyes"; then
 AC_MSG_CHECKING(which library has the termcap functions)
 fi

Return to bug 211850

Lines 2-8 Link Here

(-)tig/Makefile (-2 / +4 lines)
2	# $FreeBSD: head/devel/tig/Makefile 412346 2016-04-01 14:00:51Z mat $	2	# $FreeBSD: head/devel/tig/Makefile 412346 2016-04-01 14:00:51Z mat $
3		3
4	PORTNAME= tig	4	PORTNAME= tig
5	PORTVERSION= 2.1.1	5	PORTVERSION= 2.2
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= http://jonas.nitro.dk/tig/releases/	7	MASTER_SITES= http://jonas.nitro.dk/tig/releases/
8		8
Lines 14-22 Link Here
14		14
15	RUN_DEPENDS= git:devel/git	15	RUN_DEPENDS= git:devel/git
16		16
		17	USES= autoreconf iconv gmake ncurses readline:port
17	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
18	CONFIGURE_ARGS= ${ICONV_CONFIGURE_BASE}	19	CONFIGURE_ARGS= ${ICONV_CONFIGURE_BASE}
19	USES= iconv gmake ncurses readline:port	20
		21	MAKE_ARGS= V=1
20		22
21	ALL_TARGET= all strip	23	ALL_TARGET= all strip
22	INSTALL_TARGET= install	24	INSTALL_TARGET= install

Lines 1-14 Link Here

(-)tig/files/patch-src_ui.c (-14 lines)
1	# Origin: https://github.com/jonas/tig/commit/718c6e94fcc111e5607d6ca0bf3d15271adc0d97
2	# Subject: ui: fix crash due to out-of-bounds array access
3
4	--- src/ui.c.orig 2015-04-09 00:19:11 UTC
5	+++ src/ui.c
6	@@ -293,7 +293,7 @@ open_file_finder(const char *commit)
7	finder.keymap = get_keymap("search", STRING_SIZE("search")),
8	file_finder_update(&finder);
9	file_finder_draw(&finder);
10	- if (read_prompt_incremental("Find file: ", FALSE, file_finder_input_handler, &finder))
11	+ if (read_prompt_incremental("Find file: ", FALSE, file_finder_input_handler, &finder) && finder.pos.lineno < finder.lines)
12	file = get_path(finder.line[finder.pos.lineno]->text);
13
14	file_finder_done(&finder);

Line 0 Link Here

(-)tig/files/patch-tools_ax__lib__readline.m4 (+26 lines)
	1	--- tools/ax_lib_readline.m4.orig 2016-08-11 02:38:59 UTC
	2	+++ tools/ax_lib_readline.m4
	3	@@ -33,17 +33,19 @@ _bash_needmsg=
	4	fi
	5	AC_CACHE_VAL(bash_cv_termcap_lib,
	6	[AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc,
	7	- [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
	8	- [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
	9	- bash_cv_termcap_lib=gnutermcap
	10	if test "$ax_cv_curses_which" = "ncursesw"; then
	11	[AC_CHECK_LIB(ncursesw, tgetent, bash_cv_termcap_lib=libncursesw)]
	12	elif test "$ax_cv_curses_which" = "ncurses"; then
	13	[AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses)]
	14	elif test "$ax_cv_curses_which" = "plaincurses"; then
	15	[AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses)]
	16	+else
	17	+ [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
	18	+ [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
	19	+ bash_cv_termcap_lib=gnutermcap
	20	+ )])])
	21	fi
	22	-)])])])
	23	+])
	24	if test "X$_bash_needmsg" = "Xyes"; then
	25	AC_MSG_CHECKING(which library has the termcap functions)
	26	fi