summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--user/rrdtool/APKBUILD10
-rw-r--r--user/rrdtool/disable-rpn2.patch35
2 files changed, 4 insertions, 41 deletions
diff --git a/user/rrdtool/APKBUILD b/user/rrdtool/APKBUILD
index c4fdcd582..d93cc19b7 100644
--- a/user/rrdtool/APKBUILD
+++ b/user/rrdtool/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Maintainer:
+# Maintainer: Zach van Rijn <me@zv.io>
pkgname=rrdtool
-pkgver=1.7.2
+pkgver=1.8.0
pkgrel=0
pkgdesc="Data logging and graphing application"
url="https://oss.oetiker.ch/rrdtool/"
@@ -13,8 +13,7 @@ makedepends="cairo-dev freetype-dev groff libart-lgpl-dev libpng-dev
libxml2-dev pango-dev perl-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang perl-rrd:perl_rrd
$pkgname-cached $pkgname-cgi $pkgname-utils librrd:libs"
-source="https://oss.oetiker.ch/$pkgname/pub/$pkgname-$pkgver.tar.gz
- disable-rpn2.patch
+source="https://github.com/oetiker/$pkgname-${pkgver%%.*}.x/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz
rrdcached.initd
"
@@ -84,6 +83,5 @@ utils() {
"$subpkgdir"/usr/bin
}
-sha512sums="453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29 rrdtool-1.7.2.tar.gz
-47fbfa1ee974d607c15d7a49b1007ccfb6dcd2764f82236f8741b96fe1c3cdec8535f570116a2b24767e09c018177bd5ace4f2ceb39342b2baf3baec01a35dc1 disable-rpn2.patch
+sha512sums="8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1 rrdtool-1.8.0.tar.gz
c0c27b2c2dfa8e7ec1cb1160d2bda8d7996bbea67f4ce7779da029f583c35e5e415cf46e2a1e5cb8ed2e63d2c58a68fd7471ee6bd820db4c0f4eeeb5c252f8a3 rrdcached.initd"
diff --git a/user/rrdtool/disable-rpn2.patch b/user/rrdtool/disable-rpn2.patch
deleted file mode 100644
index 1baed862c..000000000
--- a/user/rrdtool/disable-rpn2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://github.com/oetiker/rrdtool-1.x/issues/1012
---- rrdtool-1.7.2/tests/Makefile.in.old 2019-05-27 18:46:42.000000000 +0000
-+++ rrdtool-1.7.2/tests/Makefile.in 2019-06-04 06:27:36.143871636 +0000
-@@ -537,7 +537,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- TESTS = modify1 modify2 modify3 modify4 modify5 \
-- tune1 tune2 graph1 rpn1 rpn2 \
-+ tune1 tune2 graph1 rpn1 \
- rrdcreate \
- dump-restore \
- create-with-source-1 create-with-source-2 create-with-source-3 \
-@@ -555,7 +555,7 @@
- rrdcreate \
- tune1-testa-mod1.dump tune1-testa-mod2.dump tune1-testorg.dump \
- tune2-testa-mod1.dump tune2-testorg.dump \
-- valgrind-supressions dcounter1 dcounter1.output graph1.output vformatter1 rpn1.output rpn2.output \
-+ valgrind-supressions dcounter1 dcounter1.output graph1.output vformatter1 rpn1.output \
- xport1.json.output xport1.xml.output \
- pdp-calc1 pdp-calc1-1-avg-60.output pdp-calc1-1-avg-300.output pdp-calc1-1-max-300.output
-
-@@ -820,13 +820,6 @@
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-- "$$tst" $(AM_TESTS_FD_REDIRECT)
--rpn2.log: rpn2
-- @p='rpn2'; \
-- b='rpn2'; \
-- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-- --log-file $$b.log --trs-file $$b.trs \
-- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
- rrdcreate.log: rrdcreate
- @p='rrdcreate'; \