centos7 fixes; support for building rpm packages

4 files changed, 21 insertions, 2 deletions

diff --git a/README b/README
index 4a364970b..ed5721de4 100644
--- a/README
+++ b/README
@@ -18,6 +18,8 @@ License: GPL v2
 Firejail Authors:
 
 netblue30 (netblue30@yahoo.com)
+jgriffiths (https://github.com/jgriffiths)
+        - make rpm packages support: "make rpms"
 Tom Mellor (https://github.com/kalegrill)
         - mupen64plus profile
 Martin Carpenter (https://github.com/mcarpenter)
diff --git a/RELNOTES b/RELNOTES
index fbb0f58f0..daa92d5dc 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -2,7 +2,9 @@ firejail (0.9.39) baseline; urgency=low
   * work in progress!
   * default seccomp filter update
   * disable STUN/WebRTC in default netfilter configuration
-  * added --nice optoin
+  * added --nice option
+  * --version also prints compile options
+  * build rpm packages using "make rpms"
   * new profiles: lxterminal
   * bugfixes
  -- netblue30 <netblue30@yahoo.com>  Tue, 8 Feb 2016 10:00:00 -0500
diff --git a/platform/rpm/firejail.spec b/platform/rpm/firejail.spec
index f6c9efa18..e365af2d6 100644
--- a/platform/rpm/firejail.spec
+++ b/platform/rpm/firejail.spec
@@ -19,7 +19,7 @@ using Linux namespaces. It includes a sandbox profile for Mozilla Firefox.
 %setup -q
 
 %build
-%configure
+%configure --disable-userns
 make %{?_smp_mflags}
 
 %install
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 4882e29e6..6fd011868 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -243,6 +243,21 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
         }
         else if (strcmp(argv[i], "--version") == 0) {
                 printf("firejail version %s\n", VERSION);
+#ifndef HAVE_NETWORK
+                printf("Networking support is disabled.\n");
+#endif
+#ifndef HAVE_USERNS
+                printf("User namespace support is disabled.\n");
+#endif
+#ifndef HAVE_SECCOMP
+                printf("Seccomp-bpf support is disabled.\n");
+#endif
+#ifndef HAVE_BIND
+                printf("Bind support is disabled.\n");
+#endif
+#ifndef HAVE_CHROOT
+                printf("Chroot support is disabled.\n");
+#endif
                 exit(0);
         }
 #ifdef HAVE_NETWORK