From bd08be8f6db1223a6e11d5e72789db00be812c42 Mon Sep 17 00:00:00 2001
From: omni <omni+alpine@hack.org>
Date: Wed, 12 Oct 2022 09:23:09 +0000
Subject: [PATCH] main/inotify-tools: upgrade to 3.22.6.0
---
main/inotify-tools/APKBUILD | 16 ++++++++++------
main/inotify-tools/fsid-t.patch | 18 ++++++++++++++++++
2 files changed, 28 insertions(+), 6 deletions(-)
create mode 100644 main/inotify-tools/fsid-t.patch
diff --git a/main/inotify-tools/APKBUILD b/main/inotify-tools/APKBUILD
index 82f7cbd682e1..ec21d1df6f53 100644
--- a/main/inotify-tools/APKBUILD
+++ b/main/inotify-tools/APKBUILD
@@ -1,19 +1,20 @@
# Contributor:
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=inotify-tools
-pkgver=3.20.11.0
-pkgrel=1
+pkgver=3.22.6.0
+pkgrel=0
pkgdesc="C library and CLI tools providing a simple interface to inotify"
url="https://github.com/inotify-tools/inotify-tools"
arch="all"
license="GPL-2.0-only"
makedepends="automake autoconf libtool"
-subpackages="$pkgname-dev $pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/inotify-tools/inotify-tools/archive/$pkgver.tar.gz"
+subpackages="$pkgname-dev $pkgname-libs $pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/inotify-tools/inotify-tools/archive/$pkgver.tar.gz
+ fsid-t.patch
+ "
prepare() {
default_prepare
- touch README
autoreconf -vif
}
@@ -34,4 +35,7 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="77b90e96efe0c90ab6ca4309c2f08303c2047ebddfad93ff62c616f30df8ca01102197867571047475b19b7dcc0fe369d9dd41425c2973cdc06467787098f672 inotify-tools-3.20.11.0.tar.gz"
+sha512sums="
+cda445add4b9d80b70eff9189ed50d05f4b5593a755159d0354431166c6fe6fdb33f7bf37fd50bc09aad3ed0a6e3763b9c74f65e554400f2596b8d492f1d0a21 inotify-tools-3.22.6.0.tar.gz
+536db5928373168a12a1c3c7fea8ada2592d471416c6037ec7fa9d9e7c4516e1b75f332d38d298caf8830ebca033615eddb1ce7c9a32758f14afb21ccde6be35 fsid-t.patch
+"
diff --git a/main/inotify-tools/fsid-t.patch b/main/inotify-tools/fsid-t.patch
new file mode 100644
index 000000000000..0e641499b3da
--- /dev/null
+++ b/main/inotify-tools/fsid-t.patch
@@ -0,0 +1,18 @@
+this was reverted in https://github.com/inotify-tools/inotify-tools/commit/cbab7c0bec0afb52f740417692318f43861e9313
+but is still needed
+diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c
+index 466f56d..4dbc018 100644
+--- a/libinotifytools/src/inotifytools.c
++++ b/libinotifytools/src/inotifytools.c
+@@ -57,6 +57,11 @@ struct fanotify_event_fid {
+ };
+ #endif
+
++#ifndef __GLIBC__
++#define val __val
++#define __kernel_fsid_t fsid_t
++#endif
++
+ /**
+ * @file inotifytools/inotifytools.h
+ * @brief inotifytools library public interface.
--
GitLab