summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-01-14 14:59:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-16 22:33:09 +0000
commit3e9b54ed27b9852d195d8f8192af76948c390836 (patch)
tree9e47e843d9d652b6ff3bcb3078cd2d043740430f /meta/recipes-support
parent0e70fac8fe9dab4381e921f110bac301c10a470c (diff)
downloadpoky-3e9b54ed27b9852d195d8f8192af76948c390836.tar.gz
acl/attr: update to latest upstream releases
The latest release use standard autotools, so drop all the build system related hacks and patches. Ptests have been rewritten, with 100% pass rate for both. (From OE-Core rev: 0417eef364bad6d061b6a02bff27d766f4c1ce96) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch63
-rw-r--r--meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch24
-rw-r--r--meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch51
-rw-r--r--meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch198
-rw-r--r--meta/recipes-support/attr/acl/configure.ac49
-rw-r--r--meta/recipes-support/attr/acl/run-ptest60
-rw-r--r--meta/recipes-support/attr/acl/test-fix-directory-permissions.patch37
-rw-r--r--meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch100
-rw-r--r--meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch84
-rw-r--r--meta/recipes-support/attr/acl_2.2.52.bb52
-rw-r--r--meta/recipes-support/attr/acl_2.2.53.bb74
-rw-r--r--meta/recipes-support/attr/attr.inc48
-rw-r--r--meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch69
-rw-r--r--meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch63
-rw-r--r--meta/recipes-support/attr/attr/dont-use-decl-macros.patch56
-rw-r--r--meta/recipes-support/attr/attr/run-ptest3
-rw-r--r--meta/recipes-support/attr/attr_2.4.47.bb15
-rw-r--r--meta/recipes-support/attr/attr_2.4.48.bb6
-rw-r--r--meta/recipes-support/attr/ea-acl.inc52
-rw-r--r--meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch70
-rw-r--r--meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch240
-rw-r--r--meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch666
-rw-r--r--meta/recipes-support/attr/files/relative-libdir.patch25
-rw-r--r--meta/recipes-support/attr/files/run-ptest5
24 files changed, 205 insertions, 1905 deletions
diff --git a/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch b/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch
new file mode 100644
index 0000000000..ba2ffee5d2
--- /dev/null
+++ b/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch
@@ -0,0 +1,63 @@
1From 9e08219e0e99ee2589cf35fa8d52cef3515accce Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 12 Dec 2019 15:47:49 +0100
4Subject: [PATCH] test: patch out failing bits
5
6I have confirmed on the host distro (Ubuntu 18.04) that they
7fail as well; upstream probably haven't noticed because the
8test is only executed under sudo.
9
10Upstream-Status: Inappropriate [disabling tests instead of fixing them properly]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 test/root/permissions.test | 13 -------------
14 1 file changed, 13 deletions(-)
15
16diff --git a/test/root/permissions.test b/test/root/permissions.test
17index 8f8f825..21e8a95 100644
18--- a/test/root/permissions.test
19+++ b/test/root/permissions.test
20@@ -50,10 +50,6 @@ User daemon is a member in the owning group, which has only read access.
21 Verify this.
22
23 $ su daemon
24- $ cat f
25- > root
26- > bin
27-
28 $ echo daemon >> f
29 >~ .*f: Permission denied$
30
31@@ -146,8 +142,6 @@ the owning group, he should still have no write access.
32 $ setfacl -x g:daemon f
33
34 $ su daemon
35- $ echo daemon4 >> f
36- >~ .*f: Permission denied$
37
38
39 Change the owning group. The other permissions should now grant user
40@@ -158,12 +152,6 @@ daemon write access.
41
42 $ su daemon
43 $ echo daemon5 >> f
44- $ cat f
45- > root
46- > bin
47- > daemon
48- > daemon2
49- > daemon5
50
51
52 Verify that permissions in separate matching ACL entries do not
53@@ -173,7 +161,6 @@ accumulate.
54 $ setfacl -m g:bin:r,g:daemon:w f
55
56 $ su daemon
57- $ : < f
58 $ : > f
59 $ : <> f
60 >~ .*f: Permission denied$
61--
622.17.1
63
diff --git a/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch b/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch
new file mode 100644
index 0000000000..57ef0bb728
--- /dev/null
+++ b/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch
@@ -0,0 +1,24 @@
1From 39d332a8801de5d9ef09dacb3dba85c208b7b2ad Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 12 Dec 2019 13:45:52 +0100
4Subject: [PATCH] tests: do not hardcode the build path into a helper library
5
6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 test/Makemodule.am | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/test/Makemodule.am b/test/Makemodule.am
13index 17d4927..015de7f 100644
14--- a/test/Makemodule.am
15+++ b/test/Makemodule.am
16@@ -30,7 +30,7 @@ EXTRA_DIST += \
17 check_LTLIBRARIES = libtestlookup.la
18
19 libtestlookup_la_SOURCES = test/test_passwd.c test/test_group.c
20-libtestlookup_la_CFLAGS = -DBASEDIR=\"$(abs_srcdir)\"
21+libtestlookup_la_CFLAGS = -DBASEDIR=\"/tmp/acl-ptest\"
22 libtestlookup_la_LDFLAGS = -rpath $(abs_builddir)
23
24 AM_TESTS_ENVIRONMENT = PATH="$(abs_top_builddir):$$PATH";
diff --git a/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch b/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch
deleted file mode 100644
index 4c7cba3b88..0000000000
--- a/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From d82457ce5ca7455e336da5e244d95f90e52aaef8 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Tue, 18 Apr 2017 01:17:26 -0700
4Subject: [PATCH] Makefile: libacl should depend on include
5
6Fixed race issue:
7 In file included from acl_copy_entry.c:22:0:
8 libacl.h:19:21: fatal error: sys/acl.h: No such file or directory
9 #include <sys/acl.h>
10
11[snip]
12
13 compilation terminated.
14 acl_get_file.c:27:24: fatal error: acl/libacl.h: No such file or directory
15 #include <acl/libacl.h>
16 ^
17
18The acl.h is in "include" directory, and include/Makefile creates
19symlink "sys" and "acl" poinst to current dirctory:
20$ ls include/ -l
21acl -> .
22sys -> .
23
24So if "libacl" target runs before "include", the error would happen
25since no "acl" or "sys" directory.
26
27Let libacl depend on include can fix the problem.
28
29Upstream-Status: Pending
30
31Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
32---
33 Makefile | 2 +-
34 1 file changed, 1 insertion(+), 1 deletion(-)
35
36diff --git a/Makefile b/Makefile
37index dce32d3..8a79379 100644
38--- a/Makefile
39+++ b/Makefile
40@@ -48,7 +48,7 @@ else
41 endif
42
43 # tool/lib dependencies
44-libacl: libmisc
45+libacl: include libmisc
46 getfacl setfacl chacl: libacl
47
48 ifeq ($(HAVE_BUILDDEFS), yes)
49--
502.10.2
51
diff --git a/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch b/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch
deleted file mode 100644
index cf765fdbb8..0000000000
--- a/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch
+++ /dev/null
@@ -1,198 +0,0 @@
1acl: fix the order of expected output of getfacl
2
3The result of getfacl is sorted by user id.
4In Centos or RHEL, bin user id is 1 and daemon user id is 2.
5But in our image, bin user id is 2 and daemon user id is 1.
6The patch fixes this issue to make ptest pass.
7
8Upstream-Status: Inappropriate [embedded specific]
9
10Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
11---
12 test/misc.test | 38 +++++++++++++++++++-------------------
13 1 file changed, 19 insertions(+), 19 deletions(-)
14
15diff --git a/test/misc.test b/test/misc.test
16index 6e98053..53ae5b0 100644
17--- a/test/misc.test
18+++ b/test/misc.test
19@@ -79,8 +79,8 @@ Multiple users
20
21 $ getfacl --omit-header f
22 > user::rw-
23- > user:bin:rw-
24 > user:daemon:r--
25+ > user:bin:rw-
26 > group::r--
27 > mask::rw-
28 > other::r--
29@@ -94,8 +94,8 @@ Multiple groups
30
31 $ getfacl --omit-header f
32 > user::rw-
33- > user:bin:rw-
34 > user:daemon:r--
35+ > user:bin:rw-
36 > group::r--
37 > group:daemon:r--
38 > group:users:rw-
39@@ -111,8 +111,8 @@ Remove one group
40
41 $ getfacl --omit-header f
42 > user::rw-
43- > user:bin:rw-
44 > user:daemon:r--
45+ > user:bin:rw-
46 > group::r--
47 > group:daemon:r--
48 > mask::rw-
49@@ -146,8 +146,8 @@ Default ACL
50
51 $ getfacl --omit-header d
52 > user::rwx
53- > user:bin:rwx
54 > user:daemon:rw-
55+ > user:bin:rwx
56 > group::r-x
57 > mask::rwx
58 > other::---
59@@ -236,16 +236,16 @@ Add some users and groups
60
61 $ getfacl --omit-header d/d
62 > user::rwx
63- > user:bin:rwx #effective:r-x
64 > user:daemon:r-x
65+ > user:bin:rwx #effective:r-x
66 > group::r-x
67 > group:daemon:rwx #effective:r-x
68 > group:users:r-x
69 > mask::r-x
70 > other::---
71 > default:user::rwx
72- > default:user:bin:rwx #effective:r-x
73 > default:user:daemon:r-x
74+ > default:user:bin:rwx #effective:r-x
75 > default:group::r-x
76 > default:mask::r-x
77 > default:other::---
78@@ -262,16 +262,16 @@ Symlink in directory with default ACL?
79
80 $ getfacl --omit-header d/l
81 > user::rwx
82- > user:bin:rwx #effective:r-x
83 > user:daemon:r-x
84+ > user:bin:rwx #effective:r-x
85 > group::r-x
86 > group:daemon:rwx #effective:r-x
87 > group:users:r-x
88 > mask::r-x
89 > other::---
90 > default:user::rwx
91- > default:user:bin:rwx #effective:r-x
92 > default:user:daemon:r-x
93+ > default:user:bin:rwx #effective:r-x
94 > default:group::r-x
95 > default:mask::r-x
96 > default:other::---
97@@ -287,16 +287,16 @@ Does mask manipulation work?
98
99 $ getfacl --omit-header d/d
100 > user::rwx
101- > user:bin:r-x
102 > user:daemon:r-x
103+ > user:bin:r-x
104 > group::r-x
105 > group:daemon:r-x
106 > group:users:r-x
107 > mask::r-x
108 > other::---
109 > default:user::rwx
110- > default:user:bin:rwx #effective:r-x
111 > default:user:daemon:r-x
112+ > default:user:bin:rwx #effective:r-x
113 > default:group::r-x
114 > default:mask::r-x
115 > default:other::---
116@@ -308,16 +308,16 @@ Does mask manipulation work?
117
118 $ getfacl --omit-header d/d
119 > user::rwx
120- > user:bin:r-x
121 > user:daemon:r-x
122+ > user:bin:r-x
123 > group::r-x
124 > group:daemon:r-x
125 > group:users:r-x
126 > mask::r-x
127 > other::---
128 > default:user::rwx
129- > default:user:bin:rwx
130 > default:user:daemon:r-x
131+ > default:user:bin:rwx
132 > default:group::r-x
133 > default:mask::rwx
134 > default:other::---
135@@ -333,8 +333,8 @@ Remove the default ACL
136
137 $ getfacl --omit-header d
138 > user::rwx
139- > user:bin:rwx
140 > user:daemon:rw-
141+ > user:bin:rwx
142 > group::r-x
143 > mask::rwx
144 > other::---
145@@ -373,14 +373,14 @@ Now, chmod should change the group_obj entry
146
147 $ getfacl --omit-header d
148 > user::rwx
149- > user:bin:r-x
150 > user:daemon:rwx
151+ > user:bin:r-x
152 > group::rwx
153 > mask::rwx
154 > other::r-x
155 > default:user::rwx
156- > default:user:bin:r-x
157 > default:user:daemon:rwx
158+ > default:user:bin:r-x
159 > default:group::rwx
160 > default:mask::rwx
161 > default:other::r-x
162@@ -392,14 +392,14 @@ Now, chmod should change the group_obj entry
163
164 $ getfacl --omit-header d
165 > user::rwx
166- > user:bin:r-x
167 > user:daemon:rwx #effective:r-x
168+ > user:bin:r-x
169 > group::rwx #effective:r-x
170 > mask::r-x
171 > other::---
172 > default:user::rwx
173- > default:user:bin:r-x
174 > default:user:daemon:rwx
175+ > default:user:bin:r-x
176 > default:group::rwx
177 > default:mask::rwx
178 > default:other::r-x
179@@ -411,14 +411,14 @@ Now, chmod should change the group_obj entry
180
181 $ getfacl --omit-header d
182 > user::rwx
183- > user:bin:r-x
184 > user:daemon:rwx #effective:r-x
185+ > user:bin:r-x
186 > group::rwx #effective:r-x
187 > mask::r-x
188 > other::---
189 > default:user::rwx
190- > default:user:bin:r-x
191 > default:user:daemon:rwx
192+ > default:user:bin:r-x
193 > default:group::rwx
194 > default:mask::rwx
195 > default:other::r-x
196--
1971.7.9.5
198
diff --git a/meta/recipes-support/attr/acl/configure.ac b/meta/recipes-support/attr/acl/configure.ac
deleted file mode 100644
index 7af2e8d886..0000000000
--- a/meta/recipes-support/attr/acl/configure.ac
+++ /dev/null
@@ -1,49 +0,0 @@
1# Copyright (C) 2009 Andreas Gruenbacher <agruen@suse.de>
2#
3# This program is free software: you can redistribute it and/or modify it
4# under the terms of the GNU General Public License as published by
5# the Free Software Foundation, either version 2 of the License, or
6# (at your option) any later version.
7#
8# This program is distributed in the hope that it will be useful,
9# but WITHOUT ANY WARRANTY; without even the implied warranty of
10# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11# GNU General Public License for more details.
12#
13# You should have received a copy of the GNU General Public License
14# along with this program. If not, see <http://www.gnu.org/licenses/>.
15#
16AC_INIT(include/acl.h)
17AC_CONFIG_AUX_DIR([.])
18AC_CONFIG_MACRO_DIR([m4])
19AC_CONFIG_HEADER(include/config.h)
20AC_PREFIX_DEFAULT(/usr)
21
22AC_PROG_LIBTOOL
23
24AC_ARG_ENABLE(shared,
25[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],,
26 enable_shared=yes)
27AC_SUBST(enable_shared)
28
29AC_ARG_ENABLE(gettext,
30[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],,
31 enable_gettext=yes)
32AC_SUBST(enable_gettext)
33
34AC_ARG_ENABLE(lib64,
35[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],,
36 enable_lib64=no)
37AC_SUBST(enable_lib64)
38
39AC_PACKAGE_GLOBALS(acl)
40AC_PACKAGE_UTILITIES(acl)
41AC_PACKAGE_NEED_ATTR_XATTR_H
42AC_PACKAGE_NEED_ATTR_ERROR_H
43AC_MULTILIB($enable_lib64)
44AC_PACKAGE_NEED_GETXATTR_LIBATTR
45AC_MANUAL_FORMAT
46
47AC_FUNC_GCC_VISIBILITY
48
49AC_OUTPUT(include/builddefs)
diff --git a/meta/recipes-support/attr/acl/run-ptest b/meta/recipes-support/attr/acl/run-ptest
index a56946d8e6..4312823365 100644
--- a/meta/recipes-support/attr/acl/run-ptest
+++ b/meta/recipes-support/attr/acl/run-ptest
@@ -4,61 +4,7 @@
4 4
5#umask 077 5#umask 077
6 6
7EXT3_IMAGE=ext3.img 7mkdir -p /tmp/acl-ptest/test
8EXT3_MOUNT_POINT=/mnt/ext3 8cp test/test.* /tmp/acl-ptest/test
9 9
10trap 'rm -f ${EXT3_IMAGE}' EXIT 10make test-suite.log
11
12dd if=/dev/zero of=${EXT3_IMAGE} bs=1M count=1
13if [ "$?" -eq 0 ]; then
14 echo "PASS: dump ext3.img"
15else
16 echo "FAIL: dump ext3.img"
17 exit 1
18fi
19
20mkfs.ext3 -F ${EXT3_IMAGE}
21if [ "$?" -eq 0 ]; then
22 echo "PASS: mkfs.ext3 -F ext3.img"
23else
24 echo "FAIL: mkfs.ext3 -F ext3.img"
25 exit 1
26fi
27
28if [ -d $EXT3_MOUNT_POINT ]; then
29 echo "mount point exist"
30else
31 mkdir -p $EXT3_MOUNT_POINT
32fi
33
34
35mount -o loop,rw,acl ${EXT3_IMAGE} $EXT3_MOUNT_POINT
36if [ "$?" -eq 0 ]; then
37 echo "PASS: mount ext3.img"
38else
39 echo "FAIL: mount ext3.img"
40 exit 1
41fi
42
43cp -rf ./test/ $EXT3_MOUNT_POINT
44
45cd $EXT3_MOUNT_POINT/test/
46
47if sed -e 's!^bin:x:2:$!bin:x:2:daemon!' < /etc/group > gtmp
48then if cp /etc/group group.orig;
49 then cp gtmp /etc/group
50 make -k tests root-tests | sed \
51 -e 's|^\[.*\] \(.*\) -- ok$|PASS: \1|' \
52 -e 's|^\[.*\] \(.*\) -- failed|FAIL: \1|'
53 cp group.orig /etc/group
54 else echo "FAIL: couldn't save original group file."
55 exit 1
56 fi
57else echo "FAIL: couldn't create modified group file."
58 exit 1
59fi
60
61cd -
62umount $EXT3_MOUNT_POINT
63rm -rf $EXT3_MOUNT_POINT
64rm $EXT3_IMAGE
diff --git a/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch b/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch
deleted file mode 100644
index e64990ad5b..0000000000
--- a/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 311589fedf196168382d8f0db303ab328bcf9d83 Mon Sep 17 00:00:00 2001
2From: Peter Seebach <peter.seebach@windriver.com>
3Date: Wed, 11 May 2016 15:16:06 -0500
4Subject: [PATCH] acl.inc, run-ptest: improve ptest functionality on limited
5
6commit c45bae84817a70fef6c2b661a07a492a0d23ae85
7
8 Fix permissions on temporary directory
9
10 The temporary directory's permissions have to allow other users to
11 view the directory. A default umask of 022 is common, but not mandatory,
12 and secure systems may have more restrictive defaults.
13
14 Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
15
16Upstream-Status: Backport [ http://git.savannah.gnu.org/cgit/acl.git/commit/?id=c6772a958800de064482634f77c20a0faafc5af6 ]
17
18Signed-off-by: Dengke Du <dengke.du@windriver.com>
19---
20 test/root/permissions.test | 1 +
21 1 file changed, 1 insertion(+)
22
23diff --git a/test/root/permissions.test b/test/root/permissions.test
24index 42615f5..098b52a 100644
25--- a/test/root/permissions.test
26+++ b/test/root/permissions.test
27@@ -16,6 +16,7 @@ Cry immediately if we are not running as root.
28 First, set up a temporary directory and create a regular file with
29 defined permissions.
30
31+ $ umask 022
32 $ mkdir d
33 $ cd d
34 $ umask 027
35--
362.8.1
37
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
deleted file mode 100644
index f392465b58..0000000000
--- a/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch
+++ /dev/null
@@ -1,100 +0,0 @@
1From e98ce8acf84d12ea67a3ac76bf63c6d87d9af86d Mon Sep 17 00:00:00 2001
2From: Kamil Dudka <kdudka@redhat.com>
3Date: Mon, 20 May 2013 16:38:06 +0200
4Subject: [PATCH] test: fix insufficient quoting of '\'
5
6This is a follow-up to 7f2c91b8369242a8dbc2b304a5b71b2a85f5b855, which
7caused sbits-restore.test to fail in the following way in case SELinux
8was disabled:
9
10*** sbits-restore.test ***
11[3] $ umask 022 -- ok
12[4] $ mkdir d -- ok
13[5] $ touch d/g -- ok
14[6] $ touch d/u -- ok
15[7] $ chmod u+s d/u -- ok
16[8] $ chmod g+s d/g -- ok
17[9] $ chmod +t d -- ok
18[10] $ getfacl -R d > d.acl -- ok
19[11] $ rm -R d -- ok
20[12] $ mkdir d -- ok
21[13] $ touch d/g -- ok
22[14] $ touch d/u -- ok
23[15] $ setfacl --restore d.acl -- ok
24[16] $ ls -dl d | awk '{print $1}' | sed 's/.$//g' -- failed
25drwxr-xr- != drwxr-xr-t
26[18] $ ls -dl d/u | awk '{print $1}' | sed 's/.$//g' -- failed
27-rwSr--r- != -rwSr--r--
28[20] $ ls -dl d/g | awk '{print $1}' | sed 's/.$//g' -- failed
29-rw-r-Sr- != -rw-r-Sr--
30[22] $ rm -Rf d -- ok
3117 commands (14 passed, 3 failed)
32
33Upstream-Status: Backport
34http://git.savannah.gnu.org/cgit/acl.git/commit/?id=e98ce8acf84d12ea67a3ac76bf63c6d87d9af86d
35
36Signed-off-by: Kamil Dudka <kdudka@redhat.com>
37Signed-off-by: He Zhe <zhe.he@windriver.com>
38
39Index: acl-2.2.52/test/cp.test
40===================================================================
41--- acl-2.2.52.orig/test/cp.test
42+++ acl-2.2.52/test/cp.test
43@@ -9,7 +9,7 @@ The cp utility should only copy ACLs if
44 > -rw-rw-r--+
45
46 $ cp f g
47- $ ls -l g | awk -- '{ print $1 }' | sed 's/\.$//g'
48+ $ ls -l g | awk -- '{ print $1 }' | sed 's/\\.$//g'
49 > -rw-r--r--
50
51 $ rm g
52Index: acl-2.2.52/test/misc.test
53===================================================================
54--- acl-2.2.52.orig/test/misc.test
55+++ acl-2.2.52/test/misc.test
56@@ -254,7 +254,7 @@ Add some users and groups
57 Symlink in directory with default ACL?
58
59 $ ln -s d d/l
60- $ ls -dl d/l | awk '{print $1}' | sed 's/\.$//g'
61+ $ ls -dl d/l | awk '{print $1}' | sed 's/\\.$//g'
62 > lrwxrwxrwx
63
64 $ ls -dl -L d/l | awk '{print $1}'
65@@ -343,7 +343,7 @@ Remove the default ACL
66 Reset to base entries
67
68 $ setfacl -b d
69- $ ls -dl d | awk '{print $1}' | sed 's/\.$//g'
70+ $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g'
71 > drwxr-x---
72
73 $ getfacl --omit-header d
74@@ -355,7 +355,7 @@ Reset to base entries
75 Now, chmod should change the group_obj entry
76
77 $ chmod 775 d
78- $ ls -dl d | awk '{print $1}' | sed 's/\.$//g'
79+ $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g'
80 > drwxrwxr-x
81
82 $ getfacl --omit-header d
83Index: acl-2.2.52/test/sbits-restore.test
84===================================================================
85--- acl-2.2.52.orig/test/sbits-restore.test
86+++ acl-2.2.52/test/sbits-restore.test
87@@ -13,10 +13,10 @@ Ensure setting of SUID/SGID/sticky via -
88 $ touch d/g
89 $ touch d/u
90 $ setfacl --restore d.acl
91- $ ls -dl d | awk '{print $1}' | sed 's/\.$//g'
92+ $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g'
93 > drwxr-xr-t
94- $ ls -dl d/u | awk '{print $1}' | sed 's/\.$//g'
95+ $ ls -dl d/u | awk '{print $1}' | sed 's/\\.$//g'
96 > -rwSr--r--
97- $ ls -dl d/g | awk '{print $1}' | sed 's/\.$//g'
98+ $ ls -dl d/g | awk '{print $1}' | sed 's/\\.$//g'
99 > -rw-r-Sr--
100 $ rm -Rf d
diff --git a/meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch b/meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch
deleted file mode 100644
index 8cc11a63e1..0000000000
--- a/meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch
+++ /dev/null
@@ -1,84 +0,0 @@
1From d2f49ee6fe4850b8dda5b08676b36201d3c43710 Mon Sep 17 00:00:00 2001
2From: He Zhe <zhe.he@windriver.com>
3Date: Wed, 2 Mar 2016 15:46:57 +0800
4Subject: [PATCH] test: fixups on SELinux machines for root testcases
5
6ls adds a '.' at the end of the permission field list on SELinux
7machines, filter this out so root tests work on SELinux machines.
8
9Upstream-Status: Accepted
10http://git.savannah.gnu.org/cgit/acl.git/commit/?id=26a87d36f80d5e98bccb5878834d9e69dadfe3e9
11
12Signed-off-by: He Zhe <zhe.he@windriver.com>
13---
14 test/root/permissions.test | 8 ++++----
15 test/root/restore.test | 2 +-
16 test/root/setfacl.test | 2 +-
17 3 files changed, 6 insertions(+), 6 deletions(-)
18
19diff --git a/test/root/permissions.test b/test/root/permissions.test
20index 9b9e3de..665339a 100644
21--- a/test/root/permissions.test
22+++ b/test/root/permissions.test
23@@ -19,7 +19,7 @@ defined permissions.
24 $ cd d
25 $ umask 027
26 $ touch f
27- $ ls -l f | awk -- '{ print $1, $3, $4 }'
28+ $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g'
29 > -rw-r----- root root
30
31
32@@ -39,7 +39,7 @@ Now, change the ownership of the file to bin:bin and verify that this
33 gives user bin write access.
34
35 $ chown bin:bin f
36- $ ls -l f | awk -- '{ print $1, $3, $4 }'
37+ $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g'
38 > -rw-r----- bin bin
39 $ su bin
40 $ echo bin >> f
41@@ -256,12 +256,12 @@ directories if the file has an ACL and only CAP_FOWNER would grant them.
42 $ mkdir -m 600 x
43 $ chown daemon:daemon x
44 $ echo j > x/j
45- $ ls -l x/j | awk -- '{ print $1, $3, $4 }'
46+ $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g'
47 > -rw-r----- root root
48
49 $ setfacl -m u:daemon:r x
50
51- $ ls -l x/j | awk -- '{ print $1, $3, $4 }'
52+ $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g'
53 > -rw-r----- root root
54 (With the bug this gives: `ls: x/j: Permission denied'.)
55
56diff --git a/test/root/restore.test b/test/root/restore.test
57index 63a9d01..c85097c 100644
58--- a/test/root/restore.test
59+++ b/test/root/restore.test
60@@ -21,7 +21,7 @@ Cry immediately if we are not running as root.
61 $ chown bin passwd
62 $ chmod u+s passwd
63 $ setfacl --restore passwd.acl
64- $ ls -dl passwd | awk '{print $1 " " $3 " " $4}'
65+ $ ls -dl passwd | awk '{print $1 " " $3 " " $4}' | sed 's/\\.//g'
66 > -rwsr-xr-x root root
67
68 $ rm passwd passwd.acl
69diff --git a/test/root/setfacl.test b/test/root/setfacl.test
70index a46a9f4..7efbad7 100644
71--- a/test/root/setfacl.test
72+++ b/test/root/setfacl.test
73@@ -12,7 +12,7 @@ Cry immediately if we are not running as root.
74 $ sg bin
75 $ umask 027
76 $ touch g
77- $ ls -dl g | awk '{print $1}'
78+ $ ls -dl g | awk '{print $1}' | sed 's/\\.//g'
79 > -rw-r-----
80
81 $ setfacl -m m:- g
82--
831.9.1
84
diff --git a/meta/recipes-support/attr/acl_2.2.52.bb b/meta/recipes-support/attr/acl_2.2.52.bb
deleted file mode 100644
index 6bc77d868d..0000000000
--- a/meta/recipes-support/attr/acl_2.2.52.bb
+++ /dev/null
@@ -1,52 +0,0 @@
1SUMMARY = "Utilities for managing POSIX Access Control Lists"
2HOMEPAGE = "http://savannah.nongnu.org/projects/acl/"
3SECTION = "libs"
4
5LICENSE = "LGPLv2.1+ & GPLv2+"
6LICENSE_${PN} = "GPLv2+"
7LICENSE_lib${BPN} = "LGPLv2.1+"
8LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \
9 file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764"
10
11DEPENDS = "attr"
12
13SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.src.tar.gz \
14 file://configure.ac;subdir=${BP} \
15 file://run-ptest \
16 file://acl-fix-the-order-of-expected-output-of-getfacl.patch \
17 file://test-fix-insufficient-quoting-of.patch \
18 file://test-fixups-on-SELinux-machines-for-root-testcases.patch \
19 file://test-fix-directory-permissions.patch \
20 file://Makefile-libacl-should-depend-on-include.patch \
21"
22
23SRC_URI[md5sum] = "a61415312426e9c2212bd7dc7929abda"
24SRC_URI[sha256sum] = "179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23"
25
26require ea-acl.inc
27
28# avoid RPATH hardcode to staging dir
29do_configure_append() {
30 sed -i ${S}/config.status -e s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\',
31 ${S}/config.status
32}
33
34# libdir should point to .la
35do_install_append() {
36 sed -i ${D}${libdir}/libacl.la -e \
37 s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
38}
39
40inherit ptest
41
42PTEST_BUILD_HOST_FILES = "builddefs"
43PTEST_BUILD_HOST_PATTERN = "^RPM"
44do_install_ptest() {
45 tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
46 install -d ${D}${PTEST_PATH}/include
47 install -m 644 ${S}/include/builddefs ${S}/include/buildmacros ${S}/include/buildrules ${D}${PTEST_PATH}/include/
48}
49
50RDEPENDS_${PN}-ptest = "acl bash coreutils perl perl-module-filehandle perl-module-getopt-std perl-module-posix shadow"
51
52BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-support/attr/acl_2.2.53.bb b/meta/recipes-support/attr/acl_2.2.53.bb
new file mode 100644
index 0000000000..5bb50f77f7
--- /dev/null
+++ b/meta/recipes-support/attr/acl_2.2.53.bb
@@ -0,0 +1,74 @@
1SUMMARY = "Utilities for managing POSIX Access Control Lists"
2HOMEPAGE = "http://savannah.nongnu.org/projects/acl/"
3SECTION = "libs"
4
5LICENSE = "LGPLv2.1+ & GPLv2+"
6LICENSE_${PN} = "GPLv2+"
7LICENSE_lib${BPN} = "LGPLv2.1+"
8LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \
9 file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764"
10
11DEPENDS = "attr"
12
13SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.tar.gz \
14 file://run-ptest \
15 file://0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch \
16 file://0001-test-patch-out-failing-bits.patch \
17 "
18
19SRC_URI[md5sum] = "007aabf1dbb550bcddde52a244cd1070"
20SRC_URI[sha256sum] = "06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387af26c7"
21
22inherit autotools gettext ptest
23
24PACKAGES =+ "lib${BPN}"
25
26FILES_lib${BPN} = "${libdir}/lib*${SOLIBS}"
27
28PTEST_BUILD_HOST_FILES = "builddefs"
29PTEST_BUILD_HOST_PATTERN = "^RPM"
30
31do_compile_ptest() {
32 oe_runmake libtestlookup.la
33}
34
35do_install_ptest() {
36 cp -rf ${S}/test/ ${D}${PTEST_PATH}
37 cp -rf ${S}/build-aux/ ${D}${PTEST_PATH}
38 mkdir -p ${D}${PTEST_PATH}/.libs
39 cp -rf ${B}/.libs/libtestlookup* ${D}${PTEST_PATH}/.libs
40 cp ${B}/Makefile ${D}${PTEST_PATH}
41
42 sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
43 -e 's|${DEBUG_PREFIX_MAP}||g' \
44 -e 's:${HOSTTOOLS_DIR}/::g' \
45 -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
46 -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
47 -i ${D}${PTEST_PATH}/Makefile
48
49 sed -i "s|^srcdir =.*|srcdir = \.|g" ${D}${PTEST_PATH}/Makefile
50 sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" ${D}${PTEST_PATH}/Makefile
51 sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" ${D}${PTEST_PATH}/Makefile
52 sed -i "s|^Makefile:.*|Makefile:|g" ${D}${PTEST_PATH}/Makefile
53
54 rm ${D}${PTEST_PATH}/.libs/libtestlookup.lai
55}
56
57RDEPENDS_${PN}-ptest = "acl \
58 bash \
59 coreutils \
60 perl \
61 perl-module-filehandle \
62 perl-module-getopt-std \
63 perl-module-posix \
64 shadow \
65 make \
66 gawk \
67 e2fsprogs-mke2fs \
68 perl-module-cwd \
69 perl-module-file-basename \
70 perl-module-file-path \
71 perl-module-file-spec \
72 "
73
74BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc
index 3503d66b9e..f13a83a7b4 100644
--- a/meta/recipes-support/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
@@ -8,22 +8,18 @@ LICENSE = "LGPLv2.1+ & GPLv2+"
8LICENSE_${PN} = "GPLv2+" 8LICENSE_${PN} = "GPLv2+"
9LICENSE_lib${BPN} = "LGPLv2.1+" 9LICENSE_lib${BPN} = "LGPLv2.1+"
10LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \ 10LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \
11 file://attr/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \ 11 file://tools/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \
12 file://libattr/libattr.c;endline=17;md5=7970f77049f8fa1199fff62a7ab724fb" 12 file://libattr/libattr.c;endline=17;md5=7970f77049f8fa1199fff62a7ab724fb"
13 13
14SRC_URI = "${SAVANNAH_GNU_MIRROR}/attr/${BP}.src.tar.gz \ 14SRC_URI = "${SAVANNAH_GNU_MIRROR}/attr/${BP}.tar.gz \
15 file://run-ptest \ 15 file://run-ptest \
16" 16"
17 17
18require ea-acl.inc 18inherit ptest update-alternatives autotools gettext
19 19
20# libdir should point to .la 20PACKAGES =+ "lib${BPN}"
21do_install_append() {
22 sed -i ${D}${libdir}/libattr.la -e \
23 s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
24}
25 21
26inherit ptest update-alternatives 22FILES_lib${BPN} = "${libdir}/lib*${SOLIBS}"
27 23
28ALTERNATIVE_PRIORITY = "100" 24ALTERNATIVE_PRIORITY = "100"
29ALTERNATIVE_${PN} = "setfattr" 25ALTERNATIVE_${PN} = "setfattr"
@@ -33,14 +29,34 @@ PTEST_BUILD_HOST_FILES = "builddefs"
33PTEST_BUILD_HOST_PATTERN = "^RPM" 29PTEST_BUILD_HOST_PATTERN = "^RPM"
34 30
35do_install_ptest() { 31do_install_ptest() {
36 tar -c --exclude=ext test/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) 32 cp ${B}/Makefile ${D}${PTEST_PATH}
37 mkdir ${D}${PTEST_PATH}/include 33 sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
38 for i in builddefs buildmacros buildrules; \ 34 -e 's|${DEBUG_PREFIX_MAP}||g' \
39 do cp ${S}/include/$i ${D}${PTEST_PATH}/include/; \ 35 -e 's:${HOSTTOOLS_DIR}/::g' \
40 done 36 -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
41 sed -e 's|; @echo|; echo|' -i ${D}${PTEST_PATH}/test/Makefile 37 -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
38 -i ${D}${PTEST_PATH}/Makefile
39
40 sed -i "s|^srcdir =.*|srcdir = \.|g" ${D}${PTEST_PATH}/Makefile
41 sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" ${D}${PTEST_PATH}/Makefile
42 sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" ${D}${PTEST_PATH}/Makefile
43 sed -i "s|^Makefile:.*|Makefile:|g" ${D}${PTEST_PATH}/Makefile
44 cp -rf ${S}/build-aux/ ${D}${PTEST_PATH}
45 cp -rf ${S}/test/ ${D}${PTEST_PATH}
42} 46}
43 47
44RDEPENDS_${PN}-ptest = "attr coreutils perl-module-filehandle perl-module-getopt-std perl-module-posix make perl" 48RDEPENDS_${PN}-ptest = "attr \
49 coreutils \
50 perl-module-filehandle \
51 perl-module-getopt-std \
52 perl-module-posix \
53 make \
54 perl \
55 gawk \
56 perl-module-cwd \
57 perl-module-file-basename \
58 perl-module-file-path \
59 perl-module-file-spec \
60 "
45 61
46BBCLASSEXTEND = "native nativesdk" 62BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch b/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch
deleted file mode 100644
index dcd6507bcc..0000000000
--- a/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1From 37a27b6fd09ecb37097b85e5db74e4f77b80fe0a Mon Sep 17 00:00:00 2001
2From: Felix Janda <felix.janda@posteo.de>
3Date: Tue, 12 Jan 2016 22:20:33 +0100
4Subject: [PATCH] Use stdint types consistently
5
6---
7Upstream-Status: Backport
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10 include/attributes.h | 6 ++++--
11 man/man3/attr_list.3 | 8 ++++----
12 2 files changed, 8 insertions(+), 6 deletions(-)
13
14Index: attr-2.4.47/include/attributes.h
15===================================================================
16--- attr-2.4.47.orig/include/attributes.h
17+++ attr-2.4.47/include/attributes.h
18@@ -22,6 +22,7 @@
19 extern "C" {
20 #endif
21
22+#include <stdint.h>
23 /*
24 * An almost-IRIX-compatible extended attributes API
25 * (the IRIX attribute "list" operation is missing, added ATTR_SECURE).
26@@ -69,7 +70,7 @@ typedef struct attrlist {
27 * al_offset[i] entry points to.
28 */
29 typedef struct attrlist_ent { /* data from attr_list() */
30- u_int32_t a_valuelen; /* number bytes in value of attr */
31+ uint32_t a_valuelen; /* number bytes in value of attr */
32 char a_name[1]; /* attr name (NULL terminated) */
33 } attrlist_ent_t;
34
35@@ -90,7 +91,7 @@ typedef struct attrlist_ent { /* data fr
36 * operation on a cursor is to bzero() it.
37 */
38 typedef struct attrlist_cursor {
39- u_int32_t opaque[4]; /* an opaque cookie */
40+ uint32_t opaque[4]; /* an opaque cookie */
41 } attrlist_cursor_t;
42
43 /*
44Index: attr-2.4.47/man/man3/attr_list.3
45===================================================================
46--- attr-2.4.47.orig/man/man3/attr_list.3
47+++ attr-2.4.47/man/man3/attr_list.3
48@@ -72,9 +72,9 @@ The contents of an \f4attrlist_t\fP stru
49 .nf
50 .ft 4
51 .ta 9n 22n
52-__int32_t al_count; /\(** number of entries in attrlist \(**/
53-__int32_t al_more; /\(** T/F: more attrs (do syscall again) \(**/
54-__int32_t al_offset[1]; /\(** byte offsets of attrs [var-sized] \(**/
55+int32_t al_count; /\(** number of entries in attrlist \(**/
56+int32_t al_more; /\(** T/F: more attrs (do syscall again) \(**/
57+int32_t al_offset[1]; /\(** byte offsets of attrs [var-sized] \(**/
58 .ft 1
59 .fi
60 .RE
61@@ -113,7 +113,7 @@ include the following members:
62 .nf
63 .ft 4
64 .ta 9n 22n
65-u_int32_t a_valuelen; /\(** number bytes in value of attr \(**/
66+uint32_t a_valuelen; /\(** number bytes in value of attr \(**/
67 char a_name[]; /\(** attr name (NULL terminated) \(**/
68 .ft 1
69 .fi
diff --git a/meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch b/meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch
deleted file mode 100644
index 20fcc3cee7..0000000000
--- a/meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1Subject: [PATCH] attr: Missing configure.ac
2
3Upstream-Status: Backport [Upstream released tarball missing this file]
4Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
5---
6 configure.ac | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
7 1 file changed, 48 insertions(+)
8 create mode 100644 configure.ac
9
10diff --git a/configure.ac b/configure.ac
11new file mode 100644
12index 0000000..b966d0e
13--- /dev/null
14+++ b/configure.ac
15@@ -0,0 +1,48 @@
16+# Copyright (C) 2009 Andreas Gruenbacher <agruen@suse.de>
17+#
18+# This program is free software: you can redistribute it and/or modify it
19+# under the terms of the GNU General Public License as published by
20+# the Free Software Foundation, either version 2 of the License, or
21+# (at your option) any later version.
22+#
23+# This program is distributed in the hope that it will be useful,
24+# but WITHOUT ANY WARRANTY; without even the implied warranty of
25+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
26+# GNU General Public License for more details.
27+#
28+# You should have received a copy of the GNU General Public License
29+# along with this program. If not, see <http://www.gnu.org/licenses/>.
30+#
31+AC_INIT(include/attributes.h)
32+AC_CONFIG_AUX_DIR([.])
33+AC_CONFIG_MACRO_DIR([m4])
34+AC_CONFIG_HEADER(include/config.h)
35+AC_PREFIX_DEFAULT(/usr)
36+
37+AC_PROG_LIBTOOL
38+
39+AC_ARG_ENABLE(shared,
40+[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],,
41+ enable_shared=yes)
42+AC_SUBST(enable_shared)
43+
44+AC_ARG_ENABLE(gettext,
45+[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],,
46+ enable_gettext=yes)
47+AC_SUBST(enable_gettext)
48+
49+AC_ARG_ENABLE(lib64,
50+[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],,
51+ enable_lib64=no)
52+AC_SUBST(enable_lib64)
53+
54+AC_PACKAGE_GLOBALS(attr)
55+AC_PACKAGE_UTILITIES(attr)
56+AC_MANUAL_FORMAT
57+AC_MULTILIB($enable_lib64)
58+
59+AC_C_CONST
60+AC_TYPE_MODE_T
61+AC_FUNC_ALLOCA
62+
63+AC_OUTPUT(include/builddefs)
diff --git a/meta/recipes-support/attr/attr/dont-use-decl-macros.patch b/meta/recipes-support/attr/attr/dont-use-decl-macros.patch
deleted file mode 100644
index 9d4b8929e8..0000000000
--- a/meta/recipes-support/attr/attr/dont-use-decl-macros.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1Use extern "C" instead of __BEGIN_DECL/__END_DECL macros
2these macros are defined in sys/cdefs.h for glibc and this header is not available on all libc
3
4anyway they defined like below
5
6#ifdef __cplusplus
7# define __BEGIN_DECLS extern "C" {
8# define __END_DECLS }
9#else
10# define __BEGIN_DECLS /* empty */
11# define __END_DECLS /* empty */
12#endif
13
14__THROW macro is also not available on musl, defined thusly
15
16Upstream-Status: Pending
17
18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19
20Index: attr-2.4.47/include/xattr.h
21===================================================================
22--- attr-2.4.47.orig/include/xattr.h 2014-04-02 00:01:30.252091280 -0700
23+++ attr-2.4.47/include/xattr.h 2014-04-02 00:12:57.985428099 -0700
24@@ -30,8 +30,20 @@
25 #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */
26 #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */
27
28-
29-__BEGIN_DECLS
30+#ifndef __THROW
31+# ifndef __GNUC_PREREQ
32+# define __GNUC_PREREQ(maj, min) (0)
33+# endif
34+# if defined __cplusplus && __GNUC_PREREQ (2,8)
35+# define __THROW throw ()
36+# else
37+# define __THROW
38+# endif
39+#endif
40+
41+#ifdef __cplusplus
42+extern "C" {
43+#endif
44
45 extern int setxattr (const char *__path, const char *__name,
46 const void *__value, size_t __size, int __flags) __THROW;
47@@ -58,6 +70,8 @@
48 extern int lremovexattr (const char *__path, const char *__name) __THROW;
49 extern int fremovexattr (int __filedes, const char *__name) __THROW;
50
51-__END_DECLS
52+#ifdef __cplusplus
53+}
54+#endif
55
56 #endif /* __XATTR_H__ */
diff --git a/meta/recipes-support/attr/attr/run-ptest b/meta/recipes-support/attr/attr/run-ptest
new file mode 100644
index 0000000000..f64244f239
--- /dev/null
+++ b/meta/recipes-support/attr/attr/run-ptest
@@ -0,0 +1,3 @@
1#!/bin/sh
2
3make test-suite.log
diff --git a/meta/recipes-support/attr/attr_2.4.47.bb b/meta/recipes-support/attr/attr_2.4.47.bb
deleted file mode 100644
index fc88bef830..0000000000
--- a/meta/recipes-support/attr/attr_2.4.47.bb
+++ /dev/null
@@ -1,15 +0,0 @@
1require attr.inc
2
3# configure.ac was missing from the release tarball. This should be fixed in
4# future releases of attr, remove this when updating the recipe.
5SRC_URI += "file://attr-Missing-configure.ac.patch \
6 file://dont-use-decl-macros.patch \
7 file://Remove-the-section-2-man-pages.patch \
8 file://Remove-the-attr.5-man-page-moved-to-man-pages.patch \
9 file://0001-Use-stdint-types-consistently.patch \
10 "
11
12SRC_URI[md5sum] = "84f58dec00b60f2dc8fd1c9709291cc7"
13SRC_URI[sha256sum] = "25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859"
14
15BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-support/attr/attr_2.4.48.bb b/meta/recipes-support/attr/attr_2.4.48.bb
new file mode 100644
index 0000000000..530d4e4883
--- /dev/null
+++ b/meta/recipes-support/attr/attr_2.4.48.bb
@@ -0,0 +1,6 @@
1require attr.inc
2
3SRC_URI[md5sum] = "bc1e5cb5c96d99b24886f1f527d3bb3d"
4SRC_URI[sha256sum] = "5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7"
5
6BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
deleted file mode 100644
index 9336ffc938..0000000000
--- a/meta/recipes-support/attr/ea-acl.inc
+++ /dev/null
@@ -1,52 +0,0 @@
1# this build system is mostly shared by attr and acl
2
3SRC_URI += "file://relative-libdir.patch;striplevel=0 \
4 "
5# This patch should be applied after '(attr\|acl)-Missing-configure.ac.patch'
6SRC_URI_append = " file://0001-Added-configure-option-to-enable-disable-static-libr.patch"
7
8inherit autotools-brokensep gettext
9
10# When upstream is using automake properly, this can be removed
11CLEANBROKEN = "1"
12
13# the package comes with a custom config.h.in, it cannot be
14# overwritten by autoheader
15EXTRA_AUTORECONF += "--exclude=autoheader"
16EXTRA_OECONF = "INSTALL_USER=root INSTALL_GROUP=root"
17EXTRA_OECONF_append_class-native = " --enable-gettext=no"
18EXTRA_OECONF_append_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS') == 'no')]}"
19
20EXTRA_OEMAKE = "PKG_LIB_DIR=${base_libdir} PKG_DEVLIB_DIR=${libdir}"
21
22do_install () {
23 oe_runmake install install-lib install-dev DIST_ROOT="${D}" ZIP="gzip -n"
24}
25
26do_install_append_class-native () {
27 if test "${libdir}" = "${base_libdir}" ; then
28 return
29 fi
30 librelpath=${@os.path.relpath(d.getVar('libdir'), d.getVar('base_libdir'))}
31 baselibrelpath=${@os.path.relpath(d.getVar('base_libdir'), d.getVar('libdir'))}
32
33 # Remove bad symlinks & create the correct symlinks
34 if test -L ${D}${libdir}/lib${BPN}.so ; then
35 rm -rf ${D}${libdir}/lib${BPN}.so
36 ln -sf $baselibrelpath/lib${BPN}.so ${D}${libdir}/lib${BPN}.so
37 fi
38 if test -L ${D}${base_libdir}/lib${BPN}.a ; then
39 rm -rf ${D}${base_libdir}/lib${BPN}.a
40 ln -sf $librelpath/lib${BPN}.a ${D}${base_libdir}/lib${BPN}.a
41 fi
42 if test -L ${D}${base_libdir}/lib${BPN}.la ; then
43 rm -rf ${D}${base_libdir}/lib${BPN}.la
44 ln -sf $librelpath/lib${BPN}.la ${D}${base_libdir}/lib${BPN}.la
45 fi
46}
47
48PACKAGES =+ "lib${BPN}"
49
50FILES_lib${BPN} = "${base_libdir}/lib*${SOLIBS}"
51
52BBCLASSEXTEND = "native"
diff --git a/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch b/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch
deleted file mode 100644
index 1c1159f2c9..0000000000
--- a/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From 01256c61ba126449c46dd4ab5d5e145488b981fa Mon Sep 17 00:00:00 2001
2From: Amarnath Valluri <amarnath.valluri@intel.com>
3Date: Mon, 23 Jan 2017 13:25:13 +0200
4Subject: [PATCH] Added configure option to enable/disable static library
5
6Create static library archive only in case of --enable-static.
7
8Upstream-Status: Pending
9
10Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
11---
12 configure.ac | 6 ++++++
13 include/builddefs.in | 1 +
14 include/buildmacros | 3 +++
15 3 files changed, 10 insertions(+)
16
17diff --git a/configure.ac b/configure.ac
18index b966d0e..e48268b 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -26,6 +26,12 @@ AC_ARG_ENABLE(shared,
22 enable_shared=yes)
23 AC_SUBST(enable_shared)
24
25+AC_ARG_ENABLE(static,
26+[ --enable-static=[yes/no] Enable use of static libraries [default=yes]],,
27+ enable_static=yes)
28+AC_SUBST(enable_static)
29+
30+
31 AC_ARG_ENABLE(gettext,
32 [ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],,
33 enable_gettext=yes)
34diff --git a/include/builddefs.in b/include/builddefs.in
35index d9931db..3b3dbd2 100644
36--- a/include/builddefs.in
37+++ b/include/builddefs.in
38@@ -71,6 +71,7 @@ RPMBUILD = @rpmbuild@
39 RPM_VERSION = @rpm_version@
40
41 ENABLE_SHARED = @enable_shared@
42+ENABLE_STATIC = @enable_static@
43 ENABLE_GETTEXT = @enable_gettext@
44
45 HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@
46diff --git a/include/buildmacros b/include/buildmacros
47index 39fa7e2..b0f25c5 100644
48--- a/include/buildmacros
49+++ b/include/buildmacros
50@@ -80,6 +80,7 @@ endif
51 # /usr/lib.
52 ifeq ($(ENABLE_SHARED),yes)
53 INSTALL_LTLIB_DEV = \
54+ set -x; \
55 cd $(TOPDIR)/$(LIBNAME)/.libs; \
56 ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
57 ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \
58@@ -88,7 +89,9 @@ INSTALL_LTLIB_DEV = \
59 ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
60 if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
61 rel_lib_prefix=$$(echo $(PKG_LIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
62+ if test "$(ENABLE_STATIC)" = "yes" ; then \
63 ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
64+ fi ;\
65 ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
66 rel_devlib_prefix=$$(echo $(PKG_DEVLIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
67 ../$(INSTALL) -S $$rel_devlib_prefix$(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
68--
692.7.4
70
diff --git a/meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch b/meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch
deleted file mode 100644
index d5ab83d7c6..0000000000
--- a/meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch
+++ /dev/null
@@ -1,240 +0,0 @@
1From 6047c8522b91235ad1e835f44f5e36472d9d49b2 Mon Sep 17 00:00:00 2001
2From: Andreas Gruenbacher <andreas.gruenbacher@gmail.com>
3Date: Wed, 22 Apr 2015 11:46:59 +0200
4Subject: [PATCH 2/2] Remove the attr.5 man page (moved to man-pages)
5
6Commit dce9b4448c7f2b22bd206cd068fb05cb2f3255b9 from
7https://git.savannah.nongnu.org/git/attr.git
8
9The attr.5 page is part of the extended attribute system call documentation,
10which has been moved into the man-pages package. Move the attr.5 page there
11as well.
12
13Upstream-Status: Backport
14
15[MA: updated to apply directly to v2.4.47]
16Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
17---
18 man/Makefile | 2 +-
19 man/man5/Makefile | 35 -------------
20 man/man5/attr.5 | 153 ------------------------------------------------------
21 3 files changed, 1 insertion(+), 189 deletions(-)
22 delete mode 100644 man/man5/Makefile
23 delete mode 100644 man/man5/attr.5
24
25diff --git a/man/Makefile b/man/Makefile
26index 755daed..9301f09 100644
27--- a/man/Makefile
28+++ b/man/Makefile
29@@ -19,7 +19,7 @@
30 TOPDIR = ..
31 include $(TOPDIR)/include/builddefs
32
33-SUBDIRS = man1 man3 man5
34+SUBDIRS = man1 man3
35
36 default : $(SUBDIRS)
37
38diff --git a/man/man5/Makefile b/man/man5/Makefile
39deleted file mode 100644
40index 6b70d3d..0000000
41--- a/man/man5/Makefile
42+++ /dev/null
43@@ -1,35 +0,0 @@
44-#
45-# Copyright (c) 2000, 2002 Silicon Graphics, Inc. All Rights Reserved.
46-# Copyright (C) 2009 Andreas Gruenbacher <agruen@suse.de>
47-#
48-# This program is free software: you can redistribute it and/or modify it
49-# under the terms of the GNU General Public License as published by
50-# the Free Software Foundation, either version 2 of the License, or
51-# (at your option) any later version.
52-#
53-# This program is distributed in the hope that it will be useful,
54-# but WITHOUT ANY WARRANTY; without even the implied warranty of
55-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
56-# GNU General Public License for more details.
57-#
58-# You should have received a copy of the GNU General Public License
59-# along with this program. If not, see <http://www.gnu.org/licenses/>.
60-#
61-
62-TOPDIR = ../..
63-include $(TOPDIR)/include/builddefs
64-
65-MAN_SECTION = 5
66-
67-MAN_PAGES = $(shell echo *.$(MAN_SECTION))
68-MAN_DEST = $(PKG_MAN_DIR)/man$(MAN_SECTION)
69-LSRCFILES = $(MAN_PAGES)
70-
71-default : $(MAN_PAGES)
72-
73-include $(BUILDRULES)
74-
75-install : default
76- $(INSTALL) -m 755 -d $(MAN_DEST)
77- $(INSTALL_MAN)
78-install-dev install-lib:
79diff --git a/man/man5/attr.5 b/man/man5/attr.5
80deleted file mode 100644
81index a02757d..0000000
82--- a/man/man5/attr.5
83+++ /dev/null
84@@ -1,153 +0,0 @@
85-.\" Extended attributes manual page
86-.\"
87-.\" Copyright (C) 2000, 2002, 2007 Andreas Gruenbacher <agruen@suse.de>
88-.\" Copyright (C) 2001, 2002, 2004, 2007 Silicon Graphics, Inc.
89-.\" All rights reserved.
90-.\"
91-.\" This is free documentation; you can redistribute it and/or
92-.\" modify it under the terms of the GNU General Public License as
93-.\" published by the Free Software Foundation; either version 2 of
94-.\" the License, or (at your option) any later version.
95-.\"
96-.\" The GNU General Public License's references to "object code"
97-.\" and "executables" are to be interpreted as the output of any
98-.\" document formatting or typesetting system, including
99-.\" intermediate and printed output.
100-.\"
101-.\" This manual is distributed in the hope that it will be useful,
102-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
103-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
104-.\" GNU General Public License for more details.
105-.\"
106-.\" You should have received a copy of the GNU General Public
107-.\" License along with this manual. If not, see
108-.\" <http://www.gnu.org/licenses/>.
109-.\"
110-.TH ATTR 5
111-.SH NAME
112-attr - Extended attributes
113-.SH DESCRIPTION
114-Extended attributes are name:value pairs associated permanently with
115-files and directories, similar to the environment strings associated
116-with a process.
117-An attribute may be defined or undefined.
118-If it is defined, its value may be empty or non-empty.
119-.PP
120-Extended attributes are extensions to the normal attributes which are
121-associated with all inodes in the system (i.e. the
122-.BR stat (2)
123-data).
124-They are often used to provide additional functionality
125-to a filesystem \- for example, additional security features such as
126-Access Control Lists (ACLs) may be implemented using extended attributes.
127-.PP
128-Users with search access to a file or directory may retrieve a list of
129-attribute names defined for that file or directory.
130-.PP
131-Extended attributes are accessed as atomic objects.
132-Reading retrieves the whole value of an attribute and stores it in a buffer.
133-Writing replaces any previous value with the new value.
134-.PP
135-Space consumed for extended attributes is counted towards the disk quotas
136-of the file owner and file group.
137-.PP
138-Currently, support for extended attributes is implemented on Linux by the
139-ext2, ext3, ext4, XFS, JFS and reiserfs filesystems.
140-.SH EXTENDED ATTRIBUTE NAMESPACES
141-Attribute names are zero-terminated strings.
142-The attribute name is always specified in the fully qualified
143-.IR namespace.attribute
144-form, eg.
145-.IR user.mime_type ,
146-.IR trusted.md5sum ,
147-.IR system.posix_acl_access ,
148-or
149-.IR security.selinux .
150-.PP
151-The namespace mechanism is used to define different classes of extended
152-attributes.
153-These different classes exist for several reasons, e.g. the permissions
154-and capabilities required for manipulating extended attributes of one
155-namespace may differ to another.
156-.PP
157-Currently the
158-.IR security ,
159-.IR system ,
160-.IR trusted ,
161-and
162-.IR user
163-extended attribute classes are defined as described below. Additional
164-classes may be added in the future.
165-.SS Extended security attributes
166-The security attribute namespace is used by kernel security modules,
167-such as Security Enhanced Linux.
168-Read and write access permissions to security attributes depend on the
169-policy implemented for each security attribute by the security module.
170-When no security module is loaded, all processes have read access to
171-extended security attributes, and write access is limited to processes
172-that have the CAP_SYS_ADMIN capability.
173-.SS Extended system attributes
174-Extended system attributes are used by the kernel to store system
175-objects such as Access Control Lists and Capabilities. Read and write
176-access permissions to system attributes depend on the policy implemented
177-for each system attribute implemented by filesystems in the kernel.
178-.SS Trusted extended attributes
179-Trusted extended attributes are visible and accessible only to processes that
180-have the CAP_SYS_ADMIN capability (the super user usually has this
181-capability).
182-Attributes in this class are used to implement mechanisms in user
183-space (i.e., outside the kernel) which keep information in extended attributes
184-to which ordinary processes should not have access.
185-.SS Extended user attributes
186-Extended user attributes may be assigned to files and directories for
187-storing arbitrary additional information such as the mime type,
188-character set or encoding of a file. The access permissions for user
189-attributes are defined by the file permission bits.
190-.PP
191-The file permission bits of regular files and directories are
192-interpreted differently from the file permission bits of special files
193-and symbolic links. For regular files and directories the file
194-permission bits define access to the file's contents, while for device special
195-files they define access to the device described by the special file.
196-The file permissions of symbolic links are not used in access
197-checks. These differences would allow users to consume filesystem resources in
198-a way not controllable by disk quotas for group or world writable special files and directories.
199-.PP
200-For this reason, extended user attributes are only allowed for regular files and directories, and access to extended user attributes is restricted to the
201-owner and to users with appropriate capabilities for directories with the
202-sticky bit set (see the
203-.BR chmod (1)
204-manual page for an explanation of Sticky Directories).
205-.SH FILESYSTEM DIFFERENCES
206-The kernel and the filesystem may place limits on the maximum number
207-and size of extended attributes that can be associated with a file.
208-Some file systems, such as ext2/3 and reiserfs, require the filesystem
209-to be mounted with the
210-.B user_xattr
211-mount option in order for extended user attributes to be used.
212-.PP
213-In the current ext2, ext3 and ext4 filesystem implementations, each
214-extended attribute must fit on a single filesystem block (1024, 2048
215-or 4096 bytes, depending on the block size specified when the
216-filesystem was created).
217-.PP
218-In the XFS and reiserfs filesystem implementations, there is no
219-practical limit on the number or size of extended attributes
220-associated with a file, and the algorithms used to store extended
221-attribute information on disk are scalable.
222-.PP
223-In the JFS filesystem implementation, names can be up to 255 bytes and
224-values up to 65,535 bytes.
225-.SH ADDITIONAL NOTES
226-Since the filesystems on which extended attributes are stored might also
227-be used on architectures with a different byte order and machine word
228-size, care should be taken to store attribute values in an architecture
229-independent format.
230-.SH AUTHORS
231-Andreas Gruenbacher,
232-.RI < a.gruenbacher@bestbits.at >
233-and the SGI XFS development team,
234-.RI < linux-xfs@oss.sgi.com >.
235-.SH SEE ALSO
236-getfattr(1),
237-setfattr(1).
238--
2392.7.4
240
diff --git a/meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch b/meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch
deleted file mode 100644
index 044c5a037c..0000000000
--- a/meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch
+++ /dev/null
@@ -1,666 +0,0 @@
1From b972600a26f3a930e53e2fce2625266a5d29813e Mon Sep 17 00:00:00 2001
2From: Andreas Gruenbacher <andreas.gruenbacher@gmail.com>
3Date: Tue, 14 Apr 2015 23:53:11 +0200
4Subject: [PATCH 1/2] Remove the section 2 man pages
5
6Commit 8d1263bca95722d66a6f8e83450f49d0956ea534 from upstream
7https://git.savannah.nongnu.org/git/attr.git/
8
9The section 2 man pages have long since been added to the man-pages package
10which documents all system calls; they were disabled in attr by default since
11January 2014. Get rid of them here.
12
13Upstream-Status: Backport
14
15[MA: modified to apply directly to v2.4.47]
16Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
17---
18 man/Makefile | 2 +-
19 man/man2/Makefile | 35 -----------
20 man/man2/getxattr.2 | 143 --------------------------------------------
21 man/man2/listxattr.2 | 158 -------------------------------------------------
22 man/man2/removexattr.2 | 111 ----------------------------------
23 man/man2/setxattr.2 | 143 --------------------------------------------
24 6 files changed, 1 insertion(+), 591 deletions(-)
25 delete mode 100644 man/man2/Makefile
26 delete mode 100644 man/man2/getxattr.2
27 delete mode 100644 man/man2/listxattr.2
28 delete mode 100644 man/man2/removexattr.2
29 delete mode 100644 man/man2/setxattr.2
30
31diff --git a/man/Makefile b/man/Makefile
32index 9535426..755daed 100644
33--- a/man/Makefile
34+++ b/man/Makefile
35@@ -19,7 +19,7 @@
36 TOPDIR = ..
37 include $(TOPDIR)/include/builddefs
38
39-SUBDIRS = man1 man2 man3 man5
40+SUBDIRS = man1 man3 man5
41
42 default : $(SUBDIRS)
43
44diff --git a/man/man2/Makefile b/man/man2/Makefile
45deleted file mode 100644
46index d77309d..0000000
47--- a/man/man2/Makefile
48+++ /dev/null
49@@ -1,35 +0,0 @@
50-#
51-# Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved.
52-# Copyright (C) 2009 Andreas Gruenbacher <agruen@suse.de>
53-#
54-# This program is free software: you can redistribute it and/or modify it
55-# under the terms of the GNU General Public License as published by
56-# the Free Software Foundation, either version 2 of the License, or
57-# (at your option) any later version.
58-#
59-# This program is distributed in the hope that it will be useful,
60-# but WITHOUT ANY WARRANTY; without even the implied warranty of
61-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
62-# GNU General Public License for more details.
63-#
64-# You should have received a copy of the GNU General Public License
65-# along with this program. If not, see <http://www.gnu.org/licenses/>.
66-#
67-
68-TOPDIR = ../..
69-include $(TOPDIR)/include/builddefs
70-
71-MAN_SECTION = 2
72-
73-MAN_PAGES = $(shell echo *.$(MAN_SECTION))
74-MAN_DEST = $(PKG_MAN_DIR)/man$(MAN_SECTION)
75-LSRCFILES = $(MAN_PAGES)
76-
77-default install : $(MAN_PAGES)
78-
79-include $(BUILDRULES)
80-
81-install-dev : default
82- $(INSTALL) -m 755 -d $(MAN_DEST)
83- $(INSTALL_MAN)
84-install-lib:
85diff --git a/man/man2/getxattr.2 b/man/man2/getxattr.2
86deleted file mode 100644
87index 405ad89..0000000
88--- a/man/man2/getxattr.2
89+++ /dev/null
90@@ -1,143 +0,0 @@
91-.\"
92-.\" Extended attributes system calls manual pages
93-.\"
94-.\" (C) Andreas Gruenbacher, February 2001
95-.\" (C) Silicon Graphics Inc, September 2001
96-.\"
97-.\" This is free documentation; you can redistribute it and/or
98-.\" modify it under the terms of the GNU General Public License as
99-.\" published by the Free Software Foundation; either version 2 of
100-.\" the License, or (at your option) any later version.
101-.\"
102-.\" The GNU General Public License's references to "object code"
103-.\" and "executables" are to be interpreted as the output of any
104-.\" document formatting or typesetting system, including
105-.\" intermediate and printed output.
106-.\"
107-.\" This manual is distributed in the hope that it will be useful,
108-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
109-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
110-.\" GNU General Public License for more details.
111-.\"
112-.\" You should have received a copy of the GNU General Public
113-.\" License along with this manual. If not, see
114-.\" <http://www.gnu.org/licenses/>.
115-.\"
116-.TH GETXATTR 2 "Extended Attributes" "Dec 2001" "System calls"
117-.SH NAME
118-getxattr, lgetxattr, fgetxattr \- retrieve an extended attribute value
119-.SH SYNOPSIS
120-.fam C
121-.nf
122-.B #include <sys/types.h>
123-.B #include <attr/xattr.h>
124-.sp
125-.BI "ssize_t getxattr (const char\ *" path ", const char\ *" name ",
126-.BI "\t\t\t\t void\ *" value ", size_t " size );
127-.BI "ssize_t lgetxattr (const char\ *" path ", const char\ *" name ",
128-.BI "\t\t\t\t void\ *" value ", size_t " size );
129-.BI "ssize_t fgetxattr (int " filedes ", const char\ *" name ",
130-.BI "\t\t\t\t void\ *" value ", size_t " size );
131-.fi
132-.fam T
133-.SH DESCRIPTION
134-Extended attributes are
135-.IR name :\c
136-.I value
137-pairs associated with inodes (files, directories, symlinks, etc).
138-They are extensions to the normal attributes which are associated
139-with all inodes in the system (i.e. the
140-.BR stat (2)
141-data).
142-A complete overview of extended attributes concepts can be found in
143-.BR attr (5).
144-.PP
145-.B getxattr
146-retrieves the
147-.I value
148-of the extended attribute identified by
149-.I name
150-and associated with the given
151-.I path
152-in the filesystem.
153-The length of the attribute
154-.I value
155-is returned.
156-.PP
157-.B lgetxattr
158-is identical to
159-.BR getxattr ,
160-except in the case of a symbolic link, where the link itself is
161-interrogated, not the file that it refers to.
162-.PP
163-.B fgetxattr
164-is identical to
165-.BR getxattr ,
166-only the open file pointed to by
167-.I filedes
168-(as returned by
169-.BR open (2))
170-is interrogated in place of
171-.IR path .
172-.PP
173-An extended attribute
174-.I name
175-is a simple NULL-terminated string.
176-The name includes a namespace prefix \- there may be several, disjoint
177-namespaces associated with an individual inode.
178-The value of an extended attribute is a chunk of arbitrary textual or
179-binary data of specified length.
180-.PP
181-An empty buffer of
182-.I size
183-zero can be passed into these calls to return the current size of the
184-named extended attribute, which can be used to estimate the size of a
185-buffer which is sufficiently large to hold the value associated with
186-the extended attribute.
187-.PP
188-The interface is designed to allow guessing of initial buffer
189-sizes, and to enlarge buffers when the return value indicates
190-that the buffer provided was too small.
191-.SH RETURN VALUE
192-On success, a positive number is returned indicating the size of the
193-extended attribute value.
194-On failure, \-1 is returned and
195-.I errno
196-is set appropriately.
197-.PP
198-If the named attribute does not exist, or the process has no access to
199-this attribute,
200-.I errno
201-is set to ENOATTR.
202-.PP
203-If the
204-.I size
205-of the
206-.I value
207-buffer is too small to hold the result,
208-.I errno
209-is set to ERANGE.
210-.PP
211-If extended attributes are not supported by the filesystem, or are disabled,
212-.I errno
213-is set to ENOTSUP.
214-.PP
215-The errors documented for the
216-.BR stat (2)
217-system call are also applicable here.
218-.SH AUTHORS
219-Andreas Gruenbacher,
220-.RI < a.gruenbacher@bestbits.at >
221-and the SGI XFS development team,
222-.RI < linux-xfs@oss.sgi.com >.
223-Please send any bug reports or comments to these addresses.
224-.SH SEE ALSO
225-.BR getfattr (1),
226-.BR setfattr (1),
227-.BR open (2),
228-.BR stat (2),
229-.BR setxattr (2),
230-.BR listxattr (2),
231-.BR removexattr (2),
232-and
233-.BR attr (5).
234diff --git a/man/man2/listxattr.2 b/man/man2/listxattr.2
235deleted file mode 100644
236index 8b4371c..0000000
237--- a/man/man2/listxattr.2
238+++ /dev/null
239@@ -1,158 +0,0 @@
240-.\"
241-.\" Extended attributes system calls manual pages
242-.\"
243-.\" (C) Andreas Gruenbacher, February 2001
244-.\" (C) Silicon Graphics Inc, September 2001
245-.\"
246-.\" This is free documentation; you can redistribute it and/or
247-.\" modify it under the terms of the GNU General Public License as
248-.\" published by the Free Software Foundation; either version 2 of
249-.\" the License, or (at your option) any later version.
250-.\"
251-.\" The GNU General Public License's references to "object code"
252-.\" and "executables" are to be interpreted as the output of any
253-.\" document formatting or typesetting system, including
254-.\" intermediate and printed output.
255-.\"
256-.\" This manual is distributed in the hope that it will be useful,
257-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
258-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
259-.\" GNU General Public License for more details.
260-.\"
261-.\" You should have received a copy of the GNU General Public
262-.\" License along with this manual. If not, see
263-.\" <http://www.gnu.org/licenses/>.
264-.\"
265-.TH LISTXATTR 2 "Extended Attributes" "Dec 2001" "System calls"
266-.SH NAME
267-listxattr, llistxattr, flistxattr \- list extended attribute names
268-.SH SYNOPSIS
269-.fam C
270-.nf
271-.B #include <sys/types.h>
272-.B #include <attr/xattr.h>
273-.sp
274-.BI "ssize_t listxattr (const char\ *" path ",
275-.BI "\t\t\t\t char\ *" list ", size_t " size );
276-.BI "ssize_t llistxattr (const char\ *" path ",
277-.BI "\t\t\t\t char\ *" list ", size_t " size );
278-.BI "ssize_t flistxattr (int " filedes ",
279-.BI "\t\t\t\t char\ *" list ", size_t " size );
280-.fi
281-.fam T
282-.SH DESCRIPTION
283-Extended attributes are name:value
284-pairs associated with inodes (files, directories, symlinks, etc).
285-They are extensions to the normal attributes which are associated
286-with all inodes in the system (i.e. the
287-.BR stat (2)
288-data).
289-A complete overview of extended attributes concepts can be found in
290-.BR attr (5).
291-.PP
292-.B listxattr
293-retrieves the
294-.I list
295-of extended attribute names associated with the given
296-.I path
297-in the filesystem.
298-The list is the set of (NULL-terminated) names, one after the other.
299-Names of extended attributes to which the calling process does not
300-have access may be omitted from the list.
301-The length of the attribute name
302-.I list
303-is returned.
304-.PP
305-.B llistxattr
306-is identical to
307-.BR listxattr ,
308-except in the case of a symbolic link, where the list of names of
309-extended attributes associated with the link itself is retrieved,
310-not the file that it refers to.
311-.I list
312-is a caller-allocated buffer of size
313-.IR size .
314-.PP
315-.B flistxattr
316-is identical to
317-.BR listxattr ,
318-only the open file pointed to by
319-.I filedes
320-(as returned by
321-.BR open (2))
322-is interrogated in place of
323-.IR path .
324-.PP
325-A single extended attribute
326-.I name
327-is a simple NULL-terminated string.
328-The name includes a namespace prefix \- there may be several, disjoint
329-namespaces associated with an individual inode.
330-.PP
331-An empty buffer of
332-.I size
333-zero can be passed into these calls to return the current size of the
334-list of extended attribute names, which can be used to estimate the
335-size of a buffer which is sufficiently large to hold the list of names.
336-.SH EXAMPLES
337-The
338-.I list
339-of names is returned as an unordered array of NULL-terminated character
340-strings (attribute names are separated by NULL characters), like this:
341-.fam C
342-.RS
343-.nf
344-user.name1\\0system.name1\\0user.name2\\0
345-.fi
346-.RE
347-.fam T
348-.P
349-Filesystems like ext2, ext3 and XFS which implement POSIX ACLs using
350-extended attributes, might return a
351-.I list
352-like this:
353-.fam C
354-.RS
355-.nf
356-system.posix_acl_access\\0system.posix_acl_default\\0
357-.fi
358-.RE
359-.fam T
360-.SH RETURN VALUE
361-On success, a positive number is returned indicating the size of the
362-extended attribute name list.
363-On failure, \-1 is returned and
364-.I errno
365-is set appropriately.
366-.PP
367-If the
368-.I size
369-of the
370-.I list
371-buffer is too small to hold the result,
372-.I errno
373-is set to ERANGE.
374-.PP
375-If extended attributes are not supported by the filesystem, or are disabled,
376-.I errno
377-is set to ENOTSUP.
378-.PP
379-The errors documented for the
380-.BR stat (2)
381-system call are also applicable here.
382-.SH AUTHORS
383-Andreas Gruenbacher,
384-.RI < a.gruenbacher@bestbits.at >
385-and the SGI XFS development team,
386-.RI < linux-xfs@oss.sgi.com >.
387-Please send any bug reports or comments to these addresses.
388-.SH SEE ALSO
389-.BR getfattr (1),
390-.BR setfattr (1),
391-.BR open (2),
392-.BR stat (2),
393-.BR getxattr (2),
394-.BR setxattr (2),
395-.BR removexattr (2),
396-and
397-.BR attr (5).
398diff --git a/man/man2/removexattr.2 b/man/man2/removexattr.2
399deleted file mode 100644
400index 2c7d934..0000000
401--- a/man/man2/removexattr.2
402+++ /dev/null
403@@ -1,111 +0,0 @@
404-.\"
405-.\" Extended attributes system calls manual pages
406-.\"
407-.\" (C) Andreas Gruenbacher, February 2001
408-.\" (C) Silicon Graphics Inc, September 2001
409-.\"
410-.\" This is free documentation; you can redistribute it and/or
411-.\" modify it under the terms of the GNU General Public License as
412-.\" published by the Free Software Foundation; either version 2 of
413-.\" the License, or (at your option) any later version.
414-.\"
415-.\" The GNU General Public License's references to "object code"
416-.\" and "executables" are to be interpreted as the output of any
417-.\" document formatting or typesetting system, including
418-.\" intermediate and printed output.
419-.\"
420-.\" This manual is distributed in the hope that it will be useful,
421-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
422-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
423-.\" GNU General Public License for more details.
424-.\"
425-.\" You should have received a copy of the GNU General Public
426-.\" License along with this manual. If not, see
427-.\" <http://www.gnu.org/licenses/>.
428-.\"
429-.TH REMOVEXATTR 2 "Extended Attributes" "Dec 2001" "System calls"
430-.SH NAME
431-removexattr, lremovexattr, fremovexattr \- remove an extended attribute
432-.SH SYNOPSIS
433-.fam C
434-.nf
435-.B #include <sys/types.h>
436-.B #include <attr/xattr.h>
437-.sp
438-.BI "int removexattr (const char\ *" path ", const char\ *" name );
439-.BI "int lremovexattr (const char\ *" path ", const char\ *" name );
440-.BI "int fremovexattr (int " filedes ", const char\ *" name );
441-.fi
442-.fam T
443-.SH DESCRIPTION
444-Extended attributes are
445-.IR name :\c
446-value pairs associated with inodes (files, directories, symlinks, etc).
447-They are extensions to the normal attributes which are associated
448-with all inodes in the system (i.e. the
449-.BR stat (2)
450-data).
451-A complete overview of extended attributes concepts can be found in
452-.BR attr (5).
453-.PP
454-.B removexattr
455-removes the extended attribute identified by
456-.I name
457-and associated with the given
458-.I path
459-in the filesystem.
460-.PP
461-.B lremovexattr
462-is identical to
463-.BR removexattr ,
464-except in the case of a symbolic link, where the extended attribute is
465-removed from the link itself, not the file that it refers to.
466-.PP
467-.B fremovexattr
468-is identical to
469-.BR removexattr ,
470-only the extended attribute is removed from the open file pointed to by
471-.I filedes
472-(as returned by
473-.BR open (2))
474-in place of
475-.IR path .
476-.PP
477-An extended attribute name is a simple NULL-terminated string.
478-The
479-.I name
480-includes a namespace prefix \- there may be several, disjoint
481-namespaces associated with an individual inode.
482-.SH RETURN VALUE
483-On success, zero is returned.
484-On failure, \-1 is returned and
485-.I errno
486-is set appropriately.
487-.PP
488-If the named attribute does not exist,
489-.I errno
490-is set to ENOATTR.
491-.PP
492-If extended attributes are not supported by the filesystem, or are disabled,
493-.I errno
494-is set to ENOTSUP.
495-.PP
496-The errors documented for the
497-.BR stat (2)
498-system call are also applicable here.
499-.SH AUTHORS
500-Andreas Gruenbacher,
501-.RI < a.gruenbacher@bestbits.at >
502-and the SGI XFS development team,
503-.RI < linux-xfs@oss.sgi.com >.
504-Please send any bug reports or comments to these addresses.
505-.SH SEE ALSO
506-.BR getfattr (1),
507-.BR setfattr (1),
508-.BR open (2),
509-.BR stat (2),
510-.BR setxattr (2),
511-.BR getxattr (2),
512-.BR listxattr (2),
513-and
514-.BR attr (5).
515diff --git a/man/man2/setxattr.2 b/man/man2/setxattr.2
516deleted file mode 100644
517index b20dc9f..0000000
518--- a/man/man2/setxattr.2
519+++ /dev/null
520@@ -1,143 +0,0 @@
521-.\"
522-.\" Extended attributes system calls manual pages
523-.\"
524-.\" (C) Andreas Gruenbacher, February 2001
525-.\" (C) Silicon Graphics Inc, September 2001
526-.\"
527-.\" This is free documentation; you can redistribute it and/or
528-.\" modify it under the terms of the GNU General Public License as
529-.\" published by the Free Software Foundation; either version 2 of
530-.\" the License, or (at your option) any later version.
531-.\"
532-.\" The GNU General Public License's references to "object code"
533-.\" and "executables" are to be interpreted as the output of any
534-.\" document formatting or typesetting system, including
535-.\" intermediate and printed output.
536-.\"
537-.\" This manual is distributed in the hope that it will be useful,
538-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
539-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
540-.\" GNU General Public License for more details.
541-.\"
542-.\" You should have received a copy of the GNU General Public
543-.\" License along with this manual. If not, see
544-.\" <http://www.gnu.org/licenses/>.
545-.\"
546-.TH SETXATTR 2 "Extended Attributes" "Dec 2001" "System calls"
547-.SH NAME
548-setxattr, lsetxattr, fsetxattr \- set an extended attribute value
549-.SH SYNOPSIS
550-.fam C
551-.nf
552-.B #include <sys/types.h>
553-.B #include <attr/xattr.h>
554-.sp
555-.BI "int setxattr (const char\ *" path ", const char\ *" name ",
556-.BI "\t\t\t const void\ *" value ", size_t " size ", int " flags );
557-.BI "int lsetxattr (const char\ *" path ", const char\ *" name ",
558-.BI "\t\t\t const void\ *" value ", size_t " size ", int " flags );
559-.BI "int fsetxattr (int " filedes ", const char\ *" name ",
560-.BI "\t\t\t const void\ *" value ", size_t " size ", int " flags );
561-.fi
562-.fam T
563-.SH DESCRIPTION
564-Extended attributes are
565-.IR name :\c
566-.I value
567-pairs associated with inodes (files, directories, symlinks, etc).
568-They are extensions to the normal attributes which are associated
569-with all inodes in the system (i.e. the
570-.BR stat (2)
571-data).
572-A complete overview of extended attributes concepts can be found in
573-.BR attr (5).
574-.PP
575-.B setxattr
576-sets the
577-.I value
578-of the extended attribute identified by
579-.I name
580-and associated with the given
581-.I path
582-in the filesystem.
583-The
584-.I size
585-of the
586-.I value
587-must be specified.
588-.PP
589-.B lsetxattr
590-is identical to
591-.BR setxattr ,
592-except in the case of a symbolic link, where the extended attribute is
593-set on the link itself, not the file that it refers to.
594-.PP
595-.B fsetxattr
596-is identical to
597-.BR setxattr ,
598-only the extended attribute is set on the open file pointed to by
599-.I filedes
600-(as returned by
601-.BR open (2))
602-in place of
603-.IR path .
604-.PP
605-An extended attribute name is a simple NULL-terminated string.
606-The
607-.I name
608-includes a namespace prefix \- there may be several, disjoint
609-namespaces associated with an individual inode.
610-The
611-.I value
612-of an extended attribute is a chunk of arbitrary textual or
613-binary data of specified length.
614-.PP
615-The
616-.I flags
617-parameter can be used to refine the semantics of the operation.
618-XATTR_CREATE specifies a pure create, which fails if the named
619-attribute exists already.
620-XATTR_REPLACE specifies a pure replace operation, which fails if the
621-named attribute does not already exist.
622-By default (no flags), the extended attribute will be created if
623-need be, or will simply replace the value if the attribute exists.
624-.SH RETURN VALUE
625-On success, zero is returned.
626-On failure, \-1 is returned and
627-.I errno
628-is set appropriately.
629-.PP
630-If XATTR_CREATE is specified, and the attribute exists already,
631-.I errno
632-is set to EEXIST.
633-If XATTR_REPLACE is specified, and the attribute does not exist,
634-.I errno
635-is set to ENOATTR.
636-.PP
637-If there is insufficient space remaining to store the extended attribute,
638-.I errno
639-is set to either ENOSPC, or EDQUOT if quota enforcement was the cause.
640-.PP
641-If extended attributes are not supported by the filesystem, or are disabled,
642-.I errno
643-is set to ENOTSUP.
644-.PP
645-The errors documented for the
646-.BR stat (2)
647-system call are also applicable here.
648-.SH AUTHORS
649-Andreas Gruenbacher,
650-.RI < a.gruenbacher@bestbits.at >
651-and the SGI XFS development team,
652-.RI < linux-xfs@oss.sgi.com >.
653-Please send any bug reports or comments to these addresses.
654-.SH SEE ALSO
655-.BR getfattr (1),
656-.BR setfattr (1),
657-.BR open (2),
658-.BR stat (2),
659-.BR getxattr (2),
660-.BR listxattr (2),
661-.BR removexattr (2),
662-and
663-.BR attr (5).
664--
6652.7.4
666
diff --git a/meta/recipes-support/attr/files/relative-libdir.patch b/meta/recipes-support/attr/files/relative-libdir.patch
deleted file mode 100644
index b72bf184d6..0000000000
--- a/meta/recipes-support/attr/files/relative-libdir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Upstream-Status: Pending
2
3use relative path in symbolic links, or it fails in staging
4sed expression from udev
5
67/29/2010 - created by Qing He <qing.he@intel.com>
7
8diff -u include.orig/buildmacros include/buildmacros
9--- include.orig/buildmacros 2010-07-29 17:39:48.000000000 +0800
10+++ include/buildmacros 2010-07-29 18:20:34.000000000 +0800
11@@ -88,9 +88,11 @@
12 ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
13 ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
14 if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
15- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
16- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
17- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
18+ rel_lib_prefix=$$(echo $(PKG_LIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
19+ ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
20+ ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
21+ rel_devlib_prefix=$$(echo $(PKG_DEVLIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
22+ ../$(INSTALL) -S $$rel_devlib_prefix$(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
23 fi
24 else
25 INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
diff --git a/meta/recipes-support/attr/files/run-ptest b/meta/recipes-support/attr/files/run-ptest
deleted file mode 100644
index a6c6867f2d..0000000000
--- a/meta/recipes-support/attr/files/run-ptest
+++ /dev/null
@@ -1,5 +0,0 @@
1#!/bin/sh
2
3make -C test -k tests root-tests |sed \
4 -e 's|^\[.*\] \(.*\) -- ok$|PASS: \1|' \
5 -e 's|^\[.*\] \(.*\) -- failed|FAIL: \1|'
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-07-20 04:26:48 +0000