summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorhe <he@pkgsrc.org>2012-10-24 13:32:54 +0000
committerhe <he@pkgsrc.org>2012-10-24 13:32:54 +0000
commit21a0d1dd6d656800e75affa3c1ea4535fad51b7d (patch)
tree3a69feaf3ae8952c7ccff4e6b8ab27e9bbcebc51 /graphics
parentba1125256004ad35d4107e0905e726c1d8f86975 (diff)
downloadpkgsrc-21a0d1dd6d656800e75affa3c1ea4535fad51b7d.tar.gz
Add a patch to avoid gnuplot always segfaulting on a NULL pointer
de-reference on the first command. Bump pkgrevision.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/gnuplot/Makefile4
-rw-r--r--graphics/gnuplot/distinfo3
-rw-r--r--graphics/gnuplot/patches/patch-src_command.c16
3 files changed, 20 insertions, 3 deletions
diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index 78afb456166..463b4ea3cf0 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2012/10/08 23:01:44 adam Exp $
+# $NetBSD: Makefile,v 1.67 2012/10/24 13:32:54 he Exp $
DISTNAME= gnuplot-4.6.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES+= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/}
diff --git a/graphics/gnuplot/distinfo b/graphics/gnuplot/distinfo
index 16093acb8e3..075dbd3b733 100644
--- a/graphics/gnuplot/distinfo
+++ b/graphics/gnuplot/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2012/08/10 15:14:53 drochner Exp $
+$NetBSD: distinfo,v 1.20 2012/10/24 13:32:54 he Exp $
SHA1 (gnuplot-4.6.0.tar.gz) = 9a43ae13546d97d4b174533ddac31a14e0edc9b2
RMD160 (gnuplot-4.6.0.tar.gz) = 2c06500f45fb81850b45713a2cd0e38f0021b065
@@ -10,3 +10,4 @@ SHA1 (patch-ae) = ce2a89ebcdcae1b1945563b48e6ebb6974d3a048
SHA1 (patch-af) = e5672a05f88d0ba3c1471b379dd47cd1b274f8b1
SHA1 (patch-ag) = 0e649f1d0aed8befdb818b991a45dbfc0d2e1e7c
SHA1 (patch-ah) = e4024ebbc039d7b5e741aa109259de6269b03765
+SHA1 (patch-src_command.c) = 0b09c2a58b60efe93b48c7457a50a59a7275c515
diff --git a/graphics/gnuplot/patches/patch-src_command.c b/graphics/gnuplot/patches/patch-src_command.c
new file mode 100644
index 00000000000..2d60f30c449
--- /dev/null
+++ b/graphics/gnuplot/patches/patch-src_command.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_command.c,v 1.1 2012/10/24 13:32:54 he Exp $
+
+Avoid de-referencing a NULL pointer on the first command executed(!)
+
+--- src/command.c.orig 2012-02-27 21:58:36.000000000 +0000
++++ src/command.c
+@@ -2689,7 +2689,8 @@ rlgets(char *s, size_t n, const char *pr
+ /* deleting history entries does not work, so suppress adjacent
+ duplicates only */
+ while (previous_history());
+- if (strcmp(current_history()->line, line) != 0)
++ if (current_history() != NULL &&
++ strcmp(current_history()->line, line) != 0)
+ add_history(line);
+ # else /* builtin readline */
+ add_history(line);