diff --git a/.gitignore b/.gitignore index 1e52696..30c58b0 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /ShellCheck-0.4.7.tar.gz /ShellCheck-0.5.0.tar.gz /ShellCheck-0.6.0.tar.gz +/ShellCheck-0.7.0.tar.gz diff --git a/138080bd.patch b/138080bd.patch deleted file mode 100644 index 7e1f9ba..0000000 --- a/138080bd.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 138080bdc7442458f45bd2726d9e8cb4b68cf24f Mon Sep 17 00:00:00 2001 -From: Vidar Holen -Date: Sun, 16 Dec 2018 14:42:19 -0800 -Subject: [PATCH] Fix infinite loop on annotations for SC2188 (fixes #1413) - ---- - src/ShellCheck/Analytics.hs | 2 +- - src/ShellCheck/Checker.hs | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/ShellCheck/Analytics.hs b/src/ShellCheck/Analytics.hs -index 7754ee64..a164de13 100644 ---- a/src/ShellCheck/Analytics.hs -+++ b/src/ShellCheck/Analytics.hs -@@ -2692,7 +2692,7 @@ checkRedirectedNowhere params token = - case drop 1 $ getPath (parentMap params) t of - T_DollarExpansion _ [_] : _ -> True - T_Backticked _ [_] : _ -> True -- T_Annotation _ _ u : _ -> isInExpansion u -+ t@T_Annotation {} : _ -> isInExpansion t - _ -> False - getDanglingRedirect token = - case token of -diff --git a/src/ShellCheck/Checker.hs b/src/ShellCheck/Checker.hs -index 7ac9c913..10074e38 100644 ---- a/src/ShellCheck/Checker.hs -+++ b/src/ShellCheck/Checker.hs -@@ -231,5 +231,7 @@ prop_filewideAnnotation8 = null $ - prop_sourcePartOfOriginalScript = -- #1181: -x disabled posix warning for 'source' - 2039 `elem` checkWithIncludes [("./saywhat.sh", "echo foo")] "#!/bin/sh\nsource ./saywhat.sh" - -+prop_spinBug1413 = null $ check "fun() {\n# shellcheck disable=SC2188\n> /dev/null\n}\n" -+ - return [] - runTests = $quickCheckAll diff --git a/ShellCheck.spec b/ShellCheck.spec index 5d7e682..170a6b1 100644 --- a/ShellCheck.spec +++ b/ShellCheck.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: %{pkg_name} -Version: 0.6.0 -Release: 5%{?dist} +Version: 0.7.0 +Release: 1%{?dist} Summary: Shell script analysis tool License: GPLv3+ @@ -17,9 +17,6 @@ Url: https://www.shellcheck.net/ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # End cabal-rpm sources -# https://bugzilla.redhat.com/show_bug.cgi?id=1707331 -Patch0: https://github.com/koalaman/shellcheck/commit/138080bd.patch - # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel %if %{with haddock} @@ -29,11 +26,15 @@ BuildRequires: ghc-doc BuildRequires: ghc-prof %endif BuildRequires: ghc-rpm-macros +BuildRequires: ghc-Diff-devel BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-aeson-devel +BuildRequires: ghc-array-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel +BuildRequires: ghc-deepseq-devel BuildRequires: ghc-directory-devel +BuildRequires: ghc-filepath-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-process-devel @@ -145,6 +146,9 @@ install -Dpm 0644 shellcheck.1 %{buildroot}%{_mandir}/man1/shellcheck.1 %changelog +* Mon Jul 29 2019 Jens Petersen - 0.7.0-1 +- update to 0.7.0 + * Wed Jul 24 2019 Fedora Release Engineering - 0.6.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index ab507a8..2a94f22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ShellCheck-0.6.0.tar.gz) = 51c2cc9cfd2f8a145095873f9b19d4fdd67a21eedab4ac2dbe5f43789fd0937a44bdc8480b2d0cceb5bc3802a8243dd3b701a07f1f6b5460291272ee453c7c5f +SHA512 (ShellCheck-0.7.0.tar.gz) = 88a0cb2a2879f597b832979fd934ee63e0f1ca256e5f9e7c51667744d09848817fdbe3988898f49226fc52ec27d92c314a9075995c3110ee10b24468cb60c657