Skip to content

Commit

Permalink
Merge pull request #196 from brefphp/fix-missing-libraries
Browse files Browse the repository at this point in the history
Fix support for `libgpgme`
  • Loading branch information
mnapoli authored Aug 25, 2024
2 parents 61bd7be + f86e4fd commit a86c7ed
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
7 changes: 6 additions & 1 deletion utils/lib-copy/copy-dependencies.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 3 additions & 1 deletion utils/lib-copy/libs-arm.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion utils/lib-copy/libs-x86.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit a86c7ed

Please sign in to comment.