[arch-commits] Commit in collectd/repos/community-staging-x86_64 (5 files)
Gaëtan Bisson
bisson at archlinux.org
Sat Jun 15 18:58:27 UTC 2019
Date: Saturday, June 15, 2019 @ 18:58:25
Author: bisson
Revision: 481738
archrelease: copy trunk to community-staging-x86_64
Added:
collectd/repos/community-staging-x86_64/PKGBUILD
(from rev 481737, collectd/trunk/PKGBUILD)
collectd/repos/community-staging-x86_64/service
(from rev 481737, collectd/trunk/service)
Deleted:
collectd/repos/community-staging-x86_64/PKGBUILD
collectd/repos/community-staging-x86_64/lm_sensors5to6.patch
collectd/repos/community-staging-x86_64/service
----------------------+
PKGBUILD | 151 ++++++++++++++++++++++++-------------------------
lm_sensors5to6.patch | 69 ----------------------
service | 26 ++++----
3 files changed, 87 insertions(+), 159 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-06-15 18:50:45 UTC (rev 481737)
+++ PKGBUILD 2019-06-15 18:58:25 UTC (rev 481738)
@@ -1,77 +0,0 @@
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Gerhard Brauer <gerhard.brauer at web.de>
-
-pkgname=collectd
-pkgver=5.8.1
-pkgrel=7
-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=("${url}files/${pkgname}-${pkgver}.tar.bz2"
- 'lm_sensors5to6.patch'
- 'service')
-sha256sums=('e796fda27ce06377f491ad91aa286962a68c2b54076aa77a29673d53204453da'
- '9946e796bcbc857160a540ccf38979a4dd722ec13e0761451523206b202591eb'
- 'e45e261146563b0bf6967c669dff7ac2400f066f0eb4c022ac3fdb0ccadca2f9')
-
-backup=('etc/collectd.conf')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed 's/ -Werror//g' -i configure
- patch -p1 -i ../lm_sensors5to6.patch
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- export MAKEFLAGS='-j1'
- ./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}-${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-staging-x86_64/PKGBUILD (from rev 481737, collectd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-06-15 18:58:25 UTC (rev 481738)
@@ -0,0 +1,74 @@
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Gerhard Brauer <gerhard.brauer at web.de>
+
+pkgname=collectd
+pkgver=5.9.0
+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=("${url}files/${pkgname}-${pkgver}.tar.bz2"
+ 'service')
+sha256sums=('7b220f8898a061f6e7f29a8c16697d1a198277f813da69474a67911097c0626b'
+ 'e45e261146563b0bf6967c669dff7ac2400f066f0eb4c022ac3fdb0ccadca2f9')
+
+backup=('etc/collectd.conf')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ sed 's/ -Werror//g' -i configure
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ export MAKEFLAGS='-j1'
+ ./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}-${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: lm_sensors5to6.patch
===================================================================
--- lm_sensors5to6.patch 2019-06-15 18:50:45 UTC (rev 481737)
+++ lm_sensors5to6.patch 2019-06-15 18:58:25 UTC (rev 481738)
@@ -1,69 +0,0 @@
-diff -Naur old/src/sensors.c new/src/sensors.c
---- old/src/sensors.c 2018-10-22 20:57:09.027242628 -1000
-+++ new/src/sensors.c 2018-11-29 09:51:36.950814002 -1000
-@@ -149,7 +149,7 @@
- static char *conffile = SENSORS_CONF_PATH;
- /* #endif SENSORS_API_VERSION < 0x400 */
-
--#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
-+#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600)
- typedef struct featurelist {
- const sensors_chip_name *chip;
- const sensors_feature *feature;
-@@ -159,9 +159,9 @@
-
- static char *conffile = NULL;
- static _Bool use_labels = 0;
--/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
-+/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600) */
-
--#else /* if SENSORS_API_VERSION >= 0x500 */
-+#else /* if SENSORS_API_VERSION >= 0x600 */
- #error "This version of libsensors is not supported yet. Please report this " \
- "as bug."
- #endif
-@@ -223,7 +223,7 @@
- if (IS_TRUE(value))
- ignorelist_set_invert(sensor_list, 0);
- }
--#if (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
-+#if (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600)
- else if (strcasecmp(key, "UseLabels") == 0) {
- use_labels = IS_TRUE(value) ? 1 : 0;
- }
-@@ -353,7 +353,7 @@
- } /* while sensors_get_detected_chips */
- /* #endif SENSORS_API_VERSION < 0x400 */
-
--#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
-+#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600)
- chip_num = 0;
- while ((chip = sensors_get_detected_chips(NULL, &chip_num)) != NULL) {
- const sensors_feature *feature;
-@@ -410,7 +410,7 @@
- } /* while (subfeature) */
- } /* while (feature) */
- } /* while (chip) */
--#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
-+#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600) */
-
- if (first_feature == NULL) {
- sensors_cleanup();
-@@ -485,7 +485,7 @@
- } /* for fl = first_feature .. NULL */
- /* #endif SENSORS_API_VERSION < 0x400 */
-
--#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
-+#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600)
- for (featurelist_t *fl = first_feature; fl != NULL; fl = fl->next) {
- double value;
- int status;
-@@ -528,7 +528,7 @@
-
- sensors_submit(plugin_instance, type, type_instance, value);
- } /* for fl = first_feature .. NULL */
--#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
-+#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600) */
-
- return 0;
- } /* int sensors_read */
Deleted: service
===================================================================
--- service 2019-06-15 18:50:45 UTC (rev 481737)
+++ service 2019-06-15 18:58:25 UTC (rev 481738)
@@ -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-staging-x86_64/service (from rev 481737, collectd/trunk/service)
===================================================================
--- service (rev 0)
+++ service 2019-06-15 18:58:25 UTC (rev 481738)
@@ -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