Update to 3.22.6.0

0005-Fix-segfault-with-csv-output-when-filename-contains-.patch

@@ -1,24 +0,0 @@
-From: Dmitry Bogatov <KAction@gnu.org>
-Date: Sat, 4 Mar 2017 21:13:38 +0300
-Subject: [PATCH] Fix segfault with csv output when filename contains comma
-
-Double `csv_escape()'ing filename is logic error, but root of the
-problem was that passing `csv' buffer back into `csv_escape()' caused
-endless loop over `static char csv[MAXLEN]', and buffer overflow.
----
- src/inotifywait.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/inotifywait.c b/src/inotifywait.c
-index 98aadd4..6e17007 100644
---- a/src/inotifywait.c
-+++ b/src/inotifywait.c
-@@ -119,7 +119,7 @@ void validate_format( char * fmt ) {
- void output_event_csv( struct inotify_event * event ) {
-     char *filename = csv_escape(inotifytools_filename_from_wd(event->wd));
-     if (filename != NULL)
--        printf("%s,", csv_escape(filename));
-+        printf("%s,", filename);
- 
- 	printf("%s,", csv_escape( inotifytools_event_to_str( event->mask ) ) );
- 	if ( event->len > 0 )

0006-Fix-buffer-overrun-in-inotifytools.c.patch

@@ -1,33 +0,0 @@
-From: Dmitry Bogatov <KAction@debian.org>
-Date: Tue, 6 Aug 2019 16:36:24 +0000
-Subject: Fix buffer overrun in inotifytools.c
-
-The following code
-
-    char *names[2+sizeof(int)/sizeof(char*)];
-
-was supposed to allocate enough space on stack to fit two `char *' and one
-`int'. Problem is that when sizeof(int) < sizeof(char *), which is likely on
-64-bit systems, it caused expression `sizeof(int)/sizeof(char*)' evaluate to 0,
-resulting in buffer overrun.
-
-Detected by GCC-9 new diagnostics.
-
-Closes: #925717
----
- libinotifytools/src/inotifytools.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c
-index b3feca3..ce4ccd5 100644
---- a/libinotifytools/src/inotifytools.c
-+++ b/libinotifytools/src/inotifytools.c
-@@ -859,7 +859,7 @@ void inotifytools_set_filename_by_filename( char const * oldname,
- void inotifytools_replace_filename( char const * oldname,
-                                     char const * newname ) {
- 	if ( !oldname || !newname ) return;
--	char *names[2+sizeof(int)/sizeof(char*)];
-+	char *names[2+sizeof(int)/sizeof(char*) + 1];
- 	names[0] = (char*)oldname;
- 	names[1] = (char*)newname;
- 	*((int*)&names[2]) = strlen(oldname);

inotify-tools.spec

@@ -1,13 +1,13 @@
 Name:                inotify-tools
-Version:             3.14
+Version:             3.22.6.0
 Release:             1
 Summary:             Command line utilities for inotify
 License:             GPLv2
-URL:                 https://github.com/inotify-tools
+URL:                 https://github.com/inotify-tools/inotify-tools
-Source0:             http://github.com/downloads/rvoicilas/inotify-tools/inotify-tools-%{version}.tar.gz
+Source0:             https://github.com/inotify-tools/inotify-tools/archive/%{version}/inotify-tools-%{version}.tar.gz
-Patch1:              0005-Fix-segfault-with-csv-output-when-filename-contains-.patch
+
-Patch2:              0006-Fix-buffer-overrun-in-inotifytools.c.patch
 BuildRequires:       gcc autoconf doxygen
+BuildRequires:       libtool
 %description
 inotify-tools is a set of command-line programs for Linux providing
 a simple interface to inotify. These programs can be used to monitor
@@ -21,11 +21,10 @@ This package contains headers and libraries required to build applications
 that use the libinotifytools library.
 
 %prep
-%setup -q
+%autosetup -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
+./autogen.sh
 %configure \
         --disable-dependency-tracking \
         --disable-static \
@@ -42,12 +41,14 @@ rm -rf %{buildroot}/%{_datadir}/doc/
 %ldconfig_scriptlets
 
 %files
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS COPYING ChangeLog NEWS README.md
 %{_bindir}/inotifywait
 %{_bindir}/inotifywatch
 %{_libdir}/libinotifytools.so.*
 %{_mandir}/man1/inotifywait.1*
 %{_mandir}/man1/inotifywatch.1*
+%{_mandir}/man1/fsnotifywait.1.gz
+%{_mandir}/man1/fsnotifywatch.1.gz
 
 %files devel
 %doc libinotifytools/src/doc/html/*
@@ -55,8 +56,13 @@ rm -rf %{buildroot}/%{_datadir}/doc/
 %{_includedir}/inotifytools/inotify.h
 %{_includedir}/inotifytools/inotify-nosys.h
 %{_includedir}/inotifytools/inotifytools.h
+%{_includedir}/inotifytools/fanotify-dfid-name.h
+%{_includedir}/inotifytools/fanotify.h
 %{_libdir}/libinotifytools.so
 
 %changelog
+* Tue Apr 11 2023 yaoxin <yao_xin001@hoperun.com> - 3.22.6.0-1
+- Update to 3.22.6.0
+
 * Tue Sep 7 2021 zhengyaohui <zhengyaohui1@huawei.com> - 3.14-1
 - package init