diff options
| author | tron <tron@pkgsrc.org> | 2012-10-25 15:05:37 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2012-10-25 15:05:37 +0000 |
| commit | 76e43b8212975b7407006a45002a5987424729bb (patch) | |
| tree | 31029166bd915ad53b04c64d6b20c65e4463be41 | |
| parent | c7d504e83029708796b3e74acdb7349198e0a4d2 (diff) | |
| download | pkgsrc-76e43b8212975b7407006a45002a5987424729bb.tar.gz | |
Pullup ticket #3955 - requested by he
graphics/gnuplot: bug fix patch
Revisions pulled up:
- graphics/gnuplot/Makefile 1.67 via patch
- graphics/gnuplot/distinfo 1.20
- graphics/gnuplot/patches/patch-src_command.c 1.1
---
Module Name: pkgsrc
Committed By: he
Date: Wed Oct 24 13:32:54 UTC 2012
Modified Files:
pkgsrc/graphics/gnuplot: Makefile distinfo
Added Files:
pkgsrc/graphics/gnuplot/patches: patch-src_command.c
Log Message:
Add a patch to avoid gnuplot always segfaulting on a NULL pointer
de-reference on the first command.
Bump pkgrevision.
| -rw-r--r-- | graphics/gnuplot/Makefile | 4 | ||||
| -rw-r--r-- | graphics/gnuplot/distinfo | 3 | ||||
| -rw-r--r-- | graphics/gnuplot/patches/patch-src_command.c | 16 |
3 files changed, 20 insertions, 3 deletions
diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile index 50c996f06b7..816bb19fa9b 100644 --- a/graphics/gnuplot/Makefile +++ b/graphics/gnuplot/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.63.2.1 2012/10/03 12:08:02 spz Exp $ +# $NetBSD: Makefile,v 1.63.2.2 2012/10/25 15:05:37 tron Exp $ DISTNAME= gnuplot-4.6.0 -PKGREVISION= 2 +PKGREVISION= 4 CATEGORIES+= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/} diff --git a/graphics/gnuplot/distinfo b/graphics/gnuplot/distinfo index 16093acb8e3..d4338b570d3 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.19.2.1 2012/10/25 15:05:37 tron 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..0174c05d278 --- /dev/null +++ b/graphics/gnuplot/patches/patch-src_command.c @@ -0,0 +1,16 @@ +$NetBSD: patch-src_command.c,v 1.1.2.2 2012/10/25 15:05:37 tron 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); |