[pkg-nagios-changes] [Git][nagios-team/nrpe][master] 5 commits: New upstream version 4.1.3
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Wed Dec 11 06:39:19 GMT 2024
Bas Couwenberg pushed to branch master at Debian Nagios Maintainer Group / nrpe
Commits:
ac674593 by Bas Couwenberg at 2024-12-11T07:27:59+01:00
New upstream version 4.1.3
- - - - -
7ea4838a by Bas Couwenberg at 2024-12-11T07:28:01+01:00
Update upstream source from tag 'upstream/4.1.3'
Update to upstream version '4.1.3'
with Debian dir 765651e6bbd04e19ad2b9bf89bd9fc913e17ae5c
- - - - -
e2d272c3 by Bas Couwenberg at 2024-12-11T07:28:14+01:00
New upstream release.
- - - - -
7a25e07f by Bas Couwenberg at 2024-12-11T07:29:34+01:00
Drop rename-ssl-header.patch, applied upstream.
- - - - -
64e0c460 by Bas Couwenberg at 2024-12-11T07:29:48+01:00
Set distribution to unstable.
- - - - -
15 changed files:
- CHANGELOG.md
- configure
- configure.ac
- debian/changelog
- − debian/patches/rename-ssl-header.patch
- debian/patches/series
- include/common.h.in
- include/ssl.h → include/nrpe-ssl.h
- macros/ax_nagios_get_ssl
- nrpe.spec.in
- src/Makefile.in
- src/check_nrpe.c
- src/ssl.c → src/nrpe-ssl.c
- src/nrpe.c
- update-version
Changes:
=====================================
CHANGELOG.md
=====================================
@@ -1,5 +1,12 @@
NRPE Changelog
==============
+[4.1.3](https://github.com/NagiosEnterprises/nrpe/releases/tag/nrpe-4.1.3) - 2024-12-10
+------------------
+**FIXES**
+- Change of ssl.c and ssl.h to nrpe-ssl.c and nrpe-ssl.h
+
+
+
[4.1.2](https://github.com/NagiosEnterprises/nrpe/releases/tag/nrpe-4.1.2) - 2024-12-09
------------------
**FIXES**
@@ -8,7 +15,6 @@ NRPE Changelog
-
[4.1.1](https://github.com/NagiosEnterprises/nrpe/releases/tag/nrpe-4.1.1) - 2024-08-01
------------------
**FIXES**
=====================================
configure
=====================================
@@ -2505,9 +2505,9 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
PKG_NAME=nrpe
-PKG_VERSION="4.1.2"
+PKG_VERSION="4.1.3"
PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="2024-12-09"
+PKG_REL_DATE="2024-12-10"
RPM_RELEASE=1
LANG=C
@@ -7727,7 +7727,7 @@ if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- SSL_OBJS="ssl.o"
+ SSL_OBJS="nrpe-ssl.o"
else
=====================================
configure.ac
=====================================
@@ -11,9 +11,9 @@ AC_CONFIG_AUX_DIR([build-aux])
AC_PREFIX_DEFAULT(/usr/local/nagios)
PKG_NAME=nrpe
-PKG_VERSION="4.1.2"
+PKG_VERSION="4.1.3"
PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="2024-12-09"
+PKG_REL_DATE="2024-12-10"
RPM_RELEASE=1
LANG=C
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+nagios-nrpe (4.1.3-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop rename-ssl-header.patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 11 Dec 2024 07:29:35 +0100
+
nagios-nrpe (4.1.2-1) unstable; urgency=medium
* New upstream release.
=====================================
debian/patches/rename-ssl-header.patch deleted
=====================================
@@ -1,159 +0,0 @@
-Description: Rename ssh.h to not conflict with openssl/ssl.h.
- gcc -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/nagios-nrpe-4.1.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -fcf-protection -Wdate-time -D_FORTIFY_SOURCE=2 -I/usr/include/openssl -DHAVE_CONFIG_H -I ../include -I ./../include -c -o ssl.o ./ssl.c
- ./utils.c: In function 'clean_environ':
- ./utils.c:273:17: warning: ignoring return value of 'asprintf' declared with attribute 'warn_unused_result' [-Wunused-result]
- 273 | asprintf(&keep, "%s,NRPE_MULTILINESUPPORT,NRPE_PROGRAMVERSION", keep_env_vars);
- | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ./utils.c:275:17: warning: ignoring return value of 'asprintf' declared with attribute 'warn_unused_result' [-Wunused-result]
- 275 | asprintf(&keep, "NRPE_MULTILINESUPPORT,NRPE_PROGRAMVERSION");
- | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ./ssl.c:34:31: error: unknown type name 'SslVer'
- 34 | void ssl_set_protocol_version(SslVer ssl_proto_ver, unsigned long *ssl_opts)
- | ^~~~~~
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/NagiosEnterprises/nrpe/pull/288
-
---- a/include/ssl.h
-+++ /dev/null
-@@ -1,47 +0,0 @@
--/* SSL/TLS parameters */
--typedef enum _SSL_VER {
-- SSL_Ver_Invalid = 0, SSLv2 = 1, SSLv2_plus, SSLv3, SSLv3_plus,
-- TLSv1, TLSv1_plus, TLSv1_1, TLSv1_1_plus, TLSv1_2, TLSv1_2_plus, TLSv1_3, TLSv1_3_plus
--} SslVer;
--
--typedef enum _CLNT_CERTS {
-- ClntCerts_Unknown = 0, Ask_For_Cert = 1, Require_Cert = 2
--} ClntCerts;
--
--typedef enum _SSL_LOGGING {
-- SSL_NoLogging = 0, SSL_LogStartup = 1, SSL_LogIpAddr = 2,
-- SSL_LogVersion = 4, SSL_LogCipher = 8, SSL_LogIfClientCert = 16,
-- SSL_LogCertDetails = 32
--} SslLogging;
--
--typedef struct _SSL_PARMS {
-- char *cert_file;
-- char *cacert_file;
-- char *privatekey_file;
-- char cipher_list[MAX_FILENAME_LENGTH];
-- SslVer ssl_proto_ver;
-- int allowDH;
-- ClntCerts client_certs;
-- SslLogging log_opts;
--} SslParms;
--
--
--#ifdef HAVE_SSL
--# if (defined(__sun) && defined(SOLARIS_10)) || defined(_AIX) || defined(__hpux)
--extern SSL_METHOD *meth;
--# else
--extern const SSL_METHOD *meth;
--# endif
--extern SSL_CTX *ctx;
--extern SslParms sslprm;
--#endif
--
--extern int use_ssl;
--
--
--void ssl_initialize(void);
--void ssl_set_protocol_version(SslVer ssl_proto_ver, unsigned long *ssl_opts);
--void ssl_log_startup(int server);
--int ssl_load_certificates(void);
--int ssl_set_ciphers(void);
--int ssl_verify_callback_common(int preverify_ok, X509_STORE_CTX * ctx, int is_invalid);
---- /dev/null
-+++ b/include/nrpe-ssl.h
-@@ -0,0 +1,47 @@
-+/* SSL/TLS parameters */
-+typedef enum _SSL_VER {
-+ SSL_Ver_Invalid = 0, SSLv2 = 1, SSLv2_plus, SSLv3, SSLv3_plus,
-+ TLSv1, TLSv1_plus, TLSv1_1, TLSv1_1_plus, TLSv1_2, TLSv1_2_plus, TLSv1_3, TLSv1_3_plus
-+} SslVer;
-+
-+typedef enum _CLNT_CERTS {
-+ ClntCerts_Unknown = 0, Ask_For_Cert = 1, Require_Cert = 2
-+} ClntCerts;
-+
-+typedef enum _SSL_LOGGING {
-+ SSL_NoLogging = 0, SSL_LogStartup = 1, SSL_LogIpAddr = 2,
-+ SSL_LogVersion = 4, SSL_LogCipher = 8, SSL_LogIfClientCert = 16,
-+ SSL_LogCertDetails = 32
-+} SslLogging;
-+
-+typedef struct _SSL_PARMS {
-+ char *cert_file;
-+ char *cacert_file;
-+ char *privatekey_file;
-+ char cipher_list[MAX_FILENAME_LENGTH];
-+ SslVer ssl_proto_ver;
-+ int allowDH;
-+ ClntCerts client_certs;
-+ SslLogging log_opts;
-+} SslParms;
-+
-+
-+#ifdef HAVE_SSL
-+# if (defined(__sun) && defined(SOLARIS_10)) || defined(_AIX) || defined(__hpux)
-+extern SSL_METHOD *meth;
-+# else
-+extern const SSL_METHOD *meth;
-+# endif
-+extern SSL_CTX *ctx;
-+extern SslParms sslprm;
-+#endif
-+
-+extern int use_ssl;
-+
-+
-+void ssl_initialize(void);
-+void ssl_set_protocol_version(SslVer ssl_proto_ver, unsigned long *ssl_opts);
-+void ssl_log_startup(int server);
-+int ssl_load_certificates(void);
-+int ssl_set_ciphers(void);
-+int ssl_verify_callback_common(int preverify_ok, X509_STORE_CTX * ctx, int is_invalid);
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -55,7 +55,7 @@ check_nrpe: $(srcdir)/check_nrpe.c utils
- utils.o: $(srcdir)/utils.c $(SRC_INCLUDE)/utils.h $(CFG_INCLUDE)/common.h $(CFG_INCLUDE)/config.h
- $(CC) $(CFLAGS) -c -o $@ $(srcdir)/utils.c
-
--ssl.o: $(srcdir)/ssl.c $(SRC_INCLUDE)/ssl.h $(CFG_INCLUDE)/common.h $(CFG_INCLUDE)/config.h
-+ssl.o: $(srcdir)/ssl.c $(SRC_INCLUDE)/nrpe-ssl.h $(CFG_INCLUDE)/common.h $(CFG_INCLUDE)/config.h
- $(CC) $(CFLAGS) -c -o $@ $(srcdir)/ssl.c
-
- @SSL_DH_HEADER_MAKE@
---- a/src/check_nrpe.c
-+++ b/src/check_nrpe.c
-@@ -41,7 +41,7 @@
- #endif
- #include "common.h"
- #include "utils.h"
--#include "ssl.h"
-+#include "nrpe-ssl.h"
-
- #define DEFAULT_NRPE_COMMAND "_NRPE_CHECK" /* check version of NRPE daemon */
-
---- a/src/nrpe.c
-+++ b/src/nrpe.c
-@@ -41,7 +41,7 @@
- #include "nrpe.h"
- #include "utils.h"
- #include "acl.h"
--#include "ssl.h"
-+#include "nrpe-ssl.h"
-
- #ifdef HAVE_SSL
- # if defined(USE_SSL_DH) && !defined(AUTO_SSL_DH)
---- a/src/ssl.c
-+++ b/src/ssl.c
-@@ -2,7 +2,7 @@
- # include "config.h"
- #endif
- #include "common.h"
--#include "ssl.h"
-+#include "nrpe-ssl.h"
- #include "utils.h"
-
- #ifdef HAVE_SSL
=====================================
debian/patches/series
=====================================
@@ -1,4 +1,3 @@
02_nrpe.cfg_local-include_support_nrpe.d.patch
07_warn_ssloption.patch
-rename-ssl-header.patch
ssl-rpath.patch
=====================================
include/common.h.in
=====================================
@@ -38,8 +38,8 @@
# endif
#endif
-#define PROGRAM_VERSION "4.1.2"
-#define MODIFICATION_DATE "2024-12-09"
+#define PROGRAM_VERSION "4.1.3"
+#define MODIFICATION_DATE "2024-12-10"
#define OK 0
#define ERROR -1
=====================================
include/ssl.h → include/nrpe-ssl.h
=====================================
=====================================
macros/ax_nagios_get_ssl
=====================================
@@ -297,7 +297,7 @@ if test x$SSL_TYPE != xNONE; then
[AC_LANG_PROGRAM([#include <${SSL_INC_PREFIX}${SSL_HDR}>], [SSL_new(NULL)])],
[
AC_MSG_RESULT([yes])
- SSL_OBJS="ssl.o"
+ SSL_OBJS="nrpe-ssl.o"
$1
], [
AC_MSG_ERROR([no])
=====================================
nrpe.spec.in
=====================================
@@ -22,7 +22,7 @@
%define _sysconfdir /etc/nagios
%define name @PACKAGE_NAME@
-%define version 4.1.2
+%define version 4.1.3
%define release @RPM_RELEASE@
%define nsusr @nrpe_user@
%define nsgrp @nrpe_group@
=====================================
src/Makefile.in
=====================================
@@ -55,8 +55,8 @@ check_nrpe: $(srcdir)/check_nrpe.c utils.o $(SRC_INCLUDE)/utils.h $(CFG_INCLUDE)
utils.o: $(srcdir)/utils.c $(SRC_INCLUDE)/utils.h $(CFG_INCLUDE)/common.h $(CFG_INCLUDE)/config.h
$(CC) $(CFLAGS) -c -o $@ $(srcdir)/utils.c
-ssl.o: $(srcdir)/ssl.c $(SRC_INCLUDE)/ssl.h $(CFG_INCLUDE)/common.h $(CFG_INCLUDE)/config.h
- $(CC) $(CFLAGS) -c -o $@ $(srcdir)/ssl.c
+nrpe-ssl.o: $(srcdir)/nrpe-ssl.c $(SRC_INCLUDE)/nrpe-ssl.h $(CFG_INCLUDE)/common.h $(CFG_INCLUDE)/config.h
+ $(CC) $(CFLAGS) -c -o $@ $(srcdir)/nrpe-ssl.c
@SSL_DH_HEADER_MAKE@
@@ -88,7 +88,7 @@ install-uninstall:
$(INSTALL) -m 755 ../uninstall $(SBINDIR)/nrpe-uninstall
clean:
- rm -f core nrpe check_nrpe generate_dh_params utils.o ssl.o $(SNPRINTF_O) $(SSL_DH_HEADER)
+ rm -f core nrpe check_nrpe generate_dh_params utils.o nrpe-ssl.o $(SNPRINTF_O) $(SSL_DH_HEADER)
rm -f *~ */*~
rm -rf nrpe.dSYM check_nrpe.dSYM
=====================================
src/check_nrpe.c
=====================================
@@ -41,7 +41,7 @@
#endif
#include "common.h"
#include "utils.h"
-#include "ssl.h"
+#include "nrpe-ssl.h"
#define DEFAULT_NRPE_COMMAND "_NRPE_CHECK" /* check version of NRPE daemon */
=====================================
src/ssl.c → src/nrpe-ssl.c
=====================================
@@ -2,7 +2,7 @@
# include "config.h"
#endif
#include "common.h"
-#include "ssl.h"
+#include "nrpe-ssl.h"
#include "utils.h"
#ifdef HAVE_SSL
=====================================
src/nrpe.c
=====================================
@@ -41,7 +41,7 @@
#include "nrpe.h"
#include "utils.h"
#include "acl.h"
-#include "ssl.h"
+#include "nrpe-ssl.h"
#ifdef HAVE_SSL
# if defined(USE_SSL_DH) && !defined(AUTO_SSL_DH)
=====================================
update-version
=====================================
@@ -28,10 +28,10 @@ else
fi
# Current version number
-CURRENTVERSION=4.1.2
+CURRENTVERSION=4.1.3
# Last date
-LASTDATE=2024-12-09
+LASTDATE=2024-12-10
if [ "x$1" = "x" ]
then
View it on GitLab: https://salsa.debian.org/nagios-team/nrpe/-/compare/d0e78ca1ccf2b9ae2c80a0be5569f2aa82618339...64e0c460d48137f86875bb062dbb448a7ba208d9
--
View it on GitLab: https://salsa.debian.org/nagios-team/nrpe/-/compare/d0e78ca1ccf2b9ae2c80a0be5569f2aa82618339...64e0c460d48137f86875bb062dbb448a7ba208d9
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20241211/4dda0f7f/attachment-0001.htm>
More information about the pkg-nagios-changes
mailing list