[svn-commits] russell: branch 1.4 r89339 - in /branches/1.4: build_tools/ include/asterisk/...

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Nov 16 16:26:44 2007
New Revision: 89339

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89339
Log:
Temporarily revert revision 89325, which added md5 magic for keeping track of
what build options were used.  We agreed that we should remove this before
making a 1.4 release, and then we can put it back in.  Then, we can take a
month or so to play around with it to get it how we want it.

Modified:
    branches/1.4/build_tools/make_buildopts_h
    branches/1.4/include/asterisk/module.h
    branches/1.4/main/loader.c

Modified: branches/1.4/build_tools/make_buildopts_h
URL: http://svn.digium.com/view/asterisk/branches/1.4/build_tools/make_buildopts_h?view=diff&rev=89339&r1=89338&r2=89339
==============================================================================
--- branches/1.4/build_tools/make_buildopts_h (original)
+++ branches/1.4/build_tools/make_buildopts_h Fri Nov 16 16:26:44 2007
@@ -14,7 +14,4 @@
 if ${GREP} AST_DEVMODE makeopts | ${GREP} -q yes
 then
 	echo "#define AST_DEVMODE 1"
-	TMP="${TMP} AST_DEVMODE"
 fi
-BUILDSUM=`echo ${TMP} | md5sum`
-echo "#define AST_BUILDOPT_SUM {0x${BUILDSUM:0:8}, 0x${BUILDSUM:8:8}, 0x${BUILDSUM:16:8}, 0x${BUILDSUM:24:8}}"

Modified: branches/1.4/include/asterisk/module.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/module.h?view=diff&rev=89339&r1=89338&r2=89339
==============================================================================
--- branches/1.4/include/asterisk/module.h (original)
+++ branches/1.4/include/asterisk/module.h Fri Nov 16 16:26:44 2007
@@ -203,7 +203,6 @@
 
 	const char *key;
 	unsigned int flags;
-	unsigned int buildopt_sum[4];		/* The value of AST_BUILDOPT_SUM when this module was compiled */
 };
 
 void ast_module_register(const struct ast_module_info *);
@@ -230,8 +229,7 @@
 		AST_MODULE,				\
 		desc,					\
 		keystr,					\
-		flags_to_set,				\
-		AST_BUILDOPT_SUM,			\
+		flags_to_set				\
 	};						\
 	static void  __attribute__ ((constructor)) __reg_module(void) \
 	{ \
@@ -261,7 +259,6 @@
 		.flags = flags_to_set,				\
 		.description = desc,				\
 		.key = keystr,					\
-		.buildopt_sum = AST_BUILDOPT_SUM,		\
 		fields						\
 	};							\
 	static void  __attribute__ ((constructor)) __reg_module(void) \

Modified: branches/1.4/main/loader.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/loader.c?view=diff&rev=89339&r1=89338&r2=89339
==============================================================================
--- branches/1.4/main/loader.c (original)
+++ branches/1.4/main/loader.c Fri Nov 16 16:26:44 2007
@@ -76,8 +76,6 @@
 { 0x87, 0x76, 0x79, 0x35, 0x23, 0xea, 0x3a, 0xd3,
   0x25, 0x2a, 0xbb, 0x35, 0x87, 0xe4, 0x22, 0x24 };
 
-static unsigned int buildopt_sum[4] = AST_BUILDOPT_SUM;
-
 static unsigned int embedding = 1; /* we always start out by registering embedded modules,
 				      since they are here before we dlopen() any
 				   */
@@ -600,8 +598,6 @@
 
 static unsigned int inspect_module(const struct ast_module *mod)
 {
-	unsigned int buildopt_empty[4] = { 0, };
-
 	if (!mod->info->description) {
 		ast_log(LOG_WARNING, "Module '%s' does not provide a description.\n", mod->resource);
 		return 1;
@@ -614,13 +610,6 @@
 
 	if (verify_key((unsigned char *) mod->info->key)) {
 		ast_log(LOG_WARNING, "Module '%s' did not provide a valid license key.\n", mod->resource);
-		return 1;
-	}
-
-	if (memcmp(buildopt_empty, mod->info->buildopt_sum, sizeof(buildopt_empty)) &&
-	    memcmp(buildopt_sum, mod->info->buildopt_sum, sizeof(buildopt_sum))) {
-		ast_log(LOG_WARNING, "Module '%s' was not compiled with the same compile-time options as this version of Asterisk.\n", mod->resource);
-		ast_log(LOG_WARNING, "Module '%s' will not be initialized as it may cause instability.\n", mod->resource);
 		return 1;
 	}