summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--top/maint.mk4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 774cdb11e7..4c318b912f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-08-07 Simon Josefsson <simon@josefsson.org>
+ Jim Meyering <meyering@redhat.com>
+
+ maintainer-makefile: Fix syntax error with dash.
+ * top/maint.mk (sc_vulnerable_makefile_CVE-2009-4029): Quote arguments.
+ (sc_vulnerable_makefile_CVE-2012-3386): Likewise.
+
2012-08-05 Jim Meyering <meyering@redhat.com>
extern-inline: also ignore -Wmissing-declarations
diff --git a/top/maint.mk b/top/maint.mk
index f42c199d7f..a2b0b8d1bd 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1222,7 +1222,7 @@ sc_prohibit_path_max_allocation:
sc_vulnerable_makefile_CVE-2009-4029:
@prohibit='perm -777 -exec chmod a\+rwx|chmod 777 \$$\(distdir\)' \
- in_files=(^\|/)Makefile\\.in$$ \
+ in_files='(^|/)Makefile\.in$$' \
halt=$$(printf '%s\n' \
'the above files are vulnerable; beware of running' \
' "make dist*" rules, and upgrade to fixed automake' \
@@ -1231,7 +1231,7 @@ sc_vulnerable_makefile_CVE-2009-4029:
sc_vulnerable_makefile_CVE-2012-3386:
@prohibit='chmod a\+w \$$\(distdir\)' \
- in_files=(^\|/)Makefile\\.in$$ \
+ in_files='(^|/)Makefile\.in$$' \
halt=$$(printf '%s\n' \
'the above files are vulnerable; beware of running' \
' "make distcheck", and upgrade to fixed automake' \