From nobody Tue Aug 22 06:55:39 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RVKqb5g5Hz4qT7k; Tue, 22 Aug 2023 06:55:39 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RVKqb58vNz4dt3; Tue, 22 Aug 2023 06:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692687339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wNpRQZ+lajeBhXgB3vqQHaUEL6VfLsaoF/djti3Z1OY=; b=KiWbb3PkcZtafJolsparkWvYVAilbMT6Y9+O8l3pa3sD4u+22K/P/x4BThu+SGbQentNEd 9mXuuvLgtE0BaXjdLSyzI3UIHNGYWWpkHLHLNulSEgIXS0zBPPVxijzCbd2TPzu2R+Jp3i Dk+DYFQgkHHmg7BMoY1swlFPnTexLvV1LWDiFCCH10YTDDk2pj8yBcJ0X368y2RJ5qY44m 2yDnzUJWdkN9mYvUdEBKthyQpZKPSAf+haWm0Bz48YUfC+7zqg+c/2QU7F6kqIoU49lyKA sHgmuPasSruFhSKPNZO7sCkVaptjOso41h3150mBW8ZSQ3XbmeiDjVeBUei4JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692687339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wNpRQZ+lajeBhXgB3vqQHaUEL6VfLsaoF/djti3Z1OY=; b=tkr5EWOiCENQg/4VQ9H6Jr/EX+5/Wc1QIiWU+pYyTsRdHXjjCKXk+/M6c5TbyKFyuAvBH5 Ggw+OLRKM4mxXuhFTWhBxxFC+poYQj2krcJxEHGy7tuuA5fEYopYdMYYznxqbNtfc5U92G 0shMkrApsUEaCcFGy3o+q2i4aUYdkcsiOklrsNto0r4+aG3i1gNdq3fVods/5z7uguj5vo 1sPy0MwkevqUiJtOj0/CxxBOQO5NkZJfgLlm48ImGyvJMSdL1k6e9EtsnEcrIDexJynRAy KdF4nwvOQ7GymxdIyquMbrrphts0+kQ8mSdFheFBdcs6iLEbIQ1gC0RPyMgrRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692687339; a=rsa-sha256; cv=none; b=hCv9FEd08CEnMwWvsnUzTLincy1XbeO9A12okI5e8Du7FgHoV+dd2RNY12i6+GZlJQTKDo uZjF+EU5w8dvo5xSXJ9JGDpJQU7zIceJeuil0BUzcdXV2zy0wbf2dT/8qp/42eYzomw4ww fNkxEJnyQ1izr3z1/kJDOlys8wDPFPMGI2b4ej6JJ07lSueCA/NChW3oh9B45EcfFaVeQg jzRf6pAMJEUA14AX9Zk0hibiaLXuGKFv7hn35rMUYNqcpFwqudOqMzAkfdEG+xpdd2tHej R4oLbYTuvT+elFEj/02ubI/bBd90CgS0wRKBl8Q6J8B7xMJw+cH8xNCz2utHKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RVKqb49VjztFw; Tue, 22 Aug 2023 06:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37M6tdP2074317; Tue, 22 Aug 2023 06:55:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37M6tdqL074314; Tue, 22 Aug 2023 06:55:39 GMT (envelope-from git) Date: Tue, 22 Aug 2023 06:55:39 GMT Message-Id: <202308220655.37M6tdqL074314@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 201baf55783b - main - sysutils/inotify-tools: Update 3.22.6.0 =?utf-8?Q?=E2=86=92?= 4.23.8.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 201baf55783b3bdb953cdbd356c7afb403f9d022 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=201baf55783b3bdb953cdbd356c7afb403f9d022 commit 201baf55783b3bdb953cdbd356c7afb403f9d022 Author: Yuri Victorovich AuthorDate: 2023-08-22 06:02:07 +0000 Commit: Yuri Victorovich CommitDate: 2023-08-22 06:55:33 +0000 sysutils/inotify-tools: Update 3.22.6.0 → 4.23.8.0 Reported by: portscout --- sysutils/inotify-tools/Makefile | 13 +++--- sysutils/inotify-tools/distinfo | 6 +-- sysutils/inotify-tools/files/patch-configure.ac | 6 +-- sysutils/inotify-tools/files/patch-src_Makefile.am | 18 ++++---- .../inotify-tools/files/patch-src_inotifywatch.c | 48 ---------------------- 5 files changed, 25 insertions(+), 66 deletions(-) diff --git a/sysutils/inotify-tools/Makefile b/sysutils/inotify-tools/Makefile index 331457edcf03..1a1be48fa229 100644 --- a/sysutils/inotify-tools/Makefile +++ b/sysutils/inotify-tools/Makefile @@ -1,5 +1,5 @@ PORTNAME= inotify-tools -DISTVERSION= 3.22.6.0 +DISTVERSION= 4.23.8.0 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org @@ -10,11 +10,14 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libinotify.so:devel/libinotify +TEST_DEPENDS= bash:shells/bash -USES= autoreconf compiler:c11 gmake libtool localbase +USES= autoreconf compiler:c11 gmake libtool localbase shebangfix USE_GITHUB= yes USE_LDCONFIG= yes +SHEBANG_GLOB= *.t *.sh + GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-doxygen @@ -24,9 +27,9 @@ OPTIONS_DEFINE= STATIC OPTIONS_SUB= yes post-patch: - @${REINPLACE_CMD} -e 's|stat64|stat|' \ - ${WRKSRC}/src/common.c \ - ${WRKSRC}/libinotifytools/src/inotifytools.c + @${REINPLACE_CMD} \ + -e 's|SHELL_PATH ?= /bin/bash|SHELL_PATH ?= ${LOCALBASE}/bin/bash|' \ + ${WRKSRC}/t/Makefile post-build-STATIC-on: @cd ${WRKSRC}/src && \ diff --git a/sysutils/inotify-tools/distinfo b/sysutils/inotify-tools/distinfo index e1e6961506f5..ceabaaecce2a 100644 --- a/sysutils/inotify-tools/distinfo +++ b/sysutils/inotify-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1655175207 -SHA256 (inotify-tools-inotify-tools-3.22.6.0_GH0.tar.gz) = c6b7e70f1df09e386217102a1fe041cfc15fa4f3d683d2970140b6814cf2ed12 -SIZE (inotify-tools-inotify-tools-3.22.6.0_GH0.tar.gz) = 92918 +TIMESTAMP = 1692682288 +SHA256 (inotify-tools-inotify-tools-4.23.8.0_GH0.tar.gz) = 8ad8b72a146af57688f3289b33b92a026915fc677997147071887b65b603d20a +SIZE (inotify-tools-inotify-tools-4.23.8.0_GH0.tar.gz) = 93265 diff --git a/sysutils/inotify-tools/files/patch-configure.ac b/sysutils/inotify-tools/files/patch-configure.ac index 851282839de2..6ff698392eac 100644 --- a/sysutils/inotify-tools/files/patch-configure.ac +++ b/sysutils/inotify-tools/files/patch-configure.ac @@ -1,7 +1,7 @@ ---- configure.ac.orig 2021-09-28 08:39:16 UTC +--- configure.ac.orig 2023-08-21 19:51:56 UTC +++ configure.ac -@@ -45,6 +45,7 @@ AM_CONDITIONAL([STATIC_BINARY_ENABLE], test "$STATIC_B - +@@ -55,6 +55,7 @@ fi + AM_CONDITIONAL(IS_CLANG, test "$IS_CLANG" = "yes") # Checks for libraries. +AC_SEARCH_LIBS(inotify_init, inotify) diff --git a/sysutils/inotify-tools/files/patch-src_Makefile.am b/sysutils/inotify-tools/files/patch-src_Makefile.am index 5214cd1fdfb3..96f6b8cd3c84 100644 --- a/sysutils/inotify-tools/files/patch-src_Makefile.am +++ b/sysutils/inotify-tools/files/patch-src_Makefile.am @@ -1,11 +1,15 @@ ---- src/Makefile.am.orig 2021-09-28 08:39:16 UTC +--- src/Makefile.am.orig 2023-08-21 19:51:56 UTC +++ src/Makefile.am -@@ -11,7 +11,7 @@ fsnotifywatch_SOURCES = inotifywatch.c common.c common - fsnotifywatch_CPPFLAGS = -DENABLE_FANOTIFY +@@ -12,10 +12,10 @@ fsnotifywatch_CPPFLAGS = $(AM_CPPFLAGS) -DENABLE_FANOT endif --AM_CFLAGS = -Wall -Wextra -Wshadow -Werror -std=c99 -I../libinotifytools/src -+AM_CFLAGS = -Wall -Wextra -Wshadow -Werror -std=c99 - AM_CPPFLAGS = -I$(top_srcdir)/libinotifytools/src - LDADD = ../libinotifytools/src/libinotifytools.la + if IS_CLANG +-AM_CFLAGS = -std=c99 -fno-exceptions -Wall -Wextra -Wshadow -Werror -Wno-unused-command-line-argument -I../libinotifytools/src ++AM_CFLAGS = -std=c99 -fno-exceptions -Wall -Wextra -Wshadow -Werror -Wno-unused-command-line-argument + AM_CPPFLAGS = -std=c++17 -fno-exceptions -Wall -Wextra -Wshadow -Werror -Wno-unused-command-line-argument -I../libinotifytools/src + else +-AM_CFLAGS = -std=c99 -fno-exceptions -Wall -Wextra -Wshadow -Werror -I../libinotifytools/src ++AM_CFLAGS = -std=c99 -fno-exceptions -Wall -Wextra -Wshadow -Werror + AM_CPPFLAGS = -std=c++17 -fno-exceptions -Wall -Wextra -Wshadow -Werror -I../libinotifytools/src + endif diff --git a/sysutils/inotify-tools/files/patch-src_inotifywatch.c b/sysutils/inotify-tools/files/patch-src_inotifywatch.c deleted file mode 100644 index 3b16e9a71dca..000000000000 --- a/sysutils/inotify-tools/files/patch-src_inotifywatch.c +++ /dev/null @@ -1,48 +0,0 @@ ---- src/inotifywatch.c.orig 2021-09-28 08:39:16 UTC -+++ src/inotifywatch.c -@@ -11,6 +11,9 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#include -+#endif // __FreeBSD__ - #include - #include - #include -@@ -96,8 +99,24 @@ int main(int argc, char **argv) { - char *inc_iregex = NULL; - int rc; - -+#ifdef __FreeBSD__ -+ sigset_t set, oset; -+#endif // __FreeBSD__ -+ - signal(SIGINT, handle_impatient_user); - -+#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__ -+ - // Parse commandline options, aborting if something goes wrong - if (!parse_opts(&argc, &argv, &events, &timeout, &verbose, &zero, &sort, - &recursive, &no_dereference, &fromfile, &exc_regex, -@@ -130,6 +149,10 @@ int main(int argc, char **argv) { - warn_inotify_init_error(fanotify); - 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.