From f480c8e2b021faeaf15f0173dc96454bc0354a74 Mon Sep 17 00:00:00 2001
From: Casey Icenhour <casey.icenhour@inl.gov>
Date: Wed, 13 Sep 2023 15:16:25 -0600
Subject: [PATCH 1/2] Remove bootstrap at libMesh level for macOS ARM64 and
 replace with autoreconf

With newer autotools, running the bootstrap script at that level is not technically
required and duplicative work (the patch mentioned in the issue) was being performed.
A simple autoreconf is all that is required at the libMesh level.

Refs #25456
---
 conda/libmesh/meta.yaml                 | 2 +-
 conda/moose-dev/conda_build_config.yaml | 2 +-
 conda/moose-dev/meta.yaml               | 2 +-
 conda/moose/conda_build_config.yaml     | 2 +-
 conda/template/conda_build_config.yaml  | 2 +-
 scripts/configure_libmesh.sh            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/conda/libmesh/meta.yaml b/conda/libmesh/meta.yaml
index b826868ca90c..3b98e59d00af 100644
--- a/conda/libmesh/meta.yaml
+++ b/conda/libmesh/meta.yaml
@@ -4,7 +4,7 @@
 #
 # As well as any directions pertaining to modifying those files.
 # ALSO: Follow the directions in scripts/tests/versioner_hashes.yaml
-{% set build = 0 %}
+{% set build = 1 %}
 {% set version = "2023.09.06" %}
 {% set vtk_friendly_version = "9.2" %}
 
diff --git a/conda/moose-dev/conda_build_config.yaml b/conda/moose-dev/conda_build_config.yaml
index 4cc4cad53da2..d29ac415ce6c 100644
--- a/conda/moose-dev/conda_build_config.yaml
+++ b/conda/moose-dev/conda_build_config.yaml
@@ -1,5 +1,5 @@
 moose_libmesh:
-  - moose-libmesh 2023.09.06 build_0
+  - moose-libmesh 2023.09.06 build_1
 
 moose_wasp:
   - moose-wasp 2023.08.31
diff --git a/conda/moose-dev/meta.yaml b/conda/moose-dev/meta.yaml
index e3983794d3de..a26ef5480bfe 100644
--- a/conda/moose-dev/meta.yaml
+++ b/conda/moose-dev/meta.yaml
@@ -4,7 +4,7 @@
 #   template/conda_build_config.yaml
 #
 # As well as any directions pertaining to modifying those files.
-{% set version = "2023.09.06" %}
+{% set version = "2023.09.13" %}
 
 package:
   name: moose-dev
diff --git a/conda/moose/conda_build_config.yaml b/conda/moose/conda_build_config.yaml
index cdff6e104d8b..38cf178d6519 100644
--- a/conda/moose/conda_build_config.yaml
+++ b/conda/moose/conda_build_config.yaml
@@ -1,5 +1,5 @@
 moose_dev:
-  - moose-dev 2023.09.06
+  - moose-dev 2023.09.13
 
 #### Darwin SDK SYSROOT
 CONDA_BUILD_SYSROOT:                                        # [osx]
diff --git a/conda/template/conda_build_config.yaml b/conda/template/conda_build_config.yaml
index cdff6e104d8b..38cf178d6519 100644
--- a/conda/template/conda_build_config.yaml
+++ b/conda/template/conda_build_config.yaml
@@ -1,5 +1,5 @@
 moose_dev:
-  - moose-dev 2023.09.06
+  - moose-dev 2023.09.13
 
 #### Darwin SDK SYSROOT
 CONDA_BUILD_SYSROOT:                                        # [osx]
diff --git a/scripts/configure_libmesh.sh b/scripts/configure_libmesh.sh
index 72698b12fbdd..369323ec7817 100644
--- a/scripts/configure_libmesh.sh
+++ b/scripts/configure_libmesh.sh
@@ -47,7 +47,7 @@ function configure_libmesh()
   if [[ $(uname) == Darwin  ]] && [[ $(uname -m) == arm64 ]]; then
     echo "INFO: Re-bootstrapping libMesh and its dependencies"
     cd $SRC_DIR || exit $?
-    ./bootstrap || exit $?
+    autoreconf -fiv || exit $?
     cd contrib/metaphysicl || exit $?
     ./bootstrap || exit $?
     cd ../timpi || exit $?

From 4ae4ba3e6ea735689afe275122593a80b21bd450 Mon Sep 17 00:00:00 2001
From: Casey Icenhour <casey.icenhour@inl.gov>
Date: Wed, 13 Sep 2023 16:34:15 -0600
Subject: [PATCH 2/2] Update versioner hashes (#25457)

---
 scripts/tests/versioner_hashes.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/tests/versioner_hashes.yaml b/scripts/tests/versioner_hashes.yaml
index 2f16b1a9a892..992c39b2c2ce 100644
--- a/scripts/tests/versioner_hashes.yaml
+++ b/scripts/tests/versioner_hashes.yaml
@@ -117,3 +117,9 @@ fa4c2347f80a3859d2bf68d92f52341331274f34: # 25370
   libmesh: 26585cd
   moose: fc4e3b7
   wasp: 76657f9
+f480c8e2b021faeaf15f0173dc96454bc0354a74: #25457
+  mpich: ac902f8
+  petsc: 9fe2e73
+  libmesh: ede12e5
+  moose: 6bc1745
+  wasp: 76657f9