correct and obey tcp wrapper usage help; address is optional, port is mandatory; improve source addr/port control in rc file;

smtpfeed/rc.smtpfeed

@@ -6,8 +6,10 @@
 %config
     smtpfeed_enable="$openpkg_rc_def"
     smtpfeed_flags="-u -V"
-    smtpfeed_bind_local="127.0.0.1:2525"
-    smtpfeed_bind_remote="0.0.0.0"
+    smtpfeed_bind="127.0.0.1"
+    smtpfeed_port="2525"
+    smtpfeed_source_addr=""
+    smtpfeed_source_port=""
     smtpfeed_hostname="localhost"
     smtpfeed_timeout_connect="1m"
     smtpfeed_timeout_greet="2m"
@@ -26,7 +28,8 @@
     smtpfeed_args="$smtpfeed_args -t connect=${smtpfeed_timeout_connect:-1m}"
     smtpfeed_args="$smtpfeed_args -t greet=${smtpfeed_timeout_greet:-2m}"
     smtpfeed_args="$smtpfeed_args -t rset=${smtpfeed_timeout_rset:-2m}"
-    smtpfeed_args="$smtpfeed_args -o ${smtpfeed_bind_remote:-0.0.0.0}"
+    smtpfeed_args="$smtpfeed_args ${smtpfeed_source_addr:+-o }${smtpfeed_source_addr}"
+    smtpfeed_args="$smtpfeed_args ${smtpfeed_source_port:+-p }${smtpfeed_source_port}"
     smtpfeed_args="$smtpfeed_args -c ${smtpfeed_hostname:-localhost}"
     smtpfeed_args="$smtpfeed_args -r 1 -R ${smtpfeed_maxrcpt:-100}"
     smtpfeed_args="$smtpfeed_args -s ${smtpfeed_maxsize:-4194304}"
@@ -34,7 +37,7 @@
         [ -f $smtpfeed_pidfile ] && kill -$1 `cat $smtpfeed_pidfile`
     }
     smtpfeed_start () {
-        ( @l_prefix@/sbin/smtpfeedd ${smtpfeed_bind_local:-127.0.0.1:2525} \
+        ( @l_prefix@/sbin/smtpfeedd ${smtpfeed_bind}${smtpfeed_bind:+:}${smtpfeed_port:-2525} \
           @l_prefix@/sbin/smtpfeed ${smtpfeed_args} \
           </dev/null >/dev/null 2>&1 &
           echo "$!" >${smtpfeed_pidfile}

smtpfeed/smtpfeed.spec

@@ -65,6 +65,7 @@ AutoReqProv:  no
 %prep
     %setup0 -q -c
     %setup1 -q -T -D -a 1
+    %{l_shtool} subst -e 's/port program \[argv0 argv1/port argv0 \[argv1 argv2/' smtpfeedd/smtpfeedd.c
     %{l_shtool} subst \
         -e 's;5\.8;5.[89];g' \
         smtpfeed-%{version}/configure