Skip to content

Commit a86c7ed

Browse files
authored
Merge pull request #196 from brefphp/fix-missing-libraries
Fix support for `libgpgme`
2 parents 61bd7be + f86e4fd commit a86c7ed

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

utils/lib-copy/copy-dependencies.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,12 @@
3636
$librariesThatExistOnLambda = array_map('trim', $librariesThatExistOnLambda);
3737
// For some reason some libraries are actually not in Lambda, despite being in the docker image 🤷
3838
$librariesThatExistOnLambda = array_filter($librariesThatExistOnLambda, function ($library) {
39-
return ! str_contains($library, 'libgcrypt.so') && ! str_contains($library, 'libgpg-error.so');
39+
return ! str_contains($library, 'libgcrypt.so')
40+
&& ! str_contains($library, 'libgobject-2.0.so')
41+
&& ! str_contains($library, 'libgpg-error.so')
42+
&& ! str_contains($library, 'libgpgme-pthread.so')
43+
&& ! str_contains($library, 'libgpgme.so')
44+
;
4045
});
4146

4247
$requiredLibraries = listDependencies($pathToCheck);

utils/lib-copy/libs-arm.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ libcrypto.so.1.0.2k
2929
libcrypt.so.1
3030
libc.so.6
3131
libcurl.so.4
32-
libcurl.so.4.7.0
32+
libcurl.so.4.8.0
3333
libdb-5.3.so
3434
libdb-5.so
3535
libdl-2.26.so
@@ -182,6 +182,8 @@ libpng15.so.15
182182
libpng15.so.15.13.0
183183
libpopt.so.0
184184
libpopt.so.0.0.0
185+
libpsl.so.5
186+
libpsl.so.5.3.5
185187
libpsx.so.2
186188
libpsx.so.2.54
187189
libpthread-2.26.so

utils/lib-copy/libs-x86.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ libcrypto.so.1.0.2k
2929
libcrypt.so.1
3030
libc.so.6
3131
libcurl.so.4
32-
libcurl.so.4.7.0
32+
libcurl.so.4.8.0
3333
libdb-5.3.so
3434
libdb-5.so
3535
libdl-2.26.so
@@ -184,6 +184,8 @@ libpng15.so.15
184184
libpng15.so.15.13.0
185185
libpopt.so.0
186186
libpopt.so.0.0.0
187+
libpsl.so.5
188+
libpsl.so.5.3.5
187189
libpsx.so.2
188190
libpsx.so.2.54
189191
libpthread-2.26.so

0 commit comments

Comments
 (0)