summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-11-10 19:51:36 -0500
committerMike Frysinger <vapier@gentoo.org>2015-11-10 19:52:31 -0500
commit5bd43e9ac265acdd453bf060cd2ee40cb946674d (patch)
treee3114bd2a3a2b7dc1eb7d9c96777a7e73d9daa32 /dev-util/checkbashisms/files
parentdev-util/checkbashisms: add base-system herd (diff)
downloadgentoo-5bd43e9ac265acdd453bf060cd2ee40cb946674d.tar.gz
gentoo-5bd43e9ac265acdd453bf060cd2ee40cb946674d.tar.bz2
gentoo-5bd43e9ac265acdd453bf060cd2ee40cb946674d.zip
dev-util/checkbashisms: switch to Debian as upsream
They're the original upstream and they've made more updates since (like flagging bash-4 features). Switch over to it!
Diffstat (limited to 'dev-util/checkbashisms/files')
-rw-r--r--dev-util/checkbashisms/files/checkbashisms-2.15.9-command-vV.patch30
-rw-r--r--dev-util/checkbashisms/files/checkbashisms-2.15.9-printf-b.patch30
2 files changed, 60 insertions, 0 deletions
diff --git a/dev-util/checkbashisms/files/checkbashisms-2.15.9-command-vV.patch b/dev-util/checkbashisms/files/checkbashisms-2.15.9-command-vV.patch
new file mode 100644
index 000000000000..662ccdfd2bea
--- /dev/null
+++ b/dev-util/checkbashisms/files/checkbashisms-2.15.9-command-vV.patch
@@ -0,0 +1,30 @@
+https://bugs.debian.org/733511
+
+From 50dac50bdfa7ab482bf2277cc1a620a62629c80c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 10 Nov 2015 19:39:19 -0500
+Subject: [PATCH] checkbashisms: allow `command` to use -v/-V
+
+POSIX permits the -v/-V options:
+http://pubs.opengroup.org/onlinepubs/9699919799/utilities/command.html
+command [-p][-v|-V] command_name
+---
+ scripts/checkbashisms.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl
+index 045328c..fe64a6b 100755
+--- a/scripts/checkbashisms.pl
++++ b/scripts/checkbashisms.pl
+@@ -644,7 +644,7 @@ sub init_hashes {
+ qr';;?&' => q<;;& and ;& special case operators>,
+ $LEADIN . qr'jobs\s' => q<jobs>,
+ # $LEADIN . qr'jobs\s+-[^lp]\s' => q<'jobs' with option other than -l or -p>,
+- $LEADIN . qr'command\s+-[^p]\s' => q<'command' with option other than -p>,
++ $LEADIN . qr'command\s+-[^pvV]\s' => q<'command' with option other than -p/-v/-V>,
+ $LEADIN . qr'setvar\s' => q<setvar 'foo' 'bar' should be eval 'foo="'"$bar"'"'>,
+ $LEADIN . qr'trap\s+["\']?.*["\']?\s+.*(?:ERR|DEBUG|RETURN)' => q<trap with ERR|DEBUG|RETURN>,
+ $LEADIN . qr'(?:exit|return)\s+-\d' => q<exit|return with negative status code>,
+--
+2.6.2
+
diff --git a/dev-util/checkbashisms/files/checkbashisms-2.15.9-printf-b.patch b/dev-util/checkbashisms/files/checkbashisms-2.15.9-printf-b.patch
new file mode 100644
index 000000000000..6a53e02ad6d8
--- /dev/null
+++ b/dev-util/checkbashisms/files/checkbashisms-2.15.9-printf-b.patch
@@ -0,0 +1,30 @@
+From 18cd946c5d43d010c3821a4620cf97dbc0406ed8 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 10 Nov 2015 19:40:24 -0500
+Subject: [PATCH] checkbashisms: allow `printf` to use %b
+
+POSIX permits the b conversion specifier character:
+http://pubs.opengroup.org/onlinepubs/9699919799/utilities/printf.html
+
+EXTENDED DESCRIPTION
+7. An additional conversion specifier character, b, shall be supported as follows.
+---
+ scripts/checkbashisms.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl
+index fe64a6b..0229752 100755
+--- a/scripts/checkbashisms.pl
++++ b/scripts/checkbashisms.pl
+@@ -689,7 +689,7 @@ sub init_hashes {
+ qr'\$\(\([\s\w$*/+-]*\w\-\-.*?\)\)' => q<'$((n--))' should be '$n; $((n=n-1))'>,
+ qr'\$\(\([\s\w$*/+-]*\-\-\w.*?\)\)' => q<'$((--n))' should be '$((n=n-1))'>,
+ qr'\$\(\([\s\w$*/+-]*\*\*.*?\)\)' => q<exponentiation is not POSIX>,
+- $LEADIN . qr'printf\s["\'][^"\']*?%[qb].+?["\']' => q<printf %q|%b>,
++ $LEADIN . qr'printf\s["\'][^"\']*?%q.+?["\']' => q<printf %q>,
+ );
+
+ %singlequote_bashisms = (
+--
+2.6.2
+