./0000775000175000017500000000000012621055761011442 5ustar nielsenrnielsenr./acl-fix-the-order-of-expected-output-of-getfacl.patch0000664000175000017500000001064112511411357023436 0ustar nielsenrnielsenracl: fix the order of expected output of getfacl The result of getfacl is sorted by user id. In Centos or RHEL, bin user id is 1 and daemon user id is 2. But in our image, bin user id is 2 and daemon user id is 1. The patch fixes this issue to make ptest pass. Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Chong Lu --- test/misc.test | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/test/misc.test b/test/misc.test index 6e98053..53ae5b0 100644 --- a/test/misc.test +++ b/test/misc.test @@ -79,8 +79,8 @@ Multiple users $ getfacl --omit-header f > user::rw- - > user:bin:rw- > user:daemon:r-- + > user:bin:rw- > group::r-- > mask::rw- > other::r-- @@ -94,8 +94,8 @@ Multiple groups $ getfacl --omit-header f > user::rw- - > user:bin:rw- > user:daemon:r-- + > user:bin:rw- > group::r-- > group:daemon:r-- > group:users:rw- @@ -111,8 +111,8 @@ Remove one group $ getfacl --omit-header f > user::rw- - > user:bin:rw- > user:daemon:r-- + > user:bin:rw- > group::r-- > group:daemon:r-- > mask::rw- @@ -146,8 +146,8 @@ Default ACL $ getfacl --omit-header d > user::rwx - > user:bin:rwx > user:daemon:rw- + > user:bin:rwx > group::r-x > mask::rwx > other::--- @@ -236,16 +236,16 @@ Add some users and groups $ getfacl --omit-header d/d > user::rwx - > user:bin:rwx #effective:r-x > user:daemon:r-x + > user:bin:rwx #effective:r-x > group::r-x > group:daemon:rwx #effective:r-x > group:users:r-x > mask::r-x > other::--- > default:user::rwx - > default:user:bin:rwx #effective:r-x > default:user:daemon:r-x + > default:user:bin:rwx #effective:r-x > default:group::r-x > default:mask::r-x > default:other::--- @@ -262,16 +262,16 @@ Symlink in directory with default ACL? $ getfacl --omit-header d/l > user::rwx - > user:bin:rwx #effective:r-x > user:daemon:r-x + > user:bin:rwx #effective:r-x > group::r-x > group:daemon:rwx #effective:r-x > group:users:r-x > mask::r-x > other::--- > default:user::rwx - > default:user:bin:rwx #effective:r-x > default:user:daemon:r-x + > default:user:bin:rwx #effective:r-x > default:group::r-x > default:mask::r-x > default:other::--- @@ -287,16 +287,16 @@ Does mask manipulation work? $ getfacl --omit-header d/d > user::rwx - > user:bin:r-x > user:daemon:r-x + > user:bin:r-x > group::r-x > group:daemon:r-x > group:users:r-x > mask::r-x > other::--- > default:user::rwx - > default:user:bin:rwx #effective:r-x > default:user:daemon:r-x + > default:user:bin:rwx #effective:r-x > default:group::r-x > default:mask::r-x > default:other::--- @@ -308,16 +308,16 @@ Does mask manipulation work? $ getfacl --omit-header d/d > user::rwx - > user:bin:r-x > user:daemon:r-x + > user:bin:r-x > group::r-x > group:daemon:r-x > group:users:r-x > mask::r-x > other::--- > default:user::rwx - > default:user:bin:rwx > default:user:daemon:r-x + > default:user:bin:rwx > default:group::r-x > default:mask::rwx > default:other::--- @@ -333,8 +333,8 @@ Remove the default ACL $ getfacl --omit-header d > user::rwx - > user:bin:rwx > user:daemon:rw- + > user:bin:rwx > group::r-x > mask::rwx > other::--- @@ -373,14 +373,14 @@ Now, chmod should change the group_obj entry $ getfacl --omit-header d > user::rwx - > user:bin:r-x > user:daemon:rwx + > user:bin:r-x > group::rwx > mask::rwx > other::r-x > default:user::rwx - > default:user:bin:r-x > default:user:daemon:rwx + > default:user:bin:r-x > default:group::rwx > default:mask::rwx > default:other::r-x @@ -392,14 +392,14 @@ Now, chmod should change the group_obj entry $ getfacl --omit-header d > user::rwx - > user:bin:r-x > user:daemon:rwx #effective:r-x + > user:bin:r-x > group::rwx #effective:r-x > mask::r-x > other::--- > default:user::rwx - > default:user:bin:r-x > default:user:daemon:rwx + > default:user:bin:r-x > default:group::rwx > default:mask::rwx > default:other::r-x @@ -411,14 +411,14 @@ Now, chmod should change the group_obj entry $ getfacl --omit-header d > user::rwx - > user:bin:r-x > user:daemon:rwx #effective:r-x + > user:bin:r-x > group::rwx #effective:r-x > mask::r-x > other::--- > default:user::rwx - > default:user:bin:r-x > default:user:daemon:rwx + > default:user:bin:r-x > default:group::rwx > default:mask::rwx > default:other::r-x -- 1.7.9.5 ./add-missing-configure.ac.patch0000664000175000017500000000344112511411357017220 0ustar nielsenrnielsenrUpstream-Status: Backport [configure.ac is missing from tarball] Signed-off-by: Saul Wold Index: acl-2.2.52/configure.ac =================================================================== --- /dev/null +++ acl-2.2.52/configure.ac @@ -0,0 +1,50 @@ + +# Copyright (C) 2009 Andreas Gruenbacher +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +AC_INIT(include/acl.h) +AC_CONFIG_AUX_DIR([.]) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_HEADER(include/config.h) +AC_PREFIX_DEFAULT(/usr) + +AC_PROG_LIBTOOL + +AC_ARG_ENABLE(shared, +[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],, + enable_shared=yes) +AC_SUBST(enable_shared) + +AC_ARG_ENABLE(gettext, +[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],, + enable_gettext=yes) +AC_SUBST(enable_gettext) + +AC_ARG_ENABLE(lib64, +[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],, + enable_lib64=no) +AC_SUBST(enable_lib64) + +AC_PACKAGE_GLOBALS(acl) +AC_PACKAGE_UTILITIES(acl) +AC_PACKAGE_NEED_ATTR_XATTR_H +AC_PACKAGE_NEED_ATTR_ERROR_H +AC_MULTILIB($enable_lib64) +AC_PACKAGE_NEED_GETXATTR_LIBATTR +AC_MANUAL_FORMAT + +AC_FUNC_GCC_VISIBILITY + +AC_OUTPUT(include/builddefs)