merge/readme update

5 files changed, 28 insertions, 6 deletions

diff --git a/README b/README
index 257bb20d5..6cfd03031 100644
--- a/README
+++ b/README
@@ -70,6 +70,7 @@ Adrian L. Shaw (https://github.com/adrianlshaw)
         - add barrirer profile
 Aidan Gauland (https://github.com/aidalgol)
         - added electron, riot-web and npm profiles
+        - whitelist Bohemia Interactive config dir for Steam
 Akhil Hans Maulloo (https://github.com/kouul)
         - xz profile
 Alexey Kuznetsov (kuznet@ms2.inr.ac.ru)
@@ -159,6 +160,11 @@ Bandie (https://github.com/Bandie)
         - fixed riot-desktop
 Barış Ekin Yıldırım (https://github.com/circuitshaker)
         - removing net none from code.profile
+bbhtt (https://github.com/bbhtt)
+        - improvements to balsa,fractal,gajim,trojita profiles
+        - improvements to nheko, spectral, feh, links, lynx profiles
+        - added alacartem com.github.bleakgrey.tootle, photoflare profiles
+        - add profiles for MS Edge dev build for Linux and Librewolf
 Benjamin Kampmann (https://github.com/ligthyear)
         - Forward exit code from child process
 bitfreak25 (https://github.com/bitfreak25)
@@ -178,6 +184,8 @@ Brad Ackerman
         - blacklist Bitwarden config in disable-passwdmgr.inc
 briaeros (https://github.com/briaeros)
         - fix command test in jail_prober.py
+botherer (https://github.com/botherder)
+        - add CoyIM profile
 Bruno Nova (https://github.com/brunonova)
         - whitelist fix
         - bash arguments fix
@@ -301,6 +309,8 @@ Fabian Würfl (https://github.com/BafDyce)
         - Liferea profile
 Felipe Barriga Richards (https://github.com/fbarriga)
         - --private-etc fix
+fenuks (https://github.com/fenuks)
+        - fix sound in games using FMOD
 Florian Begusch (https://github.com/florianbegusch)
         - (la)tex profiles
         - fixed transmission-common.profile
@@ -420,6 +430,8 @@ hawkey116477 (https://github.com/hawkeye116477)
         - updated Waterfox profile
 Helmut Grohne (https://github.com/helmutg)
         -  compiler support in the build system - Debian bug #869707
+hhzek0014 (https://github.com/hhzek0014)
+        - updated  bibletime.profile
 hlein (https://github.com/hlein)
         - strip out \r's from jail prober
 Holger Heinz (https://github.com/hheinz)
@@ -518,7 +530,11 @@ KellerFuchs (https://github.com/KellerFuchs)
         - fixed Cryptocat profile
         - make ~/.local read-only
 Kelvin (https://github.com/kmk3)
-        - disable ldns utilities
+        - disable ldns utilities, dnssec-*, khost, unbound-host
+        - sort DNS / RUNUSER paths
+        - improve bug_report.md
+        - fix keypassxc
+        - blacklist oksh shell in disable-shell.inc
 Kishore96in (https://github.com/Kishore96in)
         - added falkon profile
         - kxmlgui fixes
@@ -610,6 +626,7 @@ Neo00001 (https://github.com/Neo00001)
         - update virtualbox profile
         - update telegram profile
         - add spectacle profile
+        - add kdiff3 profile
 Nick Fox (https://github.com/njfox)
         - add a profile alias for code-oss
         - add code-oss config directory
@@ -620,6 +637,8 @@ Niklas Haas (https://github.com/haasn)
         - blacklisting for keybase.io's client
 Niklas Goerke (https://github.com/Niklas974)
         - update QOwnNotes profile
+Nikos Chantziaras (https://github.com/realnc)
+        - fix audio support for Discord
 nyancat18 (https://github.com/nyancat18)
         - added ardour4, dooble, karbon, krita profiles
 Ondra Nekola (https://github.com/satai)
@@ -732,6 +751,8 @@ RD PROJEKT (https://github.com/RDProjekt)
         - support AMD GPU by OpenCL in Blender
 rogshdo (https://github.com/rogshdo)
         - BitlBee profile
+rootalc (https://github.com/rootalc)
+        - add nolocal6.net filter
 Ruan (https://github.com/ruany)
         - fixed hexchat profile
 rusty-snake (https://github.com/rusty-snake)
diff --git a/README.md b/README.md
index ff5427ebd..c971b1c23 100644
--- a/README.md
+++ b/README.md
@@ -197,4 +197,4 @@ Stats:
 
 ### New profiles:
 
-spectacle, chromium-browser-privacy, gtk-straw-viewer, gtk-youtube-viewer, gtk2-youtube-viewer, gtk3-youtube-viewer, straw-viewer, lutris, dolphin-emu, authenticator-rs, servo, tutanota-desktop, npm, marker, yarn, lsar, unar, agetpkg, mdr, shotwell, qnapi, guvcview, pkglog
+kdiff3, spectacle, chromium-browser-privacy, gtk-straw-viewer, gtk-youtube-viewer, gtk2-youtube-viewer, gtk3-youtube-viewer, straw-viewer, lutris, dolphin-emu, authenticator-rs, servo, tutanota-desktop, npm, marker, yarn, lsar, unar, agetpkg, mdr, shotwell, qnapi, guvcview, pkglog
diff --git a/RELNOTES b/RELNOTES
index f6510f140..e83c408c3 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -4,11 +4,12 @@ firejail (0.9.65) baseline; urgency=low
   * allow AF_BLUETOOTH via --protocol=bluetooth
   * Setup guide for new users: contrib/firejail-welcome.sh
   * implement netns in profiles
+  * added nolocal6.net IPv6 network filter
   * new profiles: spectacle, chromium-browser-privacy, gtk-straw-viewer
   * new profiles: gtk-youtube-viewer, gtk2-youtube-viewer, gtk3-youtube-viewer
   * new profiles: straw-viewer, lutris, dolphin-emu, authenticator-rs, servo
   * new profiles: npm, marker, yarn, lsar, unar, agetpkg, mdr, shotwell, qnapi
-  * new profiles: guvcview, pkglog
+  * new profiles: guvcview, pkglog, kdiff3, CoyIM
 
  -- netblue30 <netblue30@yahoo.com>  Wed, 21 Oct 2020 09:00:00 -0500
 
diff --git a/etc/profile-m-z/warzone2100.profile b/etc/profile-m-z/warzone2100.profile
index 369c9cc1d..06a7c3412 100644
--- a/etc/profile-m-z/warzone2100.profile
+++ b/etc/profile-m-z/warzone2100.profile
@@ -16,8 +16,8 @@ include disable-passwdmgr.inc
 include disable-programs.inc
 include disable-shell.inc
 
-# mkdir ${HOME}/.warzone2100-3.1
-# mkdir ${HOME}/.warzone2100-3.2
+mkdir ${HOME}/.warzone2100-3.1
+mkdir ${HOME}/.warzone2100-3.2
 whitelist ${HOME}/.warzone2100-3.1
 whitelist ${HOME}/.warzone2100-3.2
 whitelist /usr/share/games
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index e72ef48c2..8958dfaee 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -1317,7 +1317,7 @@ $ firejail --netfilter=/etc/firejail/webserver.net --net=eth0 \\
 .br
 
 .br
-.B nolocal.net
+.B nolocal.net/nolocal6.net
 is a desktop client firewall that disable access to local network. Example:
 .br