diff options
-rw-r--r-- | .github/os_detect.sh | 7 | ||||
-rw-r--r-- | .github/workflows/test-next.yml | 2 | ||||
-rw-r--r-- | .github/workflows/test.yml | 2 | ||||
-rw-r--r-- | lib/utils_cmd.c | 2 | ||||
-rw-r--r-- | lib/utils_cmd.h | 2 | ||||
-rw-r--r-- | plugins/check_http.c | 10 |
6 files changed, 21 insertions, 4 deletions
diff --git a/.github/os_detect.sh b/.github/os_detect.sh index ee9c145d..47c762d3 100644 --- a/.github/os_detect.sh +++ b/.github/os_detect.sh | |||
@@ -1,10 +1,17 @@ | |||
1 | #!/bin/sh -e | 1 | #!/bin/sh -e |
2 | |||
3 | . /etc/os-release | ||
4 | |||
2 | # workaround for really bare-bones Archlinux containers: | 5 | # workaround for really bare-bones Archlinux containers: |
3 | if [ -x "$(command -v pacman)" ]; then | 6 | if [ -x "$(command -v pacman)" ]; then |
4 | pacman --noconfirm -Sy | 7 | pacman --noconfirm -Sy |
5 | pacman --noconfirm -S grep gawk sed | 8 | pacman --noconfirm -S grep gawk sed |
6 | fi | 9 | fi |
7 | 10 | ||
11 | if [ ${ID} == "fedora" -a ${VERSION_ID} -gt 41 ]; then | ||
12 | dnf install -y gawk | ||
13 | fi | ||
14 | |||
8 | os_release_file= | 15 | os_release_file= |
9 | if [ -s "/etc/os-release" ]; then | 16 | if [ -s "/etc/os-release" ]; then |
10 | os_release_file="/etc/os-release" | 17 | os_release_file="/etc/os-release" |
diff --git a/.github/workflows/test-next.yml b/.github/workflows/test-next.yml index 81240759..fd59e85d 100644 --- a/.github/workflows/test-next.yml +++ b/.github/workflows/test-next.yml | |||
@@ -38,7 +38,7 @@ jobs: | |||
38 | ${{ matrix.distro }} \ | 38 | ${{ matrix.distro }} \ |
39 | /bin/sh -c '${{ matrix.prepare }} && \ | 39 | /bin/sh -c '${{ matrix.prepare }} && \ |
40 | tools/setup && \ | 40 | tools/setup && \ |
41 | ./configure --enable-libtap --with-ipv6=no && \ | 41 | ./configure --enable-libtap && \ |
42 | make && \ | 42 | make && \ |
43 | make test && \ | 43 | make test && \ |
44 | make dist && \ | 44 | make dist && \ |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 77ca6585..ce0ec547 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml | |||
@@ -35,7 +35,7 @@ jobs: | |||
35 | ${{ matrix.distro }} \ | 35 | ${{ matrix.distro }} \ |
36 | /bin/sh -c '${{ matrix.prepare }} && \ | 36 | /bin/sh -c '${{ matrix.prepare }} && \ |
37 | tools/setup && \ | 37 | tools/setup && \ |
38 | ./configure --enable-libtap --with-ipv6=no && \ | 38 | ./configure --enable-libtap && \ |
39 | make && \ | 39 | make && \ |
40 | make test && \ | 40 | make test && \ |
41 | make dist && \ | 41 | make dist && \ |
diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c index 18350ac0..9b222409 100644 --- a/lib/utils_cmd.c +++ b/lib/utils_cmd.c | |||
@@ -346,7 +346,7 @@ int cmd_run_array(char *const *argv, output *out, output *err, int flags) { | |||
346 | return _cmd_close(fd); | 346 | return _cmd_close(fd); |
347 | } | 347 | } |
348 | 348 | ||
349 | int cmd_file_read(char *filename, output *out, int flags) { | 349 | int cmd_file_read(const char *filename, output *out, int flags) { |
350 | int fd; | 350 | int fd; |
351 | if (out) | 351 | if (out) |
352 | memset(out, 0, sizeof(output)); | 352 | memset(out, 0, sizeof(output)); |
diff --git a/lib/utils_cmd.h b/lib/utils_cmd.h index d00069c9..728ece23 100644 --- a/lib/utils_cmd.h +++ b/lib/utils_cmd.h | |||
@@ -20,7 +20,7 @@ typedef struct output output; | |||
20 | /** prototypes **/ | 20 | /** prototypes **/ |
21 | int cmd_run(const char *, output *, output *, int); | 21 | int cmd_run(const char *, output *, output *, int); |
22 | int cmd_run_array(char *const *, output *, output *, int); | 22 | int cmd_run_array(char *const *, output *, output *, int); |
23 | int cmd_file_read(char *, output *, int); | 23 | int cmd_file_read(const char *, output *, int); |
24 | 24 | ||
25 | /* only multi-threaded plugins need to bother with this */ | 25 | /* only multi-threaded plugins need to bother with this */ |
26 | void cmd_init(void); | 26 | void cmd_init(void); |
diff --git a/plugins/check_http.c b/plugins/check_http.c index baff682a..8e0c15ec 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c | |||
@@ -1724,6 +1724,16 @@ print_help (void) | |||
1724 | printf ("%s\n", _("strings and regular expressions, check connection times, and report on")); | 1724 | printf ("%s\n", _("strings and regular expressions, check connection times, and report on")); |
1725 | printf ("%s\n", _("certificate expiration times.")); | 1725 | printf ("%s\n", _("certificate expiration times.")); |
1726 | 1726 | ||
1727 | printf ("\n"); | ||
1728 | printf ("%s\n", _("ATTENTION!")); | ||
1729 | printf ("\n"); | ||
1730 | printf ("%s\n", _("THIS PLUGIN IS DEPRECATED. The functionality was reimplemented by the")); | ||
1731 | printf ("%s\n", _("check_curl plugin, which can be used as a drop-in replacement. You should")); | ||
1732 | printf ("%s\n", _("migrate your checks over to check_curl, because check_http is going to be")); | ||
1733 | printf ("%s\n", _("removed sooner than later. Just replace check_http with check_curl in your")); | ||
1734 | printf ("%s\n", _("check command definitions.")); | ||
1735 | printf ("%s\n", _("Report issues to: https://github.com/monitoring-plugins/monitoring-plugins/issues")); | ||
1736 | |||
1727 | printf ("\n\n"); | 1737 | printf ("\n\n"); |
1728 | 1738 | ||
1729 | print_usage (); | 1739 | print_usage (); |