deprecated --git-install and --git-uninstall

13 files changed, 6 insertions, 236 deletions

diff --git a/Makefile.in b/Makefile.in
index e9df6264d..2d73daa46 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,7 +19,6 @@ DOCDIR=@docdir@
 HAVE_SECCOMP=@HAVE_SECCOMP@
 HAVE_APPARMOR=@HAVE_APPARMOR@
 HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@
-HAVE_GIT_INSTALL=@HAVE_GIT_INSTALL@
 BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@
 HAVE_SUID=@HAVE_SUID@
 
@@ -96,10 +95,6 @@ endif
         install -c -m 0644 src/libpostexecseccomp/libpostexecseccomp.so $(DESTDIR)/$(libdir)/firejail/.
         install -c -m 0755 src/ftee/ftee $(DESTDIR)/$(libdir)/firejail/.
         install -c -m 0755 src/fshaper/fshaper.sh $(DESTDIR)/$(libdir)/firejail/.
-ifeq ($(HAVE_GIT_INSTALL),-DHAVE_GIT_INSTALL)
-        install -c -m 0755 src/fgit/fgit-install.sh $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0755 src/fgit/fgit-uninstall.sh $(DESTDIR)/$(libdir)/firejail/.
-endif
 
         install -c -m 0644 src/firecfg/firecfg.config $(DESTDIR)/$(libdir)/firejail/.
         install -c -m 0755 src/faudit/faudit $(DESTDIR)/$(libdir)/firejail/.
diff --git a/RELNOTES b/RELNOTES
index 647377e8b..9f63610e6 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,6 +1,7 @@
 firejail (0.9.53) baseline; urgency=low
   * work in progress
-  * --force depercated
+  * modif: --force depercated
+  * modif: --git-install and --git-uninstall deprecated
   * modif: support for private-bin, private-lib and shell none has been
      disabled while running AppImage archives in order to be able to use
      our regular profile files with AppImages.
@@ -10,6 +11,8 @@ firejail (0.9.53) baseline; urgency=low
      All users of Firefox-based browsers who use addons and plugins
      that read/write from ${HOME} will need to uncomment the includes for
      firefox-common-addons.inc in firefox-common.profile.
+  * modif: split disable-devel.inc into disable-devel and
+     disable-interpreters.inc
   * add --noautopulse to disable automatic ~/.config/pulse (for complex setups)
   * Spectre mitigation patch for gcc and clang compiler
   * D-Bus handling (--nodbus)
diff --git a/configure b/configure
index eebdddb32..a3b306d56 100755
--- a/configure
+++ b/configure
@@ -626,7 +626,6 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 HAVE_SECCOMP_H
 HAVE_CONTRIB_INSTALL
-HAVE_GIT_INSTALL
 HAVE_GCOV
 BUSYBOX_WORKAROUND
 HAVE_FATAL_WARNINGS
@@ -717,7 +716,6 @@ enable_suid
 enable_fatal_warnings
 enable_busybox_workaround
 enable_gcov
-enable_git_install
 enable_contrib_install
 '
       ac_precious_vars='build_alias
@@ -1369,7 +1367,6 @@ Optional Features:
   --enable-busybox-workaround
                           enable busybox workaround
   --enable-gcov           Gcov instrumentation
-  --enable-git-install    enable git install feature
   --enable-contrib-install
                           install contrib scripts
 
@@ -3787,20 +3784,6 @@ if test "x$enable_gcov" = "xyes"; then :
 
 fi
 
-
-HAVE_GIT_INSTALL=""
-# Check whether --enable-git-install was given.
-if test "${enable_git_install+set}" = set; then :
-  enableval=$enable_git_install;
-fi
-
-if test "x$enable_git_install" = "xyes"; then :
-
-        HAVE_GIT_INSTALL="-DHAVE_GIT_INSTALL"
-
-
-fi
-
 HAVE_CONTRIB_INSTALL="yes"
 # Check whether --enable-contrib-install was given.
 if test "${enable_contrib_install+set}" = set; then :
@@ -5080,7 +5063,6 @@ echo "   whitelisting: $HAVE_WHITELIST"
 echo "   private home support: $HAVE_PRIVATE_HOME"
 echo "   file transfer support: $HAVE_FILE_TRANSFER"
 echo "   overlayfs support: $HAVE_OVERLAYFS"
-echo "   git install support: $HAVE_GIT_INSTALL"
 echo "   busybox workaround: $BUSYBOX_WORKAROUND"
 echo "   Spectre compiler patch: $HAVE_SPECTRE"
 echo "   EXTRA_LDFLAGS: $EXTRA_LDFLAGS"
diff --git a/configure.ac b/configure.ac
index 7495ac4c4..bd87ed9ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,15 +179,6 @@ AS_IF([test "x$enable_gcov" = "xyes"], [
         AC_SUBST(HAVE_GCOV)
 ])
 
-
-HAVE_GIT_INSTALL=""
-AC_ARG_ENABLE([git-install],
-    AS_HELP_STRING([--enable-git-install], [enable git install feature]))
-AS_IF([test "x$enable_git_install" = "xyes"], [
-        HAVE_GIT_INSTALL="-DHAVE_GIT_INSTALL"
-        AC_SUBST(HAVE_GIT_INSTALL)
-])
-
 HAVE_CONTRIB_INSTALL="yes"
 AC_ARG_ENABLE([contrib-install],
     AS_HELP_STRING([--enable-contrib-install], [install contrib scripts]))
@@ -229,7 +220,6 @@ echo "   whitelisting: $HAVE_WHITELIST"
 echo "   private home support: $HAVE_PRIVATE_HOME"
 echo "   file transfer support: $HAVE_FILE_TRANSFER"
 echo "   overlayfs support: $HAVE_OVERLAYFS"
-echo "   git install support: $HAVE_GIT_INSTALL"
 echo "   busybox workaround: $BUSYBOX_WORKAROUND"
 echo "   Spectre compiler patch: $HAVE_SPECTRE"
 echo "   EXTRA_LDFLAGS: $EXTRA_LDFLAGS"
diff --git a/mkdeb.sh b/mkdeb.sh
index 4a8e00dee..1a8e2bc33 100755
--- a/mkdeb.sh
+++ b/mkdeb.sh
@@ -18,7 +18,7 @@ echo "*****************************************"
 tar -xJvf $CODE_ARCHIVE
 #mkdir -p $INSTALL_DIR
 cd $CODE_DIR
-./configure --prefix=/usr --enable-git-install
+./configure --prefix=/usr
 make -j2
 mkdir debian
 DESTDIR=debian make install-strip
diff --git a/src/common.mk.in b/src/common.mk.in
index 1d4dbe304..fd9f2e5a5 100644
--- a/src/common.mk.in
+++ b/src/common.mk.in
@@ -23,14 +23,13 @@ HAVE_APPARMOR=@HAVE_APPARMOR@
 HAVE_OVERLAYFS=@HAVE_OVERLAYFS@
 HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@
 HAVE_GCOV=@HAVE_GCOV@
-HAVE_GIT_INSTALL=@HAVE_GIT_INSTALL@
 
 H_FILE_LIST       = $(sort $(wildcard *.[h]))
 C_FILE_LIST       = $(sort $(wildcard *.c))
 OBJS = $(C_FILE_LIST:.c=.o)
 BINOBJS =  $(foreach file, $(OBJS), $file)
 
-CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"'  $(HAVE_GCOV) $(HAVE_GIT_INSTALL) -DPREFIX='"$(prefix)"'  -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_APPARMOR) $(HAVE_OVERLAYFS) $(HAVE_SECCOMP) $(HAVE_GLOBALCFG) $(HAVE_SECCOMP_H) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_BIND) $(HAVE_FILE_TRANSFER) $(HAVE_WHITELIST) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security
+CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"'  $(HAVE_GCOV) -DPREFIX='"$(prefix)"'  -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_APPARMOR) $(HAVE_OVERLAYFS) $(HAVE_SECCOMP) $(HAVE_GLOBALCFG) $(HAVE_SECCOMP_H) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_BIND) $(HAVE_FILE_TRANSFER) $(HAVE_WHITELIST) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security
 LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread
 EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@
 EXTRA_CFLAGS +=@EXTRA_CFLAGS@
diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c
index 20845270e..7b0ae30b6 100644
--- a/src/firejail/checkcfg.c
+++ b/src/firejail/checkcfg.c
@@ -450,14 +450,6 @@ void print_compiletime_support(void) {
 #endif
                 );
 
-        printf("\t- git install support is %s\n",
-#ifdef HAVE_GIT_INSTALL
-                "enabled"
-#else
-                "disabled"
-#endif
-                );
-
         printf("\t- networking support is %s\n",
 #ifdef HAVE_NETWORK
                 "enabled"
diff --git a/src/firejail/git.c b/src/firejail/git.c
deleted file mode 100644
index d6525aa89..000000000
--- a/src/firejail/git.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2014-2018 Firejail Authors
- *
- * This file is part of firejail project
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_GIT_INSTALL
-
-#include "firejail.h"
-#include <sys/utsname.h>
-#include <sched.h>
-#include <sys/mount.h>
-
-// install a very simple mount namespace sandbox with a tmpfs on top of /tmp
-// and drop privileges
-static void sbox_ns(void) {
-        if (unshare(CLONE_NEWNS) < 0)
-                errExit("unshare");
-
-        // mount events are not forwarded between the host the sandbox
-        if (mount(NULL, "/", NULL, MS_SLAVE | MS_REC, NULL) < 0) {
-                errExit("mount");
-        }
-
-        // mount a tmpfs on top of /tmp
-        if (mount(NULL, "/tmp", "tmpfs", 0, NULL) < 0)
-                errExit("mount");
-
-
-        // drop privileges
-        if (setgid(getgid()) < 0)
-                errExit("setgid/getgid");
-        if (setuid(getuid()) < 0)
-                errExit("setuid/getuid");
-        assert(getenv("LD_PRELOAD") == NULL);
-
-        printf("Running as "); fflush(0);
-        int rv = system("whoami");
-        (void) rv;
-        printf("/tmp directory: "); fflush(0);
-        rv = system("ls -l /tmp");
-        (void) rv;
-}
-
-
-void git_install(void) {
-        // redirect to "/usr/bin/firejail --noprofile --private-tmp /usr/lib/firejail/fgit-install.sh"
-        EUID_ASSERT();
-        EUID_ROOT();
-
-        // install a mount namespace with a tmpfs on top of /tmp
-        sbox_ns();
-
-        // run command
-        const char *cmd = LIBDIR "/firejail/fgit-install.sh";
-        int rv = system(cmd);
-        (void) rv;
-        exit(0);
-}
-
-void git_uninstall(void) {
-        // redirect to "/usr/bin/firejail --noprofile --private-tmp /usr/lib/firejail/fgit-install.sh"
-        EUID_ASSERT();
-        EUID_ROOT();
-
-        // install a mount namespace with a tmpfs on top of /tmp
-        sbox_ns();
-
-        // run command
-        const char *cmd = LIBDIR "/firejail/fgit-uninstall.sh";
-        int rv = system(cmd);
-        (void) rv;
-        exit(0);
-}
-
-#endif // HAVE_GIT_INSTALL
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 0d53a24a8..f34d2eb79 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -890,15 +890,6 @@ int main(int argc, char **argv) {
                 profile_add(cmd);
         }
 
-
-#ifdef HAVE_GIT_INSTALL
-        // process git-install and git-uninstall
-        if (check_arg(argc, argv, "--git-install", 1))
-                git_install(); // this function will not return
-        if (check_arg(argc, argv, "--git-uninstall", 1))
-                git_uninstall(); // this function will not return
-#endif
-
         // profile builder
         if (check_arg(argc, argv, "--build", 0)) // supports both --build and --build=filename
                 run_builder(argc, argv); // this function will not return
diff --git a/src/firejail/usage.c b/src/firejail/usage.c
index 542747efc..effbf3751 100644
--- a/src/firejail/usage.c
+++ b/src/firejail/usage.c
@@ -78,11 +78,6 @@ static char *usage_str =
         "    --env=name=value - set environment variable.\n"
         "    --fs.print=name|pid - print the filesystem log.\n"
         "    --get=name|pid filename - get a file from sandbox container.\n"
-#ifdef HAVE_GIT_INSTALL
-        "    --git-install - download, compile and install mainline git version\n"
-        "\tof Firejail.\n"
-        "    --git-uninstall - uninstall mainline git version of Firejail\n"
-#endif
         "    --help, -? - this help screen.\n"
         "    --hostname=name - set sandbox hostname.\n"
         "    --hosts-file=file - use file as /etc/hosts.\n"
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 85550e576..d89a763a9 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -493,39 +493,6 @@ $ firejail \-\-fs.print=3272
 \fB\-\-get=name|pid filename
 Get a file from sandbox container, see \fBFILE TRANSFER\fR section for more details.
 
-
-.TP
-\fB\-\-git-install
-Download, compile and install mainline git version of Firejail from the official repository on GitHub.
-The software is installed in /usr/local/bin, and takes precedence over the (old) version
-installed in /usr/bin. If for any reason the new version doesn't work, the user can uninstall it
-using \-\-git-uninstall command and revert to the old version.
-.br
-
-.br
-Prerequisites: git and compile support are required for this command to work. On Debian/Ubuntu
-systems this support is installed using "sudo apt-get install build-essential git".
-.br
-
-.br
-Example:
-.br
-
-.br
-$ firejail \-\-git-install
-
-.TP
-\fB\-\-git-uninstall
-Remove the Firejail version previously installed in /usr/local/bin using \-\-git-install command.
-.br
-
-.br
-Example:
-.br
-
-.br
-$ firejail \-\-git-uninstall
-
 .TP
 \fB\-?\fR, \fB\-\-help\fR
 Print options end exit.
diff --git a/test/root/git.exp b/test/root/git.exp
deleted file mode 100755
index c5ddeee89..000000000
--- a/test/root/git.exp
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/expect -f
-
-set timeout 10
-spawn $env(SHELL)
-match_max 100000
-
-
-
-send -- "firejail --version\r"
-expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
-        "git install support is disabled" { puts "TESTING: git support not available in current build\n"; exit}
-        "git install support is enabled" { puts "git support available\n"}
-}
-
-set timeout 120
-send -- "firejail --git-install\r"
-expect {
-        timeout {puts "TESTING ERROR 2\n";exit}
-        "Cloning into"
-}
-expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
-        "Configuration options"
-}
-expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
-        "src/fseccomp/fseccomp default seccomp"
-}
-expect {
-        timeout {puts "TESTING ERROR 5\n";exit}
-        "Mainline git Firejail version was installed in"
-}
-after 100
-
-send -- "firejail --git-uninstall\r"
-expect {
-        timeout {puts "TESTING ERROR 6\n";exit}
-        "Cloning into"
-}
-expect {
-        timeout {puts "TESTING ERROR 7\n";exit}
-        "Configuration options"
-}
-expect {
-        timeout {puts "TESTING ERROR 8\n";exit}
-        "Firejail mainline git version uninstalled from"
-}
-after 100
-
-puts "\nall done\n"
diff --git a/test/root/root.sh b/test/root/root.sh
index 4132bc739..4f217b727 100755
--- a/test/root/root.sh
+++ b/test/root/root.sh
@@ -77,9 +77,6 @@ echo "TESTING: fs whitelist mnt, opt, media (test/root/whitelist-mnt.exp)"
 echo "TESTING: join (test/root/join.exp)"
 ./join.exp
 
-echo "TESTING: git-install (test/root/git.exp)"
-./git.exp
-
 echo "TESTING: login-nobody (test/root/login_nobody.exp)"
 ./login_nobody.exp