Marcus Meissner
5439477a49
- Update to git snapshot dated 21 Sep 2015. - Added: * 0001-Install-the-libraries-to-the-appropriate-directory.patch * 0002-setfacl.1-fix-typo-inclu-de-include.patch * 0003-test-fix-insufficient-quoting-of.patch * 0004-Makefile-rename-configure.in-to-configure.ac.patch * 0005-Bad-markup-in-acl.5-page.patch * 0006-.gitignore-ignore-and-config.h.in.patch * 0007-Use-autoreconf-rather-than-autoconf-to-regenerate-th.patch * 0008-libacl-Make-sure-that-acl_from_text-always-sets-errn.patch * 0009-libacl-fix-SIGSEGV-of-getfacl-e-on-overly-long-group.patch * 0010-punt-debian-rpm-packaging-logic.patch * 0011-move-gettext-logic-into-misc.h.patch * 0012-test-make-running-parallel-out-of-tree-safe.patch * 0013-modernize-build-system.patch * 0014-po-regenerate-files-after-move.patch * 0015-build-drop-aclincludedir-use-pkgincludedir.patch * 0016-build-make-use-of-an-aux-dir-to-stow-away-helper-scr.patch * 0017-build-ship-a-pkgconfig-file-for-libacl.patch * 0018-read_acl_-comments-seq-rename-line-to-lineno.patch * 0019-read_acl_-comments-seq-switch-to-next_line.patch * 0020-telldir-return-value-and-seekdir-second-parameters-a.patch * 0021-mark-libmisc-funcs-as-hidden-so-they-are-not-exporte.patch * 0022-add-__acl_-prefixes-to-internal-symbols.patch * 0023-cp.test-Check-permissions-of-the-right-file.patch * 0024-libacl-acl_set_file-Remove-unnecesary-racy-check.patch * 0025-fix-compilation-with-latest-xattr-git.patch * 0026-getfacl-Fix-memory-leak.patch * 0027-Fix-the-display-block-nesting-in-acl.5.patch * 0028-setfacl-man-page-Minor-wording-improvements.patch OBS-URL: https://build.opensuse.org/request/show/347209 OBS-URL: https://build.opensuse.org/package/show/Base:System/acl?expand=0&rev=43
79 lines
2.4 KiB
Diff
79 lines
2.4 KiB
Diff
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
|
|
|
|
|