Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/checkbashisms/files/, dev-util/checkbashisms/
Date: Tue, 09 Oct 2018 12:28:31
Message-Id: 1539088097.15557363f5c958f42eb40a6b3de47d3c813b84aa.polynomial-c@gentoo
1 commit: 15557363f5c958f42eb40a6b3de47d3c813b84aa
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 9 12:27:36 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 9 12:28:17 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15557363
7
8 dev-util/checkbashisms: Bump to version 2.18.6
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 dev-util/checkbashisms/Manifest | 1 +
14 dev-util/checkbashisms/checkbashisms-2.18.6.ebuild | 40 ++++++++++++++++++++++
15 .../files/checkbashisms-2.18.6-command-vV.patch | 30 ++++++++++++++++
16 3 files changed, 71 insertions(+)
17
18 diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
19 index e7f16d6dd06..fd32a4adb33 100644
20 --- a/dev-util/checkbashisms/Manifest
21 +++ b/dev-util/checkbashisms/Manifest
22 @@ -1,3 +1,4 @@
23 DIST devscripts_2.18.2.tar.xz 729456 BLAKE2B f620edf67f67e84697677117294b9d8bc90db30fe1e228d5043179d1ae1e65f10f7299870bef3ff920312fd7103abd6c5f0296055776318640a3a9535ec006c7 SHA512 a68e9eccb5662b1ae0860b3f6cdc812a3105df83cd36f4b98b339ba1637a165f45b06acfb9dbadcf1055b65a4d5aa0780c1b921ed422ed1f0334735adadf4b6a
24 DIST devscripts_2.18.3.tar.xz 731708 BLAKE2B bbd993b6dac144dd9a9e696133d1613fc88ca7fa31debf8478bb0a8232b811b9c6cdcf0989db29f478958f500c5f885e382700c0ea451675721254cdd4d42797 SHA512 3fcd2ff4eb97fbc8d8f768ca11f03b96de0f2ab0b8824e089556695c65521cf2e8e2d532968c07292818c8cd7ea93adaa508b40aebafbbf744bd6b78d249321b
25 DIST devscripts_2.18.4.tar.xz 740128 BLAKE2B c43867b79904ebb72fbe0f65e0c5a49100dfe435f867afc3c3f40b33dabba25a5cb07cd9e27780b0198da4800a17be3f2de6ea8aad504b281b79dd1df59baaed SHA512 91a0ab2fa1f8d884d79f62d5cc8170c885c24af51de321a41f2111fe0fbc0fd8394e5fb3825eeee14d8090968be35761080a40cb55339b09522219d974f63897
26 +DIST devscripts_2.18.6.tar.xz 756772 BLAKE2B 70bdc87336558a6953fc91408fdb7e639f6fc60f8e698548d34aabd6384c2a1d67b871064f3679842c7629b2f84a3abe8612dfe3924552488a0b3e54ec0ca10c SHA512 6bbd5ab2ac522bf4201cf57cc481d3885dd26b0a57338812b5a7ae10ca4575a2942b84b6bd05934898551eae7263ed28f0f7d8d295d055aa5c80111da1531014
27
28 diff --git a/dev-util/checkbashisms/checkbashisms-2.18.6.ebuild b/dev-util/checkbashisms/checkbashisms-2.18.6.ebuild
29 new file mode 100644
30 index 00000000000..16cbdc16f64
31 --- /dev/null
32 +++ b/dev-util/checkbashisms/checkbashisms-2.18.6.ebuild
33 @@ -0,0 +1,40 @@
34 +# Copyright 1999-2018 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=6
38 +
39 +MY_PN="devscripts"
40 +MY_P="${MY_PN}-${PV}"
41 +
42 +DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
43 +HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
44 +SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
45 +
46 +LICENSE="GPL-2"
47 +SLOT="0"
48 +KEYWORDS="~amd64 ~x86"
49 +IUSE=""
50 +
51 +# Requires python packages to check tools we don't need anyway
52 +RESTRICT="test"
53 +
54 +RDEPEND="dev-lang/perl
55 + virtual/perl-Getopt-Long
56 + !<dev-util/rpmdevtools-8.3-r1"
57 +
58 +S="${WORKDIR}/${MY_P}/scripts"
59 +
60 +src_prepare() {
61 + default
62 +
63 + eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
64 +
65 + sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
66 +}
67 +
68 +src_compile() { :; }
69 +
70 +src_install() {
71 + newbin ${PN}.pl ${PN}
72 + doman ${PN}.1
73 +}
74
75 diff --git a/dev-util/checkbashisms/files/checkbashisms-2.18.6-command-vV.patch b/dev-util/checkbashisms/files/checkbashisms-2.18.6-command-vV.patch
76 new file mode 100644
77 index 00000000000..44455e3097b
78 --- /dev/null
79 +++ b/dev-util/checkbashisms/files/checkbashisms-2.18.6-command-vV.patch
80 @@ -0,0 +1,30 @@
81 +https://bugs.debian.org/733511
82 +
83 +From 9c2109e0d16473a7e80961558b112f8071aa5877 Mon Sep 17 00:00:00 2001
84 +From: Mike Frysinger <vapier@g.o>
85 +Date: Tue, 9 Oct 2018 14:23:27 +0200
86 +Subject: [PATCH] checkbashisms: allow `command` to use -v/-V
87 +
88 +POSIX permits the -v/-V options:
89 +http://pubs.opengroup.org/onlinepubs/9699919799/utilities/command.html
90 +command [-p][-v|-V] command_name
91 +---
92 + scripts/checkbashisms.pl | 2 +-
93 + 1 file changed, 1 insertion(+), 1 deletion(-)
94 +
95 +diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl
96 +index 3044634a..60005cd4 100755
97 +--- a/scripts/checkbashisms.pl
98 ++++ b/scripts/checkbashisms.pl
99 +@@ -699,7 +699,7 @@ qr'(?:^|\s)(?<func>function\s)?\s*(?:[^<>\(\)\[\]\{\};|\s]*[^<>\(\)\[\]\{\};|\s\
100 + $LEADIN . qr'jobs\s' => q<jobs>,
101 + # $LEADIN . qr'jobs\s+-[^lp]\s' => q<'jobs' with option other than -l or -p>,
102 + $LEADIN
103 +- . qr'command\s+-[^p]\s' => q<'command' with option other than -p>,
104 ++ . qr'command\s+-[^pvV]\s' => q<'command' with option other than -p/-v/-V>,
105 + $LEADIN
106 + . qr'setvar\s' =>
107 + q<setvar 'foo' 'bar' should be eval 'foo="'"$bar"'"'>,
108 +--
109 +2.19.1
110 +