Title: [233639] trunk/Tools
- Revision
- 233639
- Author
- [email protected]
- Date
- 2018-07-09 05:45:03 -0700 (Mon, 09 Jul 2018)
Log Message
[Flatpak] HTTP layout tests broken due to missing CGI.pm in the sandbox
https://bugs.webkit.org/show_bug.cgi?id=187384
Patch by Thibault Saunier <[email protected]> on 2018-07-09
Reviewed by Philippe Normand.
And make it usable inside the sandbox even when
perl is launched "tainted" (as the PERL5LIB won't
work otherwise).
* flatpak/flatpakutils.py:
(WebkitFlatpak.run_in_sandbox):
* flatpak/org.webkit.WebKit.yaml:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (233638 => 233639)
--- trunk/Tools/ChangeLog 2018-07-09 08:56:31 UTC (rev 233638)
+++ trunk/Tools/ChangeLog 2018-07-09 12:45:03 UTC (rev 233639)
@@ -1,5 +1,20 @@
2018-07-09 Thibault Saunier <[email protected]>
+ [Flatpak] HTTP layout tests broken due to missing CGI.pm in the sandbox
+ https://bugs.webkit.org/show_bug.cgi?id=187384
+
+ Reviewed by Philippe Normand.
+
+ And make it usable inside the sandbox even when
+ perl is launched "tainted" (as the PERL5LIB won't
+ work otherwise).
+
+ * flatpak/flatpakutils.py:
+ (WebkitFlatpak.run_in_sandbox):
+ * flatpak/org.webkit.WebKit.yaml:
+
+2018-07-09 Thibault Saunier <[email protected]>
+
[WPE][GTK] Mount /dev/shm on /run/shm in sandbox
https://bugs.webkit.org/show_bug.cgi?id=187400
Modified: trunk/Tools/flatpak/flatpakutils.py (233638 => 233639)
--- trunk/Tools/flatpak/flatpakutils.py 2018-07-09 08:56:31 UTC (rev 233638)
+++ trunk/Tools/flatpak/flatpakutils.py 2018-07-09 12:45:03 UTC (rev 233639)
@@ -654,6 +654,9 @@
with tempfile.NamedTemporaryFile(mode="w") as tmpscript:
flatpak_command = ["flatpak", "build", "--die-with-parent",
"--bind-mount=/run/shm=/dev/shm",
+ # Workaround for https://webkit.org/b/187384 to have our own perl modules usable inside the sandbox
+ # as setting the PERL5LIB envvar won't work inside apache (and for scripts using `perl -T``).
+ "--bind-mount=/etc/perl=%s" % os.path.join(self.flatpak_build_path, "files/lib/perl"),
"--bind-mount=/run/host/%s=%s" % (tempfile.gettempdir(), tempfile.gettempdir()),
"--bind-mount=%s=%s" % (self.sandbox_source_root, self.source_root),
# We mount WebKitBuild/PORTNAME/BuildType to /app/webkit/WebKitBuild/BuildType
Modified: trunk/Tools/flatpak/org.webkit.WebKit.yaml (233638 => 233639)
--- trunk/Tools/flatpak/org.webkit.WebKit.yaml 2018-07-09 08:56:31 UTC (rev 233638)
+++ trunk/Tools/flatpak/org.webkit.WebKit.yaml 2018-07-09 12:45:03 UTC (rev 233639)
@@ -201,5 +201,16 @@
config-opts:
- --disable-doc
+ - name: perl-cgi-pm
+ buildsystem: simple
+ build-commands:
+ - perl Makefile.PL PREFIX=/app LIB=/app/lib/perl/
+ - make install
+ sources:
+ - type: archive
+ url: https://cpan.metacpan.org/authors/id/L/LE/LEEJO/CGI-4.38.tar.gz
+ sha256: 8c58f4a529bb92a914b22b7e64c5e31185c9854a4070a6dfad44fe5cc248e7d4
+
+
# Port specific components.
- %(PORTNAME)s.yaml
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
