diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/arpwatch/22_alpine_bihourly_script.patch | 41 | ||||
| -rw-r--r-- | main/arpwatch/APKBUILD | 51 | ||||
| -rw-r--r-- | main/arpwatch/arpwatch.confd | 2 |
3 files changed, 80 insertions, 14 deletions
diff --git a/main/arpwatch/22_alpine_bihourly_script.patch b/main/arpwatch/22_alpine_bihourly_script.patch new file mode 100644 index 0000000000..729c2abd14 --- /dev/null +++ b/main/arpwatch/22_alpine_bihourly_script.patch @@ -0,0 +1,41 @@ +diff --git a/bihourly.sh b/bihourly.sh +index 33e54db..810bf80 100755 +--- a/bihourly.sh ++++ b/bihourly.sh +@@ -3,11 +3,14 @@ + # + # bihourly arpwatch job + # +-PATH=${PATH}:/usr/local/sbin +-export PATH +-# +-cd /usr/operator/arpwatch + # ++ ++. /etc/conf.d/arpwatch ++ ++ARPWATCH_REPORT_EMAIL= ++ ++cd /usr/share/arpwatch ++ + list="`cat list`" + cname="`cat cname`" + temp1=$(mktemp) +@@ -26,7 +29,7 @@ touch ${l} + + alist="" + for r in ${list}; do \ +- ./arpfetch ${r} ${cname} > ${r} 2> ${temp1} ++ arpfetch ${r} ${cname} > ${r} 2> ${temp1} + if [ -s ${temp1} ]; then + echo "arpfetch ${r} errors:" + xr=${d}/${r}.$$ +@@ -44,7 +47,7 @@ arpsnmp -d ${alist} > ${temp1} 2>&1 + sed -e '/arpsnmp: suppressed DECnet flip flop/d' ${temp1} > ${temp2} + if [ -s ${temp2} ]; then + mail -s "`hostname` arpwatch report" \ +- arpwatch-reports@noname.lbl.gov < ${temp2} ++ $ARPWATCH_REPORT_EMAIL < ${temp2} + fi + rm -f ${temp1} ${temp2} + diff --git a/main/arpwatch/APKBUILD b/main/arpwatch/APKBUILD index 94c269db7f..66fecb88a7 100644 --- a/main/arpwatch/APKBUILD +++ b/main/arpwatch/APKBUILD @@ -1,17 +1,17 @@ # Contributor: Michael Mason <ms13sp@gmail.com> -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Francesco Colista <francesco.colista@gmail.com> pkgname=arpwatch pkgver=2.1a15 -pkgrel=6 +pkgrel=7 pkgdesc="Ethernet monitoring program" url="http://www-nrg.ee.lbl.gov/" arch="all" -license="GPL" +license="BSD" depends= pkguser=arpwatch makedepends="libpcap-dev" install="$pkgname.pre-install" -subpackages="" +subpackages="$pkgname-ethercodes" source="ftp://ftp.ee.lbl.gov/$pkgname.tar.gz arpwatch.confd arpwatch.initd @@ -35,10 +35,14 @@ source="ftp://ftp.ee.lbl.gov/$pkgname.tar.gz 18_all_arpwatch-2.1a15-nofork.patch 19_all_arpwatch-2.1a15-nonewstation.patch 20_all_arpwatch-2.1a15-noreversedns-resolve.patch - 21_all_arpwatch-2.1a15-pid-filename.patch" + 21_all_arpwatch-2.1a15-pid-filename.patch + 22_alpine_bihourly_script.patch + " + +_builddir="$srcdir/$pkgname-$pkgver" prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd $_builddir for i in $source; do case $i in *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; @@ -47,7 +51,7 @@ prepare() { } build() { - cd "$srcdir/$pkgname-$pkgver" + cd $_builddir ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -57,7 +61,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $_builddir #install command wouldn't create directory ? mkdir -p "$pkgdir"/usr/sbin/ make -j1 DESTDIR="$pkgdir" install @@ -66,10 +70,26 @@ package() { chown arpuser "$pkgdir"/var/run/arpwatch install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname + for files in arp2ethers arpfetch massagevendor bihourly.sh; do + install -m755 "$_builddir"/$files "$pkgdir"/usr/sbin + done +} + +ethercodes() { + cd $_builddir + pkgdesc="$pkgname ethernet codes" + mkdir -p "$subpkgdir"/usr/share/$pkgname/awk + install -Dm644 "$_builddir"/ethercodes.dat "$subpkgdir"/usr/share/$pkgname/ethercodes.dat + for f in "$_builddir"/*.awk; do + install -Dm644 $f "$subpkgdir"/usr/share/$pkgname/awk/$f + done } + + + md5sums="cebfeb99c4a7c2a6cee2564770415fe7 arpwatch.tar.gz -dc8300ce5f02d6be95899a2982397064 arpwatch.confd +df4f7b1b785ea9f92f917442690a5677 arpwatch.confd 51ecada198c4f954ac4d5f5903198ebb arpwatch.initd 05c30c8d960d6b87b2ffc9e414bb9e2d 01_all_arpwatch-2.1a15-manpages.patch 7097d5d57a4a5897099230b5eb576dfd 02_all_arpwatch-2.1a15-srcdir.patch @@ -91,9 +111,10 @@ da5e87b06bb5a12edc605f2cb6ef86f3 14_all_arpwatch-2.1a15-paths-fix.patch 5adc4ee0193b99261be84105860a0771 18_all_arpwatch-2.1a15-nofork.patch 132e80dadf4bc130df69930a691323dd 19_all_arpwatch-2.1a15-nonewstation.patch 6214671686599ba7102371a2754a691f 20_all_arpwatch-2.1a15-noreversedns-resolve.patch -4fae1ab6cb45dd81d50e9e7f474a1ad7 21_all_arpwatch-2.1a15-pid-filename.patch" +4fae1ab6cb45dd81d50e9e7f474a1ad7 21_all_arpwatch-2.1a15-pid-filename.patch +3e427671678696b622763bc81acfa907 22_alpine_bihourly_script.patch" sha256sums="c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898 arpwatch.tar.gz -8acc2840b75c2da57b8f2a99de83e21b908c94acec77485554c801e88b62cb66 arpwatch.confd +1e81df8d0139d2860b36e8a73e3700ce613bbf588bbd21b9135c5e4f9f64a164 arpwatch.confd a19419228b46da292947cc1a045c0fd57f3826b805c0ee35f3ff62725076acb4 arpwatch.initd ee2aad981f402321960e297ce84df2ca06dbc1e58b63e3d0b62678030efef26c 01_all_arpwatch-2.1a15-manpages.patch 2053a486c2e2cb50ebaea1a3f677c0939ee80ae899e944940ea7ec8fbed67877 02_all_arpwatch-2.1a15-srcdir.patch @@ -115,9 +136,10 @@ d7abb5df788b4d86fa8a92ac5c2a9495af0d17c343faa8bf7452957c5e19ae30 14_all_arpwatc 84537f795ed6f5766ee1a552d1e49ee2b5cf13668e64afa0ac11fef76b97ed08 18_all_arpwatch-2.1a15-nofork.patch f88728dbcf0adcc2104b294bd7bc8a52fceabf93baa4d7f1a7b63e28ac2dfad3 19_all_arpwatch-2.1a15-nonewstation.patch 5c62aa5508da7bf061aa9629a9dab68ce945e68bafb24ab30c3cdea56f50c3a5 20_all_arpwatch-2.1a15-noreversedns-resolve.patch -54811b365f379522306a36eabc89c3c83cd9ddaa9fc8acd2fea84cff442807b9 21_all_arpwatch-2.1a15-pid-filename.patch" +54811b365f379522306a36eabc89c3c83cd9ddaa9fc8acd2fea84cff442807b9 21_all_arpwatch-2.1a15-pid-filename.patch +487624519a39ddbf8c6cad277c5cd0f998228bd222468398c3ba99c715a0d385 22_alpine_bihourly_script.patch" sha512sums="f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90 arpwatch.tar.gz -e1251f8aa860fc5e27c012d7abe7b879018f8d68eb75a71bdf2b6ac22b0c7697ee23a4dc17692394b07bb98a037bacaa24933acaa0d75d3d654e0c45e13cc996 arpwatch.confd +854f6361bf02586516db4f50afdee729c047cd788985f72f475e592e0e744c24d7d765f0391d733dbf417048c26b6d43c00eb63c58e6798bdb2366b93cbfe03a arpwatch.confd 8bb9818d72d1330220631c54a1802d8553a3c43e715ede6c88d44993cbae7c9d95585551a3d97f0fcf5f19ef2e93fb654ac756849b9d0783c19d91773e7f9dce arpwatch.initd 969e956c4fd192d35ce4f23a1f1461eb94a28a8d1e18845d3b099f8833dece003105b415af0a51b4d50221ded4d7434a49bba0ef7f3cac71fda9317b5edeaac3 01_all_arpwatch-2.1a15-manpages.patch 427a55b7599b8c897f1eae1b8f70b9eaa8e692636b666bf2a3a8703d8227c96e29cdcde8186ebcdcff63d902a919cde660ed6d02f9b5dc650ea9fe23afa44a5f 02_all_arpwatch-2.1a15-srcdir.patch @@ -139,4 +161,5 @@ e6f5571f8d4823c56f68ea13267f217cc60a9481cf08dfe632124593f8e3a49d3c7fb57c118490b1 91f01db73b7979464db9e0616cfc2a19c950c65f1409342220e1c6e7b22716827b681cb03ede88644e67d81efc38af32a1fd372151474e9b917abb9e13cdafdd 18_all_arpwatch-2.1a15-nofork.patch 5322d2ea02f300d2be2cd17fdf7154cfd6e775376d56c9ad4bdc520196b533060d6602ebb7a02bb1b4088afccb6c843ead3d01b9e0928125fadcdd4d1efadc88 19_all_arpwatch-2.1a15-nonewstation.patch fd7231744f8025dbcc0bec65ffc02933e0d14717a824187a955a55509316f8667b11bcc4efe847a5002519337b3cc8e778e216ebbb5ad2af504021ea61df4380 20_all_arpwatch-2.1a15-noreversedns-resolve.patch -11da1ec9cce70f2f9fb0657e3bbc2ca9cbad68a292205dfb01effd15643f0aeb693f544f2f8d308b7c3a4901de0a0f91e33676e40cb39dda2314e11097c1eae3 21_all_arpwatch-2.1a15-pid-filename.patch" +11da1ec9cce70f2f9fb0657e3bbc2ca9cbad68a292205dfb01effd15643f0aeb693f544f2f8d308b7c3a4901de0a0f91e33676e40cb39dda2314e11097c1eae3 21_all_arpwatch-2.1a15-pid-filename.patch +6823fee4d2190fcd4003c4e0940b05725fb3c408b2ff1f4af39dd5ae29cee05e7211274dbcc06b78931e5cb36e9893a8a9de6e924a9d54a99410bcdf9e6591bb 22_alpine_bihourly_script.patch" diff --git a/main/arpwatch/arpwatch.confd b/main/arpwatch/arpwatch.confd index f44221aa36..63c1af4942 100644 --- a/main/arpwatch/arpwatch.confd +++ b/main/arpwatch/arpwatch.confd @@ -10,3 +10,5 @@ OPTIONS="-N -p" # Comment this line if you wish arpwatch to run as root user (not recommended) ARPUSER="arpwatch" +# User to be notified used by bihourly.sh +ARPWATCH_REPORT_EMAIL= |