* Reworked and added new configuration options * Use version from github instead of SF mirror
Signed-off-by: Lars Pedersen <[email protected]> --- .../inotify-tools-3.13-ac-prog-libtool.diff | 26 ------------ .../inotify-tools-3.13-am-config-header.diff | 28 ------------- ...y-tools-3.13-configure-compile_ifelse.diff | 27 ------------ .../inotify-tools-3.13-m4-macro-dir.diff | 38 ----------------- patches/inotify-tools-3.13/series | 4 -- .../autogen.sh | 0 rules/inotify-tools.in | 36 +++++++++++++++- rules/inotify-tools.make | 42 ++++++++++++------- 8 files changed, 62 insertions(+), 139 deletions(-) delete mode 100644 patches/inotify-tools-3.13/inotify-tools-3.13-ac-prog-libtool.diff delete mode 100644 patches/inotify-tools-3.13/inotify-tools-3.13-am-config-header.diff delete mode 100644 patches/inotify-tools-3.13/inotify-tools-3.13-configure-compile_ifelse.diff delete mode 100644 patches/inotify-tools-3.13/inotify-tools-3.13-m4-macro-dir.diff delete mode 100644 patches/inotify-tools-3.13/series rename patches/{inotify-tools-3.13 => inotify-tools-4.23.9.0}/autogen.sh (100%) diff --git a/patches/inotify-tools-3.13/inotify-tools-3.13-ac-prog-libtool.diff b/patches/inotify-tools-3.13/inotify-tools-3.13-ac-prog-libtool.diff deleted file mode 100644 index 13ff3dffe..000000000 --- a/patches/inotify-tools-3.13/inotify-tools-3.13-ac-prog-libtool.diff +++ /dev/null @@ -1,26 +0,0 @@ -From: Robert Schwebel <[email protected]> -Subject: use modern libtool macro - -aclocal.m4:123: AC_PROG_LIBTOOL is expanded from... - -Signed-off-by: Robert Schwebel <[email protected]> - ---- -# 20091228 rsc: mailed to [email protected] - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: inotify-tools-3.13/configure.ac -=================================================================== ---- inotify-tools-3.13.orig/configure.ac -+++ inotify-tools-3.13/configure.ac -@@ -12,7 +12,7 @@ AC_PROG_MAKE_SET - - # Checks for programs. - AC_PROG_CC --AC_PROG_LIBTOOL -+LT_INIT - - AC_PATH_PROG(DOXYGEN, doxygen, NO_DOXYGEN) - diff --git a/patches/inotify-tools-3.13/inotify-tools-3.13-am-config-header.diff b/patches/inotify-tools-3.13/inotify-tools-3.13-am-config-header.diff deleted file mode 100644 index bd3b3c21d..000000000 --- a/patches/inotify-tools-3.13/inotify-tools-3.13-am-config-header.diff +++ /dev/null @@ -1,28 +0,0 @@ -From: Robert Schwebel <[email protected]> -Subject: inotify-tools: update configure.ac - -configure.ac:8: warning: The macro `AM_CONFIG_HEADER' is obsolete. - -Signed-off-by: Robert Schwebel <[email protected]> - ---- -# 20091228 rsc: mailed to [email protected] - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: inotify-tools-3.13/configure.ac -=================================================================== ---- inotify-tools-3.13.orig/configure.ac -+++ inotify-tools-3.13/configure.ac -@@ -5,8 +5,8 @@ AC_PREREQ(2.59) - AC_INIT([inotify-tools], [3.13], [[email protected]]) - AM_INIT_AUTOMAKE - AC_CONFIG_SRCDIR([src/inotifywait.c]) --AM_CONFIG_HEADER([config.h]) --AM_CONFIG_HEADER([libinotifytools/src/inotifytools/inotify.h]) -+AC_CONFIG_HEADERS([config.h]) -+AC_CONFIG_HEADERS([libinotifytools/src/inotifytools/inotify.h]) - AC_DEFINE([_GNU_SOURCE], [], [For a few GNU-specific functions]) - AC_PROG_MAKE_SET - diff --git a/patches/inotify-tools-3.13/inotify-tools-3.13-configure-compile_ifelse.diff b/patches/inotify-tools-3.13/inotify-tools-3.13-configure-compile_ifelse.diff deleted file mode 100644 index 368f2903c..000000000 --- a/patches/inotify-tools-3.13/inotify-tools-3.13-configure-compile_ifelse.diff +++ /dev/null @@ -1,27 +0,0 @@ -From: Marc Kleine-Budde <[email protected]> -Subject: use AC_COMPILE_IFELSE instead of AC_RUN_IFELSE to check for sys/inotify.h - -Without this patch cross compiling inotify-tools doesn't work -out of the box, because running a cross compiled programm is not -possible. This patch uses the AC_COMPILE_IFELSE instead. - -Signed-off-by: Marc Kleine-Budde <[email protected]> ---- -# 20091228 rsc: mailed to [email protected] - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: inotify-tools-3.13/configure.ac -=================================================================== ---- inotify-tools-3.13.orig/configure.ac -+++ inotify-tools-3.13/configure.ac -@@ -45,7 +45,7 @@ AM_CONDITIONAL([DOXYGEN_ENABLE], test x$ - AC_CHECK_HEADERS([sys/inotify.h mcheck.h]) - AC_LANG(C) - AC_MSG_CHECKING([whether sys/inotify.h actually works]) --AC_RUN_IFELSE( -+AC_COMPILE_IFELSE( - AC_LANG_PROGRAM([[#include <sys/inotify.h>]], - [[return (-1 == inotify_init());]] - ), diff --git a/patches/inotify-tools-3.13/inotify-tools-3.13-m4-macro-dir.diff b/patches/inotify-tools-3.13/inotify-tools-3.13-m4-macro-dir.diff deleted file mode 100644 index b14442156..000000000 --- a/patches/inotify-tools-3.13/inotify-tools-3.13-m4-macro-dir.diff +++ /dev/null @@ -1,38 +0,0 @@ -From: Robert Schwebel <[email protected]> - -libtool 2.2.6a claims about these updates: - -libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and -libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. -libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am. - -Signed-off-by: Robert Schwebel <[email protected]> - ---- -# 20091228 rsc: mailed to [email protected] - - Makefile.am | 1 + - configure.ac | 1 + - 2 files changed, 2 insertions(+) - -Index: inotify-tools-3.13/configure.ac -=================================================================== ---- inotify-tools-3.13.orig/configure.ac -+++ inotify-tools-3.13/configure.ac -@@ -7,6 +7,7 @@ AM_INIT_AUTOMAKE - AC_CONFIG_SRCDIR([src/inotifywait.c]) - AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_HEADERS([libinotifytools/src/inotifytools/inotify.h]) -+AC_CONFIG_MACRO_DIR([m4]) - AC_DEFINE([_GNU_SOURCE], [], [For a few GNU-specific functions]) - AC_PROG_MAKE_SET - -Index: inotify-tools-3.13/Makefile.am -=================================================================== ---- inotify-tools-3.13.orig/Makefile.am -+++ inotify-tools-3.13/Makefile.am -@@ -1,3 +1,4 @@ -+ACLOCAL_AMFLAGS = -I m4 - - SUBDIRS = libinotifytools src man - diff --git a/patches/inotify-tools-3.13/series b/patches/inotify-tools-3.13/series deleted file mode 100644 index e651b603a..000000000 --- a/patches/inotify-tools-3.13/series +++ /dev/null @@ -1,4 +0,0 @@ -inotify-tools-3.13-configure-compile_ifelse.diff -inotify-tools-3.13-am-config-header.diff -inotify-tools-3.13-ac-prog-libtool.diff -inotify-tools-3.13-m4-macro-dir.diff diff --git a/patches/inotify-tools-3.13/autogen.sh b/patches/inotify-tools-4.23.9.0/autogen.sh similarity index 100% rename from patches/inotify-tools-3.13/autogen.sh rename to patches/inotify-tools-4.23.9.0/autogen.sh diff --git a/rules/inotify-tools.in b/rules/inotify-tools.in index f4230eaee..03989be7b 100644 --- a/rules/inotify-tools.in +++ b/rules/inotify-tools.in @@ -1,8 +1,40 @@ ## SECTION=system_libraries + config INOTIFY_TOOLS tristate prompt "inotify-tools" help - Command line tools for inotify - http://inotify-tools.sourceforge.net/ + The general purpose of this package is to allow inotify's + features to be used from within shell scripts + +if INOTIFY_TOOLS + +config INOTIFY_TOOLS_WAIT + bool + prompt "inotifywait" + help + inotifywait efficiently waits for changes to files using Linux's + inotify interface + +config INOTIFY_TOOLS_WATCH + bool + prompt "inotifywatch" + help + inotifywatch listens for filesystem events using Linux's + inotify interface + +config INOTIFY_TOOLS_FS_WAIT + bool + prompt "fsnotifywait" + help + fsnotifywait is similar to inotifywait but it is using Linux's + fanotify interface by default + +config INOTIFY_TOOLS_FS_WATCH + bool + prompt "fsnotifywatch" + help + fsnotifywatch is similar to inotifywatch but it is using Linux's + fanotify interface by default +endif diff --git a/rules/inotify-tools.make b/rules/inotify-tools.make index 1f3b4367b..9c0f03b2e 100644 --- a/rules/inotify-tools.make +++ b/rules/inotify-tools.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2008 by Brandon Fosdick <[email protected]> +# Copyright (C) 2025 by Lars Pedersen <[email protected]> # # For further information about the PTXdist project and license conditions # see the README file. @@ -14,15 +15,15 @@ PACKAGES-$(PTXCONF_INOTIFY_TOOLS) += inotify-tools # # Paths and names # -INOTIFY_TOOLS_VERSION := 3.13 -INOTIFY_TOOLS_MD5 := 35d7178297390f18bae451e083362acf -INOTIFY_TOOLS := inotify-tools-$(INOTIFY_TOOLS_VERSION) -INOTIFY_TOOLS_SUFFIX := tar.gz -INOTIFY_TOOLS_URL := $(call ptx/mirror, SF, inotify-tools/$(INOTIFY_TOOLS).$(INOTIFY_TOOLS_SUFFIX)) -INOTIFY_TOOLS_SOURCE := $(SRCDIR)/$(INOTIFY_TOOLS).$(INOTIFY_TOOLS_SUFFIX) -INOTIFY_TOOLS_DIR := $(BUILDDIR)/$(INOTIFY_TOOLS) -INOTIFY_TOOLS_LICENSE := GPL-2.0-only -INOTIFY_TOOLS_LICENSE_FILES := file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 +INOTIFY_TOOLS_VERSION := 4.23.9.0 +INOTIFY_TOOLS_MD5 := 66ff78fc6595fefe715f505357b9714a +INOTIFY_TOOLS := inotify-tools-$(INOTIFY_TOOLS_VERSION) +INOTIFY_TOOLS_SUFFIX := tar.gz +INOTIFY_TOOLS_URL := https://github.com/inotify-tools/inotify-tools/archive/refs/tags/$(INOTIFY_TOOLS_VERSION).$(INOTIFY_TOOLS_SUFFIX) +INOTIFY_TOOLS_SOURCE := $(SRCDIR)/$(INOTIFY_TOOLS).$(INOTIFY_TOOLS_SUFFIX) +INOTIFY_TOOLS_DIR := $(BUILDDIR)/$(INOTIFY_TOOLS) +INOTIFY_TOOLS_LICENSE := GPL-2.0-only +INOTIFY_TOOLS_LICENSE_FILES := file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6 # ---------------------------------------------------------------------------- # Prepare @@ -44,14 +45,27 @@ $(STATEDIR)/inotify-tools.targetinstall: @$(call install_init, inotify-tools) @$(call install_fixup, inotify-tools,PRIORITY,optional) @$(call install_fixup, inotify-tools,SECTION,base) - @$(call install_fixup, inotify-tools,AUTHOR,"Brandon Fosdick <[email protected]>") + @$(call install_fixup, inotify-tools,AUTHOR,"Lars Pedersen <[email protected]>") @$(call install_fixup, inotify-tools,DESCRIPTION,missing) +ifdef PTXCONF_INOTIFY_TOOLS_WAIT @$(call install_copy, inotify-tools, 0, 0, 0755, -, /usr/bin/inotifywait) - @$(call install_lib, inotify_tools, 0, 0, 0644, libinotifytools) +endif - @$(call install_finish, inotify-tools) +ifdef PTXCONF_INOTIFY_TOOLS_WATCH + @$(call install_copy, inotify-tools, 0, 0, 0755, -, /usr/bin/inotifywatch) +endif + +ifdef PTXCONF_INOTIFY_TOOLS_FS_WAIT + @$(call install_copy, inotify-tools, 0, 0, 0755, -, /usr/bin/fsnotifywait) +endif + +ifdef PTXCONF_INOTIFY_TOOLS_FS_WATCH + @$(call install_copy, inotify-tools, 0, 0, 0755, -, /usr/bin/fsnotifywatch) +endif - @$(call touch) + @$(call install_lib, inotify-tools, 0, 0, 0644, libinotifytools) + + @$(call install_finish, inotify-tools) -# vim: syntax=make + @$(call touch) \ No newline at end of file base-commit: 172dd6c2560bc163afa099c1036313e923ad0ea9 -- 2.48.1
