Merge pull request #621 from Fred-Barclay/proposed

Proposed

7 files changed, 25 insertions, 5 deletions

diff --git a/Makefile.in b/Makefile.in
index 85e81fada..a5a3d7da9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -221,6 +221,7 @@ realinstall:
         install -c -m 0644 .etc/less.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/Telegram.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/atom-beta.profile $(DESTDIR)/$(sysconfdir)/firejail/.
+        install -c -m 0644 .etc/atom.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
         install -c -m 0644 etc/firejail.config $(DESTDIR)/$(sysconfdir)/firejail/.
         rm -fr .etc
diff --git a/README b/README
index ac05329c1..f00e7b377 100644
--- a/README
+++ b/README
@@ -54,7 +54,7 @@ Fred-Barclay (https://github.com/Fred-Barclay)
         - added pix profile
         - added audacity profile
         - fixed Telegram and qtox profiles
-        - added Atom Beta profile
+        - added Atom Beta and Atom profiles
 Jaykishan Mutkawoa (https://github.com/jmutkawoa)
         - cpio profile
 Paupiah Yash (https://github.com/CaffeinatedStud)
diff --git a/README.md b/README.md
index e6757c6f1..877d2b556 100644
--- a/README.md
+++ b/README.md
@@ -102,5 +102,5 @@ Office: evince, gthumb, fbreader, pix
 
 ## New security profiles
 
-Gitter, gThumb, mpv, Franz messenger, LibreOffice, pix, audacity, strings, xz, xzdec, gzip, cpio, less, Atom Beta
+Gitter, gThumb, mpv, Franz messenger, LibreOffice, pix, audacity, strings, xz, xzdec, gzip, cpio, less, Atom Beta, Atom
 
diff --git a/RELNOTES b/RELNOTES
index e48f7dc29..3d1004601 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -8,7 +8,7 @@ firejail (0.9.41) baseline; urgency=low
   * some profiles have been converted to private-bin
   * new profiles: Gitter, gThumb, mpv, Franz messenger, LibreOffice
   * new profiles: pix, audacity, strings, xz, xzdec, gzip, cpio, less
-  * new profiles: Atom Beta
+  * new profiles: Atom Beta, Atom
  -- netblue30 <netblue30@yahoo.com>  Tue, 31 May 2016 08:00:00 -0500
 
 firejail (0.9.40) baseline; urgency=low
diff --git a/etc/atom.profile b/etc/atom.profile
new file mode 100644
index 000000000..f996ea79e
--- /dev/null
+++ b/etc/atom.profile
@@ -0,0 +1,17 @@
+# Firjail profile for Atom.
+noblacklist ~/.atom
+noblacklist ~/.config/Atom
+
+include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-programs.inc
+include /etc/firejail/disable-passwdmgr.inc
+
+caps.drop all
+netfilter
+nonewprivs
+nogroups
+noroot
+seccomp
+shell none
+
+private-dev
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index 20a68146c..3ae366541 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -1,3 +1,5 @@
+# Do not have a new/empty line on the end of this file or dpkg-deb will warn
+# that "conffile '' is not a plain file." 
 /etc/firejail/evince.profile
 /etc/firejail/chromium.profile
 /etc/firejail/chromium-browser.profile
@@ -127,5 +129,4 @@
 /etc/firejail/less.profile
 /etc/firejail/Telegram.profile
 /etc/firejail/atom-beta.profile
-
-
+/etc/firejail/atom.profile
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 55b61df7d..55e7e30de 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -127,6 +127,7 @@ xreader
 snap
 ssh
 atom-beta
+atom
 
 # weather/climate
 aweather