diff --git a/Makefile b/Makefile index 9ca0305bc..435114a13 100644 --- a/Makefile +++ b/Makefile @@ -16,9 +16,7 @@ TAR ?= tar INSTALL ?= install RM ?= rm -f -ifneq ($(HAVE_MAN),no) MAN_TARGET = man -endif ifneq ($(HAVE_CONTRIB_INSTALL),no) CONTRIB_TARGET = contrib @@ -274,13 +272,11 @@ ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) $(INSTALL) -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d $(INSTALL) -m 0644 -t $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/base.d etc/apparmor/firejail-base endif -ifneq ($(HAVE_MAN),no) # man pages $(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man1 $(INSTALL) -m 0644 -t $(DESTDIR)$(mandir)/man1 $(MANPAGES1_GZ) $(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man5 $(INSTALL) -m 0644 -t $(DESTDIR)$(mandir)/man5 $(MANPAGES5_GZ) -endif # bash completion $(INSTALL) -m 0755 -d $(DESTDIR)$(datarootdir)/bash-completion/completions $(INSTALL) -m 0644 src/bash_completion/firejail.bash_completion $(DESTDIR)$(datarootdir)/bash-completion/completions/firejail diff --git a/config.mk.in b/config.mk.in index 2c97eaef9..c74a19ca6 100644 --- a/config.mk.in +++ b/config.mk.in @@ -28,7 +28,6 @@ BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@ HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@ HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ HAVE_GCOV=@HAVE_GCOV@ -HAVE_MAN=@HAVE_MAN@ # MANFLAGS HAVE_APPARMOR=@HAVE_APPARMOR@ diff --git a/configure b/configure index 6866d4ff8..4b11f358d 100755 --- a/configure +++ b/configure @@ -657,7 +657,6 @@ HAVE_NETWORK HAVE_CHROOT HAVE_PRIVATE_LIB HAVE_PRIVATE_HOME -HAVE_MAN HAVE_USERTMPFS HAVE_OUTPUT HAVE_DBUSPROXY @@ -738,7 +737,6 @@ enable_landlock enable_dbusproxy enable_output enable_usertmpfs -enable_man enable_private_home enable_private_lib enable_chroot @@ -1397,7 +1395,6 @@ Optional Features: --disable-dbusproxy disable dbus proxy --disable-output disable --output logging --disable-usertmpfs disable tmpfs as regular user - --disable-man disable man pages --disable-private-home disable private home feature --disable-private-lib disable private lib feature --disable-chroot disable chroot @@ -4327,25 +4324,6 @@ then : fi -HAVE_MAN="no" - -# Check whether --enable-man was given. -if test ${enable_man+y} -then : - enableval=$enable_man; -fi - -if test "x$enable_man" != "xno" -then : - - HAVE_MAN="-DHAVE_MAN" - if test "x$GAWK" = "x" -then : - as_fn_error $? "*** gawk not found ***" "$LINENO" 5 -fi - -fi - HAVE_PRIVATE_HOME="" # Check whether --enable-private-home was given. @@ -5759,7 +5737,6 @@ Features: enable --output logging: $HAVE_OUTPUT file transfer support: $HAVE_FILE_TRANSFER Landlock support: $HAVE_LANDLOCK - manpage support: $HAVE_MAN network: $HAVE_NETWORK private home support: $HAVE_PRIVATE_HOME private lib support: $HAVE_PRIVATE_LIB diff --git a/configure.ac b/configure.ac index 68c306fcd..2d9c24e64 100644 --- a/configure.ac +++ b/configure.ac @@ -137,15 +137,6 @@ AS_IF([test "x$enable_usertmpfs" != "xno"], [ HAVE_USERTMPFS="-DHAVE_USERTMPFS" ]) -HAVE_MAN="no" -AC_SUBST([HAVE_MAN]) -AC_ARG_ENABLE([man], - [AS_HELP_STRING([--disable-man], [disable man pages])]) -AS_IF([test "x$enable_man" != "xno"], [ - HAVE_MAN="-DHAVE_MAN" - AS_IF([test "x$GAWK" = "x"], [AC_MSG_ERROR([*** gawk not found ***])]) -]) - HAVE_PRIVATE_HOME="" AC_SUBST([HAVE_PRIVATE_HOME]) AC_ARG_ENABLE([private-home], @@ -301,7 +292,6 @@ Features: enable --output logging: $HAVE_OUTPUT file transfer support: $HAVE_FILE_TRANSFER Landlock support: $HAVE_LANDLOCK - manpage support: $HAVE_MAN network: $HAVE_NETWORK private home support: $HAVE_PRIVATE_HOME private lib support: $HAVE_PRIVATE_LIB diff --git a/test/compile/compile.sh b/test/compile/compile.sh index 717698dd5..7c3ee845d 100755 --- a/test/compile/compile.sh +++ b/test/compile/compile.sh @@ -26,17 +26,16 @@ arr[8]="8: compile --disable-file-transfer" arr[9]="9: compile --enable-apparmor" arr[10]="10: compile --enable-busybox-workaround" arr[11]="11: compile --disable-private-home" -arr[12]="12: compile --disable-man" -arr[13]="13: compile --disable-usertmpfs" -arr[14]="14: compile --disable-sandbox-check" -arr[15]="15: compile --disable-landlock" -arr[16]="16: compile --disable-output" -arr[17]="17: compile --disable-man" -arr[18]="18: compile --disable-private-lib" -arr[19]="19: compile --disable-suid" -arr[20]="20: compile --enable-contrib-install" -arr[21]="21: compile --enable-only-syscfg-profiles" -arr[22]="22: compile --enable-force-nonewprivs" +arr[12]="12: compile --disable-usertmpfs" +arr[13]="13: compile --disable-sandbox-check" +arr[14]="14: compile --disable-landlock" +arr[15]="15: compile --disable-output" +arr[16]="16: compile --disable-man" +arr[17]="17: compile --disable-private-lib" +arr[18]="18: compile --disable-suid" +arr[19]="19: compile --enable-contrib-install" +arr[20]="20: compile --enable-only-syscfg-profiles" +arr[21]="21: compile --enable-force-nonewprivs" print_title() { echo @@ -312,31 +311,9 @@ cd .. #***************************************************************** # TEST 12 #***************************************************************** -# - disable manpages -#***************************************************************** -print_title "${arr[12]}" -cd firejail || exit 1 - -./configure --enable-fatal-warnings --disable-man 2>&1 | tee output -if grep -E '(WARNING|ERROR)' output; then - echo "TESTING ERROR"; - exit 1 -fi - -make -j4 2>&1 | tee output -if grep -E -i 'error:' output; then - echo "TESTING ERROR"; - exit 1 -fi -make distclean -cd .. - -#***************************************************************** -# TEST 13 -#***************************************************************** # - disable tmpfs as regular user" #***************************************************************** -print_title "${arr[13]}" +print_title "${arr[12]}" cd firejail || exit 1 ./configure --enable-fatal-warnings --disable-usertmpfs 2>&1 | tee output @@ -354,11 +331,11 @@ make distclean cd .. #***************************************************************** -# TEST 14 +# TEST 13 #***************************************************************** # - disable sandbox check #***************************************************************** -print_title "${arr[14]}" +print_title "${arr[13]}" cd firejail || exit 1 ./configure --enable-fatal-warnings --disable-sandbox-check 2>&1 | tee output @@ -376,11 +353,11 @@ make distclean cd .. #***************************************************************** -# TEST 15 +# TEST 14 #***************************************************************** # - disable landlock #***************************************************************** -print_title "${arr[15]}" +print_title "${arr[14]}" cd firejail || exit 1 ./configure --enable-fatal-warnings --disable-landlock 2>&1 | tee output @@ -398,11 +375,11 @@ make distclean cd .. #***************************************************************** -# TEST 16 +# TEST 15 #***************************************************************** # - disable --output logging #***************************************************************** -print_title "${arr[16]}" +print_title "${arr[15]}" cd firejail || exit 1 ./configure --enable-fatal-warnings --disable-output 2>&1 | tee output @@ -419,11 +396,11 @@ fi cd .. #***************************************************************** -# TEST 17 +# TEST 16 #***************************************************************** # - disable man pages #***************************************************************** -print_title "${arr[17]}" +print_title "${arr[16]}" cd firejail || exit 1 ./configure --enable-fatal-warnings --disable-man 2>&1 | tee output @@ -441,11 +418,11 @@ make distclean cd .. #***************************************************************** -# TEST 18 +# TEST 17 #***************************************************************** # - disable private-lib #***************************************************************** -print_title "${arr[18]}" +print_title "${arr[17]}" cd firejail || exit 1 ./configure --enable-fatal-warnings --disable-private-lib 2>&1 | tee output @@ -463,11 +440,11 @@ make distclean cd .. #***************************************************************** -# TEST 19 +# TEST 18 #***************************************************************** # - disable suid #***************************************************************** -print_title "${arr[19]}" +print_title "${arr[18]}" cd firejail || exit 1 ./configure --enable-fatal-warnings --disable-suid 2>&1 | tee output @@ -485,11 +462,11 @@ make distclean cd .. #***************************************************************** -# TEST 20 +# TEST 19 #***************************************************************** # - enable contrib install #***************************************************************** -print_title "${arr[20]}" +print_title "${arr[19]}" cd firejail || exit 1 ./configure --enable-fatal-warnings --enable-contrib-install 2>&1 | tee output @@ -507,11 +484,11 @@ make distclean cd .. #***************************************************************** -# TEST 21 +# TEST 20 #***************************************************************** # --enable-only-syscfg-profile #***************************************************************** -print_title "${arr[21]}" +print_title "${arr[20]}" cd firejail || exit 1 ./configure --enable-fatal-warnings --enable-only-syscfg-profiles 2>&1 | tee output @@ -529,11 +506,11 @@ make distclean cd .. #***************************************************************** -# TEST 22 +# TEST 21 #***************************************************************** # - enable force nonewprivs #***************************************************************** -print_title "${arr[22]}" +print_title "${arr[21]}" cd firejail || exit 1 ./configure --enable-fatal-warnings --enable-force-nonewprivs 2>&1 | tee output