Pullup ticket #5081 - requested by bsiegert

editors/gummi: security update

Revisions pulled up:
- editors/gummi/Makefile                                        1.36
- editors/gummi/distinfo                                        1.5
- editors/gummi/patches/patch-configure.ac                      1.1
- editors/gummi/patches/patch-src_Makefile.am                   1.1
- editors/gummi/patches/patch-src_update.c                      deleted

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   bsiegert
   Date:           Tue Aug  9 18:23:21 UTC 2016

   Modified Files:
           pkgsrc/editors/gummi: Makefile distinfo
   Added Files:
           pkgsrc/editors/gummi/patches: patch-configure.ac =
   patch-src_Makefile.am
   Removed Files:
           pkgsrc/editors/gummi/patches: patch-src_update.c

   Log Message:
   Gummi 0.6.6 "We're still here" (January 27th, 2016):

   Bugs fixed:

   - Fix using predictable filenames in /tmp (CVE-2015-7758)
   - Fix source id warnings during motion runtime
   - Fix open-project crash due to missing file chooser title
   - Fix synctex for input files with relative paths
   - Add descriptive keywords to our desktop entry file
   - Improvements to the bibliography detection regex
   - Only allow loading tex files through file->open
   - Desensitize cut/copy tools when no text is selected
   - Various improvements to build system
   - Removed deprecated code


   To generate a diff of this commit:
   cvs rdiff -u -r1.35 -r1.36 pkgsrc/editors/gummi/Makefile
   cvs rdiff -u -r1.4 -r1.5 pkgsrc/editors/gummi/distinfo
   cvs rdiff -u -r0 -r1.1 pkgsrc/editors/gummi/patches/patch-configure.ac \
       pkgsrc/editors/gummi/patches/patch-src_Makefile.am
   cvs rdiff -u -r1.2 -r0 pkgsrc/editors/gummi/patches/patch-src_update.c

5 files changed, 48 insertions, 28 deletions

diff --git a/editors/gummi/Makefile b/editors/gummi/Makefile
index d7e46e49534..bc8522aca8b 100644
--- a/editors/gummi/Makefile
+++ b/editors/gummi/Makefile
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile,v 1.33 2016/05/22 18:20:46 wiz Exp $
+# $NetBSD: Makefile,v 1.33.2.1 2016/08/14 12:15:41 spz Exp $
 #
 
-DISTNAME=		gummi-0.6.5
-PKGREVISION=		24
+DISTNAME=		gummi-0.6.6
 CATEGORIES=		editors
-MASTER_SITES=		http://dev.midnightcoding.org/attachments/download/301/
+MASTER_SITES=		${MASTER_SITE_GITHUB:=alexandervdm/}
+GITHUB_PROJECT=		gummi
+GITHUB_TAG=		0.6.6
 
 MAINTAINER=		int21h@pirosfeketefa.hu
-HOMEPAGE=		http://dev.midnightcoding.org/projects/gummi
-COMMENT=		Gummi is a LaTeX editor, written in C/GTK+
+HOMEPAGE=		https://github.com/alexandervdm/gummi
+COMMENT=		LaTeX editor, written in C/GTK+
 LICENSE=		mit
 
-USE_TOOLS+= 		pkg-config intltool msgfmt gmake
+USE_TOOLS+= 		pkg-config intltool msgfmt gmake automake autoreconf
+BUILD_DEPENDS+=		gettext-m4-[0-9]*:../../devel/gettext-m4
 
 # we need some latex, but not all
 #DEPENDS+= teTeX-texmf-[0-9]*:../../print/teTeX3-texmf
@@ -21,6 +23,9 @@ USE_PKGLOCALEDIR=	yes
 
 AUTO_MKDIRS=		yes
 
+pre-configure:
+	cd ${WRKSRC:Q} && ${TOOLS_PATH.autoreconf} -vi
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXdamage/buildlink3.mk"
diff --git a/editors/gummi/distinfo b/editors/gummi/distinfo
index 2e026f9529e..130c1db9390 100644
--- a/editors/gummi/distinfo
+++ b/editors/gummi/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 03:32:16 agc Exp $
+$NetBSD: distinfo,v 1.4.6.1 2016/08/14 12:15:41 spz Exp $
 
-SHA1 (gummi-0.6.5.tar.gz) = dc7cc00518f925629574990d13982ae050515e0b
-RMD160 (gummi-0.6.5.tar.gz) = d07077e7c3c2eff9732cb3fa41c94131681357ea
-SHA512 (gummi-0.6.5.tar.gz) = 9a35533273ff5f2606ba1d79c01dcdf14f2a47628eb5d19613330650ed2a2bd542461492d031e51b773e13c6ac406b564e6703919f16e5f8d7e6bb3c4428b40e
-Size (gummi-0.6.5.tar.gz) = 520902 bytes
-SHA1 (patch-src_update.c) = 389544fbacf4206337128f41d36ec8c057982b36
+SHA1 (gummi-0.6.6.tar.gz) = 89f1ddf50760083838effe8a281ab9d0e6524fca
+RMD160 (gummi-0.6.6.tar.gz) = 2d2d9a7ba4ff27bb3769ad8c31705b64948be5d7
+SHA512 (gummi-0.6.6.tar.gz) = 3be94927c9aafa4914ed2b6f6f5022dce5bcca315a1f947fafb8a4c8bbc5a2bc57f07f8ceaaacdd0b92a5a30483ea8b00e570faf62479280d2ad874716e4c47d
+Size (gummi-0.6.6.tar.gz) = 792642 bytes
+SHA1 (patch-configure.ac) = 3034e1f140b4817f8754d2dba64148422f0ad52d
+SHA1 (patch-src_Makefile.am) = 518dc5de88db7b64efcb0cfddc993faaf01f2efe
diff --git a/editors/gummi/patches/patch-configure.ac b/editors/gummi/patches/patch-configure.ac
new file mode 100644
index 00000000000..73e736d13e1
--- /dev/null
+++ b/editors/gummi/patches/patch-configure.ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure.ac,v 1.1.2.2 2016/08/14 12:15:41 spz Exp $
+
+--- configure.ac.orig	2016-01-27 19:27:48.000000000 +0000
++++ configure.ac
+@@ -65,7 +65,10 @@ if test "$spellcheck" = yes; then
+ fi
+ 
+ # Add explicit linking flags
+-GUI_LIBS="$GUI_LIBS -pthread -lm -lz -lrt"
++GUI_LIBS="$GUI_LIBS -pthread -lm -lz"
++AC_CHECK_LIB(rt, clock_gettime, [
++    GUI_LIBS="$GUI_LIBS -lrt"
++])
+ 
+ # Checks for header files.
+ AC_CHECK_HEADERS([libintl.h locale.h netdb.h stdlib.h string.h sys/socket.h sys/time.h unistd.h fcntl.h])
diff --git a/editors/gummi/patches/patch-src_Makefile.am b/editors/gummi/patches/patch-src_Makefile.am
new file mode 100644
index 00000000000..93deab62498
--- /dev/null
+++ b/editors/gummi/patches/patch-src_Makefile.am
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Makefile.am,v 1.1.2.2 2016/08/14 12:15:41 spz Exp $
+
+--- src/Makefile.am.orig	2016-01-27 19:27:48.000000000 +0000
++++ src/Makefile.am
+@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
+ 
+ bin_PROGRAMS = gummi
+ AM_CFLAGS = $(GUI_CFLAGS) \
+-	    -export-dynamic -Wall -O2 \
++	    -Wl,-export-dynamic -Wall -O2 \
+ 	    -DGUMMI_LIBS=\"$(libdir)/$(PACKAGE)\" \
+ 	    -DGUMMI_DATA=\"$(datadir)/$(PACKAGE)\" \
+ 	    -DGUMMI_LOCALES=\"$(datadir)/locale\"
diff --git a/editors/gummi/patches/patch-src_update.c b/editors/gummi/patches/patch-src_update.c
deleted file mode 100644
index f2fd6d522e5..00000000000
--- a/editors/gummi/patches/patch-src_update.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_update.c,v 1.2 2012/08/09 23:25:05 marino Exp $
-
---- src/update.c.orig	2012-06-24 16:52:03.000000000 +0000
-+++ src/update.c
-@@ -44,6 +44,10 @@
- #include "environment.h"
- #include "utils.h"
- 
-+#if defined(__NetBSD__) || defined(__DragonFly__)
-+#include <netinet/in.h>
-+#endif
-+
- #ifdef WIN32
- /* TODO: use Winsock for WIN32 */
- #else