From 23125988f7e60bb568cc53a7084c906f6bcf9c86 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: May 18 2017 08:10:54 +0000
Subject: Resolves: #1337039 - setfacl.1: document the meaning of '-' in perms


---

diff --git a/acl-2.2.52-setfacl-man-page.patch b/acl-2.2.52-setfacl-man-page.patch
new file mode 100644
index 0000000..f86f9ee
--- /dev/null
+++ b/acl-2.2.52-setfacl-man-page.patch
@@ -0,0 +1,60 @@
+From ecee95a94420d6b0336d4caec6bc66b53442367b Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Thu, 19 May 2016 10:28:13 +0200
+Subject: [PATCH] setfacl.1: document the meaning of '-' in perms
+
+[agruen: Description further clarified.]
+
+Upstream-commit: ea3c6bb711e76d91759f8bf5475e1900362a3142
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ man/man1/setfacl.1 | 28 +++++++++++++++++++++-------
+ 1 file changed, 21 insertions(+), 7 deletions(-)
+
+diff --git a/man/man1/setfacl.1 b/man/man1/setfacl.1
+index 0c7c046..e092e51 100644
+--- a/man/man1/setfacl.1
++++ b/man/man1/setfacl.1
+@@ -194,18 +194,32 @@ you can specify either a name or a number.
+ .PP
+ The
+ .I perms
+-field is a combination of characters that indicate the permissions: read
++field is a combination of characters that indicate the read
+ .IR (r) ,
+ write
+ .IR (w) ,
+ execute
+-.IR (x) ,
+-execute only if the file is a directory or already has execute permission
+-for some user
+-.IR (X) .
+-Alternatively, the
++.IR (x)
++permissions.  Dash characters in the
+ .I perms
+-field can be an octal digit (0\-7).
++field
++.IR (\-)
++are ignored.  The character
++.I X
++stands for the execute permission if the file is a directory or already has
++execute permission for some user.  Alternatively, the
++.I perms
++field can define the permissions numerically, as a bit-wise combination of read
++.IR (4) ,
++write
++.IR (2) ,
++and execute
++.IR (1) .
++Zero
++.I perms
++fields or
++.I perms
++fields that only consist of dashes indicate no permissions.
+ .PP
+ .SS AUTOMATICALLY CREATED ENTRIES
+ Initially, files and directories contain only the three base ACL entries
+-- 
+2.5.5
+
diff --git a/acl.spec b/acl.spec
index 7ccdf66..dbc60a3 100644
--- a/acl.spec
+++ b/acl.spec
@@ -24,6 +24,9 @@ Patch4: 0004-acl-2.2.52-libdir.patch
 # fix SIGSEGV of getfacl -e on overly long group name
 Patch5: 0005-acl-2.2.52-getfacl-segv.patch
 
+# setfacl.1: document the meaning of '-' in perms (#1337039)
+Patch6: acl-2.2.52-setfacl-man-page.patch
+
 License: GPLv2+
 URL: https://savannah.nongnu.org/projects/acl
 
@@ -125,6 +128,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 
 %changelog
 * Thu May 18 2017 Kamil Dudka <kdudka@redhat.com> 2.2.52-15
+- setfacl.1: document the meaning of '-' in perms (#1337039)
 - avoid failure of %%check when building as root (#1085389)
 - apply patches automatically to ease maintenance