From owner-svn-ports-all@freebsd.org Fri Jan 31 05:46:36 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2D6F2233DB8; Fri, 31 Jan 2020 05:46:36 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4885nS0D5lz48Bk; Fri, 31 Jan 2020 05:46:36 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F234A9435; Fri, 31 Jan 2020 05:46:35 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00V5kZmf056447; Fri, 31 Jan 2020 05:46:35 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00V5kZoS056439; Fri, 31 Jan 2020 05:46:35 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202001310546.00V5kZoS056439@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Fri, 31 Jan 2020 05:46:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524672 - in head/sysutils/inotify-tools: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/sysutils/inotify-tools: . files X-SVN-Commit-Revision: 524672 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Jan 2020 05:46:36 -0000 Author: yuri Date: Fri Jan 31 05:46:34 2020 New Revision: 524672 URL: https://svnweb.freebsd.org/changeset/ports/524672 Log: sysutils/inotify-tools: Update 3.20.1 -> 3.20.2 inotify-tools has a new maintainer, changed to his fork. Modified: head/sysutils/inotify-tools/Makefile head/sysutils/inotify-tools/distinfo head/sysutils/inotify-tools/files/patch-src_Makefile.am head/sysutils/inotify-tools/files/patch-src_inotifywatch.c head/sysutils/inotify-tools/pkg-descr Modified: head/sysutils/inotify-tools/Makefile ============================================================================== --- head/sysutils/inotify-tools/Makefile Fri Jan 31 05:41:20 2020 (r524671) +++ head/sysutils/inotify-tools/Makefile Fri Jan 31 05:46:34 2020 (r524672) @@ -1,8 +1,8 @@ # Created by: Yuri Victorovich # $FreeBSD$ -PORTNAME= inotify-tools -DISTVERSION= 3.20.1 +PORTNAME= inotify-tools # new fork https://github.com/ericcurtin/inotify-tools +DISTVERSION= 3.20.2 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org @@ -15,7 +15,6 @@ LIB_DEPENDS= libinotify.so:devel/libinotify USES= autoreconf gmake libtool localbase USE_GITHUB= yes -GH_ACCOUNT= rvoicilas GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-doxygen USE_LDCONFIG= yes @@ -37,5 +36,11 @@ post-build-STATIC-on: post-install-STATIC-on: ${INSTALL_PROGRAM} ${WRKSRC}/src/inotifywait.static ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/src/inotifywatch.static ${STAGEDIR}${PREFIX}/bin + +do-test: # Some tests are known to fail: https://github.com/inotify-tools/inotify-tools/issues/108 + @${ECHO} "unit test" + @cd ${WRKSRC}/libinotifytools/src && ${GMAKE} test && ./test + @${ECHO} "integration test" + @cd ${WRKSRC}/t && ${GMAKE} .include Modified: head/sysutils/inotify-tools/distinfo ============================================================================== --- head/sysutils/inotify-tools/distinfo Fri Jan 31 05:41:20 2020 (r524671) +++ head/sysutils/inotify-tools/distinfo Fri Jan 31 05:46:34 2020 (r524672) @@ -1,3 +1,3 @@ -TIMESTAMP = 1517817616 -SHA256 (rvoicilas-inotify-tools-3.20.1_GH0.tar.gz) = a433cc1dedba851078276db69b0e97f9fe41e4ba3336d2971adfca4b3a6242ac -SIZE (rvoicilas-inotify-tools-3.20.1_GH0.tar.gz) = 79564 +TIMESTAMP = 1580350866 +SHA256 (inotify-tools-inotify-tools-3.20.2_GH0.tar.gz) = 5ef0519934ac99f58c217fce259832a4ed51e25ded64c8aaf1149791b2c9b2c7 +SIZE (inotify-tools-inotify-tools-3.20.2_GH0.tar.gz) = 80938 Modified: head/sysutils/inotify-tools/files/patch-src_Makefile.am ============================================================================== --- head/sysutils/inotify-tools/files/patch-src_Makefile.am Fri Jan 31 05:41:20 2020 (r524671) +++ head/sysutils/inotify-tools/files/patch-src_Makefile.am Fri Jan 31 05:46:34 2020 (r524672) @@ -1,16 +1,11 @@ ---- src/Makefile.am.orig 2014-11-09 20:57:04 UTC +--- src/Makefile.am.orig 2020-01-30 00:04:48 UTC +++ src/Makefile.am -@@ -2,10 +2,11 @@ bin_PROGRAMS = inotifywait inotifywatch +@@ -2,7 +2,7 @@ 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_CFLAGS = -Wall -Wextra -Wpointer-arith -Werror -std=c99 -I../libinotifytools/src ++AM_CFLAGS = -Wall -Wextra -Wpointer-arith -Werror -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 Modified: head/sysutils/inotify-tools/files/patch-src_inotifywatch.c ============================================================================== --- head/sysutils/inotify-tools/files/patch-src_inotifywatch.c Fri Jan 31 05:41:20 2020 (r524671) +++ head/sysutils/inotify-tools/files/patch-src_inotifywatch.c Fri Jan 31 05:46:34 2020 (r524672) @@ -1,4 +1,4 @@ ---- src/inotifywatch.c.orig 2018-01-06 11:10:51 UTC +--- src/inotifywatch.c.orig 2020-01-30 00:04:48 UTC +++ src/inotifywatch.c @@ -12,6 +12,9 @@ #include @@ -21,7 +21,7 @@ signal(SIGINT, handle_impatient_user); // Parse commandline options, aborting if something goes wrong -@@ -110,11 +117,27 @@ int main(int argc, char **argv) { +@@ -110,10 +117,26 @@ int main(int argc, char **argv) { return EXIT_FAILURE; } @@ -41,11 +41,10 @@ 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) Modified: head/sysutils/inotify-tools/pkg-descr ============================================================================== --- head/sysutils/inotify-tools/pkg-descr Fri Jan 31 05:41:20 2020 (r524671) +++ head/sysutils/inotify-tools/pkg-descr Fri Jan 31 05:46:34 2020 (r524672) @@ -1,4 +1,4 @@ The set of command-line programs providing a simple interface to file system events to shell scripts. -WWW: https://github.com/rvoicilas/inotify-tools/ +WWW: https://github.com/inotify-tools/inotify-tools/