Hello community, here is the log from the commit of package inotify-tools for openSUSE:Factory checked in at 2020-08-18 15:10:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/inotify-tools (Old) and /work/SRC/openSUSE:Factory/.inotify-tools.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "inotify-tools" Tue Aug 18 15:10:39 2020 rev:5 rq:826943 version:3.20.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/inotify-tools/inotify-tools.changes 2019-04-23 14:39:27.681591542 +0200 +++ /work/SRC/openSUSE:Factory/.inotify-tools.new.3399/inotify-tools.changes 2020-08-18 15:10:41.072031563 +0200 @@ -1,0 +2,11 @@ +Sun Aug 16 02:25:14 UTC 2020 - Dirk Mueller <[email protected]> + +- update to 3.20.2: + * New maintainer + * Fix potential buffer overflow + * gcc 9 support + +- remove inotify-tools-no-timestamp-in-doc.patch + inotify-return.patch (merged upstream) + +------------------------------------------------------------------- Old: ---- 3.20.1.tar.gz inotify-return.patch inotify-tools-no-timestamp-in-doc.patch New: ---- 3.20.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inotify-tools.spec ++++++ --- /var/tmp/diff_new_pack.KtGtqL/_old 2020-08-18 15:10:41.628031793 +0200 +++ /var/tmp/diff_new_pack.KtGtqL/_new 2020-08-18 15:10:41.632031794 +0200 @@ -1,7 +1,7 @@ # # spec file for package inotify-tools # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,13 @@ Name: inotify-tools -Version: 3.20.1 +Version: 3.20.2.2 Release: 0 Summary: Tools for inotify License: GPL-2.0-only Group: System/Monitoring -Url: https://github.com/rvoicilas/inotify-tools/wiki/ +URL: https://github.com/rvoicilas/inotify-tools/wiki/ Source: http://github.com/rvoicilas/inotify-tools/archive/%{version}.tar.gz -# PATCH-FIX-OPENSUSE inotify-return.patch -- add a forgotten return value -Patch0: inotify-return.patch -# PATCH-FIX-OPENSUSE inotify-tools-no-timestamp-in-doc.patch bmwiedemann -- Normalize timestamps in man page - https://github.com/rvoicilas/inotify-tools/pull/97 -Patch1: inotify-tools-no-timestamp-in-doc.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: doxygen @@ -71,8 +67,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build ./autogen.sh ++++++ 3.20.1.tar.gz -> 3.20.2.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/.cirrus.yml new/inotify-tools-3.20.2.2/.cirrus.yml --- old/inotify-tools-3.20.1/.cirrus.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/inotify-tools-3.20.2.2/.cirrus.yml 2020-02-01 13:05:18.000000000 +0100 @@ -0,0 +1,15 @@ +task: + name: FreeBSD + freebsd_instance: + matrix: + # There isn't a stable 13.0 image yet (2019-12) + image_family: freebsd-13-0-snap + image_family: freebsd-12-1 + + pkginstall_script: + - pkg install -y autoconf automake libtool bash git gcc + - ln -s /usr/local/bin/bash /bin/ + + compile_script: + - ./build_and_test.sh + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/.github/workflows/build.yml new/inotify-tools-3.20.2.2/.github/workflows/build.yml --- old/inotify-tools-3.20.1/.github/workflows/build.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/inotify-tools-3.20.2.2/.github/workflows/build.yml 2020-02-01 13:05:18.000000000 +0100 @@ -0,0 +1,23 @@ +name: build + +on: [push] + +jobs: + build-1604: + + runs-on: ubuntu-16.04 + + steps: + - uses: actions/checkout@v1 + - name: build_and_test + run: ./build_and_test.sh + + build-1804: + + runs-on: ubuntu-18.04 + + steps: + - uses: actions/checkout@v1 + - name: build_and_test + run: ./build_and_test.sh + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/.gitignore new/inotify-tools-3.20.2.2/.gitignore --- old/inotify-tools-3.20.1/.gitignore 2018-01-06 12:10:51.000000000 +0100 +++ new/inotify-tools-3.20.2.2/.gitignore 2020-02-01 13:05:18.000000000 +0100 @@ -26,3 +26,16 @@ /src/inotifywait /src/inotifywatch + +config.h +config.h.in +config.log +config.status +libtool +man/inotifywait.1 +man/inotifywatch.1 +stamp-h1 +README + +libinotifytools/src/test + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/AUTHORS new/inotify-tools-3.20.2.2/AUTHORS --- old/inotify-tools-3.20.1/AUTHORS 2018-01-06 12:10:51.000000000 +0100 +++ new/inotify-tools-3.20.2.2/AUTHORS 2020-02-01 13:05:18.000000000 +0100 @@ -1,2 +1,20 @@ -Rohan McGovern <[email protected]> +Andreas Schwab <[email protected]> +angerangel <[email protected]> +Bernhard M. Wiedemann <[email protected]> +Carl Bordum Hansen <[email protected]> +Edward Betts <[email protected]> +Enrico M. Crisostomo <[email protected]> +Eric Curtin <[email protected]> +Ilya Shipitsin <[email protected]> +Jackie Huang <[email protected]> +Jan Kratochvil <[email protected]> +Johannes Weißl <[email protected]> +jonathan00 <[email protected]> +liuguangzhao <[email protected]> +Mike Frysinger <[email protected]> +Radu Voicilas <[email protected]> +Ramkumar Ramachandra <[email protected]> +Rohan McGovern <[email protected]> +Sjon <[email protected]> +Thomas Kho <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/INSTALL new/inotify-tools-3.20.2.2/INSTALL --- old/inotify-tools-3.20.1/INSTALL 2018-01-06 12:10:51.000000000 +0100 +++ new/inotify-tools-3.20.2.2/INSTALL 2020-02-01 13:05:18.000000000 +0100 @@ -9,6 +9,26 @@ notice and this notice are preserved. This file is offered as-is, without warranty of any kind. +Pre-requisites +============== +Install autoconf, on Ubuntu: + + sudo apt-get install autoconf + +then install automake, on Ubuntu: + + sudo apt-get install autotools-dev + sudo apt-get install automake + +then install libtool, on Ubuntu: + + sudo apt-get install libtool + +Now you can proceed with basic intallation: +./configure +make +sudo make install + Basic Installation ================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/README new/inotify-tools-3.20.2.2/README --- old/inotify-tools-3.20.1/README 2018-01-06 12:10:51.000000000 +0100 +++ new/inotify-tools-3.20.2.2/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -inotify-tools -============= - -This is a package of some commandline utilities relating to inotify. - -The general purpose of this package is to allow inotify's features to be used -from within shell scripts. Read the man pages for further details. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/README.md new/inotify-tools-3.20.2.2/README.md --- old/inotify-tools-3.20.1/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/inotify-tools-3.20.2.2/README.md 2020-02-01 13:05:18.000000000 +0100 @@ -0,0 +1,10 @@ + + +inotify-tools +============= + +This is a package of some commandline utilities relating to inotify. + +The general purpose of this package is to allow inotify's features to be used +from within shell scripts. Read the man pages for further details. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/autogen.sh new/inotify-tools-3.20.2.2/autogen.sh --- old/inotify-tools-3.20.1/autogen.sh 2018-01-06 12:10:51.000000000 +0100 +++ new/inotify-tools-3.20.2.2/autogen.sh 2020-02-01 13:05:18.000000000 +0100 @@ -1,3 +1,4 @@ #!/bin/sh +cp README.md README autoreconf --install "$@" || exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/build_and_test.sh new/inotify-tools-3.20.2.2/build_and_test.sh --- old/inotify-tools-3.20.1/build_and_test.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/inotify-tools-3.20.2.2/build_and_test.sh 2020-02-01 13:05:18.000000000 +0100 @@ -0,0 +1,41 @@ +#!/bin/bash + +set -e + +j=3 + +printf "gcc build\n" +git clean -fdx 2>&1 +export CC=gcc +./autogen.sh +./configure +make -j$j + +printf "\nunit test\n" +cd libinotifytools/src/ +make -j$j test +./test +cd - + +printf "\nintegration test\n" +cd t +make -j$j +cd - + +printf "\nclang build\n" +git clean -fdx 2>&1 +export CC=clang +./autogen.sh +./configure +make -j$j + +printf "\nunit test\n" +cd libinotifytools/src/ +make -j$j test +./test +cd - + +printf "\nintegration test\n" +cd t +make -j$j + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/configure.ac new/inotify-tools-3.20.2.2/configure.ac --- old/inotify-tools-3.20.1/configure.ac 2018-01-06 12:10:51.000000000 +0100 +++ new/inotify-tools-3.20.2.2/configure.ac 2020-02-01 13:05:18.000000000 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([inotify-tools], [3.20.1]) +AC_INIT([inotify-tools], [3.20.2.2]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_SRCDIR([src/inotifywait.c]) AC_CONFIG_HEADERS([config.h]) @@ -65,7 +65,7 @@ AC_CHECK_FUNCS([daemon]) # Set variables used in man page templates -MAN_DATE=$(date +'%B %d, %Y') +MAN_DATE=$(date -u -r ChangeLog +'%Y-%m-%d') MAN_PACKAGE_VERSION=$PACKAGE_VERSION AC_SUBST([MAN_DATE]) AC_SUBST([MAN_PACKAGE_VERSION]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/libinotifytools/src/Makefile.am new/inotify-tools-3.20.2.2/libinotifytools/src/Makefile.am --- old/inotify-tools-3.20.1/libinotifytools/src/Makefile.am 2018-01-06 12:10:51.000000000 +0100 +++ new/inotify-tools-3.20.2.2/libinotifytools/src/Makefile.am 2020-02-01 13:05:18.000000000 +0100 @@ -14,7 +14,7 @@ nobase_include_HEADERS = inotifytools/inotifytools.h inotifytools/inotify-nosys.h inotifytools/inotify.h -AM_CFLAGS = -std=c99 +AM_CFLAGS = -std=c99 -Wall -Werror if DOXYGEN_ENABLE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/libinotifytools/src/inotifytools/inotify-nosys.h new/inotify-tools-3.20.2.2/libinotifytools/src/inotifytools/inotify-nosys.h --- old/inotify-tools-3.20.1/libinotifytools/src/inotifytools/inotify-nosys.h 2018-01-06 12:10:51.000000000 +0100 +++ new/inotify-tools-3.20.2.2/libinotifytools/src/inotifytools/inotify-nosys.h 2020-02-01 13:05:18.000000000 +0100 @@ -13,6 +13,11 @@ #include <sys/syscall.h> #include <unistd.h> +#ifdef __FreeBSD__ +#define stat64 stat +#define lstat64 lstat +#endif + /* * struct inotify_event - structure read from the inotify device for each event * @@ -24,7 +29,7 @@ uint32_t mask; /* watch mask */ uint32_t cookie; /* cookie to synchronize two events */ uint32_t len; /* length (including nulls) of name */ - char name __flexarr; /* stub for possible name */ + char name[]; /* stub for possible name */ }; /* the following are legal, implemented events that user-space can watch for */ @@ -100,8 +105,8 @@ # endif # if _MIPS_SIM == _MIPS_SIM_ABI64 # define __NR_inotify_init (__NR_Linux + 243) -# define __NR_inotify_add_watch (__NR_Linux + 243) -# define __NR_inotify_rm_watch (__NR_Linux + 243) +# define __NR_inotify_add_watch (__NR_Linux + 244) +# define __NR_inotify_rm_watch (__NR_Linux + 245) # endif # if _MIPS_SIM == _MIPS_SIM_NABI32 # define __NR_inotify_init (__NR_Linux + 247) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/libinotifytools/src/inotifytools/inotifytools.h new/inotify-tools-3.20.2.2/libinotifytools/src/inotifytools/inotifytools.h --- old/inotify-tools-3.20.1/libinotifytools/src/inotifytools/inotifytools.h 2018-01-06 12:10:51.000000000 +0100 +++ new/inotify-tools-3.20.2.2/libinotifytools/src/inotifytools/inotifytools.h 2020-02-01 13:05:18.000000000 +0100 @@ -1,6 +1,11 @@ #ifndef _inotifytools_H #define _inotifytools_H +#ifdef __FreeBSD__ +#define stat64 stat +#define lstat64 lstat +#endif + #ifdef __cplusplus extern "C" { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/libinotifytools/src/inotifytools.c new/inotify-tools-3.20.2.2/libinotifytools/src/inotifytools.c --- old/inotify-tools-3.20.1/libinotifytools/src/inotifytools.c 2018-01-06 12:10:51.000000000 +0100 +++ new/inotify-tools-3.20.2.2/libinotifytools/src/inotifytools.c 2020-02-01 13:05:18.000000000 +0100 @@ -19,6 +19,7 @@ #include <string.h> #include <strings.h> #include <stdlib.h> +#include <stdint.h> #include <stdio.h> #include <errno.h> #include <sys/select.h> @@ -372,18 +373,23 @@ /** * @internal */ -void replace_filename(const void *nodep, - const VISIT which, - const int depth, void *arg) { +struct replace_filename_data { + char const *old_name; + char const *new_name; + size_t old_len; +}; + +/** + * @internal + */ +void replace_filename(const void *nodep, const VISIT which, const int depth, + const struct replace_filename_data *data) { if (which != endorder && which != leaf) return; watch *w = (watch*)nodep; - char *old_name = ((char**)arg)[0]; - char *new_name = ((char**)arg)[1]; - int old_len = *((int*)&((char**)arg)[2]); char *name; - if ( 0 == strncmp( old_name, w->filename, old_len ) ) { - nasprintf( &name, "%s%s", new_name, &(w->filename[old_len]) ); - if (!strcmp( w->filename, new_name )) { + if ( 0 == strncmp( data->old_name, w->filename, data->old_len ) ) { + nasprintf( &name, "%s%s", data->new_name, &(w->filename[data->old_len]) ); + if (!strcmp( w->filename, data->new_name )) { free(name); } else { rbdelete(w, tree_filename); @@ -478,8 +484,9 @@ int ret, ret1, len; char * event1, * event2; - char eventstr[4096]; - ret = 0; + static const size_t eventstr_size = 4096; + char eventstr[eventstr_size]; + ret = 0; if ( !event || !event[0] ) return 0; @@ -488,14 +495,22 @@ while ( event1 && event1[0] ) { if ( event2 ) { len = event2 - event1; - niceassert( len < 4096, "malformed event string (very long)" ); - } + niceassert(len < eventstr_size, + "malformed event string (very long)"); + } else { len = strlen(event1); } - if ( len > 4095 ) len = 4095; - strncpy( eventstr, event1, len ); - eventstr[len] = 0; + if (len > eventstr_size - 1) + len = eventstr_size - 1; + + if (event2 || len == eventstr_size - 1) { + strncpy(eventstr, event1, len); + } else { + strcpy(eventstr, event1); + } + + eventstr[len] = 0; ret1 = onestr_to_event( eventstr ); if ( 0 == ret1 || -1 == ret1 ) { @@ -861,11 +876,11 @@ void inotifytools_replace_filename( char const * oldname, char const * newname ) { if ( !oldname || !newname ) return; - char *names[2+sizeof(int)/sizeof(char*)]; - names[0] = (char*)oldname; - names[1] = (char*)newname; - *((int*)&names[2]) = strlen(oldname); - rbwalk(tree_filename, replace_filename, (void*)names); + struct replace_filename_data data; + data.old_name = oldname; + data.new_name = newname; + data.old_len = strlen(oldname); + rbwalk(tree_filename, (void *)replace_filename, (void *)&data); } /** @@ -894,6 +909,7 @@ w->filename = strdup(filename); rbsearch(w, tree_wd); rbsearch(w, tree_filename); + return NULL; } /** @@ -1451,7 +1467,7 @@ } -int *stat_ptr(watch *w, int event) +unsigned int *stat_ptr(watch *w, int event) { if ( IN_ACCESS == event ) return &w->hit_access; @@ -1504,7 +1520,7 @@ watch *w = watch_from_wd(wd); if (!w) return -1; - int *i = stat_ptr(w, event); + unsigned int *i = stat_ptr(w, event); if (!i) return -1; return *i; } @@ -2064,7 +2080,7 @@ { if (!p1 || !p2) return p1 - p2; char asc = 1; - int sort_event = (int)config; + long sort_event = (long)config; if (sort_event == -1) { sort_event = 0; asc = 0; @@ -2072,8 +2088,8 @@ sort_event = -sort_event; asc = 0; } - int *i1 = stat_ptr((watch*)p1, sort_event); - int *i2 = stat_ptr((watch*)p2, sort_event); + unsigned int *i1 = stat_ptr((watch*)p1, sort_event); + unsigned int *i2 = stat_ptr((watch*)p2, sort_event); if (0 == *i1 - *i2) { return ((watch*)p1)->wd - ((watch*)p2)->wd; } @@ -2085,7 +2101,7 @@ struct rbtree *inotifytools_wd_sorted_by_event(int sort_event) { - struct rbtree *ret = rbinit(event_compare, (void*)sort_event); + struct rbtree *ret = rbinit(event_compare, (void*)(uintptr_t)sort_event); RBLIST *all = rbopenlist(tree_wd); void const *p = rbreadlist(all); while (p) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/libinotifytools/src/redblack.c new/inotify-tools-3.20.2.2/libinotifytools/src/redblack.c --- old/inotify-tools-3.20.1/libinotifytools/src/redblack.c 2018-01-06 12:10:51.000000000 +0100 +++ new/inotify-tools-3.20.2.2/libinotifytools/src/redblack.c 2020-02-01 13:05:18.000000000 +0100 @@ -1,5 +1,3 @@ -static char rcsid[]="$Id: redblack.c,v 1.9 2003/10/24 01:31:21 damo Exp $"; - /* Redblack balanced tree algorithm Copyright (C) Damian Ivereigh 2000 @@ -140,9 +138,6 @@ #endif /* RB_CUSTOMIZE */ { struct RB_ENTRY(tree) *retval; - char c; - - c=rcsid[0]; /* This does nothing but shutup the -Wall */ if ((retval=(struct RB_ENTRY(tree) *) malloc(sizeof(struct RB_ENTRY(tree))))==NULL) return(NULL); @@ -361,7 +356,7 @@ x=z; /* While we are not at the top and our parent node is red - ** N.B. Since the root node is garanteed black, then we + ** N.B. Since the root node is guaranteed black, then we ** are also going to stop if we are the child of the root */ @@ -445,7 +440,7 @@ RB_ENTRY(_lookup)(int mode, const RB_ENTRY(data_t) *key, struct RB_ENTRY(tree) *rbinfo) { struct RB_ENTRY(node) *x,*y; - int cmp; + int cmp=0; int found=0; y=RBNULL; /* points to the parent of x */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/libinotifytools/src/test.c new/inotify-tools-3.20.2.2/libinotifytools/src/test.c --- old/inotify-tools-3.20.1/libinotifytools/src/test.c 2018-01-06 12:10:51.000000000 +0100 +++ new/inotify-tools-3.20.2.2/libinotifytools/src/test.c 2020-02-01 13:05:18.000000000 +0100 @@ -245,9 +245,9 @@ inotifytools_set_printf_timefmt("%D%% %H:%M"); { char expected[1024]; - char timestr[1024]; + char timestr[512]; time_t now = time(0); - strftime(timestr, 1024, "%D%% %H:%M", localtime(&now)); + strftime(timestr, 512, "%D%% %H:%M", localtime(&now)); snprintf(expected, 1024, "Event ACCESS ACCESS on %s/ %s", TEST_DIR, timestr); inotifytools_snprintf(buf, 1024, test_event, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/man/inotifywait.1.in new/inotify-tools-3.20.2.2/man/inotifywait.1.in --- old/inotify-tools-3.20.1/man/inotifywait.1.in 2018-01-06 12:10:51.000000000 +0100 +++ new/inotify-tools-3.20.2.2/man/inotifywait.1.in 2020-02-01 13:05:18.000000000 +0100 @@ -256,7 +256,7 @@ .B moved_to and .B moved_from, -hence all close events received will be output as one or both of these, not +hence all move events received will be output as one or both of these, not .B MOVE. .TP @@ -305,7 +305,7 @@ .nf #!/bin/sh -while inotifywait -e modify /var/log/messages; do +while ! inotifywait -e modify /var/log/messages; do if tail -n1 /var/log/messages | grep httpd; then kdialog --msgbox "Apache needs love!" fi @@ -341,10 +341,11 @@ It is assumed the inotify event queue will never overflow. .SH AUTHORS -inotifywait is written and maintained by Rohan McGovern <[email protected]>. +inotifywait was started by Rohan McGovern, and is currently maintained by Eric Curtin and Radu Voicilas. +https://www.openhub.net/p/inotify-tools/contributors/summary gives you a more complete list of contributors. inotifywait is part of inotify-tools. The inotify-tools website is located at: -.I http://inotify-tools.sourceforge.net/ +.I https://github.com/inotify-tools/inotify-tools/wiki .SH "SEE ALSO" inotifywatch(1), strftime(3), inotify(7) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/man/inotifywatch.1.in new/inotify-tools-3.20.2.2/man/inotifywatch.1.in --- old/inotify-tools-3.20.1/man/inotifywatch.1.in 2018-01-06 12:10:51.000000000 +0100 +++ new/inotify-tools-3.20.2.2/man/inotifywatch.1.in 2020-02-01 13:05:18.000000000 +0100 @@ -262,10 +262,10 @@ It is assumed the inotify event queue will never overflow. .SH AUTHORS -inotifywatch is written by Rohan McGovern <[email protected]>. +inotifywatch was started by Rohan McGovern, and is currently maintained by Eric Curtin and Radu Voicilas. https://www.openhub.net/p/inotify-tools/contributors/summary gives you a more complete list of contributors. inotifywatch is part of inotify-tools. The inotify-tools website is located at: -.I http://inotify-tools.sourceforge.net/ +.I https://github.com/inotify-tools/inotify-tools/wiki .SH "SEE ALSO" inotifywait(1), inotify(7) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/src/Makefile.am new/inotify-tools-3.20.2.2/src/Makefile.am --- old/inotify-tools-3.20.1/src/Makefile.am 2018-01-06 12:10:51.000000000 +0100 +++ new/inotify-tools-3.20.2.2/src/Makefile.am 2020-02-01 13:05:18.000000000 +0100 @@ -2,7 +2,7 @@ inotifywait_SOURCES = inotifywait.c common.c common.h inotifywatch_SOURCES = inotifywatch.c common.c common.h -AM_CFLAGS = -Wall -Werror -Wpointer-arith -std=c99 -I../libinotifytools/src -L../libinotifytools/src +AM_CFLAGS = -Wall -Wextra -Wpointer-arith -Werror -std=c99 -I../libinotifytools/src AM_CPPFLAGS = -I$(top_srcdir)/libinotifytools/src LDADD = ../libinotifytools/src/libinotifytools.la diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/src/common.h new/inotify-tools-3.20.2.2/src/common.h --- old/inotify-tools-3.20.1/src/common.h 2018-01-06 12:10:51.000000000 +0100 +++ new/inotify-tools-3.20.2.2/src/common.h 2020-02-01 13:05:18.000000000 +0100 @@ -1,6 +1,11 @@ #ifndef COMMON_H #define COMMON_H +#ifdef __FreeBSD__ +#define stat64 stat +#define lstat64 lstat +#endif + #include <stdbool.h> #define BLOCKING_TIMEOUT -1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/t/inotifywait-daemon-logs-to-relative-paths.t new/inotify-tools-3.20.2.2/t/inotifywait-daemon-logs-to-relative-paths.t --- old/inotify-tools-3.20.1/t/inotifywait-daemon-logs-to-relative-paths.t 2018-01-06 12:10:51.000000000 +0100 +++ new/inotify-tools-3.20.2.2/t/inotifywait-daemon-logs-to-relative-paths.t 2020-02-01 13:05:18.000000000 +0100 @@ -15,9 +15,10 @@ # inotifywait has been set up. timeout=2 && touch $logfile test-file && - {(sleep 1 && touch -a test-file)&} && + {(sleep 1 && chmod 777 test-file)&} && - inotifywait \ + export LD_LIBRARY_PATH="../../libinotifytools/src/.libs/" + ../../src/.libs/inotifywait \ --quiet \ --daemon \ --outfile $logfile \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inotify-tools-3.20.1/t/inotifywait-no-event-occured.t new/inotify-tools-3.20.2.2/t/inotifywait-no-event-occured.t --- old/inotify-tools-3.20.1/t/inotifywait-no-event-occured.t 2018-01-06 12:10:51.000000000 +0100 +++ new/inotify-tools-3.20.2.2/t/inotifywait-no-event-occured.t 2020-02-01 13:05:18.000000000 +0100 @@ -5,8 +5,9 @@ . ./sharness.sh run_() { + export LD_LIBRARY_PATH="../../libinotifytools/src/.libs/" touch test && - inotifywait --quiet --timeout 1 test + ../../src/.libs/inotifywait --quiet --timeout 1 test } test_expect_success 'Exit code 2 is returned' '
