aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--community/alpine-make-rootfs/APKBUILD13
-rw-r--r--community/alpine-make-rootfs/add-new-signing-key-for-x86_64.patch23
-rw-r--r--community/alpine-make-rootfs/fix-missing-release-files-on-edge.patch39
-rw-r--r--main/binutils/APKBUILD1
-rw-r--r--main/busybox/APKBUILD3
-rw-r--r--main/gcc/APKBUILD5
-rw-r--r--main/zlib/APKBUILD4
-rwxr-xr-xscripts/bootstrap.sh4
8 files changed, 83 insertions, 9 deletions
diff --git a/community/alpine-make-rootfs/APKBUILD b/community/alpine-make-rootfs/APKBUILD
index 1914a65b31..9aaf8dd762 100644
--- a/community/alpine-make-rootfs/APKBUILD
+++ b/community/alpine-make-rootfs/APKBUILD
@@ -2,13 +2,16 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=alpine-make-rootfs
pkgver=0.5.1
-pkgrel=0
+pkgrel=1
pkgdesc="Make customized Alpine Linux rootfs (base image) for containers"
url="https://github.com/alpinelinux/alpine-make-rootfs"
arch="noarch"
license="MIT"
depends="tar"
-source="$pkgname-$pkgver.tar.gz::https://github.com/alpinelinux/$pkgname/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/alpinelinux/$pkgname/archive/v$pkgver.tar.gz
+ add-new-signing-key-for-x86_64.patch
+ fix-missing-release-files-on-edge.patch
+ "
builddir="$srcdir/$pkgname-$pkgver"
options="!check" # no suitable tests provided
@@ -17,4 +20,8 @@ package() {
make install DESTDIR="$pkgdir" PREFIX=/usr
}
-sha512sums="d2c98c3fc69b4f61d798714711b668da7abafb111846a0a8d4cbcf1003a2b677a18ad9cfa3565a0f2cb0a74a2f30f485786310a8e09ff942037bf60d88bf3245 alpine-make-rootfs-0.5.1.tar.gz"
+sha512sums="
+d2c98c3fc69b4f61d798714711b668da7abafb111846a0a8d4cbcf1003a2b677a18ad9cfa3565a0f2cb0a74a2f30f485786310a8e09ff942037bf60d88bf3245 alpine-make-rootfs-0.5.1.tar.gz
+b1e42986e889f8924e46b08d4ca614f965b9a8d4e5bf4271f9901fffd9fe022b3930537ec8d0f17ca9cea77050b4a031e61eb26636e759a5587c9c0b4d2cc160 add-new-signing-key-for-x86_64.patch
+5d46180968bd5d01c5235a5fe0d17d3f8949ab4ba6c4a69eb0e67fdc8f23563d7030e9bd1ad7ef231322b05e6518ec48b45628bb0496339829548c5028828174 fix-missing-release-files-on-edge.patch
+"
diff --git a/community/alpine-make-rootfs/add-new-signing-key-for-x86_64.patch b/community/alpine-make-rootfs/add-new-signing-key-for-x86_64.patch
new file mode 100644
index 0000000000..2e94cd1b1a
--- /dev/null
+++ b/community/alpine-make-rootfs/add-new-signing-key-for-x86_64.patch
@@ -0,0 +1,23 @@
+Patch-Source: https://github.com/alpinelinux/alpine-make-rootfs/commit/64a89ab6973c3a60a975243bc2086d6743c50aae
+--
+From 64a89ab6973c3a60a975243bc2086d6743c50aae Mon Sep 17 00:00:00 2001
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sun, 14 Nov 2021 00:04:21 +0100
+Subject: [PATCH] Add new package signing key for x86_64
+
+---
+ alpine-make-rootfs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/alpine-make-rootfs b/alpine-make-rootfs
+index 0d033ff..56c99e3 100755
+--- a/alpine-make-rootfs
++++ b/alpine-make-rootfs
+@@ -101,6 +101,7 @@ readonly ALPINE_BASE_PKGS='alpine-baselayout busybox busybox-suid musl-utils'
+ readonly ALPINE_KEYS='
+ alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1yHJxQgsHQREclQu4Ohe\nqxTxd1tHcNnvnQTu/UrTky8wWvgXT+jpveroeWWnzmsYlDI93eLI2ORakxb3gA2O\nQ0Ry4ws8vhaxLQGC74uQR5+/yYrLuTKydFzuPaS1dK19qJPXB8GMdmFOijnXX4SA\njixuHLe1WW7kZVtjL7nufvpXkWBGjsfrvskdNA/5MfxAeBbqPgaq0QMEfxMAn6/R\nL5kNepi/Vr4S39Xvf2DzWkTLEK8pcnjNkt9/aafhWqFVW7m3HCAII6h/qlQNQKSo\nGuH34Q8GsFG30izUENV9avY7hSLq7nggsvknlNBZtFUcmGoQrtx3FmyYsIC8/R+B\nywIDAQAB
+ alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwlzMkl7b5PBdfMzGdCT0\ncGloRr5xGgVmsdq5EtJvFkFAiN8Ac9MCFy/vAFmS8/7ZaGOXoCDWbYVLTLOO2qtX\nyHRl+7fJVh2N6qrDDFPmdgCi8NaE+3rITWXGrrQ1spJ0B6HIzTDNEjRKnD4xyg4j\ng01FMcJTU6E+V2JBY45CKN9dWr1JDM/nei/Pf0byBJlMp/mSSfjodykmz4Oe13xB\nCa1WTwgFykKYthoLGYrmo+LKIGpMoeEbY1kuUe04UiDe47l6Oggwnl+8XD1MeRWY\nsWgj8sF4dTcSfCMavK4zHRFFQbGp/YFJ/Ww6U9lA3Vq0wyEI6MCMQnoSMFwrbgZw\nwwIDAQAB
++alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAutQkua2CAig4VFSJ7v54\nALyu/J1WB3oni7qwCZD3veURw7HxpNAj9hR+S5N/pNeZgubQvJWyaPuQDm7PTs1+\ntFGiYNfAsiibX6Rv0wci3M+z2XEVAeR9Vzg6v4qoofDyoTbovn2LztaNEjTkB+oK\ntlvpNhg1zhou0jDVYFniEXvzjckxswHVb8cT0OMTKHALyLPrPOJzVtM9C1ew2Nnc\n3848xLiApMu3NBk0JqfcS3Bo5Y2b1FRVBvdt+2gFoKZix1MnZdAEZ8xQzL/a0YS5\nHd0wj5+EEKHfOd3A75uPa/WQmA+o0cBFfrzm69QDcSJSwGpzWrD1ScH3AK8nWvoj\nv7e9gukK/9yl1b4fQQ00vttwJPSgm9EnfPHLAtgXkRloI27H6/PuLoNvSAMQwuCD\nhQRlyGLPBETKkHeodfLoULjhDi1K2gKJTMhtbnUcAA7nEphkMhPWkBpgFdrH+5z4\nLxy+3ek0cqcI7K68EtrffU8jtUj9LFTUC8dERaIBs7NgQ/LfDbDfGh9g6qVj1hZl\nk9aaIPTm/xsi8v3u+0qaq7KzIBc9s59JOoA8TlpOaYdVgSQhHHLBaahOuAigH+VI\nisbC9vmqsThF2QdDtQt37keuqoda2E6sL7PUvIyVXDRfwX7uMDjlzTxHTymvq2Ck\nhtBqojBnThmjJQFgZXocHG8CAwEAAQ==
+ '
+ # List of directories to remove when empty.
+ readonly UNNECESSARY_DIRS='
diff --git a/community/alpine-make-rootfs/fix-missing-release-files-on-edge.patch b/community/alpine-make-rootfs/fix-missing-release-files-on-edge.patch
new file mode 100644
index 0000000000..7eeeddb797
--- /dev/null
+++ b/community/alpine-make-rootfs/fix-missing-release-files-on-edge.patch
@@ -0,0 +1,39 @@
+Patch-Source: https://github.com/alpinelinux/alpine-make-rootfs/commit/80a8e3f9d6f5ec701b2ae5e9a0d6bdb004ec1246
+--
+From 80a8e3f9d6f5ec701b2ae5e9a0d6bdb004ec1246 Mon Sep 17 00:00:00 2001
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sun, 21 Aug 2022 00:56:04 +0200
+Subject: [PATCH] Adapt to alpine-base not providing release files since v3.17
+ and on edge
+
+https://gitlab.alpinelinux.org/alpine/aports/-/commit/23e66e85c95beef9d3f72a2ccc510671fdb3462d
+---
+ alpine-make-rootfs | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/alpine-make-rootfs b/alpine-make-rootfs
+index 63133f3..eb24005 100755
+--- a/alpine-make-rootfs
++++ b/alpine-make-rootfs
+@@ -387,11 +387,16 @@ fi
+
+ _apk add --root "$rootfs" --update-cache --initdb $rootfs_pkgs >&2
+
+-if ! _apk info --root "$rootfs" --quiet --installed alpine-base; then
+- # This package contains /etc/os-release, /etc/alpine-release and /etc/issue,
+- # but we don't wanna install all its dependencies (e.g. openrc).
+- _apk fetch --root "$rootfs" --stdout alpine-base \
+- | tar -xz -C "$rootfs" etc >&2
++if ! [ -f "$rootfs"/etc/alpine-release ]; then
++ if _apk info --root "$rootfs" --quiet alpine-release >/dev/null; then
++ _apk add --root "$rootfs" alpine-release
++ else
++ # In Alpine <3.17, this package contains /etc/os-release,
++ # /etc/alpine-release and /etc/issue, but we don't wanna install all
++ # its dependencies (e.g. openrc).
++ _apk fetch --root "$rootfs" --stdout alpine-base \
++ | tar -xz -C "$rootfs" etc >&2
++ fi
+ fi
+
+ [ -e "$rootfs"/var/run ] || ln -s /run "$rootfs"/var/run
diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD
index 76817f0e6a..79d8f73d8a 100644
--- a/main/binutils/APKBUILD
+++ b/main/binutils/APKBUILD
@@ -16,6 +16,7 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
ld-bfd-mips.patch
CVE-2021-3487.patch
"
+builddir="$srcdir/$pkgname-$pkgver"
if [ "$CHOST" != "$CTARGET" ]; then
pkgname="$pkgname-$CTARGET_ARCH"
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 1998d3dd4f..d3d2844c27 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -8,7 +8,8 @@ pkgdesc="Size optimized toolbox of many common UNIX utilities"
url="https://busybox.net/"
arch="all"
license="GPL-2.0-only"
-makedepends_host="linux-headers openssl-dev libtls-standalone-dev perl"
+makedepends_build="perl"
+makedepends_host="linux-headers openssl-dev libtls-standalone-dev"
makedepends="$makedepends_build $makedepends_host"
checkdepends="zip"
provides="/bin/sh"
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index fe52d00a80..afffad628f 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later LGPL-2.1-or-later"
_gccrel=$pkgver-r$pkgrel
depends="binutils$_target isl"
makedepends_build="gcc$_cross g++$_cross paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
-makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev !gettext-dev $pkgname-gnat-bootstrap"
+makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev !gettext-dev"
subpackages=" "
[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"
replaces="libstdc++ binutils"
@@ -144,7 +144,8 @@ fi
if $LANG_ADA; then
subpackages="$subpackages libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
_languages="$_languages,ada"
- makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
+ [ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
+ [ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
fi
makedepends="$makedepends_build $makedepends_host"
diff --git a/main/zlib/APKBUILD b/main/zlib/APKBUILD
index 1e840fd9c1..ef345c16e0 100644
--- a/main/zlib/APKBUILD
+++ b/main/zlib/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=zlib
pkgver=1.2.12
-pkgrel=2
+pkgrel=3
pkgdesc="A compression/decompression Library"
arch="all"
license="Zlib"
@@ -12,6 +12,7 @@ source="https://zlib.net/zlib-$pkgver.tar.gz
configure-Pass-LDFLAGS-to-link-tests.patch
crc32.patch
$pkgname-CVE-2022-37434.patch::https://github.com/madler/zlib/commit/eff308af425b67093bab25f80f1ae950166bece1.patch
+ $pkgname-CVE-2022-37434-bugfix.patch::https://github.com/madler/zlib/commit/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch
"
# secfixes:
# 1.2.12-r2:
@@ -45,4 +46,5 @@ faa19991e88cbfd624ac9ce4a0ba12e3d7d54f88680b1a0a156a542a45bafe2053d69c6f30932781
76179eb7e498aef5bc88c3f826c6f2506a2d3c3a2e2560ef1825bd4a9297d68b0d2390619a4b3b0b2e6dde765431e5fba18fd15fbd1ad99827244f8f9bdbd909 configure-Pass-LDFLAGS-to-link-tests.patch
38f0593a0bc17336d31191b7af684e31ec2eb34bd3add49bcb1f95c5e2bfb4405ffc341c2650d52c4fbf417ab4f80a0cc82fb868c9816b04d25210ae29a71f2c crc32.patch
13bf48cb15636d77428e7e20d8c72d772eade1e099740f8541b7adee0e789097fa867512b6f3ebcff8496727999f2bf408e38414771c9b4440ad283f4c029558 zlib-CVE-2022-37434.patch
+cadeb0b05da99435c2074cb0d7aebdec2bad1c745856c8ac6ea0f2474ef091d8efeea90deafe13757cbaa465ccfbbb1b8873a8025b24f3145b2a87abb84bac83 zlib-CVE-2022-37434-bugfix.patch
"
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 1b596686ed..14e6b23ebf 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -99,8 +99,8 @@ for PKG in fortify-headers linux-headers musl libc-dev pkgconf zlib \
openssl ca-certificates libbsd libtls-standalone busybox busybox-initscripts binutils make \
apk-tools file \
gmp mpfr4 mpc1 isl cloog gcc \
- openrc alpine-conf alpine-baselayout alpine-keys alpine-base build-base \
- attr libcap patch sudo acl fakeroot tar \
+ openrc alpine-conf alpine-baselayout alpine-keys alpine-base patch build-base \
+ attr libcap sudo acl fakeroot tar \
pax-utils lzip abuild ncurses libedit openssh \
libcap-ng util-linux libaio lvm2 popt xz \
json-c argon2 cryptsetup kmod lddtree mkinitfs \