diff options
| author |  netblue30 <netblue30@protonmail.com> | 2023-03-13 13:26:23 -0400 |
|---|---|---|
| committer | netblue30 <netblue30@protonmail.com> | 2023-03-13 13:26:23 -0400 |
| commit | dfb7d98591992c7ee47ce7c8a6731ecf4339c66a (patch) | |
| tree | b4aec50706d5661e7f6276053a06863f7bcbba05 | |
| parent | merges (diff) | |
| parent | config.mk.in: remove duplicated HAVE_APPARMOR (diff) | |
| download | firejail-dfb7d98591992c7ee47ce7c8a6731ecf4339c66a.tar.gz firejail-dfb7d98591992c7ee47ce7c8a6731ecf4339c66a.tar.zst firejail-dfb7d98591992c7ee47ce7c8a6731ecf4339c66a.zip | |
Merge branch 'master' of ssh://github.com/netblue30/firejail
| -rw-r--r-- | config.mk.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config.mk.in b/config.mk.in index 1dc773a66..6b6cf1b99 100644 --- a/config.mk.in +++ b/config.mk.in | |||
| @@ -21,7 +21,6 @@ docdir=@docdir@ | |||
| 21 | mandir=@mandir@ | 21 | mandir=@mandir@ |
| 22 | sysconfdir=@sysconfdir@ | 22 | sysconfdir=@sysconfdir@ |
| 23 | 23 | ||
| 24 | HAVE_APPARMOR=@HAVE_APPARMOR@ | ||
| 25 | HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@ | 24 | HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@ |
| 26 | BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@ | 25 | BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@ |
| 27 | HAVE_SUID=@HAVE_SUID@ | 26 | HAVE_SUID=@HAVE_SUID@ |
| @@ -38,6 +37,7 @@ HAVE_APPARMOR=@HAVE_APPARMOR@ | |||
| 38 | HAVE_OVERLAYFS=@HAVE_OVERLAYFS@ | 37 | HAVE_OVERLAYFS=@HAVE_OVERLAYFS@ |
| 39 | HAVE_FIRETUNNEL=@HAVE_FIRETUNNEL@ | 38 | HAVE_FIRETUNNEL=@HAVE_FIRETUNNEL@ |
| 40 | HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@ | 39 | HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@ |
| 40 | HAVE_PRIVATE_LIB=@HAVE_PRIVATE_LIB@ | ||
| 41 | HAVE_IDS=@HAVE_IDS@ | 41 | HAVE_IDS=@HAVE_IDS@ |
| 42 | HAVE_GCOV=@HAVE_GCOV@ | 42 | HAVE_GCOV=@HAVE_GCOV@ |
| 43 | HAVE_SELINUX=@HAVE_SELINUX@ | 43 | HAVE_SELINUX=@HAVE_SELINUX@ |
| @@ -48,7 +48,6 @@ HAVE_OUTPUT=@HAVE_OUTPUT@ | |||
| 48 | HAVE_LTS=@HAVE_LTS@ | 48 | HAVE_LTS=@HAVE_LTS@ |
| 49 | HAVE_FORCE_NONEWPRIVS=@HAVE_FORCE_NONEWPRIVS@ | 49 | HAVE_FORCE_NONEWPRIVS=@HAVE_FORCE_NONEWPRIVS@ |
| 50 | HAVE_ONLY_SYSCFG_PROFILES=@HAVE_ONLY_SYSCFG_PROFILES@ | 50 | HAVE_ONLY_SYSCFG_PROFILES=@HAVE_ONLY_SYSCFG_PROFILES@ |
| 51 | HAVE_PRIVATE_LIB=@HAVE_PRIVATE_LIB@ | ||
| 52 | 51 | ||
| 53 | MANFLAGS = $(HAVE_LTS) $(HAVE_OUTPUT) $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_PRIVATE_LIB) $(HAVE_APPARMOR) $(HAVE_IDS) $(HAVE_OVERLAYFS) $(HAVE_USERTMPFS) $(HAVE_DBUSPROXY) $(HAVE_FIRETUNNEL) $(HAVE_GLOBALCFG) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_FILE_TRANSFER) $(HAVE_SELINUX) $(HAVE_SUID) $(HAVE_FORCE_NONEWPRIVS) $(HAVE_ONLY_SYSCFG_PROFILES) | 52 | MANFLAGS = $(HAVE_LTS) $(HAVE_OUTPUT) $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_PRIVATE_LIB) $(HAVE_APPARMOR) $(HAVE_IDS) $(HAVE_OVERLAYFS) $(HAVE_USERTMPFS) $(HAVE_DBUSPROXY) $(HAVE_FIRETUNNEL) $(HAVE_GLOBALCFG) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_FILE_TRANSFER) $(HAVE_SELINUX) $(HAVE_SUID) $(HAVE_FORCE_NONEWPRIVS) $(HAVE_ONLY_SYSCFG_PROFILES) |
| 54 | 53 | ||