[asterisk/f16] Revert changes to menuselect that stopped build of a couple modules

[Jeffrey C. Ollie]

commit ef692f2d0d5d2d6a2fcc06d789a651f40f6871b3
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Thu Oct 6 16:14:55 2011 -0500

    Revert changes to menuselect that stopped build of a couple modules

 ...t-enable-modules-that-are-explicitly-disa.patch |   40 ++++++++++++++++++++
 asterisk.spec                                      |    6 +++
 2 files changed, 46 insertions(+), 0 deletions(-)
---
diff --git a/0001-Revert-Don-t-enable-modules-that-are-explicitly-disa.patch b/0001-Revert-Don-t-enable-modules-that-are-explicitly-disa.patch
new file mode 100644
index 0000000..b9b5ad3
--- /dev/null
+++ b/0001-Revert-Don-t-enable-modules-that-are-explicitly-disa.patch
@@ -0,0 +1,40 @@
+From ff210ce111360ce07afa2793be3e7dc699e330ff Mon Sep 17 00:00:00 2001
+From: "Jeffrey C. Ollie" <jeff at ocjtech.us>
+Date: Thu, 6 Oct 2011 16:06:08 -0500
+Subject: [PATCH] Revert "Don't enable modules that are explicitly disabled by
+ default."
+
+This reverts commit 8394488ba473b38c5a8fba0c6b72fef3da0997a7.
+---
+ menuselect.c |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/menuselect.c b/menuselect.c
+index 1cc21f8..2a5d7dc 100644
+--- a/menuselect.c
++++ b/menuselect.c
+@@ -287,16 +287,16 @@ static int parse_tree(const char *tree_file)
+ 				mem->explicitly_enabled_only = !strcasecmp(tmp, "yes");
+ 			}
+ 
++			if (!cat->positive_output) {
++				mem->was_enabled = mem->enabled = 1;
++				print_debug("Enabling %s because the category does not have positive output\n", mem->name);
++			}
++
+ 			cur3 = mxmlFindElement(cur2, cur2, "defaultenabled", NULL, NULL, MXML_DESCEND);
+ 			if (cur3 && cur3->child) {
+ 				mem->defaultenabled = cur3->child->value.opaque;
+ 			}
+ 
+-			if (!cat->positive_output && (!mem->defaultenabled || !strcasecmp(mem->defaultenabled, "yes"))) {
+-				mem->was_enabled = mem->enabled = 1;
+-				print_debug("Enabling %s because the category does not have positive output\n", mem->name);
+-			}
+-
+ 			cur3 = mxmlFindElement(cur2, cur2, "support_level", NULL, NULL, MXML_DESCEND);
+ 			if (cur3 && cur3->child) {
+ 				mem->support_level = cur3->child->value.opaque;
+-- 
+1.7.6.4
+
diff --git a/asterisk.spec b/asterisk.spec
index 2a129f0..495de7a 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -47,6 +47,8 @@ Patch11: 0011-This-fixes-the-inotify-code-to-handle-call-files-bei.patch
 Patch12: 0012-Fix-two-problems-with-app_sms.patch
 Patch13: 0013-Remove-blank-lines-to-improve-compat-with-389-Direct.patch
 
+Patch14: 0001-Revert-Don-t-enable-modules-that-are-explicitly-disa.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
 BuildRequires: autoconf
@@ -482,6 +484,10 @@ local filesystem.
 %patch12 -p1
 %patch13 -p1
 
+pushd menuselect
+%patch14 -p1
+popd
+
 cp %{S:3} menuselect.makedeps
 cp %{S:4} menuselect.makeopts