aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Tad <tad@spotco.us>2019-11-24 12:31:16 -0500
committerLibravatar Tad <tad@spotco.us>2019-11-24 12:31:16 -0500
commitaecee8b4b84759e0cc0c2cffc3844ab455cdbec6 (patch)
tree345af331e33be16be2c8e14d03edd1b714269259
parentMerge pull request #3054 from adrianlshaw/profanity (diff)
downloadfirejail-aecee8b4b84759e0cc0c2cffc3844ab455cdbec6.tar.gz
firejail-aecee8b4b84759e0cc0c2cffc3844ab455cdbec6.tar.zst
firejail-aecee8b4b84759e0cc0c2cffc3844ab455cdbec6.zip
merges
-rw-r--r--README2
-rw-r--r--README.md2
-rw-r--r--RELNOTES2
-rw-r--r--etc/disable-programs.inc2
-rw-r--r--src/firecfg/firecfg.config1
5 files changed, 7 insertions, 2 deletions
diff --git a/README b/README
index 7e9a690bf..17c915888 100644
--- a/README
+++ b/README
@@ -58,6 +58,8 @@ Firejail Authors (alphabetical order)
58 - fix flameshot raw screenshots 58 - fix flameshot raw screenshots
591dnrr (https://github.com/1dnrr) 591dnrr (https://github.com/1dnrr)
60 - add pybitmessage profile 60 - add pybitmessage profile
61Adrian L. Shaw (https://github.com/adrianlshaw)
62 - add profanity profile
61Aidan Gauland (https://github.com/aidalgol) 63Aidan Gauland (https://github.com/aidalgol)
62 - added electron and riot-web profiles 64 - added electron and riot-web profiles
63Akhil Hans Maulloo (https://github.com/kouul) 65Akhil Hans Maulloo (https://github.com/kouul)
diff --git a/README.md b/README.md
index 4ae9ef519..e1deba279 100644
--- a/README.md
+++ b/README.md
@@ -122,4 +122,4 @@ gnome-sound-recorder, godot, jerry, keepassxc-cli, keepassxc-proxy, klatexformul
122pandoc, qgis, rhythmbox-client, tcpdump, teams-for-linux, tshark, xlinks, zeal, mpg123, conplay, mpg123.bin, mpg123-alsa, mpg123-id3dump, 122pandoc, qgis, rhythmbox-client, tcpdump, teams-for-linux, tshark, xlinks, zeal, mpg123, conplay, mpg123.bin, mpg123-alsa, mpg123-id3dump,
123mpg123-jack, mpg123-nas, mpg123-openal, mpg123-oss, mpg123-portaudio, mpg123-pulse, mpg123-strip, out123, pavucontrol-qt, 123mpg123-jack, mpg123-nas, mpg123-openal, mpg123-oss, mpg123-portaudio, mpg123-pulse, mpg123-strip, out123, pavucontrol-qt,
124gnome-characters, gnome-character-map, rsync, Whalebird, tor-browser (AUR), Zulip, tb-starter-wrapper, bzcat, kiwix-desktop, ar, 124gnome-characters, gnome-character-map, rsync, Whalebird, tor-browser (AUR), Zulip, tb-starter-wrapper, bzcat, kiwix-desktop, ar,
125gnome-latex, pngquant, kalgebra, kalgebramobile, signal-cli, amuled, kfind 125gnome-latex, pngquant, kalgebra, kalgebramobile, signal-cli, amuled, kfind, profanity
diff --git a/RELNOTES b/RELNOTES
index f83aa803f..9044ed4d3 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -22,7 +22,7 @@ firejail (0.9.61) baseline; urgency=low
22 * new profiles: tor-browser (AUR), Zulip, tb-starter-wrapper, bzcat, 22 * new profiles: tor-browser (AUR), Zulip, tb-starter-wrapper, bzcat,
23 * new profiles: kiwix-desktop, bzcat, zstd, pzstd, zstdcat, zstdgrep, zstdless 23 * new profiles: kiwix-desktop, bzcat, zstd, pzstd, zstdcat, zstdgrep, zstdless
24 * new profiles: zstdmt, unzstd, i2p, ar, gnome-latex, pngquant, kalgebra 24 * new profiles: zstdmt, unzstd, i2p, ar, gnome-latex, pngquant, kalgebra
25 * new profiles: kalgebramobile, signal-cli, amuled, kfind 25 * new profiles: kalgebramobile, signal-cli, amuled, kfind, profanity
26 -- netblue30 <netblue30@yahoo.com> Sat, 1 Jun 2019 08:00:00 -0500 26 -- netblue30 <netblue30@yahoo.com> Sat, 1 Jun 2019 08:00:00 -0500
27 27
28firejail (0.9.60) baseline; urgency=low 28firejail (0.9.60) baseline; urgency=low
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index 4db110af7..8b08d6051 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -272,6 +272,7 @@ blacklist ${HOME}/.config/pix
272blacklist ${HOME}/.config/pluma 272blacklist ${HOME}/.config/pluma
273blacklist ${HOME}/.config/ppsspp 273blacklist ${HOME}/.config/ppsspp
274blacklist ${HOME}/.config/pragha 274blacklist ${HOME}/.config/pragha
275blacklist ${HOME}/.config/profanity
275blacklist ${HOME}/.config/psi+ 276blacklist ${HOME}/.config/psi+
276blacklist ${HOME}/.config/qBittorrent 277blacklist ${HOME}/.config/qBittorrent
277blacklist ${HOME}/.config/qBittorrentrc 278blacklist ${HOME}/.config/qBittorrentrc
@@ -558,6 +559,7 @@ blacklist ${HOME}/.local/share/orage
558blacklist ${HOME}/.local/share/org.kde.gwenview 559blacklist ${HOME}/.local/share/org.kde.gwenview
559blacklist ${HOME}/.local/share/pix 560blacklist ${HOME}/.local/share/pix
560blacklist ${HOME}/.local/share/plasma_notes 561blacklist ${HOME}/.local/share/plasma_notes
562blacklist ${HOME}/.local/share/profanity
561blacklist ${HOME}/.local/share/psi+ 563blacklist ${HOME}/.local/share/psi+
562blacklist ${HOME}/.local/share/qpdfview 564blacklist ${HOME}/.local/share/qpdfview
563blacklist ${HOME}/.local/share/qutebrowser 565blacklist ${HOME}/.local/share/qutebrowser
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index b4a425356..8694ffa90 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -483,6 +483,7 @@ pngquant
483polari 483polari
484ppsspp 484ppsspp
485pragha 485pragha
486profanity
486psi-plus 487psi-plus
487pybitmessage 488pybitmessage
488# pycharm-community - FB note: may enable later 489# pycharm-community - FB note: may enable later