tags 724116 + pending patch
tags 739608 + pending patch
thanks
Dear maintainer,
I've prepared an NMU for resource-agents (versioned as
1:3.9.3+git20121009-3.1) and uploaded it to DELAYED/5. Please feel
free to tell me if I should delay it longer.
Regards,
Salvatore
diff -Nru resource-agents-3.9.3+git20121009/debian/changelog resource-agents-3.9.3+git20121009/debian/changelog
--- resource-agents-3.9.3+git20121009/debian/changelog 2012-11-22 11:19:32.000000000 +0100
+++ resource-agents-3.9.3+git20121009/debian/changelog 2014-02-21 09:02:44.000000000 +0100
@@ -1,3 +1,19 @@
+resource-agents (1:3.9.3+git20121009-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add 724116-fix-FTBFS.patch patch.
+ Fixes "resource-agents: FTBFS: /bin/bash: /install-sh: No such file or
+ directory".
+ Thanks to William Grant <wgr...@ubuntu.com> (Closes: #724116)
+ * Add 0001-Disable-HTTPS-SSL-certificate-hostname-checking-tidy.patch patch.
+ Fixes "ldirectord: fails to test HTTPS real servers". HTTPS checks with
+ request/receive will fail under newer versions of the LWP module due to
+ certificate name checking being enabled by default. This +disables the
+ check again so that service checking by IP only still succeeds.
+ (Closes: #739608)
+
+ -- Salvatore Bonaccorso <car...@debian.org> Thu, 20 Feb 2014 13:40:22 +0100
+
resource-agents (1:3.9.3+git20121009-3) unstable; urgency=low
* Fix the previous upload by including the proper patch this time.
diff -Nru resource-agents-3.9.3+git20121009/debian/patches/0001-Disable-HTTPS-SSL-certificate-hostname-checking-tidy.patch resource-agents-3.9.3+git20121009/debian/patches/0001-Disable-HTTPS-SSL-certificate-hostname-checking-tidy.patch
--- resource-agents-3.9.3+git20121009/debian/patches/0001-Disable-HTTPS-SSL-certificate-hostname-checking-tidy.patch 1970-01-01 01:00:00.000000000 +0100
+++ resource-agents-3.9.3+git20121009/debian/patches/0001-Disable-HTTPS-SSL-certificate-hostname-checking-tidy.patch 2014-02-21 09:02:44.000000000 +0100
@@ -0,0 +1,56 @@
+From 68fad38326b7c04efd6434e736e32fe395eafe02 Mon Sep 17 00:00:00 2001
+From: Matthew Newton <m...@leicester.ac.uk>
+Date: Fri, 11 Oct 2013 10:43:40 +0100
+Subject: [PATCH] Disable HTTPS SSL certificate hostname checking, tidy debug
+ output
+
+HTTPS checks with request/receive will fail under newer versions of the
+LWP module due to certificate name checking being enabled by default. This
+disables the check again so that service checking by IP only still succeeds.
+
+Additional debug output shows the Status line so that it is easier to find out
+why the service is down. Debug output tidied up when SSL values are not set
+(usually if there has been an error, or the host is unreachable).
+---
+ ldirectord/ldirectord.in | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/ldirectord/ldirectord.in b/ldirectord/ldirectord.in
+index 45a4204..6a46d97 100644
+--- a/ldirectord/ldirectord.in
++++ b/ldirectord/ldirectord.in
+@@ -2835,7 +2835,7 @@ sub check_http
+ &ld_debug(2, "check_http: url=\"$$r{url}\" "
+ . "virtualhost=\"$virtualhost\"");
+
+- my $ua = new LWP::UserAgent();
++ my $ua = new LWP::UserAgent(ssl_opts => { verify_hostname => 0 });
+
+ my $h = undef;
+ if ($$v{service} eq "http_proxy") {
+@@ -2876,14 +2876,16 @@ sub check_http
+ }
+
+ if ($$v{service} eq "https") {
+- &ld_debug(2, "SSL-Cipher: " .
+- $res->header('Client-SSL-Cipher'));
+- &ld_debug(2, "SSL-Cert-Subject: " .
+- $res->header('Client-SSL-Cert-Subject'));
+- &ld_debug(2, "SSL-Cert-Issuer: " .
+- $res->header('Client-SSL-Cert-Issuer'));
++ &ld_debug(2, "SSL-Cipher: " .
++ ($res->header('Client-SSL-Cipher') || '<not set>'));
++ &ld_debug(2, "SSL-Cert-Subject: " .
++ ($res->header('Client-SSL-Cert-Subject') || '<not set>'));
++ &ld_debug(2, "SSL-Cert-Issuer: " .
++ ($res->header('Client-SSL-Cert-Issuer') || '<not set>'));
+ }
+
++ &ld_debug(2, "Return status: " . $res->status_line);
++
+ my $recstr = $$r{receive};
+ if ($res->is_success && (!($recstr =~ /.+/) ||
+ $res->content =~ /$recstr/)) {
+--
+1.9.0
+
diff -Nru resource-agents-3.9.3+git20121009/debian/patches/724116-fix-FTBFS.patch resource-agents-3.9.3+git20121009/debian/patches/724116-fix-FTBFS.patch
--- resource-agents-3.9.3+git20121009/debian/patches/724116-fix-FTBFS.patch 1970-01-01 01:00:00.000000000 +0100
+++ resource-agents-3.9.3+git20121009/debian/patches/724116-fix-FTBFS.patch 2014-02-21 09:02:44.000000000 +0100
@@ -0,0 +1,45 @@
+Description: Fix configure.ac to cope with new autoconf.
+ Recent autoconfs generate a bad configure when AM_INIT_AUTOMAKE is
+ called as late as it was, ending up thinking that the am_aux_dir is pwd
+ at the start of the build. Move it up to under AC_INIT to fix that.
+Author: William Grant <wgr...@ubuntu.com>
+
+Index: resource-agents-3.9.3+git20121009/configure.ac
+===================================================================
+--- resource-agents-3.9.3+git20121009.orig/configure.ac 2012-10-06 05:27:22.000000000 +1000
++++ resource-agents-3.9.3+git20121009/configure.ac 2013-12-16 17:28:42.354909697 +1100
+@@ -22,6 +22,13 @@
+ AC_INIT([resource-agents],
+ m4_esyscmd([make/git-version-gen .tarball-version]),
+ [to_be_defi...@foobar.org])
++AC_CONFIG_AUX_DIR(.)
++
++dnl
++dnl AM_INIT_AUTOMAKE([1.11.1 foreign dist-bzip2 dist-xz])
++dnl
++
++AM_INIT_AUTOMAKE([1.10.1 foreign dist-bzip2])
+
+ AC_USE_SYSTEM_EXTENSIONS
+
+@@ -29,7 +36,6 @@
+
+ PKG_FEATURES=""
+
+-AC_CONFIG_AUX_DIR(.)
+ AC_CANONICAL_HOST
+
+ dnl Where #defines go (e.g. `AC_CHECK_HEADERS' below)
+@@ -56,12 +62,6 @@
+ [ --with-pkg-name=name Override package name (if you're a packager needing to pretend) ],
+ [ PACKAGE_NAME="$withval" ])
+
+-dnl
+-dnl AM_INIT_AUTOMAKE([1.11.1 foreign dist-bzip2 dist-xz])
+-dnl
+-
+-AM_INIT_AUTOMAKE([1.10.1 foreign dist-bzip2])
+-
+ AC_DEFINE_UNQUOTED(AGENTS_VERSION, "$PACKAGE_VERSION", Current agents version)
+
+ CC_IN_CONFIGURE=yes
diff -Nru resource-agents-3.9.3+git20121009/debian/patches/series resource-agents-3.9.3+git20121009/debian/patches/series
--- resource-agents-3.9.3+git20121009/debian/patches/series 2012-11-22 10:36:25.000000000 +0100
+++ resource-agents-3.9.3+git20121009/debian/patches/series 2014-02-21 09:02:44.000000000 +0100
@@ -2,3 +2,5 @@
02_spelling_fixes.patch
mysql-path.patch
fix-gethostinfo-v2.patch
+724116-fix-FTBFS.patch
+0001-Disable-HTTPS-SSL-certificate-hostname-checking-tidy.patch
