From a0be5be53ebfdf9b7ef8762fbf93b8db939ea6cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 25 Nov 2014 18:27:03 +0100 Subject: [PATCH] Dropped format-string patch, not needed --- graphviz-2.12-format-string.patch | 13 ------------- graphviz.spec | 8 ++++---- 2 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 graphviz-2.12-format-string.patch diff --git a/graphviz-2.12-format-string.patch b/graphviz-2.12-format-string.patch deleted file mode 100644 index afa66b4..0000000 --- a/graphviz-2.12-format-string.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/agraph/scan.l b/lib/agraph/scan.l -index 02eaaab..799ff89 100644 ---- a/lib/agraph/scan.l -+++ b/lib/agraph/scan.l -@@ -179,7 +179,7 @@ void yyerror(char *str) - agxbput (&xb, buf); - agxbput (&xb, yytext); - agxbput (&xb,"'\n"); -- agerror(AGERROR_SYNTAX,agxbuse(&xb)); -+ agerror(AGERROR_SYNTAX, "%s", agxbuse(&xb)); - agxbfree(&xb); - } - /* must be here to see flex's macro defns */ diff --git a/graphviz.spec b/graphviz.spec index f1a929e..ae53826 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -7,7 +7,7 @@ #-- graphviz src.rpm -------------------------------------------------------- Name: graphviz Version: 2.12 -Release: 11%{?dist} +Release: 12%{?dist} License: CPL URL: http://www.graphviz.org/ @@ -18,8 +18,6 @@ Patch1: %{name}-libcdt.patch Patch2: graphviz-2.12-CVE-2014-0978-CVE-2014-1235.patch # Fix chknum overflow (CVE-2014-1236) Patch3: graphviz-2.12-CVE-2014-1236.patch -# Backported from upstream -Patch4: graphviz-2.12-format-string.patch # graphviz is relocatable #Prefix: /usr @@ -416,7 +414,6 @@ Provides some additional PDF and HTML documentation for graphviz. %patch1 -p1 %patch2 -p1 -b .CVE-2014-0978-CVE-2014-1235 %patch3 -p1 -b .CVE-2014-1236 -%patch4 -p1 -b .format-string %build # XXX ix86 only used to have -ffast-math, let's use everywhere @@ -453,6 +450,9 @@ rm -rf $RPM_BUILD_ROOT #-- changelog -------------------------------------------------- %changelog +* Tue Nov 25 2014 Jaroslav Škarvada - 2.12-12 +- Dropped format-string patch, not needed + * Tue Nov 25 2014 Jaroslav Škarvada - 2.12-11 - Fixed format string vulnerability Resolves: rhbz#1167869