diff --git a/Puppetfile.pinned b/Puppetfile.pinned index ee7d77f5..e9c342e1 100644 --- a/Puppetfile.pinned +++ b/Puppetfile.pinned @@ -63,15 +63,15 @@ moduledir 'src/puppet/modules' mod 'puppet-kmod', :git => 'https://github.com/simp/pupmod-voxpupuli-kmod.git', - :tag => 'v3.0.0' + :tag => 'v3.2.0' -mod 'camptocamp-systemd', +mod 'puppet-systemd', :git => 'https://github.com/simp/puppet-systemd.git', - :tag => '2.12.0' + :tag => 'v3.9.0' mod 'herculesteam-augeasproviders_core', :git => 'https://github.com/simp/augeasproviders_core', - :tag => '2.7.0' + :tag => 'v3.2.0' mod 'herculesteam-augeasproviders_grub', :git => 'https://github.com/simp/augeasproviders_grub', @@ -115,11 +115,11 @@ mod 'puppetlabs-motd', mod 'puppetlabs-postgresql', :git => 'https://github.com/simp/puppetlabs-postgresql', - :tag => 'v7.2.0' + :tag => 'v8.0.0' mod 'puppetlabs-puppetdb', :git => 'https://github.com/simp/pupmod-puppetlabs-puppetdb', - :tag => '7.5.0' + :tag => '7.10.0' mod 'puppetlabs-puppet_authorization', :git => 'https://github.com/simp/puppetlabs-puppet_authorization.git', @@ -335,7 +335,7 @@ mod 'simp-selinux', mod 'simp-simp', :git => 'https://github.com/simp/pupmod-simp-simp', - :tag => '4.16.3' + :tag => '4.16.4' mod 'simp-simpkv', :git => 'https://github.com/simp/pupmod-simp-simpkv', @@ -363,7 +363,7 @@ mod 'simp-simp_firewalld', mod 'simp-simp_gitlab', :git => 'https://github.com/simp/pupmod-simp-simp_gitlab', - :tag => '0.7.0' + :tag => '0.7.1' mod 'simp-simp_grub', :git => 'https://github.com/simp/pupmod-simp-simp_grub', @@ -498,14 +498,14 @@ mod 'voxpupuli-posix_acl', mod 'voxpupuli-gitlab', :git => 'https://github.com/simp/puppet-gitlab.git', - :tag => 'v7.1.0' + :tag => 'v8.0.0' mod 'voxpupuli-snmp', :git => 'https://github.com/simp/puppet-snmp', - :tag => 'v5.1.1' + :tag => 'v6.0.0' mod 'voxpupuli-yum', :git => 'https://github.com/simp/voxpupuli-yum', - :tag => 'v4.3.0' + :tag => 'v5.4.0' # vi:syntax=ruby diff --git a/build/rpm/dependencies.yaml b/build/rpm/dependencies.yaml index 2f69aa01..8538a50d 100644 --- a/build/rpm/dependencies.yaml +++ b/build/rpm/dependencies.yaml @@ -168,9 +168,18 @@ 'pupmod-razorsedge-snmp': '3.9.0-0' # Camptocamp has assumed ownership of the systemd project +# Subsequently, Voxpupuly assumed ownership of the systemd project 'systemd': :obsoletes: 'pupmod-simp-systemd': '2.1.0-0' + 'pupmod-camptocamp-systemd': '2-12.0-1' + +# Out of maintenance, trying to get re-opened +# Allows for version bumps on the requirements +'puppet_authorization': + :requires: + - 'pupmod-puppetlabs-concat' + - 'pupmod-puppetlabs-stdlib' # Reverted back to saz-timezone 'timezone': diff --git a/src/assets/simp/build/simp.spec b/src/assets/simp/build/simp.spec index b57a3575..c2de44f8 100644 --- a/src/assets/simp/build/simp.spec +++ b/src/assets/simp/build/simp.spec @@ -28,24 +28,24 @@ Obsoletes: pupmod-simp-mcollective <= 3.0.0 Obsoletes: pupmod-simp-simpcat <= 6.0.3 # Core SIMP Requirements -Requires: pupmod-puppet-kmod >= 3.0.0, pupmod-puppet-kmod < 4.0.0 -Requires: pupmod-camptocamp-systemd >= 2.12.0, pupmod-camptocamp-systemd < 3.0.0 -Requires: pupmod-herculesteam-augeasproviders_core >= 2.7.0, pupmod-herculesteam-augeasproviders_core < 3.0.0 +Requires: pupmod-puppet-kmod >= 3.2.0, pupmod-puppet-kmod < 4.0.0 +Requires: pupmod-puppet-scamptocampystemd >= 3.9.0, pupmod-puppet-systemd < 4.0.0 +Requires: pupmod-herculesteam-augeasproviders_core >= 3.2.0, pupmod-herculesteam-augeasproviders_core < 4.0.0 Requires: pupmod-herculesteam-augeasproviders_grub >= 3.2.0, pupmod-herculesteam-augeasproviders_grub < 4.0.0 Requires: pupmod-herculesteam-augeasproviders_ssh >= 4.0.0, pupmod-herculesteam-augeasproviders_ssh < 5.0.0 Requires: pupmod-herculesteam-augeasproviders_sysctl >= 2.6.2 pupmod-herculesteam-augeasproviders_sysctl < 3.0.0 Requires: pupmod-onyxpoint-gpasswd >= 1.1.2, pupmod-onyxpoint-gpasswd < 2.0.0 Requires: pupmod-puppet-chrony >= 2.4.0, pupmod-puppet-chrony < 3.0.0 Requires: pupmod-puppet-firewalld => 4.4.0, pupmod-puppet-firewalld < 5.0.0 -Requires: pupmod-puppet-yum >= 4.3.0, pupmod-puppet-yum < 5.0.0 +Requires: pupmod-puppet-yum >= 5.4.0, pupmod-puppet-yum < 6.0.0 Requires: pupmod-puppetlabs-apache >= 6.5.1, pupmod-puppetlabs-apache < 7.0.0 Requires: pupmod-puppetlabs-concat >= 7.0.1, pupmod-puppetlabs-concat < 8.0.0 Requires: pupmod-puppetlabs-hocon >= 1.1.0, pupmod-puppetlabs-hocon < 2.0.0 Requires: pupmod-puppetlabs-inifile >= 4.1.0, pupmod-puppetlabs-inifile < 5.0.0 Requires: pupmod-puppetlabs-motd >= 6.0.0, pupmod-puppetlabs-motd < 7.0.0 -Requires: pupmod-puppetlabs-postgresql >= 7.2.0, pupmod-puppetlabs-postgresql < 8.0.0 +Requires: pupmod-puppetlabs-postgresql >= 8.0.0, pupmod-puppetlabs-postgresql < 9.0.0 Requires: pupmod-puppetlabs-puppet_authorization >= 0.5.1, pupmod-puppetlabs-puppet_authorization < 1.0.0 -Requires: pupmod-puppetlabs-puppetdb >= 7.5.0, pupmod-puppetlabs-puppetdb < 8.0.0 +Requires: pupmod-puppetlabs-puppetdb >= 7.10.0, pupmod-puppetlabs-puppetdb < 8.0.0 Requires: pupmod-puppetlabs-stdlib >= 7.1.0, pupmod-puppetlabs-stdlib < 8.0.0 Requires: pupmod-saz-timezone >= 6.1.0, pupmod-saz-timezone < 7.0.0 Requires: pupmod-simp-acpid >= 1.3.0, pupmod-simp-acpid < 2.0.0 @@ -79,7 +79,7 @@ Requires: pupmod-simp-rkhunter >= 0.1.0, pupmod-simp-rkhunter < 1.0.0 Requires: pupmod-simp-rsync >= 6.5.0, pupmod-simp-rsync < 7.0.0 Requires: pupmod-simp-rsyslog >= 8.1.0, pupmod-simp-rsyslog < 9.0.0 Requires: pupmod-simp-selinux >= 2.7.0, pupmod-simp-selinux < 3.0.0 -Requires: pupmod-simp-simp >= 4.16.3, pupmod-simp-simp < 5.0.0 +Requires: pupmod-simp-simp >= 4.16.4, pupmod-simp-simp < 5.0.0 Requires: pupmod-simp-simp_apache >= 7.1.0, pupmod-simp-simp_apache < 8.0.0 Requires: pupmod-simp-simp_banners >= 0.3.0, pupmod-simp-simp_banners < 1.0.0 Requires: pupmod-simp-simp_ds389 >= 0.1.1, pupmod-simp-simp_ds389 < 1.0.0 @@ -153,9 +153,9 @@ Obsoletes: pupmod-simp-simp_bolt <= 0.3.0 Obsoletes: pupmod-simp-simp_pki_service <= 0.3.1 Requires: simp-adapter >= 2.0.0, simp-adapter < 3.0.0 -Requires: pupmod-puppet-gitlab >= 7.1.0 +Requires: pupmod-puppet-gitlab >= 8.0.0 Requires: pupmod-puppet-posix_acl >= 1.0.1 -Requires: pupmod-puppet-snmp >= 5.1.1 +Requires: pupmod-puppet-snmp >= 6.0.0 Requires: pupmod-puppetlabs-java >= 7.0.2 Requires: pupmod-puppetlabs-ruby_task_helper >= 0.6.0 Requires: pupmod-puppetlabs-translate >= 2.1.0 @@ -177,7 +177,7 @@ Requires: pupmod-simp-network >= 6.3.0 Requires: pupmod-simp-nfs >= 7.1.0 Requires: pupmod-simp-oath >= 0.3.0 Requires: pupmod-simp-openscap >= 6.4.0 -Requires: pupmod-simp-simp_gitlab >= 0.7.0 +Requires: pupmod-simp-simp_gitlab >= 0.7.1 Requires: pupmod-simp-simp_grub >= 0.3.1 Requires: pupmod-simp-simp_ipa >= 0.2.1 Requires: pupmod-simp-simp_nfs >= 1.1.0