svn commit: r385393 - in head/devel/tig: . files

[Jan Beich]

Author: jbeich
Date: Mon May  4 11:17:03 2015
New Revision: 385393
URL: https://svnweb.freebsd.org/changeset/ports/385393

Log:
  devel/tig: update to 2.1.1
  
  - Add upstream patch to "fix crash due to out-of-bounds array access" [1]
  - Pet portlint since r383894 by formatting patches with makepatch target
  
  Changes:	http://jonas.nitro.dk/tig/NEWS.html#_tig_2_1_1
  PR:		199382
  Submitted by:	lightside <lightside at gmx.com>
  Approved by:	maintainer timeout (3 weeks)
  Obtained from:  https://github.com/jonas/tig/commit/718c6e9 [1]

Added:
  head/devel/tig/files/patch-src_ui.c   (contents, props changed)
Modified:
  head/devel/tig/Makefile   (contents, props changed)
  head/devel/tig/distinfo   (contents, props changed)
  head/devel/tig/files/patch-config.make.in   (contents, props changed)

Modified: head/devel/tig/Makefile
==============================================================================
--- head/devel/tig/Makefile	Mon May  4 11:16:47 2015	(r385392)
+++ head/devel/tig/Makefile	Mon May  4 11:17:03 2015	(r385393)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tig
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	devel
 MASTER_SITES=	http://jonas.nitro.dk/tig/releases/
 

Modified: head/devel/tig/distinfo
==============================================================================
--- head/devel/tig/distinfo	Mon May  4 11:16:47 2015	(r385392)
+++ head/devel/tig/distinfo	Mon May  4 11:17:03 2015	(r385393)
@@ -1,2 +1,2 @@
-SHA256 (tig-2.1.tar.gz) = 306287f684f57563a53abf1cf46149e0d30c6b500fbc0c39e9bc059506373cb0
-SIZE (tig-2.1.tar.gz) = 635114
+SHA256 (tig-2.1.1.tar.gz) = 50c5179fd564b829b6b2cec087e66f10cf8799601de19350df0772ae77e4852f
+SIZE (tig-2.1.1.tar.gz) = 641710

Modified: head/devel/tig/files/patch-config.make.in
==============================================================================
--- head/devel/tig/files/patch-config.make.in	Mon May  4 11:16:47 2015	(r385392)
+++ head/devel/tig/files/patch-config.make.in	Mon May  4 11:17:03 2015	(r385393)
@@ -1,7 +1,7 @@
---- ./config.make.in.orig	2014-05-10 09:51:50.000000000 +0800
-+++ ./config.make.in	2014-05-10 09:53:07.000000000 +0800
-@@ -12,7 +12,7 @@
- CFLAGS = @CFLAGS@
+--- config.make.in.orig	2015-04-09 00:19:11 UTC
++++ config.make.in
+@@ -12,7 +12,7 @@ CC = @CC@
+ CFLAGS = @CFLAGS@ @COVERAGE_CFLAGS@
  CPPFLAGS = @CPPFLAGS@ -DHAVE_CONFIG_H
  LDFLAGS = @LDFLAGS@
 -LDLIBS = @LIBS@ @CURSES_LIB@

Added: head/devel/tig/files/patch-src_ui.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/tig/files/patch-src_ui.c	Mon May  4 11:17:03 2015	(r385393)
@@ -0,0 +1,14 @@
+# 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);