From 2881fdd81136b1d57ae493dcb58b2b79947f6d0a Mon Sep 17 00:00:00 2001
From: Eric Cook <llua@gmx.com>
Date: Thu, 14 Jul 2022 00:12:36 -0400
Subject: [PATCH] feat(freebsd): update package names for Python 3.9

% print $OSTYPE;pkg search 'py39-(pygit2|gitpython|dulwich|salt)'
freebsd13.0
py39-dulwich-0.19.16           Python implementation of the Git file formats and protocols
py39-gitpython-3.1.27          Python Git Library
py39-pygit2-1.8.0              Python bindings for libgit2
py39-salt-3004.2               Distributed remote execution and configuration management system
---
 salt/osmap.yaml                                | 18 +++++++++---------
 test/integration/default/controls/pkgs_spec.rb |  2 +-
 .../default/files/_mapdata/freebsd-12.yaml     | 18 +++++++++---------
 .../default/files/_mapdata/freebsd-13.yaml     | 18 +++++++++---------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/salt/osmap.yaml b/salt/osmap.yaml
index 642b2810f..c55372822 100644
--- a/salt/osmap.yaml
+++ b/salt/osmap.yaml
@@ -66,15 +66,15 @@ MacOS:
   salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
 
 FreeBSD:
-  salt_master: py38-salt
-  salt_minion: py38-salt
-  salt_syndic: py38-salt
-  salt_cloud: py38-salt
-  salt_api: py38-salt
-  salt_ssh: py38-salt
-  python_git: py38-gitpython
-  pygit2: py38-pygit2
-  python_dulwich: py38-dulwich
+  salt_master: py39-salt
+  salt_minion: py39-salt
+  salt_syndic: py39-salt
+  salt_cloud: py39-salt
+  salt_api: py39-salt
+  salt_ssh: py39-salt
+  python_git: py39-gitpython
+  pygit2: py39-pygit2
+  python_dulwich: py39-dulwich
 
 # If `osfingermap.yaml` is introduced in the future, perhaps better to move to there,
 # since this is probably specific to `OpenBSD-6`
diff --git a/test/integration/default/controls/pkgs_spec.rb b/test/integration/default/controls/pkgs_spec.rb
index 3bfb34b04..be8ddb618 100644
--- a/test/integration/default/controls/pkgs_spec.rb
+++ b/test/integration/default/controls/pkgs_spec.rb
@@ -5,7 +5,7 @@
   when 'arch'
     %w[salt]
   when /bsd$/
-    %w[py38-salt]
+    %w[py39-salt]
   when 'windows'
     ['Salt Minion']
   when 'mac_os_x'
diff --git a/test/integration/default/files/_mapdata/freebsd-12.yaml b/test/integration/default/files/_mapdata/freebsd-12.yaml
index 646dae794..c6aa88aa0 100644
--- a/test/integration/default/files/_mapdata/freebsd-12.yaml
+++ b/test/integration/default/files/_mapdata/freebsd-12.yaml
@@ -88,9 +88,9 @@ values:
     pin_version: false
     pkgrepo: ''
     py_ver: py3
-    pygit2: py38-pygit2
-    python_dulwich: py38-dulwich
-    python_git: py38-gitpython
+    pygit2: py39-pygit2
+    python_dulwich: py39-dulwich
+    python_git: py39-gitpython
     release: '3004'
     restart_via_at: false
     retry_options:
@@ -100,14 +100,14 @@ values:
       until: true
     rootgroup: wheel
     rootuser: root
-    salt_api: py38-salt
-    salt_cloud: py38-salt
-    salt_master: py38-salt
+    salt_api: py39-salt
+    salt_cloud: py39-salt
+    salt_master: py39-salt
     salt_master_macos_plist_hash: ''
-    salt_minion: py38-salt
+    salt_minion: py39-salt
     salt_minion_macos_plist_hash: ''
-    salt_ssh: py38-salt
-    salt_syndic: py38-salt
+    salt_ssh: py39-salt
+    salt_syndic: py39-salt
     ssh_roster: {}
     syndic_service: salt_syndic
     use_pip: false
diff --git a/test/integration/default/files/_mapdata/freebsd-13.yaml b/test/integration/default/files/_mapdata/freebsd-13.yaml
index 88360b66f..ec8d79567 100644
--- a/test/integration/default/files/_mapdata/freebsd-13.yaml
+++ b/test/integration/default/files/_mapdata/freebsd-13.yaml
@@ -88,9 +88,9 @@ values:
     pin_version: false
     pkgrepo: ''
     py_ver: py3
-    pygit2: py38-pygit2
-    python_dulwich: py38-dulwich
-    python_git: py38-gitpython
+    pygit2: py39-pygit2
+    python_dulwich: py39-dulwich
+    python_git: py39-gitpython
     release: '3004'
     restart_via_at: false
     retry_options:
@@ -100,14 +100,14 @@ values:
       until: true
     rootgroup: wheel
     rootuser: root
-    salt_api: py38-salt
-    salt_cloud: py38-salt
-    salt_master: py38-salt
+    salt_api: py39-salt
+    salt_cloud: py39-salt
+    salt_master: py39-salt
     salt_master_macos_plist_hash: ''
-    salt_minion: py38-salt
+    salt_minion: py39-salt
     salt_minion_macos_plist_hash: ''
-    salt_ssh: py38-salt
-    salt_syndic: py38-salt
+    salt_ssh: py39-salt
+    salt_syndic: py39-salt
     ssh_roster: {}
     syndic_service: salt_syndic
     use_pip: false