Index: /trunk/Makefile.in
===================================================================
--- /trunk/Makefile.in	(revision 78)
+++ /trunk/Makefile.in	(revision 79)
@@ -1683,4 +1683,4 @@
 sh_prelude_old.o: $(srcsrc)/sh_prelude_old.c Makefile config_xor.h $(srcinc)/slib.h $(srcinc)/sh_mem.h $(srcinc)/sh_cat.h $(srcinc)/sh_error_min.h $(srcinc)/sh_prelude.h $(srcinc)/sh_static.h 
 sh_async.o: $(srcsrc)/sh_async.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_calls.h $(srcinc)/sh_error.h 
-sh_processcheck.o: $(srcsrc)/sh_processcheck.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_modules.h $(srcinc)/sh_processcheck.h $(srcinc)/sh_utils.h $(srcinc)/sh_error.h $(srcinc)/sh_extern.h $(srcinc)/CuTest.h 
+sh_processcheck.o: $(srcsrc)/sh_processcheck.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_modules.h $(srcinc)/sh_processcheck.h $(srcinc)/sh_utils.h $(srcinc)/sh_error.h $(srcinc)/sh_extern.h $(srcinc)/sh_calls.h $(srcinc)/CuTest.h 
 sh_portcheck.o: $(srcsrc)/sh_portcheck.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_error.h $(srcinc)/sh_mem.h $(srcinc)/sh_utils.h $(srcinc)/sh_modules.h $(srcinc)/CuTest.h 
Index: /trunk/configure.ac
===================================================================
--- /trunk/configure.ac	(revision 78)
+++ /trunk/configure.ac	(revision 79)
@@ -13,5 +13,5 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.3.0a)
+AM_INIT_AUTOMAKE(samhain, 2.3.1)
 AC_CANONICAL_HOST
 
Index: /trunk/depend.dep
===================================================================
--- /trunk/depend.dep	(revision 78)
+++ /trunk/depend.dep	(revision 79)
@@ -61,4 +61,4 @@
 kern_head.o: $(srcsrc)/kern_head.c Makefile config.h $(srcinc)/kern_head.h $(srcinc)/kern_head.h 
 sh_async.o: $(srcsrc)/sh_async.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_calls.h $(srcinc)/sh_error.h 
-sh_processcheck.o: $(srcsrc)/sh_processcheck.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_modules.h $(srcinc)/sh_processcheck.h $(srcinc)/sh_utils.h $(srcinc)/sh_error.h $(srcinc)/sh_extern.h $(srcinc)/CuTest.h 
+sh_processcheck.o: $(srcsrc)/sh_processcheck.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_modules.h $(srcinc)/sh_processcheck.h $(srcinc)/sh_utils.h $(srcinc)/sh_error.h $(srcinc)/sh_extern.h $(srcinc)/sh_calls.h $(srcinc)/CuTest.h 
 sh_portcheck.o: $(srcsrc)/sh_portcheck.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_error.h $(srcinc)/sh_mem.h $(srcinc)/sh_utils.h $(srcinc)/sh_modules.h $(srcinc)/CuTest.h 
Index: /trunk/depend.sum
===================================================================
--- /trunk/depend.sum	(revision 78)
+++ /trunk/depend.sum	(revision 79)
@@ -1,1 +1,1 @@
-2835584241
+554998806
Index: /trunk/docs/Changelog
===================================================================
--- /trunk/docs/Changelog	(revision 78)
+++ /trunk/docs/Changelog	(revision 79)
@@ -1,3 +1,8 @@
 2.3.1:
+	* don't use sstrip in 'make deb', since dh_shlibdeps uses objdump
+	  (reported by B. Masuda)
+	* rm report.pl from rules.deb.in (reported by B. Masuda)
+	* samhainctl(): longer timeout (bad status reporting at startup,
+	  reported by Phil and by Dan Track)
 	* sh_portcheck.c: make connect errors more descriptive
 	* sh_portcheck.c: fix ignored setting of PortCheckActive
Index: /trunk/rules.deb-light.in
===================================================================
--- /trunk/rules.deb-light.in	(revision 78)
+++ /trunk/rules.deb-light.in	(revision 79)
@@ -87,5 +87,5 @@
 	# dh_installchangelogs @top_srcdir@/docs/Changelog
 	dh_link
-	# dh_strip
+	dh_strip
 	dh_compress
 	dh_fixperms
Index: /trunk/rules.deb.in
===================================================================
--- /trunk/rules.deb.in	(revision 78)
+++ /trunk/rules.deb.in	(revision 79)
@@ -25,6 +25,6 @@
 	@top_srcdir@/configure @mydefargs@
 	$(MAKE) 
-	# echo '#!/bin/sh' > ./sstrip
-	# echo 'echo "*** SSTRIP DISABLED ***"' >> ./sstrip
+	echo '#!/bin/sh' > ./sstrip
+	echo 'echo "*** SSTRIP DISABLED ***"' >> ./sstrip
 	touch build-stamp
 
@@ -76,5 +76,4 @@
 	dh_installexamples @top_srcdir@/scripts/example_pager.pl \
 		@top_srcdir@/scripts/example_sms.pl \
-		@top_srcdir@/scripts/report.pl \
 		@top_srcdir@/scripts/concat.pl \
 		@top_srcdir@/scripts/samhain.logrotator \
@@ -108,5 +107,5 @@
 	dh_installchangelogs @top_srcdir@/docs/Changelog
 	dh_link
-	# dh_strip
+	dh_strip
 	dh_compress
 	dh_fixperms
Index: /trunk/src/samhain.c
===================================================================
--- /trunk/src/samhain.c	(revision 78)
+++ /trunk/src/samhain.c	(revision 79)
@@ -914,5 +914,5 @@
       default:
 	times = 0;
-	while (times < 64) {
+	while (times < 120) {
 	  respid = waitpid(pid, &status, WNOHANG|WUNTRACED);
 	  if ((pid_t)-1 == respid)
@@ -934,5 +934,5 @@
 	  (void) retry_msleep(1, 0);
 	}
-	exit (1);
+	exit (0); /* assume that it runs ok */
       }
     }