diff options
Diffstat (limited to 'sys-fs/inotify-tools')
-rw-r--r-- | sys-fs/inotify-tools/Manifest | 7 | ||||
-rw-r--r-- | sys-fs/inotify-tools/files/inotify-tools-3.22.6.0-musl.patch | 224 | ||||
-rw-r--r-- | sys-fs/inotify-tools/inotify-tools-3.22.6.0-r1.ebuild | 44 | ||||
-rw-r--r-- | sys-fs/inotify-tools/inotify-tools-4.23.9.0.ebuild (renamed from sys-fs/inotify-tools/inotify-tools-4.23.8.0.ebuild) | 0 |
4 files changed, 2 insertions, 273 deletions
diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest index 39b95f34d935..f8c82258e13f 100644 --- a/sys-fs/inotify-tools/Manifest +++ b/sys-fs/inotify-tools/Manifest @@ -1,6 +1,3 @@ -AUX inotify-tools-3.22.6.0-musl.patch 6184 BLAKE2B 88e6ca44a4624dce3a1e92ebcb9d3da727a81420c2ee96b8075d66d3ce1d4353c7aee271be1b679a4b60e3ebf1f93c1d3f4011615e575157d0fc1caf1c21d83d SHA512 d5a7c1e788cc31b283d3a721d1baf95803ab9f83b0a2a67e84e3e7663600a59b2205248a8998859cbe5857f263ebee09c9299ee28076c70f859b8f68d0dc6318 -DIST inotify-tools-3.22.6.0.tar.gz 92918 BLAKE2B 601d3ac6896e445d297a04498c63df4f81c59699ba2d5b2eee2e8c499332913ce2783d13c9906d577ff0b6d7ef91ca826d48b01674adeb3d3569dfc1fbc0df63 SHA512 cda445add4b9d80b70eff9189ed50d05f4b5593a755159d0354431166c6fe6fdb33f7bf37fd50bc09aad3ed0a6e3763b9c74f65e554400f2596b8d492f1d0a21 -DIST inotify-tools-4.23.8.0.tar.gz 93265 BLAKE2B 9aa6d33a090dd0ea055550c6540e4a7d4f0bcea0640d97c705dacecbddf388423ce217af9ac6df02bebfb0613f160d1860388c6f4e116d7c6cbc3fb42350a312 SHA512 0601f01aaf5be08fc5209710ea8c359b21d2dd6acd4ecfad79d86b287ea51b0b9201339d1bf6c3437e611ba3df760adec9ad7bb4083f13f93649e23d60fb64ed -EBUILD inotify-tools-3.22.6.0-r1.ebuild 881 BLAKE2B bed52561cb35fa207ff317fe49b3534b75b407b1c6629751b3b347867f7a504312a0f4f20c615c313142699342b0768b2676fc274378f483dd3ef90614b0b11b SHA512 b68378c11aee9299c24eebd33cac83e359366925cc5590b696d7a603d29bc7f5b4f1cc5cb7a7e332fa333b2de13b345df67af066533495e21ba92965daaf6889 -EBUILD inotify-tools-4.23.8.0.ebuild 842 BLAKE2B 63139e49ea8f3cca0ab8d97490ffacb85b59da054da2e3fe7d6b6efb4ec90618c9fb340b285494986bcc2a11e9407887900c596890fa929a47d46ffb8fdb6410 SHA512 264a03cdb5479e74753d7701da6a8df030e1470c9e2351d7f27e62613061f0e059ff3d9e959f75ec345b6b30af644c2f844dbe516ecd848df1ea3b2c16c2d315 +DIST inotify-tools-4.23.9.0.tar.gz 93281 BLAKE2B eddb0e44721cd8674f2309046998de16a030ed9ad84c49bc5950b9362055db9242dc0de1c615c3bd6c1f2835c83fc55446c9f8e6da52a98870c53f4e6cfa31f9 SHA512 8f44037a482fa39978b845b4989834e8c897ad872913c6cb8c4a987e0d13f9177b05f593332b859d7adde228fdc3512fd45d66cab65368c38926f41d57e22d13 +EBUILD inotify-tools-4.23.9.0.ebuild 842 BLAKE2B 63139e49ea8f3cca0ab8d97490ffacb85b59da054da2e3fe7d6b6efb4ec90618c9fb340b285494986bcc2a11e9407887900c596890fa929a47d46ffb8fdb6410 SHA512 264a03cdb5479e74753d7701da6a8df030e1470c9e2351d7f27e62613061f0e059ff3d9e959f75ec345b6b30af644c2f844dbe516ecd848df1ea3b2c16c2d315 MISC metadata.xml 590 BLAKE2B 6e50ca7a9b47cfe8bf97f73cb62c7e9f99d21c7687989a224136a38c075242f02386e14e5fc6d4e7216f9e44be32711005a2f366f2c26db02a900c6c5a852adf SHA512 a17f9f5e0b397c00f290e476ba9c40466149a40bb0bdbab9b75a726518ee413efc6fd64a13f2be5baf5f651c5a09a1f736c194122e5b3b81377d542b21cf925d diff --git a/sys-fs/inotify-tools/files/inotify-tools-3.22.6.0-musl.patch b/sys-fs/inotify-tools/files/inotify-tools-3.22.6.0-musl.patch deleted file mode 100644 index 0b6c9dbbe930..000000000000 --- a/sys-fs/inotify-tools/files/inotify-tools-3.22.6.0-musl.patch +++ /dev/null @@ -1,224 +0,0 @@ -https://bugs.gentoo.org/831976 (undeclared _kernel_fsid_t) -https://bugs.gentoo.org/907887 (musl-1.2.4 lfs64 issues) - -https://github.com/inotify-tools/inotify-tools/commit/8367bdd1eda71c10ab0a49c694846a622e543807 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 30 Dec 2022 04:04:56 -0800 -Subject: [PATCH] Fix build with musl and add Alpine buildnode to CI (#174) - -* configure: Add AC_SYS_LARGEFILE autoconf macro - -This will define _FILE_OFFSET_BITS to be 64 if off_t is 64bit -and we do not need to define lfs64 functions - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -* Fix build for out-of-tree builds - -When build tree is outside source-tree its not able to find -fanotify-dfid-name.h, add needed include paths on compiler commandline - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -* libinotifytools: Bridge differences between musl/glibc/kernel fnotify.h - -System detects to use sys/fnotify.h and then assumes glibc's definitions -but musl has definitions of its own. perhaps portable thing would be to -use linux/fnotify.h interface directly on linux irrespective of libc - -See the differences discussion here [1] - -[1] https://inbox.vuxu.org/musl/20191112220151.GC27331@x230/T/#ma8700992467200c8792e0fa8508eae656b81aeba - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -* replace stat64/lstat64 with stat/lstat - -lfs64 functions are not needed when off_t is 64-bit -Additionally this fixes build with musl which does not -export these functions without defining _LARGEFILE64_SOURCE - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -* Apply changes from clang-format - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -* Fix errors found by clang-format - -Fixes --Wno-gnu-variable-sized-type-not-at-end for musl clang-format - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -* ci: Enable musl in CI using alpine - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -* Tell clang-tidy to ignore warning about variable sized type - -Signed-off-by: Eric Curtin <ecurtin@redhat.com> - -* Add gcompat for code coverage tool - -Signed-off-by: Eric Curtin <ecurtin@redhat.com> - -* Skip sonarcloud on alpine - -Signed-off-by: Eric Curtin <ecurtin@redhat.com> - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Eric Curtin <ecurtin@redhat.com> -Co-authored-by: Eric Curtin <ecurtin@redhat.com> ---- a/configure.ac -+++ b/configure.ac -@@ -17,6 +17,9 @@ AC_PROG_CC - AM_INIT_AUTOMAKE - LT_INIT - -+# Add option for largefile support -+AC_SYS_LARGEFILE -+ - AC_PATH_PROG(DOXYGEN, doxygen, NO_DOXYGEN) - - AC_ARG_ENABLE(doxygen, ---- a/libinotifytools/src/Makefile.am -+++ b/libinotifytools/src/Makefile.am -@@ -2,6 +2,7 @@ SUBDIRS = inotifytools - - lib_LTLIBRARIES = libinotifytools.la - libinotifytools_la_SOURCES = inotifytools.c inotifytools_p.h redblack.c redblack.h stats.c stats.h -+libinotifytools_la_CFLAGS = -I$(srcdir)/inotifytools - libinotifytools_la_LDFLAGS = -version-info 4:1:4 - - check_PROGRAMS = test ---- a/libinotifytools/src/inotifytools.c -+++ b/libinotifytools/src/inotifytools.c -@@ -51,10 +51,16 @@ struct fanotify_event_fid; - #include <sys/vfs.h> - #include "inotifytools/fanotify.h" - -+#ifndef __GLIBC__ -+#define val __val -+#define __kernel_fsid_t fsid_t -+#endif -+ - struct fanotify_event_fid { - struct fanotify_event_info_fid info; - struct file_handle handle; - }; -+ - #endif - - /** -@@ -1746,14 +1752,14 @@ int inotifytools_watch_recursively_with_exclude(char const* path, - - static struct dirent * ent; - char * next_file; -- static struct stat64 my_stat; -+ static struct stat my_stat; - ent = readdir( dir ); - // Watch each directory within this directory - while ( ent ) { - if ( (0 != strcmp( ent->d_name, "." )) && - (0 != strcmp( ent->d_name, ".." )) ) { - nasprintf(&next_file,"%s%s", my_path, ent->d_name); -- if ( -1 == lstat64( next_file, &my_stat ) ) { -+ if (-1 == lstat(next_file, &my_stat)) { - error = errno; - free( next_file ); - if ( errno != EACCES ) { -@@ -1836,9 +1841,9 @@ int inotifytools_error() { - * @internal - */ - static int isdir( char const * path ) { -- static struct stat64 my_stat; -+ static struct stat my_stat; - -- if ( -1 == lstat64( path, &my_stat ) ) { -+ if (-1 == lstat(path, &my_stat)) { - if (errno == ENOENT) return 0; - fprintf(stderr, "Stat failed on %s: %s\n", path, strerror(errno)); - return 0; ---- a/libinotifytools/src/inotifytools/fanotify-dfid-name.h -+++ b/libinotifytools/src/inotifytools/fanotify-dfid-name.h -@@ -129,7 +129,7 @@ struct fanotify_event_info_fid { - * Following is an opaque struct file_handle that can be passed as - * an argument to open_by_handle_at(2). - */ -- unsigned char handle[0]; -+ unsigned char handle[]; - }; - - struct fanotify_response { ---- a/libinotifytools/src/inotifytools/inotify-nosys.h -+++ b/libinotifytools/src/inotifytools/inotify-nosys.h -@@ -13,11 +13,6 @@ - #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 - * ---- a/libinotifytools/src/inotifytools/inotifytools.h -+++ b/libinotifytools/src/inotifytools/inotifytools.h -@@ -1,11 +1,6 @@ - #ifndef _inotifytools_H - #define _inotifytools_H - --#ifdef __FreeBSD__ --#define stat64 stat --#define lstat64 lstat --#endif -- - #ifdef __cplusplus - extern "C" - { ---- a/src/common.c -+++ b/src/common.c -@@ -45,14 +45,15 @@ void print_event_descriptions() { - } - - int isdir(char const *path) { -- static struct stat64 my_stat; -- -- if (-1 == lstat64(path, &my_stat)) { -- if (errno == ENOENT) -- return 0; -- fprintf(stderr, "Stat failed on %s: %s\n", path, strerror(errno)); -- return 0; -- } -+ static struct stat my_stat; -+ -+ if (-1 == lstat(path, &my_stat)) { -+ if (errno == ENOENT) -+ return 0; -+ fprintf(stderr, "Stat failed on %s: %s\n", path, -+ strerror(errno)); -+ return 0; -+ } - - return S_ISDIR(my_stat.st_mode) && !S_ISLNK(my_stat.st_mode); - } ---- a/src/common.h -+++ b/src/common.h -@@ -1,13 +1,9 @@ - #ifndef COMMON_H - #define COMMON_H - --#ifdef __FreeBSD__ --#define stat64 stat --#define lstat64 lstat --#ifdef ENABLE_FANOTIFY -+#if defined(__FreeBSD__) && defined(ENABLE_FANOTIFY) - #error "FreeBSD does not support fanotify" - #endif --#endif - - #include <stdbool.h> - diff --git a/sys-fs/inotify-tools/inotify-tools-3.22.6.0-r1.ebuild b/sys-fs/inotify-tools/inotify-tools-3.22.6.0-r1.ebuild deleted file mode 100644 index 9272ad8d669e..000000000000 --- a/sys-fs/inotify-tools/inotify-tools-3.22.6.0-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Set of command-line programs providing a simple interface to inotify" -HOMEPAGE="https://github.com/inotify-tools/inotify-tools/" -SRC_URI="https://github.com/inotify-tools/inotify-tools/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~mips ~riscv sparc x86" -IUSE="doc" - -BDEPEND="doc? ( app-doc/doxygen )" - -PATCHES=( - "${FILESDIR}"/${P}-musl.patch -) - -src_prepare() { - default - - sed -i 's/ -Werror//' {,libinotifytools/}src/Makefile.am || die #745069 - - eautoreconf -} - -src_configure() { - local econfargs=( - --docdir="${EPREFIX}"/usr/share/doc/${PF}/html - $(use_enable doc doxygen) - ) - - econf "${econfargs[@]}" -} - -src_install() { - default - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/sys-fs/inotify-tools/inotify-tools-4.23.8.0.ebuild b/sys-fs/inotify-tools/inotify-tools-4.23.9.0.ebuild index 7a6785447342..7a6785447342 100644 --- a/sys-fs/inotify-tools/inotify-tools-4.23.8.0.ebuild +++ b/sys-fs/inotify-tools/inotify-tools-4.23.9.0.ebuild |