Changeset 100


Ignore:
Timestamp:
Mar 27, 2007, 11:55:19 PM (15 years ago)
Author:
rainer
Message:

Release 2.3.3; minor testscript and typo fixes.

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.in

    r98 r100  
    15531553INITFILES=samhain.startIRIX samhain.startFreeBSD samhain.startSolaris \
    15541554samhain.startLSB samhain.startGentoo samhain.startLinux samhain.startHPUX \
    1555 samhain.startIRIX
     1555samhain.startIRIX samhain.startMACOSX
    15561556
    15571557SCRIPTFILES=redhat_i386.client.spec check_samhain.pl samhainadmin.pl
  • trunk/configure.ac

    r98 r100  
    610610
    611611AC_ARG_ENABLE(db-reload,
    612         [  --enable-db-reload           enable database reload on SIGHUP [no]],
     612        [  --enable-db-reload           enable database reload on SIGHUP [[no]]],
    613613        [
    614614        if test "x${enable_db_reload}" = xyes; then
  • trunk/docs/Changelog

    r99 r100  
    112.3.3:
     2        * fixed typos in configure.ac and manual (reported by John Horne)
     3        * don't use mysql_options on x86_64, since libmysql is broken
    24        * fixed cross-compiling (patch by Joe MacDonald)
    35        * refactor sh_kern.c, sh_suidchk.c
     
    1012          (reported by Jonny Halfmoon)
    1113
    12 2.3.2:
     142.3.2 (29-01-2007):
    1315        * fix regression in full stealth mode (incorrect comparison of
    1416          bytes read vs. maximum capacity), reported by B. Fleming
     
    1921 
    20222.3.1 (21-01-2007):
    21         * fix bug that my cause accidental closure of yule TCP socket
     23        * fix bug that may cause accidental closure of yule TCP socket
    2224          (problem reported by B. Masuda)
    2325        * fix sh_kern.c for kernel 2.6.19 (reported by S. Clormann)
  • trunk/scripts/samhainrc_update.sh

    r29 r100  
    11#! /bin/sh
     2
     3# Copyright Rainer Wichmann (2006)
     4#
     5# License Information:
     6# This program is free software; you can redistribute it and/or modify
     7# it under the terms of the GNU General Public License as published by
     8# the Free Software Foundation; either version 2 of the License, or
     9# (at your option) any later version.
     10#
     11# This program is distributed in the hope that it will be useful,
     12# but WITHOUT ANY WARRANTY; without even the implied warranty of
     13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     14# GNU General Public License for more details.
     15#
     16# You should have received a copy of the GNU General Public License
     17# along with this program; if not, write to the Free Software
     18# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     19
    220
    321# -----------------------------------------------------------------------
  • trunk/test/testrun_1a.sh

    r89 r100  
    135135        [ -z "$quiet" ] && log_ok ${tcount} ${MAXTEST};
    136136    fi
     137    return 0
    137138}
    138139
     
    148149    BUILDOPTS="$PREBUILDOPTS --enable-stealth=137"; export BUILDOPTS
    149150    testrun_stealth
    150 
     151    check_err $? ${tcount};
    151152    log_end "RUN STANDALONE W/STEALTH"
    152153    return 0
  • trunk/test/testrun_1b.sh

    r97 r100  
    203203        log_skip 1 $MAXTEST 'gpg not found in $PATH'
    204204        log_skip 2 $MAXTEST 'gpg not found in $PATH'
     205        log_skip 3 $MAXTEST 'gpg not found in $PATH'
    205206    else
    206207        eval "$GPG" --list-keys 0F571F6C >/dev/null 2>/dev/null
     
    208209            log_skip 1 $MAXTEST 'public PGP key 0x0F571F6C not present'
    209210            log_skip 2 $MAXTEST 'public PGP key 0x0F571F6C not present'
     211            log_skip 3 $MAXTEST 'public PGP key 0x0F571F6C not present'
    210212        else
    211213            #
  • trunk/test/testrun_2c.sh

    r88 r100  
    123123    if [ -z "$doall" ]; then
    124124        log_skip 1 $MAXTEST 'Client/server w/mysql (or use --really-all)'
     125        log_skip 2 $MAXTEST 'Client/server w/mysql (or use --really-all)'
     126        log_skip 3 $MAXTEST 'Client/server w/mysql (or use --really-all)'
    125127        return 0
    126128    fi
     
    131133    if [ -z "$MYSQL" ]; then
    132134        log_skip 1 $MAXTEST "mysql not found";
     135        log_skip 2 $MAXTEST "mysql not found";
     136        log_skip 3 $MAXTEST "mysql not found";
    133137        return 1
    134138    else
     
    136140        if [ $? -ne 0 -o -z "$TEST" ]; then
    137141            log_skip 1 $MAXTEST "mysql not default setup"
     142            log_skip 2 $MAXTEST "mysql not default setup"
     143            log_skip 3 $MAXTEST "mysql not default setup"
    138144            return 1
    139145        fi
     
    189195    GPG=`find_path gpg`
    190196    if [ -z "$GPG" ]; then
    191         log_skip 1 $MAXTEST 'gpg not found in $PATH'
     197        log_skip 3 $MAXTEST 'gpg not found in $PATH'
    192198    else
    193199        eval "$GPG" --list-keys 0F571F6C >/dev/null 2>/dev/null
    194200        if [ $? -ne 0 ]; then
    195             log_skip 1 $MAXTEST 'public PGP key 0x0F571F6C not present'
     201            log_skip 3 $MAXTEST 'public PGP key 0x0F571F6C not present'
    196202        else
    197203            testrun_threesockets "$GPG"
Note: See TracChangeset for help on using the changeset viewer.