Merge origin/master: resolve cache.py typo conflict, accept test_msgpack.py deletion

Agent-Logs-Url: https://github.com/saltstack/salt/sessions/f2c9f789-b3af-4ddd-89cb-37411787e1bb

Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>

Author: Copilot

changelog/50436.fixed.md

@@ -238,7 +238,7 @@ output=`pip install --upgrade pip`
 _log "$output"
 
 # Check if wheel is supported in current version of pip
-pip help install 2>/dev/null | egrep --quiet '(--)no-use-wheel' && PIP_OPTS='--no-use-wheel' || PIP_OPTS=''
+pip help install 2>/dev/null | grep -E --quiet '(--)no-use-wheel' && PIP_OPTS='--no-use-wheel' || PIP_OPTS=''
 
 # Make sure swig is available
 test -z "$SWIG" && SWIG=`command -v swig`
@@ -310,7 +310,7 @@ for dep in "${deps[@]}"; do
         else
             _display "Bundled ZeroMQ detected"
         fi
-        zeromq_version=`egrep '^Version' "$zeromq_spec" | awk '{print $2}'`
+        zeromq_version=`grep -E '^Version' "$zeromq_spec" | awk '{print $2}'`
         _display "ZeroMQ version: $zeromq_version"
     fi
     _display "Installing $src"

changelog/59437.fixed.md

@@ -16,7 +16,7 @@ if test -z "$pyver"; then
     # Detect RHEL 5 and Arch, operating systems for which "/usr/bin/env python"
     # refers to a python version <2.6 or >=3.0.
     if test -f /etc/redhat-release; then
-        osmajor=`egrep -o '[0-9]+\.[0-9]+' /etc/redhat-release | cut -f1 -d.`
+        osmajor=`grep -Eo '[0-9]+\.[0-9]+' /etc/redhat-release | cut -f1 -d.`
         test "$osmajor" -eq 5 && pyver=2.6
     elif test -f /etc/arch-release; then
         python=python2

changelog/65608.deprecated.md

@@ -303,10 +303,6 @@ libnacl==1.8.0
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
     #   -r requirements/static/ci/common.in
-linode-python==1.1.1
-    # via
-    #   -c requirements/static/pkg/py3.10/linux.txt
-    #   -r requirements/static/pkg/linux.in
 looseversion==1.3.0
     # via
     #   -c requirements/static/ci/py3.10/linux.txt

changelog/66449.fixed.md

@@ -236,10 +236,6 @@ kubernetes==35.0.0
     # via -r requirements/static/ci/common.in
 libnacl==1.8.0 ; sys_platform != 'darwin' and sys_platform != 'win32'
     # via -r requirements/static/ci/common.in
-linode-python==1.1.1
-    # via
-    #   -c requirements/static/pkg/py3.10/freebsd.txt
-    #   -r requirements/static/pkg/freebsd.in
 looseversion==1.3.0
     # via
     #   -c requirements/static/pkg/py3.10/freebsd.txt