From fbb89991091f3cfc5c347791cbacb56472272bd8 Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Fri, 23 Aug 2024 17:25:33 +0200 Subject: [PATCH 1/2] Update the list of libraries bundled in Lambda --- utils/lib-copy/libs-arm.txt | 4 +++- utils/lib-copy/libs-x86.txt | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/utils/lib-copy/libs-arm.txt b/utils/lib-copy/libs-arm.txt index 6bc3cbd8..57032c49 100644 --- a/utils/lib-copy/libs-arm.txt +++ b/utils/lib-copy/libs-arm.txt @@ -29,7 +29,7 @@ libcrypto.so.1.0.2k libcrypt.so.1 libc.so.6 libcurl.so.4 -libcurl.so.4.7.0 +libcurl.so.4.8.0 libdb-5.3.so libdb-5.so libdl-2.26.so @@ -182,6 +182,8 @@ libpng15.so.15 libpng15.so.15.13.0 libpopt.so.0 libpopt.so.0.0.0 +libpsl.so.5 +libpsl.so.5.3.5 libpsx.so.2 libpsx.so.2.54 libpthread-2.26.so diff --git a/utils/lib-copy/libs-x86.txt b/utils/lib-copy/libs-x86.txt index a4cf64eb..6d44653a 100644 --- a/utils/lib-copy/libs-x86.txt +++ b/utils/lib-copy/libs-x86.txt @@ -29,7 +29,7 @@ libcrypto.so.1.0.2k libcrypt.so.1 libc.so.6 libcurl.so.4 -libcurl.so.4.7.0 +libcurl.so.4.8.0 libdb-5.3.so libdb-5.so libdl-2.26.so @@ -184,6 +184,8 @@ libpng15.so.15 libpng15.so.15.13.0 libpopt.so.0 libpopt.so.0.0.0 +libpsl.so.5 +libpsl.so.5.3.5 libpsx.so.2 libpsx.so.2.54 libpthread-2.26.so From f86e4fd220b90b9f49a29b8e50dff237e7b21f5e Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Fri, 23 Aug 2024 17:25:55 +0200 Subject: [PATCH 2/2] Fix support for `libgpgme` Related to https://github.com/brefphp/extra-php-extensions/issues/443 --- utils/lib-copy/copy-dependencies.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/utils/lib-copy/copy-dependencies.php b/utils/lib-copy/copy-dependencies.php index 7094571e..a5c849cb 100644 --- a/utils/lib-copy/copy-dependencies.php +++ b/utils/lib-copy/copy-dependencies.php @@ -36,7 +36,12 @@ $librariesThatExistOnLambda = array_map('trim', $librariesThatExistOnLambda); // For some reason some libraries are actually not in Lambda, despite being in the docker image 🤷 $librariesThatExistOnLambda = array_filter($librariesThatExistOnLambda, function ($library) { - return ! str_contains($library, 'libgcrypt.so') && ! str_contains($library, 'libgpg-error.so'); + return ! str_contains($library, 'libgcrypt.so') + && ! str_contains($library, 'libgobject-2.0.so') + && ! str_contains($library, 'libgpg-error.so') + && ! str_contains($library, 'libgpgme-pthread.so') + && ! str_contains($library, 'libgpgme.so') + ; }); $requiredLibraries = listDependencies($pathToCheck);