[oe-commits] org.oe.dev arpwatch 2.1a15: Cleanups for arpwatch:

[lenehan commit]

arpwatch 2.1a15: Cleanups for arpwatch:
- mark configuration so they don't get wiped on upgrade
- don't pass -p, for nopromisc, as an option since that isn't
  supported (must be a debian patch which is not included in OE)
- remove RUNAS which was used to specify a non-root user to run as
  since it isn't support (must be a debian patch which is not
  included in OE)
- Use volatiles to create required /var directory.
- Inherit update-rc.d so it is started and stopped during
  uninstall, upgrade and uninstall.

Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: 5344c304721483a5e45526eb6456c2aee49e5713
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5344c304721483a5e45526eb6456c2aee49e5713
Files:
1
packages/arpwatch/files/volatiles.08_arpwatch
packages/arpwatch/arpwatch_2.1a15.bb
packages/arpwatch/files/arpwatch.default
Diffs:

#
# mt diff -rfe03d95c62f69d3a072cfec35e3a1fa942b586a0 -r5344c304721483a5e45526eb6456c2aee49e5713
#
# 
# 
# add_file "packages/arpwatch/files/volatiles.08_arpwatch"
#  content [24fd532b449ccaa645e21a6d7c0ce309b296e53a]
# 
# patch "packages/arpwatch/arpwatch_2.1a15.bb"
#  from [2c2a029406cbdeb7465a8bd3ce5b24c077dbb2ac]
#    to [f3fcb602c284b23986bc9b345e7eb2f37348ac54]
# 
# patch "packages/arpwatch/files/arpwatch.default"
#  from [150b3fc8cd304f02d242d984155d3cc9832fc321]
#    to [89f60a5990643a27c2f6dcd79b76078d24035287]
# 
============================================================
--- packages/arpwatch/files/volatiles.08_arpwatch	24fd532b449ccaa645e21a6d7c0ce309b296e53a
+++ packages/arpwatch/files/volatiles.08_arpwatch	24fd532b449ccaa645e21a6d7c0ce309b296e53a
@@ -0,0 +1,2 @@
+# <type> <owner> <group> <mode> <path> <linksource>
+d root root 0775 /var/lib/arpwatch none
============================================================
--- packages/arpwatch/arpwatch_2.1a15.bb	2c2a029406cbdeb7465a8bd3ce5b24c077dbb2ac
+++ packages/arpwatch/arpwatch_2.1a15.bb	f3fcb602c284b23986bc9b345e7eb2f37348ac54
@@ -1,9 +1,9 @@ RRECOMMENDS = "arpwatch-data"
 DESCRIPTION = "Ethernet/FDDI station activity monitor"
 HOMEPAGE = "http://www-nrg.ee.lbl.gov/"
 SECTION = "network"
 LICENSE = "BSD"
 RRECOMMENDS = "arpwatch-data"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.ee.lbl.gov/arpwatch-${PV}.tar.gz \
            file://05debian_fhs.patch;patch=1 \
@@ -12,21 +12,21 @@ SRC_URI = "ftp://ftp.ee.lbl.gov/arpwatch
            file://arpwatch.default \
            file://arpwatch.conf \
            file://ethercodes.dat \
-           file://make.patch;patch=1"
+           file://make.patch;patch=1 \
+           file://volatiles.08_arpwatch"
 
-inherit autotools
+inherit autotools update-rc.d
 
-EXTRA_OEMAKE = "LDFLAGS=-L${STAGING_LIBDIR}"
-
 PACKAGES =+ "arpwatch-data"
 
 FILES_arpwatch-data = "${datadir}/arpwatch/ethercodes.dat"
 
 do_install() {
         install -d ${D}${bindir} ${D}${sbindir} ${D}${mandir}/man8 \
-                   ${D}${sysconfdir}/default \
-                   ${D}${sysconfdir}/init.d \
-                   ${D}${datadir}/arpwatch
+                ${D}${sysconfdir}/default \
+                ${D}${sysconfdir}/init.d \
+                ${D}${datadir}/arpwatch \
+                ${D}${sysconfdir}/default/volatiles
         oe_runmake install DESTDIR=${D}
         oe_runmake install-man DESTDIR=${D}
         for i in arp2ethers arpfetch massagevendor; do
@@ -40,4 +40,19 @@ do_install() {
         install -m 0644 ${WORKDIR}/arpwatch.default ${D}${sysconfdir}/default/arpwatch
         install -m 0644 ${WORKDIR}/arpwatch.conf ${D}${sysconfdir}
         install -m 0644 ${WORKDIR}/ethercodes.dat ${D}${datadir}/arpwatch
+
+        # We need some /var directories
+        for i in 08_arpwatch; do
+          install -m 0644 ${WORKDIR}/volatiles.$i ${D}${sysconfdir}/default/volatiles/$i
+        done
 }
+
+pkg_postinst_${PN} () {
+        /etc/init.d/populate-volatile.sh update
+}
+
+CONFFILES_${PN} = "${sysconfdir}/default/arpwatch \
+                   ${sysconfdir}/arpwatch.conf"
+
+INITSCRIPT_NAME = "arpwatch"
+INITSCRIPT_PARAMS = "defaults 95 05"
============================================================
--- packages/arpwatch/files/arpwatch.default	150b3fc8cd304f02d242d984155d3cc9832fc321
+++ packages/arpwatch/files/arpwatch.default	89f60a5990643a27c2f6dcd79b76078d24035287
@@ -1,7 +1,4 @@
 # Global options for arpwatch(8).
 
+# Debian: don't report bogons
+ARGS="-N"
-# Debian: don't report bogons, don't use PROMISC.
-ARGS="-N -p"
-
-# Debian: run as `arpwatch' user.  Empty this to run as root.
-RUNAS="arpwatch"