omnibus 9.0.23 → 9.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60f5a801d094e92cffa5e8bebd7dc8d1fd1a7b427c6d476b7b33b629415641d4
-  data.tar.gz: c0d7fa53dbf57e5c84c356855547e69c9cf315fe53156aeddefd60c94bf88f5d
+  metadata.gz: 065db2a80c8d5fde76cb572c23d13316eaf5a54a1e39dc6dfb1078f50a3addca
+  data.tar.gz: c76a0a6fdad8901fad830da4a2dceac66fe3d08ca23024bede57cd489a4cb115
 SHA512:
-  metadata.gz: 5525e63803dbad441fec851faf2cbd00f4463bbde7e39477517f0f9801c9f821023d787103b6eea0e0339ad39b4b89dcc6a975401587b3fbb9cab2d7e6812f50
-  data.tar.gz: 44c9a32996dc5ecbe4a7a666148236f2eeaace9e4c37f86e8ddcc9549c8265b4251956a55131f10c3ec9b6c15b9ff959075b8048da9397af8a13ffd00c945b5c
+  metadata.gz: 426485f17ad21b7682a4987f6b4fe045a5a25ac989b6ca06dd2b1a3bf8022136b6bb807b2538e2f08cb47c41b676a046edb7036d2d31c0ef9b7c6ddbffc9f637
+  data.tar.gz: ca0e935c55dfe8b0104ddfe75365126b2a204fa176167af664c01b96bbaf95aed6e1610f5cc99bf7c587240f99c1084ff87a0d1629e57e3bce538d3273cd7919

data/lib/omnibus/packagers/ips.rb

@@ -292,7 +292,10 @@ module Omnibus
       shellout!("pkgdepend generate -md #{source_dir} #{pkg_manifest_file}.2 | pkgfmt > #{pkg_manifest_file}.3")
       shellout!("pkgmogrify -DARCH=`uname -p` #{pkg_manifest_file}.3 #{transform_file} | pkgfmt > #{pkg_manifest_file}.4")
       shellout!("pkgdepend resolve -m #{pkg_manifest_file}.4")
-      shellout!("pkgmogrify #{pkg_manifest_file}.4.res #{versionlock_file} > #{pkg_manifest_file}.5.res")
+      # extra step added to truncate bash and other version requirements that may cause conflicts on
+      # Solaris patch versions slightly older than the OS that the build is running on.
+      shellout!("pkgmogrify -DARCH=`uname -p` #{pkg_manifest_file}.4.res #{transform_file} | pkgfmt > #{pkg_manifest_file}.4.res-transformed")
+      shellout!("pkgmogrify #{pkg_manifest_file}.4.res-transformed #{versionlock_file} > #{pkg_manifest_file}.5.res")
     end
 
     #

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = "9.0.23".freeze
+  VERSION = "9.0.24".freeze
 end

data/resources/ips/doc-transform.erb

@@ -1,4 +1,7 @@
 <transform dir path=<%= pathdir %>$ -> edit group bin sys>
+<transform dir path=<%= pathdir %>$ -> edit group bin sys>
+<transform depend fmri=pkg:/shell -> edit fmri '@.+' ''>
+<transform depend fmri=pkg:/system -> edit fmri '@.+' ''>
 <transform file depend -> edit pkg.debug.depend.file ruby env>
 <transform file depend -> edit pkg.debug.depend.file make env>
 <transform file depend -> edit pkg.debug.depend.file perl env>

data/spec/unit/packagers/ips_spec.rb

@@ -246,7 +246,9 @@ module Omnibus
         expect(subject).to receive(:shellout!)
           .with("pkgdepend resolve -m #{staging_dir}/project.p5m.4")
         expect(subject).to receive(:shellout!)
-          .with("pkgmogrify #{staging_dir}/project.p5m.4.res #{staging_dir}/version-lock > #{staging_dir}/project.p5m.5.res")
+          .with("pkgmogrify -DARCH=`uname -p` #{staging_dir}/project.p5m.4.res #{staging_dir}/doc-transform | pkgfmt > #{staging_dir}/project.p5m.4.res-transformed")
+        expect(subject).to receive(:shellout!)
+          .with("pkgmogrify #{staging_dir}/project.p5m.4.res-transformed #{staging_dir}/version-lock > #{staging_dir}/project.p5m.5.res")
         subject.generate_pkg_deps
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 9.0.23
+  version: 9.0.24
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-22 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3