Date: Wednesday, May 20, 2020 @ 21:03:40 Author: bisson Revision: 630994
archrelease: copy trunk to community-staging-x86_64 Added: collectd/repos/community-staging-x86_64/PKGBUILD (from rev 630993, collectd/trunk/PKGBUILD) collectd/repos/community-staging-x86_64/service (from rev 630993, collectd/trunk/service) Deleted: collectd/repos/community-staging-x86_64/PKGBUILD collectd/repos/community-staging-x86_64/service ----------+ PKGBUILD | 147 +++++++++++++++++++++++++++++-------------------------------- service | 26 +++++----- 2 files changed, 83 insertions(+), 90 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-05-20 21:03:01 UTC (rev 630993) +++ PKGBUILD 2020-05-20 21:03:40 UTC (rev 630994) @@ -1,77 +0,0 @@ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Contributor: Gerhard Brauer <gerhard.bra...@web.de> - -pkgname=collectd -pkgver=5.10.0 -pkgrel=3 -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/${pkgver}.tar.gz" - 'https://github.com/collectd/collectd/pull/3344/commits/071af20ddcde3b58ddceacfd6eb95b6756af4323.patch' - 'service') -sha256sums=('869a6ae404f4b9aa0e830b8639629ddc29ad071b2717ff21bbb6e86d09cb6f58' - 'c859da73801553d2f2d36d53ad4f8f5314dd9be7980c0563eb7ac021a87cd6ae' - 'e45e261146563b0bf6967c669dff7ac2400f066f0eb4c022ac3fdb0ccadca2f9') - -backup=('etc/collectd.conf') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../071af20ddcde3b58ddceacfd6eb95b6756af4323.patch - ./build.sh - sed 's/ -Werror//g' -i configure -} - -build() { - cd "${srcdir}/${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}-${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 630993, collectd/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-05-20 21:03:40 UTC (rev 630994) @@ -0,0 +1,70 @@ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Gerhard Brauer <gerhard.bra...@web.de> + +pkgname=collectd +pkgver=5.11.0 +pkgrel=2 +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://storage.googleapis.com/collectd-tarballs/${pkgname}-${pkgver}.tar.bz2" + 'service') +sha256sums=('37b10a806e34aa8570c1cafa6006c604796fae13cc2e1b3e630d33dcba9e5db2' + 'e45e261146563b0bf6967c669dff7ac2400f066f0eb4c022ac3fdb0ccadca2f9') + +backup=('etc/collectd.conf') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --sbindir=/usr/bin \ + --disable-werror \ + --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: service =================================================================== --- service 2020-05-20 21:03:01 UTC (rev 630993) +++ service 2020-05-20 21:03:40 UTC (rev 630994) @@ -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 630993, collectd/trunk/service) =================================================================== --- service (rev 0) +++ service 2020-05-20 21:03:40 UTC (rev 630994) @@ -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