diff options
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/Manifest.gz | bin | 45696 -> 45697 bytes | |||
| -rw-r--r-- | net-analyzer/cbm/Manifest | 4 | ||||
| -rw-r--r-- | net-analyzer/cbm/cbm-0.3.2.ebuild (renamed from net-analyzer/cbm/cbm-0.3.1.ebuild) | 0 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/Manifest | 2 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild | 2 | ||||
| -rw-r--r-- | net-analyzer/nagios-plugins/Manifest | 3 | ||||
| -rw-r--r-- | net-analyzer/nagios-plugins/files/check_smtp-implicit-tls.patch | 145 | ||||
| -rw-r--r-- | net-analyzer/nagios-plugins/nagios-plugins-2.3.3-r2.ebuild (renamed from net-analyzer/nagios-plugins/nagios-plugins-2.3.3-r1.ebuild) | 5 |
8 files changed, 155 insertions, 6 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz Binary files differindex 12da8ef99c06..03f90f808182 100644 --- a/net-analyzer/Manifest.gz +++ b/net-analyzer/Manifest.gz diff --git a/net-analyzer/cbm/Manifest b/net-analyzer/cbm/Manifest index 0efeaf9178f1..7c8ddf69c915 100644 --- a/net-analyzer/cbm/Manifest +++ b/net-analyzer/cbm/Manifest @@ -1,6 +1,6 @@ AUX cbm-0.2-tinfo.patch 531 BLAKE2B 6edd4f9904142badb81f721a0c6f359e189bd544fae32f9084376922843dfa0e7061c37959ad2d8fe59bbd799bcce825ced26e5f7f387e24b620110b7f71804d SHA512 47aa578894550fe920752c3b1dae4f22bcc6fa240e11ecc20c423972a695bd8f374a1b7437048dfbb113e7152aaf959d21a81d0028e4d89ebfb1406c7e3a10cc -DIST cbm-0.3.1.tar.gz 17297 BLAKE2B 7b8bd12d8b4e9af5235512dfb689d7b55dd8b1b28b387eb987b22dccede7ca0bbcf33ddb884545532aaacababa243b5867fec8d205ceb2c2244715b614082e9e SHA512 ab971c1fb9f9da9749fa3ae36ed8914dbd8b6afb74d038e0e06856687e76b3a8bdd3522880db0c9c8e82e923907f7f3fc487e88828fa4b4d93b29b012fafce02 +DIST cbm-0.3.2.tar.gz 17448 BLAKE2B 21acdfb2e125b31f617bd3204cc11ef199647552b67671e62bec7a94ea4a5c213a1099c72261e6370aee06e4a6686392878a30a863778387c08a1a8095855940 SHA512 7a597467203786023a8efee23ea1ed65195f872f6287ed2767f9be449cc47757980703f629222f37309c25cc5f201d9581a713479d954ddc99347d641ab4ac34 DIST cbm-0.3.tar.gz 16473 BLAKE2B 165b01ec6d0fdd691763d990e1fe81b010942077f593e64fd3ccf5f070960612ddb2ccd1aef87530b0d0fe4c40e5d758c55d33b4b6e1c4b850769ef46b8a6b79 SHA512 dd4845465b34b978e6c696d6b0fa61969aead4bdd4474a264667af63cd99c5a1035f4961645237c3870dc366ea4b131c2e005d2abb2774814d127a61ecae8e29 -EBUILD cbm-0.3.1.ebuild 652 BLAKE2B e56f7df4a06fdc2305821f6e347bc8f81b3c87eccd7639b6ff48b4a89495d4ee437fd1d58b84993013ff156eeffa4ce2205e9d9f32e16ce10c2d731a121202fb SHA512 53cb4afe0f3a5667fcb2d02510c606141db2e0f11e57b20b1551a51e6e3d3662dfde1f84637e5d3d04e16f0636640add4892856115f8d782124c8f9234ff3bd9 +EBUILD cbm-0.3.2.ebuild 652 BLAKE2B e56f7df4a06fdc2305821f6e347bc8f81b3c87eccd7639b6ff48b4a89495d4ee437fd1d58b84993013ff156eeffa4ce2205e9d9f32e16ce10c2d731a121202fb SHA512 53cb4afe0f3a5667fcb2d02510c606141db2e0f11e57b20b1551a51e6e3d3662dfde1f84637e5d3d04e16f0636640add4892856115f8d782124c8f9234ff3bd9 EBUILD cbm-0.3.ebuild 652 BLAKE2B e56f7df4a06fdc2305821f6e347bc8f81b3c87eccd7639b6ff48b4a89495d4ee437fd1d58b84993013ff156eeffa4ce2205e9d9f32e16ce10c2d731a121202fb SHA512 53cb4afe0f3a5667fcb2d02510c606141db2e0f11e57b20b1551a51e6e3d3662dfde1f84637e5d3d04e16f0636640add4892856115f8d782124c8f9234ff3bd9 MISC metadata.xml 387 BLAKE2B 0cb8910fe08af4b1b9a874dc196724cd4e7d7f65d3112ec24bacc6d338d2931afbda0755cafc89e2ce844893e1649675e34f37c0baa6d141faf45a7ca77f866b SHA512 8092aa19143ae23dec4bf31dafb786c6dbc40fce3fbe2bf144ccfaf82581bd9a44ac3bdbfa8d6d60ff6f9cbdbd29b2a77eb860385d3ea242d1e1c430eb8347c6 diff --git a/net-analyzer/cbm/cbm-0.3.1.ebuild b/net-analyzer/cbm/cbm-0.3.2.ebuild index 22ae3162bb6a..22ae3162bb6a 100644 --- a/net-analyzer/cbm/cbm-0.3.1.ebuild +++ b/net-analyzer/cbm/cbm-0.3.2.ebuild diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index 7929e7d29310..2ccbb36a49b8 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -2,6 +2,6 @@ AUX 99_nagios4-r1.conf 309 BLAKE2B c539330d9f100045fc02d13061dd3b8e958370c8885ef AUX lighttpd_nagios4-r1.conf 297 BLAKE2B 8976123407c47be6023c5dae57c833f7e0b43ae2c70348dcd72b754453b5a84dd335daa222b4b75e5c19b3d5c18b64496739bdb61b8f2f67f5655b80a0ffb65f SHA512 2ef5268e9ba228d12e3dabb5a23ce73e49b7149a047acd4a2daac3cd3415b5233aaaf3b972c85780e71bd5fe3eefb6755a6222b40a509104fb318e219366867f DIST nagios-4.4.6.tar.gz 11333414 BLAKE2B b64d34c9267349582cb43500b7b90f7948152b5fd9b28ecb0a376d0255ec9774e693beba9205512294b07dddc4702f37d0f45b3c3fcc6abbf8e8b4d9236d0ace SHA512 6ceb582816ec741439963bde1fe8d85fa3bc4ed3c2238fb818db0c4f4224a4333d153040c11a7f4d783e919c11f9ff45907bdc478504e4155f64a4c575f80550 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766 -EBUILD nagios-core-4.4.6-r2.ebuild 9358 BLAKE2B b808540623055f3830a38ed79ffbe30fc8a24851624bd6bbd902df293683e6fac78291b6f59529eaab533ff041fe8d89ddd60c3be08d36210aebd823b2173098 SHA512 4733058532beef20606e4f8bf833ce6c4e0932ca69fdef01f25e45f1533004e720b5282045b32582543d52c020d043f59989a954afbea0697a1868951c766936 +EBUILD nagios-core-4.4.6-r2.ebuild 9355 BLAKE2B 0360c182772760f3df703004d6c6513d7bd32174a12ff5fdb2f93ac463ad7e732e0d0365d576fa5c282458c3eb1cbdac8911f9848f29c3e6df7f25f6d268ad90 SHA512 58f77dd1cb3ef4dffaaa5b7a422bb3fb9b89dce9bb718981c1c6851e82d677b1d77a75075d934e98a007d42481029b537880389796138ad81bee662c86c317df EBUILD nagios-core-4.4.6.ebuild 8499 BLAKE2B 7820eb32090960de3012dde55abcdc4869a250edbcd11a7a532877a1764aee58712b7b4b2d253aa3a8092ad17471b82649dc1c3201bf2d50648c346fc975f918 SHA512 87de36179bcb17d1b1835cb4f1d57f3be33c7bb65b718a512621474ab8db70a0f41a853c32c17044e9522e9657b6b1043613579fac7eed11d7a930fbacc8207d MISC metadata.xml 1466 BLAKE2B 07156e2e5f1c26f21a73f932a67896466982941457ee6606519debd1f8f46f3d19982a4a4673fd8aece52eeecc2d00925616097ae08b93eee1220aa00c12499e SHA512 eda3e037295b70633605411dd4400a1b0cf98c528394a79f2f4b999dd3c911a3a8b04be5f3aac85e59242ef29685d1f57b73d60dd65751efb23a489e56a4f5d6 diff --git a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild index 90f596a5cc86..0dfa7c809447 100644 --- a/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild +++ b/net-analyzer/nagios-core/nagios-core-4.4.6-r2.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc ppc64 sparc ~x86" IUSE="apache2 classicui lighttpd perl +web vim-syntax" # In pkg_postinst(), we change the group of the Nagios configuration diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest index 4974750ebcff..6f4b3d91bc7f 100644 --- a/net-analyzer/nagios-plugins/Manifest +++ b/net-analyzer/nagios-plugins/Manifest @@ -1,6 +1,7 @@ +AUX check_smtp-implicit-tls.patch 4817 BLAKE2B 0a163150461b1c57892ae5802534ecc10cc94af93af846e07a4b66da445280a58e29841834002fcf86b2ed140ba26d420c550283edfef27c242710cf5673670e SHA512 27cb281b9e7fb4bec6250c1af41c74e39b171b05300587496e45d6f314d87557354b11837ec4348c91db92746b564e86f617ecf4f57ac002b4abd2918155f53c AUX define-own-mysql-port-constant.patch 3271 BLAKE2B a9776567af41b106616c10aac02042147d162a452e17480433a8fd8ffcf3ce506d6930215e8a8eaa219d7811adffbcc2b3ee6a004661ca2a1f8bdc3339bf3526 SHA512 18cb9be96b3e39a07eeb1cf6bccbbe26766ac355f4822c132253e25a6909c418071c2dc546fb60c055b78f620180035e57436a8ebb771ae1096b78d2e1c7c6ec DIST nagios-plugins-2.3.1.tar.gz 2833267 BLAKE2B f89eda7a29558dd33dedbf0de150b6a13ba66d213d74041d9eb8c680880b3825bcc9312d251d22f3b483a14c0de7c59d7801954e7563c16352bfc38236676863 SHA512 89208f211e51db4e0d56725a6ff6d2fcf4eb2207f877a2b8f130cda8480a70f318eceb94140eb4f2a17fe3dd967bb3615ccc366c1a531ebd4ff0a04b60c61b8a DIST nagios-plugins-2.3.3.tar.gz 2782610 BLAKE2B f02ded0ed6d5c649a82fe7fe06e393b404fc6e9a260365b128c114381d411d93c8980fee6da73c4d03ab73669d5b8754225ff5aa14ef4430ee0c91d8c56cb131 SHA512 2128601b1098eb82f4e7d720b96a5f92d6ad75dc181a94b25c38172767de8b72f9fece3eddb74933b1cd520928ae9416a7dc665e2f059bfe362dd74041d28cd7 EBUILD nagios-plugins-2.3.1-r2.ebuild 2988 BLAKE2B eed5cd61029d772a28a588f8ca59e5466e41fe4ea7ee5a8fc2defa106ddceead9eea43958e8c88ad5442aa063d8b1ca7369e76271ba4f57fe5591152366cf7a7 SHA512 edca196a5d78b9d37129175336df433576872d532188324d2efff4bb438477c0d65f09f7c183b5a1cfdabd3b8fe0eded18637376e9b20cae575c07c62be4f40d -EBUILD nagios-plugins-2.3.3-r1.ebuild 2993 BLAKE2B a585be573e75f10edae62c87e459050d25b947451f16f14d84c9aa2fe29e2cdbf0c4bea0bda66ff7a7bd5c558be679d76f17928e98c403c0091259f72323fd16 SHA512 76985327c20228c669bf1f574f4f447b3adc99e649f7069fb49c484cee4fa49205e88925df143db78e0c1234214511a55add49894cd7a4abfe545fda7d69a1e6 +EBUILD nagios-plugins-2.3.3-r2.ebuild 3039 BLAKE2B 2f2344d56139b20a291e272bdb381c45b99c7a952686e72f232e70b8d6fa5f637fbbda42d69add400d4d1b4d895b4608c7b853235eb5617b44879cdcfc2a5635 SHA512 06cbeb2ad6b950a8a3e3c142f55919c9f2e9a55608e6b0b35d9f0bd352267af77df155d687e2d6ad9fd02fb0aea8c9a24a873910b550994dd6f1d79b7fd137dd MISC metadata.xml 1430 BLAKE2B 63a889dc51085a41a5dec4b6c32e6262ff59fdb1413699736d6332a75406749551b1c82d62a2662f4d7935c46a4bc3b51e0ca7e3b070656163fb0b6fc69c742e SHA512 d6cbc6820de52e1ed471b97a6c592af72474db492204594314eebb656b8abe89a01667a7bbb621418fd393aeacb28e9a10c5749de7ace67dd15119f701019e72 diff --git a/net-analyzer/nagios-plugins/files/check_smtp-implicit-tls.patch b/net-analyzer/nagios-plugins/files/check_smtp-implicit-tls.patch new file mode 100644 index 000000000000..a0f30d2efdbf --- /dev/null +++ b/net-analyzer/nagios-plugins/files/check_smtp-implicit-tls.patch @@ -0,0 +1,145 @@ +From 0a8cf08ebb0740aa55d6c60d3b79fcab282604fb Mon Sep 17 00:00:00 2001 +From: Franz Schwartau <franz@electromail.org> +Date: Tue, 1 Sep 2020 12:48:51 +0200 +Subject: [PATCH 1/3] Add support for SMTP over TLS + +This is commonly used on smtps (465) port. + +PROXY protocol is not implemented with TLS in check_smtp.c, yet. +--- + plugins/check_smtp.c | 45 ++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 37 insertions(+), 8 deletions(-) + +diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c +index 0b1c54d4..d5923a6a 100644 +--- a/plugins/check_smtp.c ++++ b/plugins/check_smtp.c +@@ -42,8 +42,8 @@ const char *email = "devel@nagios-plugins.org"; + #ifdef HAVE_SSL + int check_cert = FALSE; + int days_till_exp_warn, days_till_exp_crit; +-# define my_recv(buf, len) ((use_ssl && ssl_established) ? np_net_ssl_read(buf, len) : read(sd, buf, len)) +-# define my_send(buf, len) ((use_ssl && ssl_established) ? np_net_ssl_write(buf, len) : send(sd, buf, len, 0)) ++# define my_recv(buf, len) (((use_starttls || use_ssl) && ssl_established) ? np_net_ssl_read(buf, len) : read(sd, buf, len)) ++# define my_send(buf, len) (((use_starttls || use_ssl) && ssl_established) ? np_net_ssl_write(buf, len) : send(sd, buf, len, 0)) + #else /* ifndef HAVE_SSL */ + # define my_recv(buf, len) read(sd, buf, len) + # define my_send(buf, len) send(sd, buf, len, 0) +@@ -107,6 +107,7 @@ double critical_time = 0; + int check_critical_time = FALSE; + int verbose = 0; + int use_ssl = FALSE; ++int use_starttls = FALSE; + int use_sni = FALSE; + short use_proxy_prefix = FALSE; + short use_ehlo = FALSE; +@@ -199,12 +200,25 @@ main (int argc, char **argv) + result = my_tcp_connect (server_address, server_port, &sd); + + if (result == STATE_OK) { /* we connected */ ++#ifdef HAVE_SSL ++ if (use_ssl) { ++ result = np_net_ssl_init_with_hostname(sd, (use_sni ? server_address : NULL)); ++ if (result != STATE_OK) { ++ printf (_("CRITICAL - Cannot create SSL context.\n")); ++ close(sd); ++ np_net_ssl_cleanup(); ++ return STATE_CRITICAL; ++ } else { ++ ssl_established = 1; ++ } ++ } ++#endif + + /* If requested, send PROXY header */ + if (use_proxy_prefix) { + if (verbose) + printf ("Sending header %s\n", PROXY_PREFIX); +- send(sd, PROXY_PREFIX, strlen(PROXY_PREFIX), 0); ++ my_send(PROXY_PREFIX, strlen(PROXY_PREFIX)); + } + + /* watch for the SMTP connection string and */ +@@ -230,7 +244,7 @@ main (int argc, char **argv) + } + + /* send the HELO/EHLO command */ +- send(sd, helocmd, strlen(helocmd), 0); ++ my_send(helocmd, strlen(helocmd)); + + /* allow for response to helo command to reach us */ + if (recvlines(buffer, MAX_INPUT_BUFFER) <= 0) { +@@ -243,14 +257,14 @@ main (int argc, char **argv) + } + } + +- if(use_ssl && ! supports_tls){ ++ if(use_starttls && ! supports_tls){ + printf(_("WARNING - TLS not supported by server\n")); + smtp_quit(); + return STATE_WARNING; + } + + #ifdef HAVE_SSL +- if(use_ssl) { ++ if(use_starttls) { + /* send the STARTTLS command */ + send(sd, SMTP_STARTTLS, strlen(SMTP_STARTTLS), 0); + +@@ -495,6 +509,7 @@ process_arguments (int argc, char **argv) + {"use-ipv6", no_argument, 0, '6'}, + {"help", no_argument, 0, 'h'}, + {"lmtp", no_argument, 0, 'L'}, ++ {"ssl", no_argument, 0, 's'}, + {"starttls",no_argument,0,'S'}, + {"sni", no_argument, 0, SNI_OPTION}, + {"certificate",required_argument,0,'D'}, +@@ -516,7 +531,7 @@ process_arguments (int argc, char **argv) + } + + while (1) { +- c = getopt_long (argc, argv, "+hVv46Lrt:p:f:e:c:w:H:C:R:SD:F:A:U:P:q", ++ c = getopt_long (argc, argv, "+hVv46Lrt:p:f:e:c:w:H:C:R:sSD:F:A:U:P:q", + longopts, &option); + + if (c == -1 || c == EOF) +@@ -633,9 +648,13 @@ process_arguments (int argc, char **argv) + #else + usage (_("SSL support not available - install OpenSSL and recompile")); + #endif ++ case 's': ++ /* ssl */ ++ use_ssl = TRUE; ++ break; + case 'S': + /* starttls */ +- use_ssl = TRUE; ++ use_starttls = TRUE; + use_ehlo = TRUE; + break; + case SNI_OPTION: +@@ -694,6 +713,14 @@ process_arguments (int argc, char **argv) + if (from_arg==NULL) + from_arg = strdup(" "); + ++ if (use_starttls && use_ssl) { ++ usage4 (_("Set either -s/--ssl or -S/--starttls")); ++ } ++ ++ if (use_ssl && use_proxy_prefix) { ++ usage4 (_("PROXY protocol (-r/--proxy) is not implemented with SSL/TLS (-s/--ssl), yet.")); ++ } ++ + return validate_arguments (); + } + +@@ -851,6 +878,8 @@ print_help (void) + #ifdef HAVE_SSL + printf (" %s\n", "-D, --certificate=INTEGER[,INTEGER]"); + printf (" %s\n", _("Minimum number of days a certificate has to be valid.")); ++ printf (" %s\n", "-s, --ssl"); ++ printf (" %s\n", _("Use SSL/TLS for the connection.")); + printf (" %s\n", "-S, --starttls"); + printf (" %s\n", _("Use STARTTLS for the connection.")); + printf (" %s\n", "--sni"); + diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.3.3-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.3.3-r2.ebuild index 419243e3b736..959874004cb5 100644 --- a/net-analyzer/nagios-plugins/nagios-plugins-2.3.3-r1.ebuild +++ b/net-analyzer/nagios-plugins/nagios-plugins-2.3.3-r2.ebuild @@ -62,7 +62,10 @@ DOCS=( THANKS ) -PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" ) +PATCHES=( + "${FILESDIR}/define-own-mysql-port-constant.patch" + "${FILESDIR}/check_smtp-implicit-tls.patch" +) src_prepare() { default |