diff options
author | Francesco Colista <francesco.colista@gmail.com> | 2013-07-18 07:13:55 +0000 |
---|---|---|
committer | Francesco Colista <francesco.colista@gmail.com> | 2013-07-18 07:13:55 +0000 |
commit | c01e5a5a1f38dd8812e7b54ffb9d374cd8e8bc28 (patch) | |
tree | 0c168d3d95d8e9bcec753c89b7179fa5787d9305 /main/arpwatch | |
parent | 093a801bc14b67ecf36b9237cf55b6b47588dbcd (diff) | |
download | aports-c01e5a5a1f38dd8812e7b54ffb9d374cd8e8bc28.tar.bz2 aports-c01e5a5a1f38dd8812e7b54ffb9d374cd8e8bc28.tar.xz |
main/arpwatch:
- fixed typo of pkguser in pkgusers
- changed arpuser to arpwatch
- fixed /var/run dir creation and changepath
Diffstat (limited to 'main/arpwatch')
-rw-r--r-- | main/arpwatch/APKBUILD | 16 | ||||
-rw-r--r-- | main/arpwatch/arpwatch.initd | 13 |
2 files changed, 15 insertions, 14 deletions
diff --git a/main/arpwatch/APKBUILD b/main/arpwatch/APKBUILD index 66fecb88a7..6679be4dab 100644 --- a/main/arpwatch/APKBUILD +++ b/main/arpwatch/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: Francesco Colista <francesco.colista@gmail.com> pkgname=arpwatch pkgver=2.1a15 -pkgrel=7 +pkgrel=8 pkgdesc="Ethernet monitoring program" url="http://www-nrg.ee.lbl.gov/" arch="all" license="BSD" depends= -pkguser=arpwatch +pkgusers=arpwatch makedepends="libpcap-dev" install="$pkgname.pre-install" subpackages="$pkgname-ethercodes" @@ -62,12 +62,10 @@ build() { package() { cd $_builddir - #install command wouldn't create directory ? + #make install command wouldn't create directory mkdir -p "$pkgdir"/usr/sbin/ make -j1 DESTDIR="$pkgdir" install - mkdir -p "$pkgdir"/var/lib/arpwatch - mkdir -p "$pkgdir"/var/run/arpwatch - chown arpuser "$pkgdir"/var/run/arpwatch + install -d -o arpwatch "$pkgdir"/var/lib/arpwatch || return 1 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 @@ -90,7 +88,7 @@ ethercodes() { md5sums="cebfeb99c4a7c2a6cee2564770415fe7 arpwatch.tar.gz df4f7b1b785ea9f92f917442690a5677 arpwatch.confd -51ecada198c4f954ac4d5f5903198ebb arpwatch.initd +0378428801a55e52d9f54c21663bb0b7 arpwatch.initd 05c30c8d960d6b87b2ffc9e414bb9e2d 01_all_arpwatch-2.1a15-manpages.patch 7097d5d57a4a5897099230b5eb576dfd 02_all_arpwatch-2.1a15-srcdir.patch 0fa77a4adc8421a95a6bcf424252efca 03_all_arpwatch-2.1a15-getopt.patch @@ -115,7 +113,7 @@ da5e87b06bb5a12edc605f2cb6ef86f3 14_all_arpwatch-2.1a15-paths-fix.patch 3e427671678696b622763bc81acfa907 22_alpine_bihourly_script.patch" sha256sums="c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898 arpwatch.tar.gz 1e81df8d0139d2860b36e8a73e3700ce613bbf588bbd21b9135c5e4f9f64a164 arpwatch.confd -a19419228b46da292947cc1a045c0fd57f3826b805c0ee35f3ff62725076acb4 arpwatch.initd +cb3b97667d06ced14dd3325d7c12a4f78aea108381caf207316dbb7c9019b31b arpwatch.initd ee2aad981f402321960e297ce84df2ca06dbc1e58b63e3d0b62678030efef26c 01_all_arpwatch-2.1a15-manpages.patch 2053a486c2e2cb50ebaea1a3f677c0939ee80ae899e944940ea7ec8fbed67877 02_all_arpwatch-2.1a15-srcdir.patch 33c5c469e0e3b2cd135f2246c1b1c558a01dbf8ccaa9120220177c2cda314b87 03_all_arpwatch-2.1a15-getopt.patch @@ -140,7 +138,7 @@ f88728dbcf0adcc2104b294bd7bc8a52fceabf93baa4d7f1a7b63e28ac2dfad3 19_all_arpwatc 487624519a39ddbf8c6cad277c5cd0f998228bd222468398c3ba99c715a0d385 22_alpine_bihourly_script.patch" sha512sums="f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90 arpwatch.tar.gz 854f6361bf02586516db4f50afdee729c047cd788985f72f475e592e0e744c24d7d765f0391d733dbf417048c26b6d43c00eb63c58e6798bdb2366b93cbfe03a arpwatch.confd -8bb9818d72d1330220631c54a1802d8553a3c43e715ede6c88d44993cbae7c9d95585551a3d97f0fcf5f19ef2e93fb654ac756849b9d0783c19d91773e7f9dce arpwatch.initd +4914342692657ca60a1f24930b9ade027330ba98c77e13393c0f453a09fbcd666e92e67a69a37e3eebc210bb6c87f632495be1ea5e743dac640fca57b5dcadff arpwatch.initd 969e956c4fd192d35ce4f23a1f1461eb94a28a8d1e18845d3b099f8833dece003105b415af0a51b4d50221ded4d7434a49bba0ef7f3cac71fda9317b5edeaac3 01_all_arpwatch-2.1a15-manpages.patch 427a55b7599b8c897f1eae1b8f70b9eaa8e692636b666bf2a3a8703d8227c96e29cdcde8186ebcdcff63d902a919cde660ed6d02f9b5dc650ea9fe23afa44a5f 02_all_arpwatch-2.1a15-srcdir.patch 04ab5ed5e1097901e80d70925936a2ecdb7e1d815b627cbfa246a15a4fb7cbca59b9be04840c694f71c0ff8e2f3201a6047b4fbbb9e62687e7d95ea29c5e6ae4 03_all_arpwatch-2.1a15-getopt.patch diff --git a/main/arpwatch/arpwatch.initd b/main/arpwatch/arpwatch.initd index b97c25a9c8..069d9b93f7 100644 --- a/main/arpwatch/arpwatch.initd +++ b/main/arpwatch/arpwatch.initd @@ -9,6 +9,9 @@ depend() { } start() { + checkpath -d -o ${ARPUSER}\ + -m 0755 /var/run/arpwatch + for IFACE in ${IFACES} do ebegin "Starting arpwatch on ${IFACE}" @@ -16,12 +19,12 @@ start() { [ ! -f ${DATAFILE} ] && touch ${DATAFILE} if [ -z ${ARPUSER} ]; then - start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \ - /usr/sbin/arpwatch -- -i ${IFACE} -f ${DATAFILE} -P /var/run/arpwatch.${IFACE}.pid ${OPTIONS} + start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch/arpwatch.${IFACE}.pid --exec \ + /usr/sbin/arpwatch -- -i ${IFACE} -f ${DATAFILE} -P /var/run/arpwatch/arpwatch.${IFACE}.pid ${OPTIONS} else chown ${ARPUSER} ${DATAFILE} - start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \ - /usr/sbin/arpwatch -- -i $IFACE -u ${ARPUSER} -f ${DATAFILE} -P /var/run/arpwatch.${IFACE}.pid ${OPTIONS} + start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch/arpwatch.${IFACE}.pid --exec \ + /usr/sbin/arpwatch -- -i $IFACE -u ${ARPUSER} -f ${DATAFILE} -P /var/run/arpwatch/arpwatch.${IFACE}.pid ${OPTIONS} fi eend $? done @@ -31,7 +34,7 @@ stop() { for IFACE in ${IFACES} do ebegin "Stopping arpwatch on ${IFACE}" - start-stop-daemon --stop --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \ + start-stop-daemon --stop --quiet --pidfile=/var/run/arpwatch/arpwatch.${IFACE}.pid --exec \ /usr/sbin/arpwatch eend $? done |