[Pkg-nagios-changes] [pkg-nagios] r907 - nagios2/trunk/debian

[Sean Finney]

Author: seanius
Date: 2006-05-23 14:52:06 +0000 (Tue, 23 May 2006)
New Revision: 907

Modified:
   nagios2/trunk/debian/changelog
   nagios2/trunk/debian/nagios2-common.config
Log:
fix in config script and posterity documentation

Modified: nagios2/trunk/debian/changelog
===================================================================
--- nagios2/trunk/debian/changelog	2006-05-18 17:40:55 UTC (rev 906)
+++ nagios2/trunk/debian/changelog	2006-05-23 14:52:06 UTC (rev 907)
@@ -1,9 +1,16 @@
 nagios2 (2.3-1.0) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * posterity:  the previous release 2.3-1 also included a fix for
+    CVE-2006-2489, as we were the ones who discovered it while fixing the
+    previous vulnerability :)
 
- -- Marc Haber <mh+debian-packages at zugschlus.de>  Sat, 13 May 2006 15:01:35 +0200
+  [sean finney]
+  * include the needed function from the webapps-common httpd stub inline
+    in the config script, as fresh installations may not have the file
+    available (if using apt instead of dpkg, for example).  Closes: #353966.
 
+ -- sean finney <seanius at debian.org>  Tue, 23 May 2006 16:43:21 +0200
+
 nagios2 (2.3-1) unstable; urgency=high
 
   * new upstream version

Modified: nagios2/trunk/debian/nagios2-common.config
===================================================================
--- nagios2/trunk/debian/nagios2-common.config	2006-05-18 17:40:55 UTC (rev 906)
+++ nagios2/trunk/debian/nagios2-common.config	2006-05-23 14:52:06 UTC (rev 907)
@@ -2,10 +2,29 @@
 
 . /usr/share/debconf/confmodule
 
-. /usr/share/nagios2/debian/httpd.webapps-common
+# (taken from the webapps-common httpd functions)
+# wc_httpd_installed: test for installed httpds
+# usage:
+#       wc_httpd_installed [ httpd1 httpd2 ... ]
+#
+# no arguments implies to test for all servers
+wc_httpd_installed(){
+        local httpds
+        if [ "$*" ]; then
+                httpds=$*
+        else
+                httpds=$wc_httpd_supported
+        fi
+        for f in $httpds; do
+                if test -x /usr/sbin/$f; then
+                        echo $f
+                fi
+        done
+}
 
+
 # list of installed servers to check for
-default_servers=`wc_httpd_installed $wc_httpd_apaches`
+default_servers=`wc_httpd_installed apache2 apache apache-ssl apache-perl`
 # convert list to comma seperated list
 server_list=`echo $default_servers | sed -e 's/[[:space:]][[:space:]]*/, /g'`