From: Simon McVittie Date: Sat, 27 May 2023 10:09:15 +0000 (+0100) Subject: Drop patch that was applied upstream X-Git-Tag: archive/raspbian/2023.7-3+rpi1~1^2~18 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=70d69249dcd58a2562babb2fb108dc3ef76375aa;p=ostree.git Drop patch that was applied upstream --- diff --git a/debian/patches/series b/debian/patches/series index 72667ff8..d9efcb28 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -tests-Ensure-non-root-users-have-access-to-libcap-tools.patch debian/Skip-test-pull-repeated-during-CI.patch debian/test-sysroot-Skip-on-s390x-by-default.patch diff --git a/debian/patches/tests-Ensure-non-root-users-have-access-to-libcap-tools.patch b/debian/patches/tests-Ensure-non-root-users-have-access-to-libcap-tools.patch deleted file mode 100644 index 2907b071..00000000 --- a/debian/patches/tests-Ensure-non-root-users-have-access-to-libcap-tools.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Simon McVittie -Date: Mon, 27 Feb 2023 12:40:05 +0000 -Subject: tests: Ensure non-root users have access to libcap tools - -On Debian systems, by default only root has /{usr/,}sbin in PATH. - -Signed-off-by: Simon McVittie -Forwarded: https://github.com/ostreedev/ostree/pull/2821 ---- - tests/libtest.sh | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/tests/libtest.sh b/tests/libtest.sh -index 264094b..963bc92 100755 ---- a/tests/libtest.sh -+++ b/tests/libtest.sh -@@ -32,6 +32,9 @@ else - fi - . ${test_srcdir}/libtest-core.sh - -+# Make sure /sbin/capsh etc. are in our PATH even if non-root -+PATH="$PATH:/usr/sbin:/sbin" -+ - # Array of expressions to execute when exiting. Each expression should - # be a single string (quoting if necessary) that will be eval'd. To add - # a command to run on exit, append to the libtest_exit_cmds array like