diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2024-09-12 08:22:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-12 08:22:11 -0400 |
| commit | 2af6e7aa0aa2759d4eaadd1049656dbdf9ba5d4d (patch) | |
| tree | 6d24a359d16aa1faffd7ea2931d6763da7c3f5de | |
| parent | dbf8dac1cea2b1235746e2d966a8ded9cffd5dc3 (diff) | |
| parent | fb9c18cd9629d4bcc11321c3b13ad16682461d6e (diff) | |
Merge pull request #16806 from opensourcerouting/fix/backport_ABUILD_APK_INDEX_OPTS_10.1
10.1 Backport docker ABUILD_APK_INDEX_OPTS
| -rw-r--r-- | alpine/APKBUILD.in | 2 | ||||
| -rwxr-xr-x | docker/alpine/libyang/APKBUILD | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/alpine/APKBUILD.in b/alpine/APKBUILD.in index 2cb3feec15..855b585903 100644 --- a/alpine/APKBUILD.in +++ b/alpine/APKBUILD.in @@ -33,6 +33,8 @@ _libdir=/usr/lib _user=frr build() { + export ABUILD_APK_INDEX_OPTS="--allow-untrusted" + cd "$builddir" ./configure \ diff --git a/docker/alpine/libyang/APKBUILD b/docker/alpine/libyang/APKBUILD index 6973fd62d8..d5a9320921 100755 --- a/docker/alpine/libyang/APKBUILD +++ b/docker/alpine/libyang/APKBUILD @@ -21,6 +21,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/CESNET/libyang/archive/v$pkg # - CVE-2021-28906 build() { + export ABUILD_APK_INDEX_OPTS="--allow-untrusted" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi |