From 7e5a2482284e00f60cd44a5d155fcdf2291f1fc9 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 9 May 2024 18:52:03 +0400 Subject: [PATCH] feat: update dependencies ``` | Package | Update | Change | |---|---|---| | [abseil/abseil-cpp](https://togithub.com/abseil/abseil-cpp) | patch | `20240116.1` -> `20240116.2` | | [davea42/libdwarf-code](https://togithub.com/davea42/libdwarf-code) | patch | `0.9.1` -> `0.9.2` | | git://git.kernel.org/pub/scm/git/git.git | minor | `2.44.0` -> `2.45.0` | | git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git | minor | `2.39.3` -> `2.40.1` | | git://git.openssl.org/openssl.git | minor | `3.2.1` -> `3.3.0` | | git://git.savannah.gnu.org/coreutils.git | minor | `9.4` -> `9.5` | | [grpc/grpc-go](https://togithub.com/grpc/grpc-go) | minor | `v1.62.1` -> `v1.63.2` | | [https://gitlab.com/gnutls/gnutls.git](https://gitlab.com/gnutls/gnutls) | patch | `3.8.4` -> `3.8.5` | | [libbpf/libbpf](https://togithub.com/libbpf/libbpf) | minor | `v1.3.0` -> `v1.4.1` | | [protocolbuffers/protobuf](https://togithub.com/protocolbuffers/protobuf) | minor | `26.0` -> `26.1` | | [protocolbuffers/protobuf-go](https://togithub.com/protocolbuffers/protobuf-go) | minor | `v1.33.0` -> `v1.34.1` | | [python/cpython](https://togithub.com/python/cpython) | patch | `3.12.2` -> `3.12.3` | ``` Signed-off-by: Andrey Smirnov --- .github/workflows/ci.yaml | 8 +- .github/workflows/weekly.yaml | 5 +- Makefile | 5 +- Pkgfile | 74 +++++++++---------- kmod/patches/portable-basename.patch | 106 +++++++++++++++++++++++++++ kmod/patches/strndupa.patch | 15 ++++ kmod/pkg.yaml | 5 ++ meson/pkg.yaml | 1 + util-linux/pkg.yaml | 1 + 9 files changed, 176 insertions(+), 44 deletions(-) create mode 100644 kmod/patches/portable-basename.patch create mode 100644 kmod/patches/strndupa.patch diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index cfd8bb4..b56224e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-03-27T10:42:24Z by kres latest. +# Generated on 2024-05-09T12:19:36Z by kres 1e986af. name: default concurrency: @@ -33,7 +33,7 @@ jobs: labels: ${{ steps.retrieve-pr-labels.outputs.result }} services: buildkitd: - image: moby/buildkit:v0.13.1 + image: moby/buildkit:v0.13.2 options: --privileged ports: - 1234:1234 @@ -47,6 +47,7 @@ jobs: run: | git fetch --prune --unshallow - name: Set up Docker Buildx + id: setup-buildx uses: docker/setup-buildx-action@v3 with: append: | @@ -102,7 +103,7 @@ jobs: - default services: buildkitd: - image: moby/buildkit:v0.13.1 + image: moby/buildkit:v0.13.2 options: --privileged ports: - 1234:1234 @@ -116,6 +117,7 @@ jobs: run: | git fetch --prune --unshallow - name: Set up Docker Buildx + id: setup-buildx uses: docker/setup-buildx-action@v3 with: append: | diff --git a/.github/workflows/weekly.yaml b/.github/workflows/weekly.yaml index 8aa6075..f61670f 100644 --- a/.github/workflows/weekly.yaml +++ b/.github/workflows/weekly.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-03-27T10:42:24Z by kres latest. +# Generated on 2024-05-09T12:19:36Z by kres 1e986af. name: weekly concurrency: @@ -16,7 +16,7 @@ jobs: - pkgs services: buildkitd: - image: moby/buildkit:v0.13.1 + image: moby/buildkit:v0.13.2 options: --privileged ports: - 1234:1234 @@ -30,6 +30,7 @@ jobs: run: | git fetch --prune --unshallow - name: Set up Docker Buildx + id: setup-buildx uses: docker/setup-buildx-action@v3 with: append: | diff --git a/Makefile b/Makefile index 1f3006f..1af45dc 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-03-13T16:52:46Z by kres latest. +# Generated on 2024-05-09T12:19:36Z by kres 1e986af. # common variables @@ -9,6 +9,7 @@ TAG := $(shell git describe --tag --always --dirty --match v[0-9]\*) ABBREV_TAG := $(shell git describe --tags >/dev/null 2>/dev/null && git describe --tag --always --match v[0-9]\* --abbrev=0 || echo 'undefined') BRANCH := $(shell git rev-parse --abbrev-ref HEAD) ARTIFACTS := _out +IMAGE_TAG ?= $(TAG) OPERATING_SYSTEM := $(shell uname -s | tr '[:upper:]' '[:lower:]') GOARCH := $(shell uname -m | tr '[:upper:]' '[:lower:]') @@ -93,7 +94,7 @@ If you already have a compatible builder instance, you may use that instead. ## Artifacts All artifacts will be output to ./$(ARTIFACTS). Images will be tagged with the -registry "$(REGISTRY)", username "$(USERNAME)", and a dynamic tag (e.g. $(IMAGE):$(TAG)). +registry "$(REGISTRY)", username "$(USERNAME)", and a dynamic tag (e.g. $(IMAGE):$(IMAGE_TAG)). The registry and username can be overridden by exporting REGISTRY, and USERNAME respectively. diff --git a/Pkgfile b/Pkgfile index acec889..067d877 100644 --- a/Pkgfile +++ b/Pkgfile @@ -5,12 +5,12 @@ format: v1alpha2 vars: - TOOLCHAIN_IMAGE: ghcr.io/siderolabs/toolchain:v0.11.0 + TOOLCHAIN_IMAGE: ghcr.io/siderolabs/toolchain:v0.12.0-alpha.0 # renovate: datasource=github-releases depName=abseil/abseil-cpp - abseil_version: 20240116.1 - abseil_sha256: 3c743204df78366ad2eaf236d6631d83f6bc928d1705dd0000b872e53b73dc6a - abseil_sha512: 41504899ac4fd4a6eaa0a5fdf27a7765ec81962fb99b6a07982ceed32c5289e9eb12206c83a70fd44c5c3e1b96c2bfa160eb12f1dbbb45f1109d632c7690de90 + abseil_version: 20240116.2 + abseil_sha256: 733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc + abseil_sha512: 5062e731ee8c9a757e6d75fc1c558652deb4dd1daab4d6143f7ad52a139501c61365f89acbf82480be0f9a4911a58286560068d8b1a8b6774e6afad51739766e # renovate: datasource=github-tags depName=argp-standalone/argp-standalone argp_standalone_version: 1.5.0 @@ -48,9 +48,9 @@ vars: cmake_sha512: fe817c8d5e247db3f0a9a58ee37c466a47220100d9e90711cd5d06c223cef87e41d1a756e75d1537e5f8cd010dcb8971cbeab4684b1ac12bcecf84bf7b720167 # renovate: datasource=git-tags extractVersion=^v(?.*)$ depName=git://git.savannah.gnu.org/coreutils.git - coreutils_version: 9.4 - coreutils_sha256: ea613a4cf44612326e917201bbbcdfbd301de21ffc3b59b6e5c07e040b275e52 - coreutils_sha512: 7c55ee23b685a0462bbbd118b04d25278c902604a0dcf3bf4f8bf81faa0500dee5a7813cba6f586d676c98e520cafd420f16479619305e94ea6798d8437561f5 + coreutils_version: 9.5 + coreutils_sha256: cd328edeac92f6a665de9f323c93b712af1858bc2e0d88f3f7100469470a1b8a + coreutils_sha512: 2ca0deac4dc10a80fd0c6fd131252e99d457fd03b7bd626a6bc74fe5a0529c0a3d48ce1f5da1d3b3a7a150a1ce44f0fbb6b68a6ac543dfd5baa3e71f5d65401c # renovate: datasource=git-tags extractVersion=^release_(?.*)$ depName=git://git.savannah.gnu.org/cpio.git cpio_version: 2_13 @@ -78,9 +78,9 @@ vars: dtc_sha512: d3ba6902a9a2f2cdbaff55f12fca3cfe4a1ec5779074a38e3d8b88097c7abc981835957e8ce72971e10c131e05fde0b1b961768e888ff96d89e42c75edb53afb # renovate: datasource=github-tags extractVersion=^v(?.*)$ depName=davea42/libdwarf-code - dwarfutils_version: 0.9.1 - dwarfutils_sha256: 877e81b189edbb075e3e086f6593457d8353d4df09b02e69f3c0c8aa19b51bf4 - dwarfutils_sha512: ec66f0dbc72df3dd689a2d38ebae029e081e0ec3008dd510372e0c2c387f0092c2f9fe8d9928ded87b9c2ec30f1c3dc63bfaca7cc4a14e1c8c557d3c3b37d227 + dwarfutils_version: 0.9.2 + dwarfutils_sha256: c1cd51467f9cb8459cd27d4071857abc56191cc5d4182d8bdd7744030f88f830 + dwarfutils_sha512: 761ae16a14b250944c45ce91d2a7c2aa61010613fad1e174fcdf0fcfa2718b5a35814f3eb92d90144a6ac4785c6ffaae853bc3239b8774a21dbec1f4c5a7cf53 # renovate: datasource=git-tags extractVersion=^elfutils-(?.*)$ depName=git://sourceware.org/git/elfutils.git elfutils_version: 0.191 @@ -118,9 +118,9 @@ vars: gettext_sha512: a60999bb9d09441f138214d87acb7e59aab81e765bb9253a77c54902681c5de164a5a04de2a9778dfb479dbdefaab2d5de1fbaf6095c555c43e7e9fd7a1c09bd # renovate: datasource=git-tags extractVersion=^v(?.*)$ depName=git://git.kernel.org/pub/scm/git/git.git - git_version: 2.44.0 - git_sha256: e358738dcb5b5ea340ce900a0015c03ae86e804e7ff64e47aa4631ddee681de3 - git_sha512: 9e4b9c8a8e28cd50c0db75a93eae8a3423aa7e51c4312af1e1cdaf408e93f306c23aa747f0a97f27c11ab0e2f5e6283e52c8b61c9fe6be5b9b18673a43ce1780 + git_version: 2.45.0 + git_sha256: 0aac200bd06476e7df1ff026eb123c6827bc10fe69d2823b4bf2ebebe5953429 + git_sha512: 36d438bf9a57dee8fe0536c90cb25d53c552e9f80e7575447d1d2af30cadab08522356f4ecd0f69b7877d5a7f84ab3b9766d8386beae57fe8d411d05d70db214 # official source code uses mercurial https://gmplib.org/devel/repo-usage, so falling back to a GitHub mirror, # renovate: datasource=github-tags extractVersion=^v(?.*)$ depName=alisw/GMP @@ -144,9 +144,9 @@ vars: grep_sha512: f254a1905a08c8173e12fbdd4fd8baed9a200217fba9d7641f0d78e4e002c1f2a621152d67027d9b25f0bb2430898f5233dc70909d8464fd13d7dd9298e65c42 # renovate: datasource=git-tags depName=https://gitlab.com/gnutls/gnutls.git - gnutls_version: 3.8.4 - gnutls_sha256: 2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b - gnutls_sha512: af748610392b7eec8a6294d28d088f323450207cdcda1aa2138a0fd71023994c662f7aff72b2b3cd888e7b770750611981c2cde5f2ddc45f852fc0034cdebaff + gnutls_version: 3.8.5 + gnutls_sha256: 66269a2cfe0e1c2dabec87bdbbd8ab656f396edd9a40dd006978e003cfa52bfc + gnutls_sha512: 4bac1aa7ec1dce9b3445cc515cc287a5af032d34c207399aa9722e3dc53ed652f8a57cfbc9c5e40ccc4a2631245d89ab676e3ba2be9563f60ba855aaacb8e23c # renovate: datasource=git-tags extractVersion=^v(?.*)$ depName=git://git.savannah.gnu.org/gzip.git gzip_version: 1.13 @@ -159,9 +159,9 @@ vars: kmod_sha512: 29162135aabd025dff178a4147a754b5da5964855dbeee65ca867dec3b84437f35c1c97f0f027e974a021d3ee9a4940309a716859cc3cfe93c7ed0aada338f24 # renovate: datasource=github-tags depName=libbpf/libbpf - libbpf_version: v1.3.0 - libbpf_sha256: 11db86acd627e468bc48b7258c1130aba41a12c4d364f78e184fd2f5a913d861 - libbpf_sha512: 59990189538e47765542e9ed6e88bc78c9d29bc077b5666bb1303cf15579c90b3d35a0d631b9bbd4bff2708243dc91d901bd68c119fb74dfd10a3e1066aa9acc + libbpf_version: v1.4.1 + libbpf_sha256: cc01a3a05d25e5978c20be7656f14eb8b6fcb120bb1c7e8041e497814fc273cb + libbpf_sha512: 3073806d9fc2aafb6620f41bf7d73f17ebe92cff577821a309d0fb2192a88b8bb5a984d11590fe1050035dc4dc154d50372f78c2e87a1000ddb795e30120ddf5 # renovate: datasource=git-tags extractVersion=^libcap-(?.*)$ depName=git://git.kernel.org/pub/scm/libs/libcap/libcap.git libcap_version: 2.69 @@ -244,9 +244,9 @@ vars: nettle_sha512: 5939c4b43cf9ff6c6272245b85f123c81f8f4e37089fa4f39a00a570016d837f6e706a33226e4bbfc531b02a55b2756ff312461225ed88de338a73069e031ced # renovate: datasource=git-tags extractVersion=^openssl-(?.*)$ depName=git://git.openssl.org/openssl.git - openssl_version: 3.2.1 - openssl_sha256: 83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39 - openssl_sha512: bab2b2419319f1feffaba4692f03edbf13b44d1090c6e075a2d69dad67a2d51e64e6edbf83456a26c83900a726d20d2c4ee4ead9c94b322fd0b536f3b5a863c4 + openssl_version: 3.3.0 + openssl_sha256: 53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02 + openssl_sha512: 1f9daeee6542e1b831c65f1f87befaef98ccedc3abc958c9d17f064ef771924c30849e3ff880f94eed4aaa9d81ea105e3bc8815e6d2e4d6b60b5e890f14fc5da # renovate: datasource=git-tags extractVersion=^v(?.*)$ depName=git://git.kernel.org/pub/scm/devel/pahole/pahole.git pahole_version: 1.26 @@ -275,24 +275,24 @@ vars: pkg_config_sha512: 4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75 # renovate: datasource=github-tags extractVersion=^v(?.*)$ depName=protocolbuffers/protobuf - protobuf_version: 26.0 - protobuf_sha256: e32100a8013870d24ffc37dad6781a61e5d0c99501bcb04d39c340a1c44a8e63 - protobuf_sha512: b350e0be51e4977865bfcc086506e1d85421da5d9386d2b10dada98a9a1a32a7b44e2ace866e605b42f1e2b6a702e6eca7fa9f5346819b55dd7d09f5ded3628c + protobuf_version: 26.1 + protobuf_sha256: 4fc5ff1b2c339fb86cd3a25f0b5311478ab081e65ad258c6789359cd84d421f8 + protobuf_sha512: 0363ac09f92d8e040491425d444c8dca0b9b430e02d2dff6e2b28a0c2b2bea0d33a47f50bc9e2e2d4e8e22b65a02009a20c0066fb89c75df93a7b703dda42ed4 # renovate: datasource=github-releases depName=protocolbuffers/protobuf-go - protoc_gen_go_version: v1.33.0 - protoc_gen_go_sha256: 21661d7634e3f783b015b93ceafc0261f2f02a270799bac871602c3a2172cfbe - protoc_gen_go_sha512: 749c325e32074ff17331b4876b71c1cdf9001f80dc817f9719529aef66282252bebddf4cfe81c5a3f5e56219b9f23a47941b25a921f053065e1229302aeee57a + protoc_gen_go_version: v1.34.1 + protoc_gen_go_sha256: 8aff9ec0c28a926daeedb1ce1f87a284e22fc5a892e9e5f7c850881137c85000 + protoc_gen_go_sha512: b7be230422567a72372f07c79eb2cfd036259ad463debf53c1fc75f823612cf3722217d7bc3fe7c430ff5b147ff2d850dc7d2bf6427936c1b2feee1e2da528b0 # renovate: datasource=github-tags depName=grpc/grpc-go - protoc_gen_go_grpc_version: v1.62.1 - protoc_gen_go_grpc_sha256: 81419fd0835548cf784de9af509d5d42797530894adfb6e8634ed78ae3fc8f8d - protoc_gen_go_grpc_sha512: 48b270afad1bb17ea91eca092fee861838eec4029f6b9d9df28b0500fa46f3bfd99da0fa51d4ad460cfca2382c06b6fe641e244429d754e5ce469488ad66e35f + protoc_gen_go_grpc_version: v1.63.2 + protoc_gen_go_grpc_sha256: ffc7611e4989de79de4c17b015ff10db810b85f749b12520336314746e9d7095 + protoc_gen_go_grpc_sha512: 2c35a8964acfdc251369484458e65c5aa9be8978ee902805e12b73cdce62478b9aa03e6105b9dde9db35b4f1a5124052b201f5c42c68dd2c410106efa4228103 # renovate: datasource=github-tags extractVersion=^v(?.*)$ depName=python/cpython - python_version: 3.12.2 - python_sha256: be28112dac813d2053545c14bf13a16401a21877f1a69eb6ea5d84c4a0f3d870 - python_sha512: 2ccfae7b9f95d8e15ea85d3f66eea5f6a8fdcaffc0b405095fecb33efc0df50b831c1215542910ced948b54e6de1f7242b0b8b9afc5f89079451c552430d7d9f + python_version: 3.12.3 + python_sha256: 56bfef1fdfc1221ce6720e43a661e3eb41785dd914ce99698d8c7896af4bdaa1 + python_sha512: 4a2213b108e7f1f1525baa8348e68b2a2336d925e60d0a59f0225fc470768a2c8031edafc0b8243f94dbae18afda335ee5adf2785328c2218fd64cbb439f13a4 # renovate: datasource=github-tags depName=rhash/RHash rhash_version: v1.4.4 @@ -335,9 +335,9 @@ vars: texinfo_sha512: ceab03e8422d800b08c7b44e8263b0a1f35bb7758d83a81136df6f3304a14daecda98a12a282afb85406d2ca2f665b2295e10b6f4064156ea1285d80d5d355db # renovate: datasource=git-tags extractVersion=^v(?.*)$ depName=git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git - util_linux_version: 2.39.3 - util_linux_sha256: 7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f - util_linux_sha512: a2de1672f06ca5d2d431db1265a8499808770c3781019ec4a3a40170df4685826d8e3ca120841dcc5df4681ca8c935a993317bd0dc70465b21bf8e0efef65afa + util_linux_version: 2.40.1 + util_linux_sha256: 59e676aa53ccb44b6c39f0ffe01a8fa274891c91bef1474752fad92461def24f + util_linux_sha512: 58ec6eb41d4b6bfc544a80e95c71b5f3798ab4d2a9435d3ee9e5edd56f9b3f09bcb154bdd70e002dc018938937e2e946ae731dcda0f86b362fc43423689e41fc # renovate: datasource=github-releases depName=tukaani-project/xz # NOTE: using 5.4.5 the version debian downgraded to. Ref: https://www.openwall.com/lists/oss-security/2024/03/29/4 diff --git a/kmod/patches/portable-basename.patch b/kmod/patches/portable-basename.patch new file mode 100644 index 0000000..12f333a --- /dev/null +++ b/kmod/patches/portable-basename.patch @@ -0,0 +1,106 @@ +Upstream PR #32 + +musl has removed the non-prototype declaration of basename from +string.h [1] which now results in build errors with clang-17+ +compiler. + +https://github.com/kmod-project/kmod/pull/32 + +--- + +diff -aur a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c +--- a/libkmod/libkmod-config.c ++++ b/libkmod/libkmod-config.c +@@ -794,7 +794,7 @@ + bool is_single = false; + + if (name == NULL) { +- name = basename(path); ++ name = gnu_basename(path); + is_single = true; + } + +diff -aur a/shared/util.c b/shared/util.c +--- a/shared/util.c ++++ b/shared/util.c +@@ -172,9 +172,9 @@ + + char *path_to_modname(const char *path, char buf[static PATH_MAX], size_t *len) + { +- char *modname; ++ const char *modname; + +- modname = basename(path); ++ modname = gnu_basename(path); + if (modname == NULL || modname[0] == '\0') + return NULL; + +diff -aur a/shared/util.h b/shared/util.h +--- a/shared/util.h ++++ b/shared/util.h +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -76,6 +77,12 @@ + __p->__v = (val); \ + } while(0) + ++static _always_inline_ const char *gnu_basename(const char *s) ++{ ++ const char *p = strrchr(s, '/'); ++ return p ? p+1 : s; ++} ++ + static _always_inline_ unsigned int ALIGN_POWER2(unsigned int u) + { + return 1 << ((sizeof(u) * 8) - __builtin_clz(u - 1)); +diff -aur a/testsuite/testsuite.c b/testsuite/testsuite.c +--- a/testsuite/testsuite.c ++++ b/testsuite/testsuite.c +@@ -70,7 +70,7 @@ + + printf("Usage:\n" + "\t%s [options] \n" +- "Options:\n", basename(progname)); ++ "Options:\n", gnu_basename(progname)); + + for (itr = options, itr_short = options_short; + itr->name != NULL; itr++, itr_short++) +diff -aur a/tools/depmod.c b/tools/depmod.c +--- a/tools/depmod.c ++++ b/tools/depmod.c +@@ -761,7 +761,7 @@ + if (name != NULL) + namelen = strlen(name); + else { +- name = basename(dir); ++ name = gnu_basename(dir); + namelen = strlen(name); + dirlen -= namelen + 1; + } +diff -aur a/tools/kmod.c b/tools/kmod.c +--- a/tools/kmod.c ++++ b/tools/kmod.c +@@ -68,7 +68,7 @@ + "Options:\n" + "\t-V, --version show version\n" + "\t-h, --help show this help\n\n" +- "Commands:\n", basename(argv[0])); ++ "Commands:\n", gnu_basename(argv[0])); + + for (i = 0; i < ARRAY_SIZE(kmod_cmds); i++) { + if (kmod_cmds[i]->help != NULL) { +@@ -156,7 +156,7 @@ + const char *cmd; + size_t i; + +- cmd = basename(argv[0]); ++ cmd = gnu_basename(argv[0]); + + for (i = 0; i < ARRAY_SIZE(kmod_compat_cmds); i++) { + if (streq(kmod_compat_cmds[i]->name, cmd)) diff --git a/kmod/patches/strndupa.patch b/kmod/patches/strndupa.patch new file mode 100644 index 0000000..dbff175 --- /dev/null +++ b/kmod/patches/strndupa.patch @@ -0,0 +1,15 @@ +diff --git a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c +index df12433..142e767 100644 +--- a/shared/util.c ++++ b/shared/util.c +@@ -334,7 +334,9 @@ int mkdir_p(const char *path, int len, mode_t mode) + { + char *start, *end; + +- start = strndupa(path, len); ++ start = alloca(len+1); ++ strncpy(start, path, len); ++ start[len] = '\0'; + end = start + len; + + /* diff --git a/kmod/pkg.yaml b/kmod/pkg.yaml index 57e2fa1..936d76f 100644 --- a/kmod/pkg.yaml +++ b/kmod/pkg.yaml @@ -1,6 +1,7 @@ name: kmod dependencies: - stage: base + - stage: patch steps: - sources: - url: https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-{{ .kmod_version }}.tar.xz @@ -10,6 +11,10 @@ steps: prepare: - | tar -xJf kmod.tar.xz --strip-components=1 + + patch -p1 < /pkg/patches/portable-basename.patch + patch -p1 < /pkg/patches/strndupa.patch + mkdir build cd build ../configure \ diff --git a/meson/pkg.yaml b/meson/pkg.yaml index 2022b23..4d7e18e 100644 --- a/meson/pkg.yaml +++ b/meson/pkg.yaml @@ -3,6 +3,7 @@ dependencies: - stage: base - stage: libffi - stage: python3 + - stage: openssl steps: - sources: - url: https://github.com/mesonbuild/meson/releases/download/{{ .meson_version }}/meson-{{ .meson_version }}.tar.gz diff --git a/util-linux/pkg.yaml b/util-linux/pkg.yaml index 15a7c1a..32f1485 100644 --- a/util-linux/pkg.yaml +++ b/util-linux/pkg.yaml @@ -18,6 +18,7 @@ steps: --disable-bash-completion \ --disable-asciidoc \ --disable-makeinstall-chown \ + --disable-liblastlog2 \ --without-systemd \ --without-systemdsystemunitdir \ --without-ncurses \