Fix kill/export false positives #458392 by Julian Ospald.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

6 files changed, 110 insertions, 15 deletions

diff --git a/dev-util/checkbashisms/ChangeLog b/dev-util/checkbashisms/ChangeLog
index 9deeb7e8a0c0..0f1b5465718c 100644
--- a/dev-util/checkbashisms/ChangeLog
+++ b/dev-util/checkbashisms/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/checkbashisms
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/checkbashisms/ChangeLog,v 1.5 2014/08/13 04:06:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/checkbashisms/ChangeLog,v 1.6 2014/08/13 04:36:24 vapier Exp $
+
+*checkbashisms-2.0.0.2-r1 (13 Aug 2014)
+
+  13 Aug 2014; Mike Frysinger <vapier@gentoo.org>
+  +checkbashisms-2.0.0.2-r1.ebuild, +files/checkbashisms-2.0.0.2-export.patch,
+  +files/checkbashisms-2.0.0.2-kill.patch,
+  +files/checkbashisms-2.0.0.2-version.patch:
+  Fix kill/export false positives #458392 by Julian Ospald.
 
   13 Aug 2014; Mike Frysinger <vapier@gentoo.org> -checkbashisms-2.0.0.5.ebuild,
   checkbashisms-2.0.0.2.ebuild:
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index ec6bf4bca70a..8c7bc0bbacef 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,24 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX checkbashisms-2.0.0.2-export.patch 681 SHA256 8cd8ea3cd7567b39efc9835501c6d44da8adf4d797ebea2315157735e8998fb7 SHA512 4d00c3e6d310463c6553faa60e3ca9610d51f0c6676279bea081bea0287557740499d22d493e1a3fb6467e447378131f11639c4abf4a388ebce317a71743a12c WHIRLPOOL 88bc7fc1a82988178ba42d9bd3675176e67bacfabfa91d594a63ac18646a148d6a8ead799e091cf60e7f71f66106621342ddb6f0806c1dd9fa689a9c3b8323f1
+AUX checkbashisms-2.0.0.2-kill.patch 922 SHA256 45d32fae8d1de80c837fd2454c17527ad1ba8b90e39433e79eeabd174abe35ff SHA512 c55a02635213816f0ab4897aa8d59377f745aa870ff956b56685b23ac7f826bf2d9d4c31b854cf4e3dc2bd4954ce9ca78101722ef6e139d74a78b94c61d7308a WHIRLPOOL dfcf71f186c2f57fc3eca5655cab2ada32bdb9187ae44bd6d11b772ac64253c8e4455643900a4755f2996c82185108095f942ee7dee80daaf52dc4f96653cbf5
+AUX checkbashisms-2.0.0.2-version.patch 334 SHA256 9405d41083afd70639015edcb0ea613fe87ed7f068b070d31ed46d6c07381a31 SHA512 9aa842f1d8c3ca1c096df9023a89a92a416c629717b78f74e3eaa0cd680ab32d322917b99eb6da978c297521742043ea4b8533fd7b302d82e73026c983c47c04 WHIRLPOOL 7d8dc33a074dde2105911afe4f6cdf64b8b3832471a187e97426ff85e1bdca3fab772f5b056a6431d485ac8fb898cc44421a2ac26e71afcc7d890d460d141c40
 DIST checkbashisms-2.0.0.2 21258 SHA256 4da61b7f08b55609e80c648d215f0201aa9b5f1df53aab6252129537a7f7a0ee SHA512 cd9376f4c34773aba79f81b8bb129d912844102e91e363480b9983092efd36c4827e0447242aecfcdb3cfd4cc50e19e105cc645368e8c9735f49c8e381964dd4 WHIRLPOOL 94adf80badc7b484119df3723968965057ddfc365b59e52a7444e4476396f3c82d72aa43f049a397f5e762948dad0f4e3b679a547682401a469c7b8b587a9db5
+EBUILD checkbashisms-2.0.0.2-r1.ebuild 913 SHA256 a5b23a1d2c5c08f621cde12dbd3540d71950e52f3e5b9f7c6803f1bd30e9b15a SHA512 70c7571ab6bc43d1309c0cb5062b2dbe6c4c72a0c689985a932b2f41c2f93f0e4c8fd8bb2538ab1c7720cea5f5c4590a873c8b048c05071249d04a3c047ce451 WHIRLPOOL 38dfe518df39a5646ac340c7290192f7a90d9af364599ef3fc3bed21f1118dabc36a5bd3487180bd89128512bbda776179515411bfb4f14373d76e25b6eb8d63
 EBUILD checkbashisms-2.0.0.2.ebuild 732 SHA256 a03110f4b348176e69909bd8bea7c745734ad2ac90319d03b961d1dcf5adff88 SHA512 13923abbb92d180e002629528855c84129c6cefe2468ae0ba62824acbe879537dc45a411f54ae691e547938def05bb29981118957c7fde12e402cba65bc3a51f WHIRLPOOL 09635f10345ac4d8164377335b604934de7bc2fc0b06607d9bfa9744ca1718cb92706748a53b67ff527445a78b11c9c99aebb5c0037eab43e691fb73180b136b
-MISC ChangeLog 1095 SHA256 74a7207bffca5d22e0ed6437f0e4ab01a45063f48e3a9d83f8f461aeaa32b7cc SHA512 165951661718dd4e00e205ff676c57c8e5c0ea462db9a6bdd0806e22a244d8edc2e1ad94d0cb5dc0f5952d1a6797757daf5d7a6a8a86ee22179943ef32226bd2 WHIRLPOOL 56c3e8fc890c6ddb37204408241ca212845502ade72e7803c1ad7e7f37646ef643abfd634e7846315916100954d03a3179d9dbde2f52ed1994a58adc7b285ab1
+MISC ChangeLog 1415 SHA256 f417d6e8f8bbedbcf1830606a53552b2a59990a1825057f373610df0b07ae3ff SHA512 5cd0b2be33118fce172186b5cd4af559387ee103b9a1436a369f6a4c696c95e9da86e2f7b3363fbffdb99bd5301f274b94a082d469fdfdfbd7636e8bd35e71e7 WHIRLPOOL baead750c227a3577c595dbe67ba494c8b9b5c8cc0c5440dbdddefdb3a5f08638bcda14d397daf9be42dcfff54b975cf2ed2eeeb510d6a2d96c3c57f7e583eae
 MISC metadata.xml 202 SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a SHA512 bd1c14da72bdd52e3bea3056f5b9f908c31d6915b651d15d80a0a7d26778c97cde493ae9ca4352bd313eb16ddbed9b169c6b620c7f4a9b77973f7077fa8d997c WHIRLPOOL c073cc4c903e3377c7aee652c5661a1657cc5ba70c3deb4b2d7b2d0e31a78fb8b362b2f255de3faddbf4c46250d14d2d5d39a6a13b910ad18f8d53df362163a0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT6uRSAAoJEPGu1DbS6WIA9BIP/1jMM60rCuRBsLbF6XfmvoXi
-4U26yy3Mj/c3AluzZ10bf14UWmqR4Jw4Df4zcNyBsHh8MJyEXvksVrelA/HhYIpA
-xbw4F/dNA+nMwClXLHq6uUaGrt16uu66MkSsb+BgEfKIU56y7bf6iLSBDLoyvKAs
-fJHe1A0dG5H1V7ek/93cCnSb4Gz0ghtHpRtUbpd9cKPQkGHTqcZh613ZgaBHJjEC
-iK/+SsfIzvIr05zrzlbqIVg1QUg+MvDmuVjnUBljGZpAka9OolRQJG7+ZnxcfK6/
-a8KhjRdUzseHvmxV0RCQObiq6kAWbrgwoW9PYCS9Drh/iRPj45EvpmxSW611+TFi
-75z+snlEllUbI2WrLqvzT3Lsh4woOnVSY/mq+yknv1TUd+Et2AGlWXn34DdTRMON
-7OpD5ZE2nz5Ln9G5p0Nyych/tYEZuDvPGsw30liCDnMF3TC9koyPBCCGOZSMj3no
-KnwZevACh/Zfm+6+/Gxry+0Os9f0dxAjj5uTWhDNN+goiAlgI/tJ2ppZPS+fa9vm
-Py8nLYpaTysLrO+dmzlkL9E8awVLneoLitTv6mrtmjcLahzNE3tSE6L0jFe5Uf19
-SwGLA1fAyeZ1ZMoXz230e9NxHdONCCX9QbfS8mkz2fwpyROOkzougp4NljvnjqqS
-1peIVRw+nM1lOAkXJFmD
-=eErE
+iQIbBAEBCAAGBQJT6utQAAoJEPGu1DbS6WIAYJMP+JG7t5pYQH6vk6BV0z2o3Voa
+9Ka8gDbkMJ2UB4oBq4X66SzAVR+ojQkEjf1sypmNfPQhXCMtC/Biqi1Chn55G3uy
++X3GC62DFl9qY8a8It5cy2lnYJiUtLlFAHx1sQdju1vkjPvPp4SrH5Nc5miN4EEY
+nRbvKw1nhXPRqt2wPExTXP/U4cvxZAdioW7QZPM1IswB8JSm7UrnxurhLplKCUPv
+5mxLG6ihXfO+CKS3IDk9h8OouqCGJCivBJphDpoicpOVFEHcn9DHOpQlysatHO/H
+s2T68jtuYkHmLyGlZFTP9XzMjU3vjb2Z1M1WUu+94hAQaZMEDsvycgCnxJbvQk0N
+EmZo7NEyPf5AaOpadz+hJd1kt9yRFbPfETj0TLaU6oNaU8jQE6PrIg5+ND68RriJ
+VxQP3wwVIMsA2Hxj0RML+nRK0BFRT9O9oZieAQTb5eqtEoKERuhn4hOB68Yy5bXR
+0ZOgUQgkKrdGMz3KpvOiiq6FpZvPZs+S2zVRQNU+JVVT3+QdpQ5QqkmRcprLVfnJ
+PiqiXNFJUjLxqWE5Olc5/x3vRFMDEy0S8AFNph8bmM3Z3OuC6ygcc5sRUCbEAtxE
+P4F1QG75FeJ/8Fh0faMtuWZmTPF1toINjkyWC2TrQBJd9R91YlCCXLMGMqoV4nn1
+B0kGIcIIBaISgXDfUAY=
+=0gA4
 -----END PGP SIGNATURE-----
diff --git a/dev-util/checkbashisms/checkbashisms-2.0.0.2-r1.ebuild b/dev-util/checkbashisms/checkbashisms-2.0.0.2-r1.ebuild
new file mode 100644
index 000000000000..94cd28f8185b
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.0.0.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/checkbashisms/checkbashisms-2.0.0.2-r1.ebuild,v 1.1 2014/08/13 04:36:24 vapier Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
+# "checkbaskisms" is not a typo, it's the actual upstream SF project name.
+HOMEPAGE="http://sourceforge.net/projects/checkbaskisms/"
+SRC_URI="mirror://sourceforge/checkbaskisms/${PV}/${PN} -> ${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long
+	!<dev-util/rpmdevtools-8.3-r1"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}"/${P} ${PN}
+	epatch "${FILESDIR}"/${P}-export.patch #458392
+	epatch "${FILESDIR}"/${P}-kill.patch #458392
+	epatch "${FILESDIR}"/${P}-version.patch
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/dev-util/checkbashisms/files/checkbashisms-2.0.0.2-export.patch b/dev-util/checkbashisms/files/checkbashisms-2.0.0.2-export.patch
new file mode 100644
index 000000000000..2ce8a183c8f9
--- /dev/null
+++ b/dev-util/checkbashisms/files/checkbashisms-2.0.0.2-export.patch
@@ -0,0 +1,16 @@
+`export foor=bar` is valid in POSIX
+
+https://sourceforge.net/p/checkbaskisms/checkbashisms/9/
+http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#export
+https://bugs.gentoo.org/458392
+
+--- a/checkbashisms
++++ b/checkbashisms
+@@ -512,7 +512,6 @@
+ 	$LEADIN . qr'disown\s' =>         q<disown>,
+ 	$LEADIN . qr'enable\s' =>         q<enable>,
+         $LEADIN . qr'export\s+-[^p]' =>  q<export only takes -p as an option>,
+-        $LEADIN . qr'export\s+.+=' => q<export foo=bar should be foo=bar; export foo>,
+ 	$LEADIN . qr'mapfile\s' =>        q<mapfile>,
+ 	$LEADIN . qr'readarray\s' =>      q<readarray>,
+ 	$LEADIN . qr'readonly\s+-[af]' => q<readonly -[af]>,
diff --git a/dev-util/checkbashisms/files/checkbashisms-2.0.0.2-kill.patch b/dev-util/checkbashisms/files/checkbashisms-2.0.0.2-kill.patch
new file mode 100644
index 000000000000..7ddb94a5ae1a
--- /dev/null
+++ b/dev-util/checkbashisms/files/checkbashisms-2.0.0.2-kill.patch
@@ -0,0 +1,20 @@
+`kill -HUP` is valid in POSIX
+
+we could extend the check to look for valid signal names, but that seems like
+it's not worth the effort (when the # of signals is >30).  if the code uses a
+wrong signal name, then it'll hit a runtime error regardless of shell.
+
+https://sourceforge.net/p/checkbaskisms/checkbashisms/5/
+http://pubs.opengroup.org/onlinepubs/9699919799/utilities/kill.html
+https://bugs.gentoo.org/458392
+
+--- a/checkbashisms
++++ b/checkbashisms
+@@ -496,7 +496,6 @@
+ 	qr'\&>' =>	               q<should be \>word 2\>&1>,
+ 	qr'(<\&|>\&)\s*((-|\d+)[^\s;|)}`&\\\\]|[^-\d\s]+(?<!\$)(?!\d))' =>	
+ 				       q<should be \>word 2\>&1>,
+-	$LEADIN . qr'kill\s+-[^sl]\w*' => q<kill -[0-9] or -[A-Z]>,
+ 	$LEADIN . qr'trap\s+["\']?.*["\']?\s+.*[1-9]' => q<trap with signal numbers>,
+ 	$LEADIN . qr'trap\s+["\']?.*["\']?\s+.*ERR' => q<trap ERR>,
+ 	qr'\[\[(?!:)' => q<alternative test command ([[ foo ]] should be [ foo ])>,
diff --git a/dev-util/checkbashisms/files/checkbashisms-2.0.0.2-version.patch b/dev-util/checkbashisms/files/checkbashisms-2.0.0.2-version.patch
new file mode 100644
index 000000000000..14dc79e06b96
--- /dev/null
+++ b/dev-util/checkbashisms/files/checkbashisms-2.0.0.2-version.patch
@@ -0,0 +1,13 @@
+https://sourceforge.net/p/checkbaskisms/checkbashisms/1/
+
+--- a/checkbashisms
++++ b/checkbashisms
+@@ -30,7 +30,7 @@
+ EOF
+ 
+ my $version = <<"EOF";
+-This is $progname version 2.0.0.1
++This is $progname version 2.0.0.2
+ (C) Copyright 1998-2003 Richard Braakman, Josip Rodin and Julian Gilbey
+ Additional programming by Mark Hobley
+ EOF