From e1d5913510082bad8c1464619e86b3441116649d Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Tue, 24 Feb 2009 00:02:45 +0000
Subject: [PATCH 01/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index f30e0fd..0f749eb 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.47
-Release: 3%{?dist}
+Release: 4%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libattr-devel >= 2.4.1
 BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
@@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.47-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Jul 31 2008 Jiri Moskovcak <jmoskovc@redhat.com> 2.2.47-3
 - little improvement to params patch
 - Resolves: #457244

From 45c56c95a8b34e61f4836b40ef5bca567478f627 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Fri, 24 Jul 2009 16:33:47 +0000
Subject: [PATCH 02/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 0f749eb..63ebe6a 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.47
-Release: 4%{?dist}
+Release: 5%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libattr-devel >= 2.4.1
 BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
@@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.47-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.47-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 

From 96784aaa72f6626038500b8b5a32c3dfde257f9a Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Wed, 25 Nov 2009 22:38:21 +0000
Subject: [PATCH 03/96] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index f5bf460..d4a739a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: acl
-# $Id: Makefile,v 1.1 2004/09/09 02:52:01 cvsdist Exp $
+# $Id: Makefile,v 1.2 2007/10/15 18:35:20 notting Exp $
 NAME := acl
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From 2f259437493c4eb46c715de19b74f4edcad64ae7 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@fedoraproject.org>
Date: Sun, 20 Dec 2009 11:26:21 +0000
Subject: [PATCH 04/96] - new upstream bugfix release - big cleanup in patches

---
 .cvsignore                |   2 +-
 acl-2.2.3-multilib.patch  |  14 ++-
 acl-2.2.32-build.patch    |  36 ------
 acl-2.2.39-build.patch    |  20 ++--
 acl-2.2.39-man.patch      |  12 --
 acl-2.2.39-nfsv4.patch    |   2 +
 acl-2.2.39-params.patch   | 121 --------------------
 acl-2.2.39-path_max.patch |  24 ----
 acl-2.2.39-segfault.patch |  11 --
 acl-2.2.39-walk.patch     | 235 --------------------------------------
 acl-2.2.45-exitcode.patch |  27 -----
 acl-2.2.47-params.patch   | 154 -------------------------
 acl.spec                  |  28 ++---
 sources                   |   2 +-
 14 files changed, 36 insertions(+), 652 deletions(-)
 delete mode 100644 acl-2.2.32-build.patch
 delete mode 100644 acl-2.2.39-man.patch
 delete mode 100644 acl-2.2.39-params.patch
 delete mode 100644 acl-2.2.39-path_max.patch
 delete mode 100644 acl-2.2.39-segfault.patch
 delete mode 100644 acl-2.2.39-walk.patch
 delete mode 100644 acl-2.2.45-exitcode.patch
 delete mode 100644 acl-2.2.47-params.patch

diff --git a/.cvsignore b/.cvsignore
index 389b45f..d39a8c3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-acl_2.2.47-1.tar.gz
+acl-2.2.49.src.tar.gz
diff --git a/acl-2.2.3-multilib.patch b/acl-2.2.3-multilib.patch
index 3d33399..2fd9787 100644
--- a/acl-2.2.3-multilib.patch
+++ b/acl-2.2.3-multilib.patch
@@ -1,11 +1,13 @@
---- acl-2.2.3/include/buildmacros.multilib	2003-01-28 19:00:05.000000000 -0500
-+++ acl-2.2.3/include/buildmacros	2003-01-28 19:04:13.000000000 -0500
-@@ -103,8 +103,6 @@
- 	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
+diff --git a/include/buildmacros b/include/buildmacros
+index ab89182..17423c0 100644
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -88,8 +88,6 @@ INSTALL_LTLIB_DEV = \
  	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
  	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
+ 	if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
 -	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
 -	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
- 	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
+ 	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
+ 	fi
  else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
diff --git a/acl-2.2.32-build.patch b/acl-2.2.32-build.patch
deleted file mode 100644
index 09266f5..0000000
--- a/acl-2.2.32-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- acl-2.2.32/include/buildmacros.build	2005-12-06 15:33:03.000000000 +0100
-+++ acl-2.2.32/include/buildmacros	2005-12-06 15:33:06.000000000 +0100
-@@ -54,7 +54,7 @@
- 	  $(LFILES:.l=.o) \
- 	  $(YFILES:%.y=%.tab.o)
- 
--INSTALL	= $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
-+INSTALL	= $(TOPDIR)/install-sh
- 
- SHELL = /bin/sh
- IMAGES_DIR = $(TOPDIR)/all-images
---- acl-2.2.32/include/builddefs.in.build	2005-10-07 18:51:14.000000000 +0200
-+++ acl-2.2.32/include/builddefs.in	2005-12-06 15:34:20.000000000 +0100
-@@ -53,14 +53,14 @@
- PKG_VERSION	= @pkg_version@
- PKG_PLATFORM	= @pkg_platform@
- PKG_DISTRIBUTION= @pkg_distribution@
--PKG_BIN_DIR	= @bindir@
--PKG_SBIN_DIR	= @sbindir@
--PKG_LIB_DIR	= @libdir@
--PKG_DEVLIB_DIR	= @libexecdir@
--PKG_INC_DIR	= @includedir@
--PKG_MAN_DIR	= @mandir@
--PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
--PKG_LOCALE_DIR	= @datadir@/locale
-+PKG_BIN_DIR	= $(DESTDIR)@bindir@
-+PKG_SBIN_DIR	= $(DESTDIR)@sbindir@
-+PKG_LIB_DIR	= $(DESTDIR)@libdir@
-+PKG_DEVLIB_DIR	= $(DESTDIR)@libexecdir@
-+PKG_INC_DIR	= $(DESTDIR)@includedir@
-+PKG_MAN_DIR	= $(DESTDIR)@mandir@
-+PKG_DOC_DIR	= $(DESTDIR)@datadir@/doc/@pkg_name@-@pkg_version@
-+PKG_LOCALE_DIR	= $(DESTDIR)@datadir@/locale
- 
- CC		= @cc@
- AWK		= @awk@
diff --git a/acl-2.2.39-build.patch b/acl-2.2.39-build.patch
index 1605ee3..fbe608a 100644
--- a/acl-2.2.39-build.patch
+++ b/acl-2.2.39-build.patch
@@ -1,6 +1,8 @@
---- acl-2.2.39/include/builddefs.in.build	2006-06-20 02:51:25.000000000 -0400
-+++ acl-2.2.39/include/builddefs.in	2006-07-05 12:34:05.000000000 -0400
-@@ -26,14 +26,14 @@
+diff --git a/include/builddefs.in b/include/builddefs.in
+index d054a56..10b0cd4 100644
+--- a/include/builddefs.in
++++ b/include/builddefs.in
+@@ -28,14 +28,14 @@ PKG_RELEASE	= @pkg_release@
  PKG_VERSION	= @pkg_version@
  PKG_PLATFORM	= @pkg_platform@
  PKG_DISTRIBUTION= @pkg_distribution@
@@ -23,14 +25,16 @@
  
  CC		= @cc@
  AWK		= @awk@
---- acl-2.2.39/include/buildmacros.build	2006-07-05 12:32:07.000000000 -0400
-+++ acl-2.2.39/include/buildmacros	2006-07-05 12:32:07.000000000 -0400
-@@ -26,7 +26,7 @@
+diff --git a/include/buildmacros b/include/buildmacros
+index 17423c0..3118a17 100644
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \
  	  $(LFILES:.l=.o) \
  	  $(YFILES:%.y=%.tab.o)
  
--INSTALL	= $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
-+INSTALL	= $(TOPDIR)/install-sh
+-INSTALL	= $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
++INSTALL	= $(TOPDIR)/include/install-sh
  
  SHELL = /bin/sh
  IMAGES_DIR = $(TOPDIR)/all-images
diff --git a/acl-2.2.39-man.patch b/acl-2.2.39-man.patch
deleted file mode 100644
index 0a6d7db..0000000
--- a/acl-2.2.39-man.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- acl-2.2.39/man/man1/getfacl.1	2007-07-26 15:40:16.000000000 +0200
-+++ acl-2.2.39mzk/man/man1/getfacl.1	2007-07-26 15:42:24.000000000 +0200
-@@ -115,6 +115,9 @@ Use an alternative tabular output format
- Do not strip leading slash characters (`/'). The default behavior is to
- strip leading slash characters.
- .TP
-+.I \-n, \-\-numeric
-+List numeric user and group IDs
-+.TP
- .I \-v, \-\-version
- Print the version of getfacl and exit.
- .TP
diff --git a/acl-2.2.39-nfsv4.patch b/acl-2.2.39-nfsv4.patch
index c6314f5..ee7ae04 100644
--- a/acl-2.2.39-nfsv4.patch
+++ b/acl-2.2.39-nfsv4.patch
@@ -1,3 +1,5 @@
+NOTE: This patch is not being used any more since 2.2.39-8.
+
 --- /dev/null	2007-08-22 11:21:03.626521839 -0400
 +++ acl-2.2.39/libacl/acl_nfs4_get_who.c	2007-08-22 12:02:13.000000000 -0400
 @@ -0,0 +1,103 @@
diff --git a/acl-2.2.39-params.patch b/acl-2.2.39-params.patch
deleted file mode 100644
index cc48fe4..0000000
--- a/acl-2.2.39-params.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -urp acl-2.2.39/getfacl/getfacl.c acl-2.2.39mzk/getfacl/getfacl.c
---- acl-2.2.39/getfacl/getfacl.c	2007-07-25 13:12:13.000000000 +0200
-+++ acl-2.2.39mzk/getfacl/getfacl.c	2007-07-25 12:51:14.000000000 +0200
-@@ -42,7 +42,7 @@
- #define POSIXLY_CORRECT_STR "POSIXLY_CORRECT"
- 
- #if !POSIXLY_CORRECT
--#  define CMD_LINE_OPTIONS "dRLP"
-+#  define CMD_LINE_OPTIONS "aceEsRLPtpndvh"
- #endif
- #define POSIXLY_CMD_LINE_OPTIONS "d"
- 
-@@ -554,18 +554,18 @@ void help(void)
- #if !POSIXLY_CORRECT
- 	} else {
- 		printf(_(
--"      --access            display the file access control list only\n"
-+"  -a,  --access            display the file access control list only\n"
- "  -d, --default           display the default access control list only\n"
--"      --omit-header       do not display the comment header\n"
--"      --all-effective     print all effective rights\n"
--"      --no-effective      print no effective rights\n"
--"      --skip-base         skip files that only have the base entries\n"
-+"  -c, --omit-header       do not display the comment header\n"
-+"  -e, --all-effective     print all effective rights\n"
-+"  -E, --no-effective      print no effective rights\n"
-+"  -s, --skip-base         skip files that only have the base entries\n"
- "  -R, --recursive         recurse into subdirectories\n"
- "  -L, --logical           logical walk, follow symbolic links\n"
--"  -P, --physical          physical walk, do not follow symbolic links\n"
--"      --tabular           use tabular output format\n"
--"      --numeric           print numeric user/group identifiers\n"
--"      --absolute-names    don't strip leading '/' in pathnames\n"));
-+"  -P, --physical          physical walk, do not follow symbolic links\n"
-+"  -t, --tabular           use tabular output format\n"
-+"  -n, --numeric           print numeric user/group identifiers\n"
-+"  -p, --absolute-names    don't strip leading '/' in pathnames\n"));
- 	}
- #endif
- 	printf(_(
-diff -urp acl-2.2.39/man/man1/getfacl.1 acl-2.2.39mzk/man/man1/getfacl.1
---- acl-2.2.39/man/man1/getfacl.1	2006-06-20 08:51:25.000000000 +0200
-+++ acl-2.2.39mzk/man/man1/getfacl.1	2007-07-25 13:17:17.000000000 +0200
-@@ -12,10 +12,10 @@ getfacl \- get file access control lists
- .SH SYNOPSIS
- 
- .B getfacl
--[\-dRLPvh] file ...
-+[\-aceEsRLPrpndvh] file ...
- 
- .B getfacl
--[\-dRLPvh] \-
-+[\-aceEsRLPrpndvh] \-
- 
- .SH DESCRIPTION
- For each file, getfacl displays the file name, owner, the group,
-@@ -78,22 +78,22 @@ accessing the file mode.
- 
- .SS OPTIONS
- .TP 4
--.I \-\-access
-+.I \-a, \-\-access
- Display the file access control list.
- .TP
- .I \-d, \-\-default
- Display the default access control list.
- .TP
--.I \-\-omit-header
-+.I \-c, \-\-omit-header
- Do not display the comment header (the first three lines of each file's output).
- .TP
--.I \-\-all-effective
-+.I \-e, \-\-all-effective
- Print all effective rights comments, even if identical to the rights defined by the ACL entry.
- .TP
--.I \-\-no-effective
-+.I \-E, \-\-no-effective
- Do not print effective rights comments.
- .TP
--.I \-\-skip-base
-+.I \-s, \-\-skip-base
- Skip files that only have the base ACL entries (owner, group, others).
- .TP
- .I \-R, \-\-recursive
-@@ -108,17 +108,17 @@ subdirectories.
- Physical walk, skip all symbolic links. This also skips symbolic link
- arguments.
- .TP
--.I \-\-tabular
-+.I \-t, \-\-tabular
- Use an alternative tabular output format. The ACL and the default ACL are displayed side by side. Permissions that are ineffective due to the ACL mask entry are displayed capitalized. The entry tag names for the ACL_USER_OBJ and ACL_GROUP_OBJ entries are also displayed in capital letters, which helps in spotting those entries.
- .TP
--.I \-\-absolute-names
-+.I \-p, \-\-absolute-names
- Do not strip leading slash characters (`/'). The default behavior is to
- strip leading slash characters.
- .TP
--.I \-\-version
-+.I \-v, \-\-version
- Print the version of getfacl and exit.
- .TP
--.I \-\-help
-+.I \-h, \-\-help
- Print help explaining the command line options.
- .TP
- .I \-\-
-Only in acl-2.2.39/getfacl: getfacl.c.params
-diff -urp acl-2.2.39/man/man1/getfacl.1 acl-2.2.39mzk/man/man1/getfacl.1
---- acl-2.2.39/man/man1/getfacl.1	2007-07-26 15:40:16.000000000 +0200
-+++ acl-2.2.39mzk/man/man1/getfacl.1	2007-07-26 15:42:24.000000000 +0200
-@@ -115,6 +115,9 @@ Use an alternative tabular output format
- Do not strip leading slash characters (`/'). The default behavior is to
- strip leading slash characters.
- .TP
-+.I \-n, \-\-numeric
-+List numeric user and group IDs
-+.TP
- .I \-v, \-\-version
- Print the version of getfacl and exit.
- .TP
-Only in acl-2.2.39/man/man1: getfacl.1.params
diff --git a/acl-2.2.39-path_max.patch b/acl-2.2.39-path_max.patch
deleted file mode 100644
index 42f8524..0000000
--- a/acl-2.2.39-path_max.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- acl-2.2.39/setfacl/parse.c.path_max	2006-06-20 02:51:25.000000000 -0400
-+++ acl-2.2.39/setfacl/parse.c	2006-07-05 15:27:21.000000000 -0400
-@@ -24,6 +24,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
-+#include <limits.h>
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -412,7 +413,12 @@
- 	gid_t *gid_p)
- {
- 	int c;
--	char linebuf[1024];
-+	/*
-+	  Max PATH_MAX bytes even for UTF-8 path names and additional 9 
-+	  bytes for "# file: ".Not a good solution but for now it is the 
-+	  best I can do without too much impact on the code. [tw]
-+	*/
-+	char linebuf[(4*PATH_MAX)+9];
- 	char *cp;
- 	char *p;
- 	int comments_read = 0;
diff --git a/acl-2.2.39-segfault.patch b/acl-2.2.39-segfault.patch
deleted file mode 100644
index a90c37d..0000000
--- a/acl-2.2.39-segfault.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- acl-2.2.45/setfacl/setfacl.c.segfault	2008-01-28 13:56:36.000000000 +0100
-+++ acl-2.2.45/setfacl/setfacl.c	2008-01-28 13:58:08.000000000 +0100
-@@ -679,6 +679,8 @@ int main(int argc, char *argv[])
- 		}
- 	}
- 	while (optind < argc) {
-+		if(!seq)
-+			goto synopsis;
- 		if (seq_empty(seq))
- 			goto synopsis;
- 		saw_files = 1;
diff --git a/acl-2.2.39-walk.patch b/acl-2.2.39-walk.patch
deleted file mode 100644
index 01194f6..0000000
--- a/acl-2.2.39-walk.patch
+++ /dev/null
@@ -1,235 +0,0 @@
---- acl-2.2.39/getfacl/getfacl.c.walk	2006-06-20 08:51:25.000000000 +0200
-+++ acl-2.2.39/getfacl/getfacl.c	2007-03-21 10:52:07.000000000 +0100
-@@ -34,7 +34,6 @@
- #include <dirent.h>
- #include <libgen.h>
- #include <getopt.h>
--#include <ftw.h>
- #include <locale.h>
- #include "config.h"
- #include "user_group.h"
-@@ -70,9 +69,9 @@
- const char *progname;
- const char *cmd_line_options;
- 
--int opt_recursive;  /* recurse into sub-directories? */
--int opt_walk_logical;  /* always follow symbolic links */
--int opt_walk_physical;  /* never follow symbolic links */
-+int opt_recursive = 0;  /* recurse into sub-directories? */
-+int opt_walk_logical = 0;  /* always follow symbolic links */
-+int opt_walk_physical = 0;  /* never follow symbolic links */
- int opt_print_acl = 0;
- int opt_print_default_acl = 0;
- int opt_strip_leading_slash = 1;
-@@ -562,71 +561,140 @@
- 
- 
- static int __errors;
--int __do_print(const char *file, const struct stat *stat,
--               int flag, struct FTW *ftw)
-+
-+int walk_tree(const char *file)
- {
--	int saved_errno = errno;
-+	static int level = 0;
-+	static int link_count = 0;
-+	DIR *dir;
-+	struct dirent *entry;
-+	struct stat buf;
-+	char path[FILENAME_MAX];
-+	char path2[FILENAME_MAX];
-+	char path3[FILENAME_MAX];
-+	char *dir_name;
-+	size_t len;
-+	ssize_t slen;
-+	int res;
- 
- 	/* Process the target of a symbolic link, and traverse the link,
-            only if doing a logical walk, or if the symbolic link was
-            specified on the command line. Always skip symbolic links if
-            doing a physical walk. */
- 
--	if (S_ISLNK(stat->st_mode) &&
--	    (opt_walk_physical || (ftw->level > 0 && !opt_walk_logical)))
-+	len = strlen(file);
-+	/* check for FILENAME_MAX */
-+	if (len >= FILENAME_MAX) {
-+		fprintf(stderr, "%s: %s: %s\n", progname, xquote(file),
-+			strerror(ENAMETOOLONG));
-+		__errors++;
- 		return 0;
-+	}
-+	/* string ends with '/', remove it and restart */
-+	if (len > 1 && file[len-1] == '/') {
-+		strncpy(path, file, len);
-+		path[len-1] = '\0'; /* overwrite slash */
-+		return walk_tree(path);
-+	}
- 
--	if (do_print(file, stat))
--		__errors++;
-+	if (level > 0 && !opt_recursive)
-+		return 0;
- 
--	if (flag == FTW_DNR && opt_recursive) {
--		/* Item is a directory which can't be read. */
--		fprintf(stderr, "%s: %s: %s\n",
--			progname, file, strerror(saved_errno));
-+	if (lstat(file, &buf) != 0) {
-+		fprintf(stderr, "%s: %s: %s\n", progname, xquote(file),
-+			strerror(errno));
-+		__errors++;
- 		return 0;
- 	}
- 
--	/* We also get here in non-recursive mode. In that case,
--	   return something != 0 to abort nftw. */
-+	if (S_ISLNK(buf.st_mode)) {
-+		/* physical means: no links at all */
-+		if (opt_walk_physical)
-+			return 1;
-+
-+		/* logical: show information or walk if points to directory
-+		 * also for symbolic link arguments on level 0 */
-+		if (opt_walk_logical || level == 0) {
-+			/* copy and append terminating '\0' */
-+			strncpy(path2, file, len+1);
-+
-+			/* get directory name */
-+			dir_name = dirname(path2);
-+
-+			/* get link target */
-+			slen = readlink(file, path, FILENAME_MAX-1);
-+			if (slen < 0) {
-+				fprintf(stderr, "%s: %s: %s\n", progname,
-+					xquote(file), strerror(errno));
-+				__errors++;
-+				return 0;
-+			}
-+			path[slen] = '\0';
- 
--	if (!opt_recursive)
--		return 1;
-+			if (slen == 0 || path[0] == '/') {
-+				/* absolute:
-+				 * copy and append terminating '\0' */
-+				strncpy(path3, path, slen+1);
-+			} else
-+				/* relative */
-+				snprintf(path3, FILENAME_MAX, "%s/%s",
-+					 dir_name, path);
-+			
-+			if (lstat(path3, &buf) != 0) {
-+				fprintf(stderr, "%s: %s: %s\n", progname,
-+					xquote(path), strerror(errno));
-+				__errors++;
-+				return 0;
-+			}
- 
--	return 0;
--}
-+			if ((S_ISDIR(buf.st_mode) && opt_recursive && 
-+			     link_count < 1) || S_ISLNK(buf.st_mode)) {
-+				/* walk directory or follow symlink on level
-+				 * 0 */
-+				link_count++;
-+				res = walk_tree(path3);
-+				link_count--;
-+				if (res != 1)
-+					return 0;
-+			} else
-+				if (do_print(path3, &buf))
-+					__errors++;
- 
--char *resolve_symlinks(const char *file)
--{
--	static char buffer[4096];
--	char *path = NULL;
--	ssize_t len;
--
--	len = readlink(file, buffer, sizeof(buffer)-1);
--	if (len < 0) {
--		if (errno == EINVAL)	/* not a symlink, use given path */
--			path = (char *)file;
--	} else {
--		buffer[len+1] = '\0';
--		path = buffer;
-+			return 1;
-+		}
- 	}
--	return path;
--}
--
--int walk_tree(const char *file)
--{
--	const char *p;
- 
--	__errors = 0;
--	if ((p = resolve_symlinks(file)) == NULL) {
--		fprintf(stderr, "%s: %s: %s\n", progname,
--			xquote(file), strerror(errno));
--		__errors++;
--	} else if (nftw(p, __do_print, 0, opt_walk_logical? 0 : FTW_PHYS) < 0) {
--		fprintf(stderr, "%s: %s: %s\n", progname, xquote(file),
--			strerror(errno));
-+	if (do_print(file, &buf))
- 		__errors++;
-+
-+	/* it is a directory, walk */
-+	if (S_ISDIR(buf.st_mode)) {
-+		dir = opendir(file);
-+		if (!dir) {
-+			fprintf(stderr, "%s: %s: %s\n", progname,
-+				xquote(file), strerror(errno));
-+			__errors++;
-+			return 0;
-+		}
-+
-+		level++;
-+		while ((entry = readdir(dir)) != NULL) {
-+			if (! strcmp(entry->d_name, ".") || 
-+			    ! strcmp(entry->d_name, ".."))
-+				continue;
-+
-+			snprintf(path, FILENAME_MAX, "%s/%s", file,
-+				 entry->d_name);
-+
-+			/* ignore result, walk every entry */
-+			res = walk_tree(path);
-+		}
-+		level--;
-+
-+		closedir(dir);
- 	}
--	return __errors;
-+
-+	return 1;
- }
- 
- int main(int argc, char *argv[])
-@@ -762,15 +830,22 @@
- 				if (*line == '\0')
- 					continue;
- 
--				had_errors += walk_tree(line);
-+				/* ignore result of walk_tree, use __errors */
-+				__errors = 0;
-+				walk_tree(line);
-+				had_errors += __errors;
- 			}
- 			if (!feof(stdin)) {
- 				fprintf(stderr, _("%s: Standard input: %s\n"),
- 				        progname, strerror(errno));
- 				had_errors++;
- 			}
--		} else
--			had_errors += walk_tree(argv[optind]);
-+		} else {
-+			/* ignore result of walk_tree, use __errors */
-+			__errors = 0;
-+			walk_tree(argv[optind]);
-+			had_errors += __errors;
-+		}
- 		optind++;
- 	} while (optind < argc);
- 
diff --git a/acl-2.2.45-exitcode.patch b/acl-2.2.45-exitcode.patch
deleted file mode 100644
index 0ba27b0..0000000
--- a/acl-2.2.45-exitcode.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- acl-2.2.45/setfacl/setfacl.c.old	2007-11-08 14:04:42.000000000 +0100
-+++ acl-2.2.45/setfacl/setfacl.c	2007-11-08 14:05:43.000000000 +0100
-@@ -144,7 +144,7 @@ restore(
- 		if (error < 0)
- 			goto fail;
- 		if (error == 0)
--			return 0;
-+			return status;
- 
- 		if (path_p == NULL) {
- 			if (filename) {
-@@ -158,6 +158,7 @@ restore(
- 						 "aborting\n"),
- 					progname, backup_line);
- 			}
-+			status = 1;
- 			goto getout;
- 		}
- 
-@@ -176,6 +177,7 @@ restore(
- 			fprintf(stderr, _("%s: %s: %s in line %d\n"),
- 			        progname, xquote(filename), strerror(errno),
- 				line);
-+			status = 1;
- 			goto getout;
- 		}
- 
diff --git a/acl-2.2.47-params.patch b/acl-2.2.47-params.patch
deleted file mode 100644
index 13ead33..0000000
--- a/acl-2.2.47-params.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- acl-2.2.47_old/getfacl/getfacl.c	2008-02-07 04:39:57.000000000 +0100
-+++ acl-2.2.47/getfacl/getfacl.c	2008-07-31 12:23:10.000000000 +0200
-@@ -43,7 +43,7 @@
- #define POSIXLY_CORRECT_STR "POSIXLY_CORRECT"
- 
- #if !POSIXLY_CORRECT
--#  define CMD_LINE_OPTIONS "dRLP"
-+#  define CMD_LINE_OPTIONS "aceEsRLPtpndvh"
- #endif
- #define POSIXLY_CMD_LINE_OPTIONS "d"
- 
-@@ -555,23 +555,23 @@ void help(void)
- #if !POSIXLY_CORRECT
- 	} else {
- 		printf(_(
--"      --access            display the file access control list only\n"
-+"  -a,  --access           display the file access control list only\n"
- "  -d, --default           display the default access control list only\n"
--"      --omit-header       do not display the comment header\n"
--"      --all-effective     print all effective rights\n"
--"      --no-effective      print no effective rights\n"
--"      --skip-base         skip files that only have the base entries\n"
-+"  -c, --omit-header       do not display the comment header\n"
-+"  -e, --all-effective     print all effective rights\n"
-+"  -E, --no-effective      print no effective rights\n"
-+"  -s, --skip-base         skip files that only have the base entries\n"
- "  -R, --recursive         recurse into subdirectories\n"
- "  -L, --logical           logical walk, follow symbolic links\n"
- "  -P, --physical          physical walk, do not follow symbolic links\n"
--"      --tabular           use tabular output format\n"
--"      --numeric           print numeric user/group identifiers\n"
--"      --absolute-names    don't strip leading '/' in pathnames\n"));
-+"  -t, --tabular           use tabular output format\n"
-+"  -n, --numeric           print numeric user/group identifiers\n"
-+"  -p, --absolute-names    don't strip leading '/' in pathnames\n"));
- 	}
- #endif
- 	printf(_(
--"      --version           print version and exit\n"
--"      --help              this help text\n"));
-+"  -v, --version           print version and exit\n"
-+"  -h, --help              this help text\n"));
- }
- 
- int main(int argc, char *argv[])
---- acl-2.2.47_old/man/man1/getfacl.1	2008-02-07 04:39:57.000000000 +0100
-+++ acl-2.2.47/man/man1/getfacl.1	2008-07-31 11:23:45.000000000 +0200
-@@ -12,10 +12,10 @@ getfacl \- get file access control lists
- .SH SYNOPSIS
- 
- .B getfacl
--[\-dRLPvh] file ...
-+[\-aceEsRLPrpndvh] file ...
- 
- .B getfacl
--[\-dRLPvh] \-
-+[\-aceEsRLPrpndvh] \-
- 
- .SH DESCRIPTION
- For each file, getfacl displays the file name, owner, the group,
-@@ -78,22 +78,22 @@ accessing the file mode.
- 
- .SS OPTIONS
- .TP 4
--.I \-\-access
-+.I \-a, \-\-access
- Display the file access control list.
- .TP
- .I \-d, \-\-default
- Display the default access control list.
- .TP
--.I \-\-omit-header
-+.I \-c, \-\-omit-header
- Do not display the comment header (the first three lines of each file's output).
- .TP
--.I \-\-all-effective
-+.I \-e, \-\-all-effective
- Print all effective rights comments, even if identical to the rights defined by the ACL entry.
- .TP
--.I \-\-no-effective
-+.I \-E, \-\-no-effective
- Do not print effective rights comments.
- .TP
--.I \-\-skip-base
-+.I \-s, \-\-skip-base
- Skip files that only have the base ACL entries (owner, group, others).
- .TP
- .I \-R, \-\-recursive
-@@ -109,17 +109,20 @@ Physical walk, do not follow symbolic li
- link arguments.
- Only effective in combination with \-R.
- .TP
--.I \-\-tabular
-+.I \-t, \-\-tabular
- Use an alternative tabular output format. The ACL and the default ACL are displayed side by side. Permissions that are ineffective due to the ACL mask entry are displayed capitalized. The entry tag names for the ACL_USER_OBJ and ACL_GROUP_OBJ entries are also displayed in capital letters, which helps in spotting those entries.
- .TP
--.I \-\-absolute-names
-+.I \-p, \-\-absolute-names
- Do not strip leading slash characters (`/'). The default behavior is to
- strip leading slash characters.
- .TP
--.I \-\-version
-+.I \-n, \-\-numeric
-+List numeric user and group IDs
-+.TP
-+.I \-v, \-\-version
- Print the version of getfacl and exit.
- .TP
--.I \-\-help
-+.I \-h, \-\-help
- Print help explaining the command line options.
- .TP
- .I \-\-
---- acl-2.2.47_old/man/man1/setfacl.1	2008-02-07 04:39:57.000000000 +0100
-+++ acl-2.2.47/man/man1/setfacl.1	2008-07-31 13:53:29.000000000 +0200
-@@ -115,10 +115,10 @@ This also skips symbolic link arguments.
- Only effective in combination with \-R.
- This option cannot be mixed with `\-\-restore'.
- .TP 4
--.I \-\-version
-+.I \-v, \-\-version
- Print the version of setfacl and exit.
- .TP 4
--.I \-\-help
-+.I \-h, \-\-help
- Print help explaining the command line options.
- .TP 4
- .I \-\-
---- acl-2.2.47_old/setfacl/setfacl.c	2008-07-31 11:23:18.000000000 +0200
-+++ acl-2.2.47/setfacl/setfacl.c	2008-07-31 12:23:13.000000000 +0200
-@@ -42,10 +42,10 @@ extern int do_set(const char *path_p, co
- 
- /* '-' stands for `process non-option arguments in loop' */
- #if !POSIXLY_CORRECT
--#  define CMD_LINE_OPTIONS "-:bkndm:M:x:X:RLP"
-+#  define CMD_LINE_OPTIONS "-:bkndvhm:M:x:X:RLP"
- #  define CMD_LINE_SPEC "[-bkndRLP] { -m|-M|-x|-X ... } file ..."
- #endif
--#define POSIXLY_CMD_LINE_OPTIONS "-:bkndm:M:x:X:"
-+#define POSIXLY_CMD_LINE_OPTIONS "-:bkndvhm:M:x:X:"
- #define POSIXLY_CMD_LINE_SPEC "[-bknd] {-m|-M|-x|-X ... } file ..."
- 
- struct option long_options[] = {
-@@ -265,8 +265,8 @@ void help(void)
- 	}
- #endif
- 	printf(_(
--"      --version           print version and exit\n"
--"      --help              this help text\n"));
-+"  -v, --version           print version and exit\n"
-+"  -h, --help              this help text\n"));
- }
- 
- 
\ No newline at end of file
diff --git a/acl.spec b/acl.spec
index 63ebe6a..a82849e 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,17 +1,13 @@
 Summary: Access control list utilities
 Name: acl
-Version: 2.2.47
-Release: 5%{?dist}
+Version: 2.2.49
+Release: 1%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libattr-devel >= 2.4.1
 BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
-Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_%{version}-1.tar.gz
+Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.src.tar.gz
 Patch0: acl-2.2.3-multilib.patch
 Patch1: acl-2.2.39-build.patch
-Patch2: acl-2.2.39-path_max.patch
-Patch3: acl-2.2.47-params.patch
-Patch4: acl-2.2.45-exitcode.patch
-Patch5: acl-2.2.39-segfault.patch
 License: GPLv2+
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -46,12 +42,8 @@ defined in POSIX 1003.1e draft standard 17.
 
 %prep
 %setup -q
-%patch0 -p1 -b .multilib
-%patch1 -p1 -b .build
-%patch2 -p1 -b .path_max
-%patch3 -p1 -b .params
-%patch4 -p1 -b .exitcode
-%patch5 -p1 -b .segfault
+%patch0 -p1
+%patch1 -p1
 autoconf
 
 %build
@@ -84,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun -n libacl -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/chacl
 %{_bindir}/getfacl
 %{_bindir}/setfacl
@@ -95,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/acl.5*
 
 %files -n libacl-devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 /%{_lib}/libacl.so
 %{_includedir}/acl
 %{_includedir}/sys/acl.h
@@ -103,10 +95,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/acl_*
 
 %files -n libacl
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 /%{_lib}/libacl.so.*
 
 %changelog
+* Sun Dec 20 2009 Kamil Dudka <kdudka@redhat.com> 2.2.49-1
+- new upstream bugfix release
+- big cleanup in patches
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.47-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 4903c9d..71c84af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a11e4571a54a0b1ae83010d1e68a64c2  acl_2.2.47-1.tar.gz
+181445894cca986da9ae0099d5ce2d08  acl-2.2.49.src.tar.gz

From 2354d23ec1f54e4ef5acdaf350103a858fff59ec Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@fedoraproject.org>
Date: Sat, 26 Dec 2009 20:06:52 +0000
Subject: [PATCH 05/96] - tweaked setfacl tree walk flags (#488674)

---
 acl-2.2.49-setfacl-walk.patch | 30 ++++++++++++++++++++++++++++++
 acl.spec                      |  7 ++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 acl-2.2.49-setfacl-walk.patch

diff --git a/acl-2.2.49-setfacl-walk.patch b/acl-2.2.49-setfacl-walk.patch
new file mode 100644
index 0000000..d797fb0
--- /dev/null
+++ b/acl-2.2.49-setfacl-walk.patch
@@ -0,0 +1,30 @@
+diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c
+index 091b9cc..be34e69 100644
+--- a/setfacl/setfacl.c
++++ b/setfacl/setfacl.c
+@@ -76,7 +76,7 @@ struct option long_options[] = {
+ const char *progname;
+ const char *cmd_line_options, *cmd_line_spec;
+ 
+-int walk_flags = WALK_TREE_DEREFERENCE;
++int walk_flags = WALK_TREE_DEREFERENCE_TOPLEVEL;
+ int opt_recalculate;  /* recalculate mask entry (0=default, 1=yes, -1=no) */
+ int opt_promote;  /* promote access ACL to default ACL */
+ int opt_test;  /* do not write to the file system.
+@@ -580,13 +580,14 @@ int main(int argc, char *argv[])
+ 				break;
+ 
+ 			case 'L':  /* follow symlinks */
+-				walk_flags |= WALK_TREE_LOGICAL;
++				walk_flags |= WALK_TREE_LOGICAL | WALK_TREE_DEREFERENCE;
+ 				walk_flags &= ~WALK_TREE_PHYSICAL;
+ 				break;
+ 
+ 			case 'P':  /* do not follow symlinks */
+ 				walk_flags |= WALK_TREE_PHYSICAL;
+-				walk_flags &= ~WALK_TREE_LOGICAL;
++				walk_flags &= ~(WALK_TREE_LOGICAL | WALK_TREE_DEREFERENCE |
++						WALK_TREE_DEREFERENCE_TOPLEVEL);
+ 				break;
+ 
+ 			case 't':  /* test mode */
diff --git a/acl.spec b/acl.spec
index a82849e..58972d2 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,13 +1,14 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.49
-Release: 1%{?dist}
+Release: 2%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libattr-devel >= 2.4.1
 BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
 Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.src.tar.gz
 Patch0: acl-2.2.3-multilib.patch
 Patch1: acl-2.2.39-build.patch
+Patch2: acl-2.2.49-setfacl-walk.patch
 License: GPLv2+
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -44,6 +45,7 @@ defined in POSIX 1003.1e draft standard 17.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 autoconf
 
 %build
@@ -99,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Sat Dec 26 2009 Kamil Dudka <kdudka@redhat.com> 2.2.49-2
+- tweaked setfacl tree walk flags (#488674), thanks to Markus Steinborn
+
 * Sun Dec 20 2009 Kamil Dudka <kdudka@redhat.com> 2.2.49-1
 - new upstream bugfix release
 - big cleanup in patches

From b4fdf526022820d4b97ead49bc97b9469c62cee2 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@fedoraproject.org>
Date: Tue, 5 Jan 2010 13:12:27 +0000
Subject: [PATCH 06/96] - upstream patch for setfacl --restore SUID/SGID bits
 handling (#467936)

---
 acl-2.2.49-bz467936.patch | 90 +++++++++++++++++++++++++++++++++++++++
 acl.spec                  |  7 ++-
 2 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 acl-2.2.49-bz467936.patch

diff --git a/acl-2.2.49-bz467936.patch b/acl-2.2.49-bz467936.patch
new file mode 100644
index 0000000..a07b4fd
--- /dev/null
+++ b/acl-2.2.49-bz467936.patch
@@ -0,0 +1,90 @@
+From 16230023e5afcb0b42b8d01207e3449d22772c31 Mon Sep 17 00:00:00 2001
+From: Brandon Philips <brandon@ifup.org>
+Date: Thu, 17 Dec 2009 14:28:04 -0800
+Subject: [PATCH] setfacl: changing owner and when S_ISUID should be set --restore fix
+
+Fix a problem in setfacl --restore when the owner or group is changed
+and the S_ISUID and S_ISGID are to be set.
+
+The root of the problem is that chown() can clear the S_ISUID and
+S_ISGID bits as described in chown(2):
+
+ When  the  owner  or  group of an executable file are changed by a
+ non- superuser, the S_ISUID and S_ISGID mode bits are cleared.   POSIX
+ does not specify whether this also should happen when root does the
+ chown(); the Linux behavior depends on the kernel version.  In case  of
+ a  non- group-executable  file (i.e., one for which the S_IXGRP bit is
+ not set) the S_ISGID bit indicates mandatory locking, and is not
+ cleared  by  a chown().
+
+To fix the issue re-stat() the file after chown() so that the logic
+surrounding the chmod() has the updated mode of the file.
+
+Signed-off-by: Brandon Philips <bphilips@suse.de>
+---
+ setfacl/setfacl.c      |    8 +++++++-
+ test/root/restore.test |   23 +++++++++++++++++++++++
+ 2 files changed, 30 insertions(+), 1 deletions(-)
+ create mode 100644 test/root/restore.test
+
+diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c
+index 091b9cc..56b0aa4 100644
+--- a/setfacl/setfacl.c
++++ b/setfacl/setfacl.c
+@@ -128,6 +128,7 @@ restore(
+ 	struct do_set_args args;
+ 	int line = 0, backup_line;
+ 	int error, status = 0;
++	int chmod_required = 0;
+ 
+ 	memset(&st, 0, sizeof(st));
+ 
+@@ -206,10 +207,15 @@ restore(
+ 					strerror(errno));
+ 				status = 1;
+ 			}
++
++			/* chown() clears setuid/setgid so force a chmod if
++			 * S_ISUID/S_ISGID was expected */
++			if ((st.st_mode & flags) & (S_ISUID | S_ISGID))
++				chmod_required = 1;
+ 		}
+ 
+ 		mask = S_ISUID | S_ISGID | S_ISVTX;
+-		if ((st.st_mode & mask) != (flags & mask)) {
++		if (chmod_required || ((st.st_mode & mask) != (flags & mask))) {
+ 			if (!args.mode)
+ 				args.mode = st.st_mode;
+ 			args.mode &= (S_IRWXU | S_IRWXG | S_IRWXO);
+diff --git a/test/root/restore.test b/test/root/restore.test
+new file mode 100644
+index 0000000..6003cd4
+--- /dev/null
++++ b/test/root/restore.test
+@@ -0,0 +1,23 @@
++Ensure setuid bit is restored when the owner changes
++ https://bugzilla.redhat.com/show_bug.cgi?id=467936#c7
++
++	$ touch passwd
++	$ chmod 755 passwd
++	$ chmod u+s passwd
++	$ getfacl passwd > passwd.acl
++	$ cat passwd.acl
++	> # file: passwd
++	> # owner: root
++	> # group: root
++	> # flags: s--
++	> user::rwx
++	> group::r-x
++	> other::r-x
++	>
++	$ chown bin passwd
++	$ chmod u+s passwd
++	$ setfacl --restore passwd.acl
++	$ ls -dl passwd | awk '{print $1 " " $3 " " $4}'
++	> -rwsr-xr-x root root
++
++	$ rm passwd passwd.acl
+-- 
+1.6.2.5
+
diff --git a/acl.spec b/acl.spec
index 58972d2..3bc8778 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.49
-Release: 2%{?dist}
+Release: 3%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libattr-devel >= 2.4.1
 BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
@@ -9,6 +9,7 @@ Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.
 Patch0: acl-2.2.3-multilib.patch
 Patch1: acl-2.2.39-build.patch
 Patch2: acl-2.2.49-setfacl-walk.patch
+Patch3: acl-2.2.49-bz467936.patch
 License: GPLv2+
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -46,6 +47,7 @@ defined in POSIX 1003.1e draft standard 17.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 autoconf
 
 %build
@@ -101,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Tue Jan 05 2010 Kamil Dudka <kdudka@redhat.com> 2.2.49-3
+- upstream patch for setfacl --restore SUID/SGID bits handling (#467936)
+
 * Sat Dec 26 2009 Kamil Dudka <kdudka@redhat.com> 2.2.49-2
 - tweaked setfacl tree walk flags (#488674), thanks to Markus Steinborn
 

From 72bd40792bf54cb31a3c7ef730fe4b4ad5d73f9b Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@fedoraproject.org>
Date: Tue, 19 Jan 2010 15:44:59 +0000
Subject: [PATCH 07/96] - do not package a static library (#556036) - remove
 multilib patch no longer useful - cleanup in BuildRequires

---
 acl-2.2.3-multilib.patch | 13 -------------
 acl.spec                 | 29 ++++++++++++++++++-----------
 2 files changed, 18 insertions(+), 24 deletions(-)
 delete mode 100644 acl-2.2.3-multilib.patch

diff --git a/acl-2.2.3-multilib.patch b/acl-2.2.3-multilib.patch
deleted file mode 100644
index 2fd9787..0000000
--- a/acl-2.2.3-multilib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/include/buildmacros b/include/buildmacros
-index ab89182..17423c0 100644
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -88,8 +88,6 @@ INSTALL_LTLIB_DEV = \
- 	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
- 	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
- 	if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
--	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
--	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
- 	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
- 	fi
- else
diff --git a/acl.spec b/acl.spec
index 3bc8778..418984a 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,12 +1,13 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.49
-Release: 3%{?dist}
+Release: 4%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libattr-devel >= 2.4.1
-BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
+BuildRequires: gawk
+BuildRequires: gettext
+BuildRequires: libattr-devel
+BuildRequires: libtool
 Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.src.tar.gz
-Patch0: acl-2.2.3-multilib.patch
 Patch1: acl-2.2.39-build.patch
 Patch2: acl-2.2.49-setfacl-walk.patch
 Patch3: acl-2.2.49-bz467936.patch
@@ -44,17 +45,15 @@ defined in POSIX 1003.1e draft standard 17.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-autoconf
 
 %build
 touch .census
 # acl abuses libexecdir
 %configure --libdir=/%{_lib} --libexecdir=%{_libdir}
-make LIBTOOL="libtool --tag=CC"%{?_smp_mflags}
+make %{?_smp_mflags} LIBTOOL="libtool --tag=CC"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -62,11 +61,14 @@ make install DESTDIR=$RPM_BUILD_ROOT
 make install-dev DESTDIR=$RPM_BUILD_ROOT
 make install-lib DESTDIR=$RPM_BUILD_ROOT
 
-# get rid of libacl.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libacl.la
+# get rid of libacl.a and libacl.la
+rm -f $RPM_BUILD_ROOT/%{_lib}/libacl.a
+rm -f $RPM_BUILD_ROOT/%{_lib}/libacl.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.la
 
 # fix links to shared libs and permissions
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libacl.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.so
 ln -sf ../../%{_lib}/libacl.so $RPM_BUILD_ROOT/%{_libdir}/libacl.so
 chmod 0755 $RPM_BUILD_ROOT/%{_lib}/libacl.so.*.*.*
 
@@ -93,9 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libacl-devel
 %defattr(-,root,root,-)
 /%{_lib}/libacl.so
+%{_libdir}/libacl.so
 %{_includedir}/acl
 %{_includedir}/sys/acl.h
-%{_libdir}/libacl.*
 %{_mandir}/man3/acl_*
 
 %files -n libacl
@@ -103,6 +105,11 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Tue Jan 19 2010 Kamil Dudka <kdudka@redhat.com> 2.2.49-4
+- do not package a static library (#556036)
+- remove multilib patch no longer useful
+- cleanup in BuildRequires
+
 * Tue Jan 05 2010 Kamil Dudka <kdudka@redhat.com> 2.2.49-3
 - upstream patch for setfacl --restore SUID/SGID bits handling (#467936)
 

From 65a8c0260d2e60016e3992bd675635cb6d9c56d3 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@fedoraproject.org>
Date: Wed, 10 Mar 2010 14:10:14 +0000
Subject: [PATCH 08/96] - run the test-suite if possible

---
 acl-2.2.49-tests.patch | 136 +++++++++++++++++++++++++++++++++++++++++
 acl.spec               |  25 +++++++-
 2 files changed, 160 insertions(+), 1 deletion(-)
 create mode 100644 acl-2.2.49-tests.patch

diff --git a/acl-2.2.49-tests.patch b/acl-2.2.49-tests.patch
new file mode 100644
index 0000000..d48b998
--- /dev/null
+++ b/acl-2.2.49-tests.patch
@@ -0,0 +1,136 @@
+diff --git a/test/cp.test b/test/cp.test
+index a888c04..4a75ffd 100644
+--- a/test/cp.test
++++ b/test/cp.test
+@@ -9,7 +9,7 @@ The cp utility should only copy ACLs if `-p' is given.
+ 	> -rw-rw-r--+
+ 	
+ 	$ cp f g
+-	$ ls -l g | awk -- '{ print $1 }'
++	$ ls -l g | awk -- '{ print $1 }' | sed 's/\\.$//'
+ 	> -rw-r--r--
+ 	
+ 	$ rm g
+diff --git a/test/getfacl-recursive.test b/test/getfacl-recursive.test
+index b88c211..a72192e 100644
+--- a/test/getfacl-recursive.test
++++ b/test/getfacl-recursive.test
+@@ -1,5 +1,6 @@
+ Tests for proper path recursion
+ 
++	$ umask 022
+ 	$ mkdir -p 1/2/3
+ 	$ mkdir 1/link
+ 	$ touch 1/link/file
+diff --git a/test/misc.test b/test/misc.test
+index 7c62c64..e6140da 100644
+--- a/test/misc.test
++++ b/test/misc.test
+@@ -253,7 +253,7 @@ Add some users and groups
+ Symlink in directory with default ACL?
+ 	 
+ 	$ ln -s d d/l
+-	$ ls -dl d/l | awk '{print $1}'
++	$ ls -dl d/l | awk '{print $1}' | sed 's/\\.$//'
+ 	> lrwxrwxrwx
+ 
+ 	$ ls -dl -L d/l | awk '{print $1}'
+@@ -342,7 +342,7 @@ Remove the default ACL
+ Reset to base entries
+ 	 
+ 	$ setfacl -b d
+-	$ ls -dl d | awk '{print $1}'
++	$ ls -dl d | awk '{print $1}' | sed 's/\\.$//'
+ 	> drwxr-x---
+ 
+ 	$ getfacl --omit-header d
+@@ -354,7 +354,7 @@ Reset to base entries
+ Now, chmod should change the group_obj entry
+ 	 
+ 	$ chmod 775 d
+-	$ ls -dl d | awk '{print $1}'
++	$ ls -dl d | awk '{print $1}' | sed 's/\\.$//'
+ 	> drwxrwxr-x
+ 	
+ 	$ getfacl --omit-header d
+diff --git a/test/root/permissions.test b/test/root/permissions.test
+index afaf5f0..4880bd2 100644
+--- a/test/root/permissions.test
++++ b/test/root/permissions.test
+@@ -20,7 +20,7 @@ defined permissions.
+ 	$ cd d
+ 	$ umask 027
+ 	$ touch f
+-	$ ls -l f | awk -- '{ print $1, $3, $4 }'
++	$ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/'
+ 	> -rw-r----- root root
+ 
+ 
+@@ -40,7 +40,7 @@ Now, change the ownership of the file to bin:bin and verify that this
+ gives user bin write access.
+ 
+ 	$ chown bin:bin f
+-	$ ls -l f | awk -- '{ print $1, $3, $4 }'
++	$ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/'
+ 	> -rw-r----- bin bin
+ 	$ su bin
+ 	$ echo bin >> f
+@@ -257,12 +257,12 @@ directories if the file has an ACL and only CAP_FOWNER would grant them.
+ 	$ mkdir -m 600 x
+ 	$ chown daemon:daemon x
+ 	$ echo j > x/j
+-	$ ls -l x/j | awk -- '{ print $1, $3, $4 }'
++	$ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/'
+ 	> -rw-r----- root root
+ 
+ 	$ setfacl -m u:daemon:r x
+ 
+-	$ ls -l x/j | awk -- '{ print $1, $3, $4 }'
++	$ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/'
+ 	> -rw-r----- root root
+ 	(With the bug this gives: `ls: x/j: Permission denied'.)
+ 
+diff --git a/test/root/restore.test b/test/root/restore.test
+index 6003cd4..5dbf73c 100644
+--- a/test/root/restore.test
++++ b/test/root/restore.test
+@@ -17,7 +17,7 @@ Ensure setuid bit is restored when the owner changes
+ 	$ chown bin passwd
+ 	$ chmod u+s passwd
+ 	$ setfacl --restore passwd.acl
+-	$ ls -dl passwd | awk '{print $1 " " $3 " " $4}'
++	$ ls -dl passwd | awk '{print $1 " " $3 " " $4}' | sed 's/\\. root/ root/'
+ 	> -rwsr-xr-x root root
+ 
+ 	$ rm passwd passwd.acl
+diff --git a/test/root/setfacl.test b/test/root/setfacl.test
+index 630e9fb..dd7fe08 100644
+--- a/test/root/setfacl.test
++++ b/test/root/setfacl.test
+@@ -8,7 +8,7 @@ Setfacl utility tests. Run these tests on a filesystem with ACL support.
+ 	$ sg bin
+ 	$ umask 027
+ 	$ touch g
+-	$ ls -dl g | awk '{print $1}'
++	$ ls -dl g | awk '{print $1}' | sed 's/\\.$//'
+ 	> -rw-r-----
+ 
+ 	$ setfacl -m m:- g
+diff --git a/test/sbits-restore.test b/test/sbits-restore.test
+index e5e4fb2..abdb58a 100644
+--- a/test/sbits-restore.test
++++ b/test/sbits-restore.test
+@@ -13,10 +13,10 @@ Ensure setting of SUID/SGID/sticky via --restore works
+ 	$ touch d/g
+ 	$ touch d/u
+ 	$ setfacl --restore d.acl
+-	$ ls -dl d | awk '{print $1}'
++	$ ls -dl d | awk '{print $1}' | sed 's/\\.$//'
+ 	> drwxr-xr-t
+-	$ ls -dl d/u | awk '{print $1}'
++	$ ls -dl d/u | awk '{print $1}' | sed 's/\\.$//'
+ 	> -rwSr--r--
+-	$ ls -dl d/g | awk '{print $1}'
++	$ ls -dl d/g | awk '{print $1}' | sed 's/\\.$//'
+ 	> -rw-r-Sr--
+ 	$ rm -Rf d
diff --git a/acl.spec b/acl.spec
index 418984a..56f60cf 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.49
-Release: 4%{?dist}
+Release: 5%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -9,8 +9,16 @@ BuildRequires: libattr-devel
 BuildRequires: libtool
 Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.src.tar.gz
 Patch1: acl-2.2.39-build.patch
+
+# bz #488674
 Patch2: acl-2.2.49-setfacl-walk.patch
+
+# bz #467936
 Patch3: acl-2.2.49-bz467936.patch
+
+# prepare the test-suite for SELinux and arbitrary umask
+Patch4: acl-2.2.49-tests.patch
+
 License: GPLv2+
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -48,6 +56,7 @@ defined in POSIX 1003.1e draft standard 17.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 touch .census
@@ -55,6 +64,17 @@ touch .census
 %configure --libdir=/%{_lib} --libexecdir=%{_libdir}
 make %{?_smp_mflags} LIBTOOL="libtool --tag=CC"
 
+%check
+if ./setfacl/setfacl -m u:`id -u`:rwx .; then
+    make tests || exit $?
+    if test 0 = `id -u`; then
+        make root-tests || exit $?
+    fi
+else
+    echo '*** ACLs are probably not supported by the file system,' \
+         'the test-suite will NOT run ***'
+fi
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -105,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Wed Mar 10 2010 Kamil Dudka <kdudka@redhat.com> 2.2.49-5
+- run the test-suite if possible
+
 * Tue Jan 19 2010 Kamil Dudka <kdudka@redhat.com> 2.2.49-4
 - do not package a static library (#556036)
 - remove multilib patch no longer useful

From f6b390280abba1875627b2b060fce99d8aef83c8 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@fedoraproject.org>
Date: Wed, 24 Mar 2010 16:47:34 +0000
Subject: [PATCH 09/96] - prevent setfacl --restore from SIGSEGV on malformed
 restore file     (#576550)

---
 acl-2.2.49-setfacl-restore.patch | 27 +++++++++++++++++++++++++++
 acl.spec                         | 14 +++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 acl-2.2.49-setfacl-restore.patch

diff --git a/acl-2.2.49-setfacl-restore.patch b/acl-2.2.49-setfacl-restore.patch
new file mode 100644
index 0000000..8490091
--- /dev/null
+++ b/acl-2.2.49-setfacl-restore.patch
@@ -0,0 +1,27 @@
+diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c
+index 7142af0..23784a7 100644
+--- a/setfacl/setfacl.c
++++ b/setfacl/setfacl.c
+@@ -125,7 +125,7 @@ restore(
+ 	uid_t uid;
+ 	gid_t gid;
+ 	mode_t mask, flags;
+-	struct do_set_args args;
++	struct do_set_args args = { 0 };
+ 	int line = 0, backup_line;
+ 	int error, status = 0;
+ 	int chmod_required = 0;
+diff --git a/test/misc.test b/test/misc.test
+index e6140da..a910bd0 100644
+--- a/test/misc.test
++++ b/test/misc.test
+@@ -424,3 +424,9 @@ Now, chmod should change the group_obj entry
+ 	> 
+ 
+ 	$ rmdir d
++
++Malformed restore file
++        
++        $ echo "# owner: root" > f
++        $ setfacl --restore=f 2>&1
++        >setfacl: f: No filename found in line 0, aborting
diff --git a/acl.spec b/acl.spec
index 56f60cf..43772df 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.49
-Release: 5%{?dist}
+Release: 6%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -19,6 +19,9 @@ Patch3: acl-2.2.49-bz467936.patch
 # prepare the test-suite for SELinux and arbitrary umask
 Patch4: acl-2.2.49-tests.patch
 
+# bz #576550
+Patch5: acl-2.2.49-setfacl-restore.patch
+
 License: GPLv2+
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -57,11 +60,17 @@ defined in POSIX 1003.1e draft standard 17.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 touch .census
 # acl abuses libexecdir
 %configure --libdir=/%{_lib} --libexecdir=%{_libdir}
+
+# uncomment to turn on optimizations
+# sed -i 's/-O2/-O0/' libtool include/builddefs
+# unset CFLAGS
+
 make %{?_smp_mflags} LIBTOOL="libtool --tag=CC"
 
 %check
@@ -125,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Wed Mar 24 2010 Kamil Dudka <kdudka@redhat.com> 2.2.49-6
+- prevent setfacl --restore from SIGSEGV on malformed restore file (#576550)
+
 * Wed Mar 10 2010 Kamil Dudka <kdudka@redhat.com> 2.2.49-5
 - run the test-suite if possible
 

From 49bd1d1c07cedd0791300c43c50ea77273d959cb Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@fedoraproject.org>
Date: Tue, 25 May 2010 11:48:22 +0000
Subject: [PATCH 10/96] - let acl depend on the same version of libacl
 (#595674)

---
 acl.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/acl.spec b/acl.spec
index 43772df..204e9f7 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,12 +1,13 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.49
-Release: 6%{?dist}
+Release: 7%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
 BuildRequires: libattr-devel
 BuildRequires: libtool
+Requires: libacl = %{version}-%{release}
 Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.src.tar.gz
 Patch1: acl-2.2.39-build.patch
 
@@ -43,7 +44,7 @@ the POSIX 1003.1e draft standard 17 functions for manipulating access
 control lists.
 
 %package -n libacl-devel
-Summary: Access control list static libraries and headers.
+Summary: Access control list static libraries and headers
 License: LGPLv2+
 Group: Development/Libraries
 Requires: libacl = %{version}-%{release}, libattr-devel
@@ -134,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Tue May 25 2010 Kamil Dudka <kdudka@redhat.com> 2.2.49-7
+- let acl depend on the same version of libacl (#595674)
+
 * Wed Mar 24 2010 Kamil Dudka <kdudka@redhat.com> 2.2.49-6
 - prevent setfacl --restore from SIGSEGV on malformed restore file (#576550)
 

From ef92af18297cff21a171487a5d58b76ad51c6c4e Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@fedoraproject.org>
Date: Thu, 8 Jul 2010 13:32:01 +0000
Subject: [PATCH 11/96] - remove dependency of libacl-devel on nfs-utils-lib
 and openldap

---
 acl.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/acl.spec b/acl.spec
index 204e9f7..3b3d99c 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.49
-Release: 7%{?dist}
+Release: 8%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -48,7 +48,6 @@ Summary: Access control list static libraries and headers
 License: LGPLv2+
 Group: Development/Libraries
 Requires: libacl = %{version}-%{release}, libattr-devel
-Requires: nfs-utils-lib, openldap
 
 %description -n libacl-devel
 This package contains static libraries and header files needed to develop
@@ -135,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Thu Jul 08 2010 Kamil Dudka <kdudka@redhat.com> 2.2.49-8
+- remove dependency of libacl-devel on nfs-utils-lib and openldap
+
 * Tue May 25 2010 Kamil Dudka <kdudka@redhat.com> 2.2.49-7
 - let acl depend on the same version of libacl (#595674)
 

From 6512a1c3e1f0f53b72d0e2ceca9be4c5c486d46b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 09:34:44 +0000
Subject: [PATCH 12/96] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 2 files changed, 21 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index d4a739a..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: acl
-# $Id: Makefile,v 1.2 2007/10/15 18:35:20 notting Exp $
-NAME := acl
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

From 099dce348a2ccdfa4ad384b19fb1356b7e36bc05 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Mon, 7 Feb 2011 18:15:24 -0600
Subject: [PATCH 13/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 3b3d99c..3cf081a 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.49
-Release: 8%{?dist}
+Release: 9%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -134,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.49-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Thu Jul 08 2010 Kamil Dudka <kdudka@redhat.com> 2.2.49-8
 - remove dependency of libacl-devel on nfs-utils-lib and openldap
 

From b6546a90e0cab5a48136f9b46d212501d46cfcc3 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Tue, 29 Mar 2011 13:39:53 +0200
Subject: [PATCH 14/96] fix typos in setfacl(1) man page (#675451)

---
 acl-2.2.49-bz675451.patch | 27 +++++++++++++++++++++++++++
 acl.spec                  |  9 ++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 acl-2.2.49-bz675451.patch

diff --git a/acl-2.2.49-bz675451.patch b/acl-2.2.49-bz675451.patch
new file mode 100644
index 0000000..9417ab0
--- /dev/null
+++ b/acl-2.2.49-bz675451.patch
@@ -0,0 +1,27 @@
+ man/man1/setfacl.1 |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/man/man1/setfacl.1 b/man/man1/setfacl.1
+index 25908e2..776f22d 100644
+--- a/man/man1/setfacl.1
++++ b/man/man1/setfacl.1
+@@ -62,7 +62,7 @@ ACL entries for this operation must include permissions.
+ 
+ The
+ .IR "\-x (\-\-remove)" " and " "\-X (\-\-remove-file)"
+-options remove ACL enries. Only
++options remove ACL entries. Only
+ ACL entries without the
+ .I perms
+ field are accepted as parameters, unless POSIXLY_CORRECT is defined.
+@@ -240,8 +240,8 @@ owner, owning group, or others entry, a copy of the ACL owner, owning group, or
+ .IP * 4
+ If a Default ACL contains named user entries or named group entries, and no mask entry exists, a mask entry containing the same permissions as the default Default ACL's group entry is added. Unless the
+ .I \-n
+-option is given, the permissions of the mask entry are further adjusted to inclu
+-de the union of all permissions affected by the mask entry. (See the
++option is given, the permissions of the mask entry are further adjusted to
++include the union of all permissions affected by the mask entry. (See the
+ .I \-n
+ option description).
+ .PP
diff --git a/acl.spec b/acl.spec
index 3cf081a..b3d80ad 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.49
-Release: 9%{?dist}
+Release: 10%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -23,6 +23,9 @@ Patch4: acl-2.2.49-tests.patch
 # bz #576550
 Patch5: acl-2.2.49-setfacl-restore.patch
 
+# fix typos in setfacl(1) man page (#675451)
+Patch6: acl-2.2.49-bz675451.patch
+
 License: GPLv2+
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -61,6 +64,7 @@ defined in POSIX 1003.1e draft standard 17.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 touch .census
@@ -134,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Tue Mar 29 2011 Kamil Dudka <kdudka@redhat.com> 2.2.49-10
+- fix typos in setfacl(1) man page (#675451)
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.49-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

From 6fe61386fa97f4225119aa3affec3f2233fd2060 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Wed, 6 Apr 2011 13:36:16 +0200
Subject: [PATCH 15/96] add function acl_extended_file_nofollow() (#692982)

---
 acl-2.2.49-bz692982.patch | 375 ++++++++++++++++++++++++++++++++++++++
 acl.spec                  |   9 +-
 2 files changed, 383 insertions(+), 1 deletion(-)
 create mode 100644 acl-2.2.49-bz692982.patch

diff --git a/acl-2.2.49-bz692982.patch b/acl-2.2.49-bz692982.patch
new file mode 100644
index 0000000..0b5ef44
--- /dev/null
+++ b/acl-2.2.49-bz692982.patch
@@ -0,0 +1,375 @@
+From 6bf5e24d48077db58b389e90558100fc121b8134 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 4 Apr 2011 12:43:39 +0200
+Subject: [PATCH 1/2] libacl: Add acl_extended_file_nofollow()
+
+This function calls lgetxattr() instead of getxattr(), which helps ls(1)
+to prevent unnecessary automatic mounts, which acl_extended_file()
+triggers.  See the following bug report for more details:
+https://bugzilla.redhat.com/692982
+---
+ exports                             |    1 +
+ include/libacl.h                    |    1 +
+ libacl/Makefile                     |    3 +-
+ libacl/__acl_extended_file.c        |   49 +++++++++++++++++++++++++++++++++++
+ libacl/__acl_extended_file.h        |    4 +++
+ libacl/acl_extended_file.c          |   20 ++------------
+ libacl/acl_extended_file_nofollow.c |   34 ++++++++++++++++++++++++
+ man/man3/acl_extended_file.3        |   11 +++++++-
+ man/man5/acl.5                      |    1 +
+ 9 files changed, 105 insertions(+), 19 deletions(-)
+ create mode 100644 libacl/__acl_extended_file.c
+ create mode 100644 libacl/__acl_extended_file.h
+ create mode 100644 libacl/acl_extended_file_nofollow.c
+
+diff --git a/exports b/exports
+index ef02842..b368c22 100644
+--- a/exports
++++ b/exports
+@@ -82,4 +82,5 @@ ACL_1.1 {
+ 	# Linux specific extensions
+ 	perm_copy_fd;
+ 	perm_copy_file;
++	acl_extended_file_nofollow;
+ } ACL_1.0;
+diff --git a/include/libacl.h b/include/libacl.h
+index 41ec48e..d6a6650 100644
+--- a/include/libacl.h
++++ b/include/libacl.h
+@@ -59,6 +59,7 @@ extern int acl_check(acl_t acl, int *last);
+ extern acl_t acl_from_mode(mode_t mode);
+ extern int acl_equiv_mode(acl_t acl, mode_t *mode_p);
+ int acl_extended_file(const char *path_p);
++int acl_extended_file_nofollow(const char *path_p);
+ int acl_extended_fd(int fd);
+ extern int acl_entries(acl_t acl);
+ extern const char *acl_error(int code);
+diff --git a/libacl/Makefile b/libacl/Makefile
+index 1224b65..cfe3d3a 100644
+--- a/libacl/Makefile
++++ b/libacl/Makefile
+@@ -47,7 +47,8 @@ POSIX_CFILES = \
+ 
+ LIBACL_CFILES = \
+ 	acl_to_any_text.c acl_entries.c acl_check.c acl_error.c acl_cmp.c \
+-	acl_extended_fd.c acl_extended_file.c acl_equiv_mode.c acl_from_mode.c
++	acl_extended_fd.c acl_extended_file.c acl_equiv_mode.c acl_from_mode.c \
++	acl_extended_file_nofollow.c __acl_extended_file.c
+ 
+ INTERNAL_CFILES = \
+ 	__acl_to_any_text.c __acl_to_xattr.c __acl_from_xattr.c \
+diff --git a/libacl/__acl_extended_file.c b/libacl/__acl_extended_file.c
+new file mode 100644
+index 0000000..629afe9
+--- /dev/null
++++ b/libacl/__acl_extended_file.c
+@@ -0,0 +1,49 @@
++/*
++  File: acl_extended_file.c
++
++  Copyright (C) 2000, 2011
++  Andreas Gruenbacher, <a.gruenbacher@bestbits.at>
++
++  This program is free software; you can redistribute it and/or
++  modify it under the terms of the GNU Lesser General Public
++  License as published by the Free Software Foundation; either
++  version 2.1 of the License, or (at your option) any later version.
++
++  This program is distributed in the hope that it will be useful,
++  but WITHOUT ANY WARRANTY; without even the implied warranty of
++  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++  Lesser General Public License for more details.
++
++  You should have received a copy of the GNU Lesser General Public
++  License along with this library; if not, write to the Free Software
++  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++*/
++
++#include <unistd.h>
++#include <attr/xattr.h>
++#include "libacl.h"
++
++#include "byteorder.h"
++#include "acl_ea.h"
++#include "__acl_extended_file.h"
++
++
++int
++__acl_extended_file(const char *path_p, getxattr_t fun)
++{
++	int base_size = sizeof(acl_ea_header) + 3 * sizeof(acl_ea_entry);
++	int retval;
++
++	retval = fun(path_p, ACL_EA_ACCESS, NULL, 0);
++	if (retval < 0 && errno != ENOATTR && errno != ENODATA)
++		return -1;
++	if (retval > base_size)
++		return 1;
++	retval = fun(path_p, ACL_EA_DEFAULT, NULL, 0);
++	if (retval < 0 && errno != ENOATTR && errno != ENODATA)
++		return -1;
++	if (retval >= base_size)
++		return 1;
++	return 0;
++}
++
+diff --git a/libacl/__acl_extended_file.h b/libacl/__acl_extended_file.h
+new file mode 100644
+index 0000000..f8881a1
+--- /dev/null
++++ b/libacl/__acl_extended_file.h
+@@ -0,0 +1,4 @@
++typedef ssize_t (*getxattr_t)(const char *, const char *, void *value,
++        size_t size);
++
++int __acl_extended_file(const char *path_p, getxattr_t fun);
+diff --git a/libacl/acl_extended_file.c b/libacl/acl_extended_file.c
+index d1cb85d..f417784 100644
+--- a/libacl/acl_extended_file.c
++++ b/libacl/acl_extended_file.c
+@@ -1,7 +1,7 @@
+ /*
+   File: acl_extended_file.c
+ 
+-  Copyright (C) 2000
++  Copyright (C) 2011
+   Andreas Gruenbacher, <a.gruenbacher@bestbits.at>
+ 
+   This program is free software; you can redistribute it and/or
+@@ -23,26 +23,12 @@
+ #include <attr/xattr.h>
+ #include "libacl.h"
+ 
+-#include "byteorder.h"
+-#include "acl_ea.h"
++#include "__acl_extended_file.h"
+ 
+ 
+ int
+ acl_extended_file(const char *path_p)
+ {
+-	int base_size = sizeof(acl_ea_header) + 3 * sizeof(acl_ea_entry);
+-	int retval;
+-
+-	retval = getxattr(path_p, ACL_EA_ACCESS, NULL, 0);
+-	if (retval < 0 && errno != ENOATTR && errno != ENODATA)
+-		return -1;
+-	if (retval > base_size)
+-		return 1;
+-	retval = getxattr(path_p, ACL_EA_DEFAULT, NULL, 0);
+-	if (retval < 0 && errno != ENOATTR && errno != ENODATA)
+-		return -1;
+-	if (retval >= base_size)
+-		return 1;
+-	return 0;
++	return __acl_extended_file(path_p, getxattr);
+ }
+ 
+diff --git a/libacl/acl_extended_file_nofollow.c b/libacl/acl_extended_file_nofollow.c
+new file mode 100644
+index 0000000..8f4711f
+--- /dev/null
++++ b/libacl/acl_extended_file_nofollow.c
+@@ -0,0 +1,34 @@
++/*
++  File: acl_extended_file.c
++
++  Copyright (C) 2011
++  Andreas Gruenbacher, <a.gruenbacher@bestbits.at>
++
++  This program is free software; you can redistribute it and/or
++  modify it under the terms of the GNU Lesser General Public
++  License as published by the Free Software Foundation; either
++  version 2.1 of the License, or (at your option) any later version.
++
++  This program is distributed in the hope that it will be useful,
++  but WITHOUT ANY WARRANTY; without even the implied warranty of
++  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++  Lesser General Public License for more details.
++
++  You should have received a copy of the GNU Lesser General Public
++  License along with this library; if not, write to the Free Software
++  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++*/
++
++#include <unistd.h>
++#include <attr/xattr.h>
++#include "libacl.h"
++
++#include "__acl_extended_file.h"
++
++
++int
++acl_extended_file_nofollow(const char *path_p)
++{
++	return __acl_extended_file(path_p, lgetxattr);
++}
++
+diff --git a/man/man3/acl_extended_file.3 b/man/man3/acl_extended_file.3
+index 0ca7e0f..1f04331 100644
+--- a/man/man3/acl_extended_file.3
++++ b/man/man3/acl_extended_file.3
+@@ -25,7 +25,7 @@
+ .Dt ACL_EXTENDED_FILE 3
+ .Os "Linux ACL"
+ .Sh NAME
+-.Nm acl_extended_file
++.Nm acl_extended_file, acl_extended_file_nofollow
+ .Nd test for information in ACLs by file name
+ .Sh LIBRARY
+ Linux Access Control Lists library (libacl, \-lacl).
+@@ -34,6 +34,8 @@ Linux Access Control Lists library (libacl, \-lacl).
+ .In acl/libacl.h
+ .Ft int
+ .Fn acl_extended_file "const char *path_p"
++.Ft int
++.Fn acl_extended_file_nofollow "const char *path_p"
+ .Sh DESCRIPTION
+ The
+ .Fn acl_extended_file
+@@ -61,6 +63,13 @@ mechanisms, such as Mandatory Access Control schemes. The
+ .Xr access 2
+ system call can be used to check whether a given type of access to a file
+ object would be granted.
++.Pp
++.Fn acl_extended_file_nofollow
++is identical to 
++.Fn acl_extended_file ,
++except in the case of a symbolic link, where the link itself is interrogated,
++not the file that it refers to.  Since symbolic links have no ACL themselves,
++the operation is supposed to fail on them.
+ .Sh RETURN VALUE
+ If successful, the
+ .Fn acl_extended_file
+diff --git a/man/man5/acl.5 b/man/man5/acl.5
+index 6b0f468..aec58aa 100644
+--- a/man/man5/acl.5
++++ b/man/man5/acl.5
+@@ -497,6 +497,7 @@ These non-portable extensions are available on Linux systems.
+ .Xr acl_error 3 ,
+ .Xr acl_extended_fd 3 ,
+ .Xr acl_extended_file 3 ,
++.Xr acl_extended_file_nofollow 3 ,
+ .Xr acl_from_mode 3 ,
+ .Xr acl_get_perm 3 ,
+ .Xr acl_to_any_text 3
+-- 
+1.7.4
+
+
+From ad4ca5aaee96e98b2e8e8a4351fa5e6c58d65216 Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruen@linbit.com>
+Date: Mon, 4 Apr 2011 17:18:38 +0200
+Subject: [PATCH 2/2] Minor fixes to the previous commit
+
+* Assign the new libacl version ACL_1.2 to acl_extended_file_nofollow
+  so that package managers will end up with the appropriate
+  dependencies.
+* Add a manpage entry for acl_extended_file_nofollow which sources
+  ("links to") the acl_extended_file manpage.
+* Remove the prototype for getxattr/lgetxattr.
+* Whitespace cleanups.
+---
+ exports                               |    7 ++++++-
+ libacl/__acl_extended_file.c          |    7 ++++---
+ libacl/__acl_extended_file.h          |    7 +++----
+ libacl/acl_extended_file_nofollow.c   |    3 +--
+ man/man3/acl_extended_file.3          |    2 +-
+ man/man3/acl_extended_file_nofollow.3 |    1 +
+ 6 files changed, 16 insertions(+), 11 deletions(-)
+ create mode 100644 man/man3/acl_extended_file_nofollow.3
+
+diff --git a/exports b/exports
+index b368c22..7d8e69e 100644
+--- a/exports
++++ b/exports
+@@ -82,5 +82,10 @@ ACL_1.1 {
+ 	# Linux specific extensions
+ 	perm_copy_fd;
+ 	perm_copy_file;
+-	acl_extended_file_nofollow;
+ } ACL_1.0;
++
++ACL_1.2 {
++    global:
++	# Linux specific extensions
++	acl_extended_file_nofollow;
++} ACL_1.1;
+diff --git a/libacl/__acl_extended_file.c b/libacl/__acl_extended_file.c
+index 629afe9..3e45abd 100644
+--- a/libacl/__acl_extended_file.c
++++ b/libacl/__acl_extended_file.c
+@@ -1,5 +1,5 @@
+ /*
+-  File: acl_extended_file.c
++  File: __acl_extended_file.c
+ 
+   Copyright (C) 2000, 2011
+   Andreas Gruenbacher, <a.gruenbacher@bestbits.at>
+@@ -29,7 +29,9 @@
+ 
+ 
+ int
+-__acl_extended_file(const char *path_p, getxattr_t fun)
++__acl_extended_file(const char *path_p,
++		    ssize_t (*fun)(const char *, const char *,
++				   void *, size_t))
+ {
+ 	int base_size = sizeof(acl_ea_header) + 3 * sizeof(acl_ea_entry);
+ 	int retval;
+@@ -46,4 +48,3 @@ __acl_extended_file(const char *path_p, getxattr_t fun)
+ 		return 1;
+ 	return 0;
+ }
+-
+diff --git a/libacl/__acl_extended_file.h b/libacl/__acl_extended_file.h
+index f8881a1..0b0da9e 100644
+--- a/libacl/__acl_extended_file.h
++++ b/libacl/__acl_extended_file.h
+@@ -1,4 +1,3 @@
+-typedef ssize_t (*getxattr_t)(const char *, const char *, void *value,
+-        size_t size);
+-
+-int __acl_extended_file(const char *path_p, getxattr_t fun);
++int __acl_extended_file(const char *path_p,
++			ssize_t (*)(const char *, const char *,
++				    void *, size_t));
+diff --git a/libacl/acl_extended_file_nofollow.c b/libacl/acl_extended_file_nofollow.c
+index 8f4711f..c253e4d 100644
+--- a/libacl/acl_extended_file_nofollow.c
++++ b/libacl/acl_extended_file_nofollow.c
+@@ -1,5 +1,5 @@
+ /*
+-  File: acl_extended_file.c
++  File: acl_extended_file_nofollow.c
+ 
+   Copyright (C) 2011
+   Andreas Gruenbacher, <a.gruenbacher@bestbits.at>
+@@ -31,4 +31,3 @@ acl_extended_file_nofollow(const char *path_p)
+ {
+ 	return __acl_extended_file(path_p, lgetxattr);
+ }
+-
+diff --git a/man/man3/acl_extended_file.3 b/man/man3/acl_extended_file.3
+index 1f04331..fdeef86 100644
+--- a/man/man3/acl_extended_file.3
++++ b/man/man3/acl_extended_file.3
+@@ -65,7 +65,7 @@ system call can be used to check whether a given type of access to a file
+ object would be granted.
+ .Pp
+ .Fn acl_extended_file_nofollow
+-is identical to 
++is identical to
+ .Fn acl_extended_file ,
+ except in the case of a symbolic link, where the link itself is interrogated,
+ not the file that it refers to.  Since symbolic links have no ACL themselves,
+diff --git a/man/man3/acl_extended_file_nofollow.3 b/man/man3/acl_extended_file_nofollow.3
+new file mode 100644
+index 0000000..44fc24f
+--- /dev/null
++++ b/man/man3/acl_extended_file_nofollow.3
+@@ -0,0 +1 @@
++.so man3/acl_extended_file.3
+-- 
+1.7.4
+
diff --git a/acl.spec b/acl.spec
index b3d80ad..878b250 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.49
-Release: 10%{?dist}
+Release: 11%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -26,6 +26,9 @@ Patch5: acl-2.2.49-setfacl-restore.patch
 # fix typos in setfacl(1) man page (#675451)
 Patch6: acl-2.2.49-bz675451.patch
 
+# add function acl_extended_file_nofollow() (#692982)
+Patch7: acl-2.2.49-bz692982.patch
+
 License: GPLv2+
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -65,6 +68,7 @@ defined in POSIX 1003.1e draft standard 17.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 touch .census
@@ -138,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Wed Apr 06 2011 Kamil Dudka <kdudka@redhat.com> 2.2.49-11
+- add function acl_extended_file_nofollow() (#692982)
+
 * Tue Mar 29 2011 Kamil Dudka <kdudka@redhat.com> 2.2.49-10
 - fix typos in setfacl(1) man page (#675451)
 

From 05710cfe1c6bab612e6667cdef14f2c46ff8f10d Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Tue, 19 Apr 2011 09:41:47 +0200
Subject: [PATCH 16/96] new upstream release: acl-2.2.50

---
 .gitignore                         |    1 +
 acl-2.2.39-nfsv4.patch             | 3280 ----------------------------
 acl-2.2.49-bz467936.patch          |   90 -
 acl-2.2.49-bz675451.patch          |   13 +-
 acl-2.2.49-bz692982.patch          |  375 ----
 acl-2.2.49-setfacl-restore.patch   |   27 -
 acl-2.2.49-setfacl-walk.patch      |   30 -
 acl-2.2.50.src.tar.gz.sig          |  Bin 0 -> 72 bytes
 acl.spec                           |   27 +-
 malformed-restore-double-owner.acl |    8 +
 sources                            |    2 +-
 11 files changed, 21 insertions(+), 3832 deletions(-)
 delete mode 100644 acl-2.2.39-nfsv4.patch
 delete mode 100644 acl-2.2.49-bz467936.patch
 delete mode 100644 acl-2.2.49-bz692982.patch
 delete mode 100644 acl-2.2.49-setfacl-restore.patch
 delete mode 100644 acl-2.2.49-setfacl-walk.patch
 create mode 100644 acl-2.2.50.src.tar.gz.sig
 create mode 100644 malformed-restore-double-owner.acl

diff --git a/.gitignore b/.gitignore
index d39a8c3..db4fb54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 acl-2.2.49.src.tar.gz
+/acl-2.2.50.src.tar.gz
diff --git a/acl-2.2.39-nfsv4.patch b/acl-2.2.39-nfsv4.patch
deleted file mode 100644
index ee7ae04..0000000
--- a/acl-2.2.39-nfsv4.patch
+++ /dev/null
@@ -1,3280 +0,0 @@
-NOTE: This patch is not being used any more since 2.2.39-8.
-
---- /dev/null	2007-08-22 11:21:03.626521839 -0400
-+++ acl-2.2.39/libacl/acl_nfs4_get_who.c	2007-08-22 12:02:13.000000000 -0400
-@@ -0,0 +1,103 @@
-+/*
-+ *  NFSv4 ACL Code
-+ *  Read the who value from the ace and return its type and optionally
-+ *  its value.
-+ *
-+ *  Ace is a reference to the ace to extract the who value from.
-+ *  Type is a reference where the value of the whotype will be stored.
-+ *  Who is a double reference that should either be passed as NULL
-+ *  (and thus no who string will be returned) or as a pointer to a
-+ *  char* where the who string will be allocated. This string must be
-+ *  freed by the caller.
-+ *
-+ *  Copyright (c) 2002, 2003 The Regents of the University of Michigan.
-+ *  All rights reserved.
-+ *
-+ *  Nathaniel Gallaher <ngallahe@umich.edu>
-+ *
-+ *  Redistribution and use in source and binary forms, with or without
-+ *  modification, are permitted provided that the following conditions
-+ *  are met:
-+ *
-+ *  1. Redistributions of source code must retain the above copyright
-+ *     notice, this list of conditions and the following disclaimer.
-+ *  2. Redistributions in binary form must reproduce the above copyright
-+ *     notice, this list of conditions and the following disclaimer in the
-+ *     documentation and/or other materials provided with the distribution.
-+ *  3. Neither the name of the University nor the names of its
-+ *     contributors may be used to endorse or promote products derived
-+ *     from this software without specific prior written permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include "libacl_nfs4.h"
-+
-+int acl_nfs4_get_who(struct nfs4_ace* ace, int* type, char** who)
-+{
-+	int itype;
-+	char* iwho = NULL;
-+	int wholen;
-+
-+	if(ace == NULL || ace->who == NULL)
-+		goto inval_failed;
-+
-+	itype = acl_nfs4_get_whotype(ace->who);
-+
-+	if(type != NULL) {
-+		*type = itype;
-+	}
-+
-+
-+	if(who == NULL)
-+		return 0;
-+
-+	switch(itype)
-+	{
-+		case NFS4_ACL_WHO_NAMED:
-+			iwho = ace->who;
-+			break;
-+		case NFS4_ACL_WHO_OWNER:
-+			iwho = NFS4_ACL_WHO_OWNER_STRING;
-+			break;
-+		case NFS4_ACL_WHO_GROUP:
-+			iwho = NFS4_ACL_WHO_GROUP_STRING;
-+			break;
-+		case NFS4_ACL_WHO_EVERYONE:
-+			iwho = NFS4_ACL_WHO_EVERYONE_STRING;
-+			break;
-+		default:
-+			goto inval_failed;
-+	}
-+
-+	wholen = strlen(iwho);
-+	if(wholen < 0)
-+		goto inval_failed;
-+
-+	(*who) = (char *) malloc(sizeof(char) * (wholen + 1));
-+	if((*who) == NULL) {
-+		errno = ENOMEM;
-+		goto failed;
-+	}
-+
-+	strcpy((*who), iwho);
-+
-+	return 0;
-+
-+inval_failed:
-+	errno = EINVAL;
-+
-+failed:
-+	return -1;
-+}
-+
---- /dev/null	2007-08-22 11:21:03.626521839 -0400
-+++ acl-2.2.39/libacl/acl_nfs4_add_ace.c	2007-08-22 12:02:13.000000000 -0400
-@@ -0,0 +1,83 @@
-+/*
-+ *  NFSv4 ACL Code
-+ *  Add an ace to the acl
-+ *
-+ *  Copyright (c) 2002, 2003 The Regents of the University of Michigan.
-+ *  All rights reserved.
-+ *
-+ *  Marius Aamodt Eriksen <marius@umich.edu>
-+ *  J. Bruce Fields <bfields@umich.edu>
-+ *  Nathaniel Gallaher <ngallahe@umich.edu>
-+ *  Jeff Sedlak <jsedlak@umich.edu>
-+ *
-+ *  Redistribution and use in source and binary forms, with or without
-+ *  modification, are permitted provided that the following conditions
-+ *  are met:
-+ *
-+ *  1. Redistributions of source code must retain the above copyright
-+ *     notice, this list of conditions and the following disclaimer.
-+ *  2. Redistributions in binary form must reproduce the above copyright
-+ *     notice, this list of conditions and the following disclaimer in the
-+ *     documentation and/or other materials provided with the distribution.
-+ *  3. Neither the name of the University nor the names of its
-+ *     contributors may be used to endorse or promote products derived
-+ *     from this software without specific prior written permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include "libacl_nfs4.h"
-+
-+int
-+acl_nfs4_add_ace(struct nfs4_acl *acl, u32 type, u32 flag, u32 access_mask,
-+		int whotype, char* who)
-+{
-+	struct nfs4_ace *ace;
-+	int result;
-+
-+	if(acl == NULL)
-+	{
-+		errno = EINVAL;
-+		return -1;
-+	}
-+
-+	if ((ace = malloc(sizeof(*ace))) == NULL)
-+	{
-+		errno = ENOMEM;
-+		return -1;
-+	}
-+
-+	ace->type = type;
-+	ace->flag = flag;
-+
-+	if( type == NFS4_ACE_ACCESS_DENIED_ACE_TYPE )
-+		access_mask = access_mask & ~(NFS4_ACE_MASK_IGNORE);
-+
-+
-+	/* Castrate delete_child if we aren't a directory */
-+	if (!acl->is_directory)
-+		access_mask &= ~NFS4_ACE_DELETE_CHILD;
-+
-+
-+	ace->access_mask = access_mask & NFS4_ACE_MASK_ALL;
-+
-+	result = acl_nfs4_set_who(ace, whotype, who);
-+	if(result < 0)
-+		return -1;
-+
-+	TAILQ_INSERT_TAIL(&acl->ace_head, ace, l_ace);
-+	acl->naces++;
-+
-+	return 0;
-+}
-+
---- /dev/null	2007-08-22 11:21:03.626521839 -0400
-+++ acl-2.2.39/libacl/acl_nfs4_get_whotype.c	2007-08-22 12:02:13.000000000 -0400
-@@ -0,0 +1,60 @@
-+/*
-+ *  NFSv4 ACL Code
-+ *  Get the whotype of the who string passed
-+ *
-+ *  Copyright (c) 2002, 2003 The Regents of the University of Michigan.
-+ *  All rights reserved.
-+ *
-+ *  Marius Aamodt Eriksen <marius@umich.edu>
-+ *  J. Bruce Fields <bfields@umich.edu>
-+ *  Nathaniel Gallaher <ngallahe@umich.edu>
-+ *  Jeff Sedlak <jsedlak@umich.edu>
-+ *
-+ *  Redistribution and use in source and binary forms, with or without
-+ *  modification, are permitted provided that the following conditions
-+ *  are met:
-+ *
-+ *  1. Redistributions of source code must retain the above copyright
-+ *     notice, this list of conditions and the following disclaimer.
-+ *  2. Redistributions in binary form must reproduce the above copyright
-+ *     notice, this list of conditions and the following disclaimer in the
-+ *     documentation and/or other materials provided with the distribution.
-+ *  3. Neither the name of the University nor the names of its
-+ *     contributors may be used to endorse or promote products derived
-+ *     from this software without specific prior written permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include "libacl_nfs4.h"
-+
-+inline int
-+acl_nfs4_get_whotype(char *p)
-+{
-+	if(0 == strcmp(p, NFS4_ACL_WHO_OWNER_STRING) &&
-+			strlen(p) == strlen(NFS4_ACL_WHO_OWNER_STRING)) {
-+		return NFS4_ACL_WHO_OWNER;
-+	}
-+	if(0 == strcmp(p, NFS4_ACL_WHO_GROUP_STRING) &&
-+			strlen(p) == strlen(NFS4_ACL_WHO_GROUP_STRING)) {
-+		return NFS4_ACL_WHO_GROUP;
-+	}
-+	if(0 == strcmp(p, NFS4_ACL_WHO_EVERYONE_STRING) &&
-+			strlen(p) == strlen(NFS4_ACL_WHO_EVERYONE_STRING)) {
-+		return NFS4_ACL_WHO_EVERYONE;
-+	}
-+
-+	return NFS4_ACL_WHO_NAMED;
-+}
-+
-+
---- /dev/null	2007-08-22 11:21:03.626521839 -0400
-+++ acl-2.2.39/libacl/acl_nfs4_free.c	2007-08-22 12:02:13.000000000 -0400
-@@ -0,0 +1,61 @@
-+/*
-+ *  Copyright (c) 2004 The Regents of the University of Michigan.
-+ *  All rights reserved.
-+ *
-+ *  Marius Aamodt Eriksen <marius@umich.edu>
-+ *  J. Bruce Fields <bfields@umich.edu>
-+ *  Nathaniel Gallaher <ngallahe@umich.edu>
-+ *  Jeff Sedlak <jsedlak@umich.edu>
-+ *
-+ *  Redistribution and use in source and binary forms, with or without
-+ *  modification, are permitted provided that the following conditions
-+ *  are met:
-+ *
-+ *  1. Redistributions of source code must retain the above copyright
-+ *     notice, this list of conditions, the following disclaimer, and
-+ *     any and all other licensing or copyright notices included in
-+ *     any files in this distribution.
-+ *  2. Redistributions in binary form must reproduce the above copyright
-+ *     notice, this list of conditions and the following disclaimer in the
-+ *     documentation and/or other materials provided with the distribution.
-+ *  3. Neither the name of the University nor the names of its
-+ *     contributors may be used to endorse or promote products derived
-+ *     from this software without specific prior written permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ */
-+
-+#include "libacl_nfs4.h"
-+
-+void
-+acl_nfs4_free(struct nfs4_acl *acl)
-+{
-+	struct nfs4_ace *ace;
-+
-+	if (!acl)
-+		return;
-+
-+	while (!TAILQ_IS_EMPTY(acl->ace_head)) {
-+		ace = (acl)->ace_head.tqh_first;
-+
-+		TAILQ_REMOVE( &(acl->ace_head), ace, l_ace);
-+		free(ace->who);
-+		free(ace);
-+	}
-+
-+	free(acl);
-+
-+	return;
-+}
-+
---- /dev/null	2007-08-22 11:21:03.626521839 -0400
-+++ acl-2.2.39/libacl/acl_n4tp_acl_trans.c	2007-08-22 12:02:13.000000000 -0400
-@@ -0,0 +1,439 @@
-+/*
-+ *  NFSv4 ACL Code
-+ *  Convert NFSv4 ACL to a POSIX ACL
-+ *
-+ *  Copyright (c) 2002, 2003 The Regents of the University of Michigan.
-+ *  All rights reserved.
-+ *
-+ *  Nathaniel Gallaher <ngallahe@umich.edu>
-+ *
-+ *  Redistribution and use in source and binary forms, with or without
-+ *  modification, are permitted provided that the following conditions
-+ *  are met:
-+ *
-+ *  1. Redistributions of source code must retain the above copyright
-+ *     notice, this list of conditions and the following disclaimer.
-+ *  2. Redistributions in binary form must reproduce the above copyright
-+ *     notice, this list of conditions and the following disclaimer in the
-+ *     documentation and/or other materials provided with the distribution.
-+ *  3. Neither the name of the University nor the names of its
-+ *     contributors may be used to endorse or promote products derived
-+ *     from this software without specific prior written permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <acl/libacl.h>
-+#include <nfsidmap.h>
-+#include "libacl_nfs4.h"
-+
-+
-+/*
-+ * While processing the NFSv4 ACE, this maintains bitmasks representing
-+ * which permission bits have been allowed and which denied to a given
-+ * entity: */
-+struct posix_ace_state {
-+	u_int32_t allow;
-+	u_int32_t deny;
-+};
-+
-+struct posix_user_ace_state {
-+	uid_t uid;
-+	struct posix_ace_state perms;
-+};
-+
-+struct posix_ace_state_array {
-+	int n;
-+	struct posix_user_ace_state aces[];
-+};
-+
-+/*
-+ * While processing the NFSv4 ACE, this maintains the partial permissions
-+ * calculated so far: */
-+
-+struct posix_acl_state {
-+	struct posix_ace_state owner;
-+	struct posix_ace_state group;
-+	struct posix_ace_state other;
-+	struct posix_ace_state everyone;
-+	struct posix_ace_state mask; /* Deny unused in this case */
-+	struct posix_ace_state_array *users;
-+	struct posix_ace_state_array *groups;
-+};
-+
-+static int
-+init_state(struct posix_acl_state *state, int cnt)
-+{
-+	int alloc;
-+
-+	memset(state, 0, sizeof(struct posix_acl_state));
-+	/*
-+	 * In the worst case, each individual acl could be for a distinct
-+	 * named user or group, but we don't know which, so we allocate
-+	 * enough space for either:
-+	 */
-+	alloc = sizeof(struct posix_ace_state_array)
-+		+ cnt*sizeof(struct posix_user_ace_state);
-+	state->users = calloc(1, alloc);
-+	if (!state->users)
-+		return -ENOMEM;
-+	state->groups = calloc(1, alloc);
-+	if (!state->groups) {
-+		free(state->users);
-+		return -ENOMEM;
-+	}
-+	return 0;
-+}
-+
-+static void
-+free_state(struct posix_acl_state *state) {
-+	free(state->users);
-+	free(state->groups);
-+}
-+
-+static inline void add_to_mask(struct posix_acl_state *state, struct posix_ace_state *astate)
-+{
-+	state->mask.allow |= astate->allow;
-+}
-+
-+/*
-+ * We only map from NFSv4 to POSIX ACLs when getting ACLs, when we err on the
-+ * side of permissiveness (so as not to make the file appear more secure than
-+ * it really is), so the mode bit mapping below is optimistic.
-+ */
-+static void
-+set_mode_from_nfs4(acl_entry_t pace, u_int32_t perm, int is_dir)
-+{
-+	u32 write_mode = NFS4_WRITE_MODE;
-+	acl_permset_t perms;
-+
-+	acl_get_permset(pace, &perms);
-+	acl_clear_perms(perms);
-+	if (is_dir)
-+		write_mode |= NFS4_ACE_DELETE_CHILD;
-+	if (perm & NFS4_READ_MODE)
-+		acl_add_perm(perms, ACL_READ);
-+	if (perm & write_mode)
-+		acl_add_perm(perms, ACL_WRITE);
-+	if (perm & NFS4_EXECUTE_MODE)
-+		acl_add_perm(perms, ACL_EXECUTE);
-+	acl_set_permset(pace, perms);
-+}
-+
-+/* XXX: add a "check allow" that can warn on e.g. allows of WRITE_ACL
-+ * to non-owner? */
-+
-+/* XXX: replace error returns by errno sets all over.  Ugh. */
-+
-+static acl_t
-+posix_state_to_acl(struct posix_acl_state *state, int is_dir)
-+{
-+	acl_entry_t pace;
-+	acl_t pacl;
-+	int nace;
-+	int i, error = 0;
-+
-+	if (state->users->n || state->groups->n)
-+		nace = 4 + state->users->n + state->groups->n;
-+	else
-+		nace = 3;
-+	pacl = acl_init(nace);
-+	if (!pacl)
-+		return NULL;
-+
-+	error = acl_create_entry(&pacl, &pace);
-+	if (error)
-+		goto out_err;
-+	acl_set_tag_type(pace, ACL_USER_OBJ);
-+	set_mode_from_nfs4(pace, state->owner.allow, is_dir);
-+
-+	for (i=0; i < state->users->n; i++) {
-+		error = acl_create_entry(&pacl, &pace);
-+		if (error)
-+			goto out_err;
-+		acl_set_tag_type(pace, ACL_USER);
-+		set_mode_from_nfs4(pace, state->users->aces[i].perms.allow,
-+					is_dir);
-+		acl_set_qualifier(pace, &state->users->aces[i].uid);
-+		add_to_mask(state, &state->users->aces[i].perms);
-+	}
-+
-+	error = acl_create_entry(&pacl, &pace);
-+	if (error)
-+		goto out_err;
-+	acl_set_tag_type(pace, ACL_GROUP_OBJ);
-+	set_mode_from_nfs4(pace, state->group.allow, is_dir);
-+	add_to_mask(state, &state->group);
-+
-+	for (i=0; i < state->groups->n; i++) {
-+		error = acl_create_entry(&pacl, &pace);
-+		if (error)
-+			goto out_err;
-+		acl_set_tag_type(pace, ACL_GROUP);
-+		set_mode_from_nfs4(pace, state->groups->aces[i].perms.allow,
-+					is_dir);
-+		acl_set_qualifier(pace, &state->groups->aces[i].uid);
-+		add_to_mask(state, &state->groups->aces[i].perms);
-+	}
-+
-+	if (nace > 3) {
-+		error = acl_create_entry(&pacl, &pace);
-+		if (error)
-+			goto out_err;
-+		acl_set_tag_type(pace, ACL_MASK);
-+		set_mode_from_nfs4(pace, state->mask.allow, is_dir);
-+	}
-+
-+	error = acl_create_entry(&pacl, &pace);
-+	if (error)
-+		goto out_err;
-+	acl_set_tag_type(pace, ACL_OTHER);
-+	set_mode_from_nfs4(pace, state->other.allow, is_dir);
-+
-+	return pacl;
-+out_err:
-+	acl_free(pacl);
-+	return NULL;
-+}
-+
-+static inline void allow_bits(struct posix_ace_state *astate, u32 mask)
-+{
-+	/* Allow all bits in the mask not already denied: */
-+	astate->allow |= mask & ~astate->deny;
-+}
-+
-+static inline void deny_bits(struct posix_ace_state *astate, u32 mask)
-+{
-+	/* Deny all bits in the mask not already allowed: */
-+	astate->deny |= mask & ~astate->allow;
-+}
-+
-+static int find_uid(struct posix_acl_state *state, struct posix_ace_state_array *a, uid_t uid)
-+{
-+	int i;
-+
-+	for (i = 0; i < a->n; i++)
-+		if (a->aces[i].uid == uid)
-+			return i;
-+	/* Not found: */
-+	a->n++;
-+	a->aces[i].uid = uid;
-+	a->aces[i].perms.allow = state->everyone.allow;
-+	a->aces[i].perms.deny  = state->everyone.deny;
-+
-+	return i;
-+}
-+
-+static void deny_bits_array(struct posix_ace_state_array *a, u32 mask)
-+{
-+	int i;
-+
-+	for (i=0; i < a->n; i++)
-+		deny_bits(&a->aces[i].perms, mask);
-+}
-+
-+static void allow_bits_array(struct posix_ace_state_array *a, u32 mask)
-+{
-+	int i;
-+
-+	for (i=0; i < a->n; i++)
-+		allow_bits(&a->aces[i].perms, mask);
-+}
-+
-+static acl_tag_t acl_n4tp_get_whotype(struct nfs4_ace *ace)
-+{
-+	int nfs4type;
-+	int result;
-+
-+	result = acl_nfs4_get_who(ace, &nfs4type, NULL);
-+	if (result < 0)
-+		return -1;
-+
-+	switch (nfs4type) {
-+		case NFS4_ACL_WHO_NAMED:
-+			return (ace->flag & NFS4_ACE_IDENTIFIER_GROUP ?
-+					ACL_GROUP : ACL_USER);
-+		case NFS4_ACL_WHO_OWNER:
-+			return ACL_USER_OBJ;
-+		case NFS4_ACL_WHO_GROUP:
-+			return ACL_GROUP_OBJ;
-+		case NFS4_ACL_WHO_EVERYONE:
-+			return ACL_OTHER;
-+	}
-+	errno = EINVAL;
-+	return -1;
-+}
-+
-+static int process_one_v4_ace(struct posix_acl_state *state,
-+				struct nfs4_ace *ace)
-+{
-+	u32 mask = ace->access_mask;
-+	uid_t id;
-+	int i;
-+
-+	if (nfs4_init_name_mapping(NULL))
-+		return -1;
-+
-+	switch (acl_n4tp_get_whotype(ace)) {
-+	case ACL_USER_OBJ:
-+		if (ace->type == NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE) {
-+			allow_bits(&state->owner, mask);
-+		} else {
-+			deny_bits(&state->owner, mask);
-+		}
-+		break;
-+	case ACL_USER:
-+		if (nfs4_name_to_uid(ace->who, &id))
-+			return -1;
-+		i = find_uid(state, state->users, id);
-+		if (ace->type == NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE) {
-+			allow_bits(&state->users->aces[i].perms, mask);
-+			mask = state->users->aces[i].perms.allow;
-+			allow_bits(&state->owner, mask);
-+		} else {
-+			deny_bits(&state->users->aces[i].perms, mask);
-+		}
-+		break;
-+	case ACL_GROUP_OBJ:
-+		if (ace->type == NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE) {
-+			allow_bits(&state->group, mask);
-+			mask = state->group.allow;
-+			allow_bits(&state->owner, mask);
-+			allow_bits(&state->everyone, mask);
-+			allow_bits_array(state->users, mask);
-+			allow_bits_array(state->groups, mask);
-+		} else {
-+			deny_bits(&state->group, mask);
-+		}
-+		break;
-+	case ACL_GROUP:
-+		if (nfs4_name_to_gid(ace->who, &id))
-+			return -1;
-+		i = find_uid(state, state->groups, id);
-+		if (ace->type == NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE) {
-+			allow_bits(&state->groups->aces[i].perms, mask);
-+			mask = state->groups->aces[i].perms.allow;
-+			allow_bits(&state->owner, mask);
-+			allow_bits(&state->group, mask);
-+			allow_bits(&state->everyone, mask);
-+			allow_bits_array(state->users, mask);
-+			allow_bits_array(state->groups, mask);
-+		} else {
-+			deny_bits(&state->groups->aces[i].perms, mask);
-+		}
-+		break;
-+	case ACL_OTHER:
-+		if (ace->type == NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE) {
-+			allow_bits(&state->owner, mask);
-+			allow_bits(&state->group, mask);
-+			allow_bits(&state->other, mask);
-+			allow_bits(&state->everyone, mask);
-+			allow_bits_array(state->users, mask);
-+			allow_bits_array(state->groups, mask);
-+		} else {
-+			deny_bits(&state->owner, mask);
-+			deny_bits(&state->group, mask);
-+			deny_bits(&state->other, mask);
-+			deny_bits(&state->everyone, mask);
-+			deny_bits_array(state->users, mask);
-+			deny_bits_array(state->groups, mask);
-+		}
-+	}
-+	return 0;
-+}
-+
-+#define FILE_OR_DIR_INHERIT (NFS4_ACE_FILE_INHERIT_ACE \
-+				| NFS4_ACE_DIRECTORY_INHERIT_ACE)
-+
-+/* Strip or keep inheritance aces depending on type of posix acl requested */
-+static void acl_nfs4_check_inheritance(struct nfs4_acl *acl, u32 iflags)
-+{
-+	struct nfs4_ace * cur_ace;
-+	struct nfs4_ace * temp_ace;
-+
-+	cur_ace = acl->ace_head.tqh_first;
-+
-+	while (cur_ace) {
-+		/* get the next ace now in case we free the current ace */
-+		temp_ace = cur_ace;
-+		cur_ace = cur_ace->l_ace.tqe_next;
-+
-+		if (iflags & NFS4_ACL_REQUEST_DEFAULT) {
-+			if (!(temp_ace->flag & FILE_OR_DIR_INHERIT))
-+				acl_nfs4_remove_ace(acl, temp_ace);
-+		} else {
-+			if (temp_ace->flag & NFS4_ACE_INHERIT_ONLY_ACE)
-+				acl_nfs4_remove_ace(acl, temp_ace);
-+		}
-+	}
-+}
-+
-+acl_t acl_n4tp_acl_trans(struct nfs4_acl * nacl_p, acl_type_t ptype)
-+{
-+	struct posix_acl_state state;
-+	acl_t pacl;
-+	struct nfs4_acl * temp_acl;
-+	struct nfs4_ace * cur_ace;
-+	int ret;
-+	u32 iflags = NFS4_ACL_NOFLAGS;
-+
-+	if (ptype == ACL_TYPE_DEFAULT) {
-+		if (nacl_p->is_directory)
-+			iflags |= NFS4_ACL_REQUEST_DEFAULT;
-+		else {
-+			errno = EINVAL;
-+			return NULL;
-+		}
-+	}
-+
-+	/* Copy so we can delete bits without borking the original */
-+	temp_acl = acl_nfs4_copy_acl(nacl_p);
-+	if (temp_acl == NULL)
-+		return NULL;
-+
-+	acl_nfs4_check_inheritance(temp_acl, iflags);
-+
-+	if (ptype == ACL_TYPE_DEFAULT && temp_acl->naces == 0) {
-+		acl_nfs4_free(temp_acl);
-+		return acl_init(0);
-+	}
-+
-+	ret = init_state(&state, temp_acl->naces);
-+	if (ret)
-+		goto free_failed;
-+
-+	cur_ace = temp_acl->ace_head.tqh_first;
-+	while (cur_ace) {
-+		if (process_one_v4_ace(&state, cur_ace)) {
-+			free_state(&state);
-+			goto free_failed;
-+		}
-+		cur_ace = cur_ace->l_ace.tqe_next;
-+	}
-+
-+	acl_nfs4_free(temp_acl);
-+
-+	pacl = posix_state_to_acl(&state, nacl_p->is_directory);
-+
-+	free_state(&state);
-+
-+	ret = acl_valid(pacl);
-+	if (ret < 0)
-+		goto free_failed;
-+
-+	return pacl;
-+
-+free_failed:
-+	acl_nfs4_free(temp_acl);
-+	return NULL;
-+}
---- acl-2.2.39/libacl/acl_set_fd.c.orig	2006-06-20 02:51:25.000000000 -0400
-+++ acl-2.2.39/libacl/acl_set_fd.c	2007-08-22 12:02:13.000000000 -0400
-@@ -24,6 +24,11 @@
- #include "libacl.h"
- #include "__acl_to_xattr.h"
- 
-+#ifdef USE_NFSV4_TRANS
-+ #include "libacl_nfs4.h"
-+ #include <nfsidmap.h>
-+#endif
-+
- #include "byteorder.h"
- #include "acl_ea.h"
- 
-@@ -37,10 +42,42 @@ acl_set_fd(int fd, acl_t acl)
- 	const char *name = ACL_EA_ACCESS;
- 	size_t size;
- 	int error;
-+#ifdef USE_NFSV4_TRANS
-+	int retval;
-+	struct nfs4_acl * nacl;
-+#endif
- 
- 	if (!acl_obj_p)
- 		return -1;
-+
-+#ifdef USE_NFSV4_TRANS
-+	retval = fgetxattr(fd, ACL_NFS4_XATTR, NULL, 0);
-+
-+	if(retval == -1 && (errno == ENOATTR || errno == EOPNOTSUPP)) {
-+		ext_acl_p = __acl_to_xattr(acl_obj_p, &size);
-+	} else {
-+		char domain[NFS4_MAX_DOMAIN_LEN];
-+		nfs4_init_name_mapping(NULL);
-+		error = nfs4_get_default_domain(NULL, domain, sizeof(domain));
-+		if (error)
-+			return -1;
-+		nacl = acl_nfs4_new(0);
-+		if (acl == NULL) {
-+			errno = ENOMEM;
-+			return -1;
-+		}
-+		error = acl_ptn4_acl_trans(acl, nacl, ACL_TYPE_ACCESS, 0, domain);
-+		if (error)
-+			return -1;
-+
-+		size = acl_nfs4_xattr_pack(nacl, &ext_acl_p);
-+		name = ACL_NFS4_XATTR;
-+		acl_nfs4_free(nacl);
-+	}
-+#else
- 	ext_acl_p = __acl_to_xattr(acl_obj_p, &size);
-+#endif
-+
- 	if (!ext_acl_p)
- 		return -1;
- 	error = fsetxattr(fd, name, (char *)ext_acl_p, size, 0);
---- acl-2.2.39/libacl/Makefile.orig	2006-06-20 02:51:25.000000000 -0400
-+++ acl-2.2.39/libacl/Makefile	2007-08-22 12:02:13.000000000 -0400
-@@ -8,19 +8,35 @@ LTLDFLAGS += -Wl,--version-script,$(TOPD
- include $(TOPDIR)/include/builddefs
- 
- LTLIBRARY = libacl.la
--LTLIBS = -lattr $(LIBMISC)
-+LTLIBS = -lattr -lnfsidmap $(LIBMISC)
- LTDEPENDENCIES = $(LIBMISC)
--LT_CURRENT = 2
-+LT_CURRENT = 3
- LT_REVISION = 0
--LT_AGE = 1
-+LT_AGE = 2
-+
-+CFILES = $(POSIX_CFILES) $(LIBACL_CFILES) $(LIBACL_NFS4_CFILES) \
-+	$(INTERNAL_CFILES) perm_copy_fd.c perm_copy_file.c
- 
--CFILES = $(POSIX_CFILES) $(LIBACL_CFILES) $(INTERNAL_CFILES) \
--	 perm_copy_fd.c perm_copy_file.c
- HFILES = libobj.h libacl.h byteorder.h __acl_from_xattr.h __acl_to_xattr.h \
--	 perm_copy.h
-+	 perm_copy.h $(LIBACL_NFS4_HFILES)
- 
- LCFLAGS = -include perm_copy.h
- 
-+LIBACL_NFS4_CFILES = \
-+	acl_nfs4_get_who.c \
-+	acl_n4tp_acl_trans.c       acl_nfs4_get_whotype.c \
-+	acl_nfs4_new.c \
-+	acl_nfs4_add_ace.c         acl_nfs4_remove_ace.c \
-+	acl_nfs4_add_pair.c \
-+	acl_nfs4_copy_acl.c        acl_nfs4_set_who.c \
-+	acl_nfs4_free.c            acl_nfs4_xattr_load.c \
-+	acl_nfs4_xattr_pack.c      acl_nfs4_xattr_size.c \
-+	acl_ptn4_acl_trans.c \
-+	acl_ptn4_get_mask.c        __posix_acl_from_nfs4_xattr.c \
-+
-+
-+LIBACL_NFS4_HFILES = ../include/libacl_nfs4.h ../include/nfs4.h
-+
- POSIX_CFILES = \
- 	acl_add_perm.c acl_calc_mask.c acl_clear_perms.c acl_copy_entry.c \
- 	acl_copy_ext.c acl_copy_int.c acl_create_entry.c acl_delete_def_file.c \
---- /dev/null	2007-08-22 11:21:03.626521839 -0400
-+++ acl-2.2.39/libacl/acl_nfs4_remove_ace.c	2007-08-22 12:02:13.000000000 -0400
-@@ -0,0 +1,48 @@
-+/*
-+ *  NFSv4 ACL Code
-+ *  Remove an ace from an NFS4 ACL
-+ *
-+ *  Copyright (c) 2004 The Regents of the University of Michigan.
-+ *  All rights reserved.
-+ *
-+ *  Nathaniel Gallaher <ngallahe@umich.edu>
-+ *
-+ *  Redistribution and use in source and binary forms, with or without
-+ *  modification, are permitted provided that the following conditions
-+ *  are met:
-+ *
-+ *  1. Redistributions of source code must retain the above copyright
-+ *     notice, this list of conditions, the following disclaimer, and
-+ *     any and all other licensing or copyright notices included in
-+ *     any files in this distribution.
-+ *  2. Redistributions in binary form must reproduce the above copyright
-+ *     notice, this list of conditions and the following disclaimer in the
-+ *     documentation and/or other materials provided with the distribution.
-+ *  3. Neither the name of the University nor the names of its
-+ *     contributors may be used to endorse or promote products derived
-+ *     from this software without specific prior written permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ */
-+
-+#include "libacl_nfs4.h"
-+
-+void acl_nfs4_remove_ace(struct nfs4_acl * acl, struct nfs4_ace * ace)
-+{
-+	TAILQ_REMOVE(&acl->ace_head, ace, l_ace);
-+	free(ace->who);
-+	free(ace);
-+	acl->naces--;
-+}
-+
---- /dev/null	2007-08-22 11:21:03.626521839 -0400
-+++ acl-2.2.39/libacl/acl_nfs4_set_who.c	2007-08-22 12:02:13.000000000 -0400
-@@ -0,0 +1,92 @@
-+/*
-+ *  NFSv4 ACL Code
-+ *  Write the who entry in the nfs4 ace. Who is a user supplied buffer
-+ *  containing a named who entry (null terminated string) if type is
-+ *  set to NFS4_ACL_WHO_NAMED. Otherwise, the who buffer is not used.
-+ *  The user supplied who buffer must be freed by the caller.
-+ *
-+ *  This code allocates the who buffer used in the ace. This must be freed
-+ *  upon ace removal by the ace_remove or acl_free.
-+ *
-+ *  Copyright (c) 2002, 2003 The Regents of the University of Michigan.
-+ *  All rights reserved.
-+ *
-+ *  Nathaniel Gallaher <ngallahe@umich.edu>
-+ *
-+ *  Redistribution and use in source and binary forms, with or without
-+ *  modification, are permitted provided that the following conditions
-+ *  are met:
-+ *
-+ *  1. Redistributions of source code must retain the above copyright
-+ *     notice, this list of conditions and the following disclaimer.
-+ *  2. Redistributions in binary form must reproduce the above copyright
-+ *     notice, this list of conditions and the following disclaimer in the
-+ *     documentation and/or other materials provided with the distribution.
-+ *  3. Neither the name of the University nor the names of its
-+ *     contributors may be used to endorse or promote products derived
-+ *     from this software without specific prior written permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include "libacl_nfs4.h"
-+
-+int acl_nfs4_set_who(struct nfs4_ace* ace, int type, char* who)
-+{
-+	char* iwho = NULL;
-+	int wholen;
-+
-+	if(ace == NULL)
-+		goto inval_failed;
-+
-+	switch(type)
-+	{
-+		case NFS4_ACL_WHO_NAMED:
-+			if(who == NULL)
-+				goto inval_failed;
-+			iwho = who;
-+			break;
-+		case NFS4_ACL_WHO_OWNER:
-+			iwho = NFS4_ACL_WHO_OWNER_STRING;
-+			break;
-+		case NFS4_ACL_WHO_GROUP:
-+			iwho = NFS4_ACL_WHO_GROUP_STRING;
-+			break;
-+		case NFS4_ACL_WHO_EVERYONE:
-+			iwho = NFS4_ACL_WHO_EVERYONE_STRING;
-+			break;
-+		default:
-+			goto inval_failed;
-+	}
-+
-+	wholen = strlen(iwho);
-+	if(wholen < 1)
-+		goto inval_failed;
-+
-+	ace->who = (char *) malloc(sizeof(char) * (wholen + 1));
-+	if(ace->who == NULL) {
-+		errno = ENOMEM;
-+		goto failed;
-+	}
-+
-+	strcpy(ace->who, iwho);
-+
-+	return 0;
-+
-+inval_failed:
-+	errno = EINVAL;
-+
-+failed:
-+	return -1;
-+}
-+
---- acl-2.2.39/libacl/acl_set_file.c.orig	2006-06-20 02:51:25.000000000 -0400
-+++ acl-2.2.39/libacl/acl_set_file.c	2007-08-22 12:02:13.000000000 -0400
-@@ -26,9 +26,38 @@
- #include "libacl.h"
- #include "__acl_to_xattr.h"
- 
-+#ifdef USE_NFSV4_TRANS
-+ #include "libacl_nfs4.h"
-+ #include <nfsidmap.h>
-+#endif
-+
- #include "byteorder.h"
- #include "acl_ea.h"
- 
-+#ifdef USE_NFSV4_TRANS
-+static struct nfs4_acl *get_nfs4_acl(const char *path_p, int is_dir)
-+{
-+	struct nfs4_acl * acl = NULL;
-+	ssize_t ret;
-+	char *buf;
-+
-+	ret = getxattr(path_p, ACL_NFS4_XATTR, NULL, 0);
-+	if (ret < 0)
-+		return NULL;
-+	buf = malloc(ret);
-+	if (buf == NULL)
-+		return NULL;
-+	ret = getxattr(path_p, ACL_NFS4_XATTR, buf, ret);
-+	if (ret < 0)
-+		goto out_free;
-+	acl = acl_nfs4_xattr_load(buf, ret, is_dir);
-+
-+out_free:
-+	free(buf);
-+	return acl;
-+}
-+
-+#endif
- 
- /* 23.4.22 */
- int
-@@ -39,9 +68,15 @@ acl_set_file(const char *path_p, acl_typ
- 	const char *name;
- 	size_t size;
- 	int error;
-+	struct stat st;
-+#ifdef USE_NFSV4_TRANS
-+	struct nfs4_acl * nacl;
-+	int is_dir = NFS4_ACL_ISFILE;
-+#endif
- 
- 	if (!acl_obj_p)
- 		return -1;
-+
- 	switch (type) {
- 		case ACL_TYPE_ACCESS:
- 			name = ACL_EA_ACCESS;
-@@ -54,8 +89,41 @@ acl_set_file(const char *path_p, acl_typ
- 			return -1;
- 	}
- 
-+
-+#ifdef USE_NFSV4_TRANS
-+	if (stat(path_p, &st) != 0)
-+		return -1;
-+	if (S_ISDIR(st.st_mode))
-+		is_dir = NFS4_ACL_ISDIR;
-+	if (type == ACL_TYPE_DEFAULT && !is_dir) {
-+		errno = EACCES;
-+		return -1;
-+	}
-+	nacl = get_nfs4_acl(path_p, is_dir);
-+	if (nacl == NULL && (errno == ENOATTR || errno == EOPNOTSUPP))
-+		ext_acl_p = __acl_to_xattr(acl_obj_p, &size);
-+	else {
-+		char domain[NFS4_MAX_DOMAIN_LEN];
-+
-+		nfs4_init_name_mapping(NULL);
-+		error = nfs4_get_default_domain(NULL, domain, sizeof(domain));
-+		if (error) {
-+			acl_nfs4_free(nacl);
-+			return -1;
-+		}
-+		error = acl_ptn4_acl_trans(acl, nacl, type, is_dir, domain);
-+		if (error) {
-+			acl_nfs4_free(nacl);
-+			return -1;
-+		}
-+
-+		size = acl_nfs4_xattr_pack(nacl, &ext_acl_p);
-+		name = ACL_NFS4_XATTR;
-+		acl_nfs4_free(nacl);
-+	}
-+#else
-+
- 	if (type == ACL_TYPE_DEFAULT) {
--		struct stat st;
- 
- 		if (stat(path_p, &st) != 0)
- 			return -1;
-@@ -68,6 +136,8 @@ acl_set_file(const char *path_p, acl_typ
- 	}
- 
- 	ext_acl_p = __acl_to_xattr(acl_obj_p, &size);
-+#endif
-+
- 	if (!ext_acl_p)
- 		return -1;
- 	error = setxattr(path_p, name, (char *)ext_acl_p, size, 0);
---- /dev/null	2007-08-22 11:21:03.626521839 -0400
-+++ acl-2.2.39/libacl/__posix_acl_from_nfs4_xattr.c	2007-08-22 12:02:13.000000000 -0400
-@@ -0,0 +1,60 @@
-+/*
-+ *  NFSv4 ACL Code
-+ *  Convert NFSv4 xattr values to a posix ACL
-+ *
-+ *  Copyright (c) 2002, 2003 The Regents of the University of Michigan.
-+ *  All rights reserved.
-+ *
-+ *  Nathaniel Gallaher <ngallahe@umich.edu>
-+ *
-+ *  Redistribution and use in source and binary forms, with or without
-+ *  modification, are permitted provided that the following conditions
-+ *  are met:
-+ *
-+ *  1. Redistributions of source code must retain the above copyright
-+ *     notice, this list of conditions and the following disclaimer.
-+ *  2. Redistributions in binary form must reproduce the above copyright
-+ *     notice, this list of conditions and the following disclaimer in the
-+ *     documentation and/or other materials provided with the distribution.
-+ *  3. Neither the name of the University nor the names of its
-+ *     contributors may be used to endorse or promote products derived
-+ *     from this software without specific prior written permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <acl/libacl.h>
-+#include "libacl_nfs4.h"
-+
-+/* xattr_v is a char buffer filled with the nfsv4 xattr value.
-+ * xattr_size should be the byte count of the length of the xattr_v
-+ * data size. xattr_v may be larger than <xattr_size> bytes, but only
-+ * the first <xattr_size> bytes will be read. <type> is the posix acl
-+ * type requested. Currently either default, or access */
-+
-+acl_t __posix_acl_from_nfs4_xattr(char* xattr_v,
-+		int xattr_size, acl_type_t ptype, u32 is_dir)
-+{
-+	struct nfs4_acl *	nfsacl = NULL;
-+	acl_t pacl;
-+
-+	nfsacl = acl_nfs4_xattr_load(xattr_v, xattr_size, is_dir);
-+	if(nfsacl == NULL) {
-+		return NULL;
-+	}
-+
-+	pacl = acl_n4tp_acl_trans(nfsacl, ptype);
-+
-+	return pacl;
-+}
-+
---- /dev/null	2007-08-22 11:21:03.626521839 -0400
-+++ acl-2.2.39/libacl/acl_nfs4_xattr_load.c	2007-08-22 12:02:13.000000000 -0400
-@@ -0,0 +1,191 @@
-+/*
-+ *  NFSv4 ACL Code
-+ *  Convert NFSv4 xattr values to a posix ACL
-+ *
-+ *  Copyright (c) 2002, 2003 The Regents of the University of Michigan.
-+ *  All rights reserved.
-+ *
-+ *  Nathaniel Gallaher <ngallahe@umich.edu>
-+ *
-+ *  Redistribution and use in source and binary forms, with or without
-+ *  modification, are permitted provided that the following conditions
-+ *  are met:
-+ *
-+ *  1. Redistributions of source code must retain the above copyright
-+ *     notice, this list of conditions and the following disclaimer.
-+ *  2. Redistributions in binary form must reproduce the above copyright
-+ *     notice, this list of conditions and the following disclaimer in the
-+ *     documentation and/or other materials provided with the distribution.
-+ *  3. Neither the name of the University nor the names of its
-+ *     contributors may be used to endorse or promote products derived
-+ *     from this software without specific prior written permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+
-+#include <acl/libacl.h>
-+#include <netinet/in.h>
-+#include "libacl_nfs4.h"
-+
-+
-+struct nfs4_acl * acl_nfs4_xattr_load(
-+		char *	xattr_v,
-+		int		xattr_size,
-+		u32		is_dir)
-+{
-+	struct nfs4_acl *	nacl_p;
-+	char* bufp = xattr_v;
-+	int bufs = xattr_size;
-+	u32 ace_n;
-+	u32	wholen;
-+	char* who;
-+	int d_ptr;
-+	u32 num_aces;
-+
-+	u32 type, flag, access_mask;
-+
-+	if(xattr_size < sizeof(u32)) {
-+		errno = EINVAL;
-+		return NULL;
-+	}
-+
-+	if((nacl_p = acl_nfs4_new(is_dir)) == NULL) {
-+		errno = ENOMEM;
-+		return NULL;
-+	}
-+
-+	/* Grab the number of aces in the acl */
-+	num_aces = (u32)ntohl(*((u32*)(bufp)));
-+
-+#ifdef LIBACL_NFS4_DEBUG
-+	printf(" Got number of aces: %d\n", nacl_p->naces);
-+#endif
-+
-+
-+	d_ptr = sizeof(u32);
-+	bufp += d_ptr;
-+	bufs -= d_ptr;
-+
-+	for(ace_n = 0; num_aces > ace_n ; ace_n++)
-+	{
-+#ifdef LIBACL_NFS4_DEBUG
-+		printf(" Getting Ace #%d of %d\n", ace_n, num_aces);
-+#endif
-+		/* Get the acl type */
-+		if(bufs <= 0) {
-+			errno = EINVAL;
-+			goto bad_xattr_val;
-+		}
-+
-+		type = (u32)ntohl(*((u32*)bufp));
-+#ifdef LIBACL_NFS4_DEBUG
-+		printf("  Type: %x\n", type);
-+#endif
-+
-+		d_ptr = sizeof(u32);
-+		bufp += d_ptr;
-+		bufs -= d_ptr;
-+
-+		/* Get the acl flag */
-+		if(bufs <= 0) {
-+			errno = EINVAL;
-+			goto bad_xattr_val;
-+		}
-+
-+		flag = (u32)ntohl(*((u32*)bufp));
-+#ifdef LIBACL_NFS4_DEBUG
-+		printf("  Flag: %x\n", flag);
-+#endif
-+
-+		bufp += d_ptr;
-+		bufs -= d_ptr;
-+
-+		/* Get the access mask */
-+
-+		if(bufs <= 0) {
-+			errno = EINVAL;
-+			goto bad_xattr_val;
-+		}
-+
-+		access_mask = (u32)ntohl(*((u32*)bufp));
-+#ifdef LIBACL_NFS4_DEBUG
-+		printf("  Access Mask: %x\n", access_mask);
-+#endif
-+
-+		bufp += d_ptr;
-+		bufs -= d_ptr;
-+
-+		/* Get the who string length*/
-+		if(bufs <= 0) {
-+			errno = EINVAL;
-+			goto bad_xattr_val;
-+		}
-+
-+		wholen = (u32)ntohl(*((u32*)bufp));
-+#ifdef LIBACL_NFS4_DEBUG
-+		printf("  Wholen: %d\n", wholen);
-+#endif
-+
-+		bufp += d_ptr;
-+		bufs -= d_ptr;
-+
-+		/* Get the who string */
-+		if(bufs <= 0) {
-+			errno = EINVAL;
-+			goto bad_xattr_val;
-+		}
-+
-+		who = (char *) malloc((wholen+1) * sizeof(char));
-+		if(who == NULL)
-+		{
-+			errno = ENOMEM;
-+			goto bad_xattr_val;
-+		}
-+
-+		memcpy(who, bufp, wholen);
-+
-+		who[wholen] = '\0';
-+
-+#ifdef LIBACL_NFS4_DEBUG
-+		printf("  Who: %s\n", who);
-+#endif
-+
-+		d_ptr = ((wholen / sizeof(u32))*sizeof(u32));
-+		if(wholen % sizeof(u32) != 0)
-+			d_ptr += sizeof(u32);
-+
-+		bufp += d_ptr;
-+		bufs -= d_ptr;
-+
-+		/* Make sure we aren't outside our domain */
-+		if(bufs < 0) {
-+			free(who);
-+			goto bad_xattr_val;
-+		}
-+
-+		if(acl_nfs4_add_ace(nacl_p, type, flag, access_mask, acl_nfs4_get_whotype(who), who) < 0) {
-+			free(who);
-+			goto bad_xattr_val;
-+		}
-+
-+		free(who);
-+	}
-+
-+	return nacl_p;
-+
-+bad_xattr_val:
-+	/* We bailed for some reason */
-+	acl_nfs4_free(nacl_p);
-+	return NULL;
-+}
---- /dev/null	2007-08-22 11:21:03.626521839 -0400
-+++ acl-2.2.39/libacl/acl_nfs4_xattr_pack.c	2007-08-22 12:02:13.000000000 -0400
-@@ -0,0 +1,148 @@
-+/*
-+ *  NFSv4 ACL Code
-+ *  Pack an NFS4 ACL into an XDR encoded buffer.
-+ *
-+ *  Copyright (c) 2002, 2003 The Regents of the University of Michigan.
-+ *  All rights reserved.
-+ *
-+ *  Nathaniel Gallaher <ngallahe@umich.edu>
-+ *
-+ *  Redistribution and use in source and binary forms, with or without
-+ *  modification, are permitted provided that the following conditions
-+ *  are met:
-+ *
-+ *  1. Redistributions of source code must retain the above copyright
-+ *     notice, this list of conditions and the following disclaimer.
-+ *  2. Redistributions in binary form must reproduce the above copyright
-+ *     notice, this list of conditions and the following disclaimer in the
-+ *     documentation and/or other materials provided with the distribution.
-+ *  3. Neither the name of the University nor the names of its
-+ *     contributors may be used to endorse or promote products derived
-+ *     from this software without specific prior written permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <libacl_nfs4.h>
-+#include <netinet/in.h>
-+
-+int acl_nfs4_xattr_pack(struct nfs4_acl * acl, char** bufp)
-+{
-+	struct nfs4_ace * ace;
-+	int buflen;
-+	int rbuflen;
-+	int num_aces;
-+	int ace_num;
-+	int wholen;
-+	int result;
-+	char* p;
-+	char* who;
-+
-+	if(acl == NULL || bufp == NULL)
-+	{
-+		errno = EINVAL;
-+		goto failed;
-+	}
-+
-+	buflen = acl_nfs4_xattr_size(acl);
-+	if(buflen < 0)
-+	{
-+		goto failed;
-+	}
-+
-+	*bufp = (char*) malloc(buflen);
-+	if(*bufp == NULL) {
-+		errno = ENOMEM;
-+		goto failed;
-+	}
-+
-+	p = *bufp;
-+
-+	num_aces = acl->naces;
-+
-+	*((u32*)p) = htonl(num_aces);
-+
-+	rbuflen = sizeof(u32);
-+	p += sizeof(u32);
-+
-+	ace = acl->ace_head.tqh_first;
-+	ace_num = 1;
-+
-+	while(1)
-+	{
-+		if(ace == NULL)
-+		{
-+			if(ace_num > num_aces) {
-+				break;
-+			} else {
-+				errno = ENODATA;
-+				goto failed;
-+			}
-+		}
-+
-+		*((u32*)p) = htonl(ace->type);
-+		p += sizeof(u32);
-+		rbuflen += sizeof(u32);
-+
-+		*((u32*)p) = htonl(ace->flag);
-+		p += sizeof(u32);
-+		rbuflen += sizeof(u32);
-+
-+		*((u32*)p) = htonl(ace->access_mask);
-+		p += sizeof(u32);
-+		rbuflen += sizeof(u32);
-+
-+		result = acl_nfs4_get_who(ace, NULL, &who);
-+		if(result < 0) {
-+			goto free_failed;
-+		}
-+
-+		wholen = strlen(who);
-+		*((u32*)p) = htonl(wholen);
-+		rbuflen += sizeof(u32);
-+
-+		p += sizeof(u32);
-+
-+		memcpy(p, who, wholen);
-+		free(who);
-+
-+		p += (wholen / NFS4_XDR_MOD) * NFS4_XDR_MOD;
-+		if(wholen % NFS4_XDR_MOD) {
-+			p += NFS4_XDR_MOD;
-+		}
-+
-+		rbuflen += (wholen / NFS4_XDR_MOD) * NFS4_XDR_MOD;
-+		if(wholen % NFS4_XDR_MOD) {
-+			rbuflen += NFS4_XDR_MOD;
-+		}
-+
-+		ace = ace->l_ace.tqe_next;
-+		ace_num++;
-+	}
-+
-+	if (buflen != rbuflen)
-+	{
-+		goto free_failed;
-+	}
-+	return buflen;
-+
-+free_failed:
-+	free(*bufp);
-+	*bufp = NULL;
-+
-+failed:
-+	return -1;
-+}
-+
-+
-+
---- acl-2.2.39/libacl/acl_extended_file.c.orig	2006-06-20 02:51:25.000000000 -0400
-+++ acl-2.2.39/libacl/acl_extended_file.c	2007-08-22 12:02:13.000000000 -0400
-@@ -22,6 +22,7 @@
- #include <unistd.h>
- #include <attr/xattr.h>
- #include "libacl.h"
-+#include "libacl_nfs4.h"
- 
- #include "byteorder.h"
- #include "acl_ea.h"
-@@ -33,6 +34,34 @@ acl_extended_file(const char *path_p)
- 	int base_size = sizeof(acl_ea_header) + 3 * sizeof(acl_ea_entry);
- 	int retval;
- 
-+	/* XXX: Ugh: what's the easiest way to do this, taking
-+	 * into account default acl's, and that length alone won't do this?
-+	 * Also I'm a little uncomfortable with the amount of #ifdef
-+	 * NFS4 stuff that's going on.  We need a cleaner separation. */
-+#ifdef USE_NFSV4_TRANS
-+	retval = getxattr(path_p, ACL_NFS4_XATTR, NULL, 0);
-+	if (retval < 0 && errno != ENOATTR && errno != EOPNOTSUPP)
-+		return -1;
-+	if (retval >= 0) {
-+		struct nfs4_acl *nfsacl;
-+		char *ext_acl_p = alloca(retval);
-+		if (!ext_acl_p)
-+			return -1;
-+
-+		retval = getxattr(path_p, ACL_NFS4_XATTR, ext_acl_p, retval);
-+		if (retval == -1)
-+			return -1;
-+
-+		nfsacl = acl_nfs4_xattr_load(ext_acl_p, retval, NFS4_ACL_ISFILE);
-+		if (nfsacl) {
-+			int count = nfsacl->naces;
-+			acl_nfs4_free(nfsacl);
-+			return count > 6;
-+		}
-+		return 0;
-+	}
-+#endif
-+
- 	retval = getxattr(path_p, ACL_EA_ACCESS, NULL, 0);
- 	if (retval < 0 && errno != ENOATTR && errno != ENODATA)
- 		return -1;
---- /dev/null	2007-08-22 11:21:03.626521839 -0400
-+++ acl-2.2.39/libacl/acl_ptn4_acl_trans.c	2007-08-22 12:02:13.000000000 -0400
-@@ -0,0 +1,509 @@
-+/*
-+ *  NFSv4 ACL Code
-+ *  Convert a posix ACL to an NFSv4 ACL
-+ *
-+ *  Copyright (c) 2002, 2003 The Regents of the University of Michigan.
-+ *  All rights reserved.
-+ *
-+ *  Nathaniel Gallaher <ngallahe@umich.edu>
-+ *  J. Bruce Fields <bfields@umich.edu>
-+ *
-+ *  Redistribution and use in source and binary forms, with or without
-+ *  modification, are permitted provided that the following conditions
-+ *  are met:
-+ *
-+ *  1. Redistributions of source code must retain the above copyright
-+ *     notice, this list of conditions and the following disclaimer.
-+ *  2. Redistributions in binary form must reproduce the above copyright
-+ *     notice, this list of conditions and the following disclaimer in the
-+ *     documentation and/or other materials provided with the distribution.
-+ *  3. Neither the name of the University nor the names of its
-+ *     contributors may be used to endorse or promote products derived
-+ *     from this software without specific prior written permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <acl/libacl.h>
-+#include <nfsidmap.h>
-+#include "libacl_nfs4.h"
-+
-+
-+#define FILE_OR_DIR_INHERIT (NFS4_ACE_FILE_INHERIT_ACE \
-+		| NFS4_ACE_DIRECTORY_INHERIT_ACE)
-+#define NFS4_INHERITANCE_FLAGS (FILE_OR_DIR_INHERIT | NFS4_ACE_INHERIT_ONLY_ACE)
-+
-+/* Plan:
-+ * 1: if setting default, remove all purely inherited aces, and replace
-+ *    all dual-use aces by purely effective aces
-+ * 2: if setting effective, remove all purely effective aces, and replace
-+ *    all dual-use aces by purely inherited ones
-+ */
-+static void purge_aces(struct nfs4_acl *nacl, acl_type_t type)
-+{
-+	struct nfs4_ace *p, *next;
-+
-+	for (p = nacl->ace_head.tqh_first; p != NULL; p = next) {
-+		next = p->l_ace.tqe_next;
-+
-+		if (!(p->flag & FILE_OR_DIR_INHERIT)) {
-+			/* purely effective */
-+			if (type == ACL_TYPE_ACCESS)
-+				acl_nfs4_remove_ace(nacl, p);
-+		} else if (p->flag & NFS4_ACE_INHERIT_ONLY_ACE) {
-+			/* purely inherited */
-+			if (type == ACL_TYPE_DEFAULT)
-+				acl_nfs4_remove_ace(nacl, p);
-+		} else {
-+			/* both effective and inherited */
-+			if (type == ACL_TYPE_DEFAULT) {
-+				/* Change to purely effective */
-+				p->flag &= ~NFS4_INHERITANCE_FLAGS;
-+			} else { /* ACL_TYPE_ACCESS */
-+				/* Change to purely inherited */
-+				p->flag |= NFS4_INHERITANCE_FLAGS;
-+			}
-+		}
-+
-+	}
-+}
-+ 
-+int
-+acl_ptn4_acl_trans(acl_t pacl, struct nfs4_acl *acl, acl_type_t type, u32 is_dir, char *nfs_domain)
-+{
-+	int eflag;
-+	u32 mask, mask_mask = 0;
-+	int num_aces;
-+	int result, result2;
-+	u32 iflags = NFS4_ACL_NOFLAGS;
-+	int allocated = 0;
-+
-+	acl_entry_t pace_p;
-+	acl_tag_t ace_type;
-+	acl_permset_t perms;
-+
-+	char who_buf_static[NFS4_ACL_WHO_BUFFER_LEN_GUESS];
-+	char *who_buf = NULL;
-+	int who_buflen;
-+	int who_buflen_static = NFS4_ACL_WHO_BUFFER_LEN_GUESS;
-+	uid_t * uid_p;
-+	gid_t * gid_p;
-+
-+	eflag = 0;
-+
-+	if (type == ACL_TYPE_DEFAULT) {
-+		eflag = NFS4_INHERITANCE_FLAGS;
-+		iflags |= NFS4_ACL_REQUEST_DEFAULT;
-+	}
-+
-+	purge_aces(acl, type);
-+
-+	if (is_dir & NFS4_ACL_ISDIR)
-+		iflags |= NFS4_ACL_ISDIR;
-+
-+
-+	if (pacl == NULL || (acl_valid(pacl) < 0 || acl_entries(pacl) == 0)) {
-+		errno = EINVAL;
-+		goto out;
-+	}
-+
-+	/* Start Conversion */
-+
-+	/* 3 aces minimum (mode bits) */
-+	num_aces = acl_entries(pacl);
-+	if (num_aces < 3) {
-+		errno = EINVAL;
-+		goto out;
-+	}
-+
-+	/* Get the mask entry */
-+
-+	result = acl_get_entry(pacl, ACL_FIRST_ENTRY, &pace_p);
-+	if (result < 0)
-+		goto out;
-+
-+	while (result > 0 && mask_mask == 0) {
-+		result = acl_get_tag_type(pace_p, &ace_type);
-+		if (result < 0)
-+			goto out;
-+
-+		if (ace_type == ACL_MASK) {
-+			result = acl_get_permset(pace_p, &perms);
-+			if(result < 0)
-+				goto out;
-+
-+			result = acl_ptn4_get_mask(&mask_mask, perms, iflags);
-+			if(result < 0)
-+				goto out;
-+
-+			mask_mask = ~mask_mask;
-+		}
-+
-+		result = acl_get_entry(pacl, ACL_NEXT_ENTRY, &pace_p);
-+		if (result < 0)
-+			goto out;
-+	}
-+
-+	/* Get the file owner entry */
-+	result = acl_get_entry(pacl, ACL_FIRST_ENTRY, &pace_p);
-+	if (result < 0)
-+		goto out;
-+
-+	result = acl_get_tag_type(pace_p, &ace_type);
-+	if (result < 0)
-+		goto out;
-+
-+	if (ace_type != ACL_USER_OBJ) {
-+		errno = EINVAL;
-+		goto out;
-+	}
-+
-+	result = acl_get_permset(pace_p, &perms);
-+	if (result < 0)
-+		goto out;
-+
-+	result = acl_ptn4_get_mask(&mask, perms, iflags | NFS4_ACL_OWNER);
-+	if (result < 0)
-+		goto out;
-+
-+	result = acl_nfs4_add_pair(acl, eflag, mask, NFS4_ACL_WHO_OWNER, NULL);
-+
-+	if (result < 0)
-+		goto out;
-+
-+	result = acl_get_entry(pacl, ACL_NEXT_ENTRY, &pace_p);
-+	if (result < 0)
-+		goto out;
-+
-+	result2 = acl_get_tag_type(pace_p, &ace_type);
-+	if (result2 < 0)
-+		goto out;
-+
-+	while (ace_type == ACL_USER && result > 0) {
-+		result = acl_get_permset(pace_p, &perms);
-+		if (result < 0)
-+			goto out;
-+
-+		result = acl_ptn4_get_mask(&mask, perms, iflags);
-+		if (result < 0)
-+			goto out;
-+
-+		uid_p = acl_get_qualifier(pace_p);
-+
-+		who_buf = who_buf_static;
-+		who_buflen = who_buflen_static;
-+
-+		result = nfs4_init_name_mapping(NULL);
-+		result = nfs4_uid_to_name(*uid_p, nfs_domain, who_buf, who_buflen);
-+
-+
-+		while (result == -ENOBUFS) {
-+			if (who_buf != who_buf_static)
-+				free(who_buf);
-+
-+			/* Increase the size by a full buflen unit */
-+			who_buflen += who_buflen_static;
-+			who_buf = malloc(who_buflen);
-+
-+			if (who_buf == NULL) {
-+				result = -ENOMEM;
-+				break;
-+			}
-+
-+			result = nfs4_init_name_mapping(NULL);
-+			result = nfs4_uid_to_name(*uid_p, nfs_domain, who_buf, who_buflen);
-+
-+		}
-+		acl_free(uid_p);
-+		if (result < 0) {
-+			errno = -result;
-+			goto out;
-+		}
-+
-+		if (who_buf == NULL)
-+			goto out;
-+
-+		result = acl_nfs4_add_ace(acl, NFS4_ACE_ACCESS_DENIED_ACE_TYPE,
-+				eflag,  mask_mask, NFS4_ACL_WHO_NAMED, who_buf);
-+		if (result < 0) {
-+			if(who_buf != who_buf_static)
-+				free(who_buf);
-+			goto out;
-+		}
-+
-+		result = acl_nfs4_add_pair(acl, eflag, mask, NFS4_ACL_WHO_NAMED,
-+				who_buf);
-+		if (who_buf != who_buf_static)
-+			free(who_buf);
-+		if (result < 0)
-+			goto out;
-+
-+		result = acl_get_entry(pacl, ACL_NEXT_ENTRY, &pace_p);
-+		if (result <= 0)
-+			goto out;
-+
-+		result2 = acl_get_tag_type(pace_p, &ace_type);
-+		if (result2 < 0)
-+			goto out;
-+
-+	}
-+
-+	/* In the case of groups, we apply allow ACEs first, then deny ACEs,
-+	 * since a user can be in more than one group.  */
-+
-+	/* allow ACEs */
-+
-+	if (num_aces > 3) {
-+		result2 = acl_get_tag_type(pace_p, &ace_type);
-+		if (result2 < 0)
-+			goto out;
-+
-+		if (ace_type != ACL_GROUP_OBJ) {
-+			errno = EINVAL;
-+			goto out;
-+		}
-+
-+		result = acl_nfs4_add_ace(acl, NFS4_ACE_ACCESS_DENIED_ACE_TYPE,
-+				NFS4_ACE_IDENTIFIER_GROUP | eflag, mask_mask,
-+				NFS4_ACL_WHO_GROUP, NULL);
-+
-+		if (result < 0)
-+			goto out;
-+	}
-+
-+	result = acl_get_permset(pace_p, &perms);
-+	if (result < 0)
-+		goto out;
-+
-+	result = acl_ptn4_get_mask(&mask, perms, iflags);
-+	if (result < 0)
-+		goto out;
-+
-+	result = acl_nfs4_add_ace(acl, NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE,
-+			NFS4_ACE_IDENTIFIER_GROUP | eflag, mask, NFS4_ACL_WHO_GROUP, NULL);
-+
-+	if (result < 0)
-+		goto out;
-+
-+	result = acl_get_entry(pacl, ACL_NEXT_ENTRY, &pace_p);
-+	if (result <= 0)
-+		goto out;
-+
-+	result2 = acl_get_tag_type(pace_p, &ace_type);
-+	if (result2 < 0)
-+		goto out;
-+
-+	while (ace_type == ACL_GROUP && result > 0) {
-+		result = acl_get_permset(pace_p, &perms);
-+		if (result < 0)
-+			goto out;
-+
-+		result = acl_ptn4_get_mask(&mask, perms, iflags);
-+		if (result < 0)
-+			goto out;
-+
-+		gid_p = acl_get_qualifier(pace_p);
-+
-+		who_buf = who_buf_static;
-+		who_buflen = who_buflen_static;
-+
-+		result = nfs4_gid_to_name(*gid_p, nfs_domain, who_buf, who_buflen);
-+
-+
-+		while (result == -ENOBUFS) {
-+			if (who_buf != who_buf_static)
-+				free(who_buf);
-+
-+			/* Increase the size by a full buflen unit */
-+			who_buflen += who_buflen_static;
-+			who_buf = malloc(who_buflen);
-+
-+			if (who_buf == NULL) {
-+				result = -ENOMEM;
-+				break;
-+			}
-+
-+			result = nfs4_gid_to_name(*gid_p, nfs_domain, who_buf, who_buflen);
-+		}
-+
-+		acl_free(gid_p);
-+
-+		if (result < 0) {
-+			errno = -result;
-+			goto out;
-+		}
-+
-+		if (who_buf == NULL)
-+			goto out;
-+
-+		result = acl_nfs4_add_ace(acl, NFS4_ACE_ACCESS_DENIED_ACE_TYPE,
-+				NFS4_ACE_IDENTIFIER_GROUP | eflag, mask_mask,
-+				NFS4_ACL_WHO_NAMED, who_buf);
-+		if (result < 0) {
-+			if(who_buf != who_buf_static)
-+				free(who_buf);
-+			goto out;
-+		}
-+
-+		result = acl_nfs4_add_ace(acl, NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE,
-+		    	NFS4_ACE_IDENTIFIER_GROUP | eflag, mask,
-+				NFS4_ACL_WHO_NAMED, who_buf);
-+
-+		if (who_buf != who_buf_static)
-+			free(who_buf);
-+
-+		if (result < 0)
-+			goto out;
-+		result = acl_get_entry(pacl, ACL_NEXT_ENTRY, &pace_p);
-+		if (result <= 0)
-+			goto out;
-+
-+		result2 = acl_get_tag_type(pace_p, &ace_type);
-+		if (result2 < 0)
-+			goto out;
-+	}
-+
-+	/* deny ACEs */
-+
-+	result = acl_get_entry(pacl, ACL_FIRST_ENTRY, &pace_p);
-+	if (result <= 0)
-+		goto out;
-+
-+	result2 = acl_get_tag_type(pace_p, &ace_type);
-+	if (result2 < 0)
-+		goto out;
-+
-+	while (ace_type != ACL_GROUP_OBJ && result > 0) {
-+		result = acl_get_entry(pacl, ACL_NEXT_ENTRY, &pace_p);
-+		if(result <= 0)
-+			goto out;
-+
-+		result2 = acl_get_tag_type(pace_p, &ace_type);
-+		if(result2 < 0)
-+			goto out;
-+	}
-+
-+	result = acl_get_permset(pace_p, &perms);
-+	if (result < 0)
-+		goto out;
-+
-+	result = acl_ptn4_get_mask(&mask, perms, iflags);
-+	if (result < 0)
-+		goto out;
-+
-+	result = acl_nfs4_add_ace(acl, NFS4_ACE_ACCESS_DENIED_ACE_TYPE,
-+			NFS4_ACE_IDENTIFIER_GROUP | eflag, ~mask, NFS4_ACL_WHO_GROUP,
-+			NULL);
-+
-+	if (result < 0)
-+		goto out;
-+
-+	result = acl_get_entry(pacl, ACL_NEXT_ENTRY, &pace_p);
-+	if (result <= 0)
-+		goto out;
-+
-+	result2 = acl_get_tag_type(pace_p, &ace_type);
-+	if (result2 < 0)
-+		goto out;
-+
-+	while (ace_type == ACL_GROUP && result > 0) {
-+		result = acl_get_permset(pace_p, &perms);
-+		if (result < 0)
-+			goto out;
-+
-+		result = acl_ptn4_get_mask(&mask, perms, iflags);
-+		if (result < 0)
-+			goto out;
-+
-+		gid_p = acl_get_qualifier(pace_p);
-+
-+		who_buf = who_buf_static;
-+		who_buflen = who_buflen_static;
-+
-+		result = nfs4_gid_to_name(*gid_p, nfs_domain, who_buf, who_buflen);
-+
-+
-+		while (result == -ENOBUFS) {
-+			if (who_buf != who_buf_static)
-+				free(who_buf);
-+
-+			/* Increase the size by a full buflen unit */
-+			who_buflen += who_buflen_static;
-+			who_buf = malloc(who_buflen);
-+
-+			if (who_buf == NULL) {
-+				result = -ENOMEM;
-+				break;
-+			}
-+
-+			result = nfs4_gid_to_name(*gid_p, nfs_domain, who_buf, who_buflen);
-+		}
-+
-+		acl_free(gid_p);
-+
-+		if (result < 0) {
-+			errno = -result;
-+			goto out;
-+		}
-+
-+		if (who_buf == NULL)
-+			goto out;
-+
-+		result = acl_nfs4_add_ace(acl, NFS4_ACE_ACCESS_DENIED_ACE_TYPE,
-+		    		NFS4_ACE_IDENTIFIER_GROUP | eflag, ~mask,
-+					NFS4_ACL_WHO_NAMED, who_buf);
-+		if (who_buf != who_buf_static)
-+			free(who_buf);
-+		if (result < 0)
-+			goto out;
-+
-+		result = acl_get_entry(pacl, ACL_NEXT_ENTRY, &pace_p);
-+		if (result <= 0)
-+			goto out;
-+
-+		result2 = acl_get_tag_type(pace_p, &ace_type);
-+		if (result2 < 0)
-+			goto out;
-+	}
-+
-+	if (ace_type == ACL_MASK) {
-+		result = acl_get_entry(pacl, ACL_NEXT_ENTRY, &pace_p);
-+		if (result <= 0)
-+			goto out;
-+
-+		result2 = acl_get_tag_type(pace_p, &ace_type);
-+		if (result2 < 0)
-+			goto out;
-+	}
-+
-+	if (ace_type != ACL_OTHER) {
-+		errno = EINVAL;
-+		goto out;
-+	}
-+
-+	result = acl_get_permset(pace_p, &perms);
-+	if (result < 0)
-+		goto out;
-+
-+	result = acl_ptn4_get_mask(&mask, perms, iflags);
-+	if (result < 0)
-+		goto out;
-+
-+	result = acl_nfs4_add_pair(acl, eflag, mask, NFS4_ACL_WHO_EVERYONE, NULL);
-+
-+	return result;
-+out:
-+	if (allocated)
-+		acl_nfs4_free(acl);
-+	return -1;
-+}
---- acl-2.2.39/libacl/acl_get_fd.c.orig	2006-06-20 02:51:25.000000000 -0400
-+++ acl-2.2.39/libacl/acl_get_fd.c	2007-08-22 12:02:13.000000000 -0400
-@@ -28,6 +28,10 @@
- #include "libacl.h"
- #include "__acl_from_xattr.h"
- 
-+#ifdef USE_NFSV4_TRANS
-+ #include "libacl_nfs4.h"
-+#endif
-+
- #include "byteorder.h"
- #include "acl_ea.h"
- 
-@@ -38,31 +42,59 @@ acl_get_fd(int fd)
- {
- 	const size_t size_guess = acl_ea_size(16);
- 	char *ext_acl_p = alloca(size_guess);
-+	char *name = ACL_EA_ACCESS;
- 	int retval;
-+	int nfsv4acls;
- 
- 	if (!ext_acl_p)
- 		return NULL;
--	retval = fgetxattr(fd, ACL_EA_ACCESS, ext_acl_p, size_guess);
-+
-+#ifdef USE_NFSV4_TRANS
-+	retval = fgetxattr(fd, ACL_NFS4_XATTR, ext_acl_p, size_guess);
-+	if(retval == -1 && (errno == ENOATTR || errno == EOPNOTSUPP)) {
-+		nfsv4acls = ACL_NFS4_NOT_USED;
-+		retval = fgetxattr(fd, name, ext_acl_p, size_guess);
-+	} else {
-+		nfsv4acls = ACL_NFS4_USED;
-+		name = ACL_NFS4_XATTR;
-+	}
-+#else
-+	retval = fgetxattr(fd, name, ext_acl_p, size_guess);
-+#endif
-+
- 	if (retval == -1 && errno == ERANGE) {
--		retval = fgetxattr(fd, ACL_EA_ACCESS, NULL, 0);
-+		retval = fgetxattr(fd, name, NULL, 0);
- 		if (retval > 0) {
- 			ext_acl_p = alloca(retval);
- 			if (!ext_acl_p)
- 				return NULL;
--			retval = fgetxattr(fd, ACL_EA_ACCESS, ext_acl_p,retval);
-+			retval = fgetxattr(fd, name, ext_acl_p, retval);
- 		}
- 	}
- 	if (retval > 0) {
--		acl_t acl = __acl_from_xattr(ext_acl_p, retval);
--		return acl;
-+#ifdef USE_NFSV4_TRANS
-+		if(nfsv4acls == ACL_NFS4_USED) {
-+			acl_t acl = __posix_acl_from_nfs4_xattr(ext_acl_p, retval,
-+					ACL_TYPE_ACCESS, NFS4_ACL_ISFILE);
-+
-+			return acl;
-+		}
-+		else
-+#endif
-+		{
-+			acl_t acl = __acl_from_xattr(ext_acl_p, retval);
-+			return acl;
-+		}
- 	} else if (retval == 0 || errno == ENOATTR || errno == ENODATA) {
- 		struct stat st;
- 
--		if (fstat(fd, &st) == 0)
--			return acl_from_mode(st.st_mode);
--		else
-+		if (fstat(fd, &st) != 0) {
- 			return NULL;
--	} else
-+		}
-+
-+		return acl_from_mode(st.st_mode);
-+	} else {
- 		return NULL;
-+	}
- }
- 
---- /dev/null	2007-08-22 11:21:03.626521839 -0400
-+++ acl-2.2.39/libacl/acl_nfs4_xattr_size.c	2007-08-22 12:02:13.000000000 -0400
-@@ -0,0 +1,91 @@
-+/*
-+ *  NFSv4 ACL Code
-+ *  Return the expected xattr XDR encoded size of the nfs acl. Used for
-+ *  figuring the size of the xattr buffer.
-+ *
-+ *  Copyright (c) 2002, 2003 The Regents of the University of Michigan.
-+ *  All rights reserved.
-+ *
-+ *  Nathaniel Gallaher <ngallahe@umich.edu>
-+ *
-+ *  Redistribution and use in source and binary forms, with or without
-+ *  modification, are permitted provided that the following conditions
-+ *  are met:
-+ *
-+ *  1. Redistributions of source code must retain the above copyright
-+ *     notice, this list of conditions and the following disclaimer.
-+ *  2. Redistributions in binary form must reproduce the above copyright
-+ *     notice, this list of conditions and the following disclaimer in the
-+ *     documentation and/or other materials provided with the distribution.
-+ *  3. Neither the name of the University nor the names of its
-+ *     contributors may be used to endorse or promote products derived
-+ *     from this software without specific prior written permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <libacl_nfs4.h>
-+
-+int acl_nfs4_xattr_size(struct nfs4_acl * acl)
-+{
-+	int size = 0;
-+	struct nfs4_ace * ace;
-+	int ace_num;
-+	int num_aces;
-+
-+	if(acl == NULL) {
-+		errno = EINVAL;
-+		goto failed;
-+	}
-+
-+	/* Space for number of aces */
-+	size += sizeof(u32);
-+
-+	ace = acl->ace_head.tqh_first;
-+	ace_num = 1;
-+
-+	num_aces = acl->naces;
-+
-+	while(1)
-+	{
-+		if(ace == NULL) {
-+			if(ace_num > num_aces) {
-+				break;
-+			} else {
-+				errno = ENODATA;
-+				goto failed;
-+			}
-+		}
-+
-+		/* space for type, flag, and mask */
-+		size += (3 * sizeof(u32));
-+
-+		/* space for strlen */
-+		size += sizeof(u32);
-+
-+		/* space for the who string... xdr encoded */
-+		size += (strlen(ace->who) / NFS4_XDR_MOD) * NFS4_XDR_MOD * sizeof(char);
-+		if(strlen(ace->who) % NFS4_XDR_MOD) {
-+			size += NFS4_XDR_MOD;
-+		}
-+
-+		ace = ace->l_ace.tqe_next;
-+		ace_num++;
-+	}
-+
-+	return size;
-+
-+failed:
-+	return -1;
-+}
-+
---- /dev/null	2007-08-22 11:21:03.626521839 -0400
-+++ acl-2.2.39/libacl/acl_ptn4_get_mask.c	2007-08-22 12:02:13.000000000 -0400
-@@ -0,0 +1,81 @@
-+/*
-+ *  NFSv4 ACL Code
-+ *  Translate POSIX permissions to an NFSv4 mask
-+ *
-+ *  Copyright (c) 2002, 2003 The Regents of the University of Michigan.
-+ *  All rights reserved.
-+ *
-+ *  Nathaniel Gallaher <ngallahe@umich.edu>
-+ *
-+ *  Redistribution and use in source and binary forms, with or without
-+ *  modification, are permitted provided that the following conditions
-+ *  are met:
-+ *
-+ *  1. Redistributions of source code must retain the above copyright
-+ *     notice, this list of conditions and the following disclaimer.
-+ *  2. Redistributions in binary form must reproduce the above copyright
-+ *     notice, this list of conditions and the following disclaimer in the
-+ *     documentation and/or other materials provided with the distribution.
-+ *  3. Neither the name of the University nor the names of its
-+ *     contributors may be used to endorse or promote products derived
-+ *     from this software without specific prior written permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <acl/libacl.h>
-+#include <libacl_nfs4.h>
-+
-+int acl_ptn4_get_mask(u32* mask, acl_permset_t perms, int iflags)
-+{
-+	int result;
-+
-+	*mask = NFS4_ANYONE_MODE;
-+
-+	if (perms == NULL) {
-+		errno = EINVAL;
-+		goto failed;
-+	}
-+
-+	if (iflags & NFS4_ACL_OWNER)
-+		*mask |= NFS4_OWNER_MODE;
-+
-+	result = acl_get_perm(perms, ACL_READ);
-+	if (result < 0)
-+		goto failed;
-+	else if(result == 1)
-+		*mask |= NFS4_READ_MODE;
-+
-+	result = acl_get_perm(perms, ACL_WRITE);
-+	if (result < 0)
-+		goto failed;
-+	else if (result == 1) {
-+		*mask |= NFS4_WRITE_MODE;
-+		if (iflags & NFS4_ACL_ISDIR)
-+			*mask |= NFS4_ACE_DELETE_CHILD;
-+	}
-+
-+	result = acl_get_perm(perms, ACL_EXECUTE);
-+	if (result < 0)
-+		goto failed;
-+	else if (result == 1)
-+		*mask |= NFS4_EXECUTE_MODE;
-+
-+	return 0;
-+
-+failed:
-+	return -1;
-+}
-+
-+
-+
---- acl-2.2.39/libacl/acl_get_file.c.orig	2006-06-20 02:51:25.000000000 -0400
-+++ acl-2.2.39/libacl/acl_get_file.c	2007-08-22 12:02:13.000000000 -0400
-@@ -28,6 +28,10 @@
- #include "libacl.h"
- #include "__acl_from_xattr.h"
- 
-+#ifdef USE_NFSV4_TRANS
-+ #include "libacl_nfs4.h"
-+#endif
-+
- #include "byteorder.h"
- #include "acl_ea.h"
- 
-@@ -40,6 +44,8 @@ acl_get_file(const char *path_p, acl_typ
- 	char *ext_acl_p = alloca(size_guess);
- 	const char *name;
- 	int retval;
-+	int nfsv4acls;
-+	int iflags;
- 
- 	switch(type) {
- 		case ACL_TYPE_ACCESS:
-@@ -55,8 +61,20 @@ acl_get_file(const char *path_p, acl_typ
- 
- 	if (!ext_acl_p)
- 		return NULL;
-+#ifdef USE_NFSV4_TRANS
-+	retval = getxattr(path_p, ACL_NFS4_XATTR, ext_acl_p, size_guess);
-+	if((retval == -1) && (errno == ENOATTR || errno == EOPNOTSUPP)) {
-+		nfsv4acls = ACL_NFS4_NOT_USED;
-+		retval = getxattr(path_p, name, ext_acl_p, size_guess);
-+	} else {
-+		nfsv4acls = ACL_NFS4_USED;
-+		name = ACL_NFS4_XATTR;
-+	}
-+#else
- 	retval = getxattr(path_p, name, ext_acl_p, size_guess);
--	if (retval == -1 && errno == ERANGE) {
-+#endif
-+
-+	if ((retval == -1) && (errno == ERANGE)) {
- 		retval = getxattr(path_p, name, NULL, 0);
- 		if (retval > 0) {
- 			ext_acl_p = alloca(retval);
-@@ -66,9 +84,29 @@ acl_get_file(const char *path_p, acl_typ
- 		}
- 	}
- 	if (retval > 0) {
--		acl_t acl = __acl_from_xattr(ext_acl_p, retval);
--		return acl;
--	} else if (retval == 0 || errno == ENOATTR || errno == ENODATA) {
-+#ifdef USE_NFSV4_TRANS
-+		if(nfsv4acls == ACL_NFS4_USED) {
-+			struct stat st;
-+
-+			iflags = NFS4_ACL_ISFILE;
-+
-+			if (stat(path_p, &st) != 0)
-+				return NULL;
-+
-+			if (S_ISDIR(st.st_mode))
-+				iflags = NFS4_ACL_ISDIR;
-+
-+			acl_t acl = __posix_acl_from_nfs4_xattr(ext_acl_p, retval, type,
-+					iflags);
-+			return acl;
-+		}
-+		else
-+#endif
-+		{
-+			acl_t acl = __acl_from_xattr(ext_acl_p, retval);
-+			return acl;
-+		}
-+	} else if ((retval == 0) || (errno == ENOATTR) || (errno == ENODATA)) {
- 		struct stat st;
- 
- 		if (stat(path_p, &st) != 0)
---- /dev/null	2007-08-22 11:21:03.626521839 -0400
-+++ acl-2.2.39/libacl/libacl_nfs4.h	2007-08-22 12:02:13.000000000 -0400
-@@ -0,0 +1,97 @@
-+#include <sys/types.h>
-+#include <pwd.h>
-+#include <grp.h>
-+#include <sys/acl.h>
-+#include <stdlib.h>
-+#include <sys/queue.h>
-+#include <nfs4.h>
-+#include <sys/errno.h>
-+#include <string.h>
-+
-+/* mode bit translations: */
-+#define NFS4_READ_MODE NFS4_ACE_READ_DATA
-+#define NFS4_WRITE_MODE (NFS4_ACE_WRITE_DATA | NFS4_ACE_APPEND_DATA)
-+#define NFS4_EXECUTE_MODE NFS4_ACE_EXECUTE
-+#define NFS4_ANYONE_MODE (NFS4_ACE_READ_ATTRIBUTES | NFS4_ACE_READ_ACL | \
-+		NFS4_ACE_SYNCHRONIZE)
-+#define NFS4_OWNER_MODE (NFS4_ACE_WRITE_ATTRIBUTES | NFS4_ACE_WRITE_ACL)
-+
-+#define NFS4_ACE_MASK_IGNORE (NFS4_ACE_DELETE | NFS4_ACE_WRITE_OWNER \
-+		| NFS4_ACE_READ_NAMED_ATTRS | NFS4_ACE_WRITE_NAMED_ATTRS)
-+/* XXX not sure about the following.  Note that e.g. DELETE_CHILD is wrong in
-+ * general (should only be ignored on files). */
-+#define MASK_EQUAL(mask1, mask2) \
-+	(((mask1) & NFS4_ACE_MASK_ALL & ~NFS4_ACE_MASK_IGNORE & \
-+	  					~NFS4_ACE_DELETE_CHILD) \
-+	 == ((mask2) & NFS4_ACE_MASK_ALL & ~NFS4_ACE_MASK_IGNORE & \
-+		 				~NFS4_ACE_DELETE_CHILD))
-+
-+/* Maximum length of the ace->who attribute */
-+#define NFS4_ACL_WHO_LENGTH_MAX		2048
-+#define NFS4_ACL_WHO_BUFFER_LEN_GUESS	255
-+
-+/* NFS4 acl xattr name */
-+#define ACL_NFS4_XATTR "system.nfs4_acl"
-+
-+/* Macro for finding empty tailqs */
-+#define TAILQ_IS_EMPTY(head) (head.tqh_first == NULL)
-+
-+/* Flags to pass certain properties around */
-+#define NFS4_ACL_NOFLAGS			0x00
-+#define NFS4_ACL_ISFILE				0x00
-+#define NFS4_ACL_ISDIR				0x01
-+#define NFS4_ACL_OWNER				0x02
-+#define NFS4_ACL_REQUEST_DEFAULT	0x04
-+#define NFS4_ACL_RAW				0x01
-+
-+#define NFS4_XDR_MOD				4
-+
-+typedef u_int32_t u32;
-+
-+enum {	ACL_NFS4_NOT_USED = 0,
-+		ACL_NFS4_USED
-+};
-+
-+struct ace_container {
-+	struct nfs4_ace *ace;
-+	TAILQ_ENTRY(ace_container) l_ace;
-+};
-+
-+TAILQ_HEAD(ace_container_list_head, ace_container);
-+
-+/**** Public functions ****/
-+
-+/** Manipulation functions **/
-+extern int				acl_nfs4_add_ace(struct nfs4_acl *, u32, u32, u32, int, char*);
-+extern int				acl_nfs4_add_pair(struct nfs4_acl *, int, u32, int, char*);
-+extern void				acl_nfs4_free(struct nfs4_acl *);
-+extern struct nfs4_acl *acl_nfs4_new(u32);
-+extern int				acl_nfs4_set_who(struct nfs4_ace*, int, char*);
-+extern struct nfs4_acl *acl_nfs4_copy_acl(struct nfs4_acl *);
-+extern struct nfs4_acl *acl_nfs4_xattr_load(char *, int, u32);
-+extern int				acl_nfs4_xattr_pack(struct nfs4_acl *, char**);
-+extern int				acl_nfs4_xattr_size(struct nfs4_acl *);
-+extern void				acl_nfs4_remove_ace(struct nfs4_acl * acl, struct nfs4_ace * ace);
-+
-+/** Conversion functions **/
-+
-+/* nfs4 -> posix */
-+extern acl_t		acl_n4tp_acl_trans(struct nfs4_acl *, acl_type_t);
-+
-+/* posix -> nfs4 */
-+extern int				acl_ptn4_get_mask(u32* mask, acl_permset_t perms,
-+								int iflags);
-+extern int acl_ptn4_acl_trans(acl_t, struct nfs4_acl *, acl_type_t, u32, char*);
-+
-+
-+/** Access Functions **/
-+extern inline int	acl_nfs4_get_whotype(char*);
-+extern int			acl_nfs4_get_who(struct nfs4_ace*, int*, char**);
-+
-+/**** Private(?) functions ****/
-+acl_t		__posix_acl_from_nfs4_xattr(char*, int, acl_type_t, u32);
-+
-+/* These will change */
-+char * nfs4_get_who_from_uid(uid_t);
-+char * nfs4_get_who_from_gid(gid_t);
-+/* End change */
---- /dev/null	2007-08-22 11:21:03.626521839 -0400
-+++ acl-2.2.39/libacl/acl_nfs4_new.c	2007-08-22 12:02:13.000000000 -0400
-@@ -0,0 +1,58 @@
-+/*
-+ *  Common NFSv4 ACL handling code.
-+ *  Create a new NFSv4 ACL
-+ *
-+ *  Copyright (c) 2002, 2003 The Regents of the University of Michigan.
-+ *  All rights reserved.
-+ *
-+ *  Marius Aamodt Eriksen <marius@umich.edu>
-+ *  J. Bruce Fields <bfields@umich.edu>
-+ *  Nathaniel Gallaher <ngallahe@umich.edu>
-+ *  Jeff Sedlak <jsedlak@umich.edu>
-+ *
-+ *  Redistribution and use in source and binary forms, with or without
-+ *  modification, are permitted provided that the following conditions
-+ *  are met:
-+ *
-+ *  1. Redistributions of source code must retain the above copyright
-+ *     notice, this list of conditions and the following disclaimer.
-+ *  2. Redistributions in binary form must reproduce the above copyright
-+ *     notice, this list of conditions and the following disclaimer in the
-+ *     documentation and/or other materials provided with the distribution.
-+ *  3. Neither the name of the University nor the names of its
-+ *     contributors may be used to endorse or promote products derived
-+ *     from this software without specific prior written permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+
-+
-+#include "libacl_nfs4.h"
-+
-+struct nfs4_acl *
-+acl_nfs4_new(u32 is_dir)
-+{
-+	struct nfs4_acl *acl;
-+
-+	if ((acl = malloc(sizeof(*acl))) == NULL)
-+		return NULL;
-+
-+	acl->naces = 0;
-+	acl->is_directory = is_dir;
-+
-+	TAILQ_INIT(&acl->ace_head);
-+
-+	return acl;
-+}
-+
---- /dev/null	2007-08-22 11:21:03.626521839 -0400
-+++ acl-2.2.39/libacl/acl_nfs4_copy_acl.c	2007-08-22 12:02:13.000000000 -0400
-@@ -0,0 +1,85 @@
-+/*
-+ *  NFSv4 ACL Code
-+ *  Deep copy an NFS4 ACL
-+ *
-+ *  Copyright (c) 2002, 2003 The Regents of the University of Michigan.
-+ *  All rights reserved.
-+ *
-+ *  Nathaniel Gallaher <ngallahe@umich.edu>
-+ *
-+ *  Redistribution and use in source and binary forms, with or without
-+ *  modification, are permitted provided that the following conditions
-+ *  are met:
-+ *
-+ *  1. Redistributions of source code must retain the above copyright
-+ *     notice, this list of conditions and the following disclaimer.
-+ *  2. Redistributions in binary form must reproduce the above copyright
-+ *     notice, this list of conditions and the following disclaimer in the
-+ *     documentation and/or other materials provided with the distribution.
-+ *  3. Neither the name of the University nor the names of its
-+ *     contributors may be used to endorse or promote products derived
-+ *     from this software without specific prior written permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include "libacl_nfs4.h"
-+
-+struct nfs4_acl * acl_nfs4_copy_acl(struct nfs4_acl * nacl)
-+{
-+	struct nfs4_acl * new_acl;
-+	struct nfs4_ace * ace;
-+	u32 nace;
-+	u32 num_aces;
-+	int result;
-+
-+	if(nacl == NULL) {
-+		errno = EINVAL;
-+		goto failed;
-+	}
-+
-+	num_aces = nacl->naces;
-+
-+	new_acl = acl_nfs4_new(nacl->is_directory);
-+	if(new_acl == NULL)
-+		goto failed;
-+
-+	ace = nacl->ace_head.tqh_first;
-+	nace = 1;
-+
-+	while(1)
-+	{
-+		if(ace == NULL) {
-+			if(nace > num_aces)
-+				break;
-+			else
-+				goto free_failed;
-+		}
-+
-+		result = acl_nfs4_add_ace(new_acl, ace->type, ace->flag,
-+				ace->access_mask, acl_nfs4_get_whotype(ace->who), ace->who);
-+		if(result < 0)
-+			goto free_failed;
-+
-+		ace = ace->l_ace.tqe_next;
-+		nace++;
-+	}
-+
-+	return new_acl;
-+
-+free_failed:
-+	acl_nfs4_free(new_acl);
-+
-+failed:
-+	return NULL;
-+}
---- /dev/null	2007-08-22 11:21:03.626521839 -0400
-+++ acl-2.2.39/libacl/acl_nfs4_add_pair.c	2007-08-22 12:02:13.000000000 -0400
-@@ -0,0 +1,60 @@
-+/*
-+ *  Add a pair of aces to the acl. The ace masks are complements of each other
-+ *  This keeps us from walking off the end of the acl
-+ *
-+ *  Copyright (c) 2004 The Regents of the University of Michigan.
-+ *  All rights reserved.
-+ *
-+ *  Marius Aamodt Eriksen <marius@umich.edu>
-+ *  J. Bruce Fields <bfields@umich.edu>
-+ *  Nathaniel Gallaher <ngallahe@umich.edu>
-+ *  Jeff Sedlak <jsedlak@umich.edu>
-+ *
-+ *  Redistribution and use in source and binary forms, with or without
-+ *  modification, are permitted provided that the following conditions
-+ *  are met:
-+ *
-+ *  1. Redistributions of source code must retain the above copyright
-+ *     notice, this list of conditions, the following disclaimer, and
-+ *     any and all other licensing or copyright notices included in
-+ *     any files in this distribution.
-+ *  2. Redistributions in binary form must reproduce the above copyright
-+ *     notice, this list of conditions and the following disclaimer in the
-+ *     documentation and/or other materials provided with the distribution.
-+ *  3. Neither the name of the University nor the names of its
-+ *     contributors may be used to endorse or promote products derived
-+ *     from this software without specific prior written permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ */
-+
-+
-+#include "libacl_nfs4.h"
-+
-+int
-+acl_nfs4_add_pair(struct nfs4_acl *acl, int eflag, u32 mask, int ownertype,
-+		char* owner)
-+{
-+	int error;
-+
-+	error = acl_nfs4_add_ace(acl, NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE,
-+				 eflag, mask, ownertype, owner);
-+	if (error < 0)
-+		return error;
-+	error = acl_nfs4_add_ace(acl, NFS4_ACE_ACCESS_DENIED_ACE_TYPE,
-+				eflag, ~mask, ownertype, owner);
-+	return error;
-+}
-+
-+
---- acl-2.2.39/exports.orig	2006-06-20 02:51:25.000000000 -0400
-+++ acl-2.2.39/exports	2007-08-22 12:02:13.000000000 -0400
-@@ -67,3 +67,33 @@ ACL_1.1 {
- 	perm_copy_fd;
- 	perm_copy_file;
- } ACL_1.0;
-+
-+ACL_1.2 {
-+	global:
-+	acl_nfs4_add_ace;
-+	acl_nfs4_add_pair;
-+	acl_nfs4_free;
-+	acl_nfs4_new;
-+	acl_nfs4_set_dir;
-+	acl_nfs4_set_who;
-+	acl_nfs4_copy_acl;
-+	acl_nfs4_xattr_load;
-+	acl_nfs4_xattr_pack;
-+	acl_nfs4_xattr_size;
-+	acl_nfs4_remove_ace;
-+
-+	acl_n4tp_acl_trans;
-+
-+	acl_ptn4_get_mask;
-+	acl_ptn4_acl_trans;
-+
-+	acl_nfs4_get_whotype;
-+	acl_nfs4_get_who;
-+	acl_nfs4_entries;
-+
-+	local:
-+	__posix_acl_from_nfs4_xattr;
-+	nfs4_get_who_from_uid;
-+	nfs4_get_who_from_gid;
-+
-+} ACL_1.1;
---- acl-2.2.39/include/builddefs.in.orig	2007-08-22 11:59:37.000000000 -0400
-+++ acl-2.2.39/include/builddefs.in	2007-08-22 12:02:13.000000000 -0400
-@@ -65,7 +65,7 @@ endif
- 
- GCFLAGS = $(OPTIMIZER) $(DEBUG) -funsigned-char -fno-strict-aliasing -Wall \
- 	  -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\"  \
--	  -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include
-+	  -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include -DUSE_NFSV4_TRANS
- 
- # Global, Platform, Local CFLAGS
- CFLAGS += $(GCFLAGS) $(PCFLAGS) $(LCFLAGS)
---- /dev/null	2007-08-22 11:21:03.626521839 -0400
-+++ acl-2.2.39/include/nfs4.h	2007-08-22 12:02:13.000000000 -0400
-@@ -0,0 +1,397 @@
-+/*
-+ *  NFSv4 protocol definitions.
-+ *
-+ *  Copyright (c) 2002 The Regents of the University of Michigan.
-+ *  All rights reserved.
-+ *
-+ *  Kendrick Smith <kmsmith@umich.edu>
-+ *  Andy Adamson   <andros@umich.edu>
-+ */
-+
-+#include<sys/types.h>
-+#include<sys/queue.h>
-+
-+#ifndef _LINUX_NFS4_H
-+#define _LINUX_NFS4_H
-+
-+#define NFS4_VERIFIER_SIZE	8
-+#define NFS4_FHSIZE		128
-+#define NFS4_MAXNAMLEN		NAME_MAX
-+
-+#define NFS4_ACCESS_READ        0x0001
-+#define NFS4_ACCESS_LOOKUP      0x0002
-+#define NFS4_ACCESS_MODIFY      0x0004
-+#define NFS4_ACCESS_EXTEND      0x0008
-+#define NFS4_ACCESS_DELETE      0x0010
-+#define NFS4_ACCESS_EXECUTE     0x0020
-+
-+#define NFS4_FH_PERISTENT		0x0000
-+#define NFS4_FH_NOEXPIRE_WITH_OPEN	0x0001
-+#define NFS4_FH_VOLATILE_ANY		0x0002
-+#define NFS4_FH_VOL_MIGRATION		0x0004
-+#define NFS4_FH_VOL_RENAME		0x0008
-+
-+#define NFS4_OPEN_RESULT_CONFIRM 0x0002
-+
-+#define NFS4_SHARE_ACCESS_READ	0x0001
-+#define NFS4_SHARE_ACCESS_WRITE	0x0002
-+#define NFS4_SHARE_ACCESS_BOTH	0x0003
-+#define NFS4_SHARE_DENY_READ	0x0001
-+#define NFS4_SHARE_DENY_WRITE	0x0002
-+#define NFS4_SHARE_DENY_BOTH	0x0003
-+
-+#define NFS4_SET_TO_SERVER_TIME	0
-+#define NFS4_SET_TO_CLIENT_TIME	1
-+
-+#define NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE 0
-+#define NFS4_ACE_ACCESS_DENIED_ACE_TYPE  1
-+#define NFS4_ACE_SYSTEM_AUDIT_ACE_TYPE   2
-+#define NFS4_ACE_SYSTEM_ALARM_ACE_TYPE   3
-+
-+#define ACL4_SUPPORT_ALLOW_ACL 0x01
-+#define ACL4_SUPPORT_DENY_ACL  0x02
-+#define ACL4_SUPPORT_AUDIT_ACL 0x04
-+#define ACL4_SUPPORT_ALARM_ACL 0x08
-+
-+#define NFS4_ACE_FILE_INHERIT_ACE             0x00000001
-+#define NFS4_ACE_DIRECTORY_INHERIT_ACE        0x00000002
-+#define NFS4_ACE_NO_PROPAGATE_INHERIT_ACE     0x00000004
-+#define NFS4_ACE_INHERIT_ONLY_ACE             0x00000008
-+#define NFS4_ACE_SUCCESSFUL_ACCESS_ACE_FLAG   0x00000010
-+#define NFS4_ACE_FAILED_ACCESS_ACE_FLAG       0x00000020
-+#define NFS4_ACE_IDENTIFIER_GROUP             0x00000040
-+#define NFS4_ACE_OWNER                        0x00000080
-+#define NFS4_ACE_GROUP                        0x00000100
-+#define NFS4_ACE_EVERYONE                     0x00000200
-+
-+#define NFS4_ACE_READ_DATA                    0x00000001
-+#define NFS4_ACE_LIST_DIRECTORY               0x00000001
-+#define NFS4_ACE_WRITE_DATA                   0x00000002
-+#define NFS4_ACE_ADD_FILE                     0x00000002
-+#define NFS4_ACE_APPEND_DATA                  0x00000004
-+#define NFS4_ACE_ADD_SUBDIRECTORY             0x00000004
-+#define NFS4_ACE_READ_NAMED_ATTRS             0x00000008
-+#define NFS4_ACE_WRITE_NAMED_ATTRS            0x00000010
-+#define NFS4_ACE_EXECUTE                      0x00000020
-+#define NFS4_ACE_DELETE_CHILD                 0x00000040
-+#define NFS4_ACE_READ_ATTRIBUTES              0x00000080
-+#define NFS4_ACE_WRITE_ATTRIBUTES             0x00000100
-+#define NFS4_ACE_DELETE                       0x00010000
-+#define NFS4_ACE_READ_ACL                     0x00020000
-+#define NFS4_ACE_WRITE_ACL                    0x00040000
-+#define NFS4_ACE_WRITE_OWNER                  0x00080000
-+#define NFS4_ACE_SYNCHRONIZE                  0x00100000
-+#define NFS4_ACE_GENERIC_READ                 0x00120081
-+#define NFS4_ACE_GENERIC_WRITE                0x00160106
-+#define NFS4_ACE_GENERIC_EXECUTE              0x001200A0
-+#define NFS4_ACE_MASK_ALL                     0x001F01FF
-+
-+enum nfs4_acl_whotype {
-+	NFS4_ACL_WHO_NAMED = 0,
-+	NFS4_ACL_WHO_OWNER,
-+	NFS4_ACL_WHO_GROUP,
-+	NFS4_ACL_WHO_EVERYONE,
-+};
-+
-+#define NFS4_ACL_WHO_OWNER_STRING		"OWNER@"
-+#define NFS4_ACL_WHO_GROUP_STRING		"GROUP@"
-+#define NFS4_ACL_WHO_EVERYONE_STRING	"EVERYONE@"
-+
-+struct nfs4_ace {
-+	u_int32_t	type;
-+	u_int32_t	flag;
-+	u_int32_t	access_mask;
-+	char*	who;
-+	TAILQ_ENTRY(nfs4_ace) l_ace;
-+};
-+
-+TAILQ_HEAD(ace_list_head, nfs4_ace);
-+
-+struct nfs4_acl {
-+	u_int32_t		naces;
-+	u_int32_t		is_directory;
-+	struct ace_list_head	ace_head;
-+};
-+
-+typedef struct { char data[NFS4_VERIFIER_SIZE]; } nfs4_verifier;
-+typedef struct { char data[16]; } nfs4_stateid;
-+
-+enum nfs_opnum4 {
-+	OP_ACCESS = 3,
-+	OP_CLOSE = 4,
-+	OP_COMMIT = 5,
-+	OP_CREATE = 6,
-+	OP_DELEGPURGE = 7,
-+	OP_DELEGRETURN = 8,
-+	OP_GETATTR = 9,
-+	OP_GETFH = 10,
-+	OP_LINK = 11,
-+	OP_LOCK = 12,
-+	OP_LOCKT = 13,
-+	OP_LOCKU = 14,
-+	OP_LOOKUP = 15,
-+	OP_LOOKUPP = 16,
-+	OP_NVERIFY = 17,
-+	OP_OPEN = 18,
-+	OP_OPENATTR = 19,
-+	OP_OPEN_CONFIRM = 20,
-+	OP_OPEN_DOWNGRADE = 21,
-+	OP_PUTFH = 22,
-+	OP_PUTPUBFH = 23,
-+	OP_PUTROOTFH = 24,
-+	OP_READ = 25,
-+	OP_READDIR = 26,
-+	OP_READLINK = 27,
-+	OP_REMOVE = 28,
-+	OP_RENAME = 29,
-+	OP_RENEW = 30,
-+	OP_RESTOREFH = 31,
-+	OP_SAVEFH = 32,
-+	OP_SECINFO = 33,
-+	OP_SETATTR = 34,
-+	OP_SETCLIENTID = 35,
-+	OP_SETCLIENTID_CONFIRM = 36,
-+	OP_VERIFY = 37,
-+	OP_WRITE = 38,
-+	OP_RELEASE_LOCKOWNER = 39,
-+	OP_ILLEGAL = 10044,
-+};
-+
-+enum nfsstat4 {
-+	NFS4_OK = 0,
-+	NFS4ERR_PERM = 1,
-+	NFS4ERR_NOENT = 2,
-+	NFS4ERR_IO = 5,
-+	NFS4ERR_NXIO = 6,
-+	NFS4ERR_ACCESS = 13,
-+	NFS4ERR_EXIST = 17,
-+	NFS4ERR_XDEV = 18,
-+	/* Unused/reserved 19 */
-+	NFS4ERR_NOTDIR = 20,
-+	NFS4ERR_ISDIR = 21,
-+	NFS4ERR_INVAL = 22,
-+	NFS4ERR_FBIG = 27,
-+	NFS4ERR_NOSPC = 28,
-+	NFS4ERR_ROFS = 30,
-+	NFS4ERR_MLINK = 31,
-+	NFS4ERR_NAMETOOLONG = 63,
-+	NFS4ERR_NOTEMPTY = 66,
-+	NFS4ERR_DQUOT = 69,
-+	NFS4ERR_STALE = 70,
-+	NFS4ERR_BADHANDLE = 10001,
-+	NFS4ERR_BAD_COOKIE = 10003,
-+	NFS4ERR_NOTSUPP = 10004,
-+	NFS4ERR_TOOSMALL = 10005,
-+	NFS4ERR_SERVERFAULT = 10006,
-+	NFS4ERR_BADTYPE = 10007,
-+	NFS4ERR_DELAY = 10008,
-+	NFS4ERR_SAME = 10009,
-+	NFS4ERR_DENIED = 10010,
-+	NFS4ERR_EXPIRED = 10011,
-+	NFS4ERR_LOCKED = 10012,
-+	NFS4ERR_GRACE = 10013,
-+	NFS4ERR_FHEXPIRED = 10014,
-+	NFS4ERR_SHARE_DENIED = 10015,
-+	NFS4ERR_WRONGSEC = 10016,
-+	NFS4ERR_CLID_INUSE = 10017,
-+	NFS4ERR_RESOURCE = 10018,
-+	NFS4ERR_MOVED = 10019,
-+	NFS4ERR_NOFILEHANDLE = 10020,
-+	NFS4ERR_MINOR_VERS_MISMATCH = 10021,
-+	NFS4ERR_STALE_CLIENTID = 10022,
-+	NFS4ERR_STALE_STATEID = 10023,
-+	NFS4ERR_OLD_STATEID = 10024,
-+	NFS4ERR_BAD_STATEID = 10025,
-+	NFS4ERR_BAD_SEQID = 10026,
-+	NFS4ERR_NOT_SAME = 10027,
-+	NFS4ERR_LOCK_RANGE = 10028,
-+	NFS4ERR_SYMLINK = 10029,
-+	NFS4ERR_RESTOREFH = 10030,
-+	NFS4ERR_LEASE_MOVED = 10031,
-+	NFS4ERR_ATTRNOTSUPP = 10032,
-+	NFS4ERR_NO_GRACE = 10033,
-+	NFS4ERR_RECLAIM_BAD = 10034,
-+	NFS4ERR_RECLAIM_CONFLICT = 10035,
-+	NFS4ERR_BADXDR = 10036,
-+	NFS4ERR_LOCKS_HELD = 10037,
-+	NFS4ERR_OPENMODE = 10038,
-+	NFS4ERR_BADOWNER = 10039,
-+	NFS4ERR_BADCHAR = 10040,
-+	NFS4ERR_BADNAME = 10041,
-+	NFS4ERR_BAD_RANGE = 10042,
-+	NFS4ERR_LOCK_NOTSUPP = 10043,
-+	NFS4ERR_OP_ILLEGAL = 10044,
-+	NFS4ERR_DEADLOCK = 10045,
-+	NFS4ERR_FILE_OPEN = 10046,
-+	NFS4ERR_ADMIN_REVOKED = 10047,
-+	NFS4ERR_CB_PATH_DOWN = 10048
-+};
-+
-+/*
-+ * Note: NF4BAD is not actually part of the protocol; it is just used
-+ * internally by nfsd.
-+ */
-+enum nfs_ftype4 {
-+	NF4BAD		= 0,
-+        NF4REG          = 1,    /* Regular File */
-+        NF4DIR          = 2,    /* Directory */
-+        NF4BLK          = 3,    /* Special File - block device */
-+        NF4CHR          = 4,    /* Special File - character device */
-+        NF4LNK          = 5,    /* Symbolic Link */
-+        NF4SOCK         = 6,    /* Special File - socket */
-+        NF4FIFO         = 7,    /* Special File - fifo */
-+        NF4ATTRDIR      = 8,    /* Attribute Directory */
-+        NF4NAMEDATTR    = 9     /* Named Attribute */
-+};
-+
-+enum open_claim_type4 {
-+	NFS4_OPEN_CLAIM_NULL = 0,
-+	NFS4_OPEN_CLAIM_PREVIOUS = 1,
-+	NFS4_OPEN_CLAIM_DELEGATE_CUR = 2,
-+	NFS4_OPEN_CLAIM_DELEGATE_PREV = 3
-+};
-+
-+enum opentype4 {
-+	NFS4_OPEN_NOCREATE = 0,
-+	NFS4_OPEN_CREATE = 1
-+};
-+
-+enum createmode4 {
-+	NFS4_CREATE_UNCHECKED = 0,
-+	NFS4_CREATE_GUARDED = 1,
-+	NFS4_CREATE_EXCLUSIVE = 2
-+};
-+
-+enum limit_by4 {
-+	NFS4_LIMIT_SIZE = 1,
-+	NFS4_LIMIT_BLOCKS = 2
-+};
-+
-+enum open_delegation_type4 {
-+	NFS4_OPEN_DELEGATE_NONE = 0,
-+	NFS4_OPEN_DELEGATE_READ = 1,
-+	NFS4_OPEN_DELEGATE_WRITE = 2
-+};
-+
-+enum lock_type4 {
-+	NFS4_UNLOCK_LT = 0,
-+	NFS4_READ_LT = 1,
-+	NFS4_WRITE_LT = 2,
-+	NFS4_READW_LT = 3,
-+	NFS4_WRITEW_LT = 4
-+};
-+
-+
-+/* Mandatory Attributes */
-+#define FATTR4_WORD0_SUPPORTED_ATTRS    (1UL << 0)
-+#define FATTR4_WORD0_TYPE               (1UL << 1)
-+#define FATTR4_WORD0_FH_EXPIRE_TYPE     (1UL << 2)
-+#define FATTR4_WORD0_CHANGE             (1UL << 3)
-+#define FATTR4_WORD0_SIZE               (1UL << 4)
-+#define FATTR4_WORD0_LINK_SUPPORT       (1UL << 5)
-+#define FATTR4_WORD0_SYMLINK_SUPPORT    (1UL << 6)
-+#define FATTR4_WORD0_NAMED_ATTR         (1UL << 7)
-+#define FATTR4_WORD0_FSID               (1UL << 8)
-+#define FATTR4_WORD0_UNIQUE_HANDLES     (1UL << 9)
-+#define FATTR4_WORD0_LEASE_TIME         (1UL << 10)
-+#define FATTR4_WORD0_RDATTR_ERROR       (1UL << 11)
-+
-+/* Recommended Attributes */
-+#define FATTR4_WORD0_ACL                (1UL << 12)
-+#define FATTR4_WORD0_ACLSUPPORT         (1UL << 13)
-+#define FATTR4_WORD0_ARCHIVE            (1UL << 14)
-+#define FATTR4_WORD0_CANSETTIME         (1UL << 15)
-+#define FATTR4_WORD0_CASE_INSENSITIVE   (1UL << 16)
-+#define FATTR4_WORD0_CASE_PRESERVING    (1UL << 17)
-+#define FATTR4_WORD0_CHOWN_RESTRICTED   (1UL << 18)
-+#define FATTR4_WORD0_FILEHANDLE         (1UL << 19)
-+#define FATTR4_WORD0_FILEID             (1UL << 20)
-+#define FATTR4_WORD0_FILES_AVAIL        (1UL << 21)
-+#define FATTR4_WORD0_FILES_FREE         (1UL << 22)
-+#define FATTR4_WORD0_FILES_TOTAL        (1UL << 23)
-+#define FATTR4_WORD0_FS_LOCATIONS       (1UL << 24)
-+#define FATTR4_WORD0_HIDDEN             (1UL << 25)
-+#define FATTR4_WORD0_HOMOGENEOUS        (1UL << 26)
-+#define FATTR4_WORD0_MAXFILESIZE        (1UL << 27)
-+#define FATTR4_WORD0_MAXLINK            (1UL << 28)
-+#define FATTR4_WORD0_MAXNAME            (1UL << 29)
-+#define FATTR4_WORD0_MAXREAD            (1UL << 30)
-+#define FATTR4_WORD0_MAXWRITE           (1UL << 31)
-+#define FATTR4_WORD1_MIMETYPE           (1UL << 0)
-+#define FATTR4_WORD1_MODE               (1UL << 1)
-+#define FATTR4_WORD1_NO_TRUNC           (1UL << 2)
-+#define FATTR4_WORD1_NUMLINKS           (1UL << 3)
-+#define FATTR4_WORD1_OWNER              (1UL << 4)
-+#define FATTR4_WORD1_OWNER_GROUP        (1UL << 5)
-+#define FATTR4_WORD1_QUOTA_HARD         (1UL << 6)
-+#define FATTR4_WORD1_QUOTA_SOFT         (1UL << 7)
-+#define FATTR4_WORD1_QUOTA_USED         (1UL << 8)
-+#define FATTR4_WORD1_RAWDEV             (1UL << 9)
-+#define FATTR4_WORD1_SPACE_AVAIL        (1UL << 10)
-+#define FATTR4_WORD1_SPACE_FREE         (1UL << 11)
-+#define FATTR4_WORD1_SPACE_TOTAL        (1UL << 12)
-+#define FATTR4_WORD1_SPACE_USED         (1UL << 13)
-+#define FATTR4_WORD1_SYSTEM             (1UL << 14)
-+#define FATTR4_WORD1_TIME_ACCESS        (1UL << 15)
-+#define FATTR4_WORD1_TIME_ACCESS_SET    (1UL << 16)
-+#define FATTR4_WORD1_TIME_BACKUP        (1UL << 17)
-+#define FATTR4_WORD1_TIME_CREATE        (1UL << 18)
-+#define FATTR4_WORD1_TIME_DELTA         (1UL << 19)
-+#define FATTR4_WORD1_TIME_METADATA      (1UL << 20)
-+#define FATTR4_WORD1_TIME_MODIFY        (1UL << 21)
-+#define FATTR4_WORD1_TIME_MODIFY_SET    (1UL << 22)
-+#define FATTR4_WORD1_MOUNTED_ON_FILEID  (1UL << 23)
-+
-+#define NFSPROC4_NULL 0
-+#define NFSPROC4_COMPOUND 1
-+#define NFS4_MINOR_VERSION 0
-+#define NFS4_DEBUG 1
-+
-+#ifdef __KERNEL__
-+
-+/* Index of predefined Linux client operations */
-+
-+enum {
-+	NFSPROC4_CLNT_NULL = 0,		/* Unused */
-+	NFSPROC4_CLNT_READ,
-+	NFSPROC4_CLNT_WRITE,
-+	NFSPROC4_CLNT_COMMIT,
-+	NFSPROC4_CLNT_OPEN,
-+	NFSPROC4_CLNT_OPEN_CONFIRM,
-+	NFSPROC4_CLNT_OPEN_RECLAIM,
-+	NFSPROC4_CLNT_OPEN_DOWNGRADE,
-+	NFSPROC4_CLNT_CLOSE,
-+	NFSPROC4_CLNT_SETATTR,
-+	NFSPROC4_CLNT_FSINFO,
-+	NFSPROC4_CLNT_RENEW,
-+	NFSPROC4_CLNT_SETCLIENTID,
-+	NFSPROC4_CLNT_SETCLIENTID_CONFIRM,
-+	NFSPROC4_CLNT_LOCK,
-+	NFSPROC4_CLNT_LOCKT,
-+	NFSPROC4_CLNT_LOCKU,
-+	NFSPROC4_CLNT_ACCESS,
-+	NFSPROC4_CLNT_GETATTR,
-+	NFSPROC4_CLNT_LOOKUP,
-+	NFSPROC4_CLNT_LOOKUP_ROOT,
-+	NFSPROC4_CLNT_REMOVE,
-+	NFSPROC4_CLNT_RENAME,
-+	NFSPROC4_CLNT_LINK,
-+	NFSPROC4_CLNT_CREATE,
-+	NFSPROC4_CLNT_PATHCONF,
-+	NFSPROC4_CLNT_STATFS,
-+	NFSPROC4_CLNT_READLINK,
-+	NFSPROC4_CLNT_READDIR,
-+	NFSPROC4_CLNT_SERVER_CAPS,
-+	NFSPROC4_CLNT_DELEGRETURN,
-+	NFSPROC4_CLNT_GETACL,
-+	NFSPROC4_CLNT_SETACL,
-+};
-+
-+#endif
-+#endif
-+
-+/*
-+ * Local variables:
-+ *  c-basic-offset: 8
-+ * End:
-+ */
---- /dev/null	2007-08-22 11:21:03.626521839 -0400
-+++ acl-2.2.39/include/libacl_nfs4.h	2007-08-22 12:02:13.000000000 -0400
-@@ -0,0 +1,97 @@
-+#include <sys/types.h>
-+#include <pwd.h>
-+#include <grp.h>
-+#include <sys/acl.h>
-+#include <stdlib.h>
-+#include <sys/queue.h>
-+#include <nfs4.h>
-+#include <sys/errno.h>
-+#include <string.h>
-+
-+/* mode bit translations: */
-+#define NFS4_READ_MODE NFS4_ACE_READ_DATA
-+#define NFS4_WRITE_MODE (NFS4_ACE_WRITE_DATA | NFS4_ACE_APPEND_DATA)
-+#define NFS4_EXECUTE_MODE NFS4_ACE_EXECUTE
-+#define NFS4_ANYONE_MODE (NFS4_ACE_READ_ATTRIBUTES | NFS4_ACE_READ_ACL | \
-+		NFS4_ACE_SYNCHRONIZE)
-+#define NFS4_OWNER_MODE (NFS4_ACE_WRITE_ATTRIBUTES | NFS4_ACE_WRITE_ACL)
-+
-+#define NFS4_ACE_MASK_IGNORE (NFS4_ACE_DELETE | NFS4_ACE_WRITE_OWNER \
-+		| NFS4_ACE_READ_NAMED_ATTRS | NFS4_ACE_WRITE_NAMED_ATTRS)
-+/* XXX not sure about the following.  Note that e.g. DELETE_CHILD is wrong in
-+ * general (should only be ignored on files). */
-+#define MASK_EQUAL(mask1, mask2) \
-+	(((mask1) & NFS4_ACE_MASK_ALL & ~NFS4_ACE_MASK_IGNORE & \
-+	  					~NFS4_ACE_DELETE_CHILD) \
-+	 == ((mask2) & NFS4_ACE_MASK_ALL & ~NFS4_ACE_MASK_IGNORE & \
-+		 				~NFS4_ACE_DELETE_CHILD))
-+
-+/* Maximum length of the ace->who attribute */
-+#define NFS4_ACL_WHO_LENGTH_MAX		2048
-+#define NFS4_ACL_WHO_BUFFER_LEN_GUESS	255
-+
-+/* NFS4 acl xattr name */
-+#define ACL_NFS4_XATTR "system.nfs4_acl"
-+
-+/* Macro for finding empty tailqs */
-+#define TAILQ_IS_EMPTY(head) (head.tqh_first == NULL)
-+
-+/* Flags to pass certain properties around */
-+#define NFS4_ACL_NOFLAGS			0x00
-+#define NFS4_ACL_ISFILE				0x00
-+#define NFS4_ACL_ISDIR				0x01
-+#define NFS4_ACL_OWNER				0x02
-+#define NFS4_ACL_REQUEST_DEFAULT	0x04
-+#define NFS4_ACL_RAW				0x01
-+
-+#define NFS4_XDR_MOD				4
-+
-+typedef u_int32_t u32;
-+
-+enum {	ACL_NFS4_NOT_USED = 0,
-+		ACL_NFS4_USED
-+};
-+
-+struct ace_container {
-+	struct nfs4_ace *ace;
-+	TAILQ_ENTRY(ace_container) l_ace;
-+};
-+
-+TAILQ_HEAD(ace_container_list_head, ace_container);
-+
-+/**** Public functions ****/
-+
-+/** Manipulation functions **/
-+extern int				acl_nfs4_add_ace(struct nfs4_acl *, u32, u32, u32, int, char*);
-+extern int				acl_nfs4_add_pair(struct nfs4_acl *, int, u32, int, char*);
-+extern void				acl_nfs4_free(struct nfs4_acl *);
-+extern struct nfs4_acl *acl_nfs4_new(u32);
-+extern int				acl_nfs4_set_who(struct nfs4_ace*, int, char*);
-+extern struct nfs4_acl *acl_nfs4_copy_acl(struct nfs4_acl *);
-+extern struct nfs4_acl *acl_nfs4_xattr_load(char *, int, u32);
-+extern int				acl_nfs4_xattr_pack(struct nfs4_acl *, char**);
-+extern int				acl_nfs4_xattr_size(struct nfs4_acl *);
-+extern void				acl_nfs4_remove_ace(struct nfs4_acl * acl, struct nfs4_ace * ace);
-+
-+/** Conversion functions **/
-+
-+/* nfs4 -> posix */
-+extern acl_t		acl_n4tp_acl_trans(struct nfs4_acl *, acl_type_t);
-+
-+/* posix -> nfs4 */
-+extern int				acl_ptn4_get_mask(u32* mask, acl_permset_t perms,
-+								int iflags);
-+extern int acl_ptn4_acl_trans(acl_t, struct nfs4_acl *, acl_type_t, u32, char*);
-+
-+
-+/** Access Functions **/
-+extern inline int	acl_nfs4_get_whotype(char*);
-+extern int			acl_nfs4_get_who(struct nfs4_ace*, int*, char**);
-+
-+/**** Private(?) functions ****/
-+acl_t		__posix_acl_from_nfs4_xattr(char*, int, acl_type_t, u32);
-+
-+/* These will change */
-+char * nfs4_get_who_from_uid(uid_t);
-+char * nfs4_get_who_from_gid(gid_t);
-+/* End change */
diff --git a/acl-2.2.49-bz467936.patch b/acl-2.2.49-bz467936.patch
deleted file mode 100644
index a07b4fd..0000000
--- a/acl-2.2.49-bz467936.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 16230023e5afcb0b42b8d01207e3449d22772c31 Mon Sep 17 00:00:00 2001
-From: Brandon Philips <brandon@ifup.org>
-Date: Thu, 17 Dec 2009 14:28:04 -0800
-Subject: [PATCH] setfacl: changing owner and when S_ISUID should be set --restore fix
-
-Fix a problem in setfacl --restore when the owner or group is changed
-and the S_ISUID and S_ISGID are to be set.
-
-The root of the problem is that chown() can clear the S_ISUID and
-S_ISGID bits as described in chown(2):
-
- When  the  owner  or  group of an executable file are changed by a
- non- superuser, the S_ISUID and S_ISGID mode bits are cleared.   POSIX
- does not specify whether this also should happen when root does the
- chown(); the Linux behavior depends on the kernel version.  In case  of
- a  non- group-executable  file (i.e., one for which the S_IXGRP bit is
- not set) the S_ISGID bit indicates mandatory locking, and is not
- cleared  by  a chown().
-
-To fix the issue re-stat() the file after chown() so that the logic
-surrounding the chmod() has the updated mode of the file.
-
-Signed-off-by: Brandon Philips <bphilips@suse.de>
----
- setfacl/setfacl.c      |    8 +++++++-
- test/root/restore.test |   23 +++++++++++++++++++++++
- 2 files changed, 30 insertions(+), 1 deletions(-)
- create mode 100644 test/root/restore.test
-
-diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c
-index 091b9cc..56b0aa4 100644
---- a/setfacl/setfacl.c
-+++ b/setfacl/setfacl.c
-@@ -128,6 +128,7 @@ restore(
- 	struct do_set_args args;
- 	int line = 0, backup_line;
- 	int error, status = 0;
-+	int chmod_required = 0;
- 
- 	memset(&st, 0, sizeof(st));
- 
-@@ -206,10 +207,15 @@ restore(
- 					strerror(errno));
- 				status = 1;
- 			}
-+
-+			/* chown() clears setuid/setgid so force a chmod if
-+			 * S_ISUID/S_ISGID was expected */
-+			if ((st.st_mode & flags) & (S_ISUID | S_ISGID))
-+				chmod_required = 1;
- 		}
- 
- 		mask = S_ISUID | S_ISGID | S_ISVTX;
--		if ((st.st_mode & mask) != (flags & mask)) {
-+		if (chmod_required || ((st.st_mode & mask) != (flags & mask))) {
- 			if (!args.mode)
- 				args.mode = st.st_mode;
- 			args.mode &= (S_IRWXU | S_IRWXG | S_IRWXO);
-diff --git a/test/root/restore.test b/test/root/restore.test
-new file mode 100644
-index 0000000..6003cd4
---- /dev/null
-+++ b/test/root/restore.test
-@@ -0,0 +1,23 @@
-+Ensure setuid bit is restored when the owner changes
-+ https://bugzilla.redhat.com/show_bug.cgi?id=467936#c7
-+
-+	$ touch passwd
-+	$ chmod 755 passwd
-+	$ chmod u+s passwd
-+	$ getfacl passwd > passwd.acl
-+	$ cat passwd.acl
-+	> # file: passwd
-+	> # owner: root
-+	> # group: root
-+	> # flags: s--
-+	> user::rwx
-+	> group::r-x
-+	> other::r-x
-+	>
-+	$ chown bin passwd
-+	$ chmod u+s passwd
-+	$ setfacl --restore passwd.acl
-+	$ ls -dl passwd | awk '{print $1 " " $3 " " $4}'
-+	> -rwsr-xr-x root root
-+
-+	$ rm passwd passwd.acl
--- 
-1.6.2.5
-
diff --git a/acl-2.2.49-bz675451.patch b/acl-2.2.49-bz675451.patch
index 9417ab0..cb742b4 100644
--- a/acl-2.2.49-bz675451.patch
+++ b/acl-2.2.49-bz675451.patch
@@ -1,19 +1,10 @@
- man/man1/setfacl.1 |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ man/man1/setfacl.1 |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/man/man1/setfacl.1 b/man/man1/setfacl.1
 index 25908e2..776f22d 100644
 --- a/man/man1/setfacl.1
 +++ b/man/man1/setfacl.1
-@@ -62,7 +62,7 @@ ACL entries for this operation must include permissions.
- 
- The
- .IR "\-x (\-\-remove)" " and " "\-X (\-\-remove-file)"
--options remove ACL enries. Only
-+options remove ACL entries. Only
- ACL entries without the
- .I perms
- field are accepted as parameters, unless POSIXLY_CORRECT is defined.
 @@ -240,8 +240,8 @@ owner, owning group, or others entry, a copy of the ACL owner, owning group, or
  .IP * 4
  If a Default ACL contains named user entries or named group entries, and no mask entry exists, a mask entry containing the same permissions as the default Default ACL's group entry is added. Unless the
diff --git a/acl-2.2.49-bz692982.patch b/acl-2.2.49-bz692982.patch
deleted file mode 100644
index 0b5ef44..0000000
--- a/acl-2.2.49-bz692982.patch
+++ /dev/null
@@ -1,375 +0,0 @@
-From 6bf5e24d48077db58b389e90558100fc121b8134 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Mon, 4 Apr 2011 12:43:39 +0200
-Subject: [PATCH 1/2] libacl: Add acl_extended_file_nofollow()
-
-This function calls lgetxattr() instead of getxattr(), which helps ls(1)
-to prevent unnecessary automatic mounts, which acl_extended_file()
-triggers.  See the following bug report for more details:
-https://bugzilla.redhat.com/692982
----
- exports                             |    1 +
- include/libacl.h                    |    1 +
- libacl/Makefile                     |    3 +-
- libacl/__acl_extended_file.c        |   49 +++++++++++++++++++++++++++++++++++
- libacl/__acl_extended_file.h        |    4 +++
- libacl/acl_extended_file.c          |   20 ++------------
- libacl/acl_extended_file_nofollow.c |   34 ++++++++++++++++++++++++
- man/man3/acl_extended_file.3        |   11 +++++++-
- man/man5/acl.5                      |    1 +
- 9 files changed, 105 insertions(+), 19 deletions(-)
- create mode 100644 libacl/__acl_extended_file.c
- create mode 100644 libacl/__acl_extended_file.h
- create mode 100644 libacl/acl_extended_file_nofollow.c
-
-diff --git a/exports b/exports
-index ef02842..b368c22 100644
---- a/exports
-+++ b/exports
-@@ -82,4 +82,5 @@ ACL_1.1 {
- 	# Linux specific extensions
- 	perm_copy_fd;
- 	perm_copy_file;
-+	acl_extended_file_nofollow;
- } ACL_1.0;
-diff --git a/include/libacl.h b/include/libacl.h
-index 41ec48e..d6a6650 100644
---- a/include/libacl.h
-+++ b/include/libacl.h
-@@ -59,6 +59,7 @@ extern int acl_check(acl_t acl, int *last);
- extern acl_t acl_from_mode(mode_t mode);
- extern int acl_equiv_mode(acl_t acl, mode_t *mode_p);
- int acl_extended_file(const char *path_p);
-+int acl_extended_file_nofollow(const char *path_p);
- int acl_extended_fd(int fd);
- extern int acl_entries(acl_t acl);
- extern const char *acl_error(int code);
-diff --git a/libacl/Makefile b/libacl/Makefile
-index 1224b65..cfe3d3a 100644
---- a/libacl/Makefile
-+++ b/libacl/Makefile
-@@ -47,7 +47,8 @@ POSIX_CFILES = \
- 
- LIBACL_CFILES = \
- 	acl_to_any_text.c acl_entries.c acl_check.c acl_error.c acl_cmp.c \
--	acl_extended_fd.c acl_extended_file.c acl_equiv_mode.c acl_from_mode.c
-+	acl_extended_fd.c acl_extended_file.c acl_equiv_mode.c acl_from_mode.c \
-+	acl_extended_file_nofollow.c __acl_extended_file.c
- 
- INTERNAL_CFILES = \
- 	__acl_to_any_text.c __acl_to_xattr.c __acl_from_xattr.c \
-diff --git a/libacl/__acl_extended_file.c b/libacl/__acl_extended_file.c
-new file mode 100644
-index 0000000..629afe9
---- /dev/null
-+++ b/libacl/__acl_extended_file.c
-@@ -0,0 +1,49 @@
-+/*
-+  File: acl_extended_file.c
-+
-+  Copyright (C) 2000, 2011
-+  Andreas Gruenbacher, <a.gruenbacher@bestbits.at>
-+
-+  This program is free software; you can redistribute it and/or
-+  modify it under the terms of the GNU Lesser General Public
-+  License as published by the Free Software Foundation; either
-+  version 2.1 of the License, or (at your option) any later version.
-+
-+  This program is distributed in the hope that it will be useful,
-+  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+  Lesser General Public License for more details.
-+
-+  You should have received a copy of the GNU Lesser General Public
-+  License along with this library; if not, write to the Free Software
-+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+*/
-+
-+#include <unistd.h>
-+#include <attr/xattr.h>
-+#include "libacl.h"
-+
-+#include "byteorder.h"
-+#include "acl_ea.h"
-+#include "__acl_extended_file.h"
-+
-+
-+int
-+__acl_extended_file(const char *path_p, getxattr_t fun)
-+{
-+	int base_size = sizeof(acl_ea_header) + 3 * sizeof(acl_ea_entry);
-+	int retval;
-+
-+	retval = fun(path_p, ACL_EA_ACCESS, NULL, 0);
-+	if (retval < 0 && errno != ENOATTR && errno != ENODATA)
-+		return -1;
-+	if (retval > base_size)
-+		return 1;
-+	retval = fun(path_p, ACL_EA_DEFAULT, NULL, 0);
-+	if (retval < 0 && errno != ENOATTR && errno != ENODATA)
-+		return -1;
-+	if (retval >= base_size)
-+		return 1;
-+	return 0;
-+}
-+
-diff --git a/libacl/__acl_extended_file.h b/libacl/__acl_extended_file.h
-new file mode 100644
-index 0000000..f8881a1
---- /dev/null
-+++ b/libacl/__acl_extended_file.h
-@@ -0,0 +1,4 @@
-+typedef ssize_t (*getxattr_t)(const char *, const char *, void *value,
-+        size_t size);
-+
-+int __acl_extended_file(const char *path_p, getxattr_t fun);
-diff --git a/libacl/acl_extended_file.c b/libacl/acl_extended_file.c
-index d1cb85d..f417784 100644
---- a/libacl/acl_extended_file.c
-+++ b/libacl/acl_extended_file.c
-@@ -1,7 +1,7 @@
- /*
-   File: acl_extended_file.c
- 
--  Copyright (C) 2000
-+  Copyright (C) 2011
-   Andreas Gruenbacher, <a.gruenbacher@bestbits.at>
- 
-   This program is free software; you can redistribute it and/or
-@@ -23,26 +23,12 @@
- #include <attr/xattr.h>
- #include "libacl.h"
- 
--#include "byteorder.h"
--#include "acl_ea.h"
-+#include "__acl_extended_file.h"
- 
- 
- int
- acl_extended_file(const char *path_p)
- {
--	int base_size = sizeof(acl_ea_header) + 3 * sizeof(acl_ea_entry);
--	int retval;
--
--	retval = getxattr(path_p, ACL_EA_ACCESS, NULL, 0);
--	if (retval < 0 && errno != ENOATTR && errno != ENODATA)
--		return -1;
--	if (retval > base_size)
--		return 1;
--	retval = getxattr(path_p, ACL_EA_DEFAULT, NULL, 0);
--	if (retval < 0 && errno != ENOATTR && errno != ENODATA)
--		return -1;
--	if (retval >= base_size)
--		return 1;
--	return 0;
-+	return __acl_extended_file(path_p, getxattr);
- }
- 
-diff --git a/libacl/acl_extended_file_nofollow.c b/libacl/acl_extended_file_nofollow.c
-new file mode 100644
-index 0000000..8f4711f
---- /dev/null
-+++ b/libacl/acl_extended_file_nofollow.c
-@@ -0,0 +1,34 @@
-+/*
-+  File: acl_extended_file.c
-+
-+  Copyright (C) 2011
-+  Andreas Gruenbacher, <a.gruenbacher@bestbits.at>
-+
-+  This program is free software; you can redistribute it and/or
-+  modify it under the terms of the GNU Lesser General Public
-+  License as published by the Free Software Foundation; either
-+  version 2.1 of the License, or (at your option) any later version.
-+
-+  This program is distributed in the hope that it will be useful,
-+  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+  Lesser General Public License for more details.
-+
-+  You should have received a copy of the GNU Lesser General Public
-+  License along with this library; if not, write to the Free Software
-+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+*/
-+
-+#include <unistd.h>
-+#include <attr/xattr.h>
-+#include "libacl.h"
-+
-+#include "__acl_extended_file.h"
-+
-+
-+int
-+acl_extended_file_nofollow(const char *path_p)
-+{
-+	return __acl_extended_file(path_p, lgetxattr);
-+}
-+
-diff --git a/man/man3/acl_extended_file.3 b/man/man3/acl_extended_file.3
-index 0ca7e0f..1f04331 100644
---- a/man/man3/acl_extended_file.3
-+++ b/man/man3/acl_extended_file.3
-@@ -25,7 +25,7 @@
- .Dt ACL_EXTENDED_FILE 3
- .Os "Linux ACL"
- .Sh NAME
--.Nm acl_extended_file
-+.Nm acl_extended_file, acl_extended_file_nofollow
- .Nd test for information in ACLs by file name
- .Sh LIBRARY
- Linux Access Control Lists library (libacl, \-lacl).
-@@ -34,6 +34,8 @@ Linux Access Control Lists library (libacl, \-lacl).
- .In acl/libacl.h
- .Ft int
- .Fn acl_extended_file "const char *path_p"
-+.Ft int
-+.Fn acl_extended_file_nofollow "const char *path_p"
- .Sh DESCRIPTION
- The
- .Fn acl_extended_file
-@@ -61,6 +63,13 @@ mechanisms, such as Mandatory Access Control schemes. The
- .Xr access 2
- system call can be used to check whether a given type of access to a file
- object would be granted.
-+.Pp
-+.Fn acl_extended_file_nofollow
-+is identical to 
-+.Fn acl_extended_file ,
-+except in the case of a symbolic link, where the link itself is interrogated,
-+not the file that it refers to.  Since symbolic links have no ACL themselves,
-+the operation is supposed to fail on them.
- .Sh RETURN VALUE
- If successful, the
- .Fn acl_extended_file
-diff --git a/man/man5/acl.5 b/man/man5/acl.5
-index 6b0f468..aec58aa 100644
---- a/man/man5/acl.5
-+++ b/man/man5/acl.5
-@@ -497,6 +497,7 @@ These non-portable extensions are available on Linux systems.
- .Xr acl_error 3 ,
- .Xr acl_extended_fd 3 ,
- .Xr acl_extended_file 3 ,
-+.Xr acl_extended_file_nofollow 3 ,
- .Xr acl_from_mode 3 ,
- .Xr acl_get_perm 3 ,
- .Xr acl_to_any_text 3
--- 
-1.7.4
-
-
-From ad4ca5aaee96e98b2e8e8a4351fa5e6c58d65216 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruen@linbit.com>
-Date: Mon, 4 Apr 2011 17:18:38 +0200
-Subject: [PATCH 2/2] Minor fixes to the previous commit
-
-* Assign the new libacl version ACL_1.2 to acl_extended_file_nofollow
-  so that package managers will end up with the appropriate
-  dependencies.
-* Add a manpage entry for acl_extended_file_nofollow which sources
-  ("links to") the acl_extended_file manpage.
-* Remove the prototype for getxattr/lgetxattr.
-* Whitespace cleanups.
----
- exports                               |    7 ++++++-
- libacl/__acl_extended_file.c          |    7 ++++---
- libacl/__acl_extended_file.h          |    7 +++----
- libacl/acl_extended_file_nofollow.c   |    3 +--
- man/man3/acl_extended_file.3          |    2 +-
- man/man3/acl_extended_file_nofollow.3 |    1 +
- 6 files changed, 16 insertions(+), 11 deletions(-)
- create mode 100644 man/man3/acl_extended_file_nofollow.3
-
-diff --git a/exports b/exports
-index b368c22..7d8e69e 100644
---- a/exports
-+++ b/exports
-@@ -82,5 +82,10 @@ ACL_1.1 {
- 	# Linux specific extensions
- 	perm_copy_fd;
- 	perm_copy_file;
--	acl_extended_file_nofollow;
- } ACL_1.0;
-+
-+ACL_1.2 {
-+    global:
-+	# Linux specific extensions
-+	acl_extended_file_nofollow;
-+} ACL_1.1;
-diff --git a/libacl/__acl_extended_file.c b/libacl/__acl_extended_file.c
-index 629afe9..3e45abd 100644
---- a/libacl/__acl_extended_file.c
-+++ b/libacl/__acl_extended_file.c
-@@ -1,5 +1,5 @@
- /*
--  File: acl_extended_file.c
-+  File: __acl_extended_file.c
- 
-   Copyright (C) 2000, 2011
-   Andreas Gruenbacher, <a.gruenbacher@bestbits.at>
-@@ -29,7 +29,9 @@
- 
- 
- int
--__acl_extended_file(const char *path_p, getxattr_t fun)
-+__acl_extended_file(const char *path_p,
-+		    ssize_t (*fun)(const char *, const char *,
-+				   void *, size_t))
- {
- 	int base_size = sizeof(acl_ea_header) + 3 * sizeof(acl_ea_entry);
- 	int retval;
-@@ -46,4 +48,3 @@ __acl_extended_file(const char *path_p, getxattr_t fun)
- 		return 1;
- 	return 0;
- }
--
-diff --git a/libacl/__acl_extended_file.h b/libacl/__acl_extended_file.h
-index f8881a1..0b0da9e 100644
---- a/libacl/__acl_extended_file.h
-+++ b/libacl/__acl_extended_file.h
-@@ -1,4 +1,3 @@
--typedef ssize_t (*getxattr_t)(const char *, const char *, void *value,
--        size_t size);
--
--int __acl_extended_file(const char *path_p, getxattr_t fun);
-+int __acl_extended_file(const char *path_p,
-+			ssize_t (*)(const char *, const char *,
-+				    void *, size_t));
-diff --git a/libacl/acl_extended_file_nofollow.c b/libacl/acl_extended_file_nofollow.c
-index 8f4711f..c253e4d 100644
---- a/libacl/acl_extended_file_nofollow.c
-+++ b/libacl/acl_extended_file_nofollow.c
-@@ -1,5 +1,5 @@
- /*
--  File: acl_extended_file.c
-+  File: acl_extended_file_nofollow.c
- 
-   Copyright (C) 2011
-   Andreas Gruenbacher, <a.gruenbacher@bestbits.at>
-@@ -31,4 +31,3 @@ acl_extended_file_nofollow(const char *path_p)
- {
- 	return __acl_extended_file(path_p, lgetxattr);
- }
--
-diff --git a/man/man3/acl_extended_file.3 b/man/man3/acl_extended_file.3
-index 1f04331..fdeef86 100644
---- a/man/man3/acl_extended_file.3
-+++ b/man/man3/acl_extended_file.3
-@@ -65,7 +65,7 @@ system call can be used to check whether a given type of access to a file
- object would be granted.
- .Pp
- .Fn acl_extended_file_nofollow
--is identical to 
-+is identical to
- .Fn acl_extended_file ,
- except in the case of a symbolic link, where the link itself is interrogated,
- not the file that it refers to.  Since symbolic links have no ACL themselves,
-diff --git a/man/man3/acl_extended_file_nofollow.3 b/man/man3/acl_extended_file_nofollow.3
-new file mode 100644
-index 0000000..44fc24f
---- /dev/null
-+++ b/man/man3/acl_extended_file_nofollow.3
-@@ -0,0 +1 @@
-+.so man3/acl_extended_file.3
--- 
-1.7.4
-
diff --git a/acl-2.2.49-setfacl-restore.patch b/acl-2.2.49-setfacl-restore.patch
deleted file mode 100644
index 8490091..0000000
--- a/acl-2.2.49-setfacl-restore.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c
-index 7142af0..23784a7 100644
---- a/setfacl/setfacl.c
-+++ b/setfacl/setfacl.c
-@@ -125,7 +125,7 @@ restore(
- 	uid_t uid;
- 	gid_t gid;
- 	mode_t mask, flags;
--	struct do_set_args args;
-+	struct do_set_args args = { 0 };
- 	int line = 0, backup_line;
- 	int error, status = 0;
- 	int chmod_required = 0;
-diff --git a/test/misc.test b/test/misc.test
-index e6140da..a910bd0 100644
---- a/test/misc.test
-+++ b/test/misc.test
-@@ -424,3 +424,9 @@ Now, chmod should change the group_obj entry
- 	> 
- 
- 	$ rmdir d
-+
-+Malformed restore file
-+        
-+        $ echo "# owner: root" > f
-+        $ setfacl --restore=f 2>&1
-+        >setfacl: f: No filename found in line 0, aborting
diff --git a/acl-2.2.49-setfacl-walk.patch b/acl-2.2.49-setfacl-walk.patch
deleted file mode 100644
index d797fb0..0000000
--- a/acl-2.2.49-setfacl-walk.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c
-index 091b9cc..be34e69 100644
---- a/setfacl/setfacl.c
-+++ b/setfacl/setfacl.c
-@@ -76,7 +76,7 @@ struct option long_options[] = {
- const char *progname;
- const char *cmd_line_options, *cmd_line_spec;
- 
--int walk_flags = WALK_TREE_DEREFERENCE;
-+int walk_flags = WALK_TREE_DEREFERENCE_TOPLEVEL;
- int opt_recalculate;  /* recalculate mask entry (0=default, 1=yes, -1=no) */
- int opt_promote;  /* promote access ACL to default ACL */
- int opt_test;  /* do not write to the file system.
-@@ -580,13 +580,14 @@ int main(int argc, char *argv[])
- 				break;
- 
- 			case 'L':  /* follow symlinks */
--				walk_flags |= WALK_TREE_LOGICAL;
-+				walk_flags |= WALK_TREE_LOGICAL | WALK_TREE_DEREFERENCE;
- 				walk_flags &= ~WALK_TREE_PHYSICAL;
- 				break;
- 
- 			case 'P':  /* do not follow symlinks */
- 				walk_flags |= WALK_TREE_PHYSICAL;
--				walk_flags &= ~WALK_TREE_LOGICAL;
-+				walk_flags &= ~(WALK_TREE_LOGICAL | WALK_TREE_DEREFERENCE |
-+						WALK_TREE_DEREFERENCE_TOPLEVEL);
- 				break;
- 
- 			case 't':  /* test mode */
diff --git a/acl-2.2.50.src.tar.gz.sig b/acl-2.2.50.src.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..e4fd8368a479b8588f3112e3846ba68711300deb
GIT binary patch
literal 72
zcmV-O0Jr~$Mg#y60ssaD0!^sh0RRdK5JJdf$yIAc){a^LpvPAroW)cdQsOkooNK~B
ej_@Y3)BvAf+qT2YesuTY+{Gt{MElf*`haz?!yvH$

literal 0
HcmV?d00001

diff --git a/acl.spec b/acl.spec
index 878b250..1c1c75e 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
-Version: 2.2.49
-Release: 11%{?dist}
+Version: 2.2.50
+Release: 1%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -9,26 +9,15 @@ BuildRequires: libattr-devel
 BuildRequires: libtool
 Requires: libacl = %{version}-%{release}
 Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.src.tar.gz
+Source2: malformed-restore-double-owner.acl
 Patch1: acl-2.2.39-build.patch
 
-# bz #488674
-Patch2: acl-2.2.49-setfacl-walk.patch
-
-# bz #467936
-Patch3: acl-2.2.49-bz467936.patch
-
 # prepare the test-suite for SELinux and arbitrary umask
 Patch4: acl-2.2.49-tests.patch
 
-# bz #576550
-Patch5: acl-2.2.49-setfacl-restore.patch
-
 # fix typos in setfacl(1) man page (#675451)
 Patch6: acl-2.2.49-bz675451.patch
 
-# add function acl_extended_file_nofollow() (#692982)
-Patch7: acl-2.2.49-bz692982.patch
-
 License: GPLv2+
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -63,12 +52,11 @@ defined in POSIX 1003.1e draft standard 17.
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
-%patch7 -p1
+
+# part of the test-suite not packaged upstream
+install -m0644 %{SOURCE2} test/
 
 %build
 touch .census
@@ -142,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Tue Apr 19 2011 Kamil Dudka <kdudka@redhat.com> 2.2.50-1
+- new upstream release
+
 * Wed Apr 06 2011 Kamil Dudka <kdudka@redhat.com> 2.2.49-11
 - add function acl_extended_file_nofollow() (#692982)
 
diff --git a/malformed-restore-double-owner.acl b/malformed-restore-double-owner.acl
new file mode 100644
index 0000000..1981de2
--- /dev/null
+++ b/malformed-restore-double-owner.acl
@@ -0,0 +1,8 @@
+# file: tmp
+# owner: USER
+# owner: USER
+# group: GROUP
+user::rwx
+group::rwx
+other::rwx
+
diff --git a/sources b/sources
index 71c84af..1a9e17f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-181445894cca986da9ae0099d5ce2d08  acl-2.2.49.src.tar.gz
+4917495f155260c552d9fcff63769a98  acl-2.2.50.src.tar.gz

From 3cd500cd4608a278a5a26fd1d2fb9417995dde68 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Thu, 21 Apr 2011 17:12:48 +0200
Subject: [PATCH 17/96] new upstream release: acl-2.2.51

---
 .gitignore                         |   1 +
 acl-2.2.49-tests.patch             |   6 +++---
 acl-2.2.50.src.tar.gz.sig          | Bin 72 -> 0 bytes
 acl-2.2.51.src.tar.gz.sig          | Bin 0 -> 72 bytes
 acl.spec                           |   9 ++++-----
 malformed-restore-double-owner.acl |   8 --------
 sources                            |   2 +-
 7 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 acl-2.2.50.src.tar.gz.sig
 create mode 100644 acl-2.2.51.src.tar.gz.sig
 delete mode 100644 malformed-restore-double-owner.acl

diff --git a/.gitignore b/.gitignore
index db4fb54..18b7762 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 acl-2.2.49.src.tar.gz
 /acl-2.2.50.src.tar.gz
+/acl-2.2.51.src.tar.gz
diff --git a/acl-2.2.49-tests.patch b/acl-2.2.49-tests.patch
index d48b998..1ceabf8 100644
--- a/acl-2.2.49-tests.patch
+++ b/acl-2.2.49-tests.patch
@@ -26,7 +26,7 @@ diff --git a/test/misc.test b/test/misc.test
 index 7c62c64..e6140da 100644
 --- a/test/misc.test
 +++ b/test/misc.test
-@@ -253,7 +253,7 @@ Add some users and groups
+@@ -254,7 +254,7 @@ Add some users and groups
  Symlink in directory with default ACL?
  	 
  	$ ln -s d d/l
@@ -35,7 +35,7 @@ index 7c62c64..e6140da 100644
  	> lrwxrwxrwx
  
  	$ ls -dl -L d/l | awk '{print $1}'
-@@ -342,7 +342,7 @@ Remove the default ACL
+@@ -343,7 +343,7 @@ Remove the default ACL
  Reset to base entries
  	 
  	$ setfacl -b d
@@ -44,7 +44,7 @@ index 7c62c64..e6140da 100644
  	> drwxr-x---
  
  	$ getfacl --omit-header d
-@@ -354,7 +354,7 @@ Reset to base entries
+@@ -355,7 +355,7 @@ Reset to base entries
  Now, chmod should change the group_obj entry
  	 
  	$ chmod 775 d
diff --git a/acl-2.2.50.src.tar.gz.sig b/acl-2.2.50.src.tar.gz.sig
deleted file mode 100644
index e4fd8368a479b8588f3112e3846ba68711300deb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72
zcmV-O0Jr~$Mg#y60ssaD0!^sh0RRdK5JJdf$yIAc){a^LpvPAroW)cdQsOkooNK~B
ej_@Y3)BvAf+qT2YesuTY+{Gt{MElf*`haz?!yvH$

diff --git a/acl-2.2.51.src.tar.gz.sig b/acl-2.2.51.src.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..aa2f6af1c8942158b3cfac19aa828ebc00a0d3d3
GIT binary patch
literal 72
zcmV-O0Jr~$Mg#y60ssaD0!^*W#sCTl5JJdf$yIAc)=Yx{poZ_Y5_t?tUoRxW;C}{N
eNYVCCUI3u#9<?b*BQNm^Ic>cvv@97$Fwc{83L2RJ

literal 0
HcmV?d00001

diff --git a/acl.spec b/acl.spec
index 1c1c75e..9748e98 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,6 +1,6 @@
 Summary: Access control list utilities
 Name: acl
-Version: 2.2.50
+Version: 2.2.51
 Release: 1%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
@@ -9,7 +9,6 @@ BuildRequires: libattr-devel
 BuildRequires: libtool
 Requires: libacl = %{version}-%{release}
 Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.src.tar.gz
-Source2: malformed-restore-double-owner.acl
 Patch1: acl-2.2.39-build.patch
 
 # prepare the test-suite for SELinux and arbitrary umask
@@ -55,9 +54,6 @@ defined in POSIX 1003.1e draft standard 17.
 %patch4 -p1
 %patch6 -p1
 
-# part of the test-suite not packaged upstream
-install -m0644 %{SOURCE2} test/
-
 %build
 touch .census
 # acl abuses libexecdir
@@ -130,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Thu Apr 21 2011 Kamil Dudka <kdudka@redhat.com> 2.2.51-1
+- new upstream release
+
 * Tue Apr 19 2011 Kamil Dudka <kdudka@redhat.com> 2.2.50-1
 - new upstream release
 
diff --git a/malformed-restore-double-owner.acl b/malformed-restore-double-owner.acl
deleted file mode 100644
index 1981de2..0000000
--- a/malformed-restore-double-owner.acl
+++ /dev/null
@@ -1,8 +0,0 @@
-# file: tmp
-# owner: USER
-# owner: USER
-# group: GROUP
-user::rwx
-group::rwx
-other::rwx
-
diff --git a/sources b/sources
index 1a9e17f..2ae99e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4917495f155260c552d9fcff63769a98  acl-2.2.50.src.tar.gz
+3fc0ce99dc5253bdcce4c9cd437bc267  acl-2.2.51.src.tar.gz

From dc87d4b8e79f8a90604a98a7a26bc3549987edec Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Fri, 6 May 2011 14:53:27 +0200
Subject: [PATCH 18/96] update project URL (#699058)

---
 acl.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/acl.spec b/acl.spec
index 9748e98..69baba4 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.51
-Release: 1%{?dist}
+Release: 2%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -19,7 +19,7 @@ Patch6: acl-2.2.49-bz675451.patch
 
 License: GPLv2+
 Group: System Environment/Base
-URL: http://oss.sgi.com/projects/xfs/
+URL: http://acl.bestbits.at/
 
 %description
 This package contains the getfacl and setfacl utilities needed for
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Fri May 06 2011 Kamil Dudka <kdudka@redhat.com> 2.2.51-2
+- update project URL (#699058)
+
 * Thu Apr 21 2011 Kamil Dudka <kdudka@redhat.com> 2.2.51-1
 - new upstream release
 

From 82d2580227ca3adfce0af4bb0e83326da34d6e45 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 12 Jan 2012 14:59:34 -0600
Subject: [PATCH 19/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 69baba4..c967b48 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.51
-Release: 2%{?dist}
+Release: 3%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libacl.so.*
 
 %changelog
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.51-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Fri May 06 2011 Kamil Dudka <kdudka@redhat.com> 2.2.51-2
 - update project URL (#699058)
 

From 56fc66913db17efa6662bcc3584211002be819dd Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Wed, 25 Jan 2012 13:57:13 +0100
Subject: [PATCH 20/96] install everything in /usr

This patch is needed for the /usr-move feature
https://fedoraproject.org/wiki/Features/UsrMove

This package requires now 'filesystem' >= 3, which is only installable
on a system which has /bin, /sbin, /lib, /lib64 as symlinks to /usr and
not regular directories. The 'filesystem' package acts as a guard, to
prevent *this* package to be installed on old unconverted systems.

New installations will have the 'filesystem' >=3 layout right away, old
installations need to be converted with anaconda or dracut first; only
after that, the 'filesystem' package, and also *this* package can be
installed.

Packages *should* not install files in /bin, /sbin, /lib, /lib64, but
only in the corresponding directories in /usr. Packages *must* not
install conflicting files with the same names in the corresponding
directories in / and /usr. Especially compatibilty symlinks must not be
installed.

Feel free to modify any of the changes to the spec file, but keep the
above in mind.
---
 acl.spec | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/acl.spec b/acl.spec
index c967b48..73808ed 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.51
-Release: 3%{?dist}
+Release: 4%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -31,6 +31,7 @@ License: LGPLv2+
 Group: System Environment/Libraries
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+#Conflicts: filesystem < 3
 
 %description -n libacl
 This package contains the libacl.so dynamic library which contains
@@ -57,7 +58,7 @@ defined in POSIX 1003.1e draft standard 17.
 %build
 touch .census
 # acl abuses libexecdir
-%configure --libdir=/%{_lib} --libexecdir=%{_libdir}
+%configure --libexecdir=%{_libdir}
 
 # uncomment to turn on optimizations
 # sed -i 's/-O2/-O0/' libtool include/builddefs
@@ -83,15 +84,12 @@ make install-dev DESTDIR=$RPM_BUILD_ROOT
 make install-lib DESTDIR=$RPM_BUILD_ROOT
 
 # get rid of libacl.a and libacl.la
-rm -f $RPM_BUILD_ROOT/%{_lib}/libacl.a
-rm -f $RPM_BUILD_ROOT/%{_lib}/libacl.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.la
 
-# fix links to shared libs and permissions
-rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.so
-ln -sf ../../%{_lib}/libacl.so $RPM_BUILD_ROOT/%{_libdir}/libacl.so
-chmod 0755 $RPM_BUILD_ROOT/%{_lib}/libacl.so.*.*.*
+chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libacl.so.*.*.*
 
 %find_lang %{name}
 
@@ -115,7 +113,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libacl-devel
 %defattr(-,root,root,-)
-/%{_lib}/libacl.so
 %{_libdir}/libacl.so
 %{_includedir}/acl
 %{_includedir}/sys/acl.h
@@ -123,9 +120,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libacl
 %defattr(-,root,root,-)
-/%{_lib}/libacl.so.*
+%{_libdir}/libacl.so.*
 
 %changelog
+* Wed Jan 25 2012 Harald Hoyer <harald@redhat.com> 2.2.51-4
+- install everything in /usr
+  https://fedoraproject.org/wiki/Features/UsrMove
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.51-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 

From ad8057c8f732ea259d37eb1851f08bbcb2cb1b13 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Wed, 25 Jan 2012 21:10:23 +0100
Subject: [PATCH 21/96] add filesystem guard

---
 acl.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/acl.spec b/acl.spec
index 73808ed..3ee9a91 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.51
-Release: 4%{?dist}
+Release: 5%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -31,7 +31,7 @@ License: LGPLv2+
 Group: System Environment/Libraries
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-#Conflicts: filesystem < 3
+Conflicts: filesystem < 3
 
 %description -n libacl
 This package contains the libacl.so dynamic library which contains
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libacl.so.*
 
 %changelog
+* Wed Jan 25 2012 Harald Hoyer <harald@redhat.com> 2.2.51-5
+- add filesystem guard
+
 * Wed Jan 25 2012 Harald Hoyer <harald@redhat.com> 2.2.51-4
 - install everything in /usr
   https://fedoraproject.org/wiki/Features/UsrMove

From 7cc290ed67a084830d9c92ee6e86133c22970cd3 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Wed, 2 May 2012 11:11:23 +0200
Subject: [PATCH 22/96] update the summary of libacl{,-devel} (#817952)

---
 acl.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/acl.spec b/acl.spec
index 3ee9a91..58fc45d 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.51
-Release: 5%{?dist}
+Release: 6%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -39,13 +39,13 @@ the POSIX 1003.1e draft standard 17 functions for manipulating access
 control lists.
 
 %package -n libacl-devel
-Summary: Access control list static libraries and headers
+Summary: Files needed for building programs with libacl
 License: LGPLv2+
 Group: Development/Libraries
 Requires: libacl = %{version}-%{release}, libattr-devel
 
 %description -n libacl-devel
-This package contains static libraries and header files needed to develop
+This package contains header files and documentation needed to develop
 programs which make use of the access control list programming interface
 defined in POSIX 1003.1e draft standard 17.
 
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libacl.so.*
 
 %changelog
+* Wed May 02 2012 Kamil Dudka <kdudka@redhat.com> 2.2.51-6
+- do not mention static libraries in the summary of libacl{,-devel} (#817952)
+
 * Wed Jan 25 2012 Harald Hoyer <harald@redhat.com> 2.2.51-5
 - add filesystem guard
 

From fc0d7e760fd6f3be2a9433c77f58bf501ea87ad1 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 18 Jul 2012 10:32:45 -0500
Subject: [PATCH 23/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 58fc45d..40d3b9c 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.51
-Release: 6%{?dist}
+Release: 7%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libacl.so.*
 
 %changelog
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.51-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Wed May 02 2012 Kamil Dudka <kdudka@redhat.com> 2.2.51-6
 - do not mention static libraries in the summary of libacl{,-devel} (#817952)
 

From b5b6b078cb3c14d180115d20058d2f442711bb5a Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Tue, 28 Aug 2012 16:08:58 +0200
Subject: [PATCH 24/96] fix specfile issues reported by the fedora-review
 script

---
 acl.spec | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/acl.spec b/acl.spec
index 40d3b9c..fcefe95 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.51
-Release: 7%{?dist}
+Release: 8%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -78,7 +78,6 @@ else
 fi
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 make install-dev DESTDIR=$RPM_BUILD_ROOT
 make install-lib DESTDIR=$RPM_BUILD_ROOT
@@ -93,15 +92,11 @@ chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libacl.so.*.*.*
 
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -n libacl -p /sbin/ldconfig
 
 %postun -n libacl -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %{_bindir}/chacl
 %{_bindir}/getfacl
 %{_bindir}/setfacl
@@ -112,17 +107,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/acl.5*
 
 %files -n libacl-devel
-%defattr(-,root,root,-)
 %{_libdir}/libacl.so
 %{_includedir}/acl
 %{_includedir}/sys/acl.h
 %{_mandir}/man3/acl_*
 
 %files -n libacl
-%defattr(-,root,root,-)
 %{_libdir}/libacl.so.*
 
 %changelog
+* Tue Aug 28 2012 Kamil Dudka <kdudka@redhat.com> 2.2.51-8
+- fix specfile issues reported by the fedora-review script
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.51-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

From 0eb56be2bec2bc2faa0185b0e0993677d8f3aaa7 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 13 Feb 2013 10:15:05 -0600
Subject: [PATCH 25/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index fcefe95..e3a8d3e 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.51
-Release: 8%{?dist}
+Release: 9%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -116,6 +116,9 @@ chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libacl.so.*.*.*
 %{_libdir}/libacl.so.*
 
 %changelog
+* 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
+
 * Tue Aug 28 2012 Kamil Dudka <kdudka@redhat.com> 2.2.51-8
 - fix specfile issues reported by the fedora-review script
 

From c6736e9e8e1ef9310deb8dcaf78c978b1c94dbce Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 20 May 2013 13:52:12 +0200
Subject: [PATCH 26/96] upstream release - 2.2.52

---
 .gitignore                                    |   1 +
 ...51.patch => 0001-acl-2.2.49-bz675451.patch |  12 ++-
 0002-acl-2.2.52-docdir.patch                  |  25 +++++
 ...tests.patch => 0003-acl-2.2.52-tests.patch |  87 +++---------------
 0004-acl-2.2.52-libdir.patch                  |  28 ++++++
 acl-2.2.39-build.patch                        |  40 --------
 acl-2.2.51.src.tar.gz.sig                     | Bin 72 -> 0 bytes
 acl-2.2.52.src.tar.gz.sig                     | Bin 0 -> 543 bytes
 acl.spec                                      |  30 +++---
 sources                                       |   2 +-
 10 files changed, 98 insertions(+), 127 deletions(-)
 rename acl-2.2.49-bz675451.patch => 0001-acl-2.2.49-bz675451.patch (73%)
 create mode 100644 0002-acl-2.2.52-docdir.patch
 rename acl-2.2.49-tests.patch => 0003-acl-2.2.52-tests.patch (50%)
 create mode 100644 0004-acl-2.2.52-libdir.patch
 delete mode 100644 acl-2.2.39-build.patch
 delete mode 100644 acl-2.2.51.src.tar.gz.sig
 create mode 100644 acl-2.2.52.src.tar.gz.sig

diff --git a/.gitignore b/.gitignore
index 18b7762..043c8b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 acl-2.2.49.src.tar.gz
 /acl-2.2.50.src.tar.gz
 /acl-2.2.51.src.tar.gz
+/acl-2.2.52.src.tar.gz
diff --git a/acl-2.2.49-bz675451.patch b/0001-acl-2.2.49-bz675451.patch
similarity index 73%
rename from acl-2.2.49-bz675451.patch
rename to 0001-acl-2.2.49-bz675451.patch
index cb742b4..cc04380 100644
--- a/acl-2.2.49-bz675451.patch
+++ b/0001-acl-2.2.49-bz675451.patch
@@ -1,8 +1,15 @@
+From 320b3ca0a544fd5024ddfeca6f491a0344b9ecd2 Mon Sep 17 00:00:00 2001
+From: John Bradshaw <john@johnbradshaw.org>
+Date: Sat, 5 Feb 2011 18:14:27 +0000
+Subject: [PATCH] setfacl.1: fix typo 'inclu de' -> 'include'
+
+Bug: https://bugzilla.redhat.com/675451
+---
  man/man1/setfacl.1 |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/man/man1/setfacl.1 b/man/man1/setfacl.1
-index 25908e2..776f22d 100644
+index 64f0e33..0c7c046 100644
 --- a/man/man1/setfacl.1
 +++ b/man/man1/setfacl.1
 @@ -240,8 +240,8 @@ owner, owning group, or others entry, a copy of the ACL owner, owning group, or
@@ -16,3 +23,6 @@ index 25908e2..776f22d 100644
  .I \-n
  option description).
  .PP
+-- 
+1.7.1
+
diff --git a/0002-acl-2.2.52-docdir.patch b/0002-acl-2.2.52-docdir.patch
new file mode 100644
index 0000000..21857a9
--- /dev/null
+++ b/0002-acl-2.2.52-docdir.patch
@@ -0,0 +1,25 @@
+From b4e37109d66d698772e2513c0f79e818b4235897 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 20 May 2013 13:17:14 +0200
+Subject: [PATCH] builddefs.in: use pkg version in $(PKG_DOC_DIR)
+
+---
+ include/builddefs.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/include/builddefs.in b/include/builddefs.in
+index d9931db..47bfdd6 100644
+--- a/include/builddefs.in
++++ b/include/builddefs.in
+@@ -34,7 +34,7 @@ PKG_LIB_DIR	= @libdir@@libdirsuffix@
+ PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@
+ PKG_INC_DIR	= @includedir@
+ PKG_MAN_DIR	= @mandir@
+-PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
++PKG_DOC_DIR	= @datadir@/doc/@pkg_name@-@pkg_version@
+ PKG_LOCALE_DIR	= @datadir@/locale
+ 
+ CC		= @cc@
+-- 
+1.7.1
+
diff --git a/acl-2.2.49-tests.patch b/0003-acl-2.2.52-tests.patch
similarity index 50%
rename from acl-2.2.49-tests.patch
rename to 0003-acl-2.2.52-tests.patch
index 1ceabf8..fb367ea 100644
--- a/acl-2.2.49-tests.patch
+++ b/0003-acl-2.2.52-tests.patch
@@ -1,58 +1,14 @@
-diff --git a/test/cp.test b/test/cp.test
-index a888c04..4a75ffd 100644
---- a/test/cp.test
-+++ b/test/cp.test
-@@ -9,7 +9,7 @@ The cp utility should only copy ACLs if `-p' is given.
- 	> -rw-rw-r--+
- 	
- 	$ cp f g
--	$ ls -l g | awk -- '{ print $1 }'
-+	$ ls -l g | awk -- '{ print $1 }' | sed 's/\\.$//'
- 	> -rw-r--r--
- 	
- 	$ rm g
-diff --git a/test/getfacl-recursive.test b/test/getfacl-recursive.test
-index b88c211..a72192e 100644
---- a/test/getfacl-recursive.test
-+++ b/test/getfacl-recursive.test
-@@ -1,5 +1,6 @@
- Tests for proper path recursion
- 
-+	$ umask 022
- 	$ mkdir -p 1/2/3
- 	$ mkdir 1/link
- 	$ touch 1/link/file
-diff --git a/test/misc.test b/test/misc.test
-index 7c62c64..e6140da 100644
---- a/test/misc.test
-+++ b/test/misc.test
-@@ -254,7 +254,7 @@ Add some users and groups
- Symlink in directory with default ACL?
- 	 
- 	$ ln -s d d/l
--	$ ls -dl d/l | awk '{print $1}'
-+	$ ls -dl d/l | awk '{print $1}' | sed 's/\\.$//'
- 	> lrwxrwxrwx
- 
- 	$ ls -dl -L d/l | awk '{print $1}'
-@@ -343,7 +343,7 @@ Remove the default ACL
- Reset to base entries
- 	 
- 	$ setfacl -b d
--	$ ls -dl d | awk '{print $1}'
-+	$ ls -dl d | awk '{print $1}' | sed 's/\\.$//'
- 	> drwxr-x---
- 
- 	$ getfacl --omit-header d
-@@ -355,7 +355,7 @@ Reset to base entries
- Now, chmod should change the group_obj entry
- 	 
- 	$ chmod 775 d
--	$ ls -dl d | awk '{print $1}'
-+	$ ls -dl d | awk '{print $1}' | sed 's/\\.$//'
- 	> drwxrwxr-x
- 	
- 	$ getfacl --omit-header d
+From cfd9ba83811189d9e12c86d32b06b5fd15b5f358 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 20 May 2013 13:49:34 +0200
+Subject: [PATCH] make the tests ready for SELinux
+
+---
+ test/root/permissions.test |    8 ++++----
+ test/root/restore.test     |    2 +-
+ test/root/setfacl.test     |    2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
 diff --git a/test/root/permissions.test b/test/root/permissions.test
 index afaf5f0..4880bd2 100644
 --- a/test/root/permissions.test
@@ -116,21 +72,6 @@ index 630e9fb..dd7fe08 100644
  	> -rw-r-----
  
  	$ setfacl -m m:- g
-diff --git a/test/sbits-restore.test b/test/sbits-restore.test
-index e5e4fb2..abdb58a 100644
---- a/test/sbits-restore.test
-+++ b/test/sbits-restore.test
-@@ -13,10 +13,10 @@ Ensure setting of SUID/SGID/sticky via --restore works
- 	$ touch d/g
- 	$ touch d/u
- 	$ setfacl --restore d.acl
--	$ ls -dl d | awk '{print $1}'
-+	$ ls -dl d | awk '{print $1}' | sed 's/\\.$//'
- 	> drwxr-xr-t
--	$ ls -dl d/u | awk '{print $1}'
-+	$ ls -dl d/u | awk '{print $1}' | sed 's/\\.$//'
- 	> -rwSr--r--
--	$ ls -dl d/g | awk '{print $1}'
-+	$ ls -dl d/g | awk '{print $1}' | sed 's/\\.$//'
- 	> -rw-r-Sr--
- 	$ rm -Rf d
+-- 
+1.7.1
+
diff --git a/0004-acl-2.2.52-libdir.patch b/0004-acl-2.2.52-libdir.patch
new file mode 100644
index 0000000..93a410e
--- /dev/null
+++ b/0004-acl-2.2.52-libdir.patch
@@ -0,0 +1,28 @@
+From 3dee229914dc17beef900d16175a877697119911 Mon Sep 17 00:00:00 2001
+From: Kamil Rytarowski <n54@gmx.com>
+Date: Sat, 27 Apr 2013 22:43:31 +0200
+Subject: [PATCH] Install the libraries to the appropriate directory
+
+[upstream commit 2971df45020e39516c9b3d6217195b4029026f7a]
+
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ include/builddefs.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/include/builddefs.in b/include/builddefs.in
+index 2ef6173..876a735 100644
+--- a/include/builddefs.in
++++ b/include/builddefs.in
+@@ -31,7 +31,7 @@ PKG_DISTRIBUTION= @pkg_distribution@
+ PKG_BIN_DIR	= @bindir@
+ PKG_SBIN_DIR	= @sbindir@
+ PKG_LIB_DIR	= @libdir@@libdirsuffix@
+-PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@
++PKG_DEVLIB_DIR	= @libdir@@libdirsuffix@
+ PKG_INC_DIR	= @includedir@
+ PKG_MAN_DIR	= @mandir@
+ PKG_DOC_DIR	= @datadir@/doc/@pkg_name@-@pkg_version@
+-- 
+1.7.1
+
diff --git a/acl-2.2.39-build.patch b/acl-2.2.39-build.patch
deleted file mode 100644
index fbe608a..0000000
--- a/acl-2.2.39-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/include/builddefs.in b/include/builddefs.in
-index d054a56..10b0cd4 100644
---- a/include/builddefs.in
-+++ b/include/builddefs.in
-@@ -28,14 +28,14 @@ PKG_RELEASE	= @pkg_release@
- PKG_VERSION	= @pkg_version@
- PKG_PLATFORM	= @pkg_platform@
- PKG_DISTRIBUTION= @pkg_distribution@
--PKG_BIN_DIR	= @bindir@
--PKG_SBIN_DIR	= @sbindir@
--PKG_LIB_DIR	= @libdir@@libdirsuffix@
--PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@
--PKG_INC_DIR	= @includedir@
--PKG_MAN_DIR	= @mandir@
--PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
--PKG_LOCALE_DIR	= @datadir@/locale
-+PKG_BIN_DIR	= $(DESTDIR)@bindir@
-+PKG_SBIN_DIR	= $(DESTDIR)@sbindir@
-+PKG_LIB_DIR	= $(DESTDIR)@libdir@@libdirsuffix@
-+PKG_DEVLIB_DIR	= $(DESTDIR)@libexecdir@@libdirsuffix@
-+PKG_INC_DIR	= $(DESTDIR)@includedir@
-+PKG_MAN_DIR	= $(DESTDIR)@mandir@
-+PKG_DOC_DIR	= $(DESTDIR)@datadir@/doc/@pkg_name@-@pkg_version@
-+PKG_LOCALE_DIR	= $(DESTDIR)@datadir@/locale
- 
- CC		= @cc@
- AWK		= @awk@
-diff --git a/include/buildmacros b/include/buildmacros
-index 17423c0..3118a17 100644
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \
- 	  $(LFILES:.l=.o) \
- 	  $(YFILES:%.y=%.tab.o)
- 
--INSTALL	= $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
-+INSTALL	= $(TOPDIR)/include/install-sh
- 
- SHELL = /bin/sh
- IMAGES_DIR = $(TOPDIR)/all-images
diff --git a/acl-2.2.51.src.tar.gz.sig b/acl-2.2.51.src.tar.gz.sig
deleted file mode 100644
index aa2f6af1c8942158b3cfac19aa828ebc00a0d3d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72
zcmV-O0Jr~$Mg#y60ssaD0!^*W#sCTl5JJdf$yIAc)=Yx{poZ_Y5_t?tUoRxW;C}{N
eNYVCCUI3u#9<?b*BQNm^Ic>cvv@97$Fwc{83L2RJ

diff --git a/acl-2.2.52.src.tar.gz.sig b/acl-2.2.52.src.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..f9d1b9e6351a28b93138f6a862257af3b45a7da0
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0RjL91p-l+Y(xMG2@n-SLnZ}6-!y|Q5CENYXMobghqZ}i)J}BR
z_>y#Qzx3R1Z8CaPk(UR>)+kj)KQ7h34yc+{8E>;U4J=6?R<kiOdN5+)PUW;03iTA`
zqejCjX?QYS&3UM*X@24YtL!p;P@-m;V}_O>%*v+;_T{kzlXr5lCBy&E;dfps_9OVK
zo<PEQYxv{&HmzKqJZO*q{M;w{W&T8(btjY<)wbsD6??!vMp4Xp0p$a1Y=Go~Y^<Sd
zF+MhW1b{Rb7`je=+jmvXHNE%&b^0d%<kO6<v7vp9w<uAKVmVd4;1{cykSv3JNr^=@
zl3k~0R#^yK>^+jV9q+3j1tNF>m(Q^YoRC}&jZ>(gv-e4HS1wX23!;ZLV2bQvw*o=^
zD(6~%*xL579AXU1wuBbLV2e=tw5j%HMs6~lR3dlmmof0|8jqE;yoM^;iNr)Chv;%L
zGG+tFR>}dr1s~@O;YE#8#cqo7-!Ga@{wYnl7t#eqIX-gCC?iHy>q1@D^@0=R4BSQT
z<L;M9ahg0pfSd*^%<El(g@t~qN<P`!d?o=J1Lf=@cfbQWqQ<kL>rKz5DG;h5?agTk
zT$59dfA<R31HC9IsvJpd*6^HQ9?5_@`1(1LOee$F!1(3fH?OVG{PMFYPiGM-Pp-gi
hK43Ea8c1HMSBHT_%L*5YH!G#imTfW0Rlq8}LvuM+0nh*d

literal 0
HcmV?d00001

diff --git a/acl.spec b/acl.spec
index e3a8d3e..795837d 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
-Version: 2.2.51
-Release: 9%{?dist}
+Version: 2.2.52
+Release: 1%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -9,13 +9,18 @@ BuildRequires: libattr-devel
 BuildRequires: libtool
 Requires: libacl = %{version}-%{release}
 Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.src.tar.gz
-Patch1: acl-2.2.39-build.patch
+
+# fix a typo in setfacl(1) man page (#675451)
+Patch1: 0001-acl-2.2.49-bz675451.patch
+
+# use pkg version in $(PKG_DOC_DIR)
+Patch2: 0002-acl-2.2.52-docdir.patch
 
 # prepare the test-suite for SELinux and arbitrary umask
-Patch4: acl-2.2.49-tests.patch
+Patch3: 0003-acl-2.2.52-tests.patch
 
-# fix typos in setfacl(1) man page (#675451)
-Patch6: acl-2.2.49-bz675451.patch
+# Install the libraries to the appropriate directory
+Patch4: 0004-acl-2.2.52-libdir.patch
 
 License: GPLv2+
 Group: System Environment/Base
@@ -52,13 +57,12 @@ defined in POSIX 1003.1e draft standard 17.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 %patch4 -p1
-%patch6 -p1
 
 %build
-touch .census
-# acl abuses libexecdir
-%configure --libexecdir=%{_libdir}
+%configure
 
 # uncomment to turn on optimizations
 # sed -i 's/-O2/-O0/' libtool include/builddefs
@@ -85,8 +89,6 @@ make install-lib DESTDIR=$RPM_BUILD_ROOT
 # get rid of libacl.a and libacl.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.la
 
 chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libacl.so.*.*.*
 
@@ -116,6 +118,10 @@ chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libacl.so.*.*.*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Mon May 20 2013 Kamil Dudka <kdudka@redhat.com> 2.2.52-1
+- new upstream release, drop applied patches
+- drop workarounds that are no longer necessary
+
 * 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
 
diff --git a/sources b/sources
index 2ae99e1..051eb9e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3fc0ce99dc5253bdcce4c9cd437bc267  acl-2.2.51.src.tar.gz
+a61415312426e9c2212bd7dc7929abda  acl-2.2.52.src.tar.gz

From dc263444f1065aa7862203c7f4084154bb60514a Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 20 May 2013 15:05:39 +0200
Subject: [PATCH 27/96] 0003-acl-2.2.52-tests.patch: follow-up to upstream
 patch

---
 0003-acl-2.2.52-tests.patch | 105 +++++++++++++++++++++++++++++++++++-
 1 file changed, 104 insertions(+), 1 deletion(-)

diff --git a/0003-acl-2.2.52-tests.patch b/0003-acl-2.2.52-tests.patch
index fb367ea..7bc284e 100644
--- a/0003-acl-2.2.52-tests.patch
+++ b/0003-acl-2.2.52-tests.patch
@@ -1,7 +1,7 @@
 From cfd9ba83811189d9e12c86d32b06b5fd15b5f358 Mon Sep 17 00:00:00 2001
 From: Kamil Dudka <kdudka@redhat.com>
 Date: Mon, 20 May 2013 13:49:34 +0200
-Subject: [PATCH] make the tests ready for SELinux
+Subject: [PATCH 1/2] make the tests ready for SELinux
 
 ---
  test/root/permissions.test |    8 ++++----
@@ -75,3 +75,106 @@ index 630e9fb..dd7fe08 100644
 -- 
 1.7.1
 
+
+From 3720a8a3cf55e295eca55457fad8177f6277f620 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 20 May 2013 15:00:47 +0200
+Subject: [PATCH 2/2] test: fix insufficient quoting of '\'
+
+This is a follow-up to 7f2c91b8369242a8dbc2b304a5b71b2a85f5b855, which
+caused sbits-restore.test to fail in the following way in case SELinux
+was disabled:
+
+*** sbits-restore.test ***
+[3] $ umask 022 -- ok
+[4] $ mkdir d -- ok
+[5] $ touch d/g -- ok
+[6] $ touch d/u -- ok
+[7] $ chmod u+s d/u -- ok
+[8] $ chmod g+s d/g -- ok
+[9] $ chmod +t d -- ok
+[10] $ getfacl -R d > d.acl -- ok
+[11] $ rm -R d -- ok
+[12] $ mkdir d -- ok
+[13] $ touch d/g -- ok
+[14] $ touch d/u -- ok
+[15] $ setfacl --restore d.acl -- ok
+[16] $ ls -dl d | awk '{print $1}' | sed 's/.$//g' -- failed
+drwxr-xr-                             != drwxr-xr-t
+[18] $ ls -dl d/u | awk '{print $1}' | sed 's/.$//g' -- failed
+-rwSr--r-                             != -rwSr--r--
+[20] $ ls -dl d/g | awk '{print $1}' | sed 's/.$//g' -- failed
+-rw-r-Sr-                             != -rw-r-Sr--
+[22] $ rm -Rf d -- ok
+17 commands (14 passed, 3 failed)
+---
+ test/cp.test            |    2 +-
+ test/misc.test          |    6 +++---
+ test/sbits-restore.test |    6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/test/cp.test b/test/cp.test
+index 0867f63..a927195 100644
+--- a/test/cp.test
++++ b/test/cp.test
+@@ -9,7 +9,7 @@ The cp utility should only copy ACLs if `-p' is given.
+ 	> -rw-rw-r--+
+ 	
+ 	$ cp f g
+-	$ ls -l g | awk -- '{ print $1 }' | sed 's/\.$//g'
++	$ ls -l g | awk -- '{ print $1 }' | sed 's/\\.$//g'
+ 	> -rw-r--r--
+ 	
+ 	$ rm g
+diff --git a/test/misc.test b/test/misc.test
+index 6e98053..29372b7 100644
+--- a/test/misc.test
++++ b/test/misc.test
+@@ -254,7 +254,7 @@ Add some users and groups
+ Symlink in directory with default ACL?
+ 	 
+ 	$ ln -s d d/l
+-	$ ls -dl d/l | awk '{print $1}' | sed 's/\.$//g'
++	$ ls -dl d/l | awk '{print $1}' | sed 's/\\.$//g'
+ 	> lrwxrwxrwx
+ 
+ 	$ ls -dl -L d/l | awk '{print $1}'
+@@ -343,7 +343,7 @@ Remove the default ACL
+ Reset to base entries
+ 	 
+ 	$ setfacl -b d
+-	$ ls -dl d | awk '{print $1}' | sed 's/\.$//g'
++	$ ls -dl d | awk '{print $1}' | sed 's/\\.$//g'
+ 	> drwxr-x---
+ 
+ 	$ getfacl --omit-header d
+@@ -355,7 +355,7 @@ Reset to base entries
+ Now, chmod should change the group_obj entry
+ 	 
+ 	$ chmod 775 d
+-	$ ls -dl d | awk '{print $1}' | sed 's/\.$//g'
++	$ ls -dl d | awk '{print $1}' | sed 's/\\.$//g'
+ 	> drwxrwxr-x
+ 	
+ 	$ getfacl --omit-header d
+diff --git a/test/sbits-restore.test b/test/sbits-restore.test
+index de21340..5899b0a 100644
+--- a/test/sbits-restore.test
++++ b/test/sbits-restore.test
+@@ -13,10 +13,10 @@ Ensure setting of SUID/SGID/sticky via --restore works
+ 	$ touch d/g
+ 	$ touch d/u
+ 	$ setfacl --restore d.acl
+-	$ ls -dl d | awk '{print $1}' | sed 's/\.$//g'
++	$ ls -dl d | awk '{print $1}' | sed 's/\\.$//g'
+ 	> drwxr-xr-t
+-	$ ls -dl d/u | awk '{print $1}' | sed 's/\.$//g'
++	$ ls -dl d/u | awk '{print $1}' | sed 's/\\.$//g'
+ 	> -rwSr--r--
+-	$ ls -dl d/g | awk '{print $1}' | sed 's/\.$//g'
++	$ ls -dl d/g | awk '{print $1}' | sed 's/\\.$//g'
+ 	> -rw-r-Sr--
+ 	$ rm -Rf d
+-- 
+1.7.1
+

From 8bdd68a5b0ce07cd66d723dfab057b009f7cbd01 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 2 Aug 2013 19:12:03 -0500
Subject: [PATCH 28/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 795837d..e1ea9bd 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 1%{?dist}
+Release: 2%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -118,6 +118,9 @@ chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libacl.so.*.*.*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.52-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Mon May 20 2013 Kamil Dudka <kdudka@redhat.com> 2.2.52-1
 - new upstream release, drop applied patches
 - drop workarounds that are no longer necessary

From 125536ca1c6851ec84615187062cd296afe29bf4 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Fri, 9 Aug 2013 12:50:07 +0200
Subject: [PATCH 29/96] drop a docdir-related patch to fix a packaging failure
 (#993659)

---
 0002-acl-2.2.52-docdir.patch | 25 -------------------------
 acl.spec                     | 14 ++++++++------
 2 files changed, 8 insertions(+), 31 deletions(-)
 delete mode 100644 0002-acl-2.2.52-docdir.patch

diff --git a/0002-acl-2.2.52-docdir.patch b/0002-acl-2.2.52-docdir.patch
deleted file mode 100644
index 21857a9..0000000
--- a/0002-acl-2.2.52-docdir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b4e37109d66d698772e2513c0f79e818b4235897 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Mon, 20 May 2013 13:17:14 +0200
-Subject: [PATCH] builddefs.in: use pkg version in $(PKG_DOC_DIR)
-
----
- include/builddefs.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/include/builddefs.in b/include/builddefs.in
-index d9931db..47bfdd6 100644
---- a/include/builddefs.in
-+++ b/include/builddefs.in
-@@ -34,7 +34,7 @@ PKG_LIB_DIR	= @libdir@@libdirsuffix@
- PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@
- PKG_INC_DIR	= @includedir@
- PKG_MAN_DIR	= @mandir@
--PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
-+PKG_DOC_DIR	= @datadir@/doc/@pkg_name@-@pkg_version@
- PKG_LOCALE_DIR	= @datadir@/locale
- 
- CC		= @cc@
--- 
-1.7.1
-
diff --git a/acl.spec b/acl.spec
index e1ea9bd..238b631 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 2%{?dist}
+Release: 3%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -13,9 +13,6 @@ Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.
 # fix a typo in setfacl(1) man page (#675451)
 Patch1: 0001-acl-2.2.49-bz675451.patch
 
-# use pkg version in $(PKG_DOC_DIR)
-Patch2: 0002-acl-2.2.52-docdir.patch
-
 # prepare the test-suite for SELinux and arbitrary umask
 Patch3: 0003-acl-2.2.52-tests.patch
 
@@ -57,7 +54,6 @@ defined in POSIX 1003.1e draft standard 17.
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 
@@ -92,6 +88,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.la
 
 chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libacl.so.*.*.*
 
+# drop already installed documentation, we will use an RPM macro to install it
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
+
 %find_lang %{name}
 
 %post -n libacl -p /sbin/ldconfig
@@ -99,10 +98,10 @@ chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libacl.so.*.*.*
 %postun -n libacl -p /sbin/ldconfig
 
 %files -f %{name}.lang
+%doc doc/COPYING*
 %{_bindir}/chacl
 %{_bindir}/getfacl
 %{_bindir}/setfacl
-%{_datadir}/doc/acl-%{version}
 %{_mandir}/man1/chacl.1*
 %{_mandir}/man1/getfacl.1*
 %{_mandir}/man1/setfacl.1*
@@ -118,6 +117,9 @@ chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libacl.so.*.*.*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Fri Aug 09 2013 Kamil Dudka <kdudka@redhat.com> 2.2.52-3
+- drop a docdir-related patch to fix a packaging failure (#993659)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.52-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

From 3d993cf6deeae942aec588072ecb6b18b520b5c1 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Fri, 9 Aug 2013 13:14:26 +0200
Subject: [PATCH 30/96] fix the context of 0004-acl-2.2.52-libdir.patch

---
 0004-acl-2.2.52-libdir.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/0004-acl-2.2.52-libdir.patch b/0004-acl-2.2.52-libdir.patch
index 93a410e..98d733f 100644
--- a/0004-acl-2.2.52-libdir.patch
+++ b/0004-acl-2.2.52-libdir.patch
@@ -22,7 +22,7 @@ index 2ef6173..876a735 100644
 +PKG_DEVLIB_DIR	= @libdir@@libdirsuffix@
  PKG_INC_DIR	= @includedir@
  PKG_MAN_DIR	= @mandir@
- PKG_DOC_DIR	= @datadir@/doc/@pkg_name@-@pkg_version@
+ PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
 -- 
 1.7.1
 

From 5293f396e1a3f7cb0de74da6fc4c30c4e024f531 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Fri, 1 Nov 2013 13:28:26 +0100
Subject: [PATCH 31/96] fix SIGSEGV of getfacl -e on overly long group name

---
 0005-acl-2.2.52-getfacl-segv.patch | 54 ++++++++++++++++++++++++++++++
 acl.spec                           |  9 ++++-
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 0005-acl-2.2.52-getfacl-segv.patch

diff --git a/0005-acl-2.2.52-getfacl-segv.patch b/0005-acl-2.2.52-getfacl-segv.patch
new file mode 100644
index 0000000..8a27dda
--- /dev/null
+++ b/0005-acl-2.2.52-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/acl.spec b/acl.spec
index 238b631..eb4efff 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 3%{?dist}
+Release: 4%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -19,6 +19,9 @@ Patch3: 0003-acl-2.2.52-tests.patch
 # Install the libraries to the appropriate directory
 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
+
 License: GPLv2+
 Group: System Environment/Base
 URL: http://acl.bestbits.at/
@@ -56,6 +59,7 @@ defined in POSIX 1003.1e draft standard 17.
 %patch1 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %configure
@@ -117,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Fri Nov 01 2013 Kamil Dudka <kdudka@redhat.com> 2.2.52-4
+- fix SIGSEGV of getfacl -e on overly long group name
+
 * Fri Aug 09 2013 Kamil Dudka <kdudka@redhat.com> 2.2.52-3
 - drop a docdir-related patch to fix a packaging failure (#993659)
 

From 2775e43b3c9309b237c5dcd0e132332733d9dfa4 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 6 Jun 2014 19:03:26 -0500
Subject: [PATCH 32/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index eb4efff..41c8abd 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 4%{?dist}
+Release: 5%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -121,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.52-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Fri Nov 01 2013 Kamil Dudka <kdudka@redhat.com> 2.2.52-4
 - fix SIGSEGV of getfacl -e on overly long group name
 

From 231dae96d1ec92a18d9a53e73e080c538d5739df Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Fri, 11 Jul 2014 15:51:09 -0400
Subject: [PATCH 33/96] fix license files

---
 acl.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/acl.spec b/acl.spec
index 41c8abd..32177af 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 5%{?dist}
+Release: 6%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -102,7 +102,8 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %postun -n libacl -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%doc doc/COPYING*
+%{!?_licensedir:%global license %%doc}
+%license doc/COPYING*
 %{_bindir}/chacl
 %{_bindir}/getfacl
 %{_bindir}/setfacl
@@ -121,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Fri Jul 11 2014 Tom Callaway <spot@fedoraproject.org> - 2.2.52-6
+- tag licenses properly
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.52-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

From 1f5211bf8e931309675c7051c6fcb504214af623 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Fri, 15 Aug 2014 19:56:49 +0000
Subject: [PATCH 34/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 32177af..67a48a6 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 6%{?dist}
+Release: 7%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.52-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Fri Jul 11 2014 Tom Callaway <spot@fedoraproject.org> - 2.2.52-6
 - tag licenses properly
 

From 79a0d914d422d5c2713baa0d851334b5837cd889 Mon Sep 17 00:00:00 2001
From: Till Maas <opensource@till.name>
Date: Sat, 21 Feb 2015 21:17:13 +0100
Subject: [PATCH 35/96] Rebuilt for

  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
---
 acl.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 67a48a6..4592c54 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 7%{?dist}
+Release: 8%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -122,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Sat Feb 21 2015 Till Maas <opensource@till.name> - 2.2.52-8
+- Rebuilt for
+  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.52-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 

From bbcc1748079ec9ac54e2ff4ba2762cad189bbc0c Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Tue, 16 Jun 2015 23:35:09 +0000
Subject: [PATCH 36/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 4592c54..080f2cd 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 8%{?dist}
+Release: 9%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.52-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Sat Feb 21 2015 Till Maas <opensource@till.name> - 2.2.52-8
 - Rebuilt for
   https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code

From fbf63493d32a88f764b1e8ece890e3a4da18c50a Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 14 Aug 2015 12:32:44 -0400
Subject: [PATCH 37/96] Remove bizarre 12 year old libtool invocation
 workaround that prevented

  hardened cflags working
---
 acl.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/acl.spec b/acl.spec
index 080f2cd..25c7a83 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 9%{?dist}
+Release: 10%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -68,7 +68,7 @@ defined in POSIX 1003.1e draft standard 17.
 # sed -i 's/-O2/-O0/' libtool include/builddefs
 # unset CFLAGS
 
-make %{?_smp_mflags} LIBTOOL="libtool --tag=CC"
+make %{?_smp_mflags}
 
 %check
 if ./setfacl/setfacl -m u:`id -u`:rwx .; then
@@ -122,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Fri Aug 14 2015 Adam Jackson <ajax@redhat.com> 2.2.52-10
+- Remove bizarre 12 year old libtool invocation workaround that prevented
+  hardened cflags working
+
 * Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.52-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

From bd6bf2ee1c8e596f56cba5e114fa13d5d615af4e Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 3 Feb 2016 15:57:29 +0000
Subject: [PATCH 38/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 25c7a83..81bbc24 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 10%{?dist}
+Release: 11%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.52-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Fri Aug 14 2015 Adam Jackson <ajax@redhat.com> 2.2.52-10
 - Remove bizarre 12 year old libtool invocation workaround that prevented
   hardened cflags working

From dfcff777b26f43ab47b03cf76b60a792fcff23fe Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Fri, 3 Feb 2017 12:51:49 +0100
Subject: [PATCH 39/96] Resolves: #1418474 - update project URL

---
 acl.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/acl.spec b/acl.spec
index 81bbc24..1af5de5 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 11%{?dist}
+Release: 12%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -24,7 +24,7 @@ Patch5: 0005-acl-2.2.52-getfacl-segv.patch
 
 License: GPLv2+
 Group: System Environment/Base
-URL: http://acl.bestbits.at/
+URL: https://savannah.nongnu.org/projects/acl
 
 %description
 This package contains the getfacl and setfacl utilities needed for
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Fri Feb 03 2017 Kamil Dudka <kdudka@redhat.com> 2.2.52-12
+- update project URL (#1418474)
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.52-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From 1b70d5975cbe16d4fd4e14de4e132e5b8bc39c53 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 10 Feb 2017 05:43:11 +0000
Subject: [PATCH 40/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 1af5de5..c77eae7 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 12%{?dist}
+Release: 13%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.52-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Fri Feb 03 2017 Kamil Dudka <kdudka@redhat.com> 2.2.52-12
 - update project URL (#1418474)
 

From 9089a4074c5d7dd5f0eff9cec98f07824366c15e Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Wed, 17 May 2017 17:29:47 +0200
Subject: [PATCH 41/96] Resolves: #1451826 - fix spurious acl_check() failure
 on setfacl --restore

---
 ...cl-2.2.52-setfacl-restore-initialize.patch | 40 +++++++++++++++++++
 acl.spec                                      |  9 ++++-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 0002-acl-2.2.52-setfacl-restore-initialize.patch

diff --git a/0002-acl-2.2.52-setfacl-restore-initialize.patch b/0002-acl-2.2.52-setfacl-restore-initialize.patch
new file mode 100644
index 0000000..2a6dd43
--- /dev/null
+++ b/0002-acl-2.2.52-setfacl-restore-initialize.patch
@@ -0,0 +1,40 @@
+From eb123384d1e4001b62a578ec1df53aa23016aed3 Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruenba@redhat.com>
+Date: Fri, 17 Mar 2017 10:17:01 +0100
+Subject: [PATCH] setfacl --restore: Silence valgrind
+
+Valgrind complains that setfacl --restore triggers uninitialized memory
+accesses to cmd->c_tag and cmd->c_perm of CMD_REMOVE_ACL commands in
+do_set (http://savannah.nongnu.org/bugs/?50566).  In this case, the
+uninitialized memory accesses have no effect.  Silence valgrind by
+initializing cmd->c_tag and cmd->c_perm anyway.
+
+Upstream-commit: 33f01b5d5bd98fceee0ba46cdbddb60b36fc650e
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ setfacl/sequence.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/setfacl/sequence.c b/setfacl/sequence.c
+index a418b23..5ed182e 100644
+--- a/setfacl/sequence.c
++++ b/setfacl/sequence.c
+@@ -29,7 +29,14 @@ cmd_t
+ cmd_init(
+ 	void)
+ {
+-	return (cmd_t)malloc(sizeof(struct cmd_obj));
++	cmd_t cmd;
++
++	cmd = malloc(sizeof(struct cmd_obj));
++	if (cmd) {
++		cmd->c_tag = ACL_UNDEFINED_TAG;
++		cmd->c_perm = 0;
++	}
++	return cmd;
+ }
+ 
+ 
+-- 
+2.9.4
+
diff --git a/acl.spec b/acl.spec
index c77eae7..1df2cfe 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 13%{?dist}
+Release: 14%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
@@ -13,6 +13,9 @@ Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.
 # fix a typo in setfacl(1) man page (#675451)
 Patch1: 0001-acl-2.2.49-bz675451.patch
 
+# fix spurious acl_check() failure on setfacl --restore (#1451826)
+Patch2: 0002-acl-2.2.52-setfacl-restore-initialize.patch
+
 # prepare the test-suite for SELinux and arbitrary umask
 Patch3: 0003-acl-2.2.52-tests.patch
 
@@ -57,6 +60,7 @@ defined in POSIX 1003.1e draft standard 17.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -122,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Wed May 17 2017 Kamil Dudka <kdudka@redhat.com> 2.2.52-14
+- fix spurious acl_check() failure on setfacl --restore (#1451826)
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.52-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From a2fc327ddb4aaf8b4ac71fff9c4d4c7aaca50874 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Wed, 17 May 2017 17:33:46 +0200
Subject: [PATCH 42/96] drop obsolete BuildRoot and Group tags

---
 acl.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/acl.spec b/acl.spec
index 1df2cfe..e7c8adf 100644
--- a/acl.spec
+++ b/acl.spec
@@ -2,7 +2,6 @@ Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
 Release: 14%{?dist}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk
 BuildRequires: gettext
 BuildRequires: libattr-devel
@@ -26,7 +25,6 @@ Patch4: 0004-acl-2.2.52-libdir.patch
 Patch5: 0005-acl-2.2.52-getfacl-segv.patch
 
 License: GPLv2+
-Group: System Environment/Base
 URL: https://savannah.nongnu.org/projects/acl
 
 %description
@@ -127,6 +125,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 
 %changelog
 * Wed May 17 2017 Kamil Dudka <kdudka@redhat.com> 2.2.52-14
+- drop obsolete BuildRoot and Group tags
 - fix spurious acl_check() failure on setfacl --restore (#1451826)
 
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.52-13

From 0f13caf13808c0eb6672a847c4699a85ed5dbbc9 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Thu, 18 May 2017 09:53:22 +0200
Subject: [PATCH 43/96] apply patches automatically to ease maintenance

---
 acl.spec | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/acl.spec b/acl.spec
index e7c8adf..468026a 100644
--- a/acl.spec
+++ b/acl.spec
@@ -56,12 +56,7 @@ programs which make use of the access control list programming interface
 defined in POSIX 1003.1e draft standard 17.
 
 %prep
-%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%autosetup -p1
 
 %build
 %configure
@@ -124,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Thu May 18 2017 Kamil Dudka <kdudka@redhat.com> 2.2.52-15
+- apply patches automatically to ease maintenance
+
 * Wed May 17 2017 Kamil Dudka <kdudka@redhat.com> 2.2.52-14
 - drop obsolete BuildRoot and Group tags
 - fix spurious acl_check() failure on setfacl --restore (#1451826)

From e4ad5114f7e182ebbe947829d647d1c5bcb75e8e Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Thu, 19 May 2016 13:04:12 +0200
Subject: [PATCH 44/96] Resolves: #1085389 - avoid failure of %check when
 building as root

---
 acl.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 468026a..7ccdf66 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 14%{?dist}
+Release: 15%{?dist}
 BuildRequires: gawk
 BuildRequires: gettext
 BuildRequires: libattr-devel
@@ -71,6 +71,11 @@ make %{?_smp_mflags}
 if ./setfacl/setfacl -m u:`id -u`:rwx .; then
     make tests || exit $?
     if test 0 = `id -u`; then
+        # test/root/permissions.test requires the 'daemon' user to be a member
+        # of the 'bin' group in order not to fail.  Prevent the test from
+        # running if we detect that its requirements are not met (#1085389).
+        id -nG daemon | grep bin >/dev/null || rm -f test/root/permissions.test
+
         make root-tests || exit $?
     fi
 else
@@ -120,6 +125,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 
 %changelog
 * Thu May 18 2017 Kamil Dudka <kdudka@redhat.com> 2.2.52-15
+- avoid failure of %%check when building as root (#1085389)
 - apply patches automatically to ease maintenance
 
 * Wed May 17 2017 Kamil Dudka <kdudka@redhat.com> 2.2.52-14

From 23125988f7e60bb568cc53a7084c906f6bcf9c86 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Thu, 19 May 2016 13:12:15 +0200
Subject: [PATCH 45/96] Resolves: #1337039 - setfacl.1: document the meaning of
 '-' in perms

---
 acl-2.2.52-setfacl-man-page.patch | 60 +++++++++++++++++++++++++++++++
 acl.spec                          |  4 +++
 2 files changed, 64 insertions(+)
 create mode 100644 acl-2.2.52-setfacl-man-page.patch

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
 

From b06f52063b21a59c9a1b388c27804a8e4e1f3c97 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 24 Jul 2017 15:35:05 +0200
Subject: [PATCH 46/96] update URL of the upstream source tarball

---
 acl.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/acl.spec b/acl.spec
index dbc60a3..2c7c635 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,13 +1,13 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 15%{?dist}
+Release: 16%{?dist}
 BuildRequires: gawk
 BuildRequires: gettext
 BuildRequires: libattr-devel
 BuildRequires: libtool
 Requires: libacl = %{version}-%{release}
-Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.src.tar.gz
+Source: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.src.tar.gz
 
 # fix a typo in setfacl(1) man page (#675451)
 Patch1: 0001-acl-2.2.49-bz675451.patch
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Mon Jul 24 2017 Kamil Dudka <kdudka@redhat.com> 2.2.52-16
+- update URL of the upstream source tarball
+
 * 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)

From 84e9c09316567deec1e8db61754f6a1dddbdd14a Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 24 Jul 2017 15:42:58 +0200
Subject: [PATCH 47/96] rename 0006-acl-2.2.52-setfacl-man-page.patch

---
 ...acl-man-page.patch => 0006-acl-2.2.52-setfacl-man-page.patch | 0
 acl.spec                                                        | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename acl-2.2.52-setfacl-man-page.patch => 0006-acl-2.2.52-setfacl-man-page.patch (100%)

diff --git a/acl-2.2.52-setfacl-man-page.patch b/0006-acl-2.2.52-setfacl-man-page.patch
similarity index 100%
rename from acl-2.2.52-setfacl-man-page.patch
rename to 0006-acl-2.2.52-setfacl-man-page.patch
diff --git a/acl.spec b/acl.spec
index 2c7c635..54b7f0b 100644
--- a/acl.spec
+++ b/acl.spec
@@ -25,7 +25,7 @@ Patch4: 0004-acl-2.2.52-libdir.patch
 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
+Patch6: 0006-acl-2.2.52-setfacl-man-page.patch
 
 License: GPLv2+
 URL: https://savannah.nongnu.org/projects/acl

From 3147a2273b8658143582d1ce6ed195d7dc4d4d0a Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 24 Jul 2017 15:44:17 +0200
Subject: [PATCH 48/96] Resolves: #1473845 - fix test-suite failure with
 perl-5.26.0

---
 0007-acl-2.2.52-tests-perl.patch | 31 +++++++++++++++++++++++++++++++
 acl.spec                         |  4 ++++
 2 files changed, 35 insertions(+)
 create mode 100644 0007-acl-2.2.52-tests-perl.patch

diff --git a/0007-acl-2.2.52-tests-perl.patch b/0007-acl-2.2.52-tests-perl.patch
new file mode 100644
index 0000000..76df204
--- /dev/null
+++ b/0007-acl-2.2.52-tests-perl.patch
@@ -0,0 +1,31 @@
+From 368f03d8d415854fc2e66ebaf6e014d9c0fada7b Mon Sep 17 00:00:00 2001
+From: Troy Dawson <tdawson@redhat.com>
+Date: Fri, 21 Jul 2017 14:05:47 -0700
+Subject: [PATCH] acl: escape left brace in a regex in test/run
+
+... to fix test-suite failure with perl-5.26.0
+
+Bug: https://bugzilla.redhat.com/1473845
+
+Upstream-commit: f2feb94748bd3c64ed153461afa51aebbd717821
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ test/run | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/run b/test/run
+index 2cf52e8..0e499e4 100755
+--- a/test/run
++++ b/test/run
+@@ -70,7 +70,7 @@ for (;;) {
+   if (defined $line) {
+     # Substitute %VAR and %{VAR} with environment variables.
+     $line =~ s[%(\w+)][$ENV{$1}]eg;
+-    $line =~ s[%{(\w+)}][$ENV{$1}]eg;
++    $line =~ s[%\{(\w+)}][$ENV{$1}]eg;
+   }
+   if (defined $line) {
+     if ($line =~ s/^\s*< ?//) {
+-- 
+2.9.4
+
diff --git a/acl.spec b/acl.spec
index 54b7f0b..24b6fcb 100644
--- a/acl.spec
+++ b/acl.spec
@@ -27,6 +27,9 @@ Patch5: 0005-acl-2.2.52-getfacl-segv.patch
 # setfacl.1: document the meaning of '-' in perms (#1337039)
 Patch6: 0006-acl-2.2.52-setfacl-man-page.patch
 
+# fix test-suite failure with perl-5.26.0 (#1473845)
+Patch7: 0007-acl-2.2.52-tests-perl.patch
+
 License: GPLv2+
 URL: https://savannah.nongnu.org/projects/acl
 
@@ -128,6 +131,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 
 %changelog
 * Mon Jul 24 2017 Kamil Dudka <kdudka@redhat.com> 2.2.52-16
+- fix test-suite failure with perl-5.26.0 (#1473845)
 - update URL of the upstream source tarball
 
 * Thu May 18 2017 Kamil Dudka <kdudka@redhat.com> 2.2.52-15

From 1424d983862387d590c8fdb7c682cbb5d90bcb2e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 26 Jul 2017 02:33:32 +0000
Subject: [PATCH 49/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 24b6fcb..e470c97 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 16%{?dist}
+Release: 17%{?dist}
 BuildRequires: gawk
 BuildRequires: gettext
 BuildRequires: libattr-devel
@@ -130,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.52-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Mon Jul 24 2017 Kamil Dudka <kdudka@redhat.com> 2.2.52-16
 - fix test-suite failure with perl-5.26.0 (#1473845)
 - update URL of the upstream source tarball

From 7c21fa8d9ae0a24464855014c79b256a242f7fe0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 2 Aug 2017 17:22:45 +0000
Subject: [PATCH 50/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index e470c97..fdf2c0a 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 17%{?dist}
+Release: 18%{?dist}
 BuildRequires: gawk
 BuildRequires: gettext
 BuildRequires: libattr-devel
@@ -130,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.52-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.52-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From ed120bbfb6a5d0d5504742cae8e2388f0f7147fd Mon Sep 17 00:00:00 2001
From: Rachel Sibley <rasibley@redhat.com>
Date: Fri, 22 Sep 2017 11:18:48 -0400
Subject: [PATCH 51/96] Initial commit for Atomic Host Tests

---
 tests/cmd-line-options/Makefile     |  88 ++++++++++++++++++++++
 tests/cmd-line-options/PURPOSE      |   5 ++
 tests/cmd-line-options/runtest.sh   |  18 +++++
 tests/cmd-line-options/test-core.sh | 113 ++++++++++++++++++++++++++++
 tests/tests.yml                     |  13 ++++
 5 files changed, 237 insertions(+)
 create mode 100644 tests/cmd-line-options/Makefile
 create mode 100644 tests/cmd-line-options/PURPOSE
 create mode 100755 tests/cmd-line-options/runtest.sh
 create mode 100755 tests/cmd-line-options/test-core.sh
 create mode 100644 tests/tests.yml

diff --git a/tests/cmd-line-options/Makefile b/tests/cmd-line-options/Makefile
new file mode 100644
index 0000000..d4136cc
--- /dev/null
+++ b/tests/cmd-line-options/Makefile
@@ -0,0 +1,88 @@
+# Copyright (c) 2006 Red Hat, Inc. All rights reserved. This copyrighted material 
+# is made available to anyone wishing to use, modify, copy, or
+# redistribute it subject to the terms and conditions of the GNU General
+# Public License v.2.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Author: Milos Malik <mmalik@redhat.com>
+
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+# Example Makefile for RHTS                                          #
+# This example is geared towards a test for a specific package       #
+# It does most of the work for you, but may require further coding   #
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+
+# The toplevel namespace within which the test lives.
+# FIXME: You will need to change this:
+TOPLEVEL_NAMESPACE=CoreOS
+
+# The name of the package under test:
+# FIXME: you wil need to change this:
+PACKAGE_NAME=acl
+
+# The path of the test below the package:
+# FIXME: you wil need to change this:
+RELATIVE_PATH=Sanity/cmd-line-options
+
+# Version of the test. Used with make tag.
+export TESTVERSION=1.0
+
+# The combined namespace of the test.
+export TEST=/$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH)
+
+
+# A phony target is one that is not really the name of a file.
+# It is just a name for some commands to be executed when you
+# make an explicit request. There are two reasons to use a
+# phony target: to avoid a conflict with a file of the same
+# name, and to improve performance.
+.PHONY: all install download clean
+
+# executables to be built should be added here, they will be generated on the system under test.
+BUILT_FILES= 
+
+# data files, .c files, scripts anything needed to either compile the test and/or run it.
+FILES=$(METADATA) runtest.sh Makefile PURPOSE test-core.sh
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	chmod a+x ./runtest.sh ./test-core.sh
+
+clean:
+	rm -f *~ *.rpm $(BUILT_FILES)
+
+# You may need to add other targets e.g. to build executables from source code
+# Add them here:
+
+
+# Include Common Makefile
+include /usr/share/rhts/lib/rhts-make.include
+
+# Generate the testinfo.desc here:
+$(METADATA): Makefile
+	@touch $(METADATA)
+# Change to the test owner's name
+	@echo "Owner:        Milos Malik <mmalik@redhat.com>" > $(METADATA)
+	@echo "Name:         $(TEST)" >> $(METADATA)
+	@echo "Path:         $(TEST_DIR)" >> $(METADATA)
+	@echo "TestVersion:  $(TESTVERSION)" >> $(METADATA)
+	@echo "Type:         Sanity" >> $(METADATA)
+	@echo "Description:  utilities are tested if they support basic command line options" >> $(METADATA)
+	@echo "TestTime:     2m" >> $(METADATA)
+	@echo "RunFor:       $(PACKAGE_NAME)" >> $(METADATA)  
+# add any other packages for which your test ought to run here
+	@echo "Requires:     $(PACKAGE_NAME)" >> $(METADATA)  
+# add any other requirements for the script to run here
+	@echo "License:      GPLv2" >> $(METADATA)
+
+# You may need other fields here; see the documentation
+	rhts-lint $(METADATA)
diff --git a/tests/cmd-line-options/PURPOSE b/tests/cmd-line-options/PURPOSE
new file mode 100644
index 0000000..cbf7099
--- /dev/null
+++ b/tests/cmd-line-options/PURPOSE
@@ -0,0 +1,5 @@
+Test Name: cmd-line-options
+Author: Milos Malik <mmalik@redhat.com>
+Location: /CoreOS/acl/Sanity/cmd-line-options
+Short Description: Utilities are tested if they support basic command line options.
+Safe: yes
diff --git a/tests/cmd-line-options/runtest.sh b/tests/cmd-line-options/runtest.sh
new file mode 100755
index 0000000..a852c11
--- /dev/null
+++ b/tests/cmd-line-options/runtest.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Copyright (c) 2006 Red Hat, Inc. All rights reserved. This copyrighted material 
+# is made available to anyone wishing to use, modify, copy, or
+# redistribute it subject to the terms and conditions of the GNU General
+# Public License v.2.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Author: Milos Malik <mmalik@redhat.com>
+
+rhts-run-simple-test $TEST ./test-core.sh
diff --git a/tests/cmd-line-options/test-core.sh b/tests/cmd-line-options/test-core.sh
new file mode 100755
index 0000000..92d8aed
--- /dev/null
+++ b/tests/cmd-line-options/test-core.sh
@@ -0,0 +1,113 @@
+#!/bin/sh
+# Description: sanity test for acl package
+# Author: Milos Malik <mmalik@redhat.com>
+
+##### Variable Declaration #####
+VERSION=1.0
+
+# FAIL unless test explicitly passes
+RESULT=FAIL
+
+# Each pass increases SCORE by 1
+SCORE=0
+TOTAL=8
+
+# Set language so we know what results to test for
+set_lang=0
+old_lang=$LANG
+new_lang=en_US.UTF-8
+
+# Which package and which utility do we test?
+PACKAGE=acl
+
+##### Function Declaration #####
+
+log () {
+	printf "\n:: $1 ::\n"
+}
+
+check_exit_code () {
+	echo -e "\t* exit code: $1"
+	if [ $1 $2 $3 ] ; then
+		let "SCORE += 1"
+	fi
+}
+
+##### Begin Test #####
+
+log "[`date +%H:%M:%S`] Begin Test - $TEST-$VERSION"
+
+# Warn if not running as root that test might fail
+e_user=$(whoami)
+if [[ x"${e_user}" != x"root" ]]; then
+        log "Warning, not running as root! This test might fail."
+fi
+
+# Temporarily set LANG to value we can trust results from
+if [[ x"${LANG}" != x"${new_lang}" ]]; then
+        log "Warning, LANG not set to ${new_lang}!"
+        log "Temporarily setting LANG to ${new_lang}, was ${old_lang}"
+
+        set_lang=1
+        export LANG=${new_lang}
+        log "Done, LANG=${new_lang}."
+fi
+
+log "getfacl -h"
+getfacl -h >& /dev/null
+check_exit_code $? -eq 0
+
+log "getfacl --help"
+getfacl --help >& /dev/null
+check_exit_code $? -eq 0
+
+log "getfacl -v"
+getfacl -v >& /dev/null
+check_exit_code $? -eq 0
+
+log "getfacl --version"
+getfacl --version >& /dev/null
+check_exit_code $? -eq 0
+
+log "setfacl -h"
+setfacl -h >& /dev/null
+check_exit_code $? -eq 0
+
+log "setfacl --help"
+setfacl --help >& /dev/null
+check_exit_code $? -eq 0
+
+log "setfacl -v"
+setfacl -v >& /dev/null
+check_exit_code $? -eq 0
+
+log "setfacl --version"
+setfacl --version >& /dev/null
+check_exit_code $? -eq 0
+
+# Reset LANG to original value
+if [[ ${set_lang} == 1 ]]; then
+        log "Resetting LANG to ${old_lang}."
+        export LANG=${old_lang}
+        log "Done, LANG=${old_lang}."
+fi
+
+log "[`date +%H:%M:%S`] End Test - $TEST-$VERSION"
+
+##### Report results #####
+
+log "SCORE: ${SCORE}/${TOTAL}"
+
+if [ ${SCORE} -eq ${TOTAL} ] ; then
+# everything was OK
+        log "RESULT: PASS"
+        printf "\n\n"
+    exit 0
+else
+# something failed
+        log "RESULT: FAIL"
+        printf "\n\n"
+    exit 1
+fi
+
+##### End Test #####
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..d6fb2ff
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,13 @@
+---
+# This first play always runs on the local staging system
+- hosts: localhost
+  roles:
+  - role: standard-test-beakerlib
+    tags:
+    - classic
+    - container
+    - atomic
+    tests:
+    - cmd-line-options
+    required_packages:
+    - which         # which package required for cmd-line-options

From 3abbd74fce5a32341375d0fb25c323a0164204d6 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sun, 4 Feb 2018 11:32:56 +0100
Subject: [PATCH 52/96] Switch to %ldconfig_scriptlets

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 acl.spec | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/acl.spec b/acl.spec
index fdf2c0a..0e8b248 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 18%{?dist}
+Release: 19%{?dist}
 BuildRequires: gawk
 BuildRequires: gettext
 BuildRequires: libattr-devel
@@ -41,8 +41,6 @@ manipulating access control lists.
 Summary: Dynamic library for access control list support
 License: LGPLv2+
 Group: System Environment/Libraries
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 Conflicts: filesystem < 3
 
 %description -n libacl
@@ -105,9 +103,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 
 %find_lang %{name}
 
-%post -n libacl -p /sbin/ldconfig
-
-%postun -n libacl -p /sbin/ldconfig
+%ldconfig_scriptlets -n libacl
 
 %files -f %{name}.lang
 %{!?_licensedir:%global license %%doc}
@@ -130,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Sun Feb 04 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.2.52-19
+- Switch to %%ldconfig_scriptlets
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.52-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 

From e978cdae172574ee277fb47ca057c270a9648979 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 7 Feb 2018 01:48:41 +0000
Subject: [PATCH 53/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 0e8b248..cf396c3 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 19%{?dist}
+Release: 20%{?dist}
 BuildRequires: gawk
 BuildRequires: gettext
 BuildRequires: libattr-devel
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.52-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Sun Feb 04 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.2.52-19
 - Switch to %%ldconfig_scriptlets
 

From cb7ea0f240fcb5d7fbc88f2cdbf1e7b2a93d5004 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Tue, 13 Mar 2018 12:41:23 +0100
Subject: [PATCH 54/96] Resolves: #1510527 - update link to POSIX.1e draft in
 acl(5) man page

---
 0008-acl-2.2.52-acl5-man-page.patch | 27 +++++++++++++++++++++++++++
 acl.spec                            |  8 +++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 0008-acl-2.2.52-acl5-man-page.patch

diff --git a/0008-acl-2.2.52-acl5-man-page.patch b/0008-acl-2.2.52-acl5-man-page.patch
new file mode 100644
index 0000000..85c2599
--- /dev/null
+++ b/0008-acl-2.2.52-acl5-man-page.patch
@@ -0,0 +1,27 @@
+From 1daf87b570070cc652e3ea39c1ad7f7c2cce8b09 Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruenba@redhat.com>
+Date: Mon, 12 Mar 2018 22:25:19 +0100
+Subject: [PATCH] acl.5 man page: Update link to POSIX.1e draft
+
+Upstream-commit: ff3bca294e092810e92fd8a832bc0388e3194932
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ man/man5/acl.5 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/man5/acl.5 b/man/man5/acl.5
+index c045726..18a3550 100644
+--- a/man/man5/acl.5
++++ b/man/man5/acl.5
+@@ -406,7 +406,7 @@ header.
+ .Xr stat 2 ,
+ .Xr umask 1
+ .Ss POSIX 1003.1e DRAFT 17
+-.Xr "http://www.guug.de/~winni/posix.1e/download.html"
++.Xr "http://wt.tuxomania.net/publications/posix.1e/download.html"
+ .Ss POSIX 1003.1e FUNCTIONS BY CATEGORY
+ .Bl -tag -width "MMM"
+ .It Sy ACL storage management
+-- 
+2.14.3
+
diff --git a/acl.spec b/acl.spec
index cf396c3..47435d2 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.52
-Release: 20%{?dist}
+Release: 21%{?dist}
 BuildRequires: gawk
 BuildRequires: gettext
 BuildRequires: libattr-devel
@@ -30,6 +30,9 @@ Patch6: 0006-acl-2.2.52-setfacl-man-page.patch
 # fix test-suite failure with perl-5.26.0 (#1473845)
 Patch7: 0007-acl-2.2.52-tests-perl.patch
 
+# update link to POSIX.1e draft in acl(5) man page (#1510527)
+Patch8: 0008-acl-2.2.52-acl5-man-page.patch
+
 License: GPLv2+
 URL: https://savannah.nongnu.org/projects/acl
 
@@ -126,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Tue Mar 13 2018 Kamil Dudka <kdudka@redhat.com> 2.2.52-21
+- update link to POSIX.1e draft in acl(5) man page (#1510527)
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.52-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From 3bb48c0561eee9c7c583dcdd7cd77d26f140397a Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 2 Jul 2018 17:32:03 +0200
Subject: [PATCH 55/96] new upstream release - 2.2.53

---
 .gitignore                                    |   5 +-
 0001-acl-2.2.49-bz675451.patch                |  28 ---
 0001-acl-2.2.53-test-runwrapper.patch         |  44 +++++
 ...cl-2.2.52-setfacl-restore-initialize.patch |  40 ----
 0003-acl-2.2.52-tests.patch                   | 180 ------------------
 0004-acl-2.2.52-libdir.patch                  |  28 ---
 0005-acl-2.2.52-getfacl-segv.patch            |  54 ------
 0006-acl-2.2.52-setfacl-man-page.patch        |  60 ------
 0007-acl-2.2.52-tests-perl.patch              |  31 ---
 0008-acl-2.2.52-acl5-man-page.patch           |  27 ---
 acl-2.2.52.src.tar.gz.sig                     | Bin 543 -> 0 bytes
 acl-2.2.53.tar.gz.sig                         | Bin 0 -> 566 bytes
 acl.spec                                      |  55 ++----
 sources                                       |   2 +-
 14 files changed, 67 insertions(+), 487 deletions(-)
 delete mode 100644 0001-acl-2.2.49-bz675451.patch
 create mode 100644 0001-acl-2.2.53-test-runwrapper.patch
 delete mode 100644 0002-acl-2.2.52-setfacl-restore-initialize.patch
 delete mode 100644 0003-acl-2.2.52-tests.patch
 delete mode 100644 0004-acl-2.2.52-libdir.patch
 delete mode 100644 0005-acl-2.2.52-getfacl-segv.patch
 delete mode 100644 0006-acl-2.2.52-setfacl-man-page.patch
 delete mode 100644 0007-acl-2.2.52-tests-perl.patch
 delete mode 100644 0008-acl-2.2.52-acl5-man-page.patch
 delete mode 100644 acl-2.2.52.src.tar.gz.sig
 create mode 100644 acl-2.2.53.tar.gz.sig

diff --git a/.gitignore b/.gitignore
index 043c8b6..1985515 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-acl-2.2.49.src.tar.gz
-/acl-2.2.50.src.tar.gz
-/acl-2.2.51.src.tar.gz
-/acl-2.2.52.src.tar.gz
+/acl-2.2.*.tar.gz
diff --git a/0001-acl-2.2.49-bz675451.patch b/0001-acl-2.2.49-bz675451.patch
deleted file mode 100644
index cc04380..0000000
--- a/0001-acl-2.2.49-bz675451.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 320b3ca0a544fd5024ddfeca6f491a0344b9ecd2 Mon Sep 17 00:00:00 2001
-From: John Bradshaw <john@johnbradshaw.org>
-Date: Sat, 5 Feb 2011 18:14:27 +0000
-Subject: [PATCH] setfacl.1: fix typo 'inclu de' -> 'include'
-
-Bug: https://bugzilla.redhat.com/675451
----
- man/man1/setfacl.1 |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/man/man1/setfacl.1 b/man/man1/setfacl.1
-index 64f0e33..0c7c046 100644
---- a/man/man1/setfacl.1
-+++ b/man/man1/setfacl.1
-@@ -240,8 +240,8 @@ owner, owning group, or others entry, a copy of the ACL owner, owning group, or
- .IP * 4
- If a Default ACL contains named user entries or named group entries, and no mask entry exists, a mask entry containing the same permissions as the default Default ACL's group entry is added. Unless the
- .I \-n
--option is given, the permissions of the mask entry are further adjusted to inclu
--de the union of all permissions affected by the mask entry. (See the
-+option is given, the permissions of the mask entry are further adjusted to
-+include the union of all permissions affected by the mask entry. (See the
- .I \-n
- option description).
- .PP
--- 
-1.7.1
-
diff --git a/0001-acl-2.2.53-test-runwrapper.patch b/0001-acl-2.2.53-test-runwrapper.patch
new file mode 100644
index 0000000..7c27c6c
--- /dev/null
+++ b/0001-acl-2.2.53-test-runwrapper.patch
@@ -0,0 +1,44 @@
+From 085cc4ff56857d234e80f37d0316c13eb5718696 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Tue, 3 Jul 2018 10:46:58 +0200
+Subject: [PATCH] test/runwrapper: copy the preloaded library
+
+... to a temporary directory because the original location might
+not be accessible by other users.
+---
+ test/runwrapper | 20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/test/runwrapper b/test/runwrapper
+index 6e0e899..de4555a 100755
+--- a/test/runwrapper
++++ b/test/runwrapper
+@@ -1,7 +1,23 @@
+ #!/bin/bash
+ 
+-if [ -e "$PWD/.libs/libtestlookup.so" ]; then
+-	export LD_PRELOAD="$PWD/.libs/libtestlookup.so"
++src="$PWD/.libs/libtestlookup.so"
++dst=
++if [ -e "$src" ]; then
++	# copy the preloaded library to a temporary directory because
++	# the original location might not be accessible by other users
++	tmp="$(mktemp -d)"
++	chmod 0755 "$tmp"
++	dst="${tmp}/libtestlookup.so"
++	cp -L "$src" "$dst"
++	export LD_PRELOAD="$dst"
+ fi
+ 
+ "${srcdir:-${PWD}}"/test/run "$@"
++ec="$?"
++
++if [ -n "$dst" ]; then
++	# remove the temporary location
++	rm -rf "$dst"
++fi
++
++exit "$ec"
+-- 
+2.14.4
+
diff --git a/0002-acl-2.2.52-setfacl-restore-initialize.patch b/0002-acl-2.2.52-setfacl-restore-initialize.patch
deleted file mode 100644
index 2a6dd43..0000000
--- a/0002-acl-2.2.52-setfacl-restore-initialize.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From eb123384d1e4001b62a578ec1df53aa23016aed3 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruenba@redhat.com>
-Date: Fri, 17 Mar 2017 10:17:01 +0100
-Subject: [PATCH] setfacl --restore: Silence valgrind
-
-Valgrind complains that setfacl --restore triggers uninitialized memory
-accesses to cmd->c_tag and cmd->c_perm of CMD_REMOVE_ACL commands in
-do_set (http://savannah.nongnu.org/bugs/?50566).  In this case, the
-uninitialized memory accesses have no effect.  Silence valgrind by
-initializing cmd->c_tag and cmd->c_perm anyway.
-
-Upstream-commit: 33f01b5d5bd98fceee0ba46cdbddb60b36fc650e
-Signed-off-by: Kamil Dudka <kdudka@redhat.com>
----
- setfacl/sequence.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/setfacl/sequence.c b/setfacl/sequence.c
-index a418b23..5ed182e 100644
---- a/setfacl/sequence.c
-+++ b/setfacl/sequence.c
-@@ -29,7 +29,14 @@ cmd_t
- cmd_init(
- 	void)
- {
--	return (cmd_t)malloc(sizeof(struct cmd_obj));
-+	cmd_t cmd;
-+
-+	cmd = malloc(sizeof(struct cmd_obj));
-+	if (cmd) {
-+		cmd->c_tag = ACL_UNDEFINED_TAG;
-+		cmd->c_perm = 0;
-+	}
-+	return cmd;
- }
- 
- 
--- 
-2.9.4
-
diff --git a/0003-acl-2.2.52-tests.patch b/0003-acl-2.2.52-tests.patch
deleted file mode 100644
index 7bc284e..0000000
--- a/0003-acl-2.2.52-tests.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From cfd9ba83811189d9e12c86d32b06b5fd15b5f358 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Mon, 20 May 2013 13:49:34 +0200
-Subject: [PATCH 1/2] make the tests ready for SELinux
-
----
- test/root/permissions.test |    8 ++++----
- test/root/restore.test     |    2 +-
- test/root/setfacl.test     |    2 +-
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/test/root/permissions.test b/test/root/permissions.test
-index afaf5f0..4880bd2 100644
---- a/test/root/permissions.test
-+++ b/test/root/permissions.test
-@@ -20,7 +20,7 @@ defined permissions.
- 	$ cd d
- 	$ umask 027
- 	$ touch f
--	$ ls -l f | awk -- '{ print $1, $3, $4 }'
-+	$ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/'
- 	> -rw-r----- root root
- 
- 
-@@ -40,7 +40,7 @@ Now, change the ownership of the file to bin:bin and verify that this
- gives user bin write access.
- 
- 	$ chown bin:bin f
--	$ ls -l f | awk -- '{ print $1, $3, $4 }'
-+	$ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/'
- 	> -rw-r----- bin bin
- 	$ su bin
- 	$ echo bin >> f
-@@ -257,12 +257,12 @@ directories if the file has an ACL and only CAP_FOWNER would grant them.
- 	$ mkdir -m 600 x
- 	$ chown daemon:daemon x
- 	$ echo j > x/j
--	$ ls -l x/j | awk -- '{ print $1, $3, $4 }'
-+	$ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/'
- 	> -rw-r----- root root
- 
- 	$ setfacl -m u:daemon:r x
- 
--	$ ls -l x/j | awk -- '{ print $1, $3, $4 }'
-+	$ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/'
- 	> -rw-r----- root root
- 	(With the bug this gives: `ls: x/j: Permission denied'.)
- 
-diff --git a/test/root/restore.test b/test/root/restore.test
-index 6003cd4..5dbf73c 100644
---- a/test/root/restore.test
-+++ b/test/root/restore.test
-@@ -17,7 +17,7 @@ Ensure setuid bit is restored when the owner changes
- 	$ chown bin passwd
- 	$ chmod u+s passwd
- 	$ setfacl --restore passwd.acl
--	$ ls -dl passwd | awk '{print $1 " " $3 " " $4}'
-+	$ ls -dl passwd | awk '{print $1 " " $3 " " $4}' | sed 's/\\. root/ root/'
- 	> -rwsr-xr-x root root
- 
- 	$ rm passwd passwd.acl
-diff --git a/test/root/setfacl.test b/test/root/setfacl.test
-index 630e9fb..dd7fe08 100644
---- a/test/root/setfacl.test
-+++ b/test/root/setfacl.test
-@@ -8,7 +8,7 @@ Setfacl utility tests. Run these tests on a filesystem with ACL support.
- 	$ sg bin
- 	$ umask 027
- 	$ touch g
--	$ ls -dl g | awk '{print $1}'
-+	$ ls -dl g | awk '{print $1}' | sed 's/\\.$//'
- 	> -rw-r-----
- 
- 	$ setfacl -m m:- g
--- 
-1.7.1
-
-
-From 3720a8a3cf55e295eca55457fad8177f6277f620 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Mon, 20 May 2013 15:00:47 +0200
-Subject: [PATCH 2/2] test: fix insufficient quoting of '\'
-
-This is a follow-up to 7f2c91b8369242a8dbc2b304a5b71b2a85f5b855, which
-caused sbits-restore.test to fail in the following way in case SELinux
-was disabled:
-
-*** sbits-restore.test ***
-[3] $ umask 022 -- ok
-[4] $ mkdir d -- ok
-[5] $ touch d/g -- ok
-[6] $ touch d/u -- ok
-[7] $ chmod u+s d/u -- ok
-[8] $ chmod g+s d/g -- ok
-[9] $ chmod +t d -- ok
-[10] $ getfacl -R d > d.acl -- ok
-[11] $ rm -R d -- ok
-[12] $ mkdir d -- ok
-[13] $ touch d/g -- ok
-[14] $ touch d/u -- ok
-[15] $ setfacl --restore d.acl -- ok
-[16] $ ls -dl d | awk '{print $1}' | sed 's/.$//g' -- failed
-drwxr-xr-                             != drwxr-xr-t
-[18] $ ls -dl d/u | awk '{print $1}' | sed 's/.$//g' -- failed
--rwSr--r-                             != -rwSr--r--
-[20] $ ls -dl d/g | awk '{print $1}' | sed 's/.$//g' -- failed
--rw-r-Sr-                             != -rw-r-Sr--
-[22] $ rm -Rf d -- ok
-17 commands (14 passed, 3 failed)
----
- test/cp.test            |    2 +-
- test/misc.test          |    6 +++---
- test/sbits-restore.test |    6 +++---
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/test/cp.test b/test/cp.test
-index 0867f63..a927195 100644
---- a/test/cp.test
-+++ b/test/cp.test
-@@ -9,7 +9,7 @@ The cp utility should only copy ACLs if `-p' is given.
- 	> -rw-rw-r--+
- 	
- 	$ cp f g
--	$ ls -l g | awk -- '{ print $1 }' | sed 's/\.$//g'
-+	$ ls -l g | awk -- '{ print $1 }' | sed 's/\\.$//g'
- 	> -rw-r--r--
- 	
- 	$ rm g
-diff --git a/test/misc.test b/test/misc.test
-index 6e98053..29372b7 100644
---- a/test/misc.test
-+++ b/test/misc.test
-@@ -254,7 +254,7 @@ Add some users and groups
- Symlink in directory with default ACL?
- 	 
- 	$ ln -s d d/l
--	$ ls -dl d/l | awk '{print $1}' | sed 's/\.$//g'
-+	$ ls -dl d/l | awk '{print $1}' | sed 's/\\.$//g'
- 	> lrwxrwxrwx
- 
- 	$ ls -dl -L d/l | awk '{print $1}'
-@@ -343,7 +343,7 @@ Remove the default ACL
- Reset to base entries
- 	 
- 	$ setfacl -b d
--	$ ls -dl d | awk '{print $1}' | sed 's/\.$//g'
-+	$ ls -dl d | awk '{print $1}' | sed 's/\\.$//g'
- 	> drwxr-x---
- 
- 	$ getfacl --omit-header d
-@@ -355,7 +355,7 @@ Reset to base entries
- Now, chmod should change the group_obj entry
- 	 
- 	$ chmod 775 d
--	$ ls -dl d | awk '{print $1}' | sed 's/\.$//g'
-+	$ ls -dl d | awk '{print $1}' | sed 's/\\.$//g'
- 	> drwxrwxr-x
- 	
- 	$ getfacl --omit-header d
-diff --git a/test/sbits-restore.test b/test/sbits-restore.test
-index de21340..5899b0a 100644
---- a/test/sbits-restore.test
-+++ b/test/sbits-restore.test
-@@ -13,10 +13,10 @@ Ensure setting of SUID/SGID/sticky via --restore works
- 	$ touch d/g
- 	$ touch d/u
- 	$ setfacl --restore d.acl
--	$ ls -dl d | awk '{print $1}' | sed 's/\.$//g'
-+	$ ls -dl d | awk '{print $1}' | sed 's/\\.$//g'
- 	> drwxr-xr-t
--	$ ls -dl d/u | awk '{print $1}' | sed 's/\.$//g'
-+	$ ls -dl d/u | awk '{print $1}' | sed 's/\\.$//g'
- 	> -rwSr--r--
--	$ ls -dl d/g | awk '{print $1}' | sed 's/\.$//g'
-+	$ ls -dl d/g | awk '{print $1}' | sed 's/\\.$//g'
- 	> -rw-r-Sr--
- 	$ rm -Rf d
--- 
-1.7.1
-
diff --git a/0004-acl-2.2.52-libdir.patch b/0004-acl-2.2.52-libdir.patch
deleted file mode 100644
index 98d733f..0000000
--- a/0004-acl-2.2.52-libdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3dee229914dc17beef900d16175a877697119911 Mon Sep 17 00:00:00 2001
-From: Kamil Rytarowski <n54@gmx.com>
-Date: Sat, 27 Apr 2013 22:43:31 +0200
-Subject: [PATCH] Install the libraries to the appropriate directory
-
-[upstream commit 2971df45020e39516c9b3d6217195b4029026f7a]
-
-Signed-off-by: Kamil Dudka <kdudka@redhat.com>
----
- include/builddefs.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/include/builddefs.in b/include/builddefs.in
-index 2ef6173..876a735 100644
---- a/include/builddefs.in
-+++ b/include/builddefs.in
-@@ -31,7 +31,7 @@ PKG_DISTRIBUTION= @pkg_distribution@
- PKG_BIN_DIR	= @bindir@
- PKG_SBIN_DIR	= @sbindir@
- PKG_LIB_DIR	= @libdir@@libdirsuffix@
--PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@
-+PKG_DEVLIB_DIR	= @libdir@@libdirsuffix@
- PKG_INC_DIR	= @includedir@
- PKG_MAN_DIR	= @mandir@
- PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
--- 
-1.7.1
-
diff --git a/0005-acl-2.2.52-getfacl-segv.patch b/0005-acl-2.2.52-getfacl-segv.patch
deleted file mode 100644
index 8a27dda..0000000
--- a/0005-acl-2.2.52-getfacl-segv.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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/0006-acl-2.2.52-setfacl-man-page.patch b/0006-acl-2.2.52-setfacl-man-page.patch
deleted file mode 100644
index f86f9ee..0000000
--- a/0006-acl-2.2.52-setfacl-man-page.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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/0007-acl-2.2.52-tests-perl.patch b/0007-acl-2.2.52-tests-perl.patch
deleted file mode 100644
index 76df204..0000000
--- a/0007-acl-2.2.52-tests-perl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 368f03d8d415854fc2e66ebaf6e014d9c0fada7b Mon Sep 17 00:00:00 2001
-From: Troy Dawson <tdawson@redhat.com>
-Date: Fri, 21 Jul 2017 14:05:47 -0700
-Subject: [PATCH] acl: escape left brace in a regex in test/run
-
-... to fix test-suite failure with perl-5.26.0
-
-Bug: https://bugzilla.redhat.com/1473845
-
-Upstream-commit: f2feb94748bd3c64ed153461afa51aebbd717821
-Signed-off-by: Kamil Dudka <kdudka@redhat.com>
----
- test/run | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/run b/test/run
-index 2cf52e8..0e499e4 100755
---- a/test/run
-+++ b/test/run
-@@ -70,7 +70,7 @@ for (;;) {
-   if (defined $line) {
-     # Substitute %VAR and %{VAR} with environment variables.
-     $line =~ s[%(\w+)][$ENV{$1}]eg;
--    $line =~ s[%{(\w+)}][$ENV{$1}]eg;
-+    $line =~ s[%\{(\w+)}][$ENV{$1}]eg;
-   }
-   if (defined $line) {
-     if ($line =~ s/^\s*< ?//) {
--- 
-2.9.4
-
diff --git a/0008-acl-2.2.52-acl5-man-page.patch b/0008-acl-2.2.52-acl5-man-page.patch
deleted file mode 100644
index 85c2599..0000000
--- a/0008-acl-2.2.52-acl5-man-page.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1daf87b570070cc652e3ea39c1ad7f7c2cce8b09 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruenba@redhat.com>
-Date: Mon, 12 Mar 2018 22:25:19 +0100
-Subject: [PATCH] acl.5 man page: Update link to POSIX.1e draft
-
-Upstream-commit: ff3bca294e092810e92fd8a832bc0388e3194932
-Signed-off-by: Kamil Dudka <kdudka@redhat.com>
----
- man/man5/acl.5 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/man/man5/acl.5 b/man/man5/acl.5
-index c045726..18a3550 100644
---- a/man/man5/acl.5
-+++ b/man/man5/acl.5
-@@ -406,7 +406,7 @@ header.
- .Xr stat 2 ,
- .Xr umask 1
- .Ss POSIX 1003.1e DRAFT 17
--.Xr "http://www.guug.de/~winni/posix.1e/download.html"
-+.Xr "http://wt.tuxomania.net/publications/posix.1e/download.html"
- .Ss POSIX 1003.1e FUNCTIONS BY CATEGORY
- .Bl -tag -width "MMM"
- .It Sy ACL storage management
--- 
-2.14.3
-
diff --git a/acl-2.2.52.src.tar.gz.sig b/acl-2.2.52.src.tar.gz.sig
deleted file mode 100644
index f9d1b9e6351a28b93138f6a862257af3b45a7da0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3L0vrSY0RjL91p-l+Y(xMG2@n-SLnZ}6-!y|Q5CENYXMobghqZ}i)J}BR
z_>y#Qzx3R1Z8CaPk(UR>)+kj)KQ7h34yc+{8E>;U4J=6?R<kiOdN5+)PUW;03iTA`
zqejCjX?QYS&3UM*X@24YtL!p;P@-m;V}_O>%*v+;_T{kzlXr5lCBy&E;dfps_9OVK
zo<PEQYxv{&HmzKqJZO*q{M;w{W&T8(btjY<)wbsD6??!vMp4Xp0p$a1Y=Go~Y^<Sd
zF+MhW1b{Rb7`je=+jmvXHNE%&b^0d%<kO6<v7vp9w<uAKVmVd4;1{cykSv3JNr^=@
zl3k~0R#^yK>^+jV9q+3j1tNF>m(Q^YoRC}&jZ>(gv-e4HS1wX23!;ZLV2bQvw*o=^
zD(6~%*xL579AXU1wuBbLV2e=tw5j%HMs6~lR3dlmmof0|8jqE;yoM^;iNr)Chv;%L
zGG+tFR>}dr1s~@O;YE#8#cqo7-!Ga@{wYnl7t#eqIX-gCC?iHy>q1@D^@0=R4BSQT
z<L;M9ahg0pfSd*^%<El(g@t~qN<P`!d?o=J1Lf=@cfbQWqQ<kL>rKz5DG;h5?agTk
zT$59dfA<R31HC9IsvJpd*6^HQ9?5_@`1(1LOee$F!1(3fH?OVG{PMFYPiGM-Pp-gi
hK43Ea8c1HMSBHT_%L*5YH!G#imTfW0Rlq8}LvuM+0nh*d

diff --git a/acl-2.2.53.tar.gz.sig b/acl-2.2.53.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..52f5e19e16f5f7b66eb263a38b2eb494f622b826
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j+=0<|X-CHRu8B^uO0V>_SdH}!!90$V6}Q~(MI5J6)*
zpXfLBfu?j1{wX>E=VIYYnsqL-NMRXyI)Snco{>xRUe%46&f%{m_z`!t^56NFZep#!
z^ufXr-TS%t&tw&ogTdQqwK&{$(Fp<UmK|2Fhv^5F|B|Crnk3XU0B=AZ$GaCQe{C5Z
zS*7oRfUb+2@Vb3(2D@G&eSRRseOP6T;@`1*E_6dr{o8s1l-#rSLM4=1Fx$vfN>^)~
zV6K-sZvZ1tzvZ)Fvp)GlBP3i0Q5p2hj&&pI9u)J`)zRV~#eh&zc}|Q(*rSNW;;@ds
zAgOow3&SfWbc66Fi8=KNPHg$8R2MQJH4x3Dk@x%9T5f_T&W5U`Pp!{2Y@^ldJCQAA
ze<R!@y0a+qXjT#vfdKDrJ24sAM&oVf=+YS;QCh5qWMWVrf~z<y;uJ6dC^w;?dk;_{
z>YM>=8D_gXYG|Ahmj!Ia*T{F9*)&v1Di^GK!d`D#KGf)~DkG4Tr$v)N!O0U5uWRKJ
zX-k^Ohn`WWTQL`ByW;xq9PYK5Yf-U`VJbASkP7WQj)1ShtQE|{ooVugi(dtTM8k`6
zj_xLHL0u{+hYa&r%S_-D51~a<l~r3tRGo6y&x=_7!$5u?pso|=9(W|0?}mg2a#P~o
zIp}d@s5wEQ5&2<GpnhjhHWRp=2o63pPD>WIj&4(POR@dwk=l@C&c50=58Vl<grjnA
E!>geS1ONa4

literal 0
HcmV?d00001

diff --git a/acl.spec b/acl.spec
index 47435d2..1d76fd4 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,37 +1,13 @@
 Summary: Access control list utilities
 Name: acl
-Version: 2.2.52
-Release: 21%{?dist}
+Version: 2.2.53
+Release: 1%{?dist}
 BuildRequires: gawk
 BuildRequires: gettext
 BuildRequires: libattr-devel
 BuildRequires: libtool
 Requires: libacl = %{version}-%{release}
-Source: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.src.tar.gz
-
-# fix a typo in setfacl(1) man page (#675451)
-Patch1: 0001-acl-2.2.49-bz675451.patch
-
-# fix spurious acl_check() failure on setfacl --restore (#1451826)
-Patch2: 0002-acl-2.2.52-setfacl-restore-initialize.patch
-
-# prepare the test-suite for SELinux and arbitrary umask
-Patch3: 0003-acl-2.2.52-tests.patch
-
-# Install the libraries to the appropriate directory
-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: 0006-acl-2.2.52-setfacl-man-page.patch
-
-# fix test-suite failure with perl-5.26.0 (#1473845)
-Patch7: 0007-acl-2.2.52-tests-perl.patch
-
-# update link to POSIX.1e draft in acl(5) man page (#1510527)
-Patch8: 0008-acl-2.2.52-acl5-man-page.patch
+Source: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.tar.gz
 
 License: GPLv2+
 URL: https://savannah.nongnu.org/projects/acl
@@ -75,16 +51,25 @@ defined in POSIX 1003.1e draft standard 17.
 make %{?_smp_mflags}
 
 %check
-if ./setfacl/setfacl -m u:`id -u`:rwx .; then
-    make tests || exit $?
-    if test 0 = `id -u`; then
+if ./setfacl -m "u:$(id -u):rwx" .; then
+    if test 0 = "$(id -u)"; then
         # test/root/permissions.test requires the 'daemon' user to be a member
         # of the 'bin' group in order not to fail.  Prevent the test from
         # running if we detect that its requirements are not met (#1085389).
-        id -nG daemon | grep bin >/dev/null || rm -f test/root/permissions.test
+        if id -nG daemon | { ! grep bin >/dev/null; }; then
+	    sed -e 's|test/root/permissions.test||' \
+	        -i test/Makemodule.am Makefile.in Makefile
+	fi
 
-        make root-tests || exit $?
+	# test/root/setfacl.test fails if 'bin' user cannot access build dir
+	if ! runuser -u bin -- "${PWD}/setfacl" --version; then
+	    sed -e 's|test/root/setfacl.test||' \
+	        -i test/Makemodule.am Makefile.in Makefile
+	fi
     fi
+
+    # run the upstream test-suite
+    make check || exit $?
 else
     echo '*** ACLs are probably not supported by the file system,' \
          'the test-suite will NOT run ***'
@@ -92,8 +77,6 @@ fi
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-make install-dev DESTDIR=$RPM_BUILD_ROOT
-make install-lib DESTDIR=$RPM_BUILD_ROOT
 
 # get rid of libacl.a and libacl.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.a
@@ -121,6 +104,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 
 %files -n libacl-devel
 %{_libdir}/libacl.so
+%{_libdir}/pkgconfig/*.pc
 %{_includedir}/acl
 %{_includedir}/sys/acl.h
 %{_mandir}/man3/acl_*
@@ -129,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Mon Jul 02 2018 Kamil Dudka <kdudka@redhat.com> 2.2.53-1
+- new upstream release
+
 * Tue Mar 13 2018 Kamil Dudka <kdudka@redhat.com> 2.2.52-21
 - update link to POSIX.1e draft in acl(5) man page (#1510527)
 
diff --git a/sources b/sources
index 051eb9e..d8584fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a61415312426e9c2212bd7dc7929abda  acl-2.2.52.src.tar.gz
+SHA512 (acl-2.2.53.tar.gz) = 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716

From 618c25640c341c61645e566eab7613bdc794072f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 12 Jul 2018 19:57:33 +0000
Subject: [PATCH 56/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 1d76fd4..b9bd416 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.53
-Release: 1%{?dist}
+Release: 2%{?dist}
 BuildRequires: gawk
 BuildRequires: gettext
 BuildRequires: libattr-devel
@@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Mon Jul 02 2018 Kamil Dudka <kdudka@redhat.com> 2.2.53-1
 - new upstream release
 

From 4deb1ba7a00c85818d06c9702c041e7f11d16b34 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:17:38 +0100
Subject: [PATCH 57/96] Remove obsolete Group tag

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 acl.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/acl.spec b/acl.spec
index b9bd416..653c939 100644
--- a/acl.spec
+++ b/acl.spec
@@ -19,7 +19,6 @@ manipulating access control lists.
 %package -n libacl
 Summary: Dynamic library for access control list support
 License: LGPLv2+
-Group: System Environment/Libraries
 Conflicts: filesystem < 3
 
 %description -n libacl
@@ -30,7 +29,6 @@ control lists.
 %package -n libacl-devel
 Summary: Files needed for building programs with libacl
 License: LGPLv2+
-Group: Development/Libraries
 Requires: libacl = %{version}-%{release}, libattr-devel
 
 %description -n libacl-devel

From 3e42e27ee4bae60ed9b69f17eaef772e7598c563 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 31 Jan 2019 12:54:46 +0000
Subject: [PATCH 58/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 653c939..af9abcd 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.53
-Release: 2%{?dist}
+Release: 3%{?dist}
 BuildRequires: gawk
 BuildRequires: gettext
 BuildRequires: libattr-devel
@@ -111,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From efde4cadb2166eb4dda291659d150cfd0ebeb92b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jul 2019 17:29:57 +0000
Subject: [PATCH 59/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index af9abcd..edd05d1 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.53
-Release: 3%{?dist}
+Release: 4%{?dist}
 BuildRequires: gawk
 BuildRequires: gettext
 BuildRequires: libattr-devel
@@ -111,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From 3e351e195e45e7f7310db92397bd305ad339094a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jan 2020 11:09:49 +0000
Subject: [PATCH 60/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index edd05d1..6439c2a 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.53
-Release: 4%{?dist}
+Release: 5%{?dist}
 BuildRequires: gawk
 BuildRequires: gettext
 BuildRequires: libattr-devel
@@ -111,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From 460916e7b508d846136b640137b24542a315d02c Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Wed, 3 Jun 2020 00:20:20 +0000
Subject: [PATCH 61/96] Spec file cleanups and build fix

Add BuildRequires: perl-FileHandle to fix make check
Add BuildRequres: gcc [1]
make_build [2] and make_install [3]

[1] https://docs.fedoraproject.org/en-US/packaging-guidelines/C_and_C++/#_buildrequires_and_requires
[2] https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make
[3] https://docs.fedoraproject.org/en-US/packaging-guidelines/#_why_the_makeinstall_macro_should_not_be_used
---
 acl.spec | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/acl.spec b/acl.spec
index 6439c2a..673d9ec 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,11 +1,13 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.53
-Release: 5%{?dist}
+Release: 6%{?dist}
 BuildRequires: gawk
 BuildRequires: gettext
 BuildRequires: libattr-devel
 BuildRequires: libtool
+BuildRequires: gcc
+BuildRequires: perl-FileHandle
 Requires: libacl = %{version}-%{release}
 Source: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.tar.gz
 
@@ -46,7 +48,7 @@ defined in POSIX 1003.1e draft standard 17.
 # sed -i 's/-O2/-O0/' libtool include/builddefs
 # unset CFLAGS
 
-make %{?_smp_mflags}
+%make_build
 
 %check
 if ./setfacl -m "u:$(id -u):rwx" .; then
@@ -67,14 +69,14 @@ if ./setfacl -m "u:$(id -u):rwx" .; then
     fi
 
     # run the upstream test-suite
-    make check || exit $?
+    %make_build check || exit $?
 else
     echo '*** ACLs are probably not supported by the file system,' \
          'the test-suite will NOT run ***'
 fi
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 # get rid of libacl.a and libacl.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.a
@@ -111,6 +113,15 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Wed Jun 03 2020 Tom Stellard <tstellar@redhat.com> - 2.2.53-6
+- Spec file cleanups and build fix
+- Add BuildRequires: perl-FileHandle to fix make check
+- Add BuildRequres: gcc [1]
+- Use make_build [2] and make_install[3] macros
+- [1] https://docs.fedoraproject.org/en-US/packaging-guidelines/C_and_C++/#_buildrequires_and_requires
+- [2] https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make
+- [3] https://docs.fedoraproject.org/en-US/packaging-guidelines/#_why_the_makeinstall_macro_should_not_be_used
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 1f5db79d7896e96e1e940bdc70d9d1dd59a30838 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Wed, 3 Jun 2020 10:45:41 +0200
Subject: [PATCH 62/96] acl.spec: keep the list of BuildRequires sorted

---
 acl.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 673d9ec..d071768 100644
--- a/acl.spec
+++ b/acl.spec
@@ -3,10 +3,10 @@ Name: acl
 Version: 2.2.53
 Release: 6%{?dist}
 BuildRequires: gawk
+BuildRequires: gcc
 BuildRequires: gettext
 BuildRequires: libattr-devel
 BuildRequires: libtool
-BuildRequires: gcc
 BuildRequires: perl-FileHandle
 Requires: libacl = %{version}-%{release}
 Source: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.tar.gz

From a4e4d93b26f0858b90711c1f968ccb7f04f1ff5c Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Wed, 3 Jun 2020 11:45:56 +0200
Subject: [PATCH 63/96] build require perl(FileHandle) rather than
 perl-FileHandle

... which is not available on el8
---
 acl.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index d071768..2ff3e4a 100644
--- a/acl.spec
+++ b/acl.spec
@@ -7,7 +7,7 @@ BuildRequires: gcc
 BuildRequires: gettext
 BuildRequires: libattr-devel
 BuildRequires: libtool
-BuildRequires: perl-FileHandle
+BuildRequires: perl(FileHandle)
 Requires: libacl = %{version}-%{release}
 Source: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.tar.gz
 

From 77d51f9573e29f5d9bdc6551318c10b4aa4be2cc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 27 Jul 2020 11:42:12 +0000
Subject: [PATCH 64/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 2ff3e4a..c8c0cf9 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.53
-Release: 6%{?dist}
+Release: 7%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -113,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Wed Jun 03 2020 Tom Stellard <tstellar@redhat.com> - 2.2.53-6
 - Spec file cleanups and build fix
 - Add BuildRequires: perl-FileHandle to fix make check

From 3da9d88e0186d9c42f25871bf7e84265c6e516fe Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 31 Jul 2020 23:48:04 +0000
Subject: [PATCH 65/96] - Second attempt - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acl.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index c8c0cf9..e8ed284 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.53
-Release: 7%{?dist}
+Release: 8%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -113,6 +113,10 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-8
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From 35d2b73507ff544a149e339ef1482ad93091165b Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 31 Aug 2020 17:24:56 +0200
Subject: [PATCH 66/96] acl.spec: remember to add patches to spec file

... so that they actually take an effect
---
 acl.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/acl.spec b/acl.spec
index e8ed284..8aabcfa 100644
--- a/acl.spec
+++ b/acl.spec
@@ -11,6 +11,9 @@ BuildRequires: perl(FileHandle)
 Requires: libacl = %{version}-%{release}
 Source: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.tar.gz
 
+# avoid permission denied problem with LD_PRELOAD in the test-suite
+Patch1: 0001-acl-2.2.53-test-runwrapper.patch
+
 License: GPLv2+
 URL: https://savannah.nongnu.org/projects/acl
 

From 350464f5072873d91af1e5429c08ee948247eb9f Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 31 Aug 2020 17:41:28 +0200
Subject: [PATCH 67/96] acl.spec: expand tabs in the spec file

... to keep the indentation style consistent
---
 acl.spec | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/acl.spec b/acl.spec
index 8aabcfa..c0d26f2 100644
--- a/acl.spec
+++ b/acl.spec
@@ -60,15 +60,15 @@ if ./setfacl -m "u:$(id -u):rwx" .; then
         # of the 'bin' group in order not to fail.  Prevent the test from
         # running if we detect that its requirements are not met (#1085389).
         if id -nG daemon | { ! grep bin >/dev/null; }; then
-	    sed -e 's|test/root/permissions.test||' \
-	        -i test/Makemodule.am Makefile.in Makefile
-	fi
+            sed -e 's|test/root/permissions.test||' \
+                -i test/Makemodule.am Makefile.in Makefile
+        fi
 
-	# test/root/setfacl.test fails if 'bin' user cannot access build dir
-	if ! runuser -u bin -- "${PWD}/setfacl" --version; then
-	    sed -e 's|test/root/setfacl.test||' \
-	        -i test/Makemodule.am Makefile.in Makefile
-	fi
+        # test/root/setfacl.test fails if 'bin' user cannot access build dir
+        if ! runuser -u bin -- "${PWD}/setfacl" --version; then
+            sed -e 's|test/root/setfacl.test||' \
+                -i test/Makemodule.am Makefile.in Makefile
+        fi
     fi
 
     # run the upstream test-suite

From 1a62a26c8d1754e56b4be57e7ffd390d6435f389 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 31 Aug 2020 17:47:04 +0200
Subject: [PATCH 68/96] make the test-suite use the just built library

... instead of the system one
---
 acl.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/acl.spec b/acl.spec
index c0d26f2..2271534 100644
--- a/acl.spec
+++ b/acl.spec
@@ -54,6 +54,9 @@ defined in POSIX 1003.1e draft standard 17.
 %make_build
 
 %check
+# make the test-suite use the just built library (instead of the system one)
+export LD_LIBRARY_PATH="${RPM_BUILD_ROOT}%{_libdir}:${LD_LIBRARY_PATH}"
+
 if ./setfacl -m "u:$(id -u):rwx" .; then
     if test 0 = "$(id -u)"; then
         # test/root/permissions.test requires the 'daemon' user to be a member

From e0b4e6db205b02c77e5936fe858cd1f84a0287b4 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 31 Aug 2020 17:52:54 +0200
Subject: [PATCH 69/96] Resolves: #1873975 - make __acl_create_entry_obj() work
 with LTO enabled

---
 0002-acl-2.2.53-setattr-segv.patch | 29 +++++++++++++++++++++++++++++
 acl.spec                           |  8 +++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 0002-acl-2.2.53-setattr-segv.patch

diff --git a/0002-acl-2.2.53-setattr-segv.patch b/0002-acl-2.2.53-setattr-segv.patch
new file mode 100644
index 0000000..430838c
--- /dev/null
+++ b/0002-acl-2.2.53-setattr-segv.patch
@@ -0,0 +1,29 @@
+From c03773259fbe6d3f3355efc8e66990718d5cab54 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 31 Aug 2020 17:16:34 +0200
+Subject: [PATCH] __acl_create_entry_obj: do not break strict aliasing rules
+
+... to avoid SIGSEGV with link-time optimisation enabled
+
+Bug: https://bugzilla.redhat.com/1873975
+Upstream-report: https://lists.nongnu.org/archive/html/acl-devel/2020-08/msg00000.html
+---
+ libacl/acl_create_entry.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libacl/acl_create_entry.c b/libacl/acl_create_entry.c
+index 2214c1a..8ee72a3 100644
+--- a/libacl/acl_create_entry.c
++++ b/libacl/acl_create_entry.c
+@@ -42,7 +42,7 @@ __acl_create_entry_obj(acl_obj *acl_obj_p)
+ 	entry_obj_p->eprev = acl_obj_p->aprev;
+ 	entry_obj_p->enext = (acl_entry_obj *)acl_obj_p;
+ 	entry_obj_p->eprev->enext = entry_obj_p;
+-	entry_obj_p->enext->eprev = entry_obj_p;
++	acl_obj_p->aprev = entry_obj_p;
+ 	
+ 	entry_obj_p->econtainer = acl_obj_p;
+ 	init_acl_entry_obj(*entry_obj_p);
+-- 
+2.25.4
+
diff --git a/acl.spec b/acl.spec
index 2271534..6d703c3 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.53
-Release: 8%{?dist}
+Release: 9%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -14,6 +14,9 @@ Source: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.tar
 # avoid permission denied problem with LD_PRELOAD in the test-suite
 Patch1: 0001-acl-2.2.53-test-runwrapper.patch
 
+# make __acl_create_entry_obj() work with LTO enabled (#1873975)
+Patch2: 0002-acl-2.2.53-setattr-segv.patch
+
 License: GPLv2+
 URL: https://savannah.nongnu.org/projects/acl
 
@@ -119,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Mon Aug 31 2020 Kamil Dudka <kdudka@redhat.com> 2.2.53-9
+- make __acl_create_entry_obj() work with LTO enabled (#1873975)
+
 * Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-8
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

From 77cb7a04c063e7bf6997a00d5b6b167e3504acac Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Tue, 15 Dec 2020 01:44:00 +0000
Subject: [PATCH 70/96] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 acl.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/acl.spec b/acl.spec
index 6d703c3..4bef69e 100644
--- a/acl.spec
+++ b/acl.spec
@@ -8,6 +8,7 @@ BuildRequires: gettext
 BuildRequires: libattr-devel
 BuildRequires: libtool
 BuildRequires: perl(FileHandle)
+BuildRequires: make
 Requires: libacl = %{version}-%{release}
 Source: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.tar.gz
 

From 8ff7c209f0a1b7a774479c50f2c825a60d933647 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Thu, 7 Jan 2021 09:09:39 +0100
Subject: [PATCH 71/96] acl.spec: keep BR list alphabetically sorted

---
 acl.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 4bef69e..711ae1c 100644
--- a/acl.spec
+++ b/acl.spec
@@ -7,8 +7,8 @@ BuildRequires: gcc
 BuildRequires: gettext
 BuildRequires: libattr-devel
 BuildRequires: libtool
-BuildRequires: perl(FileHandle)
 BuildRequires: make
+BuildRequires: perl(FileHandle)
 Requires: libacl = %{version}-%{release}
 Source: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.tar.gz
 

From c0202ce6097bd06dae0268a388bfd0e1de658edb Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Wed, 13 Jan 2021 00:50:36 +0000
Subject: [PATCH 72/96] Minor spec file optimizations

---
 acl.spec | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/acl.spec b/acl.spec
index 711ae1c..a1f9395 100644
--- a/acl.spec
+++ b/acl.spec
@@ -9,7 +9,7 @@ BuildRequires: libattr-devel
 BuildRequires: libtool
 BuildRequires: make
 BuildRequires: perl(FileHandle)
-Requires: libacl = %{version}-%{release}
+Requires: libacl%{?_isa} = %{version}-%{release}
 Source: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.tar.gz
 
 # avoid permission denied problem with LD_PRELOAD in the test-suite
@@ -38,7 +38,7 @@ control lists.
 %package -n libacl-devel
 Summary: Files needed for building programs with libacl
 License: LGPLv2+
-Requires: libacl = %{version}-%{release}, libattr-devel
+Requires: libacl%{?_isa} = %{version}-%{release}, libattr-devel
 
 %description -n libacl-devel
 This package contains header files and documentation needed to develop
@@ -102,7 +102,6 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %ldconfig_scriptlets -n libacl
 
 %files -f %{name}.lang
-%{!?_licensedir:%global license %%doc}
 %license doc/COPYING*
 %{_bindir}/chacl
 %{_bindir}/getfacl

From d5c22707ba8e80ef10ac7364414c924a14c74cb9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 25 Jan 2021 23:46:01 +0000
Subject: [PATCH 73/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index a1f9395..3400db8 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.53
-Release: 9%{?dist}
+Release: 10%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Aug 31 2020 Kamil Dudka <kdudka@redhat.com> 2.2.53-9
 - make __acl_create_entry_obj() work with LTO enabled (#1873975)
 

From 3b266dc344a52a276e07a35d0539ea8f702bae2e Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Fri, 12 Mar 2021 09:22:46 +0100
Subject: [PATCH 74/96] upstream release - 2.3.0

---
 .gitignore                         |   2 +-
 0002-acl-2.2.53-setattr-segv.patch |  29 -----------------------------
 acl-2.2.53.tar.gz.sig              | Bin 566 -> 0 bytes
 acl-2.3.0.tar.gz.sig               | Bin 0 -> 566 bytes
 acl.spec                           |  10 +++++-----
 sources                            |   2 +-
 6 files changed, 7 insertions(+), 36 deletions(-)
 delete mode 100644 0002-acl-2.2.53-setattr-segv.patch
 delete mode 100644 acl-2.2.53.tar.gz.sig
 create mode 100644 acl-2.3.0.tar.gz.sig

diff --git a/.gitignore b/.gitignore
index 1985515..393078a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/acl-2.2.*.tar.gz
+/acl-2.[23].*.tar.gz
diff --git a/0002-acl-2.2.53-setattr-segv.patch b/0002-acl-2.2.53-setattr-segv.patch
deleted file mode 100644
index 430838c..0000000
--- a/0002-acl-2.2.53-setattr-segv.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c03773259fbe6d3f3355efc8e66990718d5cab54 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Mon, 31 Aug 2020 17:16:34 +0200
-Subject: [PATCH] __acl_create_entry_obj: do not break strict aliasing rules
-
-... to avoid SIGSEGV with link-time optimisation enabled
-
-Bug: https://bugzilla.redhat.com/1873975
-Upstream-report: https://lists.nongnu.org/archive/html/acl-devel/2020-08/msg00000.html
----
- libacl/acl_create_entry.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libacl/acl_create_entry.c b/libacl/acl_create_entry.c
-index 2214c1a..8ee72a3 100644
---- a/libacl/acl_create_entry.c
-+++ b/libacl/acl_create_entry.c
-@@ -42,7 +42,7 @@ __acl_create_entry_obj(acl_obj *acl_obj_p)
- 	entry_obj_p->eprev = acl_obj_p->aprev;
- 	entry_obj_p->enext = (acl_entry_obj *)acl_obj_p;
- 	entry_obj_p->eprev->enext = entry_obj_p;
--	entry_obj_p->enext->eprev = entry_obj_p;
-+	acl_obj_p->aprev = entry_obj_p;
- 	
- 	entry_obj_p->econtainer = acl_obj_p;
- 	init_acl_entry_obj(*entry_obj_p);
--- 
-2.25.4
-
diff --git a/acl-2.2.53.tar.gz.sig b/acl-2.2.53.tar.gz.sig
deleted file mode 100644
index 52f5e19e16f5f7b66eb263a38b2eb494f622b826..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j+=0<|X-CHRu8B^uO0V>_SdH}!!90$V6}Q~(MI5J6)*
zpXfLBfu?j1{wX>E=VIYYnsqL-NMRXyI)Snco{>xRUe%46&f%{m_z`!t^56NFZep#!
z^ufXr-TS%t&tw&ogTdQqwK&{$(Fp<UmK|2Fhv^5F|B|Crnk3XU0B=AZ$GaCQe{C5Z
zS*7oRfUb+2@Vb3(2D@G&eSRRseOP6T;@`1*E_6dr{o8s1l-#rSLM4=1Fx$vfN>^)~
zV6K-sZvZ1tzvZ)Fvp)GlBP3i0Q5p2hj&&pI9u)J`)zRV~#eh&zc}|Q(*rSNW;;@ds
zAgOow3&SfWbc66Fi8=KNPHg$8R2MQJH4x3Dk@x%9T5f_T&W5U`Pp!{2Y@^ldJCQAA
ze<R!@y0a+qXjT#vfdKDrJ24sAM&oVf=+YS;QCh5qWMWVrf~z<y;uJ6dC^w;?dk;_{
z>YM>=8D_gXYG|Ahmj!Ia*T{F9*)&v1Di^GK!d`D#KGf)~DkG4Tr$v)N!O0U5uWRKJ
zX-k^Ohn`WWTQL`ByW;xq9PYK5Yf-U`VJbASkP7WQj)1ShtQE|{ooVugi(dtTM8k`6
zj_xLHL0u{+hYa&r%S_-D51~a<l~r3tRGo6y&x=_7!$5u?pso|=9(W|0?}mg2a#P~o
zIp}d@s5wEQ5&2<GpnhjhHWRp=2o63pPD>WIj&4(POR@dwk=l@C&c50=58Vl<grjnA
E!>geS1ONa4

diff --git a/acl-2.3.0.tar.gz.sig b/acl-2.3.0.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..9cb025323bf024f53c5e444876db9fa66d4b2689
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j*Bn>UiP*3%gwEX3T^zn|*^6J<ID0$@sM*#HU&5Y@k*
z>jM*IItTF(0I2XB-@>L6N~+dt=<1+bMpTL0?n}e|ms-4BY#WIO*>!9T5`Hbcfrdlm
z%mmH}?2B!>yn0KZpY>KjLeprZx=6Kdx6)(^^XH{2RCaVY5+m1rX<NmVLV&Dk5o#R|
z16a)>6V#-8<FI_}d${HR<35e<wkknZSH<=}mxP7VUerD{ct|gYkheD_ZhkTMu6u#v
zzxaayr|{YHffy>7NfX-Y{V+-L(YDP(OU>zgc9dO;9Bb(Tytj#BvC--@FJHkX-Sdp^
zps7;Jp@jdyUsG~%!n)OM9l`rpN{TT9D3w+E6Bs;=*gIfHMazm!NmmiS@~w>RxG8^c
zP%hR82#4_FJ1Fe0Nobm`p@gVP?kD-)JV5_*(Hi^$P0s|5b3+qpaJ9$@i%;!%^nnHs
z_xXO!Evl0{#JIPf`{~M+d1F~-Lb}#~K(72$>Y)uTmiuZtoggcOfso&w%u?CyXz<mm
zlj%W1EA`;9Cj@rIM2LQjS>9kvO|}fkEXN<BjglpXqPV0H-MK~kgSMjmLeF<QT_3`K
z5zyxbCYM2C7pD78^1eTKd+?SQ4YmGn%zVtf{~x2r^UZNodDWF=q^p~Y@LfY|E~C|&
z5uMT87K!Ij%^~yHbOTd*m@ZZQy$I727dY*xE#9;nMx&CmDS;y30sD59$G$Pi5-DOY
EupwU@LI3~&

literal 0
HcmV?d00001

diff --git a/acl.spec b/acl.spec
index 3400db8..7e3ff10 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
-Version: 2.2.53
-Release: 10%{?dist}
+Version: 2.3.0
+Release: 1%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -15,9 +15,6 @@ Source: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.tar
 # avoid permission denied problem with LD_PRELOAD in the test-suite
 Patch1: 0001-acl-2.2.53-test-runwrapper.patch
 
-# make __acl_create_entry_obj() work with LTO enabled (#1873975)
-Patch2: 0002-acl-2.2.53-setattr-segv.patch
-
 License: GPLv2+
 URL: https://savannah.nongnu.org/projects/acl
 
@@ -122,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Fri Mar 12 2021 Kamil Dudka <kdudka@redhat.com> - 2.3.0-1
+- new upstream release
+
 * Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index d8584fe..9a0204e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (acl-2.2.53.tar.gz) = 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
+SHA512 (acl-2.3.0.tar.gz) = 77c0f387955d98ee086020943ea5d50ddcf5a36981cb28d2e90c74c20c3893c13c3fa9bc5bc47f79957987ec19afd00ad0b144a1387562b887c1f5fb5e6850cc

From 08c7e74d0a58c9483d2f4f55a3fba2baffb09c3a Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Tue, 16 Mar 2021 08:53:15 +0100
Subject: [PATCH 75/96] upstream release - 2.3.1

---
 acl-2.3.0.tar.gz.sig | Bin 566 -> 0 bytes
 acl-2.3.1.tar.gz.sig | Bin 0 -> 566 bytes
 acl.spec             |   5 ++++-
 sources              |   2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)
 delete mode 100644 acl-2.3.0.tar.gz.sig
 create mode 100644 acl-2.3.1.tar.gz.sig

diff --git a/acl-2.3.0.tar.gz.sig b/acl-2.3.0.tar.gz.sig
deleted file mode 100644
index 9cb025323bf024f53c5e444876db9fa66d4b2689..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j*Bn>UiP*3%gwEX3T^zn|*^6J<ID0$@sM*#HU&5Y@k*
z>jM*IItTF(0I2XB-@>L6N~+dt=<1+bMpTL0?n}e|ms-4BY#WIO*>!9T5`Hbcfrdlm
z%mmH}?2B!>yn0KZpY>KjLeprZx=6Kdx6)(^^XH{2RCaVY5+m1rX<NmVLV&Dk5o#R|
z16a)>6V#-8<FI_}d${HR<35e<wkknZSH<=}mxP7VUerD{ct|gYkheD_ZhkTMu6u#v
zzxaayr|{YHffy>7NfX-Y{V+-L(YDP(OU>zgc9dO;9Bb(Tytj#BvC--@FJHkX-Sdp^
zps7;Jp@jdyUsG~%!n)OM9l`rpN{TT9D3w+E6Bs;=*gIfHMazm!NmmiS@~w>RxG8^c
zP%hR82#4_FJ1Fe0Nobm`p@gVP?kD-)JV5_*(Hi^$P0s|5b3+qpaJ9$@i%;!%^nnHs
z_xXO!Evl0{#JIPf`{~M+d1F~-Lb}#~K(72$>Y)uTmiuZtoggcOfso&w%u?CyXz<mm
zlj%W1EA`;9Cj@rIM2LQjS>9kvO|}fkEXN<BjglpXqPV0H-MK~kgSMjmLeF<QT_3`K
z5zyxbCYM2C7pD78^1eTKd+?SQ4YmGn%zVtf{~x2r^UZNodDWF=q^p~Y@LfY|E~C|&
z5uMT87K!Ij%^~yHbOTd*m@ZZQy$I727dY*xE#9;nMx&CmDS;y30sD59$G$Pi5-DOY
EupwU@LI3~&

diff --git a/acl-2.3.1.tar.gz.sig b/acl-2.3.1.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..ff407868ba463a1f7c0ea5cd31f0b3d90fcf6b8a
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j*Bn>UiP*3%gwEX3T^zn|*^6J<ID0$@;6)&L3#5Y@k*
z>jM*II-C~|{wrVaJo#oDmW4{^+W(cLOcaAfS7EQEoe4a5nQggf_bP43X>`7_`=+V$
z(7%K~*9bk{Ob@|FYh@%$NM1pJrJ~Hy3BAb!*Uwg<xYNh<iv@Ew@#al7vyTw~lRxr=
z6`*RScX8l3nC+mIbnZep<KHxAPGC`0m*I~zjuEHQ%s}QwYUoSwG2^Hx2`_~g3bbm1
z_98_wv@`Sudf!(j4f4z(8#Uz;Fg})Jf>*3Ip$KOIdaU>yyUf99bfBEs(A>ZKJ8~QP
zY6RSTOjQ^|Y-?Q)Z@@m!L%HK~0<jW?LxZ5FARAVu3ZU`)ZuyQ-mEW|7R<?X*^<4D)
zaVqAmx#x|D7;pvn6tgQkFg70~TdZ+(>0R&~M%8M^-eZgl1~yX@Zgy>K)|IUc$bsBs
zWf()tHa0*_6E7vQ1pEzK1deu>ZdrY~SAae|aCDOjDiP7SXlh?eb>e?kVxgX|iC!0+
z3;Od<*^!F04lp9|GD;}Z=kIIn1~Whtyk5D8jaMvYz^_c{_>nM!xle4L8T>2Oh&7?@
ziKeV0Aw|)qZhgF2@NW%a>mKZIlGtgU4zKE_$r!D}2Ze>y!}DwwP^6fZ<8Ir1!eQ5H
zheOxnoAx#xp@I6*!Ko!$va&(v9M8v?b`pFr4%nI#jp<n}I5RktJ%1q7;~VURB_kK+
ECaN9{HUIzs

literal 0
HcmV?d00001

diff --git a/acl.spec b/acl.spec
index 7e3ff10..2bf7182 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,6 +1,6 @@
 Summary: Access control list utilities
 Name: acl
-Version: 2.3.0
+Version: 2.3.1
 Release: 1%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
@@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Tue Mar 16 2021 Kamil Dudka <kdudka@redhat.com> - 2.3.1-1
+- new upstream release
+
 * Fri Mar 12 2021 Kamil Dudka <kdudka@redhat.com> - 2.3.0-1
 - new upstream release
 
diff --git a/sources b/sources
index 9a0204e..9acc87d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (acl-2.3.0.tar.gz) = 77c0f387955d98ee086020943ea5d50ddcf5a36981cb28d2e90c74c20c3893c13c3fa9bc5bc47f79957987ec19afd00ad0b144a1387562b887c1f5fb5e6850cc
+SHA512 (acl-2.3.1.tar.gz) = f101e27058c959f4c412f475c3fc77a90d1ead8728701e4ce04ff08b34139d35e0e72278c9ac7622ba6054e81c0aeca066e09491b5f5666462e3866705a0e892

From 5279e7b933d03ab2ffffe1cbe0f4308c3e25fbad Mon Sep 17 00:00:00 2001
From: Stewart Smith <trawets@amazon.com>
Date: Thu, 8 Jul 2021 15:34:33 +0000
Subject: [PATCH 76/96] gpgverify the source tarball

There are currently three maintainers listed on Savannah, and the
current release is signed by Andreas, so only import their GPG key.

Signed-off-by: Stewart Smith <trawets@amazon.com>
---
 acl.spec       |   7 +-
 agruen-key.gpg | 476 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 482 insertions(+), 1 deletion(-)
 create mode 100644 agruen-key.gpg

diff --git a/acl.spec b/acl.spec
index 2bf7182..05b1994 100644
--- a/acl.spec
+++ b/acl.spec
@@ -9,8 +9,12 @@ BuildRequires: libattr-devel
 BuildRequires: libtool
 BuildRequires: make
 BuildRequires: perl(FileHandle)
+BuildRequires: gnupg2
 Requires: libacl%{?_isa} = %{version}-%{release}
-Source: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.tar.gz
+Source0: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.tar.gz
+Source1: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.tar.gz.sig
+# Retreived from https://savannah.nongnu.org/people/viewgpg.php?user_id=15000
+Source2: agruen-key.gpg
 
 # avoid permission denied problem with LD_PRELOAD in the test-suite
 Patch1: 0001-acl-2.2.53-test-runwrapper.patch
@@ -43,6 +47,7 @@ programs which make use of the access control list programming interface
 defined in POSIX 1003.1e draft standard 17.
 
 %prep
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -p1
 
 %build
diff --git a/agruen-key.gpg b/agruen-key.gpg
new file mode 100644
index 0000000..2e22cc2
--- /dev/null
+++ b/agruen-key.gpg
@@ -0,0 +1,476 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=C+9j
+-----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file

From 016b119802d8c28793e20ac562fffce477a2bfd6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 12:18:05 +0000
Subject: [PATCH 77/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From 0ca099649455b0d1ba5f8b246ac63496d5d761e2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 17:13:12 +0000
Subject: [PATCH 78/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 05b1994..90c566b 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Tue Mar 16 2021 Kamil Dudka <kdudka@redhat.com> - 2.3.1-1
 - new upstream release
 

From d5e8875d09943c95040d88b48ca2a2b80e06b9b3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jan 2022 20:53:14 +0000
Subject: [PATCH 79/96] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 90c566b..f159e71 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From bce1e440e392ff1b7e279a630e314aa8609e644d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 20 Jul 2022 20:23:58 +0000
Subject: [PATCH 80/96] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index f159e71..8f821ff 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From fe65fce1d516ab9217b81529d082b579d8879f56 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 18 Jan 2023 21:21:24 +0000
Subject: [PATCH 81/96] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 8f821ff..a03e579 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From d1a59be84934a78626381a6fe132766e68081978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Thu, 26 Jan 2023 15:05:40 +0100
Subject: [PATCH 82/96] acl is not yet compatible with -D_FORTIFY_SOURCE=3

---
 acl.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index a03e579..944e3b2 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,10 @@
+# https://savannah.nongnu.org/bugs/index.php?62519
+%define _fortify_level 2
+
 Summary: Access control list utilities
 Name: acl
 Version: 2.3.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -124,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Thu Jan 26 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.3.1-6
+- acl is not yet compatible with -D_FORTIFY_SOURCE=3
+
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 3889a03d82c61a7f7c8a418942438bcba4d7d65f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Tue, 14 Mar 2023 13:04:39 +0100
Subject: [PATCH 83/96] store the signature in the look aside cache

---
 .gitignore           |   1 +
 acl-2.3.1.tar.gz.sig | Bin 566 -> 0 bytes
 sources              |   1 +
 3 files changed, 2 insertions(+)
 delete mode 100644 acl-2.3.1.tar.gz.sig

diff --git a/.gitignore b/.gitignore
index 393078a..08b9615 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /acl-2.[23].*.tar.gz
+/acl-2.[23].*.tar.gz.sig
diff --git a/acl-2.3.1.tar.gz.sig b/acl-2.3.1.tar.gz.sig
deleted file mode 100644
index ff407868ba463a1f7c0ea5cd31f0b3d90fcf6b8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j*Bn>UiP*3%gwEX3T^zn|*^6J<ID0$@;6)&L3#5Y@k*
z>jM*II-C~|{wrVaJo#oDmW4{^+W(cLOcaAfS7EQEoe4a5nQggf_bP43X>`7_`=+V$
z(7%K~*9bk{Ob@|FYh@%$NM1pJrJ~Hy3BAb!*Uwg<xYNh<iv@Ew@#al7vyTw~lRxr=
z6`*RScX8l3nC+mIbnZep<KHxAPGC`0m*I~zjuEHQ%s}QwYUoSwG2^Hx2`_~g3bbm1
z_98_wv@`Sudf!(j4f4z(8#Uz;Fg})Jf>*3Ip$KOIdaU>yyUf99bfBEs(A>ZKJ8~QP
zY6RSTOjQ^|Y-?Q)Z@@m!L%HK~0<jW?LxZ5FARAVu3ZU`)ZuyQ-mEW|7R<?X*^<4D)
zaVqAmx#x|D7;pvn6tgQkFg70~TdZ+(>0R&~M%8M^-eZgl1~yX@Zgy>K)|IUc$bsBs
zWf()tHa0*_6E7vQ1pEzK1deu>ZdrY~SAae|aCDOjDiP7SXlh?eb>e?kVxgX|iC!0+
z3;Od<*^!F04lp9|GD;}Z=kIIn1~Whtyk5D8jaMvYz^_c{_>nM!xle4L8T>2Oh&7?@
ziKeV0Aw|)qZhgF2@NW%a>mKZIlGtgU4zKE_$r!D}2Ze>y!}DwwP^6fZ<8Ir1!eQ5H
zheOxnoAx#xp@I6*!Ko!$va&(v9M8v?b`pFr4%nI#jp<n}I5RktJ%1q7;~VURB_kK+
ECaN9{HUIzs

diff --git a/sources b/sources
index 9acc87d..bcb4fb9 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (acl-2.3.1.tar.gz) = f101e27058c959f4c412f475c3fc77a90d1ead8728701e4ce04ff08b34139d35e0e72278c9ac7622ba6054e81c0aeca066e09491b5f5666462e3866705a0e892
+SHA512 (acl-2.3.1.tar.gz.sig) = 1e1e341637d71a25f1990fb33a773c94d9f75a8f5ba31977367e6b2c22c78b376759385ddebc36edb3776a11c3942cab4ff38853b9fc44f5c406cd2325433b2a

From efcc86fecf690c89bd4f344ee7671fac86c5c277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Tue, 14 Mar 2023 13:17:35 +0100
Subject: [PATCH 84/96] migrated to SPDX license

---
 acl.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/acl.spec b/acl.spec
index 944e3b2..5fd81ad 100644
--- a/acl.spec
+++ b/acl.spec
@@ -4,7 +4,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.3.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -22,7 +22,7 @@ Source2: agruen-key.gpg
 # avoid permission denied problem with LD_PRELOAD in the test-suite
 Patch1: 0001-acl-2.2.53-test-runwrapper.patch
 
-License: GPLv2+
+License: GPL-2.0-or-later
 URL: https://savannah.nongnu.org/projects/acl
 
 %description
@@ -31,7 +31,7 @@ manipulating access control lists.
 
 %package -n libacl
 Summary: Dynamic library for access control list support
-License: LGPLv2+
+License: LGPL-2.1-or-later
 Conflicts: filesystem < 3
 
 %description -n libacl
@@ -41,7 +41,7 @@ control lists.
 
 %package -n libacl-devel
 Summary: Files needed for building programs with libacl
-License: LGPLv2+
+License: LGPL-2.1-or-later
 Requires: libacl%{?_isa} = %{version}-%{release}, libattr-devel
 
 %description -n libacl-devel
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Tue Mar 14 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.3.1-7
+- migrated to SPDX license
+
 * Thu Jan 26 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.3.1-6
 - acl is not yet compatible with -D_FORTIFY_SOURCE=3
 

From e58f852d0e5bd54fff2b106c1d1b597420bc279c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 12:51:39 +0000
Subject: [PATCH 85/96] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 5fd81ad..6675a05 100644
--- a/acl.spec
+++ b/acl.spec
@@ -4,7 +4,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.3.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Tue Mar 14 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.3.1-7
 - migrated to SPDX license
 

From 53758727ee3fc24cdfd8cd126db7cca309fc29bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Mon, 11 Sep 2023 11:10:14 +0200
Subject: [PATCH 86/96] Backporting Georgian translation

---
 0002-add-georgian.patch | 353 ++++++++++++++++++++++++++++++++++++++++
 acl.spec                |  10 +-
 2 files changed, 362 insertions(+), 1 deletion(-)
 create mode 100644 0002-add-georgian.patch

diff --git a/0002-add-georgian.patch b/0002-add-georgian.patch
new file mode 100644
index 0000000..79873df
--- /dev/null
+++ b/0002-add-georgian.patch
@@ -0,0 +1,353 @@
+diff -urN acl-2.3.1/po/ka.po acl-2.3.1-patched/po/ka.po
+--- acl-2.3.1/po/ka.po	1970-01-01 01:00:00.000000000 +0100
++++ acl-2.3.1-patched/po/ka.po	2023-09-07 18:01:29.938584080 +0200
+@@ -0,0 +1,341 @@
++# Georgian translation of ACL package.
++# Copyright (C) 2022 Silicon Graphics, Inc.
++# This file is distributed under the same license as the acl package.
++# Temuri Doghonadze <temuri.doghonadze@gmail.com>, 2022.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: acl 2.3.1\n"
++"Report-Msgid-Bugs-To: acl-devel@nongnu.org\n"
++"POT-Creation-Date: 2022-09-24 14:25+0200\n"
++"PO-Revision-Date: 2022-09-24 15:11+0200\n"
++"Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
++"Language-Team: Georgian <(nothing)>\n"
++"Language: ka\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"Plural-Forms: nplurals=2; plural=(n != 1);\n"
++"X-Generator: Poedit 3.1.1\n"
++
++#: libacl/acl_error.c:33
++msgid "Multiple entries of same type"
++msgstr "ერთი და იგივე ტიპის მრავალი ჩანაწერი"
++
++#: libacl/acl_error.c:35
++msgid "Duplicate entries"
++msgstr "დუბლირებული ჩანაწერები"
++
++#: libacl/acl_error.c:37
++msgid "Missing or wrong entry"
++msgstr "ნაკლული ან არასწორი ჩანაწერი"
++
++#: libacl/acl_error.c:39
++msgid "Invalid entry type"
++msgstr "ჩანაწერის არასწორი ტიპი"
++
++#: libacl/perm_copy_fd.c:124 libacl/perm_copy_fd.c:136
++#: libacl/perm_copy_fd.c:198 libacl/perm_copy_file.c:124
++#: libacl/perm_copy_file.c:139 libacl/perm_copy_file.c:150
++#: libacl/perm_copy_file.c:235
++#, c-format
++msgid "setting permissions for %s"
++msgstr "%s-ის წვდომების დაყენება"
++
++#: libacl/perm_copy_fd.c:186 libacl/perm_copy_file.c:199
++#: libacl/perm_copy_file.c:224
++#, c-format
++msgid "preserving permissions for %s"
++msgstr "%s-ის წვდომების შენახვა"
++
++#: tools/chacl.c:46
++#, c-format
++msgid "Usage:\n"
++msgstr "გამოყენება:\n"
++
++#: tools/chacl.c:47
++#, c-format
++msgid "\t%s acl pathname...\n"
++msgstr "\t%s acl ბილიკი...\n"
++
++#: tools/chacl.c:48
++#, c-format
++msgid "\t%s -b acl dacl pathname...\n"
++msgstr "\t%s -b acl dacl ბილიკი...\n"
++
++#: tools/chacl.c:49
++#, c-format
++msgid "\t%s -d dacl pathname...\n"
++msgstr "\t%s -d dacl ბილიკი...\n"
++
++#: tools/chacl.c:50
++#, c-format
++msgid "\t%s -R pathname...\n"
++msgstr "\t%s -R ბილიკი...\n"
++
++#: tools/chacl.c:51
++#, c-format
++msgid "\t%s -D pathname...\n"
++msgstr "\t%s -D ბილიკი...\n"
++
++#: tools/chacl.c:52
++#, c-format
++msgid "\t%s -B pathname...\n"
++msgstr "\t%s -B ბილიკი...\n"
++
++#: tools/chacl.c:53
++#, c-format
++msgid "\t%s -l pathname...\t[not IRIX compatible]\n"
++msgstr "\t%s -l ბილიკი...\t[შეუთავსებელია IRIX-თან]\n"
++
++#: tools/chacl.c:55
++#, c-format
++msgid "\t%s -r pathname...\t[not IRIX compatible]\n"
++msgstr "\t%s -r ბილიკი...\t[შეუთავსებელია IRIX -თან]\n"
++
++#: tools/chacl.c:146
++#, c-format
++msgid "%s: error removing access acl on \"%s\": %s\n"
++msgstr "%s: \"%s\"-ზე წვდომის ACL-ის წაშლის შეცდომა: %s\n"
++
++#: tools/chacl.c:153
++#, c-format
++msgid "%s: error removing default acl on \"%s\": %s\n"
++msgstr "%s: \"%s\"-ზე ნაგულისხმები ACL-ის წაშლის შეცდომა: %s\n"
++
++#: tools/chacl.c:172 tools/chacl.c:191
++#, c-format
++msgid "%s: access ACL '%s': %s at entry %d\n"
++msgstr "%s: წვდომის ACL '%s': %s ჩანაწერთან %d\n"
++
++#: tools/chacl.c:259
++#, c-format
++msgid "%s: cannot get access ACL on '%s': %s\n"
++msgstr "%s: cannot get access ACL on '%s': %s\n"
++
++#: tools/chacl.c:265
++#, c-format
++msgid "%s: cannot get default ACL on '%s': %s\n"
++msgstr "%s: '%s'-ზე ნაგულისხმები ACL-ის მიღების შეცდომა: %s\n"
++
++#: tools/chacl.c:271
++#, c-format
++msgid "%s: cannot get access ACL text on '%s': %s\n"
++msgstr "%s: '%s'-ზე წვდომის ACL-ის ტექსტის მიღების შეცდომა: %s\n"
++
++#: tools/chacl.c:278
++#, c-format
++msgid "%s: cannot get default ACL text on '%s': %s\n"
++msgstr "%s: '%s'-ზე ნაგულისხმები ACL-ის ტექსტის მიღების შეცდომა: %s\n"
++
++#: tools/chacl.c:304
++#, c-format
++msgid "%s: cannot set access acl on \"%s\": %s\n"
++msgstr "%s: \"%s\"-ზე წვდომის ACL-ის დაყენების შეცდომა: %s\n"
++
++#: tools/chacl.c:310
++#, c-format
++msgid "%s: cannot set default acl on \"%s\": %s\n"
++msgstr "%s: \"%s\"-ზე ნაგულისხმები ACL-ის დაყენების შეცდომა: %s\n"
++
++#: tools/chacl.c:328
++#, c-format
++msgid "%s: opendir failed: %s\n"
++msgstr "%s: opendir -ის შეცდომა: %s\n"
++
++#: tools/chacl.c:342
++#, c-format
++msgid "%s: malloc failed: %s\n"
++msgstr "%s: malloc -ის შეცდომა: %s\n"
++
++#: tools/do_set.c:410
++#, c-format
++msgid "%s: %s: Malformed access ACL `%s': %s at entry %d\n"
++msgstr "%s: %s: არასწორი წვდომის ACL `%s': %s ჩანაწერთან %d\n"
++
++#: tools/do_set.c:437
++#, c-format
++msgid "%s: %s: Malformed default ACL `%s': %s at entry %d\n"
++msgstr "%s: %s: არასწორი ნაგულისხმები ACL `%s': %s ჩანაწერთან %d\n"
++
++#: tools/do_set.c:508
++#, c-format
++msgid "%s: %s: Only directories can have default ACLs\n"
++msgstr "%s: %s: ნაგულისხმები ACL-ები მხოლოდ საქაღალდეებს შეიძლება, ჰქონდეთ\n"
++
++#: tools/getfacl.c:498
++#, c-format
++msgid "%s: Removing leading '/' from absolute path names\n"
++msgstr "%s: აბსოლუტური ბილიკის შემცველი სახელების წინ დაატებული \"/\"-ის მოცილება\n"
++
++#: tools/getfacl.c:569
++#, c-format
++msgid "%s %s -- get file access control lists\n"
++msgstr "%s %s -- ფაილის წვდომის კონტროლის სიების მიღება\n"
++
++#: tools/getfacl.c:571 tools/getfacl.c:756
++#, c-format
++msgid "Usage: %s [-%s] file ...\n"
++msgstr "გამოყენება: %s [-%s] ფაილი ...\n"
++
++#: tools/getfacl.c:577
++#, c-format
++msgid "  -d, --default           display the default access control list\n"
++msgstr "  -d, --default           ნაგულისხმები წვდომის კონტროლის სიის ჩვენება\n"
++
++#: tools/getfacl.c:581
++#, c-format
++msgid ""
++"  -a, --access            display the file access control list only\n"
++"  -d, --default           display the default access control list only\n"
++"  -c, --omit-header       do not display the comment header\n"
++"  -e, --all-effective     print all effective rights\n"
++"  -E, --no-effective      print no effective rights\n"
++"  -s, --skip-base         skip files that only have the base entries\n"
++"  -R, --recursive         recurse into subdirectories\n"
++"  -L, --logical           logical walk, follow symbolic links\n"
++"  -P, --physical          physical walk, do not follow symbolic links\n"
++"  -t, --tabular           use tabular output format\n"
++"  -n, --numeric           print numeric user/group identifiers\n"
++"      --one-file-system   skip files on different filesystems\n"
++"  -p, --absolute-names    don't strip leading '/' in pathnames\n"
++msgstr ""
++"  -a, --access            მხოლოდ ფაილის წვდომის კონტროლის სიის ჩვენება\n"
++"  -d, --default           მხოლოდ ნაგულისხმები კონტროლის სიის ჩვენება\n"
++"  -c, --omit-header       კომენტარის თავსართი ნაჩვენები არ იქნება\n"
++"  -e, --all-effective     ყველა მოქმედი წვდომის ჩვენება\n"
++"  -E, --no-effective      არაფექტური წვდომების ჩვენება\n"
++"  -s, --skip-base         ფაილების გამოტოვება, რომლებსაც მხოლოდ საბაზისო ჩანაწერები გააჩნიათ\n"
++"  -R, --recursive         რეკურსია ქვესაქაღალდეებში\n"
++"  -L, --logical           ლოგიკური სიარული, სიმბმულების მიყოლა\n"
++"  -P, --physical          ფიზიკური სიარული, სიმბმულები მიყოლილი არ იქნება\n"
++"  -t, --tabular           ტაბულაციით გამოყოფილი გამოტანა\n"
++"  -n, --numeric           მომხმარებლის/ჯგუფის რიცხვობრივი იდენტიფიკატორების ჩვენება\n"
++"      --one-file-system   სხვა ფაილურ სისტემაზე მყოფი ფაილების გამოტოვება\n"
++"  -p, --absolute-names    ბილიკებს საწყისი '/' არ მოსცილდება\n"
++
++#: tools/getfacl.c:597 tools/setfacl.c:299
++#, c-format
++msgid ""
++"  -v, --version           print version and exit\n"
++"  -h, --help              this help text\n"
++msgstr ""
++" -h, --help           ამ დახმარების გამოტანა და გამოსვლა\n"
++" -v, --version      ვერსიის გამოტანა და გამოსვლა\n"
++
++#: tools/getfacl.c:743 tools/setfacl.c:316
++#, c-format
++msgid "%s: Standard input: %s\n"
++msgstr "%s: სტანდარტული შეტანა: %s\n"
++
++#: tools/getfacl.c:758 tools/setfacl.c:655
++#, c-format
++msgid "Try `%s --help' for more information.\n"
++msgstr "მეტი ინფორმაციისთვის სცადეთ '%s --help'\n"
++
++#: tools/setfacl.c:147
++#, c-format
++msgid "%s: %s: No filename found in line %d, aborting\n"
++msgstr "%s: %s: ხაზზე %d ფაილის სახელი არ არსებობს, მუშაობის დასასრული\n"
++
++#: tools/setfacl.c:152
++#, c-format
++msgid "%s: No filename found in line %d of standard input, aborting\n"
++msgstr "%s: ფაილის სახელი სტანდარტული შეტანის %d-ე ხაზზე მითითებული არაა. მუშაობის დასასრული\n"
++
++#: tools/setfacl.c:173
++#, c-format
++msgid "%s: %s: %s in line %d\n"
++msgstr "%s: %s: %s ხაზში %d\n"
++
++#: tools/setfacl.c:205
++#, c-format
++msgid "%s: %s: Cannot change owner/group: %s\n"
++msgstr "%s: %s: მბლობელის/ჯგუფის შეცვლის შეცდომა: %s\n"
++
++#: tools/setfacl.c:224
++#, c-format
++msgid "%s: %s: Cannot change mode: %s\n"
++msgstr "%s: %s: რეჟიმის შეცვლის შეცდომა: %s\n"
++
++#: tools/setfacl.c:266
++#, c-format
++msgid "%s %s -- set file access control lists\n"
++msgstr "%s %s -- ფაილის წვდომის კონტრლის სიის დაყენება\n"
++
++#: tools/setfacl.c:268 tools/setfacl.c:653
++#, c-format
++msgid "Usage: %s %s\n"
++msgstr "გამოყენება: %s %s\n"
++
++#: tools/setfacl.c:271
++#, c-format
++msgid ""
++"  -m, --modify=acl        modify the current ACL(s) of file(s)\n"
++"  -M, --modify-file=file  read ACL entries to modify from file\n"
++"  -x, --remove=acl        remove entries from the ACL(s) of file(s)\n"
++"  -X, --remove-file=file  read ACL entries to remove from file\n"
++"  -b, --remove-all        remove all extended ACL entries\n"
++"  -k, --remove-default    remove the default ACL\n"
++msgstr ""
++"  -m, --modify=acl        ფაილებზე მიმდინარე ACL-ების შეცვლა\n"
++"  -M, --modify-file=ფაილი  შესაცვლელი ACL-ების ფაილიდან წაკითხვა\n"
++"  -x, --remove=acl        ფაილებიდან ACL-ის ჩანაწერების მოცილება\n"
++"  -X, --remove-file=ფაილი  წასაშლელი ACL ჩანაწერების ფაილიდან წაკითხვა\n"
++"  -b, --remove-all        ყველა გაფართოებული ACL ჩანაწერის წაშლა\n"
++"  -k, --remove-default    ნაგულისხმები ACL-ის წაშლა\n"
++
++#: tools/setfacl.c:280
++#, c-format
++msgid ""
++"      --set=acl           set the ACL of file(s), replacing the current ACL\n"
++"      --set-file=file     read ACL entries to set from file\n"
++"      --mask              do recalculate the effective rights mask\n"
++msgstr ""
++"      --set=acl           ფაილებზე ACL-ის დაყენება, არსებულის ჩანაცვლებით\n"
++"      --set-file=ფაილი    დასაყენებელი ACL ჩანაწერების ფაილიდან წაკითხვა\n"
++"      --mask              ეფექტური უფლებების ნიღბის გადათვლა\n"
++
++#: tools/setfacl.c:286
++#, c-format
++msgid ""
++"  -n, --no-mask           don't recalculate the effective rights mask\n"
++"  -d, --default           operations apply to the default ACL\n"
++msgstr ""
++"  -n, --no-mask           ეფექტური უფლებების ნიღაბი არ გადაითვლება\n"
++"  -d, --default           ოპერაცია მხოლოდ ნაგულისხმებ ACL-ზე ჩატარდება\n"
++
++#: tools/setfacl.c:291
++#, c-format
++msgid ""
++"  -R, --recursive         recurse into subdirectories\n"
++"  -L, --logical           logical walk, follow symbolic links\n"
++"  -P, --physical          physical walk, do not follow symbolic links\n"
++"      --restore=file      restore ACLs (inverse of `getfacl -R')\n"
++"      --test              test mode (ACLs are not modified)\n"
++msgstr ""
++"  -R, --recursive         რეკურსია ქვესაქაღალდეებში\n"
++"  -L, --logical           ლოგიკური სიარული, სიმბმულების მიყოლა\n"
++"  -P, --physical          ფიზიკური სიარული. სიმბმულები მიყოლილი არ იქნება\n"
++"      --restore=file      ACL-ების ფაილიდან აღდგენა (`getfacl -R' -ის საპირისპირო)\n"
++"      --test              სატესტო რეჟიმი (ACL-ები არ შეიცვლება)\n"
++
++#: tools/setfacl.c:452
++#, c-format
++msgid "%s: Option -%c incomplete\n"
++msgstr "%s: პარამეტრი -%c დაუსრულებელია\n"
++
++#: tools/setfacl.c:457
++#, c-format
++msgid "%s: Option -%c: %s near character %d\n"
++msgstr "%s: პარამეტრი -%c: %s სიმბოლოსთან %d\n"
++
++#: tools/setfacl.c:533
++#, c-format
++msgid "%s: %s in line %d of file %s\n"
++msgstr "%s: %s ხაზზე %d ფაილში %s\n"
++
++#: tools/setfacl.c:541
++#, c-format
++msgid "%s: %s in line %d of standard input\n"
++msgstr "%s: %s ხაზზე %d სტანდარტული შემოტანიდან\n"
+diff -urN acl-2.3.1/po/LINGUAS acl-2.3.1-patched/po/LINGUAS
+--- acl-2.3.1/po/LINGUAS	2018-02-28 10:20:39.000000000 +0100
++++ acl-2.3.1-patched/po/LINGUAS	2023-09-07 18:03:09.644334456 +0200
+@@ -1,3 +1,3 @@
+-de es fr gl pl sv
++de es fr gl ka pl sv
+ en@boldquot
+ en@quot
diff --git a/acl.spec b/acl.spec
index 6675a05..703611c 100644
--- a/acl.spec
+++ b/acl.spec
@@ -4,7 +4,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.3.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -21,6 +21,7 @@ Source2: agruen-key.gpg
 
 # avoid permission denied problem with LD_PRELOAD in the test-suite
 Patch1: 0001-acl-2.2.53-test-runwrapper.patch
+Patch2: 0002-add-georgian.patch
 
 License: GPL-2.0-or-later
 URL: https://savannah.nongnu.org/projects/acl
@@ -60,6 +61,9 @@ defined in POSIX 1003.1e draft standard 17.
 # sed -i 's/-O2/-O0/' libtool include/builddefs
 # unset CFLAGS
 
+# TODO: Remove when updating to a new upstream release
+%make_build -C po ka.gmo
+
 %make_build
 
 %check
@@ -127,6 +131,10 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Mon Sep 11 2023 Temuri Doghonadze <temuri.doghonadze@gmail.com> - 2.3.1-9
+- Backport Georgian locale from git
+- Note, it will not be needed after release of new version of acl
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 07b51b662ef9357c2a7f1868a5f08fb648cd86a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Fri, 6 Oct 2023 14:28:50 +0200
Subject: [PATCH 87/96] preserve failed setfacl return code

... and make the license tag more precise.
---
 ...2.3.1-setfacl-preserve-failed-status.patch | 60 +++++++++++++++++++
 acl.spec                                      | 14 ++++-
 2 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 0003-acl-2.3.1-setfacl-preserve-failed-status.patch

diff --git a/0003-acl-2.3.1-setfacl-preserve-failed-status.patch b/0003-acl-2.3.1-setfacl-preserve-failed-status.patch
new file mode 100644
index 0000000..01fa307
--- /dev/null
+++ b/0003-acl-2.3.1-setfacl-preserve-failed-status.patch
@@ -0,0 +1,60 @@
+From 7ce89c695e76ec41fcebd83f8b728f63b0361a2d Mon Sep 17 00:00:00 2001
+From: Renaud Metrich <rmetrich@redhat.com>
+Date: Thu, 5 Oct 2023 11:17:51 +0200
+Subject: [PATCH] setfacl: preserve the failed status when processing multiple
+ files
+
+Resolves the following bug:
+```
+$ mkdir FOO
+$ setfacl -m d:g:user:rwX -m g:user:rwX ./FOO/bar ./FOO
+setfacl: ./FOO/bar: No such file or directory
+$ echo $?
+0
+```
+
+(Cleanup added while applying.)
+
+Upstream-commit: 7ce89c695e76ec41fcebd83f8b728f63b0361a2d
+---
+ tools/setfacl.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/tools/setfacl.c b/tools/setfacl.c
+index fd0bf2e..4140276 100644
+--- a/tools/setfacl.c
++++ b/tools/setfacl.c
+@@ -332,7 +332,7 @@ int main(int argc, char *argv[])
+ {
+ 	int opt;
+ 	int saw_files = 0;
+-	int status = 0;
++	int status = 0, status2;
+ 	FILE *file;
+ 	int which;
+ 	int lineno;
+@@ -555,7 +555,9 @@ int main(int argc, char *argv[])
+ 					goto synopsis;
+ 				saw_files = 1;
+ 
+-				status = next_file(optarg, seq);
++				status2 = next_file(optarg, seq);
++				if (status == 0)
++					status = status2;
+ 				break;
+ 
+ 			case 'B':  /* restore ACL backup */
+@@ -642,7 +644,9 @@ int main(int argc, char *argv[])
+ 			goto synopsis;
+ 		saw_files = 1;
+ 
+-		status = next_file(argv[optind++], seq);
++		status2 = next_file(argv[optind++], seq);
++		if (status == 0)
++			status = status2;
+ 	}
+ 	if (!saw_files)
+ 		goto synopsis;
+-- 
+2.41.0
+
diff --git a/acl.spec b/acl.spec
index 703611c..9928575 100644
--- a/acl.spec
+++ b/acl.spec
@@ -4,7 +4,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.3.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -21,9 +21,15 @@ Source2: agruen-key.gpg
 
 # avoid permission denied problem with LD_PRELOAD in the test-suite
 Patch1: 0001-acl-2.2.53-test-runwrapper.patch
+
+# add georgian translation
 Patch2: 0002-add-georgian.patch
 
-License: GPL-2.0-or-later
+# preserve failed setfacl return code (RHEL-3909)
+# https://git.savannah.nongnu.org/cgit/acl.git/commit/?id=7ce89c695e76ec41fcebd83f8b728f63b0361a2d
+Patch3: 0003-acl-2.3.1-setfacl-preserve-failed-status.patch
+
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
 URL: https://savannah.nongnu.org/projects/acl
 
 %description
@@ -131,6 +137,10 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Fri Oct 06 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.3.1-10
+- preserve failed setfacl return code (RHEL-3909)
+- make the license tag more precise
+
 * Mon Sep 11 2023 Temuri Doghonadze <temuri.doghonadze@gmail.com> - 2.3.1-9
 - Backport Georgian locale from git
 - Note, it will not be needed after release of new version of acl

From 9c90b66b09ab785a107149ee88fcf75935b799a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Fri, 1 Dec 2023 16:11:18 +0100
Subject: [PATCH 88/96] make acl compatible with -D_FORTIFY_SOURCE=3

Resolves: rhbz#2249839
---
 ...are-s_str-directly-in-string_obj_tag.patch | 81 +++++++++++++++++++
 acl.spec                                      | 12 ++-
 2 files changed, 89 insertions(+), 4 deletions(-)
 create mode 100644 0004-acl-2.3.1-libobj-declare-s_str-directly-in-string_obj_tag.patch

diff --git a/0004-acl-2.3.1-libobj-declare-s_str-directly-in-string_obj_tag.patch b/0004-acl-2.3.1-libobj-declare-s_str-directly-in-string_obj_tag.patch
new file mode 100644
index 0000000..74bc52e
--- /dev/null
+++ b/0004-acl-2.3.1-libobj-declare-s_str-directly-in-string_obj_tag.patch
@@ -0,0 +1,81 @@
+From 6f9b9246ee91eaf09c3774ff95950624ef818476 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
+Date: Tue, 31 Oct 2023 10:02:52 +0100
+Subject: libobj: declare s_str directly in string_obj_tag
+
+... to make libacl compatible with -D_FORTIFY_SOURCE=3.  Otherwise, any call
+to __acl_to_any_text would terminate the given process because the
+fortification has a limited support for zero-length arrays nested in structs,
+as noted in the linked GCC Bugzilla.  GCC devs suggested that this should be
+fixed in libacl rather than in GCC itself.
+
+Related: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104964#c15
+Resolves: https://savannah.nongnu.org/bugs/index.php?62519
+---
+ libacl/__acl_to_any_text.c | 10 +++++-----
+ libacl/libobj.h            |  7 +------
+ 2 files changed, 6 insertions(+), 11 deletions(-)
+
+diff --git a/libacl/__acl_to_any_text.c b/libacl/__acl_to_any_text.c
+index f2b8088..bfad12d 100644
+--- a/libacl/__acl_to_any_text.c
++++ b/libacl/__acl_to_any_text.c
+@@ -64,7 +64,7 @@ __acl_to_any_text(acl_t acl, ssize_t *len_p, const char *prefix,
+ 	FOREACH_ACL_ENTRY(entry_obj_p, acl_obj_p) {
+ 	repeat:
+ 		entry_len = acl_entry_to_any_str(int2ext(entry_obj_p),
+-		                                 string_obj_p->sstr + len,
++		                                 string_obj_p->s_str + len,
+ 						 size-len,
+ 						 int2ext(mask_obj_p),
+ 						 prefix,
+@@ -81,20 +81,20 @@ __acl_to_any_text(acl_t acl, ssize_t *len_p, const char *prefix,
+ 			goto repeat;
+ 		} else
+ 			len += entry_len;
+-		string_obj_p->sstr[len] = separator;
++		string_obj_p->s_str[len] = separator;
+ 		len++;
+ 	}
+ 	if (len)
+ 		len--;
+ 	if (len && suffix) {
+-		strcpy(string_obj_p->sstr + len, suffix);
++		strcpy(string_obj_p->s_str + len, suffix);
+ 		len += suffix_len;
+ 	} else
+-		string_obj_p->sstr[len] = '\0';
++		string_obj_p->s_str[len] = '\0';
+ 
+ 	if (len_p)
+ 		*len_p = len;
+-	return (char *)int2ext(string_obj_p);
++	return string_obj_p ? string_obj_p->s_str : NULL;
+ 
+ fail:
+ 	free_obj_p(string_obj_p);
+diff --git a/libacl/libobj.h b/libacl/libobj.h
+index c41d5f9..84929cf 100644
+--- a/libacl/libobj.h
++++ b/libacl/libobj.h
+@@ -76,16 +76,11 @@ struct string_obj_tag;
+ typedef struct string_obj_tag string_obj;
+ 
+ /* string object */
+-struct __string_ext {
+-	char			s_str[0];
+-};
+ struct string_obj_tag {
+ 	obj_prefix		o_prefix;
+-	struct __string_ext	i;
++	char			s_str[0];
+ };
+ 
+-#define sstr i.s_str
+-
+ /* object creation, destruction, conversion and validation */
+ void *__new_var_obj_p(int magic, size_t size) hidden;
+ void __new_obj_p_here(int magic, void *here) hidden;
+-- 
+cgit v1.1
+
diff --git a/acl.spec b/acl.spec
index 9928575..0a9b6e4 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,10 +1,7 @@
-# https://savannah.nongnu.org/bugs/index.php?62519
-%define _fortify_level 2
-
 Summary: Access control list utilities
 Name: acl
 Version: 2.3.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -29,6 +26,10 @@ Patch2: 0002-add-georgian.patch
 # https://git.savannah.nongnu.org/cgit/acl.git/commit/?id=7ce89c695e76ec41fcebd83f8b728f63b0361a2d
 Patch3: 0003-acl-2.3.1-setfacl-preserve-failed-status.patch
 
+# make acl compatible with -D_FORTIFY_SOURCE=3 (rhbz#2249839)
+# https://git.savannah.nongnu.org/cgit/acl.git/commit/?id=6f9b9246ee91eaf09c3774ff95950624ef818476
+Patch4: 0004-acl-2.3.1-libobj-declare-s_str-directly-in-string_obj_tag.patch
+
 License: GPL-2.0-or-later AND LGPL-2.1-or-later
 URL: https://savannah.nongnu.org/projects/acl
 
@@ -137,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Fri Dec 01 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.3.1-11
+- make acl compatible with -D_FORTIFY_SOURCE=3 (rhbz#2249839)
+
 * Fri Oct 06 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.3.1-10
 - preserve failed setfacl return code (RHEL-3909)
 - make the license tag more precise

From 778fe80829e186ce0b9cb5abb46668864534dbf7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 12:05:54 +0000
Subject: [PATCH 89/96] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 0a9b6e4..0d298a0 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.3.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Dec 01 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.3.1-11
 - make acl compatible with -D_FORTIFY_SOURCE=3 (rhbz#2249839)
 

From 2c6dd59067601af77db7b00759aaf5441454e1ae Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 22 Jan 2024 22:36:54 +0000
Subject: [PATCH 90/96] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 0d298a0..8f9fdc9 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.3.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 005975c99cc5df1536242ab3245f767072670074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Wed, 24 Jan 2024 10:18:15 +0100
Subject: [PATCH 91/96] rebase to latest version

Resolves: rhbz#2260000
---
 0002-add-georgian.patch                       | 353 ---------
 ...2.3.1-setfacl-preserve-failed-status.patch |  60 --
 ...are-s_str-directly-in-string_obj_tag.patch |  81 --
 acl.spec                                      |  25 +-
 sources                                       |   4 +-
 vapier-key.gpg                                | 724 ++++++++++++++++++
 6 files changed, 734 insertions(+), 513 deletions(-)
 delete mode 100644 0002-add-georgian.patch
 delete mode 100644 0003-acl-2.3.1-setfacl-preserve-failed-status.patch
 delete mode 100644 0004-acl-2.3.1-libobj-declare-s_str-directly-in-string_obj_tag.patch
 create mode 100644 vapier-key.gpg

diff --git a/0002-add-georgian.patch b/0002-add-georgian.patch
deleted file mode 100644
index 79873df..0000000
--- a/0002-add-georgian.patch
+++ /dev/null
@@ -1,353 +0,0 @@
-diff -urN acl-2.3.1/po/ka.po acl-2.3.1-patched/po/ka.po
---- acl-2.3.1/po/ka.po	1970-01-01 01:00:00.000000000 +0100
-+++ acl-2.3.1-patched/po/ka.po	2023-09-07 18:01:29.938584080 +0200
-@@ -0,0 +1,341 @@
-+# Georgian translation of ACL package.
-+# Copyright (C) 2022 Silicon Graphics, Inc.
-+# This file is distributed under the same license as the acl package.
-+# Temuri Doghonadze <temuri.doghonadze@gmail.com>, 2022.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: acl 2.3.1\n"
-+"Report-Msgid-Bugs-To: acl-devel@nongnu.org\n"
-+"POT-Creation-Date: 2022-09-24 14:25+0200\n"
-+"PO-Revision-Date: 2022-09-24 15:11+0200\n"
-+"Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
-+"Language-Team: Georgian <(nothing)>\n"
-+"Language: ka\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-+"X-Generator: Poedit 3.1.1\n"
-+
-+#: libacl/acl_error.c:33
-+msgid "Multiple entries of same type"
-+msgstr "ერთი და იგივე ტიპის მრავალი ჩანაწერი"
-+
-+#: libacl/acl_error.c:35
-+msgid "Duplicate entries"
-+msgstr "დუბლირებული ჩანაწერები"
-+
-+#: libacl/acl_error.c:37
-+msgid "Missing or wrong entry"
-+msgstr "ნაკლული ან არასწორი ჩანაწერი"
-+
-+#: libacl/acl_error.c:39
-+msgid "Invalid entry type"
-+msgstr "ჩანაწერის არასწორი ტიპი"
-+
-+#: libacl/perm_copy_fd.c:124 libacl/perm_copy_fd.c:136
-+#: libacl/perm_copy_fd.c:198 libacl/perm_copy_file.c:124
-+#: libacl/perm_copy_file.c:139 libacl/perm_copy_file.c:150
-+#: libacl/perm_copy_file.c:235
-+#, c-format
-+msgid "setting permissions for %s"
-+msgstr "%s-ის წვდომების დაყენება"
-+
-+#: libacl/perm_copy_fd.c:186 libacl/perm_copy_file.c:199
-+#: libacl/perm_copy_file.c:224
-+#, c-format
-+msgid "preserving permissions for %s"
-+msgstr "%s-ის წვდომების შენახვა"
-+
-+#: tools/chacl.c:46
-+#, c-format
-+msgid "Usage:\n"
-+msgstr "გამოყენება:\n"
-+
-+#: tools/chacl.c:47
-+#, c-format
-+msgid "\t%s acl pathname...\n"
-+msgstr "\t%s acl ბილიკი...\n"
-+
-+#: tools/chacl.c:48
-+#, c-format
-+msgid "\t%s -b acl dacl pathname...\n"
-+msgstr "\t%s -b acl dacl ბილიკი...\n"
-+
-+#: tools/chacl.c:49
-+#, c-format
-+msgid "\t%s -d dacl pathname...\n"
-+msgstr "\t%s -d dacl ბილიკი...\n"
-+
-+#: tools/chacl.c:50
-+#, c-format
-+msgid "\t%s -R pathname...\n"
-+msgstr "\t%s -R ბილიკი...\n"
-+
-+#: tools/chacl.c:51
-+#, c-format
-+msgid "\t%s -D pathname...\n"
-+msgstr "\t%s -D ბილიკი...\n"
-+
-+#: tools/chacl.c:52
-+#, c-format
-+msgid "\t%s -B pathname...\n"
-+msgstr "\t%s -B ბილიკი...\n"
-+
-+#: tools/chacl.c:53
-+#, c-format
-+msgid "\t%s -l pathname...\t[not IRIX compatible]\n"
-+msgstr "\t%s -l ბილიკი...\t[შეუთავსებელია IRIX-თან]\n"
-+
-+#: tools/chacl.c:55
-+#, c-format
-+msgid "\t%s -r pathname...\t[not IRIX compatible]\n"
-+msgstr "\t%s -r ბილიკი...\t[შეუთავსებელია IRIX -თან]\n"
-+
-+#: tools/chacl.c:146
-+#, c-format
-+msgid "%s: error removing access acl on \"%s\": %s\n"
-+msgstr "%s: \"%s\"-ზე წვდომის ACL-ის წაშლის შეცდომა: %s\n"
-+
-+#: tools/chacl.c:153
-+#, c-format
-+msgid "%s: error removing default acl on \"%s\": %s\n"
-+msgstr "%s: \"%s\"-ზე ნაგულისხმები ACL-ის წაშლის შეცდომა: %s\n"
-+
-+#: tools/chacl.c:172 tools/chacl.c:191
-+#, c-format
-+msgid "%s: access ACL '%s': %s at entry %d\n"
-+msgstr "%s: წვდომის ACL '%s': %s ჩანაწერთან %d\n"
-+
-+#: tools/chacl.c:259
-+#, c-format
-+msgid "%s: cannot get access ACL on '%s': %s\n"
-+msgstr "%s: cannot get access ACL on '%s': %s\n"
-+
-+#: tools/chacl.c:265
-+#, c-format
-+msgid "%s: cannot get default ACL on '%s': %s\n"
-+msgstr "%s: '%s'-ზე ნაგულისხმები ACL-ის მიღების შეცდომა: %s\n"
-+
-+#: tools/chacl.c:271
-+#, c-format
-+msgid "%s: cannot get access ACL text on '%s': %s\n"
-+msgstr "%s: '%s'-ზე წვდომის ACL-ის ტექსტის მიღების შეცდომა: %s\n"
-+
-+#: tools/chacl.c:278
-+#, c-format
-+msgid "%s: cannot get default ACL text on '%s': %s\n"
-+msgstr "%s: '%s'-ზე ნაგულისხმები ACL-ის ტექსტის მიღების შეცდომა: %s\n"
-+
-+#: tools/chacl.c:304
-+#, c-format
-+msgid "%s: cannot set access acl on \"%s\": %s\n"
-+msgstr "%s: \"%s\"-ზე წვდომის ACL-ის დაყენების შეცდომა: %s\n"
-+
-+#: tools/chacl.c:310
-+#, c-format
-+msgid "%s: cannot set default acl on \"%s\": %s\n"
-+msgstr "%s: \"%s\"-ზე ნაგულისხმები ACL-ის დაყენების შეცდომა: %s\n"
-+
-+#: tools/chacl.c:328
-+#, c-format
-+msgid "%s: opendir failed: %s\n"
-+msgstr "%s: opendir -ის შეცდომა: %s\n"
-+
-+#: tools/chacl.c:342
-+#, c-format
-+msgid "%s: malloc failed: %s\n"
-+msgstr "%s: malloc -ის შეცდომა: %s\n"
-+
-+#: tools/do_set.c:410
-+#, c-format
-+msgid "%s: %s: Malformed access ACL `%s': %s at entry %d\n"
-+msgstr "%s: %s: არასწორი წვდომის ACL `%s': %s ჩანაწერთან %d\n"
-+
-+#: tools/do_set.c:437
-+#, c-format
-+msgid "%s: %s: Malformed default ACL `%s': %s at entry %d\n"
-+msgstr "%s: %s: არასწორი ნაგულისხმები ACL `%s': %s ჩანაწერთან %d\n"
-+
-+#: tools/do_set.c:508
-+#, c-format
-+msgid "%s: %s: Only directories can have default ACLs\n"
-+msgstr "%s: %s: ნაგულისხმები ACL-ები მხოლოდ საქაღალდეებს შეიძლება, ჰქონდეთ\n"
-+
-+#: tools/getfacl.c:498
-+#, c-format
-+msgid "%s: Removing leading '/' from absolute path names\n"
-+msgstr "%s: აბსოლუტური ბილიკის შემცველი სახელების წინ დაატებული \"/\"-ის მოცილება\n"
-+
-+#: tools/getfacl.c:569
-+#, c-format
-+msgid "%s %s -- get file access control lists\n"
-+msgstr "%s %s -- ფაილის წვდომის კონტროლის სიების მიღება\n"
-+
-+#: tools/getfacl.c:571 tools/getfacl.c:756
-+#, c-format
-+msgid "Usage: %s [-%s] file ...\n"
-+msgstr "გამოყენება: %s [-%s] ფაილი ...\n"
-+
-+#: tools/getfacl.c:577
-+#, c-format
-+msgid "  -d, --default           display the default access control list\n"
-+msgstr "  -d, --default           ნაგულისხმები წვდომის კონტროლის სიის ჩვენება\n"
-+
-+#: tools/getfacl.c:581
-+#, c-format
-+msgid ""
-+"  -a, --access            display the file access control list only\n"
-+"  -d, --default           display the default access control list only\n"
-+"  -c, --omit-header       do not display the comment header\n"
-+"  -e, --all-effective     print all effective rights\n"
-+"  -E, --no-effective      print no effective rights\n"
-+"  -s, --skip-base         skip files that only have the base entries\n"
-+"  -R, --recursive         recurse into subdirectories\n"
-+"  -L, --logical           logical walk, follow symbolic links\n"
-+"  -P, --physical          physical walk, do not follow symbolic links\n"
-+"  -t, --tabular           use tabular output format\n"
-+"  -n, --numeric           print numeric user/group identifiers\n"
-+"      --one-file-system   skip files on different filesystems\n"
-+"  -p, --absolute-names    don't strip leading '/' in pathnames\n"
-+msgstr ""
-+"  -a, --access            მხოლოდ ფაილის წვდომის კონტროლის სიის ჩვენება\n"
-+"  -d, --default           მხოლოდ ნაგულისხმები კონტროლის სიის ჩვენება\n"
-+"  -c, --omit-header       კომენტარის თავსართი ნაჩვენები არ იქნება\n"
-+"  -e, --all-effective     ყველა მოქმედი წვდომის ჩვენება\n"
-+"  -E, --no-effective      არაფექტური წვდომების ჩვენება\n"
-+"  -s, --skip-base         ფაილების გამოტოვება, რომლებსაც მხოლოდ საბაზისო ჩანაწერები გააჩნიათ\n"
-+"  -R, --recursive         რეკურსია ქვესაქაღალდეებში\n"
-+"  -L, --logical           ლოგიკური სიარული, სიმბმულების მიყოლა\n"
-+"  -P, --physical          ფიზიკური სიარული, სიმბმულები მიყოლილი არ იქნება\n"
-+"  -t, --tabular           ტაბულაციით გამოყოფილი გამოტანა\n"
-+"  -n, --numeric           მომხმარებლის/ჯგუფის რიცხვობრივი იდენტიფიკატორების ჩვენება\n"
-+"      --one-file-system   სხვა ფაილურ სისტემაზე მყოფი ფაილების გამოტოვება\n"
-+"  -p, --absolute-names    ბილიკებს საწყისი '/' არ მოსცილდება\n"
-+
-+#: tools/getfacl.c:597 tools/setfacl.c:299
-+#, c-format
-+msgid ""
-+"  -v, --version           print version and exit\n"
-+"  -h, --help              this help text\n"
-+msgstr ""
-+" -h, --help           ამ დახმარების გამოტანა და გამოსვლა\n"
-+" -v, --version      ვერსიის გამოტანა და გამოსვლა\n"
-+
-+#: tools/getfacl.c:743 tools/setfacl.c:316
-+#, c-format
-+msgid "%s: Standard input: %s\n"
-+msgstr "%s: სტანდარტული შეტანა: %s\n"
-+
-+#: tools/getfacl.c:758 tools/setfacl.c:655
-+#, c-format
-+msgid "Try `%s --help' for more information.\n"
-+msgstr "მეტი ინფორმაციისთვის სცადეთ '%s --help'\n"
-+
-+#: tools/setfacl.c:147
-+#, c-format
-+msgid "%s: %s: No filename found in line %d, aborting\n"
-+msgstr "%s: %s: ხაზზე %d ფაილის სახელი არ არსებობს, მუშაობის დასასრული\n"
-+
-+#: tools/setfacl.c:152
-+#, c-format
-+msgid "%s: No filename found in line %d of standard input, aborting\n"
-+msgstr "%s: ფაილის სახელი სტანდარტული შეტანის %d-ე ხაზზე მითითებული არაა. მუშაობის დასასრული\n"
-+
-+#: tools/setfacl.c:173
-+#, c-format
-+msgid "%s: %s: %s in line %d\n"
-+msgstr "%s: %s: %s ხაზში %d\n"
-+
-+#: tools/setfacl.c:205
-+#, c-format
-+msgid "%s: %s: Cannot change owner/group: %s\n"
-+msgstr "%s: %s: მბლობელის/ჯგუფის შეცვლის შეცდომა: %s\n"
-+
-+#: tools/setfacl.c:224
-+#, c-format
-+msgid "%s: %s: Cannot change mode: %s\n"
-+msgstr "%s: %s: რეჟიმის შეცვლის შეცდომა: %s\n"
-+
-+#: tools/setfacl.c:266
-+#, c-format
-+msgid "%s %s -- set file access control lists\n"
-+msgstr "%s %s -- ფაილის წვდომის კონტრლის სიის დაყენება\n"
-+
-+#: tools/setfacl.c:268 tools/setfacl.c:653
-+#, c-format
-+msgid "Usage: %s %s\n"
-+msgstr "გამოყენება: %s %s\n"
-+
-+#: tools/setfacl.c:271
-+#, c-format
-+msgid ""
-+"  -m, --modify=acl        modify the current ACL(s) of file(s)\n"
-+"  -M, --modify-file=file  read ACL entries to modify from file\n"
-+"  -x, --remove=acl        remove entries from the ACL(s) of file(s)\n"
-+"  -X, --remove-file=file  read ACL entries to remove from file\n"
-+"  -b, --remove-all        remove all extended ACL entries\n"
-+"  -k, --remove-default    remove the default ACL\n"
-+msgstr ""
-+"  -m, --modify=acl        ფაილებზე მიმდინარე ACL-ების შეცვლა\n"
-+"  -M, --modify-file=ფაილი  შესაცვლელი ACL-ების ფაილიდან წაკითხვა\n"
-+"  -x, --remove=acl        ფაილებიდან ACL-ის ჩანაწერების მოცილება\n"
-+"  -X, --remove-file=ფაილი  წასაშლელი ACL ჩანაწერების ფაილიდან წაკითხვა\n"
-+"  -b, --remove-all        ყველა გაფართოებული ACL ჩანაწერის წაშლა\n"
-+"  -k, --remove-default    ნაგულისხმები ACL-ის წაშლა\n"
-+
-+#: tools/setfacl.c:280
-+#, c-format
-+msgid ""
-+"      --set=acl           set the ACL of file(s), replacing the current ACL\n"
-+"      --set-file=file     read ACL entries to set from file\n"
-+"      --mask              do recalculate the effective rights mask\n"
-+msgstr ""
-+"      --set=acl           ფაილებზე ACL-ის დაყენება, არსებულის ჩანაცვლებით\n"
-+"      --set-file=ფაილი    დასაყენებელი ACL ჩანაწერების ფაილიდან წაკითხვა\n"
-+"      --mask              ეფექტური უფლებების ნიღბის გადათვლა\n"
-+
-+#: tools/setfacl.c:286
-+#, c-format
-+msgid ""
-+"  -n, --no-mask           don't recalculate the effective rights mask\n"
-+"  -d, --default           operations apply to the default ACL\n"
-+msgstr ""
-+"  -n, --no-mask           ეფექტური უფლებების ნიღაბი არ გადაითვლება\n"
-+"  -d, --default           ოპერაცია მხოლოდ ნაგულისხმებ ACL-ზე ჩატარდება\n"
-+
-+#: tools/setfacl.c:291
-+#, c-format
-+msgid ""
-+"  -R, --recursive         recurse into subdirectories\n"
-+"  -L, --logical           logical walk, follow symbolic links\n"
-+"  -P, --physical          physical walk, do not follow symbolic links\n"
-+"      --restore=file      restore ACLs (inverse of `getfacl -R')\n"
-+"      --test              test mode (ACLs are not modified)\n"
-+msgstr ""
-+"  -R, --recursive         რეკურსია ქვესაქაღალდეებში\n"
-+"  -L, --logical           ლოგიკური სიარული, სიმბმულების მიყოლა\n"
-+"  -P, --physical          ფიზიკური სიარული. სიმბმულები მიყოლილი არ იქნება\n"
-+"      --restore=file      ACL-ების ფაილიდან აღდგენა (`getfacl -R' -ის საპირისპირო)\n"
-+"      --test              სატესტო რეჟიმი (ACL-ები არ შეიცვლება)\n"
-+
-+#: tools/setfacl.c:452
-+#, c-format
-+msgid "%s: Option -%c incomplete\n"
-+msgstr "%s: პარამეტრი -%c დაუსრულებელია\n"
-+
-+#: tools/setfacl.c:457
-+#, c-format
-+msgid "%s: Option -%c: %s near character %d\n"
-+msgstr "%s: პარამეტრი -%c: %s სიმბოლოსთან %d\n"
-+
-+#: tools/setfacl.c:533
-+#, c-format
-+msgid "%s: %s in line %d of file %s\n"
-+msgstr "%s: %s ხაზზე %d ფაილში %s\n"
-+
-+#: tools/setfacl.c:541
-+#, c-format
-+msgid "%s: %s in line %d of standard input\n"
-+msgstr "%s: %s ხაზზე %d სტანდარტული შემოტანიდან\n"
-diff -urN acl-2.3.1/po/LINGUAS acl-2.3.1-patched/po/LINGUAS
---- acl-2.3.1/po/LINGUAS	2018-02-28 10:20:39.000000000 +0100
-+++ acl-2.3.1-patched/po/LINGUAS	2023-09-07 18:03:09.644334456 +0200
-@@ -1,3 +1,3 @@
--de es fr gl pl sv
-+de es fr gl ka pl sv
- en@boldquot
- en@quot
diff --git a/0003-acl-2.3.1-setfacl-preserve-failed-status.patch b/0003-acl-2.3.1-setfacl-preserve-failed-status.patch
deleted file mode 100644
index 01fa307..0000000
--- a/0003-acl-2.3.1-setfacl-preserve-failed-status.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 7ce89c695e76ec41fcebd83f8b728f63b0361a2d Mon Sep 17 00:00:00 2001
-From: Renaud Metrich <rmetrich@redhat.com>
-Date: Thu, 5 Oct 2023 11:17:51 +0200
-Subject: [PATCH] setfacl: preserve the failed status when processing multiple
- files
-
-Resolves the following bug:
-```
-$ mkdir FOO
-$ setfacl -m d:g:user:rwX -m g:user:rwX ./FOO/bar ./FOO
-setfacl: ./FOO/bar: No such file or directory
-$ echo $?
-0
-```
-
-(Cleanup added while applying.)
-
-Upstream-commit: 7ce89c695e76ec41fcebd83f8b728f63b0361a2d
----
- tools/setfacl.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/tools/setfacl.c b/tools/setfacl.c
-index fd0bf2e..4140276 100644
---- a/tools/setfacl.c
-+++ b/tools/setfacl.c
-@@ -332,7 +332,7 @@ int main(int argc, char *argv[])
- {
- 	int opt;
- 	int saw_files = 0;
--	int status = 0;
-+	int status = 0, status2;
- 	FILE *file;
- 	int which;
- 	int lineno;
-@@ -555,7 +555,9 @@ int main(int argc, char *argv[])
- 					goto synopsis;
- 				saw_files = 1;
- 
--				status = next_file(optarg, seq);
-+				status2 = next_file(optarg, seq);
-+				if (status == 0)
-+					status = status2;
- 				break;
- 
- 			case 'B':  /* restore ACL backup */
-@@ -642,7 +644,9 @@ int main(int argc, char *argv[])
- 			goto synopsis;
- 		saw_files = 1;
- 
--		status = next_file(argv[optind++], seq);
-+		status2 = next_file(argv[optind++], seq);
-+		if (status == 0)
-+			status = status2;
- 	}
- 	if (!saw_files)
- 		goto synopsis;
--- 
-2.41.0
-
diff --git a/0004-acl-2.3.1-libobj-declare-s_str-directly-in-string_obj_tag.patch b/0004-acl-2.3.1-libobj-declare-s_str-directly-in-string_obj_tag.patch
deleted file mode 100644
index 74bc52e..0000000
--- a/0004-acl-2.3.1-libobj-declare-s_str-directly-in-string_obj_tag.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 6f9b9246ee91eaf09c3774ff95950624ef818476 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
-Date: Tue, 31 Oct 2023 10:02:52 +0100
-Subject: libobj: declare s_str directly in string_obj_tag
-
-... to make libacl compatible with -D_FORTIFY_SOURCE=3.  Otherwise, any call
-to __acl_to_any_text would terminate the given process because the
-fortification has a limited support for zero-length arrays nested in structs,
-as noted in the linked GCC Bugzilla.  GCC devs suggested that this should be
-fixed in libacl rather than in GCC itself.
-
-Related: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104964#c15
-Resolves: https://savannah.nongnu.org/bugs/index.php?62519
----
- libacl/__acl_to_any_text.c | 10 +++++-----
- libacl/libobj.h            |  7 +------
- 2 files changed, 6 insertions(+), 11 deletions(-)
-
-diff --git a/libacl/__acl_to_any_text.c b/libacl/__acl_to_any_text.c
-index f2b8088..bfad12d 100644
---- a/libacl/__acl_to_any_text.c
-+++ b/libacl/__acl_to_any_text.c
-@@ -64,7 +64,7 @@ __acl_to_any_text(acl_t acl, ssize_t *len_p, const char *prefix,
- 	FOREACH_ACL_ENTRY(entry_obj_p, acl_obj_p) {
- 	repeat:
- 		entry_len = acl_entry_to_any_str(int2ext(entry_obj_p),
--		                                 string_obj_p->sstr + len,
-+		                                 string_obj_p->s_str + len,
- 						 size-len,
- 						 int2ext(mask_obj_p),
- 						 prefix,
-@@ -81,20 +81,20 @@ __acl_to_any_text(acl_t acl, ssize_t *len_p, const char *prefix,
- 			goto repeat;
- 		} else
- 			len += entry_len;
--		string_obj_p->sstr[len] = separator;
-+		string_obj_p->s_str[len] = separator;
- 		len++;
- 	}
- 	if (len)
- 		len--;
- 	if (len && suffix) {
--		strcpy(string_obj_p->sstr + len, suffix);
-+		strcpy(string_obj_p->s_str + len, suffix);
- 		len += suffix_len;
- 	} else
--		string_obj_p->sstr[len] = '\0';
-+		string_obj_p->s_str[len] = '\0';
- 
- 	if (len_p)
- 		*len_p = len;
--	return (char *)int2ext(string_obj_p);
-+	return string_obj_p ? string_obj_p->s_str : NULL;
- 
- fail:
- 	free_obj_p(string_obj_p);
-diff --git a/libacl/libobj.h b/libacl/libobj.h
-index c41d5f9..84929cf 100644
---- a/libacl/libobj.h
-+++ b/libacl/libobj.h
-@@ -76,16 +76,11 @@ struct string_obj_tag;
- typedef struct string_obj_tag string_obj;
- 
- /* string object */
--struct __string_ext {
--	char			s_str[0];
--};
- struct string_obj_tag {
- 	obj_prefix		o_prefix;
--	struct __string_ext	i;
-+	char			s_str[0];
- };
- 
--#define sstr i.s_str
--
- /* object creation, destruction, conversion and validation */
- void *__new_var_obj_p(int magic, size_t size) hidden;
- void __new_obj_p_here(int magic, void *here) hidden;
--- 
-cgit v1.1
-
diff --git a/acl.spec b/acl.spec
index 8f9fdc9..c8c3e68 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
-Version: 2.3.1
-Release: 13%{?dist}
+Version: 2.3.2
+Release: 1%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -14,22 +14,13 @@ Requires: libacl%{?_isa} = %{version}-%{release}
 Source0: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.tar.gz
 Source1: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.tar.gz.sig
 # Retreived from https://savannah.nongnu.org/people/viewgpg.php?user_id=15000
-Source2: agruen-key.gpg
+# Source2: agruen-key.gpg
+# Retrieved from https://savannah.nongnu.org/people/viewgpg.php?user_id=42032
+Source2: vapier-key.gpg
 
 # avoid permission denied problem with LD_PRELOAD in the test-suite
 Patch1: 0001-acl-2.2.53-test-runwrapper.patch
 
-# add georgian translation
-Patch2: 0002-add-georgian.patch
-
-# preserve failed setfacl return code (RHEL-3909)
-# https://git.savannah.nongnu.org/cgit/acl.git/commit/?id=7ce89c695e76ec41fcebd83f8b728f63b0361a2d
-Patch3: 0003-acl-2.3.1-setfacl-preserve-failed-status.patch
-
-# make acl compatible with -D_FORTIFY_SOURCE=3 (rhbz#2249839)
-# https://git.savannah.nongnu.org/cgit/acl.git/commit/?id=6f9b9246ee91eaf09c3774ff95950624ef818476
-Patch4: 0004-acl-2.3.1-libobj-declare-s_str-directly-in-string_obj_tag.patch
-
 License: GPL-2.0-or-later AND LGPL-2.1-or-later
 URL: https://savannah.nongnu.org/projects/acl
 
@@ -68,9 +59,6 @@ defined in POSIX 1003.1e draft standard 17.
 # sed -i 's/-O2/-O0/' libtool include/builddefs
 # unset CFLAGS
 
-# TODO: Remove when updating to a new upstream release
-%make_build -C po ka.gmo
-
 %make_build
 
 %check
@@ -138,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Wed Jan 24 2024 Lukáš Zaoral <lzaoral@redhat.com> - 2.3.2-1
+- rebase to latest version (rhbz#2260000)
+
 * Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index bcb4fb9..f92416f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acl-2.3.1.tar.gz) = f101e27058c959f4c412f475c3fc77a90d1ead8728701e4ce04ff08b34139d35e0e72278c9ac7622ba6054e81c0aeca066e09491b5f5666462e3866705a0e892
-SHA512 (acl-2.3.1.tar.gz.sig) = 1e1e341637d71a25f1990fb33a773c94d9f75a8f5ba31977367e6b2c22c78b376759385ddebc36edb3776a11c3942cab4ff38853b9fc44f5c406cd2325433b2a
+SHA512 (acl-2.3.2.tar.gz) = 31aeb39958d8af5d08933dd3a89333a41025c3eb49fc461fa3c291caca51dad575ec13faeb7deba9b3c2ebf7615be7d45e2b78e50d4f83d8ec933c95931a7682
+SHA512 (acl-2.3.2.tar.gz.sig) = fcd05951bba9d99bceb6dee409ae9e186808c7106f68f7d8e31959f75e0f5b01e18b87c4c7340cb4c168734b596468c710342a7d8c5e27c9fc55f1fcb57f9625
diff --git a/vapier-key.gpg b/vapier-key.gpg
new file mode 100644
index 0000000..1beefff
--- /dev/null
+++ b/vapier-key.gpg
@@ -0,0 +1,724 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+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
+XkRSpu2IWY1HGR7q3i8hJf2o4Offzthpuc2ezw==
+=BP++
+-----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file

From bd75051d157fc98eb0a02ed3b5998dcdd559a9b6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 16:33:12 +0000
Subject: [PATCH 92/96] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index c8c3e68..da48658 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Wed Jan 24 2024 Lukáš Zaoral <lzaoral@redhat.com> - 2.3.2-1
 - rebase to latest version (rhbz#2260000)
 

From fa7a2a00e93e9de3ac1ecfd1a6178c77b617b744 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 10:31:38 +0000
Subject: [PATCH 93/96] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index da48658..f0e9b28 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From d152ca8f012f2b6734a608c64ae5ec8915aab358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Tue, 24 Jun 2025 10:29:56 +0200
Subject: [PATCH 94/96] tests: remove obsolete STI tests

The test itself still uses RHTS which is no longer supported in the
Testing Farm.
---
 tests/cmd-line-options/Makefile     |  88 ----------------------
 tests/cmd-line-options/PURPOSE      |   5 --
 tests/cmd-line-options/runtest.sh   |  18 -----
 tests/cmd-line-options/test-core.sh | 113 ----------------------------
 tests/tests.yml                     |  13 ----
 5 files changed, 237 deletions(-)
 delete mode 100644 tests/cmd-line-options/Makefile
 delete mode 100644 tests/cmd-line-options/PURPOSE
 delete mode 100755 tests/cmd-line-options/runtest.sh
 delete mode 100755 tests/cmd-line-options/test-core.sh
 delete mode 100644 tests/tests.yml

diff --git a/tests/cmd-line-options/Makefile b/tests/cmd-line-options/Makefile
deleted file mode 100644
index d4136cc..0000000
--- a/tests/cmd-line-options/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright (c) 2006 Red Hat, Inc. All rights reserved. This copyrighted material 
-# is made available to anyone wishing to use, modify, copy, or
-# redistribute it subject to the terms and conditions of the GNU General
-# Public License v.2.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Author: Milos Malik <mmalik@redhat.com>
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
-# Example Makefile for RHTS                                          #
-# This example is geared towards a test for a specific package       #
-# It does most of the work for you, but may require further coding   #
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
-
-# The toplevel namespace within which the test lives.
-# FIXME: You will need to change this:
-TOPLEVEL_NAMESPACE=CoreOS
-
-# The name of the package under test:
-# FIXME: you wil need to change this:
-PACKAGE_NAME=acl
-
-# The path of the test below the package:
-# FIXME: you wil need to change this:
-RELATIVE_PATH=Sanity/cmd-line-options
-
-# Version of the test. Used with make tag.
-export TESTVERSION=1.0
-
-# The combined namespace of the test.
-export TEST=/$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH)
-
-
-# A phony target is one that is not really the name of a file.
-# It is just a name for some commands to be executed when you
-# make an explicit request. There are two reasons to use a
-# phony target: to avoid a conflict with a file of the same
-# name, and to improve performance.
-.PHONY: all install download clean
-
-# executables to be built should be added here, they will be generated on the system under test.
-BUILT_FILES= 
-
-# data files, .c files, scripts anything needed to either compile the test and/or run it.
-FILES=$(METADATA) runtest.sh Makefile PURPOSE test-core.sh
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x ./runtest.sh ./test-core.sh
-
-clean:
-	rm -f *~ *.rpm $(BUILT_FILES)
-
-# You may need to add other targets e.g. to build executables from source code
-# Add them here:
-
-
-# Include Common Makefile
-include /usr/share/rhts/lib/rhts-make.include
-
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
-	@touch $(METADATA)
-# Change to the test owner's name
-	@echo "Owner:        Milos Malik <mmalik@redhat.com>" > $(METADATA)
-	@echo "Name:         $(TEST)" >> $(METADATA)
-	@echo "Path:         $(TEST_DIR)" >> $(METADATA)
-	@echo "TestVersion:  $(TESTVERSION)" >> $(METADATA)
-	@echo "Type:         Sanity" >> $(METADATA)
-	@echo "Description:  utilities are tested if they support basic command line options" >> $(METADATA)
-	@echo "TestTime:     2m" >> $(METADATA)
-	@echo "RunFor:       $(PACKAGE_NAME)" >> $(METADATA)  
-# add any other packages for which your test ought to run here
-	@echo "Requires:     $(PACKAGE_NAME)" >> $(METADATA)  
-# add any other requirements for the script to run here
-	@echo "License:      GPLv2" >> $(METADATA)
-
-# You may need other fields here; see the documentation
-	rhts-lint $(METADATA)
diff --git a/tests/cmd-line-options/PURPOSE b/tests/cmd-line-options/PURPOSE
deleted file mode 100644
index cbf7099..0000000
--- a/tests/cmd-line-options/PURPOSE
+++ /dev/null
@@ -1,5 +0,0 @@
-Test Name: cmd-line-options
-Author: Milos Malik <mmalik@redhat.com>
-Location: /CoreOS/acl/Sanity/cmd-line-options
-Short Description: Utilities are tested if they support basic command line options.
-Safe: yes
diff --git a/tests/cmd-line-options/runtest.sh b/tests/cmd-line-options/runtest.sh
deleted file mode 100755
index a852c11..0000000
--- a/tests/cmd-line-options/runtest.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2006 Red Hat, Inc. All rights reserved. This copyrighted material 
-# is made available to anyone wishing to use, modify, copy, or
-# redistribute it subject to the terms and conditions of the GNU General
-# Public License v.2.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Author: Milos Malik <mmalik@redhat.com>
-
-rhts-run-simple-test $TEST ./test-core.sh
diff --git a/tests/cmd-line-options/test-core.sh b/tests/cmd-line-options/test-core.sh
deleted file mode 100755
index 92d8aed..0000000
--- a/tests/cmd-line-options/test-core.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/sh
-# Description: sanity test for acl package
-# Author: Milos Malik <mmalik@redhat.com>
-
-##### Variable Declaration #####
-VERSION=1.0
-
-# FAIL unless test explicitly passes
-RESULT=FAIL
-
-# Each pass increases SCORE by 1
-SCORE=0
-TOTAL=8
-
-# Set language so we know what results to test for
-set_lang=0
-old_lang=$LANG
-new_lang=en_US.UTF-8
-
-# Which package and which utility do we test?
-PACKAGE=acl
-
-##### Function Declaration #####
-
-log () {
-	printf "\n:: $1 ::\n"
-}
-
-check_exit_code () {
-	echo -e "\t* exit code: $1"
-	if [ $1 $2 $3 ] ; then
-		let "SCORE += 1"
-	fi
-}
-
-##### Begin Test #####
-
-log "[`date +%H:%M:%S`] Begin Test - $TEST-$VERSION"
-
-# Warn if not running as root that test might fail
-e_user=$(whoami)
-if [[ x"${e_user}" != x"root" ]]; then
-        log "Warning, not running as root! This test might fail."
-fi
-
-# Temporarily set LANG to value we can trust results from
-if [[ x"${LANG}" != x"${new_lang}" ]]; then
-        log "Warning, LANG not set to ${new_lang}!"
-        log "Temporarily setting LANG to ${new_lang}, was ${old_lang}"
-
-        set_lang=1
-        export LANG=${new_lang}
-        log "Done, LANG=${new_lang}."
-fi
-
-log "getfacl -h"
-getfacl -h >& /dev/null
-check_exit_code $? -eq 0
-
-log "getfacl --help"
-getfacl --help >& /dev/null
-check_exit_code $? -eq 0
-
-log "getfacl -v"
-getfacl -v >& /dev/null
-check_exit_code $? -eq 0
-
-log "getfacl --version"
-getfacl --version >& /dev/null
-check_exit_code $? -eq 0
-
-log "setfacl -h"
-setfacl -h >& /dev/null
-check_exit_code $? -eq 0
-
-log "setfacl --help"
-setfacl --help >& /dev/null
-check_exit_code $? -eq 0
-
-log "setfacl -v"
-setfacl -v >& /dev/null
-check_exit_code $? -eq 0
-
-log "setfacl --version"
-setfacl --version >& /dev/null
-check_exit_code $? -eq 0
-
-# Reset LANG to original value
-if [[ ${set_lang} == 1 ]]; then
-        log "Resetting LANG to ${old_lang}."
-        export LANG=${old_lang}
-        log "Done, LANG=${old_lang}."
-fi
-
-log "[`date +%H:%M:%S`] End Test - $TEST-$VERSION"
-
-##### Report results #####
-
-log "SCORE: ${SCORE}/${TOTAL}"
-
-if [ ${SCORE} -eq ${TOTAL} ] ; then
-# everything was OK
-        log "RESULT: PASS"
-        printf "\n\n"
-    exit 0
-else
-# something failed
-        log "RESULT: FAIL"
-        printf "\n\n"
-    exit 1
-fi
-
-##### End Test #####
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index d6fb2ff..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-# This first play always runs on the local staging system
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    - container
-    - atomic
-    tests:
-    - cmd-line-options
-    required_packages:
-    - which         # which package required for cmd-line-options

From 91824d85dd3d64316176e1fe9257896c1b42e530 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 16:43:44 +0000
Subject: [PATCH 95/96] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index f0e9b28..3c28661 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.3.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From ffbca1e2b73d60adaa6f54f5d168c02738f5776e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 16 Jan 2026 03:25:08 +0000
Subject: [PATCH 96/96] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

---
 acl.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acl.spec b/acl.spec
index 3c28661..ca33309 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.3.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
 * Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild