From e3a121fd33d73742e03b417a5a78de2d673259b69a6a4eea5548610d0f55d3aa Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 15 Jul 2013 12:28:47 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Publishing/plotutils?expand=0&rev=17 --- plotutils-hershey_glyphs.patch | 24 ++++++++++++++++++++++++ plotutils-man-spline.patch | 14 ++++++++++++++ plotutils-postscript.patch | 14 ++++++++++++++ plotutils.changes | 12 ++++++++++++ plotutils.spec | 22 ++++++++++++++++------ 5 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 plotutils-hershey_glyphs.patch create mode 100644 plotutils-man-spline.patch create mode 100644 plotutils-postscript.patch diff --git a/plotutils-hershey_glyphs.patch b/plotutils-hershey_glyphs.patch new file mode 100644 index 0000000..abaf99d --- /dev/null +++ b/plotutils-hershey_glyphs.patch @@ -0,0 +1,24 @@ +| +| Description: Arithmetic overflow in Hershey pointing hands glyphs +| The glyphs 4040 and 4043 (large pointing hands) in +| _pl_g_occidental_hershey_glyphs[] in libplot/a_her_glyph.c are +| incorrect. There is an arithmetic overflow. +| . +| They where corrected by mirroing glyphs 4041 and 4042. +| Origin: http://lists.gnu.org/archive/html/bug-plotutils/2010-11/msg00000.html +| Author: Roland Münzberg +| +--- libplot/g_her_glyph.c ++++ libplot/g_her_glyph.c 2013-07-15 12:10:50.725440182 +0000 +@@ -279,7 +279,10 @@ const char * const _pl_g_occidental_hers + as part of his PLOT79 utility */ + + /* large pointing hands [4040--4043] */ +- " \204.l'm*n.l/i/a-c*[+L-G.H0H-E)K(\\*f-k.l RKgMiPiRh RR[TWNW R\\MaTaZ]` Refdead]e\\i`lckefddabT]NWOUYL\\MeKmKpJxJ}H\200D\177B RvBvDzE\177C\177BvBmCVCQB8D,J+L+[/a7eIgOgRhVi`l", " \2048v7}6z8v;uCuAwIzXy]w\\v\\t_wY{H|>z9w8v R=Y;W;T??@@C?G;H8D9A>?@@BCGPMVOUXKWHY?Y7Z4Z,\\'`$b% Rb.`._*a%b%b.a7aNbS`lZxXyIyCu?m=[=Ue9c8`;\\?]@a?d>e RD]JaPaW\\ RIRMTMN R=K;M;P*9-8.", ++ /* 4040 */ " \204dfce`d\\e[i_lbkdfcd`bS]MWNUXL[MdKlKoJwJ|H^?D~B RuBuDyE~C~BuBlCUCPB7D+J*L*[.a6eHgNgQhUi_l R\\``Z`T[M RQ[SWMW RJgLiOiQh R-l&m)n-l.i.a,c)[*L,G-H/H,E(K'\\)f,k-l", ++ /* 4041 */ " \2048v7}6z8v;uCuAwIzXy]w\\v\\t_wY{H|>z9w8v R=Y;W;T??@@C?G;H8D9A>?@@BCGPMVOUXKWHY?Y7Z4Z,\\'`$b% Rb.`._*a%b%b.a7aNbS`lZxXyIyCu?m=[=U)9,8- R=J;L;Od?c@`?\\;[8_9b>d@cB`GSMMONXXW[YdYlZoZw\\|`^?b~ Rbu`u_ya~b~bualaUbP`7Z+X*I*C.?6=H=N), used in Hershey Symbol fonts */ diff --git a/plotutils-man-spline.patch b/plotutils-man-spline.patch new file mode 100644 index 0000000..fcc5a6b --- /dev/null +++ b/plotutils-man-spline.patch @@ -0,0 +1,14 @@ +| +| There is no --number-of-intervals but --no-of-intervals option +| +--- info/spline.1 ++++ info/spline.1 2013-07-15 12:06:38.393439397 +0000 +@@ -107,7 +107,7 @@ The \fB\-k\fP option may not be used if + .br + .ns + .TP +-.BI \-\-number\-of\-intervals " n" ++.BI \-\-no\-of\-intervals " n" + Subdivide the interval over which interpolation occurs into \fIn\fP\^ + subintervals. + The number of data points computed, and written to the diff --git a/plotutils-postscript.patch b/plotutils-postscript.patch new file mode 100644 index 0000000..98710cf --- /dev/null +++ b/plotutils-postscript.patch @@ -0,0 +1,14 @@ +| +| Avoid broken postscript due not initialized variable +| +--- graph/plotter.c ++++ graph/plotter.c 2013-07-15 12:01:45.577438754 +0000 +@@ -1011,7 +1011,7 @@ set_graph_parameters (Multigrapher *mult + multigrapher->x_trans.output_min = 0.0; + multigrapher->x_trans.output_max = (double)PLOT_SIZE; + multigrapher->x_trans.output_range = multigrapher->x_trans.output_max - multigrapher->x_trans.output_min; +- multigrapher->x_trans.output_min = 0.0; ++ multigrapher->y_trans.output_min = 0.0; + multigrapher->y_trans.output_max = (double)PLOT_SIZE; + multigrapher->y_trans.output_range = multigrapher->y_trans.output_max - multigrapher->y_trans.output_min; + diff --git a/plotutils.changes b/plotutils.changes index a6710cc..c5a8e91 100644 --- a/plotutils.changes +++ b/plotutils.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Jul 15 12:24:40 UTC 2013 - werner@suse.de + +- Do not remove lex/yacc code as current bison generate broken + code (fix for bnc#829479, depends on bnc#829497) +- Add plotutils-hershey_glyphs.patch to avoid arithmetic overflow + in Hershey pointing hands glyphs +- Add plotutils-man-spline.patch as there is no --number-of-intervals + but --no-of-intervals option +- Add plotutils-postscript.patch to avoid broken postscript due not + initialized variable + ------------------------------------------------------------------- Mon Apr 15 10:09:03 UTC 2013 - idonmez@suse.com diff --git a/plotutils.spec b/plotutils.spec index 05cd914..9d68bd3 100644 --- a/plotutils.spec +++ b/plotutils.spec @@ -32,6 +32,12 @@ Patch2: plotutils-dasharray-format.patch Patch3: plotutils-autoreconf.patch # libpng15.patch sent 2012-08-30 at rsm@math.arizona.edu Patch4: plotutils-libpng15.patch +# PATCH-FIX-UPSTREAM Arithmetic overflow in Hershey pointing hands glyphs +Patch5: plotutils-hershey_glyphs.patch +# PATCH-FIX-UPSTREAM --no-of-intervals arugment is documented wrongly originall +Patch6: plotutils-man-spline.patch +# PATCH-FIX-UPSTREAM repairs postscript output +Patch7: plotutils-postscript.patch BuildRequires: bison BuildRequires: flex BuildRequires: fontpackages-devel @@ -117,13 +123,17 @@ graphics animations under the X Window System. %prep %{?gpg_verify: %gpg_verify %{S:1}} %setup -q -%patch0 -%patch1 -%patch2 -%patch3 +%patch0 -p0 +%patch1 -p0 +%patch2 -p0 +%patch3 -p0 %patch4 -p1 -# Force update lex and bison code: -grep -rslE '(made by GNU Bison|A Bison parser, made from|"lex.yy.c")' . | xargs -r rm -f +%patch5 -p0 +%patch6 -p0 +%patch7 -p0 +# Avoid update lex and bison code as otherwise we may see broken code (bnc#829479) +# that is do *not* remove any lex\yacc code +grep -rslE '(made by GNU Bison|A Bison parser, made from|"lex.yy.c")' . | xargs -r touch %build autoreconf -f -i