From 3e2b0fa30850e08f4a672cdd6b6014c21d7a52c7 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Wed, 7 Nov 2007 01:15:31 +0000
Subject: [PATCH] Improve the way out of date modules are detected

---
 jabber/module.info | 1 +
 sentry/module.info | 1 +
 setup.sh           | 5 ++++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/jabber/module.info b/jabber/module.info
index 395e524bb..681aaa136 100644
--- a/jabber/module.info
+++ b/jabber/module.info
@@ -9,3 +9,4 @@ desc_ru_RU=
 longdesc=Configure the multi-protocol Jabber messaging server.
 cpan=1
 os_support=!windows
+nondefault=1
diff --git a/sentry/module.info b/sentry/module.info
index 4dc34fc79..98201b979 100644
--- a/sentry/module.info
+++ b/sentry/module.info
@@ -10,3 +10,4 @@ desc_ru_RU=
 longdesc=Configure the portsentry, hostsentry and logcheck system security monitoring programs.
 readonly=1
 os_support=!windows
+nondefault=1
diff --git a/setup.sh b/setup.sh
index 6d367efcf..f9e344710 100755
--- a/setup.sh
+++ b/setup.sh
@@ -77,7 +77,10 @@ fi
 
 # Validate source directory
 allmods=`cd "$srcdir"; echo */module.info | sed -e 's/\/module.info//g'`
-defaultallmods=`cd "$srcdir"; echo */module.info | grep -v jabber/module.info | grep -v sentry/module.info | sed -e 's/\/module.info//g'`
+defaultallmods=`cd "$srcdir"; echo */module.info | xargs grep -L nondefault=1 2>/dev/null | sed -e 's/\/module.info//g'`
+if [ "$defaultallmods" = "" ]; then
+	defaultallmods="$allmods"
+fi
 if [ "$allmods" = "" ]; then
 	echo "ERROR: Failed to get module list"
 	echo ""