[arch-commits] Commit in collectd/repos (10 files)
Gaetan Bisson
bisson at archlinux.org
Thu Feb 26 16:49:08 UTC 2015
Date: Thursday, February 26, 2015 @ 17:49:08
Author: bisson
Revision: 128290
archrelease: copy trunk to community-i686, community-x86_64
Added:
collectd/repos/community-i686/PKGBUILD
(from rev 128289, collectd/trunk/PKGBUILD)
collectd/repos/community-i686/service
(from rev 128289, collectd/trunk/service)
collectd/repos/community-x86_64/PKGBUILD
(from rev 128289, collectd/trunk/PKGBUILD)
collectd/repos/community-x86_64/service
(from rev 128289, collectd/trunk/service)
Deleted:
collectd/repos/community-i686/PKGBUILD
collectd/repos/community-i686/libperl.patch
collectd/repos/community-i686/service
collectd/repos/community-x86_64/PKGBUILD
collectd/repos/community-x86_64/libperl.patch
collectd/repos/community-x86_64/service
--------------------------------+
/PKGBUILD | 142 +++++++++++++++++++++++++++++++++++++++
/service | 26 +++++++
community-i686/PKGBUILD | 73 --------------------
community-i686/libperl.patch | 29 -------
community-i686/service | 13 ---
community-x86_64/PKGBUILD | 73 --------------------
community-x86_64/libperl.patch | 29 -------
community-x86_64/service | 13 ---
8 files changed, 168 insertions(+), 230 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-02-26 16:47:43 UTC (rev 128289)
+++ community-i686/PKGBUILD 2015-02-26 16:49:08 UTC (rev 128290)
@@ -1,73 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Gerhard Brauer <gerhard.brauer at web.de>
-
-pkgname=collectd
-pkgver=5.4.1
-pkgrel=3
-pkgdesc='Daemon which collects system performance statistics periodically'
-url='http://collectd.org/'
-arch=('i686' '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'
- 'libmariadbclient: mysql plugin'
- 'iproute2: netlink plugin'
- 'net-snmp: snmp plugin'
- 'libnotify: notify_desktop plugin'
- 'liboping: ping plugin'
- 'libpcap: dns plugin'
- 'perl: perl plugin'
- 'postgresql-libs: postgresql plugin'
- 'python2: 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')
-
-makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'libmemcached'
- 'libmariadbclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping'
- 'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors'
- 'libvirt' 'libxml2' 'yajl')
-
-depends=('libltdl' 'iptables')
-
-source=("${url}files/${pkgname}-${pkgver}.tar.bz2"
- 'libperl.patch'
- 'service')
-sha1sums=('cea47e3936ed081bd71efacf7ba825fc837dc347'
- 'efa6450c20ce314e9000a69b17520211f6a471e1'
- '04f676d0b76c34df0bbf94629813e035b1febe04')
-
-backup=('etc/collectd.conf')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed 's/-Werror//g' -i *.ac */*.{am,in} */*/*.{am,in}
- patch -p1 -i ../libperl.patch
- autoreconf
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --sbindir=/usr/bin \
- --with-python=/usr/bin/python2
- 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-i686/PKGBUILD (from rev 128289, collectd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-02-26 16:49:08 UTC (rev 128290)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Gerhard Brauer <gerhard.brauer at web.de>
+
+pkgname=collectd
+pkgver=5.4.2
+pkgrel=1
+pkgdesc='Daemon which collects system performance statistics periodically'
+url='http://collectd.org/'
+arch=('i686' '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'
+ 'libmariadbclient: mysql plugin'
+ 'iproute2: netlink plugin'
+ 'net-snmp: snmp plugin'
+ 'libnotify: notify_desktop plugin'
+ 'liboping: ping plugin'
+ 'libpcap: dns plugin'
+ 'perl: perl plugin'
+ 'postgresql-libs: postgresql plugin'
+ 'python2: 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')
+
+makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'libmemcached'
+ 'libmariadbclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping'
+ 'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors'
+ 'libvirt' 'libxml2' 'yajl')
+
+depends=('libltdl' 'iptables')
+
+source=("${url}files/${pkgname}-${pkgver}.tar.bz2"
+ 'service')
+sha1sums=('f98847ac8cfcd3a041def620ba07cd2c49b426f8'
+ '04f676d0b76c34df0bbf94629813e035b1febe04')
+
+backup=('etc/collectd.conf')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ sed 's/-Werror//g' -i *.ac */*.{am,in} */*/*.{am,in}
+ autoreconf
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --sbindir=/usr/bin \
+ --with-python=/usr/bin/python2 \
+ --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: community-i686/libperl.patch
===================================================================
--- community-i686/libperl.patch 2015-02-26 16:47:43 UTC (rev 128289)
+++ community-i686/libperl.patch 2015-02-26 16:49:08 UTC (rev 128290)
@@ -1,29 +0,0 @@
-diff -Naur old/configure.ac new/configure.ac
---- old/configure.ac 2013-08-18 22:24:25.049973054 +1200
-+++ new/configure.ac 2013-08-23 15:58:24.552240546 +1200
-@@ -3101,11 +3101,13 @@
- then
- SAVE_CFLAGS="$CFLAGS"
- SAVE_LDFLAGS="$LDFLAGS"
-+ SAVE_LIBS="$LIBS"
- dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string)
- PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
- PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
- CFLAGS="$CFLAGS $PERL_CFLAGS"
- LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
-+ LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl $PERL_LDFLAGS"
-
- AC_CACHE_CHECK([for libperl],
- [c_cv_have_libperl],
-@@ -3124,7 +3126,10 @@
- ]]]
- )],
- [c_cv_have_libperl="yes"],
-- [c_cv_have_libperl="no"]
-+ [
-+ c_cv_have_libperl="no"
-+ LIBS="$SAVE_LIBS"
-+ ]
- )
- )
-
Deleted: community-i686/service
===================================================================
--- community-i686/service 2015-02-26 16:47:43 UTC (rev 128289)
+++ community-i686/service 2015-02-26 16:49:08 UTC (rev 128290)
@@ -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-i686/service (from rev 128289, collectd/trunk/service)
===================================================================
--- community-i686/service (rev 0)
+++ community-i686/service 2015-02-26 16:49:08 UTC (rev 128290)
@@ -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
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-02-26 16:47:43 UTC (rev 128289)
+++ community-x86_64/PKGBUILD 2015-02-26 16:49:08 UTC (rev 128290)
@@ -1,73 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Gerhard Brauer <gerhard.brauer at web.de>
-
-pkgname=collectd
-pkgver=5.4.1
-pkgrel=3
-pkgdesc='Daemon which collects system performance statistics periodically'
-url='http://collectd.org/'
-arch=('i686' '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'
- 'libmariadbclient: mysql plugin'
- 'iproute2: netlink plugin'
- 'net-snmp: snmp plugin'
- 'libnotify: notify_desktop plugin'
- 'liboping: ping plugin'
- 'libpcap: dns plugin'
- 'perl: perl plugin'
- 'postgresql-libs: postgresql plugin'
- 'python2: 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')
-
-makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'libmemcached'
- 'libmariadbclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping'
- 'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors'
- 'libvirt' 'libxml2' 'yajl')
-
-depends=('libltdl' 'iptables')
-
-source=("${url}files/${pkgname}-${pkgver}.tar.bz2"
- 'libperl.patch'
- 'service')
-sha1sums=('cea47e3936ed081bd71efacf7ba825fc837dc347'
- 'efa6450c20ce314e9000a69b17520211f6a471e1'
- '04f676d0b76c34df0bbf94629813e035b1febe04')
-
-backup=('etc/collectd.conf')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed 's/-Werror//g' -i *.ac */*.{am,in} */*/*.{am,in}
- patch -p1 -i ../libperl.patch
- autoreconf
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --sbindir=/usr/bin \
- --with-python=/usr/bin/python2
- 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-x86_64/PKGBUILD (from rev 128289, collectd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-02-26 16:49:08 UTC (rev 128290)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Gerhard Brauer <gerhard.brauer at web.de>
+
+pkgname=collectd
+pkgver=5.4.2
+pkgrel=1
+pkgdesc='Daemon which collects system performance statistics periodically'
+url='http://collectd.org/'
+arch=('i686' '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'
+ 'libmariadbclient: mysql plugin'
+ 'iproute2: netlink plugin'
+ 'net-snmp: snmp plugin'
+ 'libnotify: notify_desktop plugin'
+ 'liboping: ping plugin'
+ 'libpcap: dns plugin'
+ 'perl: perl plugin'
+ 'postgresql-libs: postgresql plugin'
+ 'python2: 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')
+
+makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'libmemcached'
+ 'libmariadbclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping'
+ 'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors'
+ 'libvirt' 'libxml2' 'yajl')
+
+depends=('libltdl' 'iptables')
+
+source=("${url}files/${pkgname}-${pkgver}.tar.bz2"
+ 'service')
+sha1sums=('f98847ac8cfcd3a041def620ba07cd2c49b426f8'
+ '04f676d0b76c34df0bbf94629813e035b1febe04')
+
+backup=('etc/collectd.conf')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ sed 's/-Werror//g' -i *.ac */*.{am,in} */*/*.{am,in}
+ autoreconf
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --sbindir=/usr/bin \
+ --with-python=/usr/bin/python2 \
+ --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: community-x86_64/libperl.patch
===================================================================
--- community-x86_64/libperl.patch 2015-02-26 16:47:43 UTC (rev 128289)
+++ community-x86_64/libperl.patch 2015-02-26 16:49:08 UTC (rev 128290)
@@ -1,29 +0,0 @@
-diff -Naur old/configure.ac new/configure.ac
---- old/configure.ac 2013-08-18 22:24:25.049973054 +1200
-+++ new/configure.ac 2013-08-23 15:58:24.552240546 +1200
-@@ -3101,11 +3101,13 @@
- then
- SAVE_CFLAGS="$CFLAGS"
- SAVE_LDFLAGS="$LDFLAGS"
-+ SAVE_LIBS="$LIBS"
- dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string)
- PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
- PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
- CFLAGS="$CFLAGS $PERL_CFLAGS"
- LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
-+ LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl $PERL_LDFLAGS"
-
- AC_CACHE_CHECK([for libperl],
- [c_cv_have_libperl],
-@@ -3124,7 +3126,10 @@
- ]]]
- )],
- [c_cv_have_libperl="yes"],
-- [c_cv_have_libperl="no"]
-+ [
-+ c_cv_have_libperl="no"
-+ LIBS="$SAVE_LIBS"
-+ ]
- )
- )
-
Deleted: community-x86_64/service
===================================================================
--- community-x86_64/service 2015-02-26 16:47:43 UTC (rev 128289)
+++ community-x86_64/service 2015-02-26 16:49:08 UTC (rev 128290)
@@ -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 128289, collectd/trunk/service)
===================================================================
--- community-x86_64/service (rev 0)
+++ community-x86_64/service 2015-02-26 16:49:08 UTC (rev 128290)
@@ -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