diff options
| author |  Fred-Barclay <Fred-Barclay@users.noreply.github.com> | 2017-08-07 11:06:04 -0500 |
|---|---|---|
| committer | Fred-Barclay <Fred-Barclay@users.noreply.github.com> | 2017-08-07 11:06:04 -0500 |
| commit | da23c55e048f3509150c42e8ccaa0cc58f3e9fb2 (patch) | |
| tree | 61240215f4fc1d11bc3dc0fd719206cdb09409f9 /platform | |
| parent | various profile fixes (#1433) (diff) | |
| download | firejail-da23c55e048f3509150c42e8ccaa0cc58f3e9fb2.tar.gz firejail-da23c55e048f3509150c42e8ccaa0cc58f3e9fb2.tar.zst firejail-da23c55e048f3509150c42e8ccaa0cc58f3e9fb2.zip | |
merges
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/debian/conffiles | 71 |
1 files changed, 43 insertions, 28 deletions
diff --git a/platform/debian/conffiles b/platform/debian/conffiles index 03dd65327..afd22c041 100644 --- a/platform/debian/conffiles +++ b/platform/debian/conffiles | |||
| @@ -15,9 +15,10 @@ | |||
| 15 | /etc/firejail/akregator.profile | 15 | /etc/firejail/akregator.profile |
| 16 | /etc/firejail/amarok.profile | 16 | /etc/firejail/amarok.profile |
| 17 | /etc/firejail/android-studio.profile | 17 | /etc/firejail/android-studio.profile |
| 18 | /etc/firejail/apktool.profile | ||
| 18 | /etc/firejail/arduino.profile | 19 | /etc/firejail/arduino.profile |
| 19 | /etc/firejail/arm.profile | ||
| 20 | /etc/firejail/ark.profile | 20 | /etc/firejail/ark.profile |
| 21 | /etc/firejail/arm.profile | ||
| 21 | /etc/firejail/atom-beta.profile | 22 | /etc/firejail/atom-beta.profile |
| 22 | /etc/firejail/atom.profile | 23 | /etc/firejail/atom.profile |
| 23 | /etc/firejail/atool.profile | 24 | /etc/firejail/atool.profile |
| @@ -26,6 +27,7 @@ | |||
| 26 | /etc/firejail/audacity.profile | 27 | /etc/firejail/audacity.profile |
| 27 | /etc/firejail/aweather.profile | 28 | /etc/firejail/aweather.profile |
| 28 | /etc/firejail/baloo_file.profile | 29 | /etc/firejail/baloo_file.profile |
| 30 | /etc/firejail/baobab.profile | ||
| 29 | /etc/firejail/bibletime.profile | 31 | /etc/firejail/bibletime.profile |
| 30 | /etc/firejail/bitlbee.profile | 32 | /etc/firejail/bitlbee.profile |
| 31 | /etc/firejail/bleachbit.profile | 33 | /etc/firejail/bleachbit.profile |
| @@ -34,23 +36,27 @@ | |||
| 34 | /etc/firejail/brasero.profile | 36 | /etc/firejail/brasero.profile |
| 35 | /etc/firejail/brave.profile | 37 | /etc/firejail/brave.profile |
| 36 | /etc/firejail/caja.profile | 38 | /etc/firejail/caja.profile |
| 39 | /etc/firejail/calibre.profile | ||
| 37 | /etc/firejail/catfish.profile | 40 | /etc/firejail/catfish.profile |
| 38 | /etc/firejail/cherrytree.profile | 41 | /etc/firejail/cherrytree.profile |
| 39 | /etc/firejail/chromium-browser.profile | 42 | /etc/firejail/chromium-browser.profile |
| 40 | /etc/firejail/chromium.profile | 43 | /etc/firejail/chromium.profile |
| 41 | /etc/firejail/claws-mail.profile | 44 | /etc/firejail/claws-mail.profile |
| 42 | /etc/firejail/clipit.profile | ||
| 43 | /etc/firejail/clementine.profile | 45 | /etc/firejail/clementine.profile |
| 46 | /etc/firejail/clipit.profile | ||
| 44 | /etc/firejail/cmus.profile | 47 | /etc/firejail/cmus.profile |
| 45 | /etc/firejail/conkeror.profile | 48 | /etc/firejail/conkeror.profile |
| 46 | /etc/firejail/corebird.profile | 49 | /etc/firejail/corebird.profile |
| 47 | /etc/firejail/cpio.profile | 50 | /etc/firejail/cpio.profile |
| 48 | /etc/firejail/cryptocat.profile | 51 | /etc/firejail/cryptocat.profile |
| 52 | /etc/firejail/curl.profile | ||
| 49 | /etc/firejail/cvlc.profile | 53 | /etc/firejail/cvlc.profile |
| 50 | /etc/firejail/cyberfox.profile | 54 | /etc/firejail/cyberfox.profile |
| 55 | /etc/firejail/darktable.profile | ||
| 51 | /etc/firejail/deadbeef.profile | 56 | /etc/firejail/deadbeef.profile |
| 52 | /etc/firejail/default.profile | 57 | /etc/firejail/default.profile |
| 53 | /etc/firejail/deluge.profile | 58 | /etc/firejail/deluge.profile |
| 59 | /etc/firejail/dex2jar.profile | ||
| 54 | /etc/firejail/dia.profile | 60 | /etc/firejail/dia.profile |
| 55 | /etc/firejail/digikam.profile | 61 | /etc/firejail/digikam.profile |
| 56 | /etc/firejail/dillo.profile | 62 | /etc/firejail/dillo.profile |
| @@ -66,8 +72,9 @@ | |||
| 66 | /etc/firejail/dosbox.profile | 72 | /etc/firejail/dosbox.profile |
| 67 | /etc/firejail/dragon.profile | 73 | /etc/firejail/dragon.profile |
| 68 | /etc/firejail/dropbox.profile | 74 | /etc/firejail/dropbox.profile |
| 69 | /etc/firejail/elinks.profile | 75 | /etc/firejail/ebook-viewer.profile |
| 70 | /etc/firejail/electron.profile | 76 | /etc/firejail/electron.profile |
| 77 | /etc/firejail/elinks.profile | ||
| 71 | /etc/firejail/emacs.profile | 78 | /etc/firejail/emacs.profile |
| 72 | /etc/firejail/empathy.profile | 79 | /etc/firejail/empathy.profile |
| 73 | /etc/firejail/enchant.profile | 80 | /etc/firejail/enchant.profile |
| @@ -75,6 +82,7 @@ | |||
| 75 | /etc/firejail/eog.profile | 82 | /etc/firejail/eog.profile |
| 76 | /etc/firejail/eom.profile | 83 | /etc/firejail/eom.profile |
| 77 | /etc/firejail/epiphany.profile | 84 | /etc/firejail/epiphany.profile |
| 85 | /etc/firejail/etr.profile | ||
| 78 | /etc/firejail/evince.profile | 86 | /etc/firejail/evince.profile |
| 79 | /etc/firejail/evolution.profile | 87 | /etc/firejail/evolution.profile |
| 80 | /etc/firejail/exiftool.profile | 88 | /etc/firejail/exiftool.profile |
| @@ -91,14 +99,18 @@ | |||
| 91 | /etc/firejail/fontforge.profile | 99 | /etc/firejail/fontforge.profile |
| 92 | /etc/firejail/fossamail.profile | 100 | /etc/firejail/fossamail.profile |
| 93 | /etc/firejail/franz.profile | 101 | /etc/firejail/franz.profile |
| 102 | /etc/firejail/frozen-bubble.profile | ||
| 94 | /etc/firejail/gajim.profile | 103 | /etc/firejail/gajim.profile |
| 95 | /etc/firejail/galculator.profile | 104 | /etc/firejail/galculator.profile |
| 96 | /etc/firejail/geany.profile | 105 | /etc/firejail/geany.profile |
| 106 | /etc/firejail/geary.profile | ||
| 97 | /etc/firejail/gedit.profile | 107 | /etc/firejail/gedit.profile |
| 98 | /etc/firejail/geeqie.profile | 108 | /etc/firejail/geeqie.profile |
| 99 | /etc/firejail/gimp.profile | 109 | /etc/firejail/ghb.profile |
| 100 | /etc/firejail/gimp-2.8.profile | 110 | /etc/firejail/gimp-2.8.profile |
| 111 | /etc/firejail/gimp.profile | ||
| 101 | /etc/firejail/git.profile | 112 | /etc/firejail/git.profile |
| 113 | /etc/firejail/gitg.profile | ||
| 102 | /etc/firejail/gitter.profile | 114 | /etc/firejail/gitter.profile |
| 103 | /etc/firejail/gjs.profile | 115 | /etc/firejail/gjs.profile |
| 104 | /etc/firejail/globaltime.profile | 116 | /etc/firejail/globaltime.profile |
| @@ -114,6 +126,7 @@ | |||
| 114 | /etc/firejail/gnome-mplayer.profile | 126 | /etc/firejail/gnome-mplayer.profile |
| 115 | /etc/firejail/gnome-music.profile | 127 | /etc/firejail/gnome-music.profile |
| 116 | /etc/firejail/gnome-photos.profile | 128 | /etc/firejail/gnome-photos.profile |
| 129 | /etc/firejail/gnome-twitch.profile | ||
| 117 | /etc/firejail/gnome-weather.profile | 130 | /etc/firejail/gnome-weather.profile |
| 118 | /etc/firejail/goobox.profile | 131 | /etc/firejail/goobox.profile |
| 119 | /etc/firejail/google-chrome-beta.profile | 132 | /etc/firejail/google-chrome-beta.profile |
| @@ -132,6 +145,9 @@ | |||
| 132 | /etc/firejail/gucharmap.profile | 145 | /etc/firejail/gucharmap.profile |
| 133 | /etc/firejail/gwenview.profile | 146 | /etc/firejail/gwenview.profile |
| 134 | /etc/firejail/gzip.profile | 147 | /etc/firejail/gzip.profile |
| 148 | /etc/firejail/handbrake-gtk.profile | ||
| 149 | /etc/firejail/handbrake.profile | ||
| 150 | /etc/firejail/hashcat.profile | ||
| 135 | /etc/firejail/hedgewars.profile | 151 | /etc/firejail/hedgewars.profile |
| 136 | /etc/firejail/hexchat.profile | 152 | /etc/firejail/hexchat.profile |
| 137 | /etc/firejail/highlight.profile | 153 | /etc/firejail/highlight.profile |
| @@ -143,8 +159,8 @@ | |||
| 143 | /etc/firejail/img2txt.profile | 159 | /etc/firejail/img2txt.profile |
| 144 | /etc/firejail/inkscape.profile | 160 | /etc/firejail/inkscape.profile |
| 145 | /etc/firejail/inox.profile | 161 | /etc/firejail/inox.profile |
| 146 | /etc/firejail/iridium.profile | ||
| 147 | /etc/firejail/iridium-browser.profile | 162 | /etc/firejail/iridium-browser.profile |
| 163 | /etc/firejail/iridium.profile | ||
| 148 | /etc/firejail/jd-gui.profile | 164 | /etc/firejail/jd-gui.profile |
| 149 | /etc/firejail/jitsi.profile | 165 | /etc/firejail/jitsi.profile |
| 150 | /etc/firejail/k3b.profile | 166 | /etc/firejail/k3b.profile |
| @@ -161,9 +177,11 @@ | |||
| 161 | /etc/firejail/kodi.profile | 177 | /etc/firejail/kodi.profile |
| 162 | /etc/firejail/konversation.profile | 178 | /etc/firejail/konversation.profile |
| 163 | /etc/firejail/ktorrent.profile | 179 | /etc/firejail/ktorrent.profile |
| 180 | /etc/firejail/kwrite.profile | ||
| 164 | /etc/firejail/leafpad.profile | 181 | /etc/firejail/leafpad.profile |
| 165 | /etc/firejail/less.profile | 182 | /etc/firejail/less.profile |
| 166 | /etc/firejail/libreoffice.profile | 183 | /etc/firejail/libreoffice.profile |
| 184 | /etc/firejail/liferea.profile | ||
| 167 | /etc/firejail/localc.profile | 185 | /etc/firejail/localc.profile |
| 168 | /etc/firejail/lodraw.profile | 186 | /etc/firejail/lodraw.profile |
| 169 | /etc/firejail/loffice.profile | 187 | /etc/firejail/loffice.profile |
| @@ -190,6 +208,7 @@ | |||
| 190 | /etc/firejail/meld.profile | 208 | /etc/firejail/meld.profile |
| 191 | /etc/firejail/midori.profile | 209 | /etc/firejail/midori.profile |
| 192 | /etc/firejail/mousepad.profile | 210 | /etc/firejail/mousepad.profile |
| 211 | /etc/firejail/mplayer.profile | ||
| 193 | /etc/firejail/mpv.profile | 212 | /etc/firejail/mpv.profile |
| 194 | /etc/firejail/multimc5.profile | 213 | /etc/firejail/multimc5.profile |
| 195 | /etc/firejail/mumble.profile | 214 | /etc/firejail/mumble.profile |
| @@ -201,8 +220,10 @@ | |||
| 201 | /etc/firejail/netsurf.profile | 220 | /etc/firejail/netsurf.profile |
| 202 | /etc/firejail/nolocal.net | 221 | /etc/firejail/nolocal.net |
| 203 | /etc/firejail/nylas.profile | 222 | /etc/firejail/nylas.profile |
| 223 | /etc/firejail/obs.profile | ||
| 204 | /etc/firejail/odt2txt.profile | 224 | /etc/firejail/odt2txt.profile |
| 205 | /etc/firejail/okular.profile | 225 | /etc/firejail/okular.profile |
| 226 | /etc/firejail/open-invaders.profile | ||
| 206 | /etc/firejail/openbox.profile | 227 | /etc/firejail/openbox.profile |
| 207 | /etc/firejail/openshot.profile | 228 | /etc/firejail/openshot.profile |
| 208 | /etc/firejail/opera-beta.profile | 229 | /etc/firejail/opera-beta.profile |
| @@ -214,7 +235,9 @@ | |||
| 214 | /etc/firejail/pdfsam.profile | 235 | /etc/firejail/pdfsam.profile |
| 215 | /etc/firejail/pdftotext.profile | 236 | /etc/firejail/pdftotext.profile |
| 216 | /etc/firejail/peek.profile | 237 | /etc/firejail/peek.profile |
| 238 | /etc/firejail/picard.profile | ||
| 217 | /etc/firejail/pidgin.profile | 239 | /etc/firejail/pidgin.profile |
| 240 | /etc/firejail/pingus.profile | ||
| 218 | /etc/firejail/pithos.profile | 241 | /etc/firejail/pithos.profile |
| 219 | /etc/firejail/pix.profile | 242 | /etc/firejail/pix.profile |
| 220 | /etc/firejail/pluma.profile | 243 | /etc/firejail/pluma.profile |
| @@ -232,31 +255,39 @@ | |||
| 232 | /etc/firejail/qutebrowser.profile | 255 | /etc/firejail/qutebrowser.profile |
| 233 | /etc/firejail/rambox.profile | 256 | /etc/firejail/rambox.profile |
| 234 | /etc/firejail/ranger.profile | 257 | /etc/firejail/ranger.profile |
| 258 | /etc/firejail/remmina.profile | ||
| 235 | /etc/firejail/rhythmbox.profile | 259 | /etc/firejail/rhythmbox.profile |
| 236 | /etc/firejail/riot-web.profile | 260 | /etc/firejail/riot-web.profile |
| 237 | /etc/firejail/ristretto.profile | 261 | /etc/firejail/ristretto.profile |
| 238 | /etc/firejail/rtorrent.profile | 262 | /etc/firejail/rtorrent.profile |
| 239 | /etc/firejail/scribus.profile | 263 | /etc/firejail/scribus.profile |
| 264 | /etc/firejail/sdat2img.profile | ||
| 240 | /etc/firejail/seamonkey-bin.profile | 265 | /etc/firejail/seamonkey-bin.profile |
| 241 | /etc/firejail/seamonkey.profile | 266 | /etc/firejail/seamonkey.profile |
| 242 | /etc/firejail/server.profile | 267 | /etc/firejail/server.profile |
| 243 | /etc/firejail/silentarmy.profile | 268 | /etc/firejail/silentarmy.profile |
| 244 | /etc/firejail/simple-scan.profile | 269 | /etc/firejail/simple-scan.profile |
| 270 | /etc/firejail/simutrans.profile | ||
| 245 | /etc/firejail/skanlite.profile | 271 | /etc/firejail/skanlite.profile |
| 246 | /etc/firejail/skype.profile | 272 | /etc/firejail/skype.profile |
| 247 | /etc/firejail/skypeforlinux.profile | 273 | /etc/firejail/skypeforlinux.profile |
| 248 | /etc/firejail/slack.profile | 274 | /etc/firejail/slack.profile |
| 275 | /etc/firejail/smplayer.profile | ||
| 249 | /etc/firejail/snap.profile | 276 | /etc/firejail/snap.profile |
| 250 | /etc/firejail/soffice.profile | 277 | /etc/firejail/soffice.profile |
| 278 | /etc/firejail/soundconverter.profile | ||
| 251 | /etc/firejail/spotify.profile | 279 | /etc/firejail/spotify.profile |
| 280 | /etc/firejail/sqlitebrowser.profile | ||
| 252 | /etc/firejail/ssh-agent.profile | 281 | /etc/firejail/ssh-agent.profile |
| 253 | /etc/firejail/ssh.profile | 282 | /etc/firejail/ssh.profile |
| 254 | /etc/firejail/start-tor-browser.profile | 283 | /etc/firejail/start-tor-browser.profile |
| 255 | /etc/firejail/steam.profile | 284 | /etc/firejail/steam.profile |
| 256 | /etc/firejail/stellarium.profile | 285 | /etc/firejail/stellarium.profile |
| 257 | /etc/firejail/strings.profile | 286 | /etc/firejail/strings.profile |
| 287 | /etc/firejail/supertux2.profile | ||
| 258 | /etc/firejail/synfigstudio.profile | 288 | /etc/firejail/synfigstudio.profile |
| 259 | /etc/firejail/tar.profile | 289 | /etc/firejail/tar.profile |
| 290 | /etc/firejail/telegram-desktop.profile | ||
| 260 | /etc/firejail/telegram.profile | 291 | /etc/firejail/telegram.profile |
| 261 | /etc/firejail/thunar.profile | 292 | /etc/firejail/thunar.profile |
| 262 | /etc/firejail/thunderbird.profile | 293 | /etc/firejail/thunderbird.profile |
| @@ -266,6 +297,7 @@ | |||
| 266 | /etc/firejail/transmission-gtk.profile | 297 | /etc/firejail/transmission-gtk.profile |
| 267 | /etc/firejail/transmission-qt.profile | 298 | /etc/firejail/transmission-qt.profile |
| 268 | /etc/firejail/transmission-show.profile | 299 | /etc/firejail/transmission-show.profile |
| 300 | /etc/firejail/truecraft.profile | ||
| 269 | /etc/firejail/uget-gtk.profile | 301 | /etc/firejail/uget-gtk.profile |
| 270 | /etc/firejail/unbound.profile | 302 | /etc/firejail/unbound.profile |
| 271 | /etc/firejail/unknown-horizons.profile | 303 | /etc/firejail/unknown-horizons.profile |
| @@ -277,12 +309,14 @@ | |||
| 277 | /etc/firejail/viking.profile | 309 | /etc/firejail/viking.profile |
| 278 | /etc/firejail/vim.profile | 310 | /etc/firejail/vim.profile |
| 279 | /etc/firejail/virtualbox.profile | 311 | /etc/firejail/virtualbox.profile |
| 280 | /etc/firejail/vivaldi.profile | ||
| 281 | /etc/firejail/vivaldi-beta.profile | 312 | /etc/firejail/vivaldi-beta.profile |
| 282 | /etc/firejail/vivaldi-stable.profile | 313 | /etc/firejail/vivaldi-stable.profile |
| 314 | /etc/firejail/vivaldi.profile | ||
| 283 | /etc/firejail/vlc.profile | 315 | /etc/firejail/vlc.profile |
| 316 | /etc/firejail/vym.profile | ||
| 284 | /etc/firejail/w3m.profile | 317 | /etc/firejail/w3m.profile |
| 285 | /etc/firejail/warzone2100.profile | 318 | /etc/firejail/warzone2100.profile |
| 319 | /etc/firejail/waterfox.profile | ||
| 286 | /etc/firejail/webserver.net | 320 | /etc/firejail/webserver.net |
| 287 | /etc/firejail/weechat-curses.profile | 321 | /etc/firejail/weechat-curses.profile |
| 288 | /etc/firejail/weechat.profile | 322 | /etc/firejail/weechat.profile |
| @@ -291,6 +325,8 @@ | |||
| 291 | /etc/firejail/whitelist-common.inc | 325 | /etc/firejail/whitelist-common.inc |
| 292 | /etc/firejail/wine.profile | 326 | /etc/firejail/wine.profile |
| 293 | /etc/firejail/wire.profile | 327 | /etc/firejail/wire.profile |
| 328 | /etc/firejail/wireshark-gtk.profile | ||
| 329 | /etc/firejail/wireshark-qt.profile | ||
| 294 | /etc/firejail/wireshark.profile | 330 | /etc/firejail/wireshark.profile |
| 295 | /etc/firejail/xchat.profile | 331 | /etc/firejail/xchat.profile |
| 296 | /etc/firejail/xed.profile | 332 | /etc/firejail/xed.profile |
| @@ -299,9 +335,9 @@ | |||
| 299 | /etc/firejail/xfce4-notes.profile | 335 | /etc/firejail/xfce4-notes.profile |
| 300 | /etc/firejail/xiphos.profile | 336 | /etc/firejail/xiphos.profile |
| 301 | /etc/firejail/xmms.profile | 337 | /etc/firejail/xmms.profile |
| 302 | /etc/firejail/xonotic.profile | ||
| 303 | /etc/firejail/xonotic-glx.profile | 338 | /etc/firejail/xonotic-glx.profile |
| 304 | /etc/firejail/xonotic-sdl.profile | 339 | /etc/firejail/xonotic-sdl.profile |
| 340 | /etc/firejail/xonotic.profile | ||
| 305 | /etc/firejail/xpdf.profile | 341 | /etc/firejail/xpdf.profile |
| 306 | /etc/firejail/xplayer.profile | 342 | /etc/firejail/xplayer.profile |
| 307 | /etc/firejail/xpra.profile | 343 | /etc/firejail/xpra.profile |
| @@ -312,24 +348,3 @@ | |||
| 312 | /etc/firejail/youtube-dl.profile | 348 | /etc/firejail/youtube-dl.profile |
| 313 | /etc/firejail/zathura.profile | 349 | /etc/firejail/zathura.profile |
| 314 | /etc/firejail/zoom.profile | 350 | /etc/firejail/zoom.profile |
| 315 | /etc/firejail/vym.profile | ||
| 316 | /etc/firejail/darktable.profile | ||
| 317 | /etc/firejail/waterfox.profile | ||
| 318 | /etc/firejail/handbrake.profile | ||
| 319 | /etc/firejail/curl.profile | ||
| 320 | /etc/firejail/mplayer.profile | ||
| 321 | /etc/firejail/smplayer.profile | ||
| 322 | /etc/firejail/ebook-viewer.profile | ||
| 323 | /etc/firejail/calibre.profile | ||
| 324 | /etc/firejail/handbrake-gtk.profile | ||
| 325 | /etc/firejail/ghb.profile | ||
| 326 | /etc/firejail/kwrite.profile | ||
| 327 | /etc/firejail/geary.profile | ||
| 328 | /etc/firejail/liferea.profile | ||
| 329 | /etc/firejail/etr.profile | ||
| 330 | /etc/firejail/frozen-bubble.profile | ||
| 331 | /etc/firejail/open-invaders.profile | ||
| 332 | /etc/firejail/pingus.profile | ||
| 333 | /etc/firejail/simutrans.profile | ||
| 334 | /etc/firejail/supertux2.profile | ||
| 335 | /etc/firejail/telegram-desktop.profile | ||