Changeset 181 for trunk

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:

• Makefile.in (modified) (3 diffs)
• configure.ac (modified) (2 diffs)
• docs/Changelog (modified) (1 diff)
• src/sh_error.c (modified) (2 diffs)
• src/sh_getopt.c (modified) (2 diffs)
• src/sh_hash.c (modified) (6 diffs)
• src/sh_prelude.c (modified) (1 diff)
• src/sh_prelude_old.c (deleted)
• src/sh_readconf.c (modified) (3 diffs)

trunk/Makefile.in

@@ -151 +151 @@
         $(srcsrc)/sh_prelink.c $(srcsrc)/sh_static.c \
         $(srcsrc)/sh_portcheck.c $(srcsrc)/sh_port2proc.c\
-        $(srcsrc)/sh_processcheck.c $(srcsrc)/sh_prelude_old.c \
+        $(srcsrc)/sh_processcheck.c \
         $(srcsrc)/sh_pthread.c $(srcsrc)/sh_string.c \
         $(srcsrc)/dnmalloc.c \
@@ -167 +167 @@
         zAVLTree.o sh_socket.o sh_ignore.o sh_prelude.o \
         sh_mounts.o sh_userfiles.o sh_prelink.o sh_static.o \
-        sh_processcheck.o sh_portcheck.o sh_port2proc.o sh_prelude_old.o \
+        sh_processcheck.o sh_portcheck.o sh_port2proc.o \
         sh_pthread.o sh_string.o dnmalloc.o
 
@@ -1706 +1706 @@
 sh_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 
 sh_static.o: $(srcsrc)/sh_static.c Makefile config_xor.h $(srcinc)/sh_pthread.h 
-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 
 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)/sh_calls.h $(srcinc)/sh_pthread.h $(srcinc)/CuTest.h 

trunk/configure.ac

@@ -963 +963 @@
                case "$sh_libprelude_version" in
                0.8*)
-                sh_prelude_libs=`$LIBPRELUDE_CONFIG --libs | sed 's,\(.*\)\( -L.* -lprelude$\),\2 \1,'`
-                sh_prelude_cflags=`$LIBPRELUDE_CONFIG --cflags`
-                LIBS="$LIBS ${sh_prelude_libs}"
-                CFLAGS="$CFLAGS ${sh_prelude_cflags}"
-                AC_DEFINE(HAVE_LIBPRELUDE,1,[Have libprelude])
-                AC_DEFINE(HAVE_LIBPRELUDE_8,1,[Have libprelude 0.8])
+                AC_MSG_ERROR([Libprelude 0.8 is too old, 0.9.6 or higher is required.])
                ;;
                *)
@@ -974 +969 @@
                [
                 AC_DEFINE(HAVE_LIBPRELUDE,1,[Have libprelude])
-                AC_DEFINE(HAVE_LIBPRELUDE_9,1,[Have libprelude 0.9])
                 CFLAGS="$CFLAGS $LIBPRELUDE_PTHREAD_CFLAGS"
                 LDFLAGS="$LDFLAGS $LIBPRELUDE_LDFLAGS"

trunk/docs/Changelog

@@ -1 +1 @@
 2.4.7:
+        * remove libprelude 0.8 support (obsolete)
         * sh_forward.c: increase TIME_OUT_DEF to 900 secs
         * dnmalloc.c: initialize rc in dnmalloc_fork_child(),

trunk/src/sh_error.c

@@ -799 +799 @@
 void sh_error_fixup(void)
 {
-#if defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
   if ((errFlags.preludelevel & SH_ERR_NOT)   == 0)
     sh_prelude_init();
@@ -815 +815 @@
 void sh_error_init_prelude(void)
 {
-#if defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
   if ((errFlags.preludelevel & SH_ERR_NOT)   == 0)
     sh_prelude_init();

trunk/src/sh_getopt.c

@@ -276 +276 @@
     HAS_ARG_NO, 
     sh_getopt_version },
-#if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
   /* need to skip over these */
   { N_("prelude"),  
@@ -373 +373 @@
 #ifdef HAVE_LIBPRELUDE
   if (num > 0) fputc ('\n', stdout); ++num;
-#ifdef HAVE_LIBPRELUDE_8
-  fputs (_(" prelude (0.8)"), stdout);
-#else
-  fputs (_(" prelude (0.9+)"), stdout);
-#endif
+  fputs (_(" prelude (0.9.6+)"), stdout);
 #endif
 

trunk/src/sh_hash.c

@@ -2441 +2441 @@
    * also report device for prelude
    */
-#if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
   if (is_new)
     format = _("dev_new=\"%lu,%lu\" ");
@@ -2609 +2609 @@
    * also report device for prelude
    */
-#if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
   if (is_new)
     format = _("dev_new=<%lu,%lu>, ");
@@ -3062 +3062 @@
 
       if (   ((modi_mask & MODI_MOD) != 0)
-#if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
              || ((modi_mask & MODI_USR) != 0)
              || ((modi_mask & MODI_GRP) != 0)
@@ -3211 +3211 @@
        * also report device for prelude
        */
-#if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
       if ((modi_mask & MODI_INO) != 0)
         {
@@ -3234 +3234 @@
 
       if (   ((modi_mask & MODI_USR) != 0)
-#if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
           || ((modi_mask & MODI_MOD) != 0)
 #endif
@@ -3262 +3262 @@
 
       if (   ((modi_mask & MODI_GRP) != 0)
-#if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
           || ((modi_mask & MODI_MOD) != 0)
 #endif

trunk/src/sh_prelude.c

@@ -62 +62 @@
 char ** sh_argv_store;
 
-#if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
 
 

trunk/src/sh_readconf.c

@@ -48 +48 @@
 #endif
 
-#ifdef HAVE_LIBPRELUDE_9
+#ifdef HAVE_LIBPRELUDE
 #include "sh_prelude.h"
 #endif
@@ -1053 +1053 @@
   { N_("preludeclass"),      SH_SECTION_LOG,   SH_SECTION_NONE, 
     sh_error_prelude_mask },
-#ifdef HAVE_LIBPRELUDE_9
   { N_("preludeprofile"),    SH_SECTION_MISC,  SH_SECTION_NONE,
     sh_prelude_set_profile },
@@ -1064 +1063 @@
   { N_("preludemaptohigh"),    SH_SECTION_MISC,  SH_SECTION_NONE,
     sh_prelude_map_high },
-#endif
 #endif