[arch-commits] Commit in collectd/repos/community-x86_64 (6 files)
Gaëtan Bisson
bisson at archlinux.org
Sat Oct 5 02:00:53 UTC 2019
Date: Saturday, October 5, 2019 @ 02:00:52
Author: bisson
Revision: 512884
archrelease: copy trunk to community-x86_64
Added:
collectd/repos/community-x86_64/PKGBUILD
(from rev 512883, collectd/trunk/PKGBUILD)
collectd/repos/community-x86_64/fix-failed-values-string.patch
(from rev 512883, collectd/trunk/fix-failed-values-string.patch)
collectd/repos/community-x86_64/service
(from rev 512883, collectd/trunk/service)
Deleted:
collectd/repos/community-x86_64/PKGBUILD
collectd/repos/community-x86_64/fix-failed-values-string.patch
collectd/repos/community-x86_64/service
--------------------------------+
PKGBUILD | 151 +++++++++++++++++++--------------------
fix-failed-values-string.patch | 54 ++++++-------
service | 26 +++---
3 files changed, 114 insertions(+), 117 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-05 02:00:28 UTC (rev 512883)
+++ PKGBUILD 2019-10-05 02:00:52 UTC (rev 512884)
@@ -1,77 +0,0 @@
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Gerhard Brauer <gerhard.brauer at web.de>
-
-pkgname=collectd
-pkgver=5.9.1
-pkgrel=1
-pkgdesc='Daemon which collects system performance statistics periodically'
-url='https://collectd.org/'
-arch=('x86_64')
-license=('GPL')
-
-optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins'
- 'libdbi: dbi plugin'
- 'libesmtp: notify_email plugin'
- 'libgcrypt: encryption and authentication for network plugin'
- 'libmemcached: memcachec plugin'
- 'mariadb-libs: mysql plugin'
- 'systemd-libs: UdevNameAttr option'
- 'iproute2: netlink plugin'
- 'net-snmp: snmp plugin'
- 'libnotify: notify_desktop plugin'
- 'openipmi: ipmi plugin'
- 'liboping: ping plugin'
- 'libpcap: dns plugin'
- 'perl: perl plugin'
- 'postgresql-libs: postgresql plugin'
- 'python: python plugin'
- 'rrdtool: rrdtool and rrdcached plugins'
- 'lm_sensors: lm_sensors and sensors plugins'
- 'libvirt: libvirt plugin'
- 'libxml2: ascent and libvirt plugins'
- 'yajl: curl_json plugin'
- 'libatasmart: smart plugin'
- 'lvm2: lvm plugin'
- 'protobuf-c: write_riemann plugin'
- 'mosquitto: MQTT plugin'
- 'libmicrohttpd: prometheus plugin'
- 'librabbitmq-c: amqp plugin')
-
-makedepends=(${optdepends[@]%:*})
-depends=('libltdl' 'iptables' 'libnsl')
-
-source=("https://github.com/${pkgname}/${pkgname}/archive/${pkgname}-${pkgver}.tar.gz"
- 'fix-failed-values-string.patch'
- 'service')
-sha256sums=('51fb72f51489cb33fa4ddd65b757d81d77c13a33b36f031d6ce2835a2eec9adb'
- 'd9dca57380e69c8c10775d4e24fc40fd1bf838f7fd7cbbc9e1118e47f76ba0fe'
- 'e45e261146563b0bf6967c669dff7ac2400f066f0eb4c022ac3fdb0ccadca2f9')
-
-backup=('etc/collectd.conf')
-
-prepare() {
- 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}-${pkgname}-${pkgver}"
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --sbindir=/usr/bin \
- --with-python=/usr/bin/python \
- --with-perl-bindings='INSTALLDIRS=vendor'
- make all
-}
-
-package() {
- 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
- install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl
-}
Copied: collectd/repos/community-x86_64/PKGBUILD (from rev 512883, collectd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-10-05 02:00:52 UTC (rev 512884)
@@ -0,0 +1,74 @@
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Gerhard Brauer <gerhard.brauer at web.de>
+
+pkgname=collectd
+pkgver=5.9.2
+pkgrel=1
+pkgdesc='Daemon which collects system performance statistics periodically'
+url='https://collectd.org/'
+arch=('x86_64')
+license=('GPL')
+
+optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins'
+ 'libdbi: dbi plugin'
+ 'libesmtp: notify_email plugin'
+ 'libgcrypt: encryption and authentication for network plugin'
+ 'libmemcached: memcachec plugin'
+ 'mariadb-libs: mysql plugin'
+ 'systemd-libs: UdevNameAttr option'
+ 'iproute2: netlink plugin'
+ 'net-snmp: snmp plugin'
+ 'libnotify: notify_desktop plugin'
+ 'openipmi: ipmi plugin'
+ 'liboping: ping plugin'
+ 'libpcap: dns plugin'
+ 'perl: perl plugin'
+ 'postgresql-libs: postgresql plugin'
+ 'python: python plugin'
+ 'rrdtool: rrdtool and rrdcached plugins'
+ 'lm_sensors: lm_sensors and sensors plugins'
+ 'libvirt: libvirt plugin'
+ 'libxml2: ascent and libvirt plugins'
+ 'yajl: curl_json plugin'
+ 'libatasmart: smart plugin'
+ 'lvm2: lvm plugin'
+ 'protobuf-c: write_riemann plugin'
+ 'mosquitto: MQTT plugin'
+ 'libmicrohttpd: prometheus plugin'
+ 'librabbitmq-c: amqp plugin')
+
+makedepends=(${optdepends[@]%:*})
+depends=('libltdl' 'iptables' 'libnsl')
+
+source=("https://github.com/${pkgname}/${pkgname}/archive/${pkgname}-${pkgver}.tar.gz"
+ 'service')
+sha256sums=('961116e74ac505b920578932fd2bd9904febbc7d5aefba3e0ea3d44337c00119'
+ 'e45e261146563b0bf6967c669dff7ac2400f066f0eb4c022ac3fdb0ccadca2f9')
+
+backup=('etc/collectd.conf')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
+ ./build.sh
+ sed 's/ -Werror//g' -i configure
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --sbindir=/usr/bin \
+ --with-python=/usr/bin/python \
+ --with-perl-bindings='INSTALLDIRS=vendor'
+ make all
+}
+
+package() {
+ 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
+ install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl
+}
Deleted: fix-failed-values-string.patch
===================================================================
--- fix-failed-values-string.patch 2019-10-05 02:00:28 UTC (rev 512883)
+++ fix-failed-values-string.patch 2019-10-05 02:00:52 UTC (rev 512884)
@@ -1,27 +0,0 @@
-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, ...) /* {{{ */
Copied: collectd/repos/community-x86_64/fix-failed-values-string.patch (from rev 512883, collectd/trunk/fix-failed-values-string.patch)
===================================================================
--- fix-failed-values-string.patch (rev 0)
+++ fix-failed-values-string.patch 2019-10-05 02:00:52 UTC (rev 512884)
@@ -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, ...) /* {{{ */
Deleted: service
===================================================================
--- service 2019-10-05 02:00:28 UTC (rev 512883)
+++ service 2019-10-05 02:00:52 UTC (rev 512884)
@@ -1,13 +0,0 @@
-[Unit]
-Description=System statistics collection daemon
-After=local-fs.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/collectdmon.pid
-ExecStart=/usr/bin/collectdmon
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
Copied: collectd/repos/community-x86_64/service (from rev 512883, collectd/trunk/service)
===================================================================
--- service (rev 0)
+++ service 2019-10-05 02:00:52 UTC (rev 512884)
@@ -0,0 +1,13 @@
+[Unit]
+Description=System statistics collection daemon
+After=local-fs.target network.target
+
+[Service]
+Type=forking
+PIDFile=/run/collectdmon.pid
+ExecStart=/usr/bin/collectdmon
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list