Revision: 26354
http://sourceforge.net/p/gar/code/26354
Author: dmichelsen
Date: 2018-02-06 11:46:33 +0000 (Tue, 06 Feb 2018)
Log Message:
-----------
nrpe/trunk: Update to 3.2.1
Modified Paths:
--------------
csw/mgar/pkg/nrpe/trunk/Makefile
csw/mgar/pkg/nrpe/trunk/checksums
csw/mgar/pkg/nrpe/trunk/files/0002-changing-packetbuffer-length-to-8k.patch
Removed Paths:
-------------
csw/mgar/pkg/nrpe/trunk/files/0003-change_dh_param_to_2048.patch
Modified: csw/mgar/pkg/nrpe/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nrpe/trunk/Makefile 2018-02-01 17:31:12 UTC (rev 26353)
+++ csw/mgar/pkg/nrpe/trunk/Makefile 2018-02-06 11:46:33 UTC (rev 26354)
@@ -1,5 +1,5 @@
NAME = nrpe
-VERSION = 2.15
+VERSION = 3.2.1
GARTYPE = v2
define BLURB
@@ -19,16 +19,15 @@
PATCHFILES_isa-sparcv8plus-size-8k +=
0002-changing-packetbuffer-length-to-8k.patch
PATCHFILES_isa-pentium_pro-size-8k +=
0002-changing-packetbuffer-length-to-8k.patch
-PATCHFILES += 0003-change_dh_param_to_2048.patch
-
LICENSE = LEGAL
EXTRA_MODULATORS = SIZE
MODULATIONS_SIZE = 1k 8k
-REINPLACE_USRLOCAL += .*/nrpe-2.15/SECURITY
-REINPLACE_USRLOCAL += .*/nrpe-2.15/README
REINPLACE_USRLOCAL += sample-config/nrpe.cfg.in
+# Default path:
+# *path = "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin";
+REINPLACE_USRLOCAL += src/utils.c
PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386
@@ -67,12 +66,13 @@
CONFIGURE_ARGS += $(DIRPATHS)
CONFIGURE_ARGS += --with-ssl-lib=$(libdir)
CONFIGURE_ARGS += --with-ssl-inc=$(includedir)
-CONFIGURE_ARGS += --with-ssl-dir=$(bindir)
CONFIGURE_ARGS += --with-kerberos-inc=$(includedir)
CONFIGURE_ARGS += --enable-command-args
-INSTALL_ARGS = install-daemon-config
+BUILD_ARGS = all
+INSTALL_ARGS = install-daemon install-config
+
# There is no testsuite
TEST_SCRIPTS =
@@ -91,7 +91,7 @@
include gar/category.mk
-pre-configure:
+xpre-configure:
@# This is because of patch 0003-change_dh_param_to_2048.patch
cd $(WORKSRC) && autoconf
@$(MAKECOOKIE)
@@ -102,9 +102,9 @@
ginstall -m 644 $(WORKDIR)/README_8k $(DESTDIR)$(DOCDIR)
ginstall -m 644 $(WORKSRC)/docs/NRPE.pdf $(DESTDIR)$(DOCDIR)
ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(DOCDIR)
- ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(DOCDIR)
- ginstall -m 644 $(WORKSRC)/README.SSL $(DESTDIR)$(DOCDIR)
- ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(DOCDIR)
+ ginstall -m 644 $(WORKSRC)/README.md $(DESTDIR)$(DOCDIR)
+ ginstall -m 644 $(WORKSRC)/README.SSL.md $(DESTDIR)$(DOCDIR)
+ ginstall -m 644 $(WORKSRC)/SECURITY.md $(DESTDIR)$(DOCDIR)
ginstall -D -m 755 $(WORKDIR)/cswnrpe
$(DESTDIR)$(sysconfdir)/init.d/cswnrpe
ginstall -D -m 644 $(WORKDIR)/cswusergroup $(DESTDIR)$(USERGROUP)
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/nrpe/trunk/checksums
===================================================================
--- csw/mgar/pkg/nrpe/trunk/checksums 2018-02-01 17:31:12 UTC (rev 26353)
+++ csw/mgar/pkg/nrpe/trunk/checksums 2018-02-06 11:46:33 UTC (rev 26354)
@@ -1 +1 @@
-3921ddc598312983f604541784b35a50 nrpe-2.15.tar.gz
+8997e195fea93cdceb8c7ed8ac1d43bc nrpe-3.2.1.tar.gz
Modified:
csw/mgar/pkg/nrpe/trunk/files/0002-changing-packetbuffer-length-to-8k.patch
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/0002-changing-packetbuffer-length-to-8k.patch
2018-02-01 17:31:12 UTC (rev 26353)
+++ csw/mgar/pkg/nrpe/trunk/files/0002-changing-packetbuffer-length-to-8k.patch
2018-02-06 11:46:33 UTC (rev 26354)
@@ -1,34 +1,34 @@
-From 3aaf73298717337b2002ae64d843d1342778c370 Mon Sep 17 00:00:00 2001
-From: Juergen Arndt <j...@opencsw.org>
-Date: Tue, 28 Feb 2012 14:43:46 +0100
+From 93f765175addce1d16d1379f6ad49d1d5433f848 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Tue, 6 Feb 2018 12:07:08 +0100
Subject: [PATCH] changing packetbuffer length to 8k
---
- include/common.h | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ include/common.h.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/include/common.h b/include/common.h
-index fb3b429..6591d10 100755
---- a/include/common.h
-+++ b/include/common.h
-@@ -41,7 +41,7 @@
- #define DEFAULT_SOCKET_TIMEOUT 10 /* timeout after 10 seconds */
- #define DEFAULT_CONNECTION_TIMEOUT 300 /* timeout if daemon is waiting
for connection more than this time */
+diff --git a/include/common.h.in b/include/common.h.in
+index 90f6272..53281dd 100644
+--- a/include/common.h.in
++++ b/include/common.h.in
+@@ -55,7 +55,7 @@
+ #define DEFAULT_SOCKET_TIMEOUT 10 /* timeout
after 10 seconds */
+ #define DEFAULT_CONNECTION_TIMEOUT 300 /* timeout if daemon is
waiting for connection more than this time */
--#define MAX_INPUT_BUFFER 2048 /* max size of most buffers we use */
-+#define MAX_INPUT_BUFFER 8192 /* max size of most buffers we use */
- #define MAX_FILENAME_LENGTH 256
+-#define MAX_INPUT_BUFFER 2048 /* max size of most
buffers we use */
++#define MAX_INPUT_BUFFER 8192 /* max size of most
buffers we use */
+ #define MAX_FILENAME_LENGTH 256
+ #define MAX_HOST_ADDRESS_LENGTH 256 /* max size of
a host address */
+ #define MAX_COMMAND_ARGUMENTS 16
+@@ -70,7 +70,7 @@
+ #define NRPE_PACKET_VERSION_2 2
+ #define NRPE_PACKET_VERSION_1 1 /* older packet version
identifiers (no longer supported) */
- #define MAX_HOST_ADDRESS_LENGTH 256 /* max size of a host address */
-@@ -60,7 +60,7 @@
- #define NRPE_PACKET_VERSION_2 2
- #define NRPE_PACKET_VERSION_1 1 /* older packet version
identifiers (no longer supported) */
+-#define MAX_PACKETBUFFER_LENGTH 1024 /* amount of data to
send in one query/response vor version 2 */
++#define MAX_PACKETBUFFER_LENGTH 8192 /* amount of data to
send in one query/response vor version 2 */
--#define MAX_PACKETBUFFER_LENGTH 1024 /* max amount of data
we'll send in one query/response */
-+#define MAX_PACKETBUFFER_LENGTH 8192 /* max amount of data
we'll send in one query/response */
-
- typedef struct packet_struct{
- int16_t packet_version;
+ typedef struct _v2_packet {
+ int16_t packet_version;
--
-1.7.9
+2.4.0
Deleted: csw/mgar/pkg/nrpe/trunk/files/0003-change_dh_param_to_2048.patch
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/0003-change_dh_param_to_2048.patch
2018-02-01 17:31:12 UTC (rev 26353)
+++ csw/mgar/pkg/nrpe/trunk/files/0003-change_dh_param_to_2048.patch
2018-02-06 11:46:33 UTC (rev 26354)
@@ -1,39 +0,0 @@
-From a733ca5b0f5e5e8f8a17730c43164c338c79161e Mon Sep 17 00:00:00 2001
-From: Jan Holzhueter <j...@opencsw.org>
-Date: Tue, 29 Mar 2016 10:16:49 +0200
-Subject: [PATCH] chage_dh_param_to_2048
-
----
- configure.in | 2 +-
- src/nrpe.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index f0dfa09..1993140 100644
---- a/configure.in
-+++ b/configure.in
-@@ -340,7 +340,7 @@ if test x$check_for_ssl = xyes; then
- sslbin=$ssldir/bin/openssl
- fi
- # awk to strip off meta data at bottom of dhparam output
-- $sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}'
> include/dh.h
-+ $sslbin dhparam -C 2048 | awk '/^-----/ {exit} {print}'
> include/dh.h
- fi
- fi
-
-diff --git a/src/nrpe.c b/src/nrpe.c
-index 381f0ac..6234492 100644
---- a/src/nrpe.c
-+++ b/src/nrpe.c
-@@ -266,7 +266,7 @@ int main(int argc, char **argv){
-
- /* use anonymous DH ciphers */
- SSL_CTX_set_cipher_list(ctx,"ADH");
-- dh=get_dh512();
-+ dh=get_dh2048();
- SSL_CTX_set_tmp_dh(ctx,dh);
- DH_free(dh);
- if(debug==TRUE)
---
-2.4.0
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
