[gnuplot] 04/05: Refresh patches

Anton Gladky gladk at moszumanska.debian.org
Wed Nov 8 20:08:15 UTC 2017 

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository gnuplot.

commit 133babdca426da4666a147a9a6733f7832d63378
Author: Anton Gladky <gladk at debian.org>
Date:   Wed Nov 8 21:00:40 2017 +0100

    Refresh patches
---
 debian/patches/04_fix_libexecdir.diff            |  6 ++---
 debian/patches/07_doc.patch                      |  6 ++---
 debian/patches/08_disable_demo_plugin.patch      | 28 ++++++++++++------------
 debian/patches/09_remove_beos.patch              | 16 +++++++-------
 debian/patches/10_removepicins.patch             | 12 +++++-----
 debian/patches/11_fix_linkage_wx.patch           |  8 +++----
 debian/patches/13_honour_SOURCE_DATE_EPOCH.patch |  6 ++---
 debian/patches/20_CVE-2017-9670.patch            | 20 -----------------
 debian/patches/series                            |  1 -
 9 files changed, 41 insertions(+), 62 deletions(-)

diff --git a/debian/patches/04_fix_libexecdir.diff b/debian/patches/04_fix_libexecdir.diff
index c458186..c6ba6a1 100644
--- a/debian/patches/04_fix_libexecdir.diff
+++ b/debian/patches/04_fix_libexecdir.diff
@@ -2,10 +2,10 @@ Description: fix libexecdir
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-16
 
-Index: gnuplot-5.2.0/src/Makefile.am
+Index: gnuplot-5.2.2/src/Makefile.am
 ===================================================================
---- gnuplot-5.2.0.orig/src/Makefile.am
-+++ gnuplot-5.2.0/src/Makefile.am
+--- gnuplot-5.2.2.orig/src/Makefile.am
++++ gnuplot-5.2.2/src/Makefile.am
 @@ -2,7 +2,7 @@
  AUTOMAKE_OPTIONS = foreign subdir-objects
  
diff --git a/debian/patches/07_doc.patch b/debian/patches/07_doc.patch
index 93feb7f..2fedb5a 100644
--- a/debian/patches/07_doc.patch
+++ b/debian/patches/07_doc.patch
@@ -2,10 +2,10 @@ Description: Fix path in documentation generation
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-16
 
-Index: gnuplot-5.2.0/docs/Makefile.am
+Index: gnuplot-5.2.2/docs/Makefile.am
 ===================================================================
---- gnuplot-5.2.0.orig/docs/Makefile.am
-+++ gnuplot-5.2.0/docs/Makefile.am
+--- gnuplot-5.2.2.orig/docs/Makefile.am
++++ gnuplot-5.2.2/docs/Makefile.am
 @@ -322,7 +322,7 @@ ${ELCS}: gnuplot-eldoc.el
  # that only appears to work with a non-generated texi file for input.
  
diff --git a/debian/patches/08_disable_demo_plugin.patch b/debian/patches/08_disable_demo_plugin.patch
index 4c6889c..91d2e45 100644
--- a/debian/patches/08_disable_demo_plugin.patch
+++ b/debian/patches/08_disable_demo_plugin.patch
@@ -5,11 +5,11 @@ Description: temporarly disable demo plugin
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-16
 
-Index: gnuplot-5.2.0/demo/Makefile.in
+Index: gnuplot-5.2.2/demo/Makefile.in
 ===================================================================
---- gnuplot-5.2.0.orig/demo/Makefile.in
-+++ gnuplot-5.2.0/demo/Makefile.in
-@@ -327,7 +327,6 @@ epslatex.ps epslatex.tex random.tmp stri
+--- gnuplot-5.2.2.orig/demo/Makefile.in
++++ gnuplot-5.2.2/demo/Makefile.in
+@@ -337,7 +337,6 @@ epslatex.ps epslatex.tex random.tmp stri
  
  BINARY_FILES = binary1 binary2 binary3
  SUBDIRS = $(PLUGIN_DIR)
@@ -17,18 +17,18 @@ Index: gnuplot-5.2.0/demo/Makefile.in
  DEMO = all.dem
  GNUPLOT = gnuplot
  EXTRA_DIST = Makefile.am.in lena-keypoints.bin scatter2.bin sine.bin \
-@@ -372,7 +371,6 @@ reflect.fnc gen-random.inc stat.inc GM1_
- blutux.rgb lena.rgb sound.par sound2.par start.par gnuplot.rot gnu-valley \
- random-points gpdemos.tcl html 
+@@ -382,7 +381,6 @@ hexa.fnc line.fnc reflect.fnc gen-random
+ bldg.png GM1_bonds.r3d blutux.rgb lena.rgb sound.par sound2.par start.par \
+ gnuplot.rot gnu-valley random-points gpdemos.tcl html 
  
 - at BUILD_PLUGIN_TRUE@PLUGIN_DIR = plugin
  all: all-recursive
  
  .SUFFIXES:
-Index: gnuplot-5.2.0/demo/Makefile.am
+Index: gnuplot-5.2.2/demo/Makefile.am
 ===================================================================
---- gnuplot-5.2.0.orig/demo/Makefile.am
-+++ gnuplot-5.2.0/demo/Makefile.am
+--- gnuplot-5.2.2.orig/demo/Makefile.am
++++ gnuplot-5.2.2/demo/Makefile.am
 @@ -9,7 +9,6 @@ epslatex.ps epslatex.tex random.tmp stri
  BINARY_FILES = binary1 binary2 binary3
  
@@ -37,17 +37,17 @@ Index: gnuplot-5.2.0/demo/Makefile.am
  
  DEMO = all.dem
  
-@@ -124,6 +123,3 @@ Makefile.am: Makefile.am.in
+@@ -126,6 +125,3 @@ Makefile.am: Makefile.am.in
  	chmod og-w $@t
  	mv $@t $@
  
 -if BUILD_PLUGIN
 -PLUGIN_DIR = plugin
 -endif
-Index: gnuplot-5.2.0/demo/Makefile.am.in
+Index: gnuplot-5.2.2/demo/Makefile.am.in
 ===================================================================
---- gnuplot-5.2.0.orig/demo/Makefile.am.in
-+++ gnuplot-5.2.0/demo/Makefile.am.in
+--- gnuplot-5.2.2.orig/demo/Makefile.am.in
++++ gnuplot-5.2.2/demo/Makefile.am.in
 @@ -9,7 +9,6 @@ epslatex.ps epslatex.tex random.tmp stri
  BINARY_FILES = binary1 binary2 binary3
  
diff --git a/debian/patches/09_remove_beos.patch b/debian/patches/09_remove_beos.patch
index 1043ea8..23fd3b4 100644
--- a/debian/patches/09_remove_beos.patch
+++ b/debian/patches/09_remove_beos.patch
@@ -2,10 +2,10 @@ Description: remove beos-specific code
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-16
 
-Index: gnuplot-5.2.0/src/Makefile.am
+Index: gnuplot-5.2.2/src/Makefile.am
 ===================================================================
---- gnuplot-5.2.0.orig/src/Makefile.am
-+++ gnuplot-5.2.0/src/Makefile.am
+--- gnuplot-5.2.2.orig/src/Makefile.am
++++ gnuplot-5.2.2/src/Makefile.am
 @@ -75,11 +75,7 @@ getcolor_x11.o: getcolor.c
  bf_test_SOURCES = bf_test.c
  bf_test_LIBS = -lm
@@ -19,10 +19,10 @@ Index: gnuplot-5.2.0/src/Makefile.am
  
  EXTRA_gnuplot_SOURCES = strftime.c vms.c
  
-Index: gnuplot-5.2.0/configure.ac
+Index: gnuplot-5.2.2/configure.ac
 ===================================================================
---- gnuplot-5.2.0.orig/configure.ac
-+++ gnuplot-5.2.0/configure.ac
+--- gnuplot-5.2.2.orig/configure.ac
++++ gnuplot-5.2.2/configure.ac
 @@ -194,7 +194,6 @@ GP_MSDOS
  GP_APPLE
  GP_BEOS
@@ -31,7 +31,7 @@ Index: gnuplot-5.2.0/configure.ac
  
  dnl _instead_ of -lm ...
  AC_CHECK_FUNC(sin,,[AC_CHECK_LIB(m,sin)])
-@@ -1251,7 +1250,6 @@ AC_CONFIG_FILES([Makefile
+@@ -1253,7 +1252,6 @@ AC_CONFIG_FILES([Makefile
             share/Makefile
             share/LaTeX/Makefile
             src/Makefile
@@ -39,7 +39,7 @@ Index: gnuplot-5.2.0/configure.ac
             src/wxterminal/Makefile
             src/qtterminal/Makefile
             term/Makefile
-@@ -1352,10 +1350,6 @@ if test "$is_msdos" = yes; then
+@@ -1354,10 +1352,6 @@ if test "$is_msdos" = yes; then
    AC_MSG_RESULT([  svga terminal (MSDOS/djgpp): yes])
  fi
  
diff --git a/debian/patches/10_removepicins.patch b/debian/patches/10_removepicins.patch
index 3113c85..9f95245 100644
--- a/debian/patches/10_removepicins.patch
+++ b/debian/patches/10_removepicins.patch
@@ -2,10 +2,10 @@ Description: removes picins latex include
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-16
 
-Index: gnuplot-5.2.0/docs/Makefile.am
+Index: gnuplot-5.2.2/docs/Makefile.am
 ===================================================================
---- gnuplot-5.2.0.orig/docs/Makefile.am
-+++ gnuplot-5.2.0/docs/Makefile.am
+--- gnuplot-5.2.2.orig/docs/Makefile.am
++++ gnuplot-5.2.2/docs/Makefile.am
 @@ -187,7 +187,6 @@ gnuplot.pdf: figures.tex pdf_figures $(s
  	  touch figures.idx ; \
  	  rm -f pdffigures.tex ; \
@@ -14,10 +14,10 @@ Index: gnuplot-5.2.0/docs/Makefile.am
  	  ) ; \
  	  TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
  	  TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
-Index: gnuplot-5.2.0/docs/doc2tex.c
+Index: gnuplot-5.2.2/docs/doc2tex.c
 ===================================================================
---- gnuplot-5.2.0.orig/docs/doc2tex.c
-+++ gnuplot-5.2.0/docs/doc2tex.c
+--- gnuplot-5.2.2.orig/docs/doc2tex.c
++++ gnuplot-5.2.2/docs/doc2tex.c
 @@ -168,12 +168,6 @@ process_line( char *line, FILE *b)
  	    break;
  
diff --git a/debian/patches/11_fix_linkage_wx.patch b/debian/patches/11_fix_linkage_wx.patch
index 9013dd2..ae3aaeb 100644
--- a/debian/patches/11_fix_linkage_wx.patch
+++ b/debian/patches/11_fix_linkage_wx.patch
@@ -2,11 +2,11 @@ Description: Add missing linkage against X11 libs.
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-16
 
-Index: gnuplot-5.2.0/src/Makefile.am
+Index: gnuplot-5.2.2/src/Makefile.am
 ===================================================================
---- gnuplot-5.2.0.orig/src/Makefile.am
-+++ gnuplot-5.2.0/src/Makefile.am
-@@ -93,6 +93,8 @@ $(EXTRA_gnuplot_SOURCES)
+--- gnuplot-5.2.2.orig/src/Makefile.am
++++ gnuplot-5.2.2/src/Makefile.am
+@@ -89,6 +89,8 @@ $(EXTRA_gnuplot_SOURCES)
  
  if BUILD_WXWIDGETS
  gnuplot_SOURCES += wxterminal/wxt_gui.cpp
diff --git a/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch b/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch
index 1d48873..6ecbe44 100644
--- a/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch
+++ b/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch
@@ -4,10 +4,10 @@ Description: Honour SOURCE_DATE_EPOCH
  See https://reproducible-builds.org/specs/source-date-epoch/
 Author: Alexis Bienvenüe <pado at passoire.fr>
 
-Index: gnuplot-5.2.0/term/post.trm
+Index: gnuplot-5.2.2/term/post.trm
 ===================================================================
---- gnuplot-5.2.0.orig/term/post.trm
-+++ gnuplot-5.2.0/term/post.trm
+--- gnuplot-5.2.2.orig/term/post.trm
++++ gnuplot-5.2.2/term/post.trm
 @@ -1651,15 +1651,45 @@ end\n\
      int i;
      time_t now;
diff --git a/debian/patches/20_CVE-2017-9670.patch b/debian/patches/20_CVE-2017-9670.patch
deleted file mode 100644
index 6ed3b48..0000000
--- a/debian/patches/20_CVE-2017-9670.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix memory corruption vulnerability. CVE-2017-9670
-Author: Ethan Merritt
-Bug-Debian: https://bugs.debian.org/864901
-Origin: https://sourceforge.net/p/gnuplot/bugs/_discuss/thread/44ec637c/af0f/attachment/uninitialized_variables_%28Bug1933%29.patch
-Bug: https://sourceforge.net/p/gnuplot/bugs/1933/
-Reviewed-By: Anton Gladky <gladk at debian.org>
-Last-Update: 2017-06-16
-
-Index: gnuplot-5.0.7/src/set.c
-===================================================================
---- gnuplot-5.0.7.orig/src/set.c
-+++ gnuplot-5.0.7/src/set.c
-@@ -5971,6 +5971,7 @@ load_tic_series(AXIS_INDEX axis)
- 
-     if (!equals(c_token, ",")) {
- 	/* only step specified */
-+	incr_token = c_token;
- 	incr = start;
- 	start = -VERYLARGE;
- 	end = VERYLARGE;
diff --git a/debian/patches/series b/debian/patches/series
index 455280a..9ca8baf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
 10_removepicins.patch
 11_fix_linkage_wx.patch
 13_honour_SOURCE_DATE_EPOCH.patch
-#20_CVE-2017-9670.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gnuplot.git

More information about the debian-science-commits mailing list