From c955279b8369414c98f89b5d6223573a395c009f Mon Sep 17 00:00:00 2001
From: CentOS Buildsys <bugs@centos.org>
Date: Jan 28 2014 09:16:29 +0000
Subject: import acl-2.2.51-12.el7.src.rpm


---

diff --git a/SOURCES/acl-2.2.51-getfacl-segv.patch b/SOURCES/acl-2.2.51-getfacl-segv.patch
new file mode 100644
index 0000000..8a27dda
--- /dev/null
+++ b/SOURCES/acl-2.2.51-getfacl-segv.patch
@@ -0,0 +1,54 @@
+From fb071c302b8cad8837bc1e57407dc3ffa14d3f99 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Thu, 31 Oct 2013 19:24:35 +0100
+Subject: [PATCH] libacl: fix SIGSEGV of getfacl -e on overly long group name
+
+We simply make sure that at least one tab is used for indentation.
+---
+ libacl/__acl_to_any_text.c |    5 +++++
+ test/root/getfacl.test     |   17 +++++++++++++++++
+ 2 files changed, 22 insertions(+), 0 deletions(-)
+ create mode 100644 test/root/getfacl.test
+
+diff --git a/libacl/__acl_to_any_text.c b/libacl/__acl_to_any_text.c
+index a4f9c34..1d10e81 100644
+--- a/libacl/__acl_to_any_text.c
++++ b/libacl/__acl_to_any_text.c
+@@ -247,6 +247,11 @@ acl_entry_to_any_str(const acl_entry_t entry_d, char *text_p, ssize_t size,
+ 		    options & TEXT_ALL_EFFECTIVE) {
+ 			x = (options & TEXT_SMART_INDENT) ?
+ 				((text_p - orig_text_p)/8) : TABS-1;
++
++			/* use at least one tab for indentation */
++			if (x > (TABS-1))
++				x = (TABS-1);
++
+ 			strncpy(text_p, tabs+x, size);
+ 			ADVANCE(TABS-x);
+ 
+diff --git a/test/root/getfacl.test b/test/root/getfacl.test
+new file mode 100644
+index 0000000..f84e25d
+--- /dev/null
++++ b/test/root/getfacl.test
+@@ -0,0 +1,17 @@
++Make sure that getfacl always adds at least one space between the permissions
++in an acl entry and the effective permissions comment.
++
++	$ umask 022
++	$ mkdir d
++	$ groupadd loooooooooooooooooooooooonggroup
++	$ setfacl -dm group:loooooooooooooooooooooooonggroup:rwx d
++	$ getfacl -cde d
++	> user::rwx
++	> group::r-x	#effective:r-x
++	> group:loooooooooooooooooooooooonggroup:rwx	#effective:rwx
++	> mask::rwx
++	> other::r-x
++	>
++
++	$ groupdel loooooooooooooooooooooooonggroup
++	$ rm -r d
+-- 
+1.7.1
+
diff --git a/SPECS/acl.spec b/SPECS/acl.spec
index e3a8d3e..3eab8d6 100644
--- a/SPECS/acl.spec
+++ b/SPECS/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.51
-Release: 9%{?dist}
+Release: 12%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -17,6 +17,9 @@ Patch4: acl-2.2.49-tests.patch
 # fix typos in setfacl(1) man page (#675451)
 Patch6: acl-2.2.49-bz675451.patch
 
+# fix SIGSEGV of getfacl -e on overly long group name
+Patch7: acl-2.2.51-getfacl-segv.patch
+
 License: GPLv2+
 Group: System Environment/Base
 URL: http://acl.bestbits.at/
@@ -54,6 +57,7 @@ defined in POSIX 1003.1e draft standard 17.
 %patch1 -p1
 %patch4 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 touch .census
@@ -116,6 +120,15 @@ chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libacl.so.*.*.*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Tue Jan 28 2014 Daniel Mach <dmach@redhat.com> - 2.2.51-12
+- Mass rebuild 2014-01-24
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 2.2.51-11
+- Mass rebuild 2013-12-27
+
+* Fri Nov 01 2013 Kamil Dudka <kdudka@redhat.com> 2.2.51-10
+- fix SIGSEGV of getfacl -e on overly long group name (#1025737)
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.51-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild