diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-08-29 11:25:34 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-09-05 01:07:41 -0300 |
commit | 97874c3bf923798b0e3ab119d169aaa9b1314221 (patch) | |
tree | 469c6f3ecc707becb9472432396910e9874f7b6a /configure | |
parent | Revert "compile fix" (diff) | |
download | firejail-97874c3bf923798b0e3ab119d169aaa9b1314221.tar.gz firejail-97874c3bf923798b0e3ab119d169aaa9b1314221.tar.zst firejail-97874c3bf923798b0e3ab119d169aaa9b1314221.zip |
Revert "Merge pull request #5315 from ChrysoliteAzalea/landlock"
This reverts commit 54cb3e741e972c754e595d56de0bca0792299f83, reversing
changes made to 97b1e02d5f4dca4261dc9928f8a5ebf8966682d7.
There were many issues and requests for changes raised in the pull
request (both code-wise and design-wise) and most of them are still
unresolved[1].
[1] https://github.com/netblue30/firejail/pull/5315
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 16 |
1 files changed, 0 insertions, 16 deletions
@@ -652,7 +652,6 @@ HAVE_DBUSPROXY | |||
652 | EXTRA_LDFLAGS | 652 | EXTRA_LDFLAGS |
653 | EXTRA_CFLAGS | 653 | EXTRA_CFLAGS |
654 | HAVE_SELINUX | 654 | HAVE_SELINUX |
655 | HAVE_LANDLOCK | ||
656 | AA_LIBS | 655 | AA_LIBS |
657 | AA_CFLAGS | 656 | AA_CFLAGS |
658 | PKG_CONFIG_LIBDIR | 657 | PKG_CONFIG_LIBDIR |
@@ -714,7 +713,6 @@ enable_sanitizer | |||
714 | enable_ids | 713 | enable_ids |
715 | enable_apparmor | 714 | enable_apparmor |
716 | enable_selinux | 715 | enable_selinux |
717 | enable_landlock | ||
718 | enable_dbusproxy | 716 | enable_dbusproxy |
719 | enable_output | 717 | enable_output |
720 | enable_usertmpfs | 718 | enable_usertmpfs |
@@ -1376,7 +1374,6 @@ Optional Features: | |||
1376 | --enable-ids enable ids | 1374 | --enable-ids enable ids |
1377 | --enable-apparmor enable apparmor | 1375 | --enable-apparmor enable apparmor |
1378 | --enable-selinux SELinux labeling support | 1376 | --enable-selinux SELinux labeling support |
1379 | --enable-landlock Landlock self-restriction support | ||
1380 | --disable-dbusproxy disable dbus proxy | 1377 | --disable-dbusproxy disable dbus proxy |
1381 | --disable-output disable --output logging | 1378 | --disable-output disable --output logging |
1382 | --disable-usertmpfs disable tmpfs as regular user | 1379 | --disable-usertmpfs disable tmpfs as regular user |
@@ -3345,19 +3342,7 @@ if test "x$enable_selinux" = "xyes"; then : | |||
3345 | 3342 | ||
3346 | fi | 3343 | fi |
3347 | 3344 | ||
3348 | HAVE_LANDLOCK="" | ||
3349 | 3345 | ||
3350 | # Check whether --enable-landlock was given. | ||
3351 | if test "${enable_landlock+set}" = set; then : | ||
3352 | enableval=$enable_landlock; | ||
3353 | fi | ||
3354 | |||
3355 | if test "x$enable_landlock" = "xyes"; then : | ||
3356 | |||
3357 | HAVE_LANDLOCK="-DHAVE_LANDLOCK" | ||
3358 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS" | ||
3359 | |||
3360 | fi | ||
3361 | 3346 | ||
3362 | 3347 | ||
3363 | 3348 | ||
@@ -5292,7 +5277,6 @@ Features: | |||
5292 | overlayfs support: $HAVE_OVERLAYFS | 5277 | overlayfs support: $HAVE_OVERLAYFS |
5293 | private home support: $HAVE_PRIVATE_HOME | 5278 | private home support: $HAVE_PRIVATE_HOME |
5294 | SELinux labeling support: $HAVE_SELINUX | 5279 | SELinux labeling support: $HAVE_SELINUX |
5295 | Landlock self-restriction support: $HAVE_LANDLOCK | ||
5296 | user namespace: $HAVE_USERNS | 5280 | user namespace: $HAVE_USERNS |
5297 | X11 sandboxing support: $HAVE_X11 | 5281 | X11 sandboxing support: $HAVE_X11 |
5298 | 5282 | ||