diff --git a/.gitignore b/.gitignore index 05e620b..5eacd0b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,8 @@ inotify-tools-3.13.tar.gz /inotify-tools-3.14.tar.gz +/inotify-tools-3.21.9.0.tar.gz +/3.21.9.1.tar.gz +/3.21.9.2.tar.gz +/3.21.9.3.tar.gz +/3.21.9.4.tar.gz +/3.21.9.5.tar.gz diff --git a/0005-Fix-segfault-with-csv-output-when-filename-contains-.patch b/0005-Fix-segfault-with-csv-output-when-filename-contains-.patch deleted file mode 100644 index 94f3ee6..0000000 --- a/0005-Fix-segfault-with-csv-output-when-filename-contains-.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Dmitry Bogatov -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 ) diff --git a/0006-Fix-buffer-overrun-in-inotifytools.c.patch b/0006-Fix-buffer-overrun-in-inotifytools.c.patch deleted file mode 100644 index a3d2a91..0000000 --- a/0006-Fix-buffer-overrun-in-inotifytools.c.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Dmitry Bogatov -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); diff --git a/inotify-tools.spec b/inotify-tools.spec index 1b7bdf6..0ad9c4a 100644 --- a/inotify-tools.spec +++ b/inotify-tools.spec @@ -1,18 +1,18 @@ Name: inotify-tools -Version: 3.14 -Release: 23%{?dist} +Version: 3.21.9.5 +Release: 1%{?dist} Summary: Command line utilities for inotify License: GPLv2 -URL: http://inotify-tools.sourceforge.net/ -Source0: http://github.com/downloads/rvoicilas/inotify-tools/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 +URL: https://github.com/inotify-tools/inotify-tools +Source0: https://github.com/inotify-tools/inotify-tools/archive/%{version}/inotify-tools-%{version}.tar.gz BuildRequires: gcc BuildRequires: autoconf +BuildRequires: automake BuildRequires: doxygen -BuildRequires: make +BuildRequires: make +BuildRequires: libtool %description inotify-tools is a set of command-line programs for Linux providing @@ -29,19 +29,15 @@ that use the libinotifytools library. %prep %setup -q -%patch1 -p1 -%patch2 -p1 %build +./autogen.sh %configure \ --disable-dependency-tracking \ --disable-static \ --enable-doxygen -# https://docs.fedoraproject.org/en-US/packaging-guidelines/#_removing_rpath -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?_smp_mflags} +./rh_build.sh %{?_smp_mflags} %install @@ -58,12 +54,14 @@ rm -rf %{buildroot}/%{_datadir}/doc/ %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* +%{_mandir}/man1/fsnotifywatch.1* %files devel %doc libinotifytools/src/doc/html/* @@ -71,10 +69,15 @@ 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 +* Wed Sep 22 2021 Eric Curtin - 3.21.9.5-1 +- Update to 3.21.9.5 + * Thu Jul 22 2021 Fedora Release Engineering - 3.14-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index a3c58ab..b035bb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b43d95a0fa8c45f8bab3aec9672cf30c inotify-tools-3.14.tar.gz +SHA512 (3.21.9.5.tar.gz) = d0ae070f4fa3ea261913bba4ed6edf865aa8ddb9235cf5e967d11f54168a78d92739a5110a1afbdedbe3e6f0cbaf395883e2d47a182c9e6847986da184a52a97