Initial commit
This commit is contained in:
Your Name
+39
@@ -0,0 +1,39 @@
|
||||
From 1a5671a4eb13b81b98c3e71f00370781563f66d8 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 10 Nov 2022 17:57:24 -0800
|
||||
Subject: [PATCH] chacl: Use portable version of dirent and readdir
|
||||
|
||||
Using 64bit versions on 32bit architectures should be enabled with
|
||||
--enable-largefile, this makes it portable across musl and glibc
|
||||
|
||||
Upstream-Status: Backport [https://git.savannah.nongnu.org/cgit/acl.git/commit/?id=2b42f64737adf6a2ddd491213580d6e9cdd2f5af]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
tools/chacl.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tools/chacl.c b/tools/chacl.c
|
||||
index 525a7ff..8fff875 100644
|
||||
--- a/tools/chacl.c
|
||||
+++ b/tools/chacl.c
|
||||
@@ -320,7 +320,7 @@ walk_dir(acl_t acl, acl_t dacl, const char *fname)
|
||||
{
|
||||
int failed = 0;
|
||||
DIR *dir;
|
||||
- struct dirent64 *d;
|
||||
+ struct dirent *d;
|
||||
char *name;
|
||||
|
||||
if ((dir = opendir(fname)) == NULL) {
|
||||
@@ -332,7 +332,7 @@ walk_dir(acl_t acl, acl_t dacl, const char *fname)
|
||||
return(0); /* got a file, not an error */
|
||||
}
|
||||
|
||||
- while ((d = readdir64(dir)) != NULL) {
|
||||
+ while ((d = readdir(dir)) != NULL) {
|
||||
/* skip "." and ".." entries */
|
||||
if (strcmp(d->d_name, ".") == 0 || strcmp(d->d_name, "..") == 0)
|
||||
continue;
|
||||
--
|
||||
2.38.1
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
From 9e08219e0e99ee2589cf35fa8d52cef3515accce Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Thu, 12 Dec 2019 15:47:49 +0100
|
||||
Subject: [PATCH] test: patch out failing bits
|
||||
|
||||
I have confirmed on the host distro (Ubuntu 18.04) that they
|
||||
fail as well; upstream probably haven't noticed because the
|
||||
test is only executed under sudo.
|
||||
|
||||
Upstream-Status: Inappropriate [disabling tests instead of fixing them properly]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
test/root/permissions.test | 13 -------------
|
||||
1 file changed, 13 deletions(-)
|
||||
|
||||
diff --git a/test/root/permissions.test b/test/root/permissions.test
|
||||
index 8f8f825..21e8a95 100644
|
||||
--- a/test/root/permissions.test
|
||||
+++ b/test/root/permissions.test
|
||||
@@ -50,10 +50,6 @@ User daemon is a member in the owning group, which has only read access.
|
||||
Verify this.
|
||||
|
||||
$ su daemon
|
||||
- $ cat f
|
||||
- > root
|
||||
- > bin
|
||||
-
|
||||
$ echo daemon >> f
|
||||
>~ .*f: Permission denied$
|
||||
|
||||
@@ -146,8 +142,6 @@ the owning group, he should still have no write access.
|
||||
$ setfacl -x g:daemon f
|
||||
|
||||
$ su daemon
|
||||
- $ echo daemon4 >> f
|
||||
- >~ .*f: Permission denied$
|
||||
|
||||
|
||||
Change the owning group. The other permissions should now grant user
|
||||
@@ -158,12 +152,6 @@ daemon write access.
|
||||
|
||||
$ su daemon
|
||||
$ echo daemon5 >> f
|
||||
- $ cat f
|
||||
- > root
|
||||
- > bin
|
||||
- > daemon
|
||||
- > daemon2
|
||||
- > daemon5
|
||||
|
||||
|
||||
Verify that permissions in separate matching ACL entries do not
|
||||
@@ -173,7 +161,6 @@ accumulate.
|
||||
$ setfacl -m g:bin:r,g:daemon:w f
|
||||
|
||||
$ su daemon
|
||||
- $ : < f
|
||||
$ : > f
|
||||
$ : <> f
|
||||
>~ .*f: Permission denied$
|
||||
--
|
||||
2.17.1
|
||||
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
From 39d332a8801de5d9ef09dacb3dba85c208b7b2ad Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Thu, 12 Dec 2019 13:45:52 +0100
|
||||
Subject: [PATCH] tests: do not hardcode the build path into a helper library
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
test/Makemodule.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/Makemodule.am b/test/Makemodule.am
|
||||
index 17d4927..015de7f 100644
|
||||
--- a/test/Makemodule.am
|
||||
+++ b/test/Makemodule.am
|
||||
@@ -30,7 +30,7 @@ EXTRA_DIST += \
|
||||
check_LTLIBRARIES = libtestlookup.la
|
||||
|
||||
libtestlookup_la_SOURCES = test/test_passwd.c test/test_group.c
|
||||
-libtestlookup_la_CFLAGS = -DBASEDIR=\"$(abs_srcdir)\"
|
||||
+libtestlookup_la_CFLAGS = -DBASEDIR=\"/tmp/acl-ptest\"
|
||||
libtestlookup_la_LDFLAGS = -rpath $(abs_builddir)
|
||||
|
||||
AM_TESTS_ENVIRONMENT = PATH="$(abs_top_builddir):$$PATH";
|
||||
@@ -0,0 +1,16 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
#This script is used to run acl test suites
|
||||
|
||||
#umask 077
|
||||
|
||||
mkdir -p /tmp/acl-ptest/test
|
||||
cp test/test.* /tmp/acl-ptest/test
|
||||
|
||||
set +e
|
||||
make test-suite.log
|
||||
exitcode=$?
|
||||
if [ $exitcode -ne 0 -a -e test-suite.log ]; then
|
||||
cat test-suite.log
|
||||
fi
|
||||
exit $exitcode
|
||||
@@ -0,0 +1,86 @@
|
||||
SUMMARY = "Utilities for managing POSIX Access Control Lists"
|
||||
DESCRIPTION = "ACL allows you to provide different levels of access to files \
|
||||
and folders for different users."
|
||||
|
||||
HOMEPAGE = "http://savannah.nongnu.org/projects/acl/"
|
||||
BUGTRACKER = "http://savannah.nongnu.org/bugs/?group=acl"
|
||||
|
||||
SECTION = "libs"
|
||||
|
||||
LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
|
||||
LICENSE:${PN} = "GPL-2.0-or-later"
|
||||
LICENSE:lib${BPN} = "LGPL-2.1-or-later"
|
||||
LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \
|
||||
file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764"
|
||||
|
||||
DEPENDS = "attr"
|
||||
|
||||
SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.tar.gz \
|
||||
file://run-ptest \
|
||||
file://0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch \
|
||||
file://0001-test-patch-out-failing-bits.patch \
|
||||
file://0001-chacl-Use-portable-version-of-dirent-and-readdir.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "760c61c68901b37fdd5eefeeaf4c0c7a26bdfdd8ac747a1edff1ce0e243c11af"
|
||||
|
||||
inherit autotools gettext ptest
|
||||
|
||||
EXTRA_OECONF += "--enable-largefile"
|
||||
|
||||
PACKAGES =+ "lib${BPN}"
|
||||
|
||||
FILES:lib${BPN} = "${libdir}/lib*${SOLIBS}"
|
||||
|
||||
PTEST_BUILD_HOST_FILES = "builddefs"
|
||||
PTEST_BUILD_HOST_PATTERN = "^RPM"
|
||||
|
||||
do_compile_ptest() {
|
||||
oe_runmake libtestlookup.la
|
||||
}
|
||||
|
||||
do_install_ptest() {
|
||||
cp -rf ${S}/test/ ${D}${PTEST_PATH}
|
||||
cp -rf ${S}/build-aux/ ${D}${PTEST_PATH}
|
||||
mkdir -p ${D}${PTEST_PATH}/.libs
|
||||
cp -rf ${B}/.libs/libtestlookup* ${D}${PTEST_PATH}/.libs
|
||||
cp ${B}/Makefile ${D}${PTEST_PATH}
|
||||
|
||||
sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
|
||||
-e 's|${DEBUG_PREFIX_MAP}||g' \
|
||||
-e 's:${HOSTTOOLS_DIR}/::g' \
|
||||
-e 's:${RECIPE_SYSROOT_NATIVE}::g' \
|
||||
-e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
|
||||
-i ${D}${PTEST_PATH}/Makefile
|
||||
|
||||
sed -i "s|^srcdir =.*|srcdir = \.|g" ${D}${PTEST_PATH}/Makefile
|
||||
sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" ${D}${PTEST_PATH}/Makefile
|
||||
sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" ${D}${PTEST_PATH}/Makefile
|
||||
sed -i "s|^Makefile:.*|Makefile:|g" ${D}${PTEST_PATH}/Makefile
|
||||
|
||||
rm ${D}${PTEST_PATH}/.libs/libtestlookup.lai
|
||||
}
|
||||
|
||||
do_install_ptest:append:libc-musl() {
|
||||
sed -i -e '/test\/misc.test/d' ${D}${PTEST_PATH}/Makefile
|
||||
}
|
||||
|
||||
RDEPENDS:${PN}-ptest = "acl \
|
||||
bash \
|
||||
coreutils \
|
||||
perl \
|
||||
perl-module-constant \
|
||||
perl-module-filehandle \
|
||||
perl-module-getopt-std \
|
||||
perl-module-posix \
|
||||
shadow \
|
||||
make \
|
||||
gawk \
|
||||
e2fsprogs-mke2fs \
|
||||
perl-module-cwd \
|
||||
perl-module-file-basename \
|
||||
perl-module-file-path \
|
||||
perl-module-file-spec \
|
||||
"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
@@ -0,0 +1,71 @@
|
||||
SUMMARY = "Utilities for manipulating filesystem extended attributes"
|
||||
DESCRIPTION = "Implement the ability for a user to attach name:value pairs to objects within the XFS filesystem."
|
||||
|
||||
HOMEPAGE = "http://savannah.nongnu.org/projects/attr/"
|
||||
SECTION = "libs"
|
||||
|
||||
DEPENDS = "virtual/libintl"
|
||||
|
||||
LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
|
||||
LICENSE:${PN} = "GPL-2.0-or-later"
|
||||
LICENSE:lib${BPN} = "LGPL-2.1-or-later"
|
||||
LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \
|
||||
file://doc/COPYING.LGPL;md5=b8d31f339300bc239d73461d68e77b9c \
|
||||
file://tools/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \
|
||||
file://libattr/libattr.c;endline=17;md5=7970f77049f8fa1199fff62a7ab724fb"
|
||||
|
||||
SRC_URI = "${SAVANNAH_GNU_MIRROR}/attr/${BP}.tar.gz \
|
||||
file://run-ptest \
|
||||
"
|
||||
|
||||
inherit ptest update-alternatives autotools gettext
|
||||
|
||||
PACKAGES =+ "lib${BPN}"
|
||||
|
||||
FILES:lib${BPN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}"
|
||||
|
||||
ALTERNATIVE_PRIORITY = "100"
|
||||
ALTERNATIVE:${PN} = "setfattr"
|
||||
ALTERNATIVE_TARGET[setfattr] = "${bindir}/setfattr"
|
||||
|
||||
PTEST_BUILD_HOST_FILES = "builddefs"
|
||||
PTEST_BUILD_HOST_PATTERN = "^RPM"
|
||||
|
||||
do_install_ptest() {
|
||||
cp ${B}/Makefile ${D}${PTEST_PATH}
|
||||
sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
|
||||
-e 's|${DEBUG_PREFIX_MAP}||g' \
|
||||
-e 's:${HOSTTOOLS_DIR}/::g' \
|
||||
-e 's:${RECIPE_SYSROOT_NATIVE}::g' \
|
||||
-e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
|
||||
-i ${D}${PTEST_PATH}/Makefile
|
||||
|
||||
sed -i "s|^srcdir =.*|srcdir = \.|g" ${D}${PTEST_PATH}/Makefile
|
||||
sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" ${D}${PTEST_PATH}/Makefile
|
||||
sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" ${D}${PTEST_PATH}/Makefile
|
||||
sed -i "s|^Makefile:.*|Makefile:|g" ${D}${PTEST_PATH}/Makefile
|
||||
cp -rf ${S}/build-aux/ ${D}${PTEST_PATH}
|
||||
cp -rf ${S}/test/ ${D}${PTEST_PATH}
|
||||
}
|
||||
|
||||
do_install_ptest:append:libc-musl() {
|
||||
sed -i -e 's|f: Operation n|f: N|g' ${D}${PTEST_PATH}/test/attr.test
|
||||
}
|
||||
|
||||
RDEPENDS:${PN}-ptest = "attr \
|
||||
bash \
|
||||
coreutils \
|
||||
perl-module-constant \
|
||||
perl-module-filehandle \
|
||||
perl-module-getopt-std \
|
||||
perl-module-posix \
|
||||
make \
|
||||
perl \
|
||||
gawk \
|
||||
perl-module-cwd \
|
||||
perl-module-file-basename \
|
||||
perl-module-file-path \
|
||||
perl-module-file-spec \
|
||||
"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
@@ -0,0 +1,10 @@
|
||||
#!/bin/sh
|
||||
|
||||
set +e
|
||||
make test-suite.log
|
||||
exitcode=$?
|
||||
if [ $exitcode -ne 0 -a -e test-suite.log ]; then
|
||||
cat test-suite.log
|
||||
fi
|
||||
exit $exitcode
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
require attr.inc
|
||||
|
||||
SRC_URI[sha256sum] = "bae1c6949b258a0d68001367ce0c741cebdacdd3b62965d17e5eb23cd78adaf8"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
Reference in New Issue
Block a user