From 6dcb88099afb7a92595c92ec753a57bfd59043b91e93c03094b3870ebeb1e6eb Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 16 Aug 2017 07:15:05 +0000 Subject: [PATCH] Update to version 5.0.7 OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=80 --- gnuplot-4.4.0-x11ovf.dif | 8 +++--- gnuplot-4.6.0-demo.diff | 14 +++++----- gnuplot-4.6.0-fonts.diff | 23 ++++++++------- gnuplot-4.6.0.dif | 60 ++++++++++++++++++++-------------------- gnuplot-5.0.6.tar.gz | 3 -- gnuplot-5.0.7.tar.gz | 3 ++ gnuplot.changes | 31 ++++++++++++++++++++- gnuplot.spec | 2 +- 8 files changed, 88 insertions(+), 56 deletions(-) delete mode 100644 gnuplot-5.0.6.tar.gz create mode 100644 gnuplot-5.0.7.tar.gz diff --git a/gnuplot-4.4.0-x11ovf.dif b/gnuplot-4.4.0-x11ovf.dif index e8c9a30..c6ad17b 100644 --- a/gnuplot-4.4.0-x11ovf.dif +++ b/gnuplot-4.4.0-x11ovf.dif @@ -3,8 +3,8 @@ 1 file changed, 9 insertions(+), 3 deletions(-) --- src/gplt_x11.c -+++ src/gplt_x11.c 2016-12-15 12:54:24.652945585 +0000 -@@ -958,6 +958,8 @@ mainloop() ++++ src/gplt_x11.c 2017-08-16 07:04:07.631337117 +0000 +@@ -957,6 +957,8 @@ mainloop() nfds = cn + 1; while (1) { @@ -13,7 +13,7 @@ XFlush(dpy); /* see above */ FD_ZERO(&tset); -@@ -995,7 +997,11 @@ mainloop() +@@ -994,7 +996,11 @@ mainloop() process_event(&xe); } } @@ -26,7 +26,7 @@ unlink(X11_ipcpath); record(); fclose(X11_ipc); -@@ -1223,8 +1229,8 @@ static int read_input __PROTO((void)); +@@ -1226,8 +1232,8 @@ static int read_input __PROTO((void)); static int read_input() { diff --git a/gnuplot-4.6.0-demo.diff b/gnuplot-4.6.0-demo.diff index 77534cc..a74cc6f 100644 --- a/gnuplot-4.6.0-demo.diff +++ b/gnuplot-4.6.0-demo.diff @@ -8,7 +8,7 @@ 6 files changed, 40 insertions(+), 9 deletions(-) --- demo/fit.dem -+++ demo/fit.dem 2016-12-15 12:39:37.002761578 +0000 ++++ demo/fit.dem 2017-08-16 07:02:41.572923104 +0000 @@ -10,6 +10,7 @@ set dummy x, y print "Some examples how data fitting using nonlinear least squares fit can be done." @@ -51,7 +51,7 @@ # release datablock undefine $PearsonYork --- demo/poldat.dem -+++ demo/poldat.dem 2016-12-15 12:39:37.002761578 +0000 ++++ demo/poldat.dem 2017-08-16 07:02:41.572923104 +0000 @@ -11,7 +11,7 @@ unset grid unset polar set title "Primitive Smith Chart" @@ -62,7 +62,7 @@ set rrange [-0 : 10] set trange [-pi : pi] --- demo/simple.dem -+++ demo/simple.dem 2016-12-15 12:39:37.002761578 +0000 ++++ demo/simple.dem 2017-08-16 07:02:41.572923104 +0000 @@ -8,14 +8,13 @@ # set title "Simple Plots" font ",20" @@ -80,7 +80,7 @@ pause -1 "Hit return to continue" --- demo/stringvar.dem -+++ demo/stringvar.dem 2016-12-15 12:39:37.002761578 +0000 ++++ demo/stringvar.dem 2017-08-16 07:02:41.572923104 +0000 @@ -1,7 +1,8 @@ # # Miscellaneous neat things you can do using the string variables code @@ -119,8 +119,8 @@ unset ytics set yrange [0:1] --- src/show.c -+++ src/show.c 2016-12-15 12:39:37.006761498 +0000 -@@ -1051,6 +1051,15 @@ show_version(FILE *fp) ++++ src/show.c 2017-08-16 07:02:41.576923031 +0000 +@@ -1056,6 +1056,15 @@ show_version(FILE *fp) p /* type "help seeking-assistance" */ ); @@ -137,7 +137,7 @@ /* show version long */ if (almost_equals(c_token, "l$ong")) { --- src/variable.c -+++ src/variable.c 2016-12-15 12:39:37.006761498 +0000 ++++ src/variable.c 2017-08-16 07:02:41.576923031 +0000 @@ -37,7 +37,10 @@ static char *RCSid() { return RCSid("$Id /* The Death of Global Variables - part one. */ diff --git a/gnuplot-4.6.0-fonts.diff b/gnuplot-4.6.0-fonts.diff index 00f6483..119c323 100644 --- a/gnuplot-4.6.0-fonts.diff +++ b/gnuplot-4.6.0-fonts.diff @@ -1,6 +1,10 @@ -diff -p -u -r ../gnuplot-5.0.0.orig/src/gplt_x11.c src/gplt_x11.c ---- ../gnuplot-5.0.0.orig/src/gplt_x11.c 2014-12-15 05:24:07.000000000 +0100 -+++ src/gplt_x11.c 2015-01-21 08:49:39.558763938 +0100 +--- + src/gplt_x11.c | 33 +++++++++++++++++++++++++++------ + src/variable.c | 2 ++ + 2 files changed, 29 insertions(+), 6 deletions(-) + +--- src/gplt_x11.c ++++ src/gplt_x11.c 2017-08-16 07:02:00.645677412 +0000 @@ -103,15 +103,16 @@ static char *RCSid() { return RCSid("$Id * patches by Masahito Yamaga */ @@ -34,7 +38,7 @@ diff -p -u -r ../gnuplot-5.0.0.orig/src/gplt_x11.c src/gplt_x11.c #ifdef EXPORT_SELECTION # undef EXPORT_SELECTION #endif /* EXPORT SELECTION */ -@@ -523,8 +530,8 @@ static char *gpFallbackFont __PROTO((voi +@@ -522,8 +529,8 @@ static char *gpFallbackFont __PROTO((voi static int gpXGetFontascent __PROTO((XFontStruct *cfont)); enum set_encoding_id encoding = S_ENC_DEFAULT; /* EAM - mirrored from core code by 'QE' */ @@ -45,7 +49,7 @@ diff -p -u -r ../gnuplot-5.0.0.orig/src/gplt_x11.c src/gplt_x11.c #define Nwidths 10 static unsigned int widths[Nwidths] = { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -@@ -2287,6 +2294,8 @@ exec_cmd(plot_struct *plot, char *comman +@@ -2288,6 +2295,8 @@ exec_cmd(plot_struct *plot, char *comman /* Save the request default font */ c = &(buffer[strlen(buffer)-1]); while (*c <= ' ') *c-- = '\0'; @@ -54,7 +58,7 @@ diff -p -u -r ../gnuplot-5.0.0.orig/src/gplt_x11.c src/gplt_x11.c strncpy(default_font, &buffer[2], strlen(&buffer[2])+1); FPRINTF((stderr, "gnuplot_x11: exec_cmd() set default_font to \"%s\"\n", default_font)); break; -@@ -5757,7 +5766,7 @@ XFontStruct *gpXLoadQueryFont (Display * +@@ -5751,7 +5760,7 @@ XFontStruct *gpXLoadQueryFont (Display * } #else if (first_time) { @@ -63,7 +67,7 @@ diff -p -u -r ../gnuplot-5.0.0.orig/src/gplt_x11.c src/gplt_x11.c first_time = FALSE; } while (n_miss-- > 0) -@@ -5912,6 +5921,18 @@ char *fontname; +@@ -5906,6 +5915,18 @@ char *fontname; } #ifdef USE_X11_MULTIBYTE @@ -82,9 +86,8 @@ diff -p -u -r ../gnuplot-5.0.0.orig/src/gplt_x11.c src/gplt_x11.c if (fontname && strncmp(fontname, "mbfont:", 7) == 0) { if (multibyte_fonts_usable) { usemultibyte = 1; -diff -p -u -r ../gnuplot-5.0.0.orig/src/variable.c src/variable.c ---- ../gnuplot-5.0.0.orig/src/variable.c 2013-07-03 00:19:09.000000000 +0200 -+++ src/variable.c 2015-01-21 08:47:20.056751038 +0100 +--- src/variable.c ++++ src/variable.c 2017-08-16 07:02:00.645677412 +0000 @@ -282,6 +282,8 @@ static const struct path_table fontpath_ { "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" }, #endif diff --git a/gnuplot-4.6.0.dif b/gnuplot-4.6.0.dif index 72d1989..766772e 100644 --- a/gnuplot-4.6.0.dif +++ b/gnuplot-4.6.0.dif @@ -1,16 +1,16 @@ --- - gnuplot-5.0.5/configure.in | 2 +- - gnuplot-5.0.5/docs/Makefile.am | 12 ++++++++---- - gnuplot-5.0.5/docs/gnuplot-fr.doc | 4 ++-- - gnuplot-5.0.5/src/gadgets.h | 2 +- - gnuplot-5.0.5/src/gplt_x11.c | 9 ++++++--- - gnuplot-5.0.5/src/plot.c | 22 +++++++++++++++++++++- - gnuplot-5.0.5/src/term.h | 6 +++--- - gnuplot-5.0.5/term/linux.trm | 4 ++-- + gnuplot-5.0.7/configure.in | 2 +- + gnuplot-5.0.7/docs/Makefile.am | 12 ++++++++---- + gnuplot-5.0.7/docs/gnuplot-fr.doc | 4 ++-- + gnuplot-5.0.7/src/gadgets.h | 2 +- + gnuplot-5.0.7/src/gplt_x11.c | 9 ++++++--- + gnuplot-5.0.7/src/plot.c | 22 +++++++++++++++++++++- + gnuplot-5.0.7/src/term.h | 6 +++--- + gnuplot-5.0.7/term/linux.trm | 4 ++-- 8 files changed, 44 insertions(+), 17 deletions(-) ---- gnuplot-5.0.5/configure.in -+++ gnuplot-5.0.5/configure.in 2016-12-15 12:41:19.652693771 +0000 +--- gnuplot-5.0.7/configure.in ++++ gnuplot-5.0.7/configure.in 2017-08-16 07:03:41.655815809 +0000 @@ -370,7 +370,7 @@ if test "$with_linux_vga" = yes; then [AC_DEFINE(LINUXVGA,1, [ Define if this is a Linux system with SuperVGA library. ]) @@ -20,8 +20,8 @@ with_linux_vga=no) fi ---- gnuplot-5.0.5/docs/Makefile.am -+++ gnuplot-5.0.5/docs/Makefile.am 2016-12-15 12:50:02.702188523 +0000 +--- gnuplot-5.0.7/docs/Makefile.am ++++ gnuplot-5.0.7/docs/Makefile.am 2017-08-16 07:03:41.655815809 +0000 @@ -42,7 +42,7 @@ # @@ -64,8 +64,8 @@ alldoc2gih_SOURCES = doc2gih.c termdoc.c alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS) ---- gnuplot-5.0.5/docs/gnuplot-fr.doc -+++ gnuplot-5.0.5/docs/gnuplot-fr.doc 2016-12-15 12:41:21.712652296 +0000 +--- gnuplot-5.0.7/docs/gnuplot-fr.doc ++++ gnuplot-5.0.7/docs/gnuplot-fr.doc 2017-08-16 07:03:41.655815809 +0000 @@ -436,8 +436,8 @@ C #Home & same as \verb~^A~. \\ #Ctrl Home & same as \verb~^E~. \\ @@ -77,8 +77,8 @@ %c l . %Touche fléchée@Fonction %_ ---- gnuplot-5.0.5/src/gadgets.h -+++ gnuplot-5.0.5/src/gadgets.h 2016-12-15 12:41:21.712652296 +0000 +--- gnuplot-5.0.7/src/gadgets.h ++++ gnuplot-5.0.7/src/gadgets.h 2017-08-16 07:03:41.655815809 +0000 @@ -482,7 +482,7 @@ extern TBOOLEAN clip_lines1; extern TBOOLEAN clip_lines2; extern TBOOLEAN clip_points; @@ -88,9 +88,9 @@ extern int samples_1; extern int samples_2; ---- gnuplot-5.0.5/src/gplt_x11.c -+++ gnuplot-5.0.5/src/gplt_x11.c 2016-12-15 12:41:21.716652216 +0000 -@@ -2524,9 +2524,12 @@ exec_cmd(plot_struct *plot, char *comman +--- gnuplot-5.0.7/src/gplt_x11.c ++++ gnuplot-5.0.7/src/gplt_x11.c 2017-08-16 07:03:41.655815809 +0000 +@@ -2525,9 +2525,12 @@ exec_cmd(plot_struct *plot, char *comman } } /* X11_justify_text(mode) - set text justification mode */ @@ -106,9 +106,9 @@ else if (*buffer == 'A') sscanf(buffer + 1, "%lf", &plot->angle); ---- gnuplot-5.0.5/src/plot.c -+++ gnuplot-5.0.5/src/plot.c 2016-12-15 12:41:21.716652216 +0000 -@@ -216,6 +216,7 @@ static int asked_privi = 0; +--- gnuplot-5.0.7/src/plot.c ++++ gnuplot-5.0.7/src/plot.c 2017-08-16 07:03:41.655815809 +0000 +@@ -218,6 +218,7 @@ static int asked_privi = 0; void drop_privilege() { @@ -116,7 +116,7 @@ if (!asked_privi) { euid = geteuid(); egid = getegid(); -@@ -229,11 +230,13 @@ drop_privilege() +@@ -231,11 +232,13 @@ drop_privilege() if (seteuid(ruid) == -1) (void) fprintf(stderr, "seteuid(%d): %s\n", (int) ruid, strerror(errno)); @@ -130,7 +130,7 @@ if (!asked_privi) { euid = geteuid(); egid = getegid(); -@@ -247,6 +250,7 @@ take_privilege() +@@ -249,6 +252,7 @@ take_privilege() if (seteuid(euid) == -1) (void) fprintf(stderr, "seteuid(%d): %s\n", (int) euid, strerror(errno)); @@ -138,7 +138,7 @@ } #endif /* LINUXVGA */ -@@ -273,8 +277,8 @@ main(int argc, char **argv) +@@ -275,8 +279,8 @@ main(int argc, char **argv) int i; #ifdef LINUXVGA @@ -148,7 +148,7 @@ #endif /* make sure that we really have revoked root access, this might happen if gnuplot is compiled without vga support but is installed suid by mistake */ -@@ -329,6 +333,22 @@ main(int argc, char **argv) +@@ -334,6 +338,22 @@ main(int argc, char **argv) rl_getc_function = getc_wrapper; #endif @@ -171,8 +171,8 @@ #if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDITLINE) /* T.Walter 1999-06-24: 'rl_readline_name' must be this fix name. * It is used to parse a 'gnuplot' specific section in '~/.inputrc' ---- gnuplot-5.0.5/src/term.h -+++ gnuplot-5.0.5/src/term.h 2016-12-15 12:41:21.716652216 +0000 +--- gnuplot-5.0.7/src/term.h ++++ gnuplot-5.0.7/src/term.h 2017-08-16 07:03:41.655815809 +0000 @@ -265,9 +265,9 @@ #include "emf.trm" @@ -194,8 +194,8 @@ /* Frame Maker MIF 3.00 format driver */ #ifdef HAVE_MIF ---- gnuplot-5.0.5/term/linux.trm -+++ gnuplot-5.0.5/term/linux.trm 2016-12-15 12:41:21.716652216 +0000 +--- gnuplot-5.0.7/term/linux.trm ++++ gnuplot-5.0.7/term/linux.trm 2017-08-16 07:03:41.655815809 +0000 @@ -195,7 +195,7 @@ TERM_PUBLIC void LINUX_linetype __PROTO( TERM_PUBLIC void LINUX_move __PROTO((unsigned int x, unsigned int y)); TERM_PUBLIC void LINUX_vector __PROTO((unsigned int x, unsigned int y)); diff --git a/gnuplot-5.0.6.tar.gz b/gnuplot-5.0.6.tar.gz deleted file mode 100644 index 63e7943..0000000 --- a/gnuplot-5.0.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5bbe4713e555c2e103b7d4ffd45fca69551fff09cf5c3f9cb17428aaacc9b460 -size 5093897 diff --git a/gnuplot-5.0.7.tar.gz b/gnuplot-5.0.7.tar.gz new file mode 100644 index 0000000..b980343 --- /dev/null +++ b/gnuplot-5.0.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ad760ff013b4a9cf29853fa9b50c50030a33cd8fb86220a23abb466655136fc +size 5100186 diff --git a/gnuplot.changes b/gnuplot.changes index 8980b09..55678d9 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Wed Aug 16 07:09:12 UTC 2017 - werner@suse.de + +- Update to 5.0.7 (which does also close CVE-2017-9670 (bsc#1044638)) + * NEW set term {pngcairo|pdfcairo} pointscale + * NEW "save fit" back-ported from version 5.2 as a replacement for "update" + * NEW user-defined dashtypes in metapost terminal + * CHANGE deprecate "update" command (but do not remove it) + * CHANGE allow placement of circles in 3D plots using axis coordinates + * CHANGE ignore invalid z coordinate for 3D objects placed in "set view map" + * CHANGE distinguish 'bind "shift-Button1"' from 'bind "Button1"' + * CHANGE use Mingw-w64 and MSVC popen rather than built-in "fake" popen + * CHANGE allow range to include sampling interval in plots using pseudofile '+' + * FIX rangelimited y2 axis could produce spurious diagonal line across plot + * FIX assignment of x/y dimensions in "binary record=(a,b) ... with image" + * FIX negative array index caused by hidden3d degenerate polygon + * FIX object clipping in "set view map" + * FIX cairo terminals: scale textbox border linewidth by terminal linewidth + * FIX canvas terminal: initialization of plot dimensions (affects first zoom) + * FIX crash in stats if no usable data is found + * FIX do not use LaTeX formatting in tabular output + * FIX sanity check to catch "plot '+' binary" + * FIX sanity check for NULL format passed to gprintf + * FIX sanity check for empty image data structure on input + * FIX more consistent handling of plot 'with table' + * FIX incorrect, possibly empty, command string was saved for previous fit + * FIX 2D images with logscale axes could fail (segfault) + * FIX nested iteration containing an empty range + * FIX allow 64-bit Cygwin build using gtk3 for wxt terminal + ------------------------------------------------------------------- Wed May 10 08:53:16 UTC 2017 - nico.kruber@gmail.com @@ -20,7 +50,6 @@ Wed May 10 08:53:16 UTC 2017 - nico.kruber@gmail.com qt, wxt * CHANGE - spline segments outside xrange are ignored rather than treated as errors - * FIX assignment of x/y dimensions in "binary record=(a,b) ... with image" * FIX wxt - multithreaded wxt was faulting during resize (mutex lock failure) * FIX windows - timed pause only worked for intervals < 1 second * FIX Front/back layering of border+grid lines was not always correct in diff --git a/gnuplot.spec b/gnuplot.spec index 6b7dd29..1cac2d5 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -83,7 +83,7 @@ BuildRequires: wxWidgets-devel >= 3 BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel Url: http://www.gnuplot.info/ -Version: 5.0.6 +Version: 5.0.7 Release: 0 Summary: Function Plotting Utility and more License: SUSE-Gnuplot and GPL-2.0+