File tree Expand file tree Collapse file tree 2 files changed +60
-2
lines changed
Expand file tree Collapse file tree 2 files changed +60
-2
lines changed Original file line number Diff line number Diff line change 1+ musl versions before 1.2.2 don't have all the required fanotify features,
2+ so a vendored header is used, but it redefines some types and the build fails
3+ --- a/libinotifytools/src/inotifytools/fanotify-dfid-name.h
4+ +++ b/libinotifytools/src/inotifytools/fanotify-dfid-name.h
5+ @@ -100,42 +100,10 @@
6+
7+ #define FANOTIFY_METADATA_VERSION 3
8+
9+ - struct fanotify_event_metadata {
10+ - __u32 event_len;
11+ - __u8 vers;
12+ - __u8 reserved;
13+ - __u16 metadata_len;
14+ - __aligned_u64 mask;
15+ - __s32 fd;
16+ - __s32 pid;
17+ - };
18+ -
19+ #define FAN_EVENT_INFO_TYPE_FID 1
20+ #define FAN_EVENT_INFO_TYPE_DFID_NAME 2
21+ #define FAN_EVENT_INFO_TYPE_DFID 3
22+
23+ - /* Variable length info record following event metadata */
24+ - struct fanotify_event_info_header {
25+ - __u8 info_type;
26+ - __u8 pad;
27+ - __u16 len;
28+ - };
29+ -
30+ - /* Unique file identifier info record */
31+ - struct fanotify_event_info_fid {
32+ - struct fanotify_event_info_header hdr;
33+ - __kernel_fsid_t fsid;
34+ - /*
35+ - * Following is an opaque struct file_handle that can be passed as
36+ - * an argument to open_by_handle_at(2).
37+ - */
38+ - unsigned char handle[];
39+ - };
40+ -
41+ - struct fanotify_response {
42+ - __s32 fd;
43+ - __u32 response;
44+ - };
45+
46+ /* Legit userspace responses to a _PERM event */
47+ #define FAN_ALLOW 0x01
Original file line number Diff line number Diff line change 11# Template file for 'inotify-tools'
22pkgname=inotify-tools
3- version=3.20.11 .0
3+ version=4.25.9 .0
44revision=1
55build_style=gnu-configure
66hostmakedepends="automake libtool"
@@ -9,7 +9,18 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
99license="GPL-2.0-or-later"
1010homepage="https://github.com/inotify-tools/inotify-tools"
1111distfiles="https://github.com/inotify-tools/inotify-tools/archive/${version}.tar.gz"
12- checksum=58a3cde89e4a5111a87ac16b56b06a8f885460fca0aea51b69c856ce30a37a14
12+ checksum=d33a4fd24c72c2d08893f129d724adf725b93dae96c359e4f4e9f32573cc853b
13+
14+ # we are still using musl1.1 on 32bit arm
15+ case "$XBPS_TARGET_MACHINE" in
16+ armv[67]l-musl) configure_args+=" --enable-fanotify" ;;
17+ esac
18+
19+ post_patch() {
20+ case "$XBPS_TARGET_MACHINE" in
21+ armv[67]l-musl) patch -Np1 < "${FILESDIR}/musl1.1.patch" ;;
22+ esac
23+ }
1324
1425pre_configure() {
1526 autoreconf -fi
You can’t perform that action at this time.
0 commit comments