From c60f765238615c5f8fcb4fdfafc299c91c7fa43e Mon Sep 17 00:00:00 2001 From: Stuart Cardall Date: Sun, 21 Jan 2018 12:05:17 +0000 Subject: community/inotify-tools-inc: remove aport The `--include` and `--includei` options are now part of inotify-tools. --- community/inotify-tools-inc/APKBUILD | 54 --- .../inotify-tools-inc/add-include-regex.patch | 365 --------------------- 2 files changed, 419 deletions(-) delete mode 100644 community/inotify-tools-inc/APKBUILD delete mode 100644 community/inotify-tools-inc/add-include-regex.patch diff --git a/community/inotify-tools-inc/APKBUILD b/community/inotify-tools-inc/APKBUILD deleted file mode 100644 index d49588744c..0000000000 --- a/community/inotify-tools-inc/APKBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# Contributor: Stuart Cardall -# Maintainer: Stuart Cardall -pkgname="inotify-tools-inc" -_realname="${pkgname%*-inc}" -pkgver=3.14 -pkgrel=1 -pkgdesc="inotify-tools patched to add --include regex" -url="https://github.com/rvoicilas/inotify-tools" -arch="all" -license="GPL-2.0" -depends="!inotify-tools" -subpackages="$pkgname-dev $pkgname-doc" -source="https://github.com/downloads/rvoicilas/$_realname/$_realname-$pkgver.tar.gz - add-include-regex.patch - " - -builddir="$srcdir"/$_realname-$pkgver - -prepare() { - default_prepare || return 1 - update_config_guess || return 1 -} - -build() { - cd "$builddir" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - || return 1 - make || return 1 -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 - # post-install message - mkdir -p "$pkgdir/usr/share/doc/$pkgname" - cat > $pkgdir/usr/share/doc/$pkgname/example.sh <.\n"); - printf("\t--excludei \n" - "\t \tLike --exclude but case insensitive.\n"); -+ printf("\t--include \n" -+ "\t \tInclude all events on only those files matching\n" -+ "\t \tthe extended regular expression .\n"); -+ printf("\t--includei \n" -+ "\t \tLike --include but case insensitive.\n"); - printf("\t-m|--monitor \tKeep listening for events forever. Without\n" - "\t \tthis option, inotifywait will exit after one\n" - "\t \tevent is received.\n"); -diff -urp inotify-tools-3.14/src/inotifywatch.c inotify-tools.new/src/inotifywatch.c ---- inotify-tools-3.14/src/inotifywatch.c 2010-03-12 13:53:46.000000000 +0000 -+++ inotify-tools.new/src/inotifywatch.c 2015-05-10 16:51:40.060391453 +0000 -@@ -43,7 +43,9 @@ bool parse_opts( - int * recursive, - char ** fromfile, - char ** regex, -- char ** iregex -+ char ** iregex, -+ char ** include_regex, -+ char ** include_iregex - ); - - void print_help(); -@@ -91,21 +93,34 @@ int main(int argc, char ** argv) - done = false; - char * regex = NULL; - char * iregex = NULL; -+ char * include_regex = NULL; -+ char * include_iregex = NULL; -+ bool invert_regex = false; - - signal( SIGINT, handle_impatient_user ); - - // Parse commandline options, aborting if something goes wrong - if ( !parse_opts( &argc, &argv, &events, &timeout, &verbose, &zero, &sort, -- &recursive, &fromfile, ®ex, &iregex ) ) { -+ &recursive, &fromfile, ®ex, &iregex, &include_regex, &include_iregex ) ) { - return EXIT_FAILURE; - } - -+ if (include_regex) { -+ regex = include_regex; -+ invert_regex = true; -+ } -+ -+ if (include_iregex) { -+ iregex = include_iregex; -+ invert_regex = true; -+ } -+ - if ( -- (regex && !inotifytools_ignore_events_by_regex(regex, REG_EXTENDED) ) || -+ (regex && !inotifytools_ignore_events_by_regex(regex, REG_EXTENDED, invert_regex) ) || - (iregex && !inotifytools_ignore_events_by_regex(iregex, REG_EXTENDED| -- REG_ICASE)) -+ REG_ICASE, invert_regex)) - ) { -- fprintf(stderr, "Error in `exclude' regular expression.\n"); -+ fprintf(stderr, "Error in `exclude' or `include' regular expression.\n"); - return EXIT_FAILURE; - } - -@@ -390,7 +405,9 @@ bool parse_opts( - int * recursive, - char ** fromfile, - char ** regex, -- char ** iregex -+ char ** iregex, -+ char ** include_regex, -+ char ** include_iregex - ) { - assert( argc ); assert( argv ); assert( events ); assert( timeout ); - assert( verbose ); assert( zero ); assert( sort ); assert( recursive ); -@@ -400,7 +417,7 @@ bool parse_opts( - char * opt_string = "hra:d:zve:t:"; - - // Construct array -- struct option long_opts[12]; -+ struct option long_opts[14]; - - // --help - long_opts[0].name = "help"; -@@ -460,11 +477,21 @@ bool parse_opts( - long_opts[10].has_arg = 1; - long_opts[10].flag = NULL; - long_opts[10].val = (int)'b'; -+ // --include -+ long_opts[11].name = "include"; -+ long_opts[11].has_arg = 1; -+ long_opts[11].flag = NULL; -+ long_opts[11].val = (int)'j'; -+ // --includei -+ long_opts[12].name = "includei"; -+ long_opts[12].has_arg = 1; -+ long_opts[12].flag = NULL; -+ long_opts[12].val = (int)'k'; - // Empty last element -- long_opts[11].name = 0; -- long_opts[11].has_arg = 0; -- long_opts[11].flag = 0; -- long_opts[11].val = 0; -+ long_opts[13].name = 0; -+ long_opts[13].has_arg = 0; -+ long_opts[13].flag = 0; -+ long_opts[13].val = 0; - - // Get first option - char curr_opt = getopt_long(*argc, *argv, opt_string, long_opts, NULL); -@@ -506,6 +533,16 @@ bool parse_opts( - (*iregex) = optarg; - break; - -+ // --include -+ case 'j': -+ (*include_regex) = optarg; -+ break; -+ -+ // --includei -+ case 'k': -+ (*include_iregex) = optarg; -+ break; -+ - // --fromfile - case 'o': - if (*fromfile) { -@@ -625,6 +662,16 @@ bool parse_opts( - return false; - } - -+ if ( *include_regex && *include_iregex ) { -+ fprintf(stderr, "--include and --includei cannot both be specified.\n"); -+ return false; -+ } -+ -+ if ( ( *include_regex || *include_iregex ) && ( *regex || *iregex ) ) { -+ fprintf(stderr, "Cannot use include and exclude options simultaneously.\n"); -+ return false; -+ } -+ - // If ? returned, invalid option - return (curr_opt != '?'); - } -@@ -647,6 +694,11 @@ void print_help() - "\t\texpression .\n"); - printf("\t--excludei \n" - "\t\tLike --exclude but case insensitive.\n"); -+ printf("\t--include \n" -+ "\t\tInclude all events only those files matching the extended\n" -+ "\t\tregular expression .\n"); -+ printf("\t--includei \n" -+ "\t\tLike --include but case insensitive.\n"); - printf("\t-z|--zero\n" - "\t\tIn the final table of results, output rows and columns even\n" - "\t\tif they consist only of zeros (the default is to not output\n" -- cgit v1.2.3