[arch-commits] Commit in graphviz/trunk (4 files)
Gaetan Bisson
bisson at nymeria.archlinux.org
Tue Feb 4 10:17:51 UTC 2014
Date: Tuesday, February 4, 2014 @ 11:17:51
Author: bisson
Revision: 205064
upstream update, implement FS#38772
Modified:
graphviz/trunk/PKGBUILD
Deleted:
graphviz/trunk/dotty.patch
graphviz/trunk/yyerror0.patch
graphviz/trunk/yyerror1.patch
----------------+
PKGBUILD | 30 ++++++++----------------------
dotty.patch | 21 ---------------------
yyerror0.patch | 53 -----------------------------------------------------
yyerror1.patch | 26 --------------------------
4 files changed, 8 insertions(+), 122 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-02-04 00:48:48 UTC (rev 205063)
+++ PKGBUILD 2014-02-04 10:17:51 UTC (rev 205064)
@@ -4,14 +4,14 @@
# Contributor: John Proctor <jproctor at prium.net>
pkgname=graphviz
-pkgver=2.34.0
-pkgrel=3
+pkgver=2.36.0
+pkgrel=1
pkgdesc='Graph visualization software'
url='http://www.graphviz.org/'
license=('CPL')
arch=('i686' 'x86_64')
depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts')
-makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'tk' 'qt4')
+makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'tk' 'qt4' 'gtk2')
optdepends=('mono: sharp bindings'
'guile: guile bindings'
'lua51: lua bindings'
@@ -21,30 +21,16 @@
'python2: python bindings'
'r: r bindings'
'tcl: tcl bindings'
- 'qt4: gvedit')
-source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz"
- 'yyerror0.patch'
- 'yyerror1.patch'
- 'dotty.patch')
-sha1sums=('5a0c00bebe7f4c7a04523db21f40966dc9f0d441'
- '7a6fe4f532974d9ca173b1aba9927bdeb5f80be9'
- '6d76a230ee6c11bcd610ebe56f98e96ecef6217d'
- '31bc9f505c8b6470289a0d6ec31c237765cba239')
+ 'qt4: gvedit'
+ 'gtk2: gtk output plugin')
+source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('a41e9f1cbcc9a24651e14dd15a4cda3d912d7d19')
install=install
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../yyerror0.patch
- patch -p1 -i ../yyerror1.patch
- patch -p1 -i ../dotty.patch
- sed \
- -e '/LIBPOSTFIX="64"/d' \
- -i configure
-}
-
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ export LIBPOSTFIX=/
export PYTHON=python2
export LUA=lua5.1
Deleted: dotty.patch
===================================================================
--- dotty.patch 2014-02-04 00:48:48 UTC (rev 205063)
+++ dotty.patch 2014-02-04 10:17:51 UTC (rev 205064)
@@ -1,21 +0,0 @@
-diff -Naur old/cmd/dotty/dotty_layout.lefty new/cmd/dotty/dotty_layout.lefty
---- old/cmd/dotty/dotty_layout.lefty 2013-09-06 15:07:52.000000000 -1000
-+++ new/cmd/dotty/dotty_layout.lefty 2013-10-22 15:23:50.153028328 -1000
-@@ -5,7 +5,7 @@
- local fd;
-
- if (~dotty.lservers[lserver] | tablesize (dotty.lservers[lserver]) == 0) {
-- if (~((fd = openio ('pipe', lserver, 'r+', '%e -Txdot')) >= 0)) {
-+ if (~((fd = openio ('pipe', lserver, 'r+', '%e -Txdot1.2')) >= 0)) {
- dotty.message (0, concat ('cannot start ', lserver));
- return null;
- }
-@@ -438,6 +438,8 @@
- }
- } else if (t[i] == 'I') {
- i = i + 7;
-+ } else if (t[i] == 't') {
-+ i = i + 2;
- } else {
- dotty.message (0, concat ('draw language parser error: ', t[i]));
- return null;
Deleted: yyerror0.patch
===================================================================
--- yyerror0.patch 2014-02-04 00:48:48 UTC (rev 205063)
+++ yyerror0.patch 2014-02-04 10:17:51 UTC (rev 205064)
@@ -1,53 +0,0 @@
-From 7aaddf52cd98589fb0c3ab72a393f8411838438a Mon Sep 17 00:00:00 2001
-From: "Emden R. Gansner" <erg at alum.mit.edu>
-Date: Fri, 4 Oct 2013 09:06:39 -0400
-Subject: [PATCH] Fix buffer overflow problem when reporting a syntax error
- with a very long input line
-
----
- lib/cgraph/scan.l | 21 +++++++++++++++------
- 1 file changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/lib/cgraph/scan.l b/lib/cgraph/scan.l
-index 3cfde0f..2efd203 100644
---- a/lib/cgraph/scan.l
-+++ b/lib/cgraph/scan.l
-@@ -16,6 +16,7 @@
- %{
- #include <grammar.h>
- #include <cghdr.h>
-+#include <agxbuf.h>
- #include <ctype.h>
- #define GRAPH_EOF_TOKEN '@' /* lex class must be defined below */
- /* this is a workaround for linux flex */
-@@ -191,13 +192,21 @@ ID ({NAME}|{NUMBER})
- %%
- void yyerror(char *str)
- {
-+ unsigned char xbuf[BUFSIZ];
- char buf[BUFSIZ];
-- if (InputFile)
-- sprintf(buf,"%s:%d: %s in line %d near '%s'\n",InputFile, line_num,
-- str,line_num,yytext);
-- else
-- sprintf(buf," %s in line %d near '%s'\n", str,line_num,yytext);
-- agerr(AGWARN,buf);
-+ agxbuf xb;
-+
-+ agxbinit(&xb, BUFSIZ, xbuf);
-+ if (InputFile) {
-+ agxbput (&xb, InputFile);
-+ agxbput (&xb, ": ");
-+ }
-+ sprintf(buf," %s in line %d near '", str,line_num);
-+ agxbput (&xb, buf);
-+ agxbput (&xb, yytext);
-+ agxbput (&xb,"'\n");
-+ agerr(AGWARN,agxbuse(&xb));
-+ agxbfree(&xb);
- }
- /* must be here to see flex's macro defns */
- void aglexeof() { unput(GRAPH_EOF_TOKEN); }
---
-1.8.5.1
-
Deleted: yyerror1.patch
===================================================================
--- yyerror1.patch 2014-02-04 00:48:48 UTC (rev 205063)
+++ yyerror1.patch 2014-02-04 10:17:51 UTC (rev 205064)
@@ -1,26 +0,0 @@
-From d266bb2b4154d11c27252b56d86963aef4434750 Mon Sep 17 00:00:00 2001
-From: "Emden R. Gansner" <erg at alum.mit.edu>
-Date: Tue, 7 Jan 2014 10:45:36 -0500
-Subject: [PATCH] Prevent possible buffer overflow in yyerror()
-
----
- lib/cgraph/scan.l | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/cgraph/scan.l b/lib/cgraph/scan.l
-index 3efe1d5..212967c 100644
---- a/lib/cgraph/scan.l
-+++ b/lib/cgraph/scan.l
-@@ -201,7 +201,8 @@ void yyerror(char *str)
- agxbput (&xb, InputFile);
- agxbput (&xb, ": ");
- }
-- sprintf(buf," %s in line %d near '", str,line_num);
-+ agxbput (&xb, str);
-+ sprintf(buf," in line %d near '", line_num);
- agxbput (&xb, buf);
- agxbput (&xb, yytext);
- agxbput (&xb,"'\n");
---
-1.8.5.1
-
More information about the arch-commits
mailing list