10 files changed, 218 insertions, 74 deletions

diff --git a/bin/check-mirrors b/bin/check-mirrors
index 9048640..badcb83 100755
--- a/bin/check-mirrors
+++ b/bin/check-mirrors
@@ -17,9 +17,7 @@ mirrors='
     https://ftp.lysator.liu.se/pub/monitoring-plugins/
     https://ftp.belnet.be/mirror/nagios-plugins.org/
     https://ftp.cc.uoc.gr/mirrors/monitoring-plugins/
-    https://mirrors.fe.up.pt/pub/monitoring-plugins/
     https://ftp2.osuosl.org/pub/monitoring-plugins/
-    https://mirror.bytemark.co.uk/monitoring-plugins/
     http://mirror.mephi.ru/nagios-plugins/
     https://ftp.kaist.ac.kr/nagios-plugins/
     https://mirrors.ustc.edu.cn/monitoring-plugins/
@@ -105,25 +103,6 @@ mirrors='
 #   Home page:
 #   - http://www.en.uoc.gr/
 #
-# PORTUGAL
-#
-#   URLs:
-#   - ftp://mirrors.fe.up.pt/pub/monitoring-plugins/
-#   - http://mirrors.fe.up.pt/pub/monitoring-plugins/
-#   - https://mirrors.fe.up.pt/pub/monitoring-plugins/
-#
-#   Features:
-#   - IPv4
-#   - IPv6
-#   - Updated daily
-#
-#   Contacts:
-#   - Mirror Admins <mirrors AT fe.up.pt>
-#   - Filipe Carvalho <filipec AT sp.up.pt>
-#
-#   Home page:
-#   - http://www.sp.up.pt/
-#
 # UNITED STATES
 #
 #   URLs:
@@ -142,23 +121,6 @@ mirrors='
 #   - http://osuosl.org/
 #
 #
-# UNITED KINGDOM
-#
-#   URLs:
-#   - http://mirror.bytemark.co.uk/monitoring-plugins/
-#   - https://mirror.bytemark.co.uk/monitoring-plugins/
-#
-#   Features:
-#   - IPv4
-#   - IPv6
-#   - Updated twice a day
-#
-#   Contacts:
-#   - James Lawrie <support AT support.bytemark.co.uk>
-#
-#   Home page:
-#   - http://www.bytemark.co.uk/
-#
 # RUSSIA
 #
 #   URLs:
diff --git a/etc/nginx.conf b/etc/nginx.conf
index ee815d3..f8e61bf 100644
--- a/etc/nginx.conf
+++ b/etc/nginx.conf
@@ -19,10 +19,12 @@ ssl_dhparam /home/plugins/etc/ssl/dh-parameters.pem;
 # Server definition for <https://www.monitoring-plugins.org/>.
 #
 server {
-        listen 130.133.8.40:443 ssl;
-        listen 130.133.8.40:444 ssl;
+        listen 130.133.8.40:443 ssl http2;
+        listen 130.133.8.40:444 ssl http2;
         server_name www.monitoring-plugins.org;
         root /home/plugins/web/port-$server_port;
+        ssl_certificate /home/plugins/etc/ssl/monitoring-plugins.crt;
+        ssl_certificate_key /home/plugins/etc/ssl/monitoring-plugins.key;
 
         #
         # Downloads and attachments.
@@ -34,7 +36,10 @@ server {
                 }
                 root /home/plugins/web;
                 fancyindex on;
+                fancyindex_default_sort date_desc;
+                fancyindex_name_length 40;
                 fancyindex_exact_size off;
+                fancyindex_time_format "%F";
                 fancyindex_css_href /resources/plugins.css;
                 fancyindex_ignore ^timestamp$;
         }
@@ -78,6 +83,15 @@ server {
         }
 
         #
+        # Rspamd.
+        #
+        location /rspamd/ {
+                proxy_pass http://127.0.0.1:11334/;
+                proxy_set_header Host $host;
+                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+
+        #
         # Redirects etc.
         #
         location = /favicon.ico {
@@ -119,20 +133,55 @@ server {
 }
 
 #
-# Redirect HTTP and all other domains to <https://www.monitoring-plugins.org/>.
-# Ditto for the test instance.
+# Redirect HTTP to <https://www.monitoring-plugins.org/>.  Ditto for the test
+# instance.
 #
 server {
-        listen 130.133.8.40:80 default_server;
-        listen 130.133.8.40:443 default_server ssl;
+        listen 130.133.8.40:80;
+        server_name monitoring-plugins.org www.monitoring-plugins.org;
+        return 301 https://www.monitoring-plugins.org$request_uri;
+}
+
+server {
+        listen 130.133.8.40:81;
+        server_name monitoring-plugins.org www.monitoring-plugins.org;
+        return 301 https://www.monitoring-plugins.org:444$request_uri;
+}
+
+#
+# Add "www" prefix.  Ditto for the test instance.
+#
+server {
+        listen 130.133.8.40:443 ssl http2;
+        server_name monitoring-plugins.org;
         ssl_certificate /home/plugins/etc/ssl/monitoring-plugins.crt;
         ssl_certificate_key /home/plugins/etc/ssl/monitoring-plugins.key;
         return 301 https://www.monitoring-plugins.org$request_uri;
 }
+
 server {
-        listen 130.133.8.40:81 default_server;
-        listen 130.133.8.40:444 default_server ssl;
+        listen 130.133.8.40:444 ssl http2;
+        server_name monitoring-plugins.org;
         ssl_certificate /home/plugins/etc/ssl/monitoring-plugins.crt;
         ssl_certificate_key /home/plugins/etc/ssl/monitoring-plugins.key;
         return 301 https://www.monitoring-plugins.org:444$request_uri;
 }
+
+#
+# Outdated domains. Can be deleted in 2026.
+#
+server {
+        listen 130.133.8.40:80 default_server;
+        listen 130.133.8.40:443 default_server ssl http2;
+        root /home/plugins/web-redirect;
+        ssl_certificate /home/plugins/etc/ssl/monitoring-plugins.crt;
+        ssl_certificate_key /home/plugins/etc/ssl/monitoring-plugins.key;
+}
+
+server {
+        listen 130.133.8.40:81 default_server;
+        listen 130.133.8.40:444 default_server ssl http2;
+        root /home/plugins/web-redirect;
+        ssl_certificate /home/plugins/etc/ssl/monitoring-plugins.crt;
+        ssl_certificate_key /home/plugins/etc/ssl/monitoring-plugins.key;
+}
diff --git a/libexec/git-notify b/libexec/git-notify
index 64da7c0..228c7d6 100755
--- a/libexec/git-notify
+++ b/libexec/git-notify
@@ -4,6 +4,7 @@
 #
 # Copyright 2005 Alexandre Julliard
 # Copyright 2009, 2013 Nagios Plugins Development Team
+# Copyright 2024, 2025 Monitoring Plugins Development Team
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -34,9 +35,12 @@
 #
 
 use strict;
-use Fcntl ':flock';
-use Encode qw(encode decode);
+use utf8;
+use feature qw(evalbytes unicode_eval unicode_strings);
+use open qw(:std :utf8);
 use Cwd 'realpath';
+use Encode qw(encode);
+use Fcntl ':flock';
 
 sub git_config($);
 sub get_repos_name();
@@ -449,7 +453,7 @@ sub send_commit_notice($$)
     my ($ref,$obj) = @_;
     my %info = get_object_info($obj);
     my @notice = ();
-    my ($url,$subject,$obj_string);
+    my ($url,$from,$subject,$obj_string);
 
     if ($gitweb_url)
     {
@@ -515,9 +519,8 @@ sub send_commit_notice($$)
     }
 
     $subject .= truncate_str(${$info{"log"}}[0],50);
-    $_ = decode($info{"encoding"}, $_) for @notice;
-    mail_notification("$info{'committer_name'} <$from_address>", $commitlist_address, $subject,
-        "text/plain; charset=UTF-8", @notice);
+    $from = encode("MIME-Q",$info{'committer_name'}) . " <$from_address>";
+    mail_notification($from, $commitlist_address, $subject, "text/plain; charset=UTF-8", @notice);
 }
 
 # send a commit notice to the CIA server
diff --git a/web/input/development.md b/web/input/development.md
index bb3047d..67cd3a8 100644
--- a/web/input/development.md
+++ b/web/input/development.md
@@ -48,7 +48,7 @@ commands:
 Also see our testing-related [development FAQs][dev-faq].
 
 [team]: team.html "Monitoring Plugins Development Team"
-[nagios]: http://www.nagios.org/ "Nagios"
+[nagios]: https://www.nagios.org/ "Nagios"
 [github]: https://github.com/ "GitHub"
 [fork]: https://help.github.com/articles/fork-a-repo "Fork Documentation"
 [pull]: https://help.github.com/articles/using-pull-requests "Pull Request Documentation"
@@ -56,7 +56,7 @@ Also see our testing-related [development FAQs][dev-faq].
 [git-ref]: doc/faq/git.html#references "Git References"
 [master-img]:  https://github.com/monitoring-plugins/monitoring-plugins/actions/workflows/test.yml/badge.svg?branch=master "Build Status master"
 [coverity-img]: https://scan.coverity.com/projects/1435/badge.svg?flat=1 "Coverity Metric"
-[libtap]: http://jc.ngo.org.uk/trac-bin/trac.cgi/wiki/LibTap "LibTap Homepage"
+[libtap]: https://github.com/zorgnax/libtap "LibTap Homepage"
 [dev-faq]: doc/faq/#development "Development FAQs"
 [github-actions]: https://docs.github.com/en/actions "GitHub Docs - GitHub Actions"
 [github-ci-actions]: https://github.com/monitoring-plugins/monitoring-plugins/actions "Monitoring Plugins - Github Workflows"
diff --git a/web/input/download.md b/web/input/download.md
index 75ad689..4758175 100644
--- a/web/input/download.md
+++ b/web/input/download.md
@@ -19,8 +19,7 @@ See the [release history][news] for an overview of changes between earlier
 versions.  Old releases can be found in the [download area][download].  There
 are mirrors available in [Belgium][mirror-be], [China][mirror-cn],
 [Germany][mirror-de], [Greece][mirror-gr], [Korea][mirror-kr],
-[Portugal][mirror-pt], [Russia][mirror-ru], [Sweden][mirror-se], the
-[UK][mirror-uk], and the [USA][mirror-us].
+[Russia][mirror-ru], [Sweden][mirror-se], and the [USA][mirror-us].
 
 ### Development Snapshot
 
@@ -37,7 +36,7 @@ directory][snapshot] of the [download area][download].
 
 The Monitoring::Plugin module is available from [CPAN][cpan]:
 
-* <http://search.cpan.org/dist/Monitoring-Plugin/>
+* <https://metacpan.org/dist/Monitoring-Plugin>
 
 ## NagiosMIB
 
@@ -53,7 +52,6 @@ Old versions can be found [within][mib] the [download area][download].
 [mirror-de]: https://ftp.fu-berlin.de/unix/network/monitoring-plugins/ "Mirror in Germany"
 [mirror-gr]: https://ftp.cc.uoc.gr/mirrors/monitoring-plugins/ "Mirror in Greece"
 [mirror-kr]: https://ftp.kaist.ac.kr/nagios-plugins/ "Mirror in Korea"
-[mirror-pt]: https://mirrors.fe.up.pt/pub/monitoring-plugins/ "Mirror in Portugal"
 [mirror-ru]: http://mirror.mephi.ru/nagios-plugins/ "Mirror in Russia"
 [mirror-se]: https://ftp.lysator.liu.se/pub/monitoring-plugins/ "Mirror in Sweden"
 [mirror-uk]: https://mirror.bytemark.co.uk/monitoring-plugins/ "Mirror in the United Kingdom"
@@ -63,7 +61,7 @@ Old versions can be found [within][mib] the [download area][download].
 [download]: download/ "Download Area"
 [snapshot]: download/snapshot/ "Snapshot Directory"
 [mib]: download/mib/ "NagiosMIB Directory"
-[cpan]: http://www.cpan.org/ "CPAN"
+[cpan]: https://www.cpan.org/ "CPAN"
 [tar1]: download/monitoring-plugins-{{plugins_release}}.tar.gz "Current Release Tarball"
 [sum1]: download/monitoring-plugins-{{plugins_release}}.tar.gz.sha1 "SHA-1 Sum"
 [tar2]: download/snapshot/monitoring-plugins-master.tar.gz "Current Snapshot Tarball"
diff --git a/web/input/impressum.md b/web/input/impressum.md
index ac15f7a..d79ea74 100644
--- a/web/input/impressum.md
+++ b/web/input/impressum.md
@@ -9,12 +9,12 @@ parent: Home
 Responsible for the content of this site:
 
 Holger Weiß  
-Gutsmuthsstr. 19  
+Buggestr. 11  
 12163 Berlin  
 Germany
 
 **Phone:**  
-&emsp; +49 30 61286685
+&emsp; +49 160 7282852
 
 **Email:**  
 &emsp; holger@zedat.fu-berlin.de
@@ -22,6 +22,6 @@ Germany
 **Jabber:**  
 &emsp; holger@jabber.fu-berlin.de
 
-[law]: http://www.gesetze-im-internet.de/ddg/__5.html
+[law]: https://www.gesetze-im-internet.de/ddg/__5.html
 
 <!--% # vim:set filetype=markdown textwidth=78 joinspaces expandtab: # %-->
diff --git a/web/input/index.md b/web/input/index.md
index 6c18870..29a9285 100644
--- a/web/input/index.md
+++ b/web/input/index.md
@@ -33,25 +33,25 @@ monitoring products as well.
 You can get the latest releases from the [download page][download].
 
 [team]: team.html "Monitoring Plugins Development Team"
-[icinga]: https://www.icinga.org/ "Icinga"
-[naemon]: http://naemon.github.io/ "Naemon"
-[nagios]: http://www.nagios.org/ "Nagios"
-[sensu]: http://sensuapp.org/ "Sensu"
-[shinken]: http://www.shinken-monitoring.org/ "Shinken"
+[icinga]: https://icinga.com/ "Icinga"
+[naemon]: https://www.naemon.io/ "Naemon"
+[nagios]: https://www.nagios.org/ "Nagios"
+[sensu]: https://sensu.io/ "Sensu"
+[shinken]: https://github.com/shinken-solutions/shinken "Shinken"
 [load]: doc/man/check_load.html "check_load"
 [procs]: doc/man/check_procs.html "check_procs"
 [disk]: doc/man/check_disk.html "check_disk"
 [icmp]: doc/man/check_icmp.html "check_icmp"
 [snmp]: doc/man/check_snmp.html "check_snmp"
 [http]: doc/man/check_http.html "check_http"
-[nagex]: http://exchange.nagios.org/directory/Plugins "Plugins on Nagios Exchange"
-[icnex]: https://exchange.icinga.org/dig/Plugins "Plugins on Icinga Exchange"
-[module]: http://search.cpan.org/dist/Monitoring-Plugin/ "Monitoring::Plugin Module"
+[nagex]: https://exchange.nagios.org/directory/Plugins "Plugins on Nagios Exchange"
+[icnex]: https://exchange.icinga.com/ "Icinga Exchange"
+[module]: https://metacpan.org/dist/Monitoring-Plugin "Monitoring::Plugin Module"
 [guidelines]: doc/guidelines.html "Monitoring Plugin Development Guidelines"
 [perl-plugins]: doc/writing-perl-plugins.html "Monitoring::Plugin Presentation"
 [rename]: news/new-project-name.html "New Project Name"
-[history]: http://www.nagios.org/about/history "Nagios (Plugins) History"
-[folks]: http://www.nagios.org/about/team "Nagios Team"
+[history]: https://www.nagios.org/about/history/ "Nagios (Plugins) History"
+[folks]: https://www.nagios.org/team/ "Nagios Team"
 [download]: download.html "Download"
 
 <!--% # vim:set filetype=markdown textwidth=78 joinspaces expandtab: # %-->
diff --git a/web/input/news/release-3-0-0-rc1.md b/web/input/news/release-3-0-0-rc1.md
new file mode 100644
index 0000000..85c7982
--- /dev/null
+++ b/web/input/news/release-3-0-0-rc1.md
@@ -0,0 +1,80 @@
+title: Version 3.0.0-rc1 Released
+author: Lorenz Kästle
+date: 2025-12-03
+---
+
+The Monitoring Plugins Development Team announces version 3.0.0-rc1 of
+the Monitoring Plugins! 
+This release is different in several regards to previous releases.
+Due the a significant refactoring and the unintented side effect this
+may have, the "real" release will be following release candidates which
+are intented to for early adapters and testing.
+<end-of-teaser>
+
+The core parts of this release are significant changes to the C part of this
+project, which should be mostly internal and not change the results in a
+significant way (meaning the input parameters mostly stay as they are and the
+exit code should remain the same if the parameters are the same in the old
+version and context did not change).
+The reality is, that big changes have
+unintented consequences which are not covered in the test cases or some
+consequences were not in our scope at all.
+For the list of notable changes in this release, see below.
+
+You can get the tarball from our [download page][download].
+
+### General changes
+* In the C part of the project
+  * Heavy refactoring to simplify and unify the code base
+  * Introduction of a generalized output mechanism for most plugins
+  * Standardized code formatting via `clang-format`
+
+### Specific changes 
+#### check_curl
+`check_curl` received a lot of changes which improve the documentation and
+fix several bugs.
+It is also not considered experimental anymore.
+
+Additionaly `check_curl` can now be configured to handle cookies internally
+without saving cookies to the filesystem.
+
+#### check_http
+`check_http` is now considered deprecated and will not receive attention any
+more. It is replaced by `check_curl`
+
+#### check_snmp
+`check_snmp` does not execute `snmpget` or `snmpgetnext` anymore but executes
+the net-snmp calls natively now.
+
+#### check_nwstat
+`check_nwstat` was removed, due to its perceived insignificance in the current
+IT world. This reduces the maintenance load and ressource consumption in
+general.
+
+#### check_by_ssh
+`check_by_ssh` ignores output on `stderr` by default now. This should
+avoid false positives for warnings by the OpenSSH client (especially
+about the server missing Post-Quantum cryptography.
+
+#### check_dns
+`check_dns` now ignores CNAMES in reverse DNS mode.
+
+#### check_fping
+If during compilation `fping` 5.2, 5.3 or higher are present, `check_fping` 
+will be able to use new options which were introduced with these versions.
+These options are (equivalent to the ones with the same name in `fping`)
+`--fwmark`, `--icmp-timestamp` and `--check-source`.
+The older flags `--dontfrag` and `--random` were also added.
+
+Also the `-4` and `-6` flags may not have worked as intented and should be
+fixed now.
+
+#### check_mysql
+`check_mysql` should now be able to correctly detect whether a replica is
+attached and working correctly.
+Changes were necessary here to adapt to changes in the naming convention in
+MySQL.
+
+[download]: /download.html
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces expandtab: # %-->
diff --git a/web/input/news/release-3-0-0-rc2.md b/web/input/news/release-3-0-0-rc2.md
new file mode 100644
index 0000000..79746bd
--- /dev/null
+++ b/web/input/news/release-3-0-0-rc2.md
@@ -0,0 +1,43 @@
+title: Version 3.0.0-rc2 Released
+author: Lorenz Kästle
+date: 2026-01-02
+---
+
+The Monitoring Plugins Development Team announces version 3.0.0-rc2 of
+the Monitoring Plugins! 
+
+This is the second release candidate for version 3.0.0.
+
+It contains mostly fixes to the 3.0.0-rc1 version and is also not a full release,
+but serves as a basis for test until we are mostly sure not to break production
+setups.
+
+### Changes
+* check_nt was removed
+  check_nt is no long useful in current setups and hasn't been for some time.
+  Therefore it was removed without a replacement.
+* check_ntp was removed
+  check_ntp was marked as deprecated for a long time due to systematic problems.
+  It should not be in use anywhere and gets now removed to reduce code size and
+  avoid misleading users.
+  The replacements are check_ntp_time and check_ntp_peer
+* Bugfix for check_ntp_time
+  An errournous change in check_ntp_time made it fail in almost all use cases.
+  This has been fixed
+* Properly separate perfdata from different subchecks
+  A missing separator caused errors in perfdata strings (from C plugins) where
+  two different data points where not properly separated and showed up as a single
+  invalid data point
+* check_curl: append the query string from parsed uri
+  When using the old style follow method (`-f follow`) with check_curl the query string was not
+  appended to the new target after redirect. This was fixed. (Thanks Ahmet Oeztuerk)
+* Fixing different problems on OpenBSD
+  A few different things did prevent proper compilation and usage on OpenBSD, partly due
+  to different naming conventions there. These are hopefully fixed now. Thanks to Alvar Penning
+  and Stuart Henderson.
+* Gnulib update to stable-202507
+
+
+[download]: /download.html
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces expandtab: # %-->
diff --git a/web/macros.py b/web/macros.py
index 5536f3f..eab21bc 100644
--- a/web/macros.py
+++ b/web/macros.py
@@ -3,7 +3,7 @@ import math
 import os.path
 import time
 
-plugins_release = '2.4.0'
+plugins_release = '3.0.0-rc2'
 mib_release = '1.0.1'
 release_notes = 'news/release-%s.html' % plugins_release.replace('.', '-')
 site_url = 'https://www.monitoring-plugins.org/'
@@ -52,6 +52,7 @@ _RSS_ITEM = """
     </item>
 """
 
+
 def hook_postconvert_rss():
     items = []
     posts = [p for p in pages if 'date' in p]
@@ -75,6 +76,7 @@ def hook_postconvert_rss():
 # News
 #
 
+
 def hook_preconvert_news():
     posts_per_page = 10
     posts = [p for p in pages if 'date' in p]
@@ -97,6 +99,7 @@ def hook_preconvert_news():
                      parent='News')
         pages.append(p)
 
+
 def make_news_page(posts, current_index):
     marker = '<end-of-teaser>'
     if current_index == 0:
@@ -121,6 +124,7 @@ def make_news_page(posts, current_index):
         p['parent'] = title
     return '\n'.join(teaser) + '\n\n'
 
+
 def make_news_footer(n_news_pages, current_index):
     if n_news_pages == 1:
         return ''
@@ -142,6 +146,7 @@ def make_news_footer(n_news_pages, current_index):
         footer.append('[Last](news/%d.html)' % n_news_pages)
     return '&emsp;'.join(footer) + '\n{: #news-footer }\n'
 
+
 def next_news_chunk(posts, posts_per_page):
     index = 0
     while len(posts[index:]) > 0:
@@ -152,6 +157,7 @@ def next_news_chunk(posts, posts_per_page):
 # Menu and Breadcrumb Navigation
 #
 
+
 def menu():
     menu_pages = [p for p in pages if 'menu' in p]
     menu_pages.sort(key=lambda p: int(p['menu']))
@@ -161,9 +167,10 @@ def menu():
         else:
             print('<span><a href="%s">%s</a></span>' % (p.url, hx(p.title)))
 
+
 def breadcrumb():
     stable = '<span id="release">Stable release: <a href="%s">%s</a></span>' \
-           % (release_notes, plugins_release)
+        % (release_notes, plugins_release)
     parents = {p.title: (p.url, p.get('parent')) for p in pages}
     title = page.title
     crumbs = hx(title)
@@ -179,11 +186,13 @@ def breadcrumb():
 # Miscellaneous
 #
 
+
 def list_kids():
     kids = [(p.url, p.title) for p in pages if p.get('parent') == page.title]
     for kid in sorted(kids):
         print('* [%s](%s)' % (kid[1], kid[0]))
 
+
 def copyright_years(since=None):
     this_year = time.gmtime().tm_year
     if since is not None and int(since) != this_year: