Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/arpwatch/PKGBUILD
	community/partclone/PKGBUILD
	community/pidgin-libnotify/PKGBUILD
	core/systemd/PKGBUILD
	extra/subversion/PKGBUILD

4 files changed, 67 insertions, 22 deletions

diff --git a/community/arpwatch/ChangeLog b/community/arpwatch/ChangeLog
deleted file mode 100644
index d22a5592c..000000000
--- a/community/arpwatch/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2007-07-02 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/community/arpwatch/LICENSE b/community/arpwatch/LICENSE
new file mode 100644
index 000000000..be49954d9
--- /dev/null
+++ b/community/arpwatch/LICENSE
@@ -0,0 +1,18 @@
+Copyright (c) 1992, 1993, 1994, 1995, 1996, 1998, 2000
+     The Regents of the University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that: (1) source code distributions
+retain the above copyright notice and this paragraph in its entirety, (2)
+distributions including binary code include the above copyright notice and
+this paragraph in its entirety in the documentation or other materials
+provided with the distribution, and (3) all advertising materials mentioning
+features or use of this software display the following acknowledgement:
+``This product includes software developed by the University of California,
+Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
+the University nor the names of its contributors may be used to endorse
+or promote products derived from this software without specific prior
+written permission.
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/community/arpwatch/PKGBUILD b/community/arpwatch/PKGBUILD
index 96f4e5e19..a5d2f0975 100644
--- a/community/arpwatch/PKGBUILD
+++ b/community/arpwatch/PKGBUILD
@@ -1,29 +1,48 @@
-# $Id: PKGBUILD 65045 2012-02-20 02:17:24Z spupykin $
+# $Id: PKGBUILD 87787 2013-04-06 15:38:17Z seblu $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Sébastien Luttringer
 
 pkgname=arpwatch
 pkgver=2.1a15
-pkgrel=8
-pkgdesc="arpwatch and arpsnmp network monitoring tools"
-arch=(i686 x86_64 'mips64el')
-url="ftp://ftp.ee.lbl.gov/"
-license=("GPL")
-depends=(libpcap)
-source=(ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz)
-md5sums=('cebfeb99c4a7c2a6cee2564770415fe7')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
+pkgrel=10
+pkgdesc='Ethernet/FDDI station activity monitor'
+arch=('i686' 'x86_64' 'mips64el')
+url='ftp://ftp.ee.lbl.gov/'
+license=('BSD')
+depends=('libpcap' 'smtp-forwarder')
+source=("ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz"
+        'LICENSE'
+        "$pkgname.service")
+md5sums=('cebfeb99c4a7c2a6cee2564770415fe7'
+         '9359518c500562281e76cdb0b2fa9062'
+         '2324a202222303daa1a41d8abd7a7e4a')
 
+prepare() {
+  cd $pkgname-$pkgver
+  # move arp database in /var/lib/arpwatch
   sed -i 's|ARPDIR = $(prefix)/arpwatch|ARPDIR = /var/lib/arpwatch|' Makefile.in
+  # binary ownership to root
+  sed -i 's/-\(o\|g\) bin/-\1 root/g' Makefile.in
+}
 
-  ./configure --prefix=/usr
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --mandir=/usr/share/man
   make SENDMAIL=/usr/sbin/sendmail
-  install -d -m 0755 $pkgdir/usr/sbin
-  make DESTDIR=$pkgdir install
-  install -D -m 0644 arpwatch.8 $pkgdir/usr/share/man/man8/arpwatch.8
-  install -D -m 0644 arpsnmp.8 $pkgdir/usr/share/man/man8/arpsnmp.8
-  install -d -m 0755 $pkgdir/var/lib/arpwatch
-  touch $pkgdir/var/lib/arpwatch/arp.dat
 }
+
+package() {
+  cd $pkgname-$pkgver
+  install -d -m 0755 "$pkgdir"/usr/{sbin,share/man}
+  make DESTDIR="$pkgdir" install install-man
+  # install ether prefix database
+  install -Dm644 ethercodes.dat "$pkgdir/var/lib/$pkgname/ethercodes.dat"
+  cd "$srcdir"
+  # license
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  # systemd
+  install -Dm644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname@.service"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/arpwatch/arpwatch.service b/community/arpwatch/arpwatch.service
new file mode 100644
index 000000000..570f93852
--- /dev/null
+++ b/community/arpwatch/arpwatch.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Watch ARP on interface %I
+After=network.target
+
+[Service]
+Type=forking
+ExecStartPre=/usr/bin/touch /var/lib/arpwatch/%I.dat
+ExecStart=/usr/sbin/arpwatch -f /var/lib/arpwatch/%I.dat -i %I
+
+[Install]
+WantedBy=multi-user.target