Update for Jammy (#37)

v4.0.0 Updates
cloudfoundry-community · Jan 11, 2024 · 160b467 · 160b467
1 parent 11ef150
commit 160b467
Show file tree

Hide file tree

Showing 25 changed files with 164 additions and 84 deletions.
diff --git a/.final_builds/jobs/toolbelt-everything/index.yml b/.final_builds/jobs/toolbelt-everything/index.yml
@@ -7,6 +7,10 @@ builds:
     version: 2c39d1f373063ce98ba5c3bac115679cb3b81066
     blobstore_id: 36e673fc-7e3d-438c-8265-57cd4229dc12
     sha1: e9cfea8ad998fc42542e99c13ab7cdc38773ee82
+  2e5d2cc5c3ab9139e56fa51ab7b52eecc69b8d2f2e31ed7fda948b6fcba83ebb:
+    version: 2e5d2cc5c3ab9139e56fa51ab7b52eecc69b8d2f2e31ed7fda948b6fcba83ebb
+    blobstore_id: e2212347-45df-46a1-53f4-d5a0d32cfddc
+    sha1: sha256:5f8ee3303997e4010fb721a5e66fa01dbea3da3b0c367ebfab9990fddfebc0bd
   3c1ad788b8069762d47f21d53b8af8930af6caae:
     version: 3c1ad788b8069762d47f21d53b8af8930af6caae
     blobstore_id: 819fc9f2-d3ae-489f-bdf8-4ebf7b243b0f

diff --git a/.final_builds/packages/toolbelt-boss/index.yml b/.final_builds/packages/toolbelt-boss/index.yml
@@ -3,4 +3,8 @@ builds:
     version: 0d3d7af95c31d959e220ccbfd95f71a2b7e109cffe250abd7e7d88b48b782a47
     blobstore_id: 8b4fc64d-d272-4613-403b-e5c01233279b
     sha1: sha256:a6f0b110d2eb5640e4425e7648b8add49c57701979dbc2c6dc65d9cb54fbd086
+  40340bb20076e47066acbba43a37c1db543c966e9c4444b39c20866512ca3530:
+    version: 40340bb20076e47066acbba43a37c1db543c966e9c4444b39c20866512ca3530
+    blobstore_id: fa333774-74f0-4df6-6791-2d6132a1399c
+    sha1: sha256:2d958af19aaf91ec489ddb3019d719d176195fda1c1395a0adf7bc9789f37b67
 format-version: "2"
diff --git a/.final_builds/packages/toolbelt-cf/index.yml b/.final_builds/packages/toolbelt-cf/index.yml
@@ -1,4 +1,8 @@
 builds:
+  0aa8bb00f330492dddeae9d50e11d31a3e2be94cbefe09b5bc9df64b574cbd12:
+    version: 0aa8bb00f330492dddeae9d50e11d31a3e2be94cbefe09b5bc9df64b574cbd12
+    blobstore_id: 0e103d58-db26-475b-5f8b-87f37062c24b
+    sha1: sha256:1c4746d11891cf264afa9e14e5e1547ac5b545f3c067820cfddb8beb04847f44
   883f839cfe968be111d31e2547fe35f58607847b043c2c3c9d2d6e6cb9223d61:
     version: 883f839cfe968be111d31e2547fe35f58607847b043c2c3c9d2d6e6cb9223d61
     blobstore_id: 59fc4605-0069-4a21-61ff-2eb6efb5a8ba

diff --git a/.final_builds/packages/toolbelt-hatop/index.yml b/.final_builds/packages/toolbelt-hatop/index.yml
@@ -1,4 +1,8 @@
 builds:
+  06cc59763327fa9ad7c5fac471f3c8e956974e1a1c01aa9726b810d4507b1f7f:
+    version: 06cc59763327fa9ad7c5fac471f3c8e956974e1a1c01aa9726b810d4507b1f7f
+    blobstore_id: f445c9df-5d54-4bc8-4874-2219b5f2d782
+    sha1: sha256:acaa33f946765d1162191bc09d7a5d3302143bb2c2ca07f9cf428be7a500c690
   14970870bdd9cd7c6efaa5455df49342f970453efb6d9bfff85cc9213d968e48:
     version: 14970870bdd9cd7c6efaa5455df49342f970453efb6d9bfff85cc9213d968e48
     blobstore_id: 37826039-14eb-4066-67ca-fd968f0c199e

diff --git a/.final_builds/packages/toolbelt-jq/index.yml b/.final_builds/packages/toolbelt-jq/index.yml
@@ -15,4 +15,8 @@ builds:
     version: b36480470dd3839778fb343eb0c3987276847ac2
     blobstore_id: 5971ee21-4027-43d1-9baf-f6b6c9fd9e9e
     sha1: c5c6a03f3e0fee9eb135529189fec4c07015f6d1
+  f11ad9f2ceefb9c212933b8a00a826a049dfa36e0021e3a6365ece6f3d96dbc3:
+    version: f11ad9f2ceefb9c212933b8a00a826a049dfa36e0021e3a6365ece6f3d96dbc3
+    blobstore_id: c93ab26a-e2da-4e0c-62d6-d097fbfd73aa
+    sha1: sha256:10b72498d4904c7f84b53717bcb34c61829139cbbba007757af6363d5503f3f2
 format-version: "2"
diff --git a/.final_builds/packages/toolbelt-mysql-client/index.yml b/.final_builds/packages/toolbelt-mysql-client/index.yml
@@ -15,4 +15,8 @@ builds:
     version: cbd642d2304d96461eebb3ce839963c24ffb69feb8a823435f8d243d420d5822
     blobstore_id: ed6ee5da-5c96-4614-6cc2-c9951086dacc
     sha1: sha256:4d8d6d792b05f201c7bd700e873ea61ef3814827305b89824220dfc0f48edcc7
+  d0cdc67b0d1f7e709da1d0319fc77dbb951ec111a40995ce14c52c5700eae061:
+    version: d0cdc67b0d1f7e709da1d0319fc77dbb951ec111a40995ce14c52c5700eae061
+    blobstore_id: 49aa43cf-3f1d-4796-6e01-61616b6640a9
+    sha1: sha256:dbffe919eb185bc873c4fe660a9712e7a6870b35e81604a560b4d12f63fbee76
 format-version: "2"
diff --git a/.final_builds/packages/toolbelt-psql/index.yml b/.final_builds/packages/toolbelt-psql/index.yml
@@ -1,4 +1,8 @@
 builds:
+  31964354d986b4cbad387a0b61ef833e68d0028ead1d0732e1326ae3034d2a2d:
+    version: 31964354d986b4cbad387a0b61ef833e68d0028ead1d0732e1326ae3034d2a2d
+    blobstore_id: 66a164c9-e53f-4488-504b-7e04338b5afb
+    sha1: sha256:bf603c0a03ad6cf81c5d834bc01007eea2999478b15761010eff04c5faecaad3
   54c703ef445012987fcf162bb407aea333647d50e8e28edd92d31be9625756f2:
     version: 54c703ef445012987fcf162bb407aea333647d50e8e28edd92d31be9625756f2
     blobstore_id: d93f18cc-7afc-4667-6a88-3ccd65180aef

diff --git a/.final_builds/packages/toolbelt-redis/index.yml b/.final_builds/packages/toolbelt-redis/index.yml
@@ -1,4 +1,8 @@
 builds:
+  0f8f445c544b8d2ebf8a7ed0ef0a73a25709f9b3dcb2a629ad36185e75dd243c:
+    version: 0f8f445c544b8d2ebf8a7ed0ef0a73a25709f9b3dcb2a629ad36185e75dd243c
+    blobstore_id: 50772987-13c6-49c3-6851-a8063fc68b29
+    sha1: sha256:14799fc3963e4f5feb591d1c2783297de225794a477bbdfceb6c55a78884b823
   13fa931a26637a087313360b85ca7707630b60ad:
     version: 13fa931a26637a087313360b85ca7707630b60ad
     blobstore_id: 4b4f322e-136a-416b-ab9d-03b8b3ae9de0

diff --git a/.final_builds/packages/toolbelt-safe/index.yml b/.final_builds/packages/toolbelt-safe/index.yml
@@ -15,6 +15,10 @@ builds:
     version: 842228f037f6e406ddd63683f3fe6acd80e2e1bf01ea7d7c8d3cd438115c4390
     blobstore_id: 6de1439b-b76e-4a50-42a7-0d9dece64071
     sha1: sha256:e71722d0b29fe8a88bfd526adef026044a9d0492650ba449b41719a987432fa9
+  b23ce0ababcfd9a11f2cc839afc8a0e189e5801632be329271e6bfee08a0f217:
+    version: b23ce0ababcfd9a11f2cc839afc8a0e189e5801632be329271e6bfee08a0f217
+    blobstore_id: 4aa226ff-33f0-4968-7ae7-8f491c8ff343
+    sha1: sha256:6530930dc15071f052733847b3785640dc1a32954b05462fba053350e4e18d4b
   b4ff4ca43f1c5710962dc8b2b454415718ab7743:
     version: b4ff4ca43f1c5710962dc8b2b454415718ab7743
     blobstore_id: b8c8c653-e394-4313-ba46-ba1c33ebbec7

diff --git a/.final_builds/packages/toolbelt-tshark/index.yml b/.final_builds/packages/toolbelt-tshark/index.yml
@@ -11,6 +11,10 @@ builds:
     version: 77ed4422eabc941f87bdc7f18ee803088bf7b1ed9a3ea87a5cc4ce94caab7404
     blobstore_id: 1e6dcd65-9113-45ae-5d32-af8df2fac37b
     sha1: sha256:8ea20f783ccb2f5079bb8c789d6afcf81a29b1ae2f2405d8ab57da007f8013a7
+  7b5949efe5ac623ad065eff5b93426387af8149ae8413fb4d2cb5190114e3b22:
+    version: 7b5949efe5ac623ad065eff5b93426387af8149ae8413fb4d2cb5190114e3b22
+    blobstore_id: 9e0bd43c-8645-4c41-79bb-eb0e73cfe367
+    sha1: sha256:db0a7427d914451d5249f9d1030158efcaaff6d6b8a30469dcb4ab7b92021adf
   83038dfcf3b261adb28de7f5bb34bed6f772b485:
     version: 83038dfcf3b261adb28de7f5bb34bed6f772b485
     blobstore_id: dc43cd99-356b-440d-8620-ed829d4c6c94

diff --git a/.final_builds/packages/toolbelt-vault/index.yml b/.final_builds/packages/toolbelt-vault/index.yml
@@ -11,6 +11,10 @@ builds:
     version: 71c0bdd8f1ab0824ad6c84e63fc8775c3046d893
     blobstore_id: e65947fc-8fbc-46b7-4804-192c01b2858e
     sha1: b40b8771a573fd967bb372adf33d3076ee9a0fcf
+  a96b8636b349adb9435eb68e5c7bda1bc91a9b83ca4edf3aee6bb4c9b8604303:
+    version: a96b8636b349adb9435eb68e5c7bda1bc91a9b83ca4edf3aee6bb4c9b8604303
+    blobstore_id: f3053203-08d0-43b9-5660-c6840bcab681
+    sha1: sha256:e9ded8a2b35e61531a14827229862cf3c0b7819a085913d10395d36a34d26692
   b7055117d527f48c7beed888971b4b3824dd7ec4:
     version: b7055117d527f48c7beed888971b4b3824dd7ec4
     blobstore_id: 54ca9d53-b972-4434-b6b0-f1331d33b835

diff --git a/ci/release_notes.md b/ci/release_notes.md
@@ -0,0 +1,30 @@
+# Updates to Toolbelt
+
+Name | Current Version | Updated Version
+-----|-----------------|----------------
+boss |0.0.6|0.0.7
+cf-cli6| 6.53.0
+cf-cli7| 7.4.0|7.7.5
+cf-cli8| 8.1.0|8.7.5
+hatop|0.8.1|0.8.2
+jq|1.6|1.7
+mysql/mariadb|10.6.5|10.6.16
+nats|1.0.2| 1.2.0
+postgresql|14.1|14.10
+python|3.10.2|3.10.13
+redis|5.0.8|5.0.9
+redis|6.2.6|6.2.14
+redis||7.2.3
+safe|1.6.1|1.9.0
+spruce|1.31.0|
+vault|1.9.2|1.15.3
+
+Testing on Jammy Stemcell 1.250 and 1.318
+
+Known Issues:
+
+* Wireshark not compiling on Jammy and commented out on toolbelt-everything
+
+Support for Trusty is dropped
+Support for Xenial and Bionic will be dropped
+
diff --git a/config/blobs.yml b/config/blobs.yml
@@ -1,19 +1,19 @@
 boss/boss-linux-amd64:
-  size: 7201287
-  object_id: 1f2eeae8-c17d-43e2-5799-aeef2ade0dcc
-  sha: sha256:3df6764e740c74579cfdee3b32eafc2fe46ce6c57996c4e6766abcef00399fb6
+  size: 7279015
+  object_id: 3277b45a-318b-4361-79eb-14b6719387ae
+  sha: sha256:752b35912e0cb5ba2387c0c7a50a30c3c2380c02cd6cbd1bd34e56476384f22b
 cf-cli/cf-cli_6.53.0_linux_x86-64.tgz:
   size: 8973024
   object_id: 591d8206-aa7d-42d1-5a33-d1deaaaf40d0
   sha: sha256:09664d1469fb8a0ddba804343121aba7d8f64ba6bfde75a53f6e29d6600b2342
-cf-cli/cf7-cli_7.4.0_linux_x86-64.tgz:
-  size: 7882979
-  object_id: 946c4bb7-dbaa-48be-6fce-7959e9a1bc30
-  sha: sha256:6ac44598c580fe24c98f3b52df2e6357116478c68dee5c74800cb39cba421695
-cf-cli/cf8-cli_8.1.0_linux_x86-64.tgz:
-  size: 8840669
-  object_id: 3d3230ef-a91f-4b5c-6898-1c6d253352e5
-  sha: sha256:2bc4c178b47bed712422d94399a6cc9acc92d21c6a640392ec7181b0c1bce5d0
+cf-cli/cf7-cli_7.7.5_linux_x86-64.tgz:
+  size: 7491336
+  object_id: ddd75935-4f14-4354-60e9-171292409719
+  sha: sha256:98c7338794f9bb89f6ab7ea574dc71d4cf79c725826695de93925bb7671cde55
+cf-cli/cf8-cli_8.7.5_linux_x86-64.tgz:
+  size: 8726530
+  object_id: ae962d64-00c6-4760-6d5b-edc3aedad33b
+  sha: sha256:824d23dc595529cee953151b4c8680c43de9b36d46611f0041318706858fd9f1
 cfdot/cfdot-linux64:
   size: 24614808
   object_id: b673e243-7c22-4fd3-5ec2-945d8557c4f1
@@ -30,18 +30,18 @@ gotcha/gotcha-linux-amd64:
   size: 6120802
   object_id: 8d2d3d2d-a92f-4641-5869-ff406f0a9bb0
   sha: sha256:e7393662184c953fe6a81877429590f448fe7445af93557374c439d34593608e
-hatop/hatop-v0.8.1:
-  size: 74088
-  object_id: bc80e80a-d04a-4eb8-7d5c-485b525fce49
-  sha: sha256:71acfc8734d05dc5f85a8236c740ef7bbf4d54e6fc3eaf286b35561be093b0f3
-jq/jq-1.6-linux64:
-  size: 3953824
-  object_id: d5ccf0ea-0ccc-4cf7-648e-593fe39e0c16
-  sha: sha256:af986793a515d500ab2d35f8d2aecd656e764504b789b66d7e1a0b727a124c44
-mysql/mariadb-10.6.5.tar.gz:
-  size: 85061860
-  object_id: 84ac0ca9-e447-424b-733c-96de83947cc4
-  sha: sha256:e0be040428d9a42a8bb4bd221b567ff2522cd6fa8906386273da4f03c5c20a8f
+hatop/hatop-v0.8.2:
+  size: 74158
+  object_id: becfcd81-9c10-4956-6dad-fe7b8cdc967a
+  sha: sha256:4e41948e1c6e5d7972f721df87215a8b2971474f23afde34cd56809b89f4ae5d
+jq/jq-1.7-linux64:
+  size: 2319424
+  object_id: 77decea4-c98b-473a-573f-ecbde6c1e0a8
+  sha: sha256:2f312b9587b1c1eddf3a53f9a0b7d276b9b7b94576c85bda22808ca950569716
+mysql/mariadb-10.6.16.tar.gz:
+  size: 98224346
+  object_id: 61e8433b-47ea-433d-438e-a3041abb9c46
+  sha: sha256:5ef83843e796dcda9aea47b24690ddf6d848f43f43e11f9d9a0cc21c78fbb9cf
 nats/nats-1.2.0-linux-x86_64.tar.gz:
   size: 2394744
   object_id: 250fd04e-8840-4f95-51f3-0556cfe740a4
@@ -102,34 +102,30 @@ nmap/nmap-7.92.tar.bz2:
   size: 10498200
   object_id: 6136104c-96cc-4660-7f60-21b9210c16a5
   sha: sha256:a5479f2f8a6b0b2516767d2f7189c386c1dc858d997167d7ec5cfc798c7571a1
-postgresql/postgresql-14.1.tar.gz:
-  size: 28666442
-  object_id: 29c6c92b-d4b4-4e98-4a07-98f52d033dbe
-  sha: sha256:b29030525e1314d676f41e6007a96d4489ba0d03fa93e67b477c1d5386790c8f
-python/Python-3.8.12.tgz:
-  size: 24769402
-  object_id: b4f586d8-35e9-4eca-42d5-4df1dbcc051f
-  sha: sha256:316aa33f3b7707d041e73f246efedb297a70898c4b91f127f66dc8d80c596f1a
-python/Python-3.9.10.tgz:
-  size: 25800844
-  object_id: daafe05c-deb5-40df-7a6c-7d909a8d8978
-  sha: sha256:1aa9c0702edbae8f6a2c95f70a49da8420aaa76b7889d3419c186bfc8c0e571e
-python/Python-3.10.2.tgz:
-  size: 25067363
-  object_id: 31678306-13dc-4994-70eb-97e5a149616f
-  sha: sha256:3c0ede893011319f9b0a56b44953a3d52c7abf9657c23fb4bc9ced93b86e9c97
-redis/redis-5.0.8.tar.gz:
-  size: 1985757
-  object_id: 9fc1ca84-6ece-466b-65dc-616b5ad29375
-  sha: sha256:f3c7eac42f433326a8d981b50dba0169fdfaf46abb23fcda2f933a7552ee4ed7
-redis/redis-6.2.6.tar.gz:
-  size: 2476542
-  object_id: dbc58783-bb9e-4ef0-5298-06912fcc55cf
-  sha: sha256:5b2b8b7a50111ef395bf1c1d5be11e6e167ac018125055daa8b5c2317ae131ab
+postgresql/postgresql-14.10.tar.gz:
+  size: 29190254
+  object_id: 52a1767e-07a0-400c-59ce-c8c92d3fe3a1
+  sha: sha256:ce197c3bada3f10120f617766d9caccee6453a568122e6db52d961c749732f37
+python/Python-3.10.13.tgz:
+  size: 26111363
+  object_id: 24146d09-0663-49ec-601f-c006a1ca7d05
+  sha: sha256:698ec55234c1363bd813b460ed53b0f108877c7a133d48bde9a50a1eb57b7e65
+redis/redis-5.0.9.tar.gz:
+  size: 1986574
+  object_id: 05be408c-03d9-48c7-4f88-44b1aa54b74f
+  sha: sha256:53d0ae164cd33536c3d4b720ae9a128ea6166ebf04ff1add3b85f1242090cb85
+redis/redis-6.2.14.tar.gz:
+  size: 2496149
+  object_id: ba70d207-1816-4bc0-70e8-f2bad13fe6b1
+  sha: sha256:34e74856cbd66fdb3a684fb349d93961d8c7aa668b06f81fd93ff267d09bc277
+redis/redis-7.2.3.tar.gz:
+  size: 3384816
+  object_id: 21b7a69c-40df-4038-5f45-2e62a94a52b2
+  sha: sha256:3e2b196d6eb4ddb9e743088bfc2915ccbb42d40f5a8a3edd8cb69c716ec34be7
 safe/safe-linux-amd64:
-  size: 9982119
-  object_id: d85e3ce6-5681-4d9c-6e6d-b1ce5f31ba95
-  sha: sha256:666a65837b34c60f96868f2b1e2c5fcf32aa3333a184ed3d36c2532654ffc4c0
+  size: 10378351
+  object_id: 59fc50aa-ed6c-45ff-47bd-83d5998d12a6
+  sha: sha256:c8cd4e7fbdfad5155eff8b13ea0035922c7fd2aa74a0bedfbbba0aa3ab60e3da
 screen/screen-4.8.0.tar.gz:
   size: 854854
   object_id: 5be7cfc0-c65a-4ea9-562e-fdc9ab5d726f
@@ -166,10 +162,10 @@ tshark/wireshark-3.6.1.tar.xz:
   size: 39632140
   object_id: 49bb16ef-af16-4aa3-4d68-f02a215c4000
   sha: sha256:0434eda8fb6bf88e2b42a67eb5d1de254a67d505bec3bb51fee9d7cad7925a38
-vault/vault_1.9.2_linux_amd64.zip:
-  size: 68958688
-  object_id: abf2102c-55ac-47d8-5ae7-fc9c0982d924
-  sha: sha256:1e3eb5c225ff1825a59616ebbd4ac300e9d6eaefcae26253e49209350c0a5e71
+vault/vault_1.15.3_linux_amd64.zip:
+  size: 134240071
+  object_id: f51ee6a2-c6d9-4450-6376-99f02ef51f46
+  sha: sha256:9e2d1a2a725cfd2489cd02e6cb22079082d8224a3cc6d9ac900488c911175742
 veritas/veritas-47c19f8:
   size: 12270832
   object_id: 7e2f5aaa-fc23-4b71-85be-50bd4947335e

diff --git a/jobs/toolbelt-everything/spec b/jobs/toolbelt-everything/spec
@@ -13,15 +13,15 @@ packages:
   - toolbelt-nmap
   - toolbelt-nats
   - toolbelt-mysql-client
-  - toolbelt-netsniff-ng
+#  - toolbelt-netsniff-ng
   - toolbelt-psql
   - toolbelt-redis
   - toolbelt-safe
   - toolbelt-screen
   - toolbelt-spruce
   - toolbelt-tcptrace
   - toolbelt-tree
-  - toolbelt-tshark
+#  - toolbelt-tshark
   - toolbelt-vault
   - toolbelt-veritas
 templates:

diff --git a/packages/toolbelt-cf/packaging b/packages/toolbelt-cf/packaging
@@ -3,10 +3,10 @@ set -u # report the usage of uninitialized variables
 
 # link: https://github.com/cloudfoundry/cli/releases
 # toolbelt-cf
-# 	- cf version:	7.4.0+e55633fed.2021-11-15
+# 	- cf version:	7.7.5
 # 	- cf6 version:	6.53.0+8e2b70a4a.2020-10-01
-# 	- cf7 version:	7.4.0+e55633fed.2021-11-15
-# 	- cf8 version:	8.1.0+034d929d7.2022-01-03
+# 	- cf7 version:	7.7.5
+# 	- cf8 version:	8.7.5
 
 
 # Detect # of CPUs so make jobs can be parallelized
@@ -26,12 +26,12 @@ cp cf ${BOSH_INSTALL_TARGET}/bin/cf6 &&
 chmod 755 ${BOSH_INSTALL_TARGET}/bin/cf6) || exit 1
 
 (
-tar -xzf cf-cli/cf7-cli_7.4.0_linux_x86-64.tgz cf7 &&
+tar -xzf cf-cli/cf7-cli_7.7.5_linux_x86-64.tgz cf7 &&
 cp cf7 ${BOSH_INSTALL_TARGET}/bin &&
 chmod 755 ${BOSH_INSTALL_TARGET}/bin/cf7) || exit 1
 
 (
-tar -xzf cf-cli/cf8-cli_8.1.0_linux_x86-64.tgz cf8 &&
+tar -xzf cf-cli/cf8-cli_8.7.5_linux_x86-64.tgz cf8 &&
 cp cf8 ${BOSH_INSTALL_TARGET}/bin &&
 chmod 755 ${BOSH_INSTALL_TARGET}/bin/cf8) || exit 1
 

diff --git a/packages/toolbelt-hatop/packaging b/packages/toolbelt-hatop/packaging
@@ -1,14 +1,14 @@
 #!/bin/bash
 set -eu
 
-# link: https://github.com/jhunt/hatop/releases/tag/v0.8.1
-# hatop version:	0.8.0
+# link: https://github.com/jhunt/hatop/releases/tag/v0.8.2
+# hatop version:	0.8.2
 
 
 mkdir -p ${BOSH_INSTALL_TARGET}/bin
-cp hatop/hatop-v0.8.1 ${BOSH_INSTALL_TARGET}/bin
-chmod 755 ${BOSH_INSTALL_TARGET}/bin/hatop-v0.8.1
-ln -s ${BOSH_INSTALL_TARGET}/bin/hatop-v0.8.1 ${BOSH_INSTALL_TARGET}/bin/hatop
+cp hatop/hatop-v0.8.2 ${BOSH_INSTALL_TARGET}/bin
+chmod 755 ${BOSH_INSTALL_TARGET}/bin/hatop-v0.8.2
+ln -s ${BOSH_INSTALL_TARGET}/bin/hatop-v0.8.2 ${BOSH_INSTALL_TARGET}/bin/hatop
 
 # Need to add a check to see if there is an
 #   existing python install. If there is, 

diff --git a/packages/toolbelt-jq/packaging b/packages/toolbelt-jq/packaging
@@ -2,7 +2,7 @@ set -e # exit immediately if a simple command exits with a non-zero status
 set -u # report the usage of uninitialized variables
 
 # link: https://github.com/stedolan/jq/releases
-# jq version: jq-1.6
+# jq version: jq-1.7
 
 
 # Detect # of CPUs so make jobs can be parallelized
@@ -13,5 +13,5 @@ CPUS=$(grep -c ^processor /proc/cpuinfo)
 export HOME=/var/vcap
 
 mkdir -p ${BOSH_INSTALL_TARGET}/bin
-cp jq/jq-1.6-linux64 ${BOSH_INSTALL_TARGET}/bin/jq
+cp jq/jq-1.7-linux64 ${BOSH_INSTALL_TARGET}/bin/jq
 chmod 755 ${BOSH_INSTALL_TARGET}/bin/jq
diff --git a/packages/toolbelt-jq/spec b/packages/toolbelt-jq/spec
@@ -2,5 +2,5 @@
 name: toolbelt-jq
 dependencies: []
 files:
-    # https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64
-  - jq/jq-1.6-linux64
+    # https://github.com/stedolan/jq/releases/download/jq-1.7/jq-linux-amd64
+  - jq/jq-1.7-linux64
diff --git a/packages/toolbelt-mysql-client/packaging b/packages/toolbelt-mysql-client/packaging
@@ -19,8 +19,8 @@ export LDFLAGS=-L${LD_LIBRARY_PATH}
 export CPPFLAGS=-I${INCLUDE_PATH}
 export PATH=${PATH}:${BOSH_INSTALL_TARGET}/bin:${BOSH_INSTALL_TARGET}/sbin
 
-tar -xzf mysql/mariadb-10.6.5.tar.gz
-(cd mariadb-10.6.5/
+tar -xzf mysql/mariadb-10.6.16.tar.gz
+(cd mariadb-10.6.16/
   cmake -DCMAKE_INSTALL_PREFIX:PATH=${BOSH_INSTALL_TARGET} -DWITHOUT_SERVER:BOOL=ON && \
   make && \
   make install) || exit 1
diff --git a/packages/toolbelt-psql/packaging b/packages/toolbelt-psql/packaging
@@ -8,9 +8,9 @@ CPUS=$(grep -c ^processor /proc/cpuinfo)
 # $BOSH_INSTALL_TARGET - where you copy/install files to be included in package
 export HOME=/var/vcap
 
-# download from https://ftp.postgresql.org/pub/source/v14.1/postgresql-14.1.tar.gz
-# shasum: https://ftp.postgresql.org/pub/source/v14.1/postgresql-14.1.tar.bz2.sha256
-VERSION=14.1
+# download from https://ftp.postgresql.org/pub/source/v14.10/postgresql-14.10.tar.gz
+# shasum: https://ftp.postgresql.org/pub/source/v14.10/postgresql-14.10.tar.bz2.sha256
+VERSION=14.10
 
 tar -zxf "postgresql/postgresql-${VERSION}.tar.gz"
 

diff --git a/packages/toolbelt-psql/spec b/packages/toolbelt-psql/spec
@@ -2,4 +2,4 @@
 name: toolbelt-psql
 dependencies: []
 files:
-  - postgresql/postgresql-14.1.tar.gz
+  - postgresql/postgresql-14.10.tar.gz