Source: resource-agents Version: 1:4.4.0-1 Severity: normal Tags: patch User: [email protected] Usertags: shell X-Debbugs-Cc: [email protected]
Attached is a patch to fix a typo in heartbeat/MailTo that behaves differently when /bin/sh is bash vs. dash by using curly-braces instead of square brackets to define the variable. Without this either "0" or "$[OCF_RESKEY_email_default]" is embedded in the ocf_heartbeat_MailTo.7 manpage depending on the shell, neither of which are probably the intended value. This impacts the reproducibility of the build: https://reproducible-builds.org/docs/ There is also a merge request submitted if that's easier for you: https://salsa.debian.org/ha-team/resource-agents/merge_requests/1 live well, vagrant
From 2b003a7b5f0a0194adaeee04604dafa05a0132fc Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian <[email protected]> Date: Wed, 13 Nov 2019 15:49:29 -0800 Subject: [PATCH] Fix typo in heartbeat/MailTo that behaves differently when /bin/sh is bash vs. dash by using curly-braces instead of square brackets to define the variable. Without this either "0" or "$[OCF_RESKEY_email_default]" is embedded in the ocf_heartbeat_MailTo.7 manpage depending on the shell, neither of which are probably the intended value. This impacts the reproducibility of the build: https://reproducible-builds.org/docs/ --- debian/patches/series | 1 + debian/patches/typo-in-mailto | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 debian/patches/typo-in-mailto diff --git a/debian/patches/series b/debian/patches/series index f58907b..fc8054b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ gitignore.patch reproducible.patch var-run.patch mysql-exit-code.patch +typo-in-mailto diff --git a/debian/patches/typo-in-mailto b/debian/patches/typo-in-mailto new file mode 100644 index 0000000..44c07e5 --- /dev/null +++ b/debian/patches/typo-in-mailto @@ -0,0 +1,26 @@ +From: Vagrant Cascadian <[email protected]> + +Fix typo that behaves differently when /bin/sh is bash vs. dash by +using curly-braces instead of square brackets to define the variable. + +Without this either "0" or "$[OCF_RESKEY_email_default]" is embedded +in the ocf_heartbeat_MailTo.7 manpage depending on the shell, neither +of which are probably the intended value. + +This impacts the reproducibility of the build: + + https://reproducible-builds.org/docs/ + +Index: resource-agents/heartbeat/MailTo +=================================================================== +--- resource-agents.orig/heartbeat/MailTo ++++ resource-agents/heartbeat/MailTo +@@ -67,7 +67,7 @@ a takeover occurs. + The email address of sysadmin. + </longdesc> + <shortdesc lang="en">Email address</shortdesc> +-<content type="string" default="$[OCF_RESKEY_email_default]" /> ++<content type="string" default="${OCF_RESKEY_email_default}" /> + </parameter> + + <parameter name="subject" unique="0"> -- 2.20.1
signature.asc
Description: PGP signature
