Re: Upcoming Lenny Point Release

[Alexander Wirt <formorer@debian.org>]

Philipp Kern schrieb am Friday, den 05. June 2009:

Hi, 

> we intend to do a Lenny Point Release on Saturday, June 20th.  We will
> clear stable NEW in the coming days and then declare the point release
> frozen.  Please hurry up if you still need something to go into Lenny
> at that point.
Indeed, unfortunatly an upload of nagios3 from one of my team member short
before lenny introduced a nasty bug with a broken postrm which leads to many
bugreports. As this bug is really annoying I prepared an update of nagios3
for lenny (interdiff attached). It would be nice to get this approved for the
next point release. I also fixed some other annoying bug which prevents
removing of the package if you removed the nagios-apache configuration. 

Thanks in advance 

Alex

diff -u nagios3-3.0.6/debian/nagios3-common.prerm nagios3-3.0.6/debian/nagios3-common.prerm
--- nagios3-3.0.6/debian/nagios3-common.prerm
+++ nagios3-3.0.6/debian/nagios3-common.prerm
@@ -4,7 +4,7 @@
 
 apacheconf="/etc/nagios3/apache2.conf"
 
-if [ -f $apacheconf ]
+if [ -f $apacheconf ]; then
   case "$1" in
     remove)
 	# find the configured servers
diff -u nagios3-3.0.6/debian/nagios3-common.postinst nagios3-3.0.6/debian/nagios3-common.postinst
--- nagios3-3.0.6/debian/nagios3-common.postinst
+++ nagios3-3.0.6/debian/nagios3-common.postinst
@@ -74,12 +74,13 @@
 
 	# configure the web servers, if it is desired
 	if [ "$servers" ]; then
-		wc_httpd_apache_include $apacheconf nagios3 $servers
-		# reload the selected servers if they are running 
-		running_servers="$(wc_httpd_running $servers)"
-		if [ "$running_servers" ]; then
-			wc_httpd_invoke "reload" $running_servers
-		fi
+		if wc_httpd_apache_include $apacheconf nagios3 $servers; then
+			# reload the selected servers if they are running 
+			running_servers="$(wc_httpd_running $servers)"
+			if [ "$running_servers" ]; then
+				wc_httpd_invoke "reload" $running_servers
+			fi
+		fi	
 	fi
 
 
diff -u nagios3-3.0.6/debian/changelog nagios3-3.0.6/debian/changelog
--- nagios3-3.0.6/debian/changelog
+++ nagios3-3.0.6/debian/changelog
@@ -1,3 +1,11 @@
+nagios3 (3.0.6-4~lenny1) unstable; urgency=low
+
+  * Fix typo in nagios3-common.prerm (Closes: #514168)
+  * Do not fail if apache include file has been removed 
+    by the user (Closes: #515260)
+
+ -- Alexander Wirt <formorer@debian.org>  Mon, 25 May 2009 17:16:16 +0000
+
 nagios3 (3.0.6-3) unstable; urgency=low
 
   [ Alexander Wirt ]
only in patch2:
unchanged:
--- nagios3-3.0.6.orig/contrib/perlxsi.c
+++ nagios3-3.0.6/contrib/perlxsi.c
@@ -0,0 +1,16 @@
+#include <EXTERN.h>
+#include <perl.h>
+
+EXTERN_C void xs_init (pTHX);
+
+EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
+
+EXTERN_C void
+xs_init(pTHX)
+{
+	char *file = __FILE__;
+	dXSUB_SYS;
+
+	/* DynaLoader is a special case */
+	newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
+}