add snmptrapd(8) support

snmp/rc.snmp

@@ -5,6 +5,7 @@
 
 %config
     snmp_enable="$openpkg_rc_def"
+    snmp_daemons="snmpd snmptrapd"
     snmp_log_prolog="true"
     snmp_log_epilog="true"
     snmp_log_numfiles="10"
@@ -12,9 +13,15 @@
     snmp_log_complevel="9"
 
 %common
-    snmp_pidfile="@l_prefix@/var/snmp/snmpd.pid"
+    snmp_pidfile_snmptrapd="@l_prefix@/var/snmp/snmptrapd.pid"
+    snmp_pidfile_snmpd="@l_prefix@/var/snmp/snmpd.pid"
     snmp_signal () {
-        [ -f $snmp_pidfile ] && kill -$1 `cat $snmp_pidfile`
+        [ -f $snmp_pidfile_snmptrapd ] \
+            && kill -$1 `cat $snmp_pidfile_snmptrapd`
+        local rc=$?
+        [ -f $snmp_pidfile_snmpd ] \
+            && kill -$1 `cat $snmp_pidfile_snmpd` \
+            && [ $rc -eq 0 ]
     }
 
 %status -u @l_susr@ -o
@@ -31,7 +38,12 @@
 %start -u @l_susr@
     rcService snmp enable yes || exit 0
     rcService snmp active yes && exit 0
-    @l_prefix@/sbin/snmpd -s
+    for daemon in $snmp_daemons; do
+        case "$daemon" in
+            snmpd     ) @l_prefix@/sbin/snmpd     -Lsd ;;
+            snmptrapd ) @l_prefix@/sbin/snmptrapd -Lsd ;;
+        esac
+    done
 
 %stop -u @l_susr@
     rcService snmp enable yes || exit 0

snmp/snmp.spec

@@ -49,8 +49,9 @@ Release:      20041119
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/net-snmp/net-snmp-%{version}.tar.gz
 Source1:      rc.snmp
-Source2:      snmpd.conf
-Source3:      fsl.snmp
+Source2:      fsl.snmp
+Source3:      snmpd.conf
+Source4:      snmptrapd.conf
 Patch0:       snmp.patch
 
 #   build information
@@ -94,6 +95,9 @@ AutoReqProv:  no
     %{l_shtool} subst \
         -e 's;\(pid_file =\) NULL;\1 "%{l_prefix}/var/snmp/snmpd.pid";' \
         agent/snmpd.c
+    %{l_shtool} subst \
+        -e 's;\(pid_file =\) NULL;\1 "%{l_prefix}/var/snmp/snmptrapd.pid";' \
+        apps/snmptrapd.c
 
     #   adjust package for RPM support in Host MIB
     #   (because OpenPKG RPM is a little bit different)
@@ -189,7 +193,7 @@ AutoReqProv:  no
 
     #   install default configuration
     %{l_shtool} install -c -m 644 \
-        %{SOURCE snmpd.conf} \
+        %{SOURCE snmpd.conf} %{SOURCE snmptrapd.conf} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/snmp/
 
     #   strip down installation

snmp/snmptrapd.conf

@@ -0,0 +1,4 @@
+##
+##  snmptrapd.conf
+##
+