From cb42fa600df2f0843421620e3597ba71b1117828 Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Thu, 15 Sep 2016 08:19:29 -0400
Subject: fixed /etc/login.def reading on Mageia systems

---
 README    |  2 ++
 README.md | 12 ++++++++++++
 RELNOTES  |  2 ++
 mkuid.sh  |  2 +-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/README b/README
index b3cef82b0..9510b6b1d 100644
--- a/README
+++ b/README
@@ -42,6 +42,8 @@ Aleksey Manevich (https://github.com/manevich)
 	- fixed several TOCTOU security problems
 	- added --fix option to firecfg utility
 	- read_pid fix
+	- added --x11=block options
+	- x11 xpra, xphyr, block profile commands
 Fred-Barclay (https://github.com/Fred-Barclay)
 	- added Vivaldi, Atril profiles
 	- added PaleMoon profile
diff --git a/README.md b/README.md
index eafcf1d78..944cd41ca 100644
--- a/README.md
+++ b/README.md
@@ -36,3 +36,15 @@ FAQ: https://firejail.wordpress.com/support/frequently-asked-questions/
 `````
 # Current development version: 0.9.43
 
+## New command line options
+`````
+      --x11=block
+              Blacklist  /tmp/.X11-unix  directory,  ${HOME}/.Xauthority  and  file
+              specified in ${XAUTHORITY} enviroment variable.  Remove  DISPLAY  and
+              XAUTHORITY  enviroment  variables.   Stop  with  error message if X11
+              abstract socket will be accessible in jail.
+`````
+
+## New profile commands
+
+x11 xpra, x11 xephyr, x11 block
\ No newline at end of file
diff --git a/RELNOTES b/RELNOTES
index 6a0bd4711..fb0f989fe 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,5 +1,7 @@
 firejail (0.9.43) baseline; urgency=low
   * development version
+  * feature: blocking x11 (--x11=block)
+  * feature: x11 xpra, x11 xephyr, x11 block profile commands
  -- netblue30 <netblue30@yahoo.com>  Fri, 9 Sept 2016 08:00:00 -0500
 
 firejail (0.9.42) baseline; urgency=low
diff --git a/mkuid.sh b/mkuid.sh
index f03fdaf94..c95741043 100755
--- a/mkuid.sh
+++ b/mkuid.sh
@@ -4,7 +4,7 @@ echo "extracting UID_MIN and GID_MIN"
 echo "#ifndef FIREJAIL_UIDS_H" > uids.h
 echo "#define FIREJAIL_UIDS_H" >> uids.h
 
-if [ -f /etc/login.defs ]
+if [ -r /etc/login.defs ]
 then
 	echo "// using values extracted from /etc/login.defs" >> uids.h
 	UID_MIN=`awk '/^\s*UID_MIN\s*([0-9]*).*?$/ {print $2}' /etc/login.defs`
-- 
cgit v1.2.3-54-g00ecf