From 03935581049f82ff466defcc203c5bcc6db5b43a Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Wed, 25 Dec 2024 18:04:49 +0400 Subject: [PATCH] feat: bump dependencies ``` | Package | Update | Change | |---|---|---| | [curl/curl](https://redirect.github.com/curl/curl) | patch | `8_11_0` -> `8_11_1` | | [davea42/libdwarf-code](https://redirect.github.com/davea42/libdwarf-code) | patch | `0.11.0` -> `0.11.1` | | git://git.kernel.org/pub/scm/devel/pahole/pahole.git | minor | `1.27` -> `1.28` | | git://git.kernel.org/pub/scm/libs/libcap/libcap.git | minor | `2.72` -> `2.73` | | git://git.savannah.gnu.org/texinfo.git | minor | `7.1.1` -> `7.2` | | [grpc/grpc-go](https://redirect.github.com/grpc/grpc-go) | minor | `v1.68.0` -> `v1.69.2` | | [mesonbuild/meson](https://redirect.github.com/mesonbuild/meson) | patch | `1.6.0` -> `1.6.1` | | [protocolbuffers/protobuf](https://redirect.github.com/protocolbuffers/protobuf) | minor | `29.0` -> `29.2` | | [protocolbuffers/protobuf-go](https://redirect.github.com/protocolbuffers/protobuf-go) | minor | `v1.35.2` -> `v1.36.1` | | [python/cpython](https://redirect.github.com/python/cpython) | patch | `3.13.0` -> `3.13.1` | | [systemd/systemd](https://redirect.github.com/systemd/systemd) | major | `256.8` -> `257.1` | ``` Signed-off-by: Andrey Smirnov --- Pkgfile | 60 +++++++++++++++---------------- ca-certificates/pkg.yaml | 6 ++-- elfutils/pkg.yaml | 2 +- libcap2/patches/getdents.patch | 66 ---------------------------------- libcap2/pkg.yaml | 2 -- sd-boot/patches/musl.patch | 6 ++-- sd-boot/pkg.yaml | 4 +-- 7 files changed, 39 insertions(+), 107 deletions(-) delete mode 100644 libcap2/patches/getdents.patch diff --git a/Pkgfile b/Pkgfile index eef41a0..c23ca34 100644 --- a/Pkgfile +++ b/Pkgfile @@ -58,9 +58,9 @@ vars: cpio_sha512: 1e1ca6b3e3e64f206f9d828a152d6b4f8f6974de7a953ff96e02698b1c3c2c777c2111450e6a71c0693e29ca8bc01c3dda9f5e829b8e3221f647414df49dff6a # renovate: datasource=github-releases extractVersion=^curl-(?.*)$ depName=curl/curl - curl_version: 8_11_0 - curl_sha256: db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb - curl_sha512: 3a642d421e0a5c09ecb681bea18498f2c6124e9af4d8afdc074dfb85a9b0211d8972ade9cf00ab44b5dfed9303262cd83551dd3b5e0976d11fc19da3c4a0987e + curl_version: 8_11_1 + curl_sha256: c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56 + curl_sha512: 7c7c47a49505575b610c56b455f0919ea5082a993bf5483eeb258ead167aadb87078d626b343b417dcfc5439c53556425c8fb4fe3b01b53a87b47c01686a3e57 # renovate: datasource=git-tags extractVersion=^v(?.*)$ depName=git://git.savannah.gnu.org/diffutils.git diffutils_version: 3.10 @@ -73,9 +73,9 @@ vars: dtc_sha512: 30f3611175a5c29556282f3f2894701a5837eb869608d89d78c280af448bbc3a5b6c83f51c28f991847c0eb7c42aa57599bbc31433f1b3b2c8d162cb2169b91f # renovate: datasource=github-tags extractVersion=^v(?.*)$ depName=davea42/libdwarf-code - dwarfutils_version: 0.11.0 - dwarfutils_sha256: 846071fb220ac1952f9f15ebbac6c7831ef50d0369b772c07a8a8139a42e07d2 - dwarfutils_sha512: 050cb111c1ed94980357011a623190b626b68425639ee1ab39ab09a31d0cc55e557ef35739ce1295cf0e1b51848fbcbb3633fe1f6466784db6d8eb008a93c355 + dwarfutils_version: 0.11.1 + dwarfutils_sha256: b5be211b1bd0c1ee41b871b543c73cbff5822f76994f6b160fc70d01d1b5a1bf + dwarfutils_sha512: d927b1d0e8dd1540c2f5da2a9d39b2914bb48225b2b9bdca94e7b36349358e1f537044eadc345f11d75de717fdda07ad99a8a7a5eb45e64fe4c79c37e165012f # renovate: datasource=git-tags extractVersion=^elfutils-(?.*)$ depName=git://sourceware.org/git/elfutils.git elfutils_version: 0.192 @@ -164,9 +164,9 @@ vars: libbpf_sha512: 0cc25addcf5fcee0537d598037feab4bc73a513e6025d8f559bed58fe8850a10fcfeefd1a9dafc5e0bac6202d445944b12811cb7254b9b3be4dd3d2cc1e9419b # renovate: datasource=git-tags extractVersion=^libcap-(?.*)$ depName=git://git.kernel.org/pub/scm/libs/libcap/libcap.git - libcap_version: 2.72 - libcap_sha256: 0274f5a15a5205f656d8f0169eef711dd29158ba8ad3b240618b342b2460175b - libcap_sha512: c0726bcd5e48395c6f4edd34f0fcaa21d7b2fe35dbc88824c0d86b42859dbe507f55c1ac7f7352e2aa56e3632b7aa9a098ca9cc730c82f942106d2786b10ba2c + libcap_version: 2.73 + libcap_sha256: 6405f6089cf4cdd8c271540cd990654d78dd0b1989b2d9bda20f933a75a795a5 + libcap_sha512: 8ab72cf39bf029656b2a4a5972a0da4ab4b46a3d8a8da66d6cde925e06fe34df2fa5fc4d0b62c9cec4972b0b2678fdac6ef9421b6fb83c2a5bf869cf8d5fdb16 # renovate: datasource=github-tags extractVersion=^v(?.*)$ depName=libffi/libffi libffi_version: 3.4.6 @@ -209,9 +209,9 @@ vars: make_sha512: 145260cbd6a8226cef3dfef0c8baba31847beaebc7e6b65d39d02715fd4f4cab9b139b6c3772e550088d4f9ae80c6d3ed20b9a7664c693644dfb96b4cb60e67c # renovate: datasource=github-releases depName=mesonbuild/meson - meson_version: 1.6.0 - meson_sha256: 999b65f21c03541cf11365489c1fad22e2418bb0c3d50ca61139f2eec09d5496 - meson_sha512: 8805f07d0cfe2050305eff009b20973bfe3aab808a263479ed98a31fa026c1a378285928c2dd058e4224abc1b347aeee5c1628c964375135e9b4647819a119bc + meson_version: 1.6.1 + meson_sha256: 1eca49eb6c26d58bbee67fd3337d8ef557c0804e30a6d16bfdf269db997464de + meson_sha512: b4ca7a3b667db0ad370110abd8b20467b1c74ae7777a068db33f8974602c123881a7130b2340664abb52e36fe5195989a5cc8fa7de6212c37abf5b0900554425 # renovate: datasource=git-tags depName=https://gitlab.inria.fr/mpc/mpc.git mpc_version: 1.3.1 @@ -249,9 +249,9 @@ vars: openssl_sha512: 0784096f00c7907e477919d5ddeadb14b61bcb569a938fa739c1c714949214a7daf63574149d718dae372ed0c91c300042f4e3ba5e8633607e8034a3bda75a26 # renovate: datasource=git-tags extractVersion=^v(?.*)$ depName=git://git.kernel.org/pub/scm/devel/pahole/pahole.git - pahole_version: 1.27 - pahole_sha256: 87223298d4f8f9ada9b3cc5cef1bedd7aeb447cd8295abc466e009a26accff13 - pahole_sha512: d239f6ac7cabe7f6fdcfbb9b318100963e80585823fd29f412c6d8b5157a0ceeaf354e0b807e40a36fba338eed86f1b44852ff9c4fd01e0812d764c722726648 + pahole_version: 1.28 + pahole_sha256: 9a319c214b38554be8430a672043d85735564e8e1e78db5a41cba7a03d038056 + pahole_sha512: 13715ca502c2bdda79fb97296d42f8ed4201c2f991882abd9bcae1d43db99bd2c5dcb80ac110ebc9dc1621b062945e528c3ed2b4ad042c3941233e1addb89540 # renovate: datasource=git-tags extractVersion=^v(?.*)$ depName=git://git.savannah.gnu.org/patch.git patch_version: 2.7.6 @@ -275,9 +275,9 @@ vars: pkg_config_sha512: 4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75 # renovate: datasource=github-tags extractVersion=^v(?.*)$ depName=protocolbuffers/protobuf - protobuf_version: 29.0 - protobuf_sha256: 10a0d58f39a1a909e95e00e8ba0b5b1dc64d02997f741151953a2b3659f6e78c - protobuf_sha512: c5637486a533557ea909d1f880b0f0064fff0c4665612e023170941310c45bf8e7373d2c67de621824b056530e98792c00799d71ec4ff7b6af9142cdc4cb8dee + protobuf_version: 29.2 + protobuf_sha256: 63150aba23f7a90fd7d87bdf514e459dd5fe7023fdde01b56ac53335df64d4bd + protobuf_sha512: aeb21773edc3dd92a6c1ba6ccd721cc8a20d61230a5309c75ee3ef19baa554c228a6d1095f191ccc18f10183b646f3140dfe6526f5812bcaa64b7d5260572643 # renovate: datasource=github-releases depName=protocolbuffers/protobuf-go protoc_gen_go_version: v1.35.2 @@ -285,14 +285,14 @@ vars: protoc_gen_go_sha512: 4c34090452ea29a0260e842ac960ee91c72e1869cad815c08b56e7f787cba2342d3cc56cab93805711836a683a2b746fd72be32022c7710caea8e466efa0b59f # renovate: datasource=github-tags depName=grpc/grpc-go - protoc_gen_go_grpc_version: v1.68.0 - protoc_gen_go_grpc_sha256: 7831f4c5f7a223eea8c53c6f927b29d723a57c37a6104d9b016356338d0b48e3 - protoc_gen_go_grpc_sha512: c863769b0f53da268422d981e274ce3f0083c1c784614bbb453993c851d2246a5d856c3ab43cd0ff9179461733d41e5cbb3be49e9a8c30c302ccdea931dbb712 + protoc_gen_go_grpc_version: v1.69.2 + protoc_gen_go_grpc_sha256: 203e346da4e316aa4d866a723944b197dc5f0f2b46444ba1b6017feee8008c22 + protoc_gen_go_grpc_sha512: f95caccca23583587e2779fad7c8618c890bc4e512dae2bc9aae1474749335141b50603960c5ce2a33db6cfffe594c8b9aa2f411ae9040d2b92c32e38192f73d # renovate: datasource=github-tags extractVersion=^v(?.*)$ depName=python/cpython - python_version: 3.13.0 - python_sha256: 086de5882e3cb310d4dca48457522e2e48018ecd43da9cdf827f6a0759efb07d - python_sha512: 44a143c9b96b55b01885ec020c3364265bda55289615cd7d5071915b0d0178a6f35e7551a89090001fcb7f3172d38177a56bf8b8532b15c9dbc50295c9210152 + python_version: 3.13.1 + python_sha256: 9cf9427bee9e2242e3877dd0f6b641c1853ca461f39d6503ce260a59c80bf0d9 + python_sha512: 056c9b5fc0a6b540f41513d045f43c1ed463d15e0f345cecec703ec9c2335e53b4beb19de9c74ab2b236b023f934d5fd9ae7727a808634eaa01cfe66018a9a35 # renovate: datasource=github-tags depName=rhash/RHash rhash_version: v1.4.5 @@ -326,9 +326,9 @@ vars: swig_sha512: 019dee5a46d57e1030eef47cd5d007ccaadbdcd4e53cd30d7c795f0118ecf4406a78185534502c81c5f6d7bac0713256e7e19b20b5a2d14e2c552219edbaf5cf # renovate: datasource=github-releases extractVersion=^v(?.*)$ depName=systemd/systemd - systemd_version: 256.8 - systemd_sha256: b3d003b4f6d1ab0bfae0cf7a37c4aa559923c49bc8e9d1331b7459e12ebc357a - systemd_sha512: 0cdd41274b79177705f6999194ea2698e8bccd123d983733972e0fba4ece5467eddefec419a992d1646e93adda7b811810deec163a15f2c9347473caefe2ce09 + systemd_version: 257.1 + systemd_sha256: 375365b9f3718ba5fc2a972445eefcd9e229cc18bffe95818220c2a52efe8ed9 + systemd_sha512: dded7555077f85d0f8106b72cc46604fbe4249452be6b2d55800770b6deb2a3a122697c5a5f23b22dab416e8c050e53fc30d59dfd3bfd7c9fbbdab3162e8ebe5 # renovate: datasource=git-tags extractVersion=^release_(?.*)$ depName=git://git.savannah.gnu.org/tar.git tar_version: 1_34 @@ -336,9 +336,9 @@ vars: tar_sha512: 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902 # renovate: datasource=git-tags extractVersion=^texinfo-(?.*)$ depName=git://git.savannah.gnu.org/texinfo.git - texinfo_version: 7.1.1 - texinfo_sha256: 31ae37e46283529432b61bee1ce01ed0090d599e606fc6a29dca1f77c76a6c82 - texinfo_sha512: 05d605fba810f2939cab16ed5ddb341e22d397370648e6e0271c807fa573267e933c75ed7ae682c3c9cfecb568311a8df7abeb8c0556a94ef7169737d5b9c52a + texinfo_version: 7.2 + texinfo_sha256: 0329d7788fbef113fa82cb80889ca197a344ce0df7646fe000974c5d714363a6 + texinfo_sha512: 8e67337ae12a552fc620c43725507a4978710ea6630e98b0f5e98eb3f79a90e191dde5225699aa6217c26f171d277461f76150f0459cd07b40c3234d2f3d89bf # renovate: datasource=git-tags extractVersion=^v(?.*)$ depName=git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git util_linux_version: 2.40.2 diff --git a/ca-certificates/pkg.yaml b/ca-certificates/pkg.yaml index abefcc4..099b184 100644 --- a/ca-certificates/pkg.yaml +++ b/ca-certificates/pkg.yaml @@ -1,10 +1,10 @@ name: ca-certificates steps: - sources: - - url: https://curl.se/ca/cacert-2024-09-24.pem + - url: https://curl.se/ca/cacert-2024-11-26.pem destination: cacert.pem - sha256: 189d3cf6d103185fba06d76c1af915263c6d42225481a1759e853b33ac857540 - sha512: 6048901e8e31bc9e75d208b39a9de747168f7252cfa80e6df2c13a7b28a7ac08e333434b29961b50036fcd9ccc0b1f670ffafc8866e84365b366eb9b25e6019b + sha256: bb1782d281fe60d4a2dcf41bc229abe3e46c280212597d4abcc25bddf667739b + sha512: 26c6fa1ac7bcfd523f9ab9e6c2d971103ccfc610ad0df504d4e9b064dad74576d77240c052b808f4c37c9240302a7e973a20f79ee39ac7bf3201a6fa9f0dfa96 install: - | mkdir -p /rootfs${TOOLCHAIN}/etc/ssl/certs diff --git a/elfutils/pkg.yaml b/elfutils/pkg.yaml index 198a02c..53d3991 100644 --- a/elfutils/pkg.yaml +++ b/elfutils/pkg.yaml @@ -32,7 +32,7 @@ steps: - | cd build - make + make -j $(nproc) install: - | cd build diff --git a/libcap2/patches/getdents.patch b/libcap2/patches/getdents.patch deleted file mode 100644 index 0d988c9..0000000 --- a/libcap2/patches/getdents.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 304089b078f2f339cd7ccb030a0ad0194aea0a0f Mon Sep 17 00:00:00 2001 -From: Xi Ruoyao -Date: Tue, 12 Nov 2024 11:44:56 +0800 -Subject: psx: use getdents64 instead of getdents - -On relatively new architectures (for example ARM64, RISC-V, and -LoongArch), the kernel does not have a getdents syscall. Use getdents64 -instead to fix the build on them. - -The getdents64 syscall was added in Linux 2.4 and I don't think we -should still support older kernels today. - -Signed-off-by: Xi Ruoyao -Signed-off-by: Andrew G. Morgan ---- - psx/psx.c | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -diff --git a/psx/psx.c b/psx/psx.c -index d66a7bf..bf7d69f 100644 ---- a/psx/psx.c -+++ b/psx/psx.c -@@ -410,10 +410,11 @@ static long int __psx_immediate_syscall(long int syscall_nr, - - #define BUF_SIZE 4096 - --struct psx_linux_dirent { -- unsigned long d_ino; -- off_t d_off; -+struct psx_linux_dirent64 { -+ long long d_ino; -+ long long d_off; - unsigned short d_reclen; -+ unsigned char d_type; - char d_name[]; - }; - -@@ -486,11 +487,11 @@ long int __psx_syscall(long int syscall_nr, ...) { - - for (;;) { - char buf[BUF_SIZE]; -- size_t nread = syscall(SYS_getdents, fd, buf, BUF_SIZE); -+ size_t nread = syscall(SYS_getdents64, fd, buf, BUF_SIZE); - if (nread == 0) { - break; - } else if (nread < 0) { -- perror("getdents failed"); -+ perror("getdents64 failed"); - kill(psx_tracker.pid, SIGKILL); - } - -@@ -499,10 +500,10 @@ long int __psx_syscall(long int syscall_nr, ...) { - for (offset = 0; offset < nread; offset += reclen) { - /* deal with potential unaligned reads */ - memcpy(&reclen, buf + offset + -- offsetof(struct psx_linux_dirent, d_reclen), -+ offsetof(struct psx_linux_dirent64, d_reclen), - sizeof(reclen)); - char *dir = (buf + offset + -- offsetof(struct psx_linux_dirent, d_name)); -+ offsetof(struct psx_linux_dirent64, d_name)); - long tid = atoi(dir); - if (tid == 0 || tid == self) { - continue; --- -cgit 1.2.3-korg diff --git a/libcap2/pkg.yaml b/libcap2/pkg.yaml index fe426f1..de6f5f3 100644 --- a/libcap2/pkg.yaml +++ b/libcap2/pkg.yaml @@ -11,8 +11,6 @@ steps: prepare: - | tar -xf libcap.tar.xz --strip-components=1 - - | - patch -p1 < /pkg/patches/getdents.patch build: - | make prefix=${TOOLCHAIN} lib=lib -j $(nproc) diff --git a/sd-boot/patches/musl.patch b/sd-boot/patches/musl.patch index 68a02c4..e981e3b 100644 --- a/sd-boot/patches/musl.patch +++ b/sd-boot/patches/musl.patch @@ -3,10 +3,10 @@ int here: https://git.musl-libc.org/cgit/musl/tree/arch/x86_64/bits/alltypes.h.i So the patch below sets __DEFINED_wchar_t and loads `stddef.h` later so that we can override it. -diff --git src/boot/efi/efi.h src/boot/efi/efi.h +diff --git src/boot/efi.h src/boot/efi.h index b8d193154e..e432e9c91f 100644 ---- src/boot/efi/efi.h -+++ src/boot/efi/efi.h +--- src/boot/efi.h ++++ src/boot/efi.h @@ -3,14 +3,15 @@ #include diff --git a/sd-boot/pkg.yaml b/sd-boot/pkg.yaml index 32a4c8a..dd33ed5 100644 --- a/sd-boot/pkg.yaml +++ b/sd-boot/pkg.yaml @@ -53,8 +53,8 @@ steps: - | mkdir -p /rootfs/toolchain/lib/systemd/boot/efi - cp build/src/boot/efi/*.efi /rootfs/toolchain/lib/systemd/boot/efi - cp build/src/boot/efi/*.efi.stub /rootfs/toolchain/lib/systemd/boot/efi + cp build/src/boot/*.efi /rootfs/toolchain/lib/systemd/boot/efi + cp build/src/boot/*.efi.stub /rootfs/toolchain/lib/systemd/boot/efi finalize: - from: /rootfs to: /