Changeset 79


Ignore:
Timestamp:
Jan 12, 2007, 10:00:55 PM (18 years ago)
Author:
rainer
Message:

Fixes ticket #42 (timeout in samhainctl) and ticket #44 (broken 'make deb' target).

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.in

    r76 r79  
    16831683sh_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
    16841684sh_async.o: $(srcsrc)/sh_async.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_calls.h $(srcinc)/sh_error.h
    1685 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
     1685sh_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
    16861686sh_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

  • trunk/configure.ac

    r78 r79  
    1313dnl start
    1414dnl
    15 AM_INIT_AUTOMAKE(samhain, 2.3.0a)
     15AM_INIT_AUTOMAKE(samhain, 2.3.1)
    1616AC_CANONICAL_HOST
    1717

  • trunk/depend.dep

    r76 r79  
    6161kern_head.o: $(srcsrc)/kern_head.c Makefile config.h $(srcinc)/kern_head.h $(srcinc)/kern_head.h
    6262sh_async.o: $(srcsrc)/sh_async.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_calls.h $(srcinc)/sh_error.h
    63 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
     63sh_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
    6464sh_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

  • trunk/depend.sum

    r76 r79  
    1 2835584241
     1554998806

  • trunk/docs/Changelog

    r78 r79  
    112.3.1:
     2        * don't use sstrip in 'make deb', since dh_shlibdeps uses objdump
     3          (reported by B. Masuda)
     4        * rm report.pl from rules.deb.in (reported by B. Masuda)
     5        * samhainctl(): longer timeout (bad status reporting at startup,
     6          reported by Phil and by Dan Track)
    27        * sh_portcheck.c: make connect errors more descriptive
    38        * sh_portcheck.c: fix ignored setting of PortCheckActive

  • trunk/rules.deb-light.in

    r68 r79  
    8787        # dh_installchangelogs @top_srcdir@/docs/Changelog
    8888        dh_link
    89         # dh_strip
     89        dh_strip
    9090        dh_compress
    9191        dh_fixperms

  • trunk/rules.deb.in

    r68 r79  
    2525        @top_srcdir@/configure @mydefargs@
    2626        $(MAKE)
    27         # echo '#!/bin/sh' > ./sstrip
    28         # echo 'echo "*** SSTRIP DISABLED ***"' >> ./sstrip
     27        echo '#!/bin/sh' > ./sstrip
     28        echo 'echo "*** SSTRIP DISABLED ***"' >> ./sstrip
    2929        touch build-stamp
    3030
    … …  
    7676        dh_installexamples @top_srcdir@/scripts/example_pager.pl \
    7777                @top_srcdir@/scripts/example_sms.pl \
    78                 @top_srcdir@/scripts/report.pl \
    7978                @top_srcdir@/scripts/concat.pl \
    8079                @top_srcdir@/scripts/samhain.logrotator \
    … …  
    108107        dh_installchangelogs @top_srcdir@/docs/Changelog
    109108        dh_link
    110         # dh_strip
     109        dh_strip
    111110        dh_compress
    112111        dh_fixperms

  • trunk/src/samhain.c

    r59 r79  
    914914      default:
    915915        times = 0;
    916         while (times < 64) {
     916        while (times < 120) {
    917917          respid = waitpid(pid, &status, WNOHANG|WUNTRACED);
    918918          if ((pid_t)-1 == respid)
    … …  
    934934          (void) retry_msleep(1, 0);
    935935        }
    936         exit (1);
     936        exit (0); /* assume that it runs ok */
    937937      }
    938938    }
Note: See TracChangeset for help on using the changeset viewer.