vanagon 0.39.2 → 0.39.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bbab09cfcd3f8a91841bb070ac6fbdd57b37ba5833e4992f3c2251df12c825a
-  data.tar.gz: 1a14dea7853f5e623ae1d8fbccf35f63d5fb63c2ab6b9c013ce50bc37a2ba791
+  metadata.gz: 1ed8da3751c29acb70fea9bff9eb49263409066fe80d8b2d44554988768f02d7
+  data.tar.gz: a5f496b8508eee638db7cb797ae824f1b4beb5b046c67bba9efbd8f30de5faf7
 SHA512:
-  metadata.gz: f167828ef7a0012965b349b670fa4c3b3712bdb6065ae0ced63acca1ec8b909b850ada729cf4151271c62781f4576e088b8f5289de12e94f3748c64f311fdb4a
-  data.tar.gz: 4ab66f44f2b4fabd72ab2fa42c00bd4f3756b4dc9681c1ba05d2715fdacf82092327f297986f3fe872cdf3e306195d1fa3ee66b1ba9e2c8cf575e61b8b5386ae
+  metadata.gz: f3ad3013534e4f40bcc5972efac9397477ab3e636e391e669215d44b06130a7d8a379b6cc67c95127081e1c3b58167744f4db6a943d35ea0160312a875dc43b5
+  data.tar.gz: faecaa5fe8ec3dc0e8174f766bb0849f94ca8b3b35f70cb19faea91985365bda45da16820b3aadb27dcf0a101bec39f8b46075e6b65547b18cb1c0ddd45224e8

data/lib/vanagon/platform/defaults/debian-11-aarch64.rb

@@ -0,0 +1,11 @@
+platform "debian-11-aarch64" do |plat|
+  plat.servicedir "/lib/systemd/system"
+  plat.defaultdir "/etc/default"
+  plat.servicetype "systemd"
+  plat.codename "bullseye"
+
+  packages = %w(build-essential devscripts make quilt pkg-config debhelper rsync fakeroot cmake)
+  plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends #{packages.join(' ')}"
+  plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends "
+  plat.vmpooler_template "debian-11-arm64"
+end

data/lib/vanagon/project.rb

@@ -850,7 +850,7 @@ class Vanagon
                       source.file
                     end
 
-        @settings.merge!(yaml_safe_load_shim(yaml_path))
+        @settings.merge!(YAML.safe_load(File.read(yaml_path), permitted_classes: [Symbol]))
       end
     end
 
@@ -876,19 +876,6 @@ class Vanagon
       source_type
     end
 
-    # YAML.safe_load introduced an incompatible change in Ruby 3.1.0
-    # Shim that until no longer relevant.
-    def yaml_safe_load_shim(yaml_path)
-      new_safe_load_version = Gem::Version.new('3.1.0')
-      this_version = Gem::Version.new(RUBY_VERSION)
-
-      if this_version >= new_safe_load_version
-        YAML.safe_load(File.read(yaml_path), permitted_classes: [Symbol])
-      else
-        YAML.safe_load(File.read(yaml_path), [Symbol])
-      end
-    end
-
     def load_upstream_metadata(metadata_uri)
       VanagonLogger.info "Loading metadata from #{metadata_uri}"
       case metadata_uri

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.39.2
+  version: 0.39.3
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2023-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: |2
       Vanagon takes a set of project, component, and platform configuration files, to perform
       multiplatform builds that are packaged into rpms, debs, dmgs, etc.
@@ -157,6 +171,7 @@ files:
 - lib/vanagon/platform.rb
 - lib/vanagon/platform/deb.rb
 - lib/vanagon/platform/defaults/debian-10-amd64.rb
+- lib/vanagon/platform/defaults/debian-11-aarch64.rb
 - lib/vanagon/platform/defaults/debian-11-amd64.rb
 - lib/vanagon/platform/defaults/debian-8-amd64.rb
 - lib/vanagon/platform/defaults/debian-8-i386.rb