Merge branch 'master' of github.com:monitoring-plugins/monitoring-plugins

6 files changed, 53 insertions, 6 deletions

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ea0b38be..37c77381 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Codespell
         uses: codespell-project/actions-codespell@v2
         with:
-          skip: "./.git,./.gitignore,./ABOUT-NLS,*.po,./gl,./po,./tools/squid.conf,./build-aux/ltmain.sh"
+          skip: "./.git,./.gitignore,./ABOUT-NLS,*.po,./gl,./po,./tools/squid.conf,./build-aux/ltmain.sh,THANKS.in"
           ignore_words_list: allright,gord,didi,hda,nd,alis,clen,scrit,ser,fot,te,parm,isnt,consol,oneliners,esponse,slac
           check_filenames: true
           check_hidden: true
diff --git a/NEWS b/NEWS
index 9ec3c5e0..5af66e87 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,39 @@
 This file documents the major additions and syntax changes between releases.
 
+2.3.4 18th Oct 2023
+        ENHANCEMENTS
+        * check_curl: added --cookie-jar and doing proper cleanup of libcurl
+        * check_curl: Include all IPs from getaddrinfo() in curl DNS cache
+        * check_dhcp: Add dhcp rogue detection
+        * check_disk: add ignore-missing option to return OK for missing fs
+        * check_disk_smb: allow checking 0-sized resource (ex. IPC$)
+        * check_disk: The options to include or exclude specific file systems now allow the usage of regex(7)
+        * check_icmp: Add support to Jitter, MOS and Score
+        * check_mysql: Detect running mysqldump and handle it more gracefully
+        * check_procs: Implement --exclude-process to exclude specific processes
+        * check_smtp: add new longoption --tls
+        * check_smtp: Add option to prefix PROXY header
+        * check_smtp: Add support for SMTP over TLS
+        * check_smtp: Add support for SNI
+        * check_snmp: Implement option to ignore mib file parsing errors
+        * check_users: prefer systemd-logind over utmp
+
+        FIXES
+        * check_disk: Display SI units correctly
+        * check_ircd: use pack_sockaddr_in rather than hand-rolled
+        * check_log/check_oracle/check_sensors: fixed the outputs of the help functionality
+        * check_mysql: Add mysql_close to avoid spamming the server logs
+        * check_smtp: add missing -r option in usage
+        * check_snmp: disable multiplier when unused
+        * check_wave: Use compile time determined path to snmpget
+        
+        GENERAL
+        * Sync with the Gnulib code 668c0b8ffa
+        * Set autoconf prerequisite version to 2.64
+        * Remove sha1 and use sha256 in some parts of the plugin structure
+        * A lot of compiler warnings were fixed
+        * Some code was refactored a little bit
+
 2.3.3 2nd Feb 2023
         ENHANCEMENTS
         using PRId64 and PRIu64 instead of %ld directly
diff --git a/NP-VERSION-GEN b/NP-VERSION-GEN
index c353b1d1..06a3eafa 100755
--- a/NP-VERSION-GEN
+++ b/NP-VERSION-GEN
@@ -6,7 +6,7 @@
 SRC_ROOT=`dirname $0`
 
 NPVF=NP-VERSION-FILE
-DEF_VER=2.3git
+DEF_VER=2.3.4
 
 LF='
 '
diff --git a/THANKS.in b/THANKS.in
index b1327440..0ef7d480 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -406,3 +406,16 @@ Wolfgang Nieder
 andrew bezella
 Lorenz Gruenwald
 John Morrissey
+Arkadiusz Miśkiewicz
+Björn Berg
+Franz Schwartau
+Gerardo Malazdrewicz
+Kristian Schuster
+Patrick Cervicek
+Patrick Uiterwijk
+Platon Pronko
+Stefan Taferner
+Stuart Henderson
+Thoralf Rickert-Wendt
+Thorsten Kukuk
+Matthias Döhler
diff --git a/configure.ac b/configure.ac
index b5374b23..dea15097 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.64)
-AC_INIT(monitoring-plugins,2.3git)
+AC_INIT(monitoring-plugins,2.3.4)
 AC_CONFIG_SRCDIR(NPTest.pm)
 AC_CONFIG_FILES([gl/Makefile])
 AC_CONFIG_AUX_DIR(build-aux)
diff --git a/doc/RELEASING.md b/doc/RELEASING.md
index 432b1da1..f0932bd4 100644
--- a/doc/RELEASING.md
+++ b/doc/RELEASING.md
@@ -2,7 +2,7 @@ Releasing a New Monitoring Plugins Version
 ==========================================
 
 Throughout this document, it is assumed that the current Monitoring
-Plugins version is 2.3.3, and that we're about to publish version 2.4.
+Plugins version is 2.3.4, and that we're about to publish version 2.4.
 It is also assumed that the official repository on GitHub is tracked
 using the remote name `monitoring-plugins` (rather than `origin`).
 
@@ -18,7 +18,7 @@ Prepare and commit files
 ------------------------
 
 - Update `configure.ac` and `NP-VERSION-GEN` with new version.
-- Update `NEWS` from `git log --reverse v2.3.3..` output, and specify
+- Update `NEWS` from `git log --reverse v2.3.4..` output, and specify
   the release version/date.
 - Update `AUTHORS` if there are new team members.
 - Update `THANKS.in` using `tools/update-thanks`.
@@ -93,6 +93,6 @@ Announce new release
 
 If you want to mention the number of contributors in the announcement:
 
-    git shortlog -s v2.3.3..v2.4 | wc -l
+    git shortlog -s v2.3.4..v2.4 | wc -l
 
 <!-- vim:set filetype=markdown textwidth=72: -->