[arch-commits] Commit in collectd/trunk (PKGBUILD fix-failed-values-string.patch)

[Gaëtan Bisson]

    Date: Thursday, September 12, 2019 @ 20:12:04
  Author: bisson
Revision: 509838

upstream update, new tarball url

Added:
  collectd/trunk/fix-failed-values-string.patch
Modified:
  collectd/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   17 ++++++++++-------
 fix-failed-values-string.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-12 19:58:48 UTC (rev 509837)
+++ PKGBUILD	2019-09-12 20:12:04 UTC (rev 509838)
@@ -2,7 +2,7 @@
 # Contributor: Gerhard Brauer <gerhard.brauer at web.de>
 
 pkgname=collectd
-pkgver=5.9.0
+pkgver=5.9.1
 pkgrel=1
 pkgdesc='Daemon which collects system performance statistics periodically'
 url='https://collectd.org/'
@@ -40,21 +40,24 @@
 makedepends=(${optdepends[@]%:*})
 depends=('libltdl' 'iptables' 'libnsl')
 
-source=("${url}files/${pkgname}-${pkgver}.tar.bz2"
+source=("https://github.com/${pkgname}/${pkgname}/archive/${pkgname}-${pkgver}.tar.gz"
+        'fix-failed-values-string.patch'
         'service')
-sha256sums=('7b220f8898a061f6e7f29a8c16697d1a198277f813da69474a67911097c0626b'
+sha256sums=('51fb72f51489cb33fa4ddd65b757d81d77c13a33b36f031d6ce2835a2eec9adb'
+            'd9dca57380e69c8c10775d4e24fc40fd1bf838f7fd7cbbc9e1118e47f76ba0fe'
             'e45e261146563b0bf6967c669dff7ac2400f066f0eb4c022ac3fdb0ccadca2f9')
 
 backup=('etc/collectd.conf')
 
 prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
+	./build.sh
 	sed 's/ -Werror//g' -i configure
+	patch -p1 -i ../fix-failed-values-string.patch
 }
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	export MAKEFLAGS='-j1'
+	cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -66,7 +69,7 @@
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 	rmdir "${pkgdir}/var/run" # FS#30201
 	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service

Added: fix-failed-values-string.patch
===================================================================
--- fix-failed-values-string.patch	                        (rev 0)
+++ fix-failed-values-string.patch	2019-09-12 20:12:04 UTC (rev 509838)
@@ -0,0 +1,27 @@
+From d27bfc74e606290f191c04cdb4e2acc4d5e8d4a9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?F=E1=B4=80=CA=99=C9=AA=E1=B4=87=C9=B4=20W=E1=B4=87=CA=80?=
+ =?UTF-8?q?=C9=B4=CA=9F=C9=AA?= <faxmodem at collectd.org>
+Date: Mon, 29 Jul 2019 09:54:27 +0200
+Subject: [PATCH] fix https://github.com/collectd/collectd/issues/3232
+
+Change-Id: Idab2c4ffa242a73b651f1b056f85f905e356c5ac
+---
+ src/utils/common/common.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/utils/common/common.c b/src/utils/common/common.c
+index 7cfd31096b..8b2521de11 100644
+--- a/src/utils/common/common.c
++++ b/src/utils/common/common.c
+@@ -99,10 +99,7 @@ int ssnprintf(char *str, size_t sz, const char *format, ...) {
+ 
+   va_end(ap);
+ 
+-  if (ret < 0) {
+-    return ret;
+-  }
+-  return (size_t)ret >= sz;
++  return ret;
+ } /* int ssnprintf */
+ 
+ char *ssnprintf_alloc(char const *format, ...) /* {{{ */