aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPelle Bo Regener <pboreg@mek.dtu.dk>2017-05-18 00:42:06 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2017-05-25 11:39:25 +0000
commit3df67afdee29b5b2db415c3d91fc14ef439bb541 (patch)
treeab037d287a9cea38d99c26c0035511eb81adcac4
parentb2be4014b18d95ee58f359f9e1a9a21f8fc9713a (diff)
downloadaports-3df67afdee29b5b2db415c3d91fc14ef439bb541.tar.gz
aports-3df67afdee29b5b2db415c3d91fc14ef439bb541.tar.bz2
aports-3df67afdee29b5b2db415c3d91fc14ef439bb541.tar.xz
main/graphviz: upgrade to 2.40.1
Also remove obsolete patches
-rw-r--r--main/graphviz/APKBUILD33
-rw-r--r--main/graphviz/CVE-2014-9157.patch21
-rw-r--r--main/graphviz/musl-posix-grep.patch22
3 files changed, 5 insertions, 71 deletions
diff --git a/main/graphviz/APKBUILD b/main/graphviz/APKBUILD
index 53b1fc365f..694fbef875 100644
--- a/main/graphviz/APKBUILD
+++ b/main/graphviz/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=graphviz
-pkgver=2.38.0
-pkgrel=6
+pkgver=2.40.1
+pkgrel=0
pkgdesc="Graph Visualization Tools"
url="http://www.graphviz.org/"
arch="all"
@@ -21,25 +21,14 @@ subpackages="$pkgname-dev $pkgname-doc py-gv:py lua-$pkgname:_lua
source="http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-$pkgver.tar.gz
$pkgname.trigger
0001-clone-nameclash.patch
- musl-posix-grep.patch
- CVE-2014-9157.patch
"
builddir="$srcdir"/graphviz-$pkgver
-prepare() {
- default_prepare
-
- cd "$builddir"
- update_config_sub || return 1
-
- # Use /usr/lib instead of /usr/lib64.
- sed -i -e 's/LIBPOSTFIX="64"/LIBPOSTFIX=/' \
- configure || return 1
-}
build() {
cd "$builddir"
+ LIBPOSTFIX=/ \
LUA=lua5.2 \
LUA_CFLAGS="$(pkg-config --cflags lua5.2)" \
LUA_LIBS="$(pkg-config --libs lua5.2)" \
@@ -117,18 +106,6 @@ graphs() {
"$subpkgdir"/usr/share/graphviz/
}
-md5sums="5b6a829b2ac94efcd5fa3c223ed6d3ae graphviz-2.38.0.tar.gz
-6e30f6cb07c20d92fe280586c56104eb graphviz.trigger
-bce8a9ae4c3a8c52c1bcf0e03d5ce364 0001-clone-nameclash.patch
-f2e8e751d8b26dd659b51940f7210b8a musl-posix-grep.patch
-8da7607dfaaf0ea01e2618d647f79c45 CVE-2014-9157.patch"
-sha256sums="81aa238d9d4a010afa73a9d2a704fc3221c731e1e06577c2ab3496bdef67859e graphviz-2.38.0.tar.gz
-990a108305f0188102b15bf946fee7aff27a9e449eae480192d8d2f933bb9802 graphviz.trigger
-2b6c8186bf2799658494428d68597f63b91799f37809cbe59d8adcab60c27363 0001-clone-nameclash.patch
-c9629e3e5502450ff000af173d568147aee5d8e884d7d8d8754cb7dd94e90ba6 musl-posix-grep.patch
-4289ed4dbcfc2e6d19131e029364eaf7bc728948bbed2b211e808868b7450752 CVE-2014-9157.patch"
-sha512sums="0e51a97dae595f4e80bc9e4a12ba3c48485fab19941a28d522f5a0624b6a767e0ba720e9e55bff8efe8308dd1cd3793e2c99cb5fdfceb2d5cafb0cbee907e531 graphviz-2.38.0.tar.gz
+sha512sums="a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5 graphviz-2.40.1.tar.gz
50947e6a11929f724759266f7716d52d10923eba6d59704ab39e4bdf18f8471d548c2b11ab051dd4b67cb82742aaf54d6358890d049d5b5982f3383b65f7ae8c graphviz.trigger
-aa4cbc341906a949a6bf78cadd96c437d6bcc90369941fe03519aa4447731ecbf6063a0dd0366d3e7aaadf22b69e4bcab3f8632a7da7a01f8e08a3be05c2bc5d 0001-clone-nameclash.patch
-365ecb684b26c382f62b2c8bc075169eafd46478d21a49ecc433fcbf7b720027567438a01659fada7714433c1eced7f5662913179e6d59437fc5daba0d66b0cc musl-posix-grep.patch
-0bd86ddab647ddc2c4b6b2ae8435b725c7e5a66028d51bae6f1111030be3f338b6b767327ad04e8f830cc2483812eee9e54943197ae5de06395d70c240e36552 CVE-2014-9157.patch"
+aa4cbc341906a949a6bf78cadd96c437d6bcc90369941fe03519aa4447731ecbf6063a0dd0366d3e7aaadf22b69e4bcab3f8632a7da7a01f8e08a3be05c2bc5d 0001-clone-nameclash.patch"
diff --git a/main/graphviz/CVE-2014-9157.patch b/main/graphviz/CVE-2014-9157.patch
deleted file mode 100644
index 25f7b3f406..0000000000
--- a/main/graphviz/CVE-2014-9157.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/ellson/graphviz/commit/99eda421f7ddc27b14e4ac1d2126e5fe41719081
-
---- ./lib/cgraph/scan.l.orig
-+++ ./lib/cgraph/scan.l
-@@ -209,6 +209,7 @@
- <hstring>([^><\n]*) addstr(yytext);
- . return (yytext[0]);
- %%
-+
- void yyerror(char *str)
- {
- unsigned char xbuf[BUFSIZ];
-@@ -225,7 +226,7 @@
- agxbput (&xb, buf);
- agxbput (&xb, yytext);
- agxbput (&xb,"'\n");
-- agerr(AGERR,agxbuse(&xb));
-+ agerr(AGERR, "%s", agxbuse(&xb));
- agxbfree(&xb);
- }
- /* must be here to see flex's macro defns */
diff --git a/main/graphviz/musl-posix-grep.patch b/main/graphviz/musl-posix-grep.patch
deleted file mode 100644
index 3cff5feb52..0000000000
--- a/main/graphviz/musl-posix-grep.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- graphviz-2.34.0.orig/Makefile.am
-+++ graphviz-2.34.0/Makefile.am
-@@ -31,7 +31,7 @@
- BUILT_SOURCES = $(top_builddir)/graphviz_version.h
-
- $(top_builddir)/graphviz_version.h: config.h
-- $(GREP) 'PACKAGE\|VERSION\|GVPLUGIN' config.h > $(top_builddir)/graphviz_version.h
-+ $(EGREP) 'PACKAGE|VERSION|GVPLUGIN' config.h > $(top_builddir)/graphviz_version.h
-
- EXTRA_DIST = $(txt) $(html) graphviz.spec.in graphviz.spec \
- autogen.sh config/depcomp config/config.rpath \
---- graphviz-2.34.0.orig/Makefile.in
-+++ graphviz-2.34.0/Makefile.in
-@@ -1242,7 +1242,7 @@
- find $(distdir) -name CVS -type d -prune -exec rm -rf {} \;
-
- $(top_builddir)/graphviz_version.h: config.h
-- $(GREP) 'PACKAGE\|VERSION\|GVPLUGIN' config.h > $(top_builddir)/graphviz_version.h
-+ $(EGREP) 'PACKAGE|VERSION|GVPLUGIN' config.h > $(top_builddir)/graphviz_version.h
-
- .PHONY: rpm
- rpm: dist