[pkg-nagios-changes] [Git][nagios-team/nrpe][upstream] New upstream version 4.1.3

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch upstream 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
- - - - -


12 changed files:

- CHANGELOG.md
- configure
- configure.ac
- 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


=====================================
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/-/commit/ac6745932676383cd3003d96c45b689cb03bb5cb

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/nrpe/-/commit/ac6745932676383cd3003d96c45b689cb03bb5cb
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/5d6181a7/attachment-0001.htm>