summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Bruhin2014-02-24 16:30:35 +0100
committerFlorian Bruhin2014-02-24 16:30:35 +0100
commit9ca19db399b964652650ba9b0e785c572e2a3367 (patch)
tree0a9409d91c91a6fbfbc8ef6b85fec09693985ac4
parent41f7bdc2f6be8c20cdc33612b9d590f66470822f (diff)
downloadaur-9ca19db399b964652650ba9b0e785c572e2a3367.tar.gz
Update NUT
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD35
2 files changed, 33 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5f0ff6cce12..e29a9ae5ac8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,18 @@
pkgbase = network-ups-tools
pkgdesc = NUT is a collection of programs for monitoring and administering UPS hardware
pkgver = 2.7.1
- pkgrel = 2
+ pkgrel = 3
url = http://www.networkupstools.org/
install = nut.install
arch = i686
arch = x86_64
license = GPL2
+ makedepends = asciidoc
depends = openssl
depends = libusb-compat
depends = libltdl
+ depends = neon
+ depends = net-snmp
options = !emptydirs
options = !libtool
backup = etc/ups/ups.conf
diff --git a/PKGBUILD b/PKGBUILD
index 5e2d4dab991..a3635f32ad1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,24 @@
# Contributor: Alex Reznichenko <sa5gap@yandex.ru>
# Contributor: Roman Kyrylych <roman@archlinux.org>
# Contributor: Giuseppe Lucarelli <luk@rebelsoft.org>
+# Contributor: Dan Ziemba <zman0900@gmail.com>
pkgname=network-ups-tools
pkgver=2.7.1
-pkgrel=2
+pkgrel=3
pkgdesc="NUT is a collection of programs for monitoring and administering UPS hardware"
arch=('i686' 'x86_64')
url="http://www.networkupstools.org/"
license=('GPL2')
-depends=('openssl' 'libusb-compat' 'libltdl')
-makedepends=()
+depends=('openssl' 'libusb-compat' 'libltdl' 'neon' 'net-snmp')
+makedepends=('asciidoc')
backup=(etc/ups/{ups.conf,upsd.conf,upsd.users,upsmon.conf,upssched.conf})
install=nut.install
source=("http://www.networkupstools.org/source/2.7/nut-${pkgver}.tar.gz"
-"http://www.networkupstools.org/source/2.7/nut-${pkgver}.tar.gz.sig")
+ "http://www.networkupstools.org/source/2.7/nut-${pkgver}.tar.gz.sig")
options=('!emptydirs' '!libtool')
sha256sums=('71a6d73ad6d910808126ba7f217ec1142a0c6709c63a22a099e7338960b2c798'
-'SKIP')
+ 'SKIP')
build() {
cd "$srcdir/nut-$pkgver"
@@ -26,23 +27,45 @@ build() {
--without-wrap \
--with-user=ups \
--with-group=nut \
+ --disable-static \
+ --with-serial \
--with-usb \
+ --with-doc=html-single \
+ --without-avahi \
+ --with-snmp \
+ --with-neon \
+ --without-powerman \
+ --without-ipmi \
+ --without-freeipmi \
+ --with-libltdl \
+ --without-cgi \
--prefix=/usr \
--with-udev-dir=/usr/lib/udev \
--with-systemdsystemunitdir=/lib/systemd/system \
--datadir=/usr/share/ups \
--sbindir=/usr/bin \
--with-drvpath=/usr/bin \
- --sysconfdir=/etc/ups
+ --sysconfdir=/etc/ups \
+ --with-openssl
make
}
package() {
cd "$srcdir/nut-$pkgver"
make DESTDIR="$pkgdir" install
+
install -D -m644 "conf/ups.conf.sample" "$pkgdir/etc/ups/ups.conf"
install -D -m640 "conf/upsd.conf.sample" "$pkgdir/etc/ups/upsd.conf"
install -D -m640 "conf/upsd.users.sample" "$pkgdir/etc/ups/upsd.users"
install -D -m640 "conf/upsmon.conf.sample" "$pkgdir/etc/ups/upsmon.conf"
install -D -m644 "conf/upssched.conf.sample" "$pkgdir/etc/ups/upssched.conf"
+
+ install -d -v -m755 "$pkgdir/usr/share/doc/network-ups-tools/images/cables"
+ install -v -m 644 docs/*.html "$pkgdir/usr/share/doc/network-ups-tools"
+ install -v -m 644 docs/images/*.png "$pkgdir/usr/share/doc/network-ups-tools/images"
+ install -v -m 644 docs/images/cables/*.{png,jpg} "$pkgdir/usr/share/doc/network-ups-tools/images/cables"
+
+ # Fix broken systemd unit
+ cd "$pkgdir"
+ sed -i 's|=/upsdrvctl|=/usr/bin/upsdrvctl|' usr/lib/systemd/system/nut-driver.service
}