summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch52
1 files changed, 22 insertions, 30 deletions
diff --git a/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch b/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch
index 0b350be563..f392465b58 100644
--- a/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch
+++ b/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch
@@ -35,61 +35,56 @@ http://git.savannah.gnu.org/cgit/acl.git/commit/?id=e98ce8acf84d12ea67a3ac76bf63
35 35
36Signed-off-by: Kamil Dudka <kdudka@redhat.com> 36Signed-off-by: Kamil Dudka <kdudka@redhat.com>
37Signed-off-by: He Zhe <zhe.he@windriver.com> 37Signed-off-by: He Zhe <zhe.he@windriver.com>
38---
39 test/cp.test | 2 +-
40 test/misc.test | 6 +++---
41 test/sbits-restore.test | 6 +++---
42 3 files changed, 7 insertions(+), 7 deletions(-)
43 38
44diff --git a/test/cp.test b/test/cp.test 39Index: acl-2.2.52/test/cp.test
45index 0867f63..a927195 100644 40===================================================================
46--- a/test/cp.test 41--- acl-2.2.52.orig/test/cp.test
47+++ b/test/cp.test 42+++ acl-2.2.52/test/cp.test
48@@ -9,7 +9,7 @@ The cp utility should only copy ACLs if `-p' is given. 43@@ -9,7 +9,7 @@ The cp utility should only copy ACLs if
49 > -rw-rw-r--+ 44 > -rw-rw-r--+
50 45
51 $ cp f g 46 $ cp f g
52- $ ls -l g | awk -- '{ print $1 }' | sed 's/\.$//g' 47- $ ls -l g | awk -- '{ print $1 }' | sed 's/\.$//g'
53+ $ ls -l g | awk -- '{ print $1 }' | sed 's/\\.$//g' 48+ $ ls -l g | awk -- '{ print $1 }' | sed 's/\\.$//g'
54 > -rw-r--r-- 49 > -rw-r--r--
55 50
56 $ rm g 51 $ rm g
57diff --git a/test/misc.test b/test/misc.test 52Index: acl-2.2.52/test/misc.test
58index 6e98053..29372b7 100644 53===================================================================
59--- a/test/misc.test 54--- acl-2.2.52.orig/test/misc.test
60+++ b/test/misc.test 55+++ acl-2.2.52/test/misc.test
61@@ -254,7 +254,7 @@ Add some users and groups 56@@ -254,7 +254,7 @@ Add some users and groups
62 Symlink in directory with default ACL? 57 Symlink in directory with default ACL?
63 58
64 $ ln -s d d/l 59 $ ln -s d d/l
65- $ ls -dl d/l | awk '{print $1}' | sed 's/\.$//g' 60- $ ls -dl d/l | awk '{print $1}' | sed 's/\.$//g'
66+ $ ls -dl d/l | awk '{print $1}' | sed 's/\\.$//g' 61+ $ ls -dl d/l | awk '{print $1}' | sed 's/\\.$//g'
67 > lrwxrwxrwx 62 > lrwxrwxrwx
68 63
69 $ ls -dl -L d/l | awk '{print $1}' 64 $ ls -dl -L d/l | awk '{print $1}'
70@@ -343,7 +343,7 @@ Remove the default ACL 65@@ -343,7 +343,7 @@ Remove the default ACL
71 Reset to base entries 66 Reset to base entries
72 67
73 $ setfacl -b d 68 $ setfacl -b d
74- $ ls -dl d | awk '{print $1}' | sed 's/\.$//g' 69- $ ls -dl d | awk '{print $1}' | sed 's/\.$//g'
75+ $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g' 70+ $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g'
76 > drwxr-x--- 71 > drwxr-x---
77 72
78 $ getfacl --omit-header d 73 $ getfacl --omit-header d
79@@ -355,7 +355,7 @@ Reset to base entries 74@@ -355,7 +355,7 @@ Reset to base entries
80 Now, chmod should change the group_obj entry 75 Now, chmod should change the group_obj entry
81 76
82 $ chmod 775 d 77 $ chmod 775 d
83- $ ls -dl d | awk '{print $1}' | sed 's/\.$//g' 78- $ ls -dl d | awk '{print $1}' | sed 's/\.$//g'
84+ $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g' 79+ $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g'
85 > drwxrwxr-x 80 > drwxrwxr-x
86 81
87 $ getfacl --omit-header d 82 $ getfacl --omit-header d
88diff --git a/test/sbits-restore.test b/test/sbits-restore.test 83Index: acl-2.2.52/test/sbits-restore.test
89index de21340..5899b0a 100644 84===================================================================
90--- a/test/sbits-restore.test 85--- acl-2.2.52.orig/test/sbits-restore.test
91+++ b/test/sbits-restore.test 86+++ acl-2.2.52/test/sbits-restore.test
92@@ -13,10 +13,10 @@ Ensure setting of SUID/SGID/sticky via --restore works 87@@ -13,10 +13,10 @@ Ensure setting of SUID/SGID/sticky via -
93 $ touch d/g 88 $ touch d/g
94 $ touch d/u 89 $ touch d/u
95 $ setfacl --restore d.acl 90 $ setfacl --restore d.acl
@@ -103,6 +98,3 @@ index de21340..5899b0a 100644
103+ $ ls -dl d/g | awk '{print $1}' | sed 's/\\.$//g' 98+ $ ls -dl d/g | awk '{print $1}' | sed 's/\\.$//g'
104 > -rw-r-Sr-- 99 > -rw-r-Sr--
105 $ rm -Rf d 100 $ rm -Rf d
106--
1071.9.1
108