From b5392b332e116eca867f7c83708d55f391d2dc28 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Thu, 28 Nov 2019 09:46:34 +0200
Subject: Clean debian/patches/dyson-acl.patch
---
debian/patches/dyson-acl.patch | 57 ++++++++++--------------------------------
1 file changed, 13 insertions(+), 44 deletions(-)
diff --git a/debian/patches/dyson-acl.patch b/debian/patches/dyson-acl.patch
index a9e39d4..2f7a961 100644
--- a/debian/patches/dyson-acl.patch
+++ b/debian/patches/dyson-acl.patch
@@ -10,7 +10,7 @@ Index: fakeroot.git/libfakeroot.c
+++ fakeroot.git/libfakeroot.c
@@ -1922,6 +1922,9 @@ int fakeroot_isdisabled(void)
}
-
+
#ifdef HAVE_ACL_T
+
+/* linux: */
@@ -69,7 +69,7 @@ Index: fakeroot.git/libfakeroot.c
+#endif /* HAVE_ACL_TRIVIAL */
+
+#endif /* HAVE_ACL_T */
-
+
#ifdef HAVE_FTS_READ
FTSENT *fts_read(FTS *ftsp) {
Index: fakeroot.git/configure.ac
@@ -77,9 +77,9 @@ Index: fakeroot.git/configure.ac
--- fakeroot.git.orig/configure.ac
+++ fakeroot.git/configure.ac
@@ -288,6 +288,16 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-
+
AC_CHECK_FUNCS(fchmodat fchownat fstatat mkdirat mknodat openat renameat unlinkat lchmod fgetattrlist)
-
+
+save_LIBS="$LIBS"
+# Linux
+AC_SEARCH_LIBS(acl_get_fd, acl)
@@ -91,7 +91,7 @@ Index: fakeroot.git/configure.ac
+LIBS="$save_LIBS"
+
AC_CHECK_FUNCS(capset listxattr llistxattr flistxattr getxattr lgetxattr fgetxattr setxattr lsetxattr fsetxattr removexattr lremovexattr fremovexattr)
-
+
dnl find out how stat() etc are called. On linux systems, we really
Index: fakeroot.git/wrapfunc.inp
===================================================================
@@ -99,7 +99,7 @@ Index: fakeroot.git/wrapfunc.inp
+++ fakeroot.git/wrapfunc.inp
@@ -208,10 +208,24 @@ unlinkat;int;(int dir_fd, const char *pa
#endif /* HAVE_FSTATAT */
-
+
#ifdef HAVE_ACL_T
+
+#ifdef HAVE_ACL_GET_FD
@@ -120,7 +120,7 @@ Index: fakeroot.git/wrapfunc.inp
+#endif
+
#endif /* HAVE_ACL_T */
-
+
#ifdef HAVE_FTS_READ
Index: fakeroot.git/wrapstruct.h
===================================================================
@@ -128,7 +128,7 @@ Index: fakeroot.git/wrapstruct.h
+++ fakeroot.git/wrapstruct.h
@@ -185,10 +185,24 @@ struct next_wrap_st next_wrap[]= {
#endif /* HAVE_FSTATAT */
-
+
#ifdef HAVE_ACL_T
+
+#ifdef HAVE_ACL_GET_FD
@@ -149,46 +149,15 @@ Index: fakeroot.git/wrapstruct.h
+#endif
+
#endif /* HAVE_ACL_T */
-
- #ifdef HAVE_FTS_READ
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- fakeroot (1.24-1) unstable; urgency=medium
- .
- [ Danny Milosavljevic ]
- * Add test "t.cp-a".
- .
- [ Clint Adams ]
- * Patch from Ilias Tsitsimpis to retry msgsnd() if interrupted by
- a signal. closes: #883780.
- * Patch from Martin Dorey to detect and handle message queue and
- semaphore id collision. closes: #856439.
- * Drop patch glibc-xattr-types.
-Author: Clint Adams <clint@debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: 2019-11-25
+ #ifdef HAVE_FTS_READ
+Index: fakeroot.git/wrapdef.h
+===================================================================
--- fakeroot-1.24.orig/wrapdef.h
+++ fakeroot-1.24/wrapdef.h
@@ -184,10 +184,24 @@ int (*next_unlinkat)(int dir_fd, const c
#endif /* HAVE_FSTATAT */
-
+
#ifdef HAVE_ACL_T
+
+#ifdef HAVE_ACL_GET_FD
@@ -209,5 +178,5 @@ Last-Update: 2019-11-25
+#endif
+
#endif /* HAVE_ACL_T */
-
+
#ifdef HAVE_FTS_READ
--
cgit v1.2.3