Changeset 181


Ignore:
Timestamp:
Sep 23, 2008, 8:41:26 PM (16 years ago)
Author:
katerina
Message:

Remove support for obsolete version 0.8 of libprelude (ticket #120).

Location:
trunk
Files:
1 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.in

    r180 r181  
    151151        $(srcsrc)/sh_prelink.c $(srcsrc)/sh_static.c \
    152152        $(srcsrc)/sh_portcheck.c $(srcsrc)/sh_port2proc.c\
    153         $(srcsrc)/sh_processcheck.c $(srcsrc)/sh_prelude_old.c \
     153        $(srcsrc)/sh_processcheck.c \
    154154        $(srcsrc)/sh_pthread.c $(srcsrc)/sh_string.c \
    155155        $(srcsrc)/dnmalloc.c \
     
    167167        zAVLTree.o sh_socket.o sh_ignore.o sh_prelude.o \
    168168        sh_mounts.o sh_userfiles.o sh_prelink.o sh_static.o \
    169         sh_processcheck.o sh_portcheck.o sh_port2proc.o sh_prelude_old.o \
     169        sh_processcheck.o sh_portcheck.o sh_port2proc.o \
    170170        sh_pthread.o sh_string.o dnmalloc.o
    171171
     
    17061706sh_prelink.o: $(srcsrc)/sh_prelink.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_tiger.h $(srcinc)/sh_extern.h $(srcinc)/sh_utils.h $(srcinc)/sh_unix.h
    17071707sh_static.o: $(srcsrc)/sh_static.c Makefile config_xor.h $(srcinc)/sh_pthread.h
    1708 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 $(srcinc)/sh_pthread.h
    17091708sh_async.o: $(srcsrc)/sh_async.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_calls.h $(srcinc)/sh_error.h
    17101709sh_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)/sh_pthread.h $(srcinc)/CuTest.h
  • trunk/configure.ac

    r177 r181  
    963963               case "$sh_libprelude_version" in
    964964               0.8*)
    965                 sh_prelude_libs=`$LIBPRELUDE_CONFIG --libs | sed 's,\(.*\)\( -L.* -lprelude$\),\2 \1,'`
    966                 sh_prelude_cflags=`$LIBPRELUDE_CONFIG --cflags`
    967                 LIBS="$LIBS ${sh_prelude_libs}"
    968                 CFLAGS="$CFLAGS ${sh_prelude_cflags}"
    969                 AC_DEFINE(HAVE_LIBPRELUDE,1,[Have libprelude])
    970                 AC_DEFINE(HAVE_LIBPRELUDE_8,1,[Have libprelude 0.8])
     965                AC_MSG_ERROR([Libprelude 0.8 is too old, 0.9.6 or higher is required.])
    971966               ;;
    972967               *)
     
    974969               [
    975970                AC_DEFINE(HAVE_LIBPRELUDE,1,[Have libprelude])
    976                 AC_DEFINE(HAVE_LIBPRELUDE_9,1,[Have libprelude 0.9])
    977971                CFLAGS="$CFLAGS $LIBPRELUDE_PTHREAD_CFLAGS"
    978972                LDFLAGS="$LDFLAGS $LIBPRELUDE_LDFLAGS"
  • trunk/docs/Changelog

    r180 r181  
    112.4.7:
     2        * remove libprelude 0.8 support (obsolete)
    23        * sh_forward.c: increase TIME_OUT_DEF to 900 secs
    34        * dnmalloc.c: initialize rc in dnmalloc_fork_child(),
  • trunk/src/sh_error.c

    r170 r181  
    799799void sh_error_fixup(void)
    800800{
    801 #if defined(HAVE_LIBPRELUDE_9)
     801#if defined(HAVE_LIBPRELUDE)
    802802  if ((errFlags.preludelevel & SH_ERR_NOT)   == 0)
    803803    sh_prelude_init();
     
    815815void sh_error_init_prelude(void)
    816816{
    817 #if defined(HAVE_LIBPRELUDE_9)
     817#if defined(HAVE_LIBPRELUDE)
    818818  if ((errFlags.preludelevel & SH_ERR_NOT)   == 0)
    819819    sh_prelude_init();
  • trunk/src/sh_getopt.c

    r171 r181  
    276276    HAS_ARG_NO,
    277277    sh_getopt_version },
    278 #if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
     278#if defined(HAVE_LIBPRELUDE)
    279279  /* need to skip over these */
    280280  { N_("prelude"), 
     
    373373#ifdef HAVE_LIBPRELUDE
    374374  if (num > 0) fputc ('\n', stdout); ++num;
    375 #ifdef HAVE_LIBPRELUDE_8
    376   fputs (_(" prelude (0.8)"), stdout);
    377 #else
    378   fputs (_(" prelude (0.9+)"), stdout);
    379 #endif
     375  fputs (_(" prelude (0.9.6+)"), stdout);
    380376#endif
    381377
  • trunk/src/sh_hash.c

    r171 r181  
    24412441   * also report device for prelude
    24422442   */
    2443 #if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
     2443#if defined(HAVE_LIBPRELUDE)
    24442444  if (is_new)
    24452445    format = _("dev_new=\"%lu,%lu\" ");
     
    26092609   * also report device for prelude
    26102610   */
    2611 #if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
     2611#if defined(HAVE_LIBPRELUDE)
    26122612  if (is_new)
    26132613    format = _("dev_new=<%lu,%lu>, ");
     
    30623062
    30633063      if (   ((modi_mask & MODI_MOD) != 0)
    3064 #if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
     3064#if defined(HAVE_LIBPRELUDE)
    30653065             || ((modi_mask & MODI_USR) != 0)
    30663066             || ((modi_mask & MODI_GRP) != 0)
     
    32113211       * also report device for prelude
    32123212       */
    3213 #if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
     3213#if defined(HAVE_LIBPRELUDE)
    32143214      if ((modi_mask & MODI_INO) != 0)
    32153215        {
     
    32343234
    32353235      if (   ((modi_mask & MODI_USR) != 0)
    3236 #if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
     3236#if defined(HAVE_LIBPRELUDE)
    32373237          || ((modi_mask & MODI_MOD) != 0)
    32383238#endif
     
    32623262
    32633263      if (   ((modi_mask & MODI_GRP) != 0)
    3264 #if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
     3264#if defined(HAVE_LIBPRELUDE)
    32653265          || ((modi_mask & MODI_MOD) != 0)
    32663266#endif
  • trunk/src/sh_prelude.c

    r180 r181  
    6262char ** sh_argv_store;
    6363
    64 #if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
     64#if defined(HAVE_LIBPRELUDE)
    6565
    6666
  • trunk/src/sh_readconf.c

    r170 r181  
    4848#endif
    4949
    50 #ifdef HAVE_LIBPRELUDE_9
     50#ifdef HAVE_LIBPRELUDE
    5151#include "sh_prelude.h"
    5252#endif
     
    10531053  { N_("preludeclass"),      SH_SECTION_LOG,   SH_SECTION_NONE,
    10541054    sh_error_prelude_mask },
    1055 #ifdef HAVE_LIBPRELUDE_9
    10561055  { N_("preludeprofile"),    SH_SECTION_MISC,  SH_SECTION_NONE,
    10571056    sh_prelude_set_profile },
     
    10641063  { N_("preludemaptohigh"),    SH_SECTION_MISC,  SH_SECTION_NONE,
    10651064    sh_prelude_map_high },
    1066 #endif
    10671065#endif
    10681066
Note: See TracChangeset for help on using the changeset viewer.