[gnuplot] 02/04: Refresh patches
Anton Gladky
gladk at moszumanska.debian.org
Tue Aug 22 20:26: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 58ba113a75db1b6f3863e027220281562383fc64
Author: Anton Gladky <gladk at debian.org>
Date: Tue Aug 22 22:22:39 2017 +0200
Refresh patches
---
debian/patches/04_fix_libexecdir.diff | 6 ++--
debian/patches/07_doc.patch | 6 ++--
debian/patches/08_disable_demo_plugin.patch | 22 ++++++-------
debian/patches/09_remove_beos.patch | 16 +++++-----
debian/patches/10_removepicins.patch | 12 ++++----
debian/patches/11_fix_linkage_wx.patch | 6 ++--
debian/patches/13_honour_SOURCE_DATE_EPOCH.patch | 8 ++---
debian/patches/14_strip_username_from_output.patch | 36 ----------------------
debian/patches/20_CVE-2017-9670.patch | 8 +++--
debian/patches/series | 1 -
10 files changed, 43 insertions(+), 78 deletions(-)
diff --git a/debian/patches/04_fix_libexecdir.diff b/debian/patches/04_fix_libexecdir.diff
index 5192b30..8b26e03 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.0.6/src/Makefile.am
+Index: gnuplot-5.0.7/src/Makefile.am
===================================================================
---- gnuplot-5.0.6.orig/src/Makefile.am
-+++ gnuplot-5.0.6/src/Makefile.am
+--- gnuplot-5.0.7.orig/src/Makefile.am
++++ gnuplot-5.0.7/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 a4603f6..dbf9eb9 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.0.6/docs/Makefile.am
+Index: gnuplot-5.0.7/docs/Makefile.am
===================================================================
---- gnuplot-5.0.6.orig/docs/Makefile.am
-+++ gnuplot-5.0.6/docs/Makefile.am
+--- gnuplot-5.0.7.orig/docs/Makefile.am
++++ gnuplot-5.0.7/docs/Makefile.am
@@ -345,7 +345,7 @@ ${ELCS}: gnuplot-eldoc.el
fi
diff --git a/debian/patches/08_disable_demo_plugin.patch b/debian/patches/08_disable_demo_plugin.patch
index cd6f9a9..cf1d77d 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.0.6/demo/Makefile.in
+Index: gnuplot-5.0.7/demo/Makefile.in
===================================================================
---- gnuplot-5.0.6.orig/demo/Makefile.in
-+++ gnuplot-5.0.6/demo/Makefile.in
-@@ -328,7 +328,6 @@ epslatex.ps epslatex.tex random.tmp stri
+--- gnuplot-5.0.7.orig/demo/Makefile.in
++++ gnuplot-5.0.7/demo/Makefile.in
+@@ -329,7 +329,6 @@ epslatex.ps epslatex.tex random.tmp stri
BINARY_FILES = binary1 binary2 binary3
SUBDIRS = $(PLUGIN_DIR)
@@ -17,7 +17,7 @@ Index: gnuplot-5.0.6/demo/Makefile.in
DEMO = all.dem
GNUPLOT = gnuplot
EXTRA_DIST = Makefile.am.in lena-keypoints.bin scatter2.bin sine.bin \
-@@ -367,7 +366,6 @@ hexa.fnc line.fnc reflect.fnc gen-random
+@@ -368,7 +367,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
@@ -25,10 +25,10 @@ Index: gnuplot-5.0.6/demo/Makefile.in
all: all-recursive
.SUFFIXES:
-Index: gnuplot-5.0.6/demo/Makefile.am
+Index: gnuplot-5.0.7/demo/Makefile.am
===================================================================
---- gnuplot-5.0.6.orig/demo/Makefile.am
-+++ gnuplot-5.0.6/demo/Makefile.am
+--- gnuplot-5.0.7.orig/demo/Makefile.am
++++ gnuplot-5.0.7/demo/Makefile.am
@@ -9,7 +9,6 @@ epslatex.ps epslatex.tex random.tmp stri
BINARY_FILES = binary1 binary2 binary3
@@ -44,10 +44,10 @@ Index: gnuplot-5.0.6/demo/Makefile.am
-if BUILD_PLUGIN
-PLUGIN_DIR = plugin
-endif
-Index: gnuplot-5.0.6/demo/Makefile.am.in
+Index: gnuplot-5.0.7/demo/Makefile.am.in
===================================================================
---- gnuplot-5.0.6.orig/demo/Makefile.am.in
-+++ gnuplot-5.0.6/demo/Makefile.am.in
+--- gnuplot-5.0.7.orig/demo/Makefile.am.in
++++ gnuplot-5.0.7/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 04fce01..df34f49 100644
--- a/debian/patches/09_remove_beos.patch
+++ b/debian/patches/09_remove_beos.patch
@@ -2,11 +2,11 @@ Description: remove beos-specific code
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-16
-Index: gnuplot-5.0.6/configure.in
+Index: gnuplot-5.0.7/configure.in
===================================================================
---- gnuplot-5.0.6.orig/configure.in
-+++ gnuplot-5.0.6/configure.in
-@@ -1327,7 +1327,6 @@ AC_OUTPUT([Makefile
+--- gnuplot-5.0.7.orig/configure.in
++++ gnuplot-5.0.7/configure.in
+@@ -1334,7 +1334,6 @@ AC_OUTPUT([Makefile
share/Makefile
share/LaTeX/Makefile
src/Makefile
@@ -14,7 +14,7 @@ Index: gnuplot-5.0.6/configure.in
src/wxterminal/Makefile
src/qtterminal/Makefile
term/Makefile
-@@ -1435,10 +1434,6 @@ if test "$is_msdos" = yes; then
+@@ -1442,10 +1441,6 @@ if test "$is_msdos" = yes; then
AC_MSG_RESULT([ svga terminal (MSDOS/djgpp): yes])
fi
@@ -25,10 +25,10 @@ Index: gnuplot-5.0.6/configure.in
if test "$is_next" = yes; then
AC_MSG_RESULT([ next terminal: yes])
fi
-Index: gnuplot-5.0.6/src/Makefile.am
+Index: gnuplot-5.0.7/src/Makefile.am
===================================================================
---- gnuplot-5.0.6.orig/src/Makefile.am
-+++ gnuplot-5.0.6/src/Makefile.am
+--- gnuplot-5.0.7.orig/src/Makefile.am
++++ gnuplot-5.0.7/src/Makefile.am
@@ -73,11 +73,7 @@ endif
bf_test_SOURCES = bf_test.c
bf_test_LIBS = -lm
diff --git a/debian/patches/10_removepicins.patch b/debian/patches/10_removepicins.patch
index fa31207..6446fcd 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.0.6/docs/Makefile.am
+Index: gnuplot-5.0.7/docs/Makefile.am
===================================================================
---- gnuplot-5.0.6.orig/docs/Makefile.am
-+++ gnuplot-5.0.6/docs/Makefile.am
+--- gnuplot-5.0.7.orig/docs/Makefile.am
++++ gnuplot-5.0.7/docs/Makefile.am
@@ -189,7 +189,6 @@ gnuplot.pdf: figures.tex pdf_figures $(s
touch figures.idx ; \
rm -f pdffigures.tex ; \
@@ -14,10 +14,10 @@ Index: gnuplot-5.0.6/docs/Makefile.am
) ; \
TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
-Index: gnuplot-5.0.6/docs/doc2tex.c
+Index: gnuplot-5.0.7/docs/doc2tex.c
===================================================================
---- gnuplot-5.0.6.orig/docs/doc2tex.c
-+++ gnuplot-5.0.6/docs/doc2tex.c
+--- gnuplot-5.0.7.orig/docs/doc2tex.c
++++ gnuplot-5.0.7/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 7cf4c06..bbbff6a 100644
--- a/debian/patches/11_fix_linkage_wx.patch
+++ b/debian/patches/11_fix_linkage_wx.patch
@@ -2,10 +2,10 @@ Description: Add missing linkage against X11 libs.
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-16
-Index: gnuplot-5.0.6/src/Makefile.am
+Index: gnuplot-5.0.7/src/Makefile.am
===================================================================
---- gnuplot-5.0.6.orig/src/Makefile.am
-+++ gnuplot-5.0.6/src/Makefile.am
+--- gnuplot-5.0.7.orig/src/Makefile.am
++++ gnuplot-5.0.7/src/Makefile.am
@@ -87,6 +87,8 @@ $(EXTRA_gnuplot_SOURCES)
if BUILD_WXWIDGETS
diff --git a/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch b/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch
index 6fb4f1e..e06ab13 100644
--- a/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch
+++ b/debian/patches/13_honour_SOURCE_DATE_EPOCH.patch
@@ -4,11 +4,11 @@ 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.0.6/term/post.trm
+Index: gnuplot-5.0.7/term/post.trm
===================================================================
---- gnuplot-5.0.6.orig/term/post.trm
-+++ gnuplot-5.0.6/term/post.trm
-@@ -1657,15 +1657,45 @@ end\n\
+--- gnuplot-5.0.7.orig/term/post.trm
++++ gnuplot-5.0.7/term/post.trm
+@@ -1656,15 +1656,45 @@ end\n\
int i;
time_t now;
char *timedate;
diff --git a/debian/patches/14_strip_username_from_output.patch b/debian/patches/14_strip_username_from_output.patch
deleted file mode 100644
index efd04be..0000000
--- a/debian/patches/14_strip_username_from_output.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Strip username from output
- Strip username from output to make it reproducible.
-Author: Alexis Bienvenüe <pado at passoire.fr>
-
-Index: gnuplot-5.0.6/term/post.trm
-===================================================================
---- gnuplot-5.0.6.orig/term/post.trm
-+++ gnuplot-5.0.6/term/post.trm
-@@ -1644,7 +1644,6 @@ SDict begin [\n\
- /Title (%s)\n\
- /Subject (gnuplot plot)\n\
- /Creator (gnuplot %s patchlevel %s)\n\
-- /Author (%s)\n\
- %% /Producer (gnuplot)\n\
- %% /Keywords ()\n\
- /CreationDate (%s)\n\
-@@ -1837,18 +1836,11 @@ end\n\
-
- /* HH: print pdf information interpreted by ghostscript/acrobat */
- {
-- char *username=getusername();
-- char *username2=PS_escape_string(username,"()\\");
- char *outstr2=PS_escape_string(outstr,"()\\");
- fprintf(gppsfile, psi3,
- outstr2?outstr2:"",
-- gnuplot_version, gnuplot_patchlevel,
-- username2?username2:"",
-+ gnuplot_version, gnuplot_patchlevel,
- timedate);
-- if (username)
-- free(username);
-- if (username2)
-- free(username2);
- if (outstr2)
- free(outstr2);
- }
diff --git a/debian/patches/20_CVE-2017-9670.patch b/debian/patches/20_CVE-2017-9670.patch
index 482ea7e..6ed3b48 100644
--- a/debian/patches/20_CVE-2017-9670.patch
+++ b/debian/patches/20_CVE-2017-9670.patch
@@ -6,9 +6,11 @@ Bug: https://sourceforge.net/p/gnuplot/bugs/1933/
Reviewed-By: Anton Gladky <gladk at debian.org>
Last-Update: 2017-06-16
---- gnuplot-5.0.5+dfsg1.orig/src/set.c
-+++ gnuplot-5.0.5+dfsg1/src/set.c
-@@ -5926,6 +5926,7 @@ load_tic_series(AXIS_INDEX axis)
+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 */
diff --git a/debian/patches/series b/debian/patches/series
index 3c19808..1341cd8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,5 +5,4 @@
10_removepicins.patch
11_fix_linkage_wx.patch
13_honour_SOURCE_DATE_EPOCH.patch
-14_strip_username_from_output.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