Skip to content

inotify-tools: update to 4.25.9.0 #58280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
r-ricci wants to merge 1 commit into
base: master
Choose a base branch
from
+60 −2
Open

inotify-tools: update to 4.25.9.0 #58280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions srcpkgs/inotify-tools/files/musl1.1.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
musl versions before 1.2.2 don't have all the required fanotify features,
so a vendored header is used, but it redefines some types and the build fails
--- a/libinotifytools/src/inotifytools/fanotify-dfid-name.h
+++ b/libinotifytools/src/inotifytools/fanotify-dfid-name.h
@@ -100,42 +100,10 @@

#define FANOTIFY_METADATA_VERSION 3

-struct fanotify_event_metadata {
- __u32 event_len;
- __u8 vers;
- __u8 reserved;
- __u16 metadata_len;
- __aligned_u64 mask;
- __s32 fd;
- __s32 pid;
-};
-
#define FAN_EVENT_INFO_TYPE_FID 1
#define FAN_EVENT_INFO_TYPE_DFID_NAME 2
#define FAN_EVENT_INFO_TYPE_DFID 3

-/* Variable length info record following event metadata */
-struct fanotify_event_info_header {
- __u8 info_type;
- __u8 pad;
- __u16 len;
-};
-
-/* Unique file identifier info record */
-struct fanotify_event_info_fid {
- struct fanotify_event_info_header hdr;
- __kernel_fsid_t fsid;
- /*
- * Following is an opaque struct file_handle that can be passed as
- * an argument to open_by_handle_at(2).
- */
- unsigned char handle[];
-};
-
-struct fanotify_response {
- __s32 fd;
- __u32 response;
-};

/* Legit userspace responses to a _PERM event */
#define FAN_ALLOW 0x01
15 changes: 13 additions & 2 deletions srcpkgs/inotify-tools/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'inotify-tools'
pkgname=inotify-tools
version=3.20.11.0
version=4.25.9.0
revision=1
build_style=gnu-configure
hostmakedepends="automake libtool"
Expand All @@ -9,7 +9,18 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/inotify-tools/inotify-tools"
distfiles="https://github.com/inotify-tools/inotify-tools/archive/${version}.tar.gz"
checksum=58a3cde89e4a5111a87ac16b56b06a8f885460fca0aea51b69c856ce30a37a14
checksum=d33a4fd24c72c2d08893f129d724adf725b93dae96c359e4f4e9f32573cc853b

# we are still using musl1.1 on 32bit arm
case "$XBPS_TARGET_MACHINE" in
armv*-musl) configure_args+=" --enable-fanotify" ;;
esac

post_patch() {
case "$XBPS_TARGET_MACHINE" in
armv*-musl) patch -Np1 < "${FILESDIR}/musl1.1.patch" ;;
esac
}

pre_configure() {
autoreconf -fi
Expand Down