Skip to content

Commit c7b0307

Browse files
joshcooperjoshcooper
authored
Merge pull request #829 from mhashizume/PA-6376/master/bump-components
Update puppet-agent components
2 parents 50954b5 + d4fccf9 commit c7b0307

File tree

12 files changed

+177
-79
lines changed

12 files changed

+177
-79
lines changed

‎configs/components/dmidecode.rb

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
component 'dmidecode' do |pkg, settings, platform|
2-
pkg.version '3.3'
3-
pkg.md5sum 'afca949fd71a23dd39c4a3c9cd946dc0'
2+
pkg.version '3.5'
3+
pkg.sha256sum '79d76735ee8e25196e2a722964cf9683f5a09581503537884b256b01389cc073'
44

5-
pkg.apply_patch 'resources/patches/dmidecode/1117390c.patch'
6-
pkg.apply_patch 'resources/patches/dmidecode/11e134e5.patch'
5+
pkg.apply_patch 'resources/patches/dmidecode/80de3762.patch'
6+
pkg.apply_patch 'resources/patches/dmidecode/c76ddda0.patch'
7+
pkg.apply_patch 'resources/patches/dmidecode/de392ff0.patch'
78

89
pkg.apply_patch 'resources/patches/dmidecode/dmidecode-install-to-bin.patch'
910
pkg.url "http://download.savannah.gnu.org/releases/dmidecode/dmidecode-#{pkg.get_version}.tar.xz"

‎configs/components/libffi.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component 'libffi' do |pkg, settings, platform|
2-
pkg.version '3.4.3'
3-
pkg.md5sum 'b57b0ac1d1072681cee9148a417bd2ec'
2+
pkg.version '3.4.6'
3+
pkg.sha256sum 'b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e'
44
pkg.url "https://github.com/libffi/libffi/releases/download/v#{pkg.get_version}/#{pkg.get_name}-#{pkg.get_version}.tar.gz"
55
pkg.mirror "#{settings[:buildsources_url]}/#{pkg.get_name}-#{pkg.get_version}.tar.gz"
66

‎configs/components/libxml2.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component "libxml2" do |pkg, settings, platform|
2-
pkg.version '2.10.3'
3-
pkg.sha256sum '5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c'
2+
pkg.version '2.12.6'
3+
pkg.sha256sum '889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb'
44

55
libxml2_version_y = pkg.get_version.gsub(/(\d+)\.(\d+)\.(\d+)/, '\1.\2')
66
pkg.url "https://download.gnome.org/sources/libxml2/#{libxml2_version_y}/libxml2-#{pkg.get_version}.tar.xz"

‎configs/components/libxslt.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component "libxslt" do |pkg, settings, platform|
2-
pkg.version '1.1.37'
3-
pkg.sha256sum '3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4'
2+
pkg.version '1.1.39'
3+
pkg.sha256sum '2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0'
44

55
libxslt_version_y = pkg.get_version.gsub(/(\d+)\.(\d+)\.(\d+)/, '\1.\2')
66
pkg.url "https://download.gnome.org/sources/libxslt/#{libxslt_version_y}/libxslt-#{pkg.get_version}.tar.xz"

‎configs/components/rubygem-highline.rb

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
component 'rubygem-highline' do |pkg, settings, _platform|
2-
pkg.version '2.1.0'
3-
pkg.md5sum '4209083bda845d47dcc05b7ab23f25fd'
2+
version = settings[:rubygem_highline_version] || '2.1.0'
3+
pkg.version version
4+
5+
case version
6+
when '2.1.0'
7+
pkg.md5sum '4209083bda845d47dcc05b7ab23f25fd'
8+
when '3.0.1'
9+
pkg.sha256sum 'ca18b218fd581b1fae832f89bfeaf2b34d3a93429c44fd4411042ffce286f009'
10+
else
11+
raise "rubygem-highline version #{version} has not been configured; Cannot continue."
12+
end
413

514
instance_eval File.read('configs/components/_base-rubygem.rb')
615

‎configs/components/rubygem-net-ssh.rb

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
component "rubygem-net-ssh" do |pkg, settings, platform|
2-
# Projects may define a :rubygem_net_ssh_version setting, or we use 4.2.0 by default:
3-
version = settings[:rubygem_net_ssh_version] || '4.2.0'
2+
# Projects may define a :rubygem_net_ssh_version setting, or we use 6.1.0 by default:
3+
version = settings[:rubygem_net_ssh_version] || '6.1.0'
4+
if platform.is_cross_compiled? && platform.is_solaris?
5+
# Building agent-runtime-7.x on Solaris 10/11 SPARC fails with newer versions of net-ssh because those platforms
6+
# use older (<= 2.1) versions of Ruby for cross-compiling. Pin to 4.2.0, the last version of net-ssh that supports
7+
# those older Rubies, until we deprecate those platforms.
8+
version = '4.2.0'
9+
end
410
pkg.version version
511

612
case version
713
when "7.2.3"
814
pkg.md5sum "be25f70538cb8dcde68d924f001d75df"
915
when "6.1.0"
1016
pkg.md5sum "383afadb1bd66a458a5d8d2d60736b3d"
11-
when "5.2.0"
12-
pkg.md5sum "341114b3bf34257abd3b11bd16b0c99d"
1317
when "4.2.0"
1418
pkg.md5sum "fec5b151d84110b95ec0056017804491"
15-
when "4.1.0"
16-
pkg.md5sum "6af1ff8c42a07b11203058c9b74cbaef"
1719
else
1820
raise "rubygem-net-ssh version #{version} has not been configured; Cannot continue."
1921
end

‎configs/projects/agent-runtime-main.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
# Set preferred component versions if they differ from defaults:
44
proj.setting :ruby_version, '3.2.3'
55
proj.setting :rubygem_deep_merge_version, '1.2.2'
6+
proj.setting :rubygem_highline_version, '3.0.1'
67
proj.setting :rubygem_hocon_version, '1.4.0'
8+
proj.setting :rubygem_net_ssh_version, '7.2.3'
79

810
# Solaris and AIX depend on libedit which breaks augeas compliation starting with 1.13.0
911
if platform.is_solaris? || platform.name == 'aix-7.1-ppc'

‎resources/patches/dmidecode/1117390c.patch

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎resources/patches/dmidecode/11e134e5.patch

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎resources/patches/dmidecode/80de3762.patch

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
From 80de376231e903d2cbea95e51ffea31860502159 Mon Sep 17 00:00:00 2001
2+
From: Jerry Hoemann <[email protected]>
3+
Date: Mon, 3 Apr 2023 10:15:12 +0200
4+
Subject: dmioem: HPE OEM Record 237 Firmware change
5+
6+
HPE OEM record type 237 offset 0x09 field was changed from a single
7+
byte STRING to a two byte WORD representing date.
8+
9+
Fixes: cdab638dabb7 ("dmioem: Decode HPE OEM Record 237")
10+
Signed-off-by: Jerry Hoemann <[email protected]>
11+
Signed-off-by: Jean Delvare <[email protected]>
12+
---
13+
dmioem.c | 8 +++++---
14+
1 file changed, 5 insertions(+), 3 deletions(-)
15+
16+
diff --git a/dmioem.c b/dmioem.c
17+
index dc4b857..2746e15 100644
18+
--- a/dmioem.c
19+
+++ b/dmioem.c
20+
@@ -1094,7 +1094,8 @@ static int dmi_decode_hp(const struct dmi_header *h)
21+
* 0x06 | Manufacture|STRING | DIMM Manufacturer
22+
* 0x07 | Part Number|STRING | DIMM Manufacturer's Part Number
23+
* 0x08 | Serial Num |STRING | DIMM Vendor Serial Number
24+
- * 0x09 | Spare Part |STRING | DIMM Spare Part Number
25+
+ * 0x09 | Man Date | BYTE | DIMM Manufacture Date (YEAR) in BCD
26+
+ * 0x0A | Man Date | BYTE | DIMM Manufacture Date (WEEK) in BCD
27+
*/
28+
if (gen < G9) return 0;
29+
pr_handle_name("%s DIMM Vendor Information", company);
30+
@@ -1105,8 +1106,9 @@ static int dmi_decode_hp(const struct dmi_header *h)
31+
pr_attr("DIMM Manufacturer Part Number", "%s", dmi_string(h, data[0x07]));
32+
if (h->length < 0x09) break;
33+
pr_attr("DIMM Vendor Serial Number", "%s", dmi_string(h, data[0x08]));
34+
- if (h->length < 0x0A) break;
35+
- pr_attr("DIMM Spare Part Number", "%s", dmi_string(h, data[0x09]));
36+
+ if (h->length < 0x0B) break;
37+
+ if (WORD(data + 0x09))
38+
+ pr_attr("DIMM Manufacture Date", "20%02x-W%02x", data[0x09], data[0x0A]);
39+
break;
40+
41+
case 238:
42+
--
43+
cgit v1.1
44+

0 commit comments

Comments
 (0)