[arch-commits] Commit in arpwatch/trunk (5 files)

Sergej Pupykin spupykin at archlinux.org
Sun Jun 14 22:44:19 UTC 2020


    Date: Sunday, June 14, 2020 @ 22:44:18
  Author: spupykin
Revision: 644731

upgpkg: arpwatch 3.1-1

Added:
  arpwatch/trunk/ethercodes.dat.gz
Modified:
  arpwatch/trunk/PKGBUILD
  arpwatch/trunk/arpwatch.service
Deleted:
  arpwatch/trunk/ethercodes.dat.xz
  arpwatch/trunk/gen_ethercode.sh

-------------------+
 PKGBUILD          |   41 +++++++++++++++++------------------------
 arpwatch.service  |    1 +
 ethercodes.dat.gz |    1 +
 gen_ethercode.sh  |   32 --------------------------------
 4 files changed, 19 insertions(+), 56 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-14 22:33:14 UTC (rev 644730)
+++ PKGBUILD	2020-06-14 22:44:18 UTC (rev 644731)
@@ -2,38 +2,34 @@
 # Contributor: Sébastien Luttringer
 
 pkgname=arpwatch
-pkgver=2.1a15
-pkgrel=15
+pkgver=3.1
+pkgrel=1
 pkgdesc='Ethernet/FDDI station activity monitor'
 arch=('x86_64')
 url='ftp://ftp.ee.lbl.gov/'
 license=('BSD')
 depends=('libpcap' 'smtp-forwarder')
-source=("ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz"
-        'ethercodes.dat.xz'
+source=("https://ee.lbl.gov/downloads/arpwatch/arpwatch-$pkgver.tar.gz"
         'LICENSE'
+        "ethercodes.dat.gz"
         "$pkgname.service")
-sha512sums=('f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90'
-            '3dea05c98fab494c48fe55085aa152dc8f13ab60168fe9887955c594a86928fb850f49612c1d69450c1d6ac4286efb86cf5f3e9105eadfec88225b18d45f2ca7'
+sha512sums=('2e6f6e388e1828e34626e36356a89f3bc95d268b9242955d6636ac05041bcf533e7625ed73b37b6ea5eab8cfed54b8c483547556c98664efff63c18639efa282'
             'ed46c36220507d8ffbd01a3cc90c9047536b8af26af8c9623fae7a6584ad922b6adebabb6de771b0dbdc802da1a6cb51b8b30a8902c92d71f8b31ee763d61624'
-            'f5b259b1d25d847ca60b8b29e8f198d418803c5ea1493599bbc5232278431dbe06553984f862f35f84046a892f0b12f7989fa4a4b42d2f6c74bc9786a9877cc8')
+            'dc9818e6453e0d9ef38864536ea66b15a8acb48091b609e422227538d3d4c6b93cc853778f8f4ea8cd887dc15c1c62da66f4325c540eb80f9c78705d63a65226'
+            '4a9460c8a376d9183265b73e2c3b02965223144fecfeeb630ec5e70d40d4aed5725e5a43ae370938afa0a2fd362785020eca679e585a7f400e4e67f255807a84')
 
 prepare() {
   cd $pkgname-$pkgver
-  # move arp database in /var/lib/arpwatch
-  # /var is used because arpwatch write its learned mac into this folder
-  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
-  # Update ethercodes with recent OUI. See gen_ethercodes.sh
-  cp -f "$srcdir/ethercodes.dat" ethercodes.dat
-  # Do not spam root user
-  sed -i 's|root|arpwatch|' addresses.h.in
+  sed -i '/@HAVE_FREEBSD_TRUE@/d' Makefile.in
 }
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin
+  ./configure \
+    --prefix=/usr \
+    --mandir=/usr/share/man \
+    --sbindir=/usr/bin \
+    --with-watcher=arpwatch
   make SENDMAIL=/usr/bin/sendmail
 }
 
@@ -40,14 +36,11 @@
 package() {
   cd $pkgname-$pkgver
   install -d -m 0755 "$pkgdir"/usr/{bin,share/man/man8}
-  make DESTDIR="$pkgdir" install install-man
+  make DESTDIR="$pkgdir" install
   # install ether prefix database
-  install -Dm644 ethercodes.dat "$pkgdir/var/lib/$pkgname/ethercodes.dat"
-  cd "$srcdir"
+  install -Dm644 "$srcdir"/ethercodes.dat "$pkgdir/var/lib/$pkgname/ethercodes.dat"
   # license
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 "$srcdir"/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   # systemd
-  install -Dm644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname at .service"
+  install -Dm644 "$srcdir"/$pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname at .service"
 }
-
-# vim:set ts=2 sw=2 et:

Modified: arpwatch.service
===================================================================
--- arpwatch.service	2020-06-14 22:33:14 UTC (rev 644730)
+++ arpwatch.service	2020-06-14 22:44:18 UTC (rev 644731)
@@ -4,6 +4,7 @@
 
 [Service]
 Type=forking
+WorkingDirectory=/var/lib/arpwatch
 ExecStartPre=/usr/bin/touch /var/lib/arpwatch/%i.dat
 ExecStart=/usr/bin/arpwatch -f /var/lib/arpwatch/%i.dat -i %i
 

Added: ethercodes.dat.gz
===================================================================
(Binary files differ)

Index: arpwatch/trunk/ethercodes.dat.gz
===================================================================
--- ethercodes.dat.gz	2020-06-14 22:33:14 UTC (rev 644730)
+++ ethercodes.dat.gz	2020-06-14 22:44:18 UTC (rev 644731)

Property changes on: arpwatch/trunk/ethercodes.dat.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/gzip
\ No newline at end of property
Deleted: ethercodes.dat.xz
===================================================================
(Binary files differ)

Deleted: gen_ethercode.sh
===================================================================
--- gen_ethercode.sh	2020-06-14 22:33:14 UTC (rev 644730)
+++ gen_ethercode.sh	2020-06-14 22:44:18 UTC (rev 644731)
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# Copyright © 2013 Sébastien Luttringer
-
-# This script is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This script is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this script.  If not, see <http://www.gnu.org/licenses/>.
-
-# Get and format official OUI
-wget -O- 'http://standards.ieee.org/regauth/oui/oui.txt' | \
-sed -nr 's/[ \t]+(..)-(..)-(..)[ \t]+\(hex\)[ \t]+(.*)/\L\1:\2:\3\E\t\4/p' > ethercodes.dat
-
-# Add private OUI
-cat >> ethercodes.dat <<EOF
-52:54:00	QEMU Virtual NIC
-b0:c4:20	Bochs Virtual NIC
-de:ad:ca	PearPC Virtual NIC
-00:ff:d1	Cooperative Linux virtual NIC
-EOF
-
-# Sort and compress
-sort ethercodes.dat | xz -9 > ethercodes.dat.xz
-rm ethercodes.dat



More information about the arch-commits mailing list