Hello community, here is the log from the commit of package trinity for openSUSE:Factory checked in at 2017-11-29 10:54:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/trinity (Old) and /work/SRC/openSUSE:Factory/.trinity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trinity" Wed Nov 29 10:54:18 2017 rev:47 rq:546177 version:1.8+git.20171103 Changes: -------- --- /work/SRC/openSUSE:Factory/trinity/trinity.changes 2017-11-10 14:57:45.663288964 +0100 +++ /work/SRC/openSUSE:Factory/.trinity.new/trinity.changes 2017-11-29 10:54:26.272780025 +0100 @@ -1,0 +2,6 @@ +Tue Nov 28 09:14:12 UTC 2017 - [email protected] + +- add compat-handle-removed-autofs-macros.patch to fix factory + build failure + +------------------------------------------------------------------- New: ---- compat-handle-removed-autofs-macros.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trinity.spec ++++++ --- /var/tmp/diff_new_pack.UKgXx5/_old 2017-11-29 10:54:26.880757968 +0100 +++ /var/tmp/diff_new_pack.UKgXx5/_new 2017-11-29 10:54:26.884757822 +0100 @@ -25,6 +25,7 @@ Group: Development/Tools/Other Url: http://codemonkey.org.uk/projects/trinity/ Source0: %{name}-%{version}.tar.xz +Patch0: compat-handle-removed-autofs-macros.patch ExcludeArch: %ix86 %arm %description @@ -35,6 +36,7 @@ %prep %setup -q +%patch0 -p1 %build export CFLAGS="%{optflags}" ++++++ compat-handle-removed-autofs-macros.patch ++++++ From: Jiri Slaby <[email protected]> Date: Tue, 28 Nov 2017 08:58:04 +0100 Subject: compat: handle removed autofs macros Patch-mainline: no In file included from ioctls/autofs.c:4:0: ioctls/autofs.c:241:8: error: 'AUTOFS_IOC_EXPIRE_INDIRECT' undeclared here (not in a function); did you mean 'AUTOFS_IOC_EXPIRE_CMD'? IOCTL(AUTOFS_IOC_EXPIRE_INDIRECT), ^ include/ioctls.h:53:15: note: in definition of macro 'IOCTL' { .request = _request, .name = #_request, } ^~~~~~~~ ioctls/autofs.c:242:8: error: 'AUTOFS_IOC_EXPIRE_DIRECT' undeclared here (not in a function); did you mean 'AUTOFS_IOC_EXPIRE_INDIRECT'? IOCTL(AUTOFS_IOC_EXPIRE_DIRECT), ^ include/ioctls.h:53:15: note: in definition of macro 'IOCTL' { .request = _request, .name = #_request, } ^~~~~~~~ Define them as AUTOFS_IOC_EXPIRE_MULTI as they used to be. Signed-off-by: Jiri Slaby <[email protected]> --- include/compat.h | 8 ++++++++ ioctls/autofs.c | 1 + 2 files changed, 9 insertions(+) diff --git a/include/compat.h b/include/compat.h index 10065ceca5f6..fc9a1b95ac4c 100644 --- a/include/compat.h +++ b/include/compat.h @@ -1209,3 +1209,11 @@ struct kvm_get_htab_fd { #ifndef SO_IP_SET #define SO_IP_SET 83 #endif + +/* linux/auto_fs4.h */ +#ifndef AUTOFS_IOC_EXPIRE_INDIRECT +#define AUTOFS_IOC_EXPIRE_INDIRECT AUTOFS_IOC_EXPIRE_MULTI +#endif +#ifndef AUTOFS_IOC_EXPIRE_DIRECT +#define AUTOFS_IOC_EXPIRE_DIRECT AUTOFS_IOC_EXPIRE_MULTI +#endif diff --git a/ioctls/autofs.c b/ioctls/autofs.c index 04a3eb811326..a39ccccc056b 100644 --- a/ioctls/autofs.c +++ b/ioctls/autofs.c @@ -8,6 +8,7 @@ #include "shm.h" #include "syscall.h" #include "utils.h" +#include "compat.h" /* include/linux/auto_dev-ioctl.h */ /* -- 2.15.0
