Date: Tue, 15 Mar 2016 17:01:33 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r411193 - in branches/2016Q1/sysutils/inotify-tools: . files Message-ID: <201603151701.u2FH1Xrv003466@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Tue Mar 15 17:01:33 2016 New Revision: 411193 URL: https://svnweb.freebsd.org/changeset/ports/411193 Log: MFH: r411192 sysutils/inotify-tools: Update to 3.14.01 This update prevents signal handling from being blocked on a worker thread as well as an accumulation of other bug fixes. PR: 204366 Approved by: ports-secteam (with hat) Added: branches/2016Q1/sysutils/inotify-tools/files/patch-configure.ac - copied unchanged from r411192, head/sysutils/inotify-tools/files/patch-configure.ac branches/2016Q1/sysutils/inotify-tools/files/patch-src_Makefile.am - copied unchanged from r411192, head/sysutils/inotify-tools/files/patch-src_Makefile.am branches/2016Q1/sysutils/inotify-tools/files/patch-src_inotifywatch.c - copied unchanged from r411192, head/sysutils/inotify-tools/files/patch-src_inotifywatch.c Deleted: branches/2016Q1/sysutils/inotify-tools/files/patch-libinotifytools_src_inotifytools.c Modified: branches/2016Q1/sysutils/inotify-tools/Makefile branches/2016Q1/sysutils/inotify-tools/distinfo Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/sysutils/inotify-tools/Makefile ============================================================================== --- branches/2016Q1/sysutils/inotify-tools/Makefile Tue Mar 15 16:58:12 2016 (r411192) +++ branches/2016Q1/sysutils/inotify-tools/Makefile Tue Mar 15 17:01:33 2016 (r411193) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= inotify-tools -PORTVERSION= 3.14 -CATEGORIES= sysutils +PORTVERSION= 3.14.01 DISTVERSIONPREFIX= v +CATEGORIES= sysutils MAINTAINER= yuri@rawbw.com COMMENT= Command-line utilities to watch for file events @@ -15,6 +15,7 @@ LIB_DEPENDS= libinotify.so:${PORTSDIR}/d USE_GITHUB= yes GH_ACCOUNT= rvoicilas +GH_TAGNAME= 1df9af4 USES= autoreconf gmake libtool GNU_CONFIGURE= yes @@ -24,6 +25,5 @@ INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -LIBS+= -linotify .include <bsd.port.mk> Modified: branches/2016Q1/sysutils/inotify-tools/distinfo ============================================================================== --- branches/2016Q1/sysutils/inotify-tools/distinfo Tue Mar 15 16:58:12 2016 (r411192) +++ branches/2016Q1/sysutils/inotify-tools/distinfo Tue Mar 15 17:01:33 2016 (r411193) @@ -1,2 +1,2 @@ -SHA256 (rvoicilas-inotify-tools-v3.14_GH0.tar.gz) = 97a4fdf9132da47c2baa677c1a427c435ee55a26df42b2b74a41489b9fbd2323 -SIZE (rvoicilas-inotify-tools-v3.14_GH0.tar.gz) = 66905 +SHA256 (rvoicilas-inotify-tools-v3.14.01-1df9af4_GH0.tar.gz) = 3cb567344dad1fbe9a935d5a7c3f9c9bbce151df982631eb319763b2708ef4ea +SIZE (rvoicilas-inotify-tools-v3.14.01-1df9af4_GH0.tar.gz) = 70023 Copied: branches/2016Q1/sysutils/inotify-tools/files/patch-configure.ac (from r411192, head/sysutils/inotify-tools/files/patch-configure.ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/sysutils/inotify-tools/files/patch-configure.ac Tue Mar 15 17:01:33 2016 (r411193, copy of r411192, head/sysutils/inotify-tools/files/patch-configure.ac) @@ -0,0 +1,18 @@ +--- configure.ac.orig 2014-11-09 20:57:04 UTC ++++ configure.ac +@@ -44,6 +44,7 @@ AM_CONDITIONAL([STATIC_BINARY_ENABLE], t + + + # Checks for libraries. ++AC_SEARCH_LIBS(inotify_init, inotify) + + # Checks for header files. + AC_CHECK_HEADERS([sys/inotify.h mcheck.h]) +@@ -62,6 +63,7 @@ AC_C_CONST + AC_C_INLINE + + # Checks for library functions. ++AC_CHECK_FUNCS(stat64, [], [CPPFLAGS="$CPPFLAGS -Dstat64=stat -Dlstat64=lstat"]) + + # Set variables used in man page templates + MAN_DATE=$(date +'%B %d, %Y') Copied: branches/2016Q1/sysutils/inotify-tools/files/patch-src_Makefile.am (from r411192, head/sysutils/inotify-tools/files/patch-src_Makefile.am) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/sysutils/inotify-tools/files/patch-src_Makefile.am Tue Mar 15 17:01:33 2016 (r411193, copy of r411192, head/sysutils/inotify-tools/files/patch-src_Makefile.am) @@ -0,0 +1,16 @@ +--- src/Makefile.am.orig 2014-11-09 20:57:04 UTC ++++ src/Makefile.am +@@ -2,10 +2,11 @@ bin_PROGRAMS = inotifywait inotifywatch + 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 -Werror -Wpointer-arith -std=c99 + AM_CPPFLAGS = -I$(top_srcdir)/libinotifytools/src + LDADD = ../libinotifytools/src/libinotifytools.la ++AM_LDFLAGS = -L$(top_srcdir)/libinotifytools/src + + if STATIC_BINARY_ENABLE +-AM_LDFLAGS = -static-libtool-libs ++AM_LDFLAGS += -static-libtool-libs + endif Copied: branches/2016Q1/sysutils/inotify-tools/files/patch-src_inotifywatch.c (from r411192, head/sysutils/inotify-tools/files/patch-src_inotifywatch.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/sysutils/inotify-tools/files/patch-src_inotifywatch.c Tue Mar 15 17:01:33 2016 (r411193, copy of r411192, head/sysutils/inotify-tools/files/patch-src_inotifywatch.c) @@ -0,0 +1,50 @@ +--- src/inotifywatch.c.orig 2015-11-09 01:40:46 UTC ++++ src/inotifywatch.c +@@ -12,6 +12,9 @@ + #include <errno.h> + #include <fcntl.h> + #include <getopt.h> ++#ifdef __FreeBSD__ ++#include <pthread.h> ++#endif // __FreeBSD__ + #include <regex.h> + #include <signal.h> + #include <stdbool.h> +@@ -93,6 +96,9 @@ int main(int argc, char ** argv) + char * exc_iregex = NULL; + char * inc_regex = NULL; + char * inc_iregex = NULL; ++#ifdef __FreeBSD__ ++ sigset_t set, oset; ++#endif // __FreeBSD__ + + signal( SIGINT, handle_impatient_user ); + +@@ -121,11 +127,27 @@ int main(int argc, char ** argv) + return EXIT_FAILURE; + } + ++#ifdef __FreeBSD__ ++ // Block some signals in libinotify's worker thread, so that ++ // handle_signal runs in the context of the main thread and ++ // the 'done' flag is actually honored. ++ sigemptyset(&set); ++ sigaddset(&set, SIGINT); ++ sigaddset(&set, SIGHUP); ++ sigaddset(&set, SIGTERM); ++ sigaddset(&set, SIGALRM); ++ pthread_sigmask(SIG_BLOCK, &set, &oset); ++#endif // __FreeBSD__ ++ + if ( !inotifytools_initialize() ) { + warn_inotify_init_error(); + return EXIT_FAILURE; + } + ++#ifdef __FreeBSD__ ++ pthread_sigmask(SIG_SETMASK, &oset, NULL); ++#endif // __FreeBSD__ ++ + // Attempt to watch file + // If events is still 0, make it all events. + if ( !events )
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603151701.u2FH1Xrv003466>