testing/acl
SHA256
3
0
Fork 0
forked from pool/acl
Code Pull Requests Activity

Accepting request 528489 from home:coolo:branches:openSUSE:Factory

Browse Source 
- refresh acl-2.2.52-tests.patch to work with perl 5.26

OBS-URL: https://build.opensuse.org/request/show/528489
OBS-URL: https://build.opensuse.org/package/show/Base:System/acl?expand=0&rev=55
This commit is contained in:
Dirk Mueller 2017-09-25 09:02:36 +00:00 committed by Git OBS Bridge
parent e74230ff4a
commit bda5454aae
2 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
acl-2.2.52-tests.patch
View File

@ -9,11 +9,11 @@ Subject: [PATCH 1/2] make the tests ready for SELinux
test/root/setfacl.test | 2 +- test/root/setfacl.test | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-) 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/test/root/permissions.test b/test/root/permissions.test Index: acl-2.2.52/test/root/permissions.test
index afaf5f0..4880bd2 100644 ===================================================================
--- a/test/root/permissions.test --- acl-2.2.52.orig/test/root/permissions.test
+++ b/test/root/permissions.test +++ acl-2.2.52/test/root/permissions.test
@@ -20,7 +20,7 @@ defined permissions. @@ -19,7 +19,7 @@ defined permissions.
$ cd d $ cd d
$ umask 027 $ umask 027
$ touch f $ touch f
@ -22,7 +22,7 @@ index afaf5f0..4880bd2 100644
> -rw-r----- root root > -rw-r----- root root
@@ -40,7 +40,7 @@ Now, change the ownership of the file to bin:bin and verify that this @@ -39,7 +39,7 @@ Now, change the ownership of the file to
gives user bin write access. gives user bin write access.
$ chown bin:bin f $ chown bin:bin f
@ -31,7 +31,7 @@ index afaf5f0..4880bd2 100644
> -rw-r----- bin bin > -rw-r----- bin bin
$ su bin $ su bin
$ echo bin >> f $ echo bin >> f
@@ -257,12 +257,12 @@ directories if the file has an ACL and only CAP_FOWNER would grant them. @@ -256,12 +256,12 @@ directories if the file has an ACL and o
$ mkdir -m 600 x $ mkdir -m 600 x
$ chown daemon:daemon x $ chown daemon:daemon x
$ echo j > x/j $ echo j > x/j
@ -46,11 +46,11 @@ index afaf5f0..4880bd2 100644
> -rw-r----- root root > -rw-r----- root root
(With the bug this gives: `ls: x/j: Permission denied'.) (With the bug this gives: `ls: x/j: Permission denied'.)
diff --git a/test/root/restore.test b/test/root/restore.test Index: acl-2.2.52/test/root/restore.test
index 6003cd4..5dbf73c 100644 ===================================================================
--- a/test/root/restore.test --- acl-2.2.52.orig/test/root/restore.test
+++ b/test/root/restore.test +++ acl-2.2.52/test/root/restore.test
@@ -17,7 +17,7 @@ Ensure setuid bit is restored when the owner changes @@ -21,7 +21,7 @@ Cry immediately if we are not running as
$ chown bin passwd $ chown bin passwd
$ chmod u+s passwd $ chmod u+s passwd
$ setfacl --restore passwd.acl $ setfacl --restore passwd.acl
@ -59,11 +59,11 @@ index 6003cd4..5dbf73c 100644
> -rwsr-xr-x root root > -rwsr-xr-x root root
$ rm passwd passwd.acl $ rm passwd passwd.acl
diff --git a/test/root/setfacl.test b/test/root/setfacl.test Index: acl-2.2.52/test/root/setfacl.test
index 630e9fb..dd7fe08 100644 ===================================================================
--- a/test/root/setfacl.test --- acl-2.2.52.orig/test/root/setfacl.test
+++ b/test/root/setfacl.test +++ acl-2.2.52/test/root/setfacl.test
@@ -8,7 +8,7 @@ Setfacl utility tests. Run these tests on a filesystem with ACL support. @@ -12,7 +12,7 @@ Cry immediately if we are not running as
$ sg bin $ sg bin
$ umask 027 $ umask 027
$ touch g $ touch g
@ -72,7 +72,16 @@ index 630e9fb..dd7fe08 100644
> -rw-r----- > -rw-r-----
$ setfacl -m m:- g $ setfacl -m m:- g
-- Index: acl-2.2.52/test/run
1.7.1 ===================================================================
--- acl-2.2.52.orig/test/run
+++ acl-2.2.52/test/run
@@ -92,7 +92,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*< ?//) {

5
acl.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Sep 24 08:30:07 UTC 2017 - coolo@suse.com
- refresh acl-2.2.52-tests.patch to work with perl 5.26
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 20 09:25:14 UTC 2017 - dimstar@opensuse.org Sat May 20 09:25:14 UTC 2017 - dimstar@opensuse.org