chore: bump deps

Bump dependencies and drop `versioning=loose` everywhere. OpenSSL versioning is so weird that none of explicit version managers work with renovate, so keep `loose` only for OpenSSL and use proper `packageManagers` for others. Signed-off-by: Noel Georgi <git@frezbo.dev>
siderolabs · Mar 21, 2023 · c26b0b5 · c26b0b5
1 parent 7d8f5bd
commit c26b0b5
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 28 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -50,18 +50,44 @@
             ],
             "versioning": "regex:^(?<major>\\d+)_(?<minor>\\d+)_?(?<patch>\\d+)?$"
         },
+        {
+            "matchPackageNames": [
+                "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"
+            ],
+            "versioning": "regex:^(?<major>\\d{4})(?<minor>\\d{2})(?<patch>\\d{2})\\.?(?<build>\\d+)?$"
+        },
+        {
+            "matchPackageNames": [
+                "raspberrypi/firmware"
+            ],
+            "versioning": "regex:^\\d+\\.(?<major>\\d{4})(?<minor>\\d{2})(?<patch>\\d{2})$"
+        },
         {
             "matchPackageNames": [
                 "u-boot/u-boot",
                 "git://git.kernel.org/pub/scm/boot/syslinux/syslinux.git",
                 "git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git",
-                "nvidia/open-gpu-kernel-modules"
+                "nvidia/open-gpu-kernel-modules",
+                "dosfstools/dosfstools",
+                "git://git.savannah.gnu.org/grub.git",
+                "https://pagure.io/libaio.git",
+                "rpm-software-management/popt",
+                "git://git.liburcu.org/userspace-rcu.git",
+                "ARM-software/arm-trusted-firmware"
             ],
             "versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.?(?<patch>\\d+)?$"
         },
         {
             "matchPackageNames": [
-                "git://repo.or.cz/socat.git"
+                "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git",
+                "benhoyt/inih"
+            ],
+            "versioning": "regex:^(?<major>\\d+)\\.?(?<minor>\\d+)?\\.?(?<patch>\\d+)?$"
+        },
+        {
+            "matchPackageNames": [
+                "git://repo.or.cz/socat.git",
+                "json-c/json-c"
             ],
             "versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.?(?<patch>\\d+)?\\.?(?<build>\\d+)?$"
         },

diff --git a/Pkgfile b/Pkgfile
@@ -3,7 +3,7 @@
 format: v1alpha2
 
 vars:
-  TOOLS_IMAGE: ghcr.io/siderolabs/tools:v1.4.0-alpha.0-25-g9bea7d0
+  TOOLS_IMAGE: ghcr.io/siderolabs/tools:v1.4.0-alpha.0-26-g2d710f9
 
   # renovate: datasource=github-releases depName=containernetworking/plugins
   cni_version: v1.2.0
@@ -21,7 +21,7 @@ vars:
   cryptsetup_sha256: da1769da8fa1682f03773e50e75d9d1c4f7464cb660200c00bf5e4586be83308
   cryptsetup_sha512: 91f4570e7398f3aa68d4f029d734731867530f839634a1a8b23b3722b32ecfd41266e2da0404360881557022b092857eed761840f233ce9676348d426b3682a0
 
-  # renovate: datasource=github-releases extractVersion=^v(?<version>.*)$ versioning=loose depName=dosfstools/dosfstools
+  # renovate: datasource=github-releases extractVersion=^v(?<version>.*)$ depName=dosfstools/dosfstools
   dosfstools_version: 4.2
   dosfstools_sha256: 64926eebf90092dca21b14259a5301b7b98e7b1943e8a201c7d726084809b527
   dosfstools_sha512: 3cc0808edb4432428df8a67da4bb314fd1f27adc4a05754c1a492091741a7b6875ebd9f6a509cc4c5ad85643fc40395b6e0cadee548b25cc439cc9b725980156
@@ -47,7 +47,7 @@ vars:
   gasket_driver_sha256: df60528df13fbbc01a52d4bb10248ce262bc531484df42aa070b464b566081cb
   gasket_driver_sha512: 059185a7e1fe7674027d0fd1a9fd3b6390e814382be4ae5d7b4c4c71b0d0e37551b20a8c633b1cf532b0a09197685538dcfc08d08fed867b9d1b314b1bdd1b60
 
-  # renovate: datasource=git-tags extractVersion=^grub-(?<version>.*)$ versioning=loose depName=git://git.savannah.gnu.org/grub.git
+  # renovate: datasource=git-tags extractVersion=^grub-(?<version>.*)$ depName=git://git.savannah.gnu.org/grub.git
   grub_version: 2.06
   grub_sha256: b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1
   grub_sha512: 4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
@@ -63,41 +63,41 @@ vars:
   iptables_sha512: e367bf286135e39b7401e852de25c1ed06d44befdffd92ed1566eb2ae9704b48ac9196cb971f43c6c83c6ad4d910443d32064bcdf618cfcef6bcab113e31ff70
 
   # renovate: datasource=git-refs versioning=git depName=https://github.com/ipxe/ipxe.git
-  ipxe_ref: bf25e23d07f16be62825650c0826c4eadf2699b6
-  ipxe_sha256: 89c836ecf0e03bafa74f1c2bfc8096c7a4b01fafac7ca25afe5af51cd4b01c16
-  ipxe_sha512: 98f72b220eef2ddc5a218f4112459b8e366dddc2bf9b130dcae2a9e3036bb721effb464d9907060c2b55147443f426ecc02d8b7045794d72f992977eb7fa3050
+  ipxe_ref: 09e8a154084c57311463408e3f2e412c305a9638
+  ipxe_sha256: df9e6e4612c2d4b0003ae2cc4686da4fdce2a6a1ab71238fda6e3964b11a8c28
+  ipxe_sha512: b241fd32d9a2100f99334d9d09e2736af0ea724923f66693e574e480a616fed2cd127f6851bea1c80fd35792048700afcb18e42eb3c3d2b35816d3917cbfb0c2
 
   # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
-  linux_version: 6.1.19
-  linux_sha256: 9e991c6e5f6c1ca45eea98c55e82ef6ae3dccc73b3e8a655c8665e585f5a8647
-  linux_sha512: 06e714a70b6014a4f56b551952db899a526b9b3f7fdb11ca0f354d99e65fff1be9a3bc9522af98a93753568266233eff2f5e6f032921293ca2802587ff866ffd
+  linux_version: 6.1.20
+  linux_sha256: 76322de8c01a3c63b42c4d1e9b9e7d1897ddb91276e10d73d1f9df3562f031f0
+  linux_sha512: 1b2660fa5464410649b2d78d08cc060de4eb38bcb158154e74fee3383cae3ff4cc373235e874eceeac3abfda9689571f3b3aed8ad2ac82ec2975e21688458a9b
 
-  # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ versioning=loose depName=git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git
+  # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git
   kmod_version: 30
   kmod_sha256: f897dd72698dc6ac1ef03255cd0a5734ad932318e4adbaebc7338ef2f5202f9f
   kmod_sha512: e2cd34e600a72e44710760dfda9364b790b8352a99eafbd43e683e4a06f37e6b5c0b5d14e7c28070e30fc5fc6ceddedf7b97f3b6c2c5c2d91204fefd630b9a3e
 
-  # renovate: datasource=git-tags extractVersion=^libaio-(?<version>.*)$ versioning=loose depName=https://pagure.io/libaio.git
+  # renovate: datasource=git-tags extractVersion=^libaio-(?<version>.*)$ depName=https://pagure.io/libaio.git
   libaio_version: 0.3.113
   libaio_sha256: 2c44d1c5fd0d43752287c9ae1eb9c023f04ef848ea8d4aafa46e9aedb678200b
   libaio_sha512: 65c30a102433bf8386581b03fc706d84bd341be249fbdee11a032b237a7b239e8c27413504fef15e2797b1acd67f752526637005889590ecb380e2e120ab0b71
 
-  # renovate: datasource=github-releases extractVersion=^r(?<version>.*)$ versioning=loose depName=benhoyt/inih
+  # renovate: datasource=github-releases extractVersion=^r(?<version>.*)$ depName=benhoyt/inih
   libinih_version: 56
   libinih_sha256: 4f2ba6bd122d30281a8c7a4d5723b7af90b56aa828c0e88256d7fceda03a491a
   libinih_sha512: ff3e0910990f73e5b21fddc84737ab346279f201c86c7ad864c6cad9de5bde57c3e0a433b9b8f3585b7d86feaae2ea074185f92891dcadc98c274c1c0745d2d2
 
-  # renovate: datasource=github-tags extractVersion=^json-c-(?<version>.*)-.*$ versioning=loose depName=json-c/json-c
+  # renovate: datasource=github-tags extractVersion=^json-c-(?<version>.*)-.*$ depName=json-c/json-c
   libjson_c_version: 0.16
   libjson_c_sha256: 8e45ac8f96ec7791eaf3bb7ee50e9c2100bbbc87b8d0f1d030c5ba8a0288d96b
   libjson_c_sha512: 255cff99033340b2c2678255d41dae7808f83ed0c102e693d2d9e186bd1f21dd1385fcaa360c0fc087a00965a9567fbda733370e6b518a9be2f1bb0a80439151
 
   # renovate: datasource=github-releases depName=tukaani-project/xz
-  xz_version: v5.4.1
-  xz_sha256: 5d9827aa1875b21c288f78864bb26d2650b436ea8d2cad364e4921eb6266a5a5
-  xz_sha512: f890ee5207799fbc7bb9ae031f444d39d82275b0e1b8cc7f01fdb9270050e38849bd1269db2a2f12fe87b5e23e03f9e809a5c3456d066c0a56e6f98d728553ea
+  xz_version: v5.4.2
+  xz_sha256: 3ee13d0f40148625306b90f9622f8c9660b8082884051b0cfe46f18492f88955
+  xz_sha512: 39163ee327743111968c4231fccc4ebbc1c77c96acf19afa8b1ca4153826a2c0d83b43111fa22b56139c03fc19c621d365fa0f80be1f3c3784fe7dd6f8fcfb68
 
-  # renovate: datasource=github-releases extractVersion=^popt-(?<version>.*)-release$ versioning=loose depName=rpm-software-management/popt
+  # renovate: datasource=github-releases extractVersion=^popt-(?<version>.*)-release$ depName=rpm-software-management/popt
   libpopt_version: 1.19
   libpopt_sha256: c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9
   libpopt_sha512: 5d1b6a15337e4cd5991817c1957f97fc4ed98659870017c08f26f754e34add31d639d55ee77ca31f29bb631c0b53368c1893bd96cf76422d257f7997a11f6466
@@ -107,12 +107,12 @@ vars:
   libseccomp_sha256: d82902400405cf0068574ef3dc1fe5f5926207543ba1ae6f8e7a1576351dcbdb
   libseccomp_sha512: 92650bd7d1d48b383f402a536b97a017fd0f6ad1234daf4b938d01c92e8d134a01d2f2dd45fd9e2d025d7556bd1386ec360402145a87f20580c85949d62cea0e
 
-  # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ versioning=loose depName=git://git.liburcu.org/userspace-rcu.git
+  # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.liburcu.org/userspace-rcu.git
   liburcu_version: 0.14.0
   liburcu_sha256: ca43bf261d4d392cff20dfae440836603bf009fce24fdc9b2697d837a2239d4f
   liburcu_sha512: 7297e51012f4c44ee27c0e18ed9d87bf24be34db68a5398394c1e683a045bb561cf74aa913398404c0ed5cb8011af728ea12947717fa5f27627e5ca78e63a40f
 
-  # renovate: datasource=git-tags versioning=loose depName=git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
+  # renovate: datasource=git-tags depName=git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
   linux_firmware_version: 20230310
   linux_firmware_sha256: 14c472af10f9b566c4f575aeb30d8a274d54b1660007e7426b7e4ea21dff81aa
   linux_firmware_sha512: a5655744892d7ebe341c6612a2f34f9f8b29af70b0c5795c5170b79517a88e75a518843278cb3b66e462be2905995ffd4f15373292e42ea387df6fd693333e89
@@ -141,10 +141,10 @@ vars:
   openssl_sha256: 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b
   openssl_sha512: 628676c9c3bc1cf46083d64f61943079f97f0eefd0264042e40a85dbbd988f271bfe01cd1135d22cc3f67a298f1d078041f8f2e97b0da0d93fe172da573da18c
 
-  # renovate: datasource=github-tags versioning=loose depName=raspberrypi/firmware
-  raspberrypi_firmware_version: 1.20230306
-  raspberrypi_firmware_sha256: f34f3591b6e32c12a4f654dca53c897f3a97db056aff182125e89a0965b123b1
-  raspberrypi_firmware_sha512: 065ec218f52097eb72cc74143990b8552849e5a352ddfc7f536d58e2c8df81da667b37fbae80f9cff61d61438a9bddb65030074fa0e2ee25338bbfced4a301bd
+  # renovate: datasource=github-tags depName=raspberrypi/firmware
+  raspberrypi_firmware_version: 1.20230317
+  raspberrypi_firmware_sha256: d6bb08f138b6d0868decad1bfe74d79f958e269a0f40470d719bf9850a65d574
+  raspberrypi_firmware_sha512: 959c939be6e9b15656be51e5cd5b4beedf85882a75bcfa34391edfc22cfb95d3dd954a8683a18fc4e800812f67aabb4ce9d0009b1eb209609c13b8090dd579d6
 
   # renovate: datasource=github-tags depName=opencontainers/runc
   runc_version: v1.1.4
@@ -162,7 +162,7 @@ vars:
   syslinux_sha256: 26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e
   syslinux_sha512: dd2b2916962b9e93bc1e714182e3ca2a727a229b8afabe913050bcfdd43ee2af51ee3acf79121d8c20caf434583efaa7f3196871e0e07c04d82191323a50fe31
 
-  # renovate: datasource=github-tags versioning=loose depName=ARM-software/arm-trusted-firmware
+  # renovate: datasource=github-tags depName=ARM-software/arm-trusted-firmware
   arm_trusted_firmware_version: v2.8.0
   arm_trusted_firmware_sha256: 60fad60eeb6840097f8e64f16093c06ddb2ef269c7a22affed02beaa6cefe466
   arm_trusted_firmware_sha512: 958cf8f9e258638e59d0fbd8b053fce7d8a9ea2fc922686c9d20ea16f79f55219ac18a12ab240c528ee98e49c2e0eef4c963fdb255cc14b92437a5b3cffc8640

diff --git a/kernel/build/config-amd64 b/kernel/build/config-amd64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.19 Kernel Configuration
+# Linux/x86 6.1.20 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y

diff --git a/kernel/build/config-arm64 b/kernel/build/config-arm64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.1.19 Kernel Configuration
+# Linux/arm64 6.1.20 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y