user/rrdtool: bump to 1.7.2 to fix TZ bug, enable tests

3 files changed, 41 insertions, 16 deletions

diff --git a/user/rrdtool/APKBUILD b/user/rrdtool/APKBUILD
index f61223adc..bec89b8ca 100644
--- a/user/rrdtool/APKBUILD
+++ b/user/rrdtool/APKBUILD
@@ -1,19 +1,20 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: 
 pkgname=rrdtool
-pkgver=1.7.1
+pkgver=1.7.2
 pkgrel=0
 pkgdesc="Data logging and graphing application"
 url="https://oss.oetiker.ch/rrdtool/"
 arch="all"
-options="!check"  # Tests fail because of CET time zone begin date changing.
 license="GPL-2.0+"
 depends="font-sony-misc"
+checkdepends="bc"
 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
 	rrdcached.initd
 	"
 
@@ -33,7 +34,7 @@ build() {
 
 check() {
 	cd "$builddir"
-	make check
+	LANG=C.UTF-8 LC_ALL=C.UTF-8 TZ=UTC make check
 }
 
 package() {
@@ -86,5 +87,6 @@ utils() {
 		"$subpkgdir"/usr/bin
 }
 
-sha512sums="ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14  rrdtool-1.7.1.tar.gz
+sha512sums="453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29  rrdtool-1.7.2.tar.gz
+47fbfa1ee974d607c15d7a49b1007ccfb6dcd2764f82236f8741b96fe1c3cdec8535f570116a2b24767e09c018177bd5ace4f2ceb39342b2baf3baec01a35dc1  disable-rpn2.patch
 c0c27b2c2dfa8e7ec1cb1160d2bda8d7996bbea67f4ce7779da029f583c35e5e415cf46e2a1e5cb8ed2e63d2c58a68fd7471ee6bd820db4c0f4eeeb5c252f8a3  rrdcached.initd"
diff --git a/user/rrdtool/disable-rpn2.patch b/user/rrdtool/disable-rpn2.patch
new file mode 100644
index 000000000..1baed862c
--- /dev/null
+++ b/user/rrdtool/disable-rpn2.patch
@@ -0,0 +1,35 @@
+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'; \
diff --git a/user/rrdtool/no-posix-fallocate.patch b/user/rrdtool/no-posix-fallocate.patch
deleted file mode 100644
index c34c5a187..000000000
--- a/user/rrdtool/no-posix-fallocate.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- rrdtool-1.4.8.orig/configure.ac
-+++ rrdtool-1.4.8/configure.ac
-@@ -280,9 +280,6 @@
- #include <fcntl.h>])
- AC_CHECK_FUNCS(posix_fadvise)
- 
--dnl can we use posix_fallocate
--AC_CHECK_FUNCS(posix_fallocate)
--
- CONFIGURE_PART(Libintl Processing)
- 
- AM_GNU_GETTEXT_VERSION(0.17)