Changeset 101


Ignore:
Timestamp:
Apr 24, 2007, 10:57:49 AM (15 years ago)
Author:
rainer
Message:

Fix compile bug with --with-kcheck

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.in

    r100 r101  
    10021002        echo "l none /etc/rc1.d/K10@install_name@=/etc/init.d/@install_name@" >> prototype; \
    10031003        ARCH=`uname -p`; \
    1004         PSTAMP=`date '+%cc%yy%mm%dd%HH%MM%SS'`; \
     1004        PSTAMP=`date '+%c%y%m%d%H%M%S'`; \
    10051005        echo "PKG=@install_name@"         >  pkginfo; \
    10061006        echo "NAME=file integrity check"  >> pkginfo; \
     
    12051205# For kernel syscall monitoring
    12061206kern_head: Makefile $(top_srcdir)/include/kern_head.h $(srcsrc)/kern_head.c
    1207         @echo "$(BUILD_CC) -I. -DSYSTEMMAP=\"@systemmap@\" -o kern_head $(srcsrc)/kern_head.c $(LIBS_KVM)"; \
    1208         $(BUILD_CC) -I. -DSYSTEMMAP=\"@systemmap@\" -o kern_head $(srcsrc)/kern_head.c $(LIBS_KVM)
     1207        @echo "$(BUILD_CC) -I. -I./include -DSYSTEMMAP=\"@systemmap@\" -o kern_head $(srcsrc)/kern_head.c $(LIBS_KVM)"; \
     1208        $(BUILD_CC) -I. -I./include -DSYSTEMMAP=\"@systemmap@\" -o kern_head $(srcsrc)/kern_head.c $(LIBS_KVM)
    12091209
    12101210sh_ks.h: kern_head
  • trunk/configure.ac

    r100 r101  
    10111011                echo
    10121012                echo " Either the mysql or the zlib library was not found"
    1013                 echo " or was unusable, maybe because an old, incompatible"
    1014                 echo " version is installed on your system, eg compiled from"
    1015                 echo " source long time ago. See config.log for the error"
     1013                echo " or was unusable. Possible reasons include:"
     1014                echo "  - an old, incompatible version compiled from source"
     1015                echo "  - on Solaris, libmysql is compiled with the Solaris"
     1016                echo "    compiler, thus the mysql_config script provides"
     1017                echo "    compiler options unsuitable for gcc (move"
     1018                echo "    mysql_config out of your PATH)"
     1019                echo " For other problems, check config.log for the error"
    10161020                echo " message from the compiler."
    1017                 echo " Please review your installed mysql and zlib libraries"
    1018                 echo " and/or use --with-libs=-L/path/to/libdirectory"
     1021                echo
     1022                echo " If your mysql and zlib libraries are installed in an"
     1023                echo " unusual place, use --with-libs=-L/path/to/libdirectory"
    10191024                echo " where libdirectory is the directory holding libmysql"
    10201025                echo " or libz."
  • trunk/docs/Changelog

    r100 r101  
    1 2.3.3:
     12.3.4:
     2        * fixed compilation of kern_head (problem reported by S. Clormann)
     3        * more typos fixed (reported by John Horne)
     4
     52.3.3 (27-03-2007):
    26        * fixed typos in configure.ac and manual (reported by John Horne)
    37        * don't use mysql_options on x86_64, since libmysql is broken
  • trunk/docs/FAQ.html

    r91 r101  
    139139</ul>
    140140</div>
    141 <p><i>FAQ Revised: Monday 12 February 2007 23:06:43</i></p>
     141<p><i>FAQ Revised: Saturday 14 April 2007 17:05:58</i></p>
    142142<hr><h2>Table of Contents</h2>
    143143<dl>
     
    161161<li><a href="#Build and install8">2.9. What is sh_tiger1.s?</a></li>
    162162<li><a href="#Build and install9">2.10. Why does static compiling (<code>--enable-static</code>) on MaxOS X fail ?</a></li>
     163<li><a href="#Build and install10">2.11. Why does compiling with MySQL fail on Solaris ?</a></li>
    163164</ul></dd>
    164165<dt><b>3. File checking</b></dt>
     
    406407<a href="http://developer.apple.com/qa/qa2001/qa1118.html">Technical Q&A QA1118</a>.
    407408This is a MacOS X issue and not a bug in samhain.<br><br></dd>
     409<dt><b><a name="Build and install10">2.11. Why does compiling with MySQL fail on Solaris ?</a></b></dt>
     410<dd>The reason is often the shell script 'mysql_config' that comes as part
     411of MySQL. This script is intended to print appropriate compiler flags for
     412compiling applications that use MySQL. Unfortunately, since Sun compiles
     413MySQL with the Solaris compiler, this script outputs options for the Solaris
     414compiler (i.e. unsuitable for gcc). To solve this problem, you need to move
     415this script (i.e. 'mysql_config') out of your PATH before running
     416<tt>./configure</tt> (unless of course you are using the Solaris compiler
     417rather than gcc).<br><br></dd>
    408418</dl>
    409419<hr><h2>3. File checking</h2>
     
    469479as &quot;localhost&quot; to the server, thus the server
    470480needs to trust the client name
    471 as reported by the client itself, and suppress all eroors on resolving
     481as reported by the client itself, and suppress all errors on resolving
    472482this name to the apparent address. In the server configuration:
    473483
     
    587597     <p>
    588598     Alternatively, you can <code>scp</code> the database
    589      to the client, run <code>samhain -t update -l none</code> (you
     599     to the client, run <code>samhain -t update -l none --foreground</code>
     600     (you
    590601     need to avoid logging because otherwise you will get in conflict with
    591602     the running samhain daemon), and then <code>scp</code> the
  • trunk/samhainrc.freebsd

    r59 r101  
    546546# FileCheckScheduleTwo = NULL
    547547
    548 ## Report only once on modified fles
     548## Report only once on modified files
    549549## Setting this to 'FALSE' will generate a report for any policy
    550550## violation (old and new ones) each time the daemon checks the file system.
  • trunk/samhainrc.linux

    r18 r101  
    582582# FileCheckScheduleTwo = NULL
    583583
    584 ## Report only once on modified fles
     584## Report only once on modified files
    585585## Setting this to 'FALSE' will generate a report for any policy
    586586## violation (old and new ones) each time the daemon checks the file system.
  • trunk/samhainrc.netbsd

    r59 r101  
    679679# FileCheckScheduleTwo = NULL
    680680
    681 ## Report only once on modified fles
     681## Report only once on modified files
    682682## Setting this to 'FALSE' will generate a report for any policy
    683683## violation (old and new ones) each time the daemon checks the file system.
  • trunk/samhainrc.solaris

    r1 r101  
    506506# FileCheckScheduleTwo = NULL
    507507
    508 ## Report only once on modified fles
     508## Report only once on modified files
    509509## Setting this to 'FALSE' will generate a report for any policy
    510510## violation (old and new ones) each time the daemon checks the file system.
  • trunk/src/sh_prelink.c

    r34 r101  
    7575  long status;
    7676  char magic[4];
     77
     78  /* 42 bytes is about the minimum an ELF binary might have
     79   * (with plenty of hacks to reduce the size, such as interleaving
     80   * the code with the header...)
     81   */
    7782  if (size < 42)
    7883    return S_FALSE;
     84
    7985  status = sl_read_timeout (fd, magic, 4, alert_timeout);
    8086  (void) sl_rewind(fd);
Note: See TracChangeset for help on using the changeset viewer.