diff --git a/app/containers/containerd/ympbuild b/app/containers/containerd/ympbuild index 1d89fd1b..c399c1a1 100644 --- a/app/containers/containerd/ympbuild +++ b/app/containers/containerd/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='containerd' -release='1' -version='1.7.10' +release='2' +version='2.0.0' url='https://example.org' description='Package description missing' email='aliriza.keskin@pardus.org.tr' @@ -12,7 +12,7 @@ source=("https://github.com/containerd/containerd/archive/v$version.tar.gz" "containerd.confd") depends=(runc) makedepends=(go) -md5sums=('0b2cc4244e310fa1cbf8fb3b2c95fbd3' +sha256sums=('346d644e1b96e1f4a39bfe9d1eb0eb01ca676f806c12d95e5dbe35325bbc1780' 'SKIP' 'SKIP') group=(app.containers) diff --git a/app/containers/docker/ympbuild b/app/containers/docker/ympbuild index aeff1a77..af2c4b61 100755 --- a/app/containers/docker/ympbuild +++ b/app/containers/docker/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='docker' -release='2' -version='25.0.3' +release='3' +version='27.3.1' url='https://docker.io' description='Pack, ship and run any application as a lightweight container' email='aliriza.keskin@pardus.org.tr' @@ -13,8 +13,8 @@ source=("cli.tar.gz::https://github.com/docker/cli/archive/v$version.tar.gz" 'docker.confd') depends=(make-ca containerd iptables tini) makedepends=(go) -md5sums=('07e11663adb2485dded81d99e45b4aae' - '39e1f98dfaba26fe6cdc14f97050c63c' +sha256sums=('df7d44387166d90954e290dfbe0a278649bf71d0e89933615bdc0757580b68e4' + 'd18208d9e0b6421307342cdef266193984c97c87177b9262b1113e6e9e7e020e' 'SKIP' 'SKIP') group=(app.containers) @@ -24,8 +24,8 @@ arch=('x86_64') # Thx alpine linux # https://git.alpinelinux.org/aports/tree/community/docker/APKBUILD -_cli_commit=4debf411d1e6efbd9ce65e4250718e9c529a6525 # https://github.com/docker/cli/commits/v$pkgver -_moby_commit=f417435e5f6216828dec57958c490c4f8bae4f98 # https://github.com/moby/moby/commits/v$pkgver +_cli_commit=ce1223035ac3ab8922717092e63a184cf67b493d # https://github.com/docker/cli/commits/v$pkgver +_moby_commit=41ca978a0a5400cc24b274137efa9f25517fcc0b # https://github.com/moby/moby/commits/v$pkgver export AUTO_GOPATH=1 export GITCOMMIT=$_cli_commit # for cli @@ -37,6 +37,8 @@ unset CC # prevent possible ccache issues _cli_builddir="$HOME/cli-$version" _moby_builddir="$HOME/moby-$version" +unset PREFIX + build () { # engine (moby) cd moby-$version diff --git a/busybox-1.36.1-kernel-6.8.patch b/busybox-1.36.1-kernel-6.8.patch new file mode 100644 index 00000000..4f74d51b --- /dev/null +++ b/busybox-1.36.1-kernel-6.8.patch @@ -0,0 +1,53 @@ +http://lists.busybox.net/pipermail/busybox/2024-March/090678.html +https://bugs.gentoo.org/926872 + +Linux v6.8-rc1 removed the definitions related to CBQ making tc fail to +build. Add some #ifdefs to handle this missing support. +--- a/networking/tc.c ++++ b/networking/tc.c +@@ -231,6 +231,13 @@ static int cbq_parse_opt(int argc, char **argv, struct nlmsghdr *n) + return 0; + } + #endif ++ ++#ifndef TCA_CBQ_MAX ++/* ++ * Linux v6.8-rc1~131^2~60^2^2 removed the uapi definitions for CBQ. ++ * See https://git.kernel.org/linus/33241dca48626 ++ */ ++#else + static int cbq_print_opt(struct rtattr *opt) + { + struct rtattr *tb[TCA_CBQ_MAX+1]; +@@ -322,6 +329,7 @@ static int cbq_print_opt(struct rtattr *opt) + done: + return 0; + } ++#endif + + static FAST_FUNC int print_qdisc( + const struct sockaddr_nl *who UNUSED_PARAM, +@@ -372,8 +380,10 @@ static FAST_FUNC int print_qdisc( + int qqq = index_in_strings(_q_, name); + if (qqq == 0) { /* pfifo_fast aka prio */ + prio_print_opt(tb[TCA_OPTIONS]); ++#ifdef TCA_CBQ_MAX + } else if (qqq == 1) { /* class based queuing */ + cbq_print_opt(tb[TCA_OPTIONS]); ++#endif + } else { + /* don't know how to print options for this qdisc */ + printf("(options for %s)", name); +@@ -442,9 +452,11 @@ static FAST_FUNC int print_class( + int qqq = index_in_strings(_q_, name); + if (qqq == 0) { /* pfifo_fast aka prio */ + /* nothing. */ /*prio_print_opt(tb[TCA_OPTIONS]);*/ ++#ifdef TCA_CBQ_MAX + } else if (qqq == 1) { /* class based queuing */ + /* cbq_print_copt() is identical to cbq_print_opt(). */ + cbq_print_opt(tb[TCA_OPTIONS]); ++#endif + } else { + /* don't know how to print options for this class */ + printf("(options for %s)", name); + diff --git a/media/libs/dav1d/ympbuild b/media/libs/dav1d/ympbuild index 9714d78c..05d0b451 100644 --- a/media/libs/dav1d/ympbuild +++ b/media/libs/dav1d/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='dav1d' -release='4' -version='1.4.0' +release='5' +version='1.5.0' url='https://code.videolan.org/videolan/dav1d/' description='dav1d is an AV1 Decoder' email='aliriza.keskin@pardus.org.tr' @@ -10,7 +10,7 @@ license=('GPLv3') source=("https://code.videolan.org/videolan/dav1d/-/archive/$version/dav1d-$version.tar.gz") depends=() makedepends=(meson ninja) -md5sums=('827aff30accb3de733df9482e19935d4') +sha256sums=('78b15d9954b513ea92d27f39362535ded2243e1b0924fde39f37a31ebed5f76b') group=(media.libs) uses=() arch=('x86_64') diff --git a/sys/apps/bubblewrap/ympbuild b/sys/apps/bubblewrap/ympbuild index b4d3bea4..25952c58 100644 --- a/sys/apps/bubblewrap/ympbuild +++ b/sys/apps/bubblewrap/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='bubblewrap' -release='1' -version='0.8.0' +release='2' +version='0.10.0' url='https://containers/bubblewrap' description='Unprivileged sandboxing tool, namespaces-powered chroot-like solution' email='aliriza.keskin@pardus.org.tr' @@ -10,7 +10,7 @@ license=('GPLv3') source=("https://github.com/containers/bubblewrap/archive/refs/tags/v$version.tar.gz") depends=(libcap) makedepends=() -md5sums=('283b9896a10cb17373053d353345a757') +sha256sums=('2108fafedeec4df2c451119606c191b0bfbd88328972dbb04fb8eb56081a724f') group=(sys.apps) uses=() arch=('x86_64') diff --git a/sys/base/busybox/busybox-1.36.1-kernel-6.8.patch b/sys/base/busybox/busybox-1.36.1-kernel-6.8.patch new file mode 100644 index 00000000..4f74d51b --- /dev/null +++ b/sys/base/busybox/busybox-1.36.1-kernel-6.8.patch @@ -0,0 +1,53 @@ +http://lists.busybox.net/pipermail/busybox/2024-March/090678.html +https://bugs.gentoo.org/926872 + +Linux v6.8-rc1 removed the definitions related to CBQ making tc fail to +build. Add some #ifdefs to handle this missing support. +--- a/networking/tc.c ++++ b/networking/tc.c +@@ -231,6 +231,13 @@ static int cbq_parse_opt(int argc, char **argv, struct nlmsghdr *n) + return 0; + } + #endif ++ ++#ifndef TCA_CBQ_MAX ++/* ++ * Linux v6.8-rc1~131^2~60^2^2 removed the uapi definitions for CBQ. ++ * See https://git.kernel.org/linus/33241dca48626 ++ */ ++#else + static int cbq_print_opt(struct rtattr *opt) + { + struct rtattr *tb[TCA_CBQ_MAX+1]; +@@ -322,6 +329,7 @@ static int cbq_print_opt(struct rtattr *opt) + done: + return 0; + } ++#endif + + static FAST_FUNC int print_qdisc( + const struct sockaddr_nl *who UNUSED_PARAM, +@@ -372,8 +380,10 @@ static FAST_FUNC int print_qdisc( + int qqq = index_in_strings(_q_, name); + if (qqq == 0) { /* pfifo_fast aka prio */ + prio_print_opt(tb[TCA_OPTIONS]); ++#ifdef TCA_CBQ_MAX + } else if (qqq == 1) { /* class based queuing */ + cbq_print_opt(tb[TCA_OPTIONS]); ++#endif + } else { + /* don't know how to print options for this qdisc */ + printf("(options for %s)", name); +@@ -442,9 +452,11 @@ static FAST_FUNC int print_class( + int qqq = index_in_strings(_q_, name); + if (qqq == 0) { /* pfifo_fast aka prio */ + /* nothing. */ /*prio_print_opt(tb[TCA_OPTIONS]);*/ ++#ifdef TCA_CBQ_MAX + } else if (qqq == 1) { /* class based queuing */ + /* cbq_print_copt() is identical to cbq_print_opt(). */ + cbq_print_opt(tb[TCA_OPTIONS]); ++#endif + } else { + /* don't know how to print options for this class */ + printf("(options for %s)", name); + diff --git a/sys/base/busybox/ympbuild b/sys/base/busybox/ympbuild index 78f2b0d9..bc21947d 100644 --- a/sys/base/busybox/ympbuild +++ b/sys/base/busybox/ympbuild @@ -1,7 +1,7 @@ #!/bin/bash name=busybox -version=1.36.1 -release=2 +version=1.37.0 +release=3 url='https://busybox.net' description='BusyBox is a software suite that provides several Unix utilities in a single executable file.' email='parduscix@yandex.ru' @@ -16,8 +16,10 @@ source=("https://busybox.net/downloads/busybox-$version.tar.bz2" "files/udhcpc.openrc" "files/udhcpc.script" "data-user.patch" + "busybox-1.36.1-kernel-6.8.patch" ) -md5sums=("0fc591bc9f4e365dfd9ade0014f32561" +sha256sums=("3311dff32e746499f4df0d5df04d7eb396382d7e108bb9250e7b519b837043a4" + "SKIP" "SKIP" "SKIP" "SKIP" @@ -33,6 +35,7 @@ prepare(){ ln -s /usr/bin/$tool ../musl-$tool done patch -Np1 -i ../data-user.patch + patch -Np1 -i ../busybox-1.36.1-kernel-6.8.patch } setup(){ diff --git a/sys/fs/btrfs-progs/ympbuild b/sys/fs/btrfs-progs/ympbuild index 9b35549a..5723283f 100644 --- a/sys/fs/btrfs-progs/ympbuild +++ b/sys/fs/btrfs-progs/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='btrfs-progs' -release='5' -version='6.9.2' +release='6' +version='6.11' url='https://github.com/storaged-project/libblockdev' description='A library for manipulating block devices' email='bayramk@gmail.com' @@ -10,14 +10,11 @@ license=('GPLv3') source=("https://github.com/kdave/btrfs-progs/archive/refs/tags/v${version}.tar.gz") depends=(e2fsprogs zlib libgcrypt eudev) makedepends=() -sha256sums=('2a6b7b87cc80c9c26bc775d2014510e9c05e59098234bee29f7158484bad2a73') +sha256sums=('ba1b8017b82e22f874fb3b09805ac4f45e3265888dc56eaf4449f38f896f6fc4') group=(sys.fs) uses=() arch=('x86_64') -install=btrfs-progs.install -options=(!staticlibs) - cd $name-$version setup(){