From 54bd22ef6a4c2c81f188dd1866a22cdf5b9db804 Mon Sep 17 00:00:00 2001
From: Ajay Kemparaj <ajaykemparaj@gmail.com>
Date: Fri, 2 Aug 2024 16:36:50 -0700
Subject: [PATCH] bash: revert git-checkout and improve version test (#25531)

---
 bash.yaml | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/bash.yaml b/bash.yaml
index 6ba26432e3e..4f0c543e5e2 100644
--- a/bash.yaml
+++ b/bash.yaml
@@ -1,18 +1,11 @@
 package:
   name: bash
   version: 5.2.32
-  epoch: 0
+  epoch: 1
   description: "GNU bourne again shell"
   copyright:
     - license: GPL-3.0-or-later
 
-# The bash git repository only tags using major.minor version numbers
-var-transforms:
-  - from: ${{package.version}}
-    match: (\d+\.\d+).*
-    replace: $1
-    to: mangled-package-version
-
 environment:
   contents:
     packages:
@@ -22,11 +15,10 @@ environment:
       - ncurses-dev
 
 pipeline:
-  - uses: git-checkout
+  - uses: fetch
     with:
-      repository: https://git.savannah.gnu.org/git/bash.git
-      tag: bash-${{vars.mangled-package-version}}
-      expected-commit: 74091dd4e8086db518b30df7f222691524469998
+      uri: https://ftp.gnu.org/gnu/bash/bash-${{package.version}}.tar.gz
+      expected-sha256: d3ef80d2b67d8cbbe4d3265c63a72c46f9b278ead6e0e06d61801b58f23f50b5
 
   - runs: |
       ./configure \
@@ -95,6 +87,6 @@ update:
 test:
   pipeline:
     - runs: |
-        /bin/bash --version || exit 1
+        /bin/bash --version || grep ${{package.version}}
     - runs: |
         /bin/bash -c "echo 'hello world'" || exit 1