diff --git a/.gitignore b/.gitignore index 981a546..828074b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /cacti-spine-1.2.15.tar.gz /cacti-spine-1.2.16.tar.gz /cacti-spine-1.2.17.tar.gz +/cacti-spine-1.2.19.tar.gz diff --git a/cacti-spine-disable-des.patch b/cacti-spine-disable-des.patch deleted file mode 100644 index 53ad91d..0000000 --- a/cacti-spine-disable-des.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 037ea818eb3e75f7b02128d8206c5229f9cb95e3 Mon Sep 17 00:00:00 2001 -From: netniV -Date: Sat, 4 Sep 2021 19:06:39 +0000 -Subject: [PATCH] Unable to build when DES no longer supported (#220) - -Closes #220 ---- - -diff --git a/snmp.c b/snmp.c -index facb347..c3dce45 100644 ---- a/snmp.c -+++ b/snmp.c -@@ -123,9 +123,11 @@ void *snmp_host_init(int host_id, char *hostname, int snmp_version, char *snmp_c - void *sessp = NULL; - struct snmp_session session; - char hostnameport[BUFSIZE]; -+ int snmp_errored; - - /* initialize SNMP */ - snmp_sess_init(&session); -+ snmp_errored = 0; - - /* Bind to snmp_clientaddr if specified */ - size_t len = strlen(set.snmp_clientaddr); -@@ -248,12 +250,17 @@ void *snmp_host_init(int host_id, char *hostname, int snmp_version, char *snmp_c - } - } else { - if (strcmp(snmp_priv_protocol, "DES") == 0) { -+ #if defined(USM_PRIV_PROTO_DES_LEN) - session.securityPrivProto = snmp_duplicate_objid(usmDESPrivProtocol, USM_PRIV_PROTO_DES_LEN); - session.securityPrivProtoLen = USM_PRIV_PROTO_DES_LEN; - session.securityPrivKeyLen = USM_PRIV_KU_LEN; - - /* set the security level to authenticate, and encrypted */ - session.securityLevel = SNMP_SEC_LEVEL_AUTHPRIV; -+ #else -+ SPINE_LOG(("SNMP: Error DES is no longer supported on this system")); -+ return 0; -+ #endif - } else { - #if defined(USM_PRIV_PROTO_AES_LEN) - session.securityPrivProto = snmp_duplicate_objid(usmAESPrivProtocol, USM_PRIV_PROTO_AES_LEN); -@@ -277,6 +284,7 @@ void *snmp_host_init(int host_id, char *hostname, int snmp_version, char *snmp_c - session.securityPrivKey, - &(session.securityPrivKeyLen)) != SNMPERR_SUCCESS) { - SPINE_LOG(("SNMP: Error generating SNMPv3 Ku from privacy pass phrase.")); -+ return 0; - } - } - } - -From de228894a82cf69ac46f0be1f5bf2ee782aa32f9 Mon Sep 17 00:00:00 2001 -From: root -Date: Sun, 5 Sep 2021 14:10:53 +0000 -Subject: [PATCH] Remove some unused parts of #220 - ---- - snmp.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/snmp.c b/snmp.c -index c3dce45..0b716c0 100644 ---- a/snmp.c -+++ b/snmp.c -@@ -123,7 +123,6 @@ void *snmp_host_init(int host_id, char *hostname, int snmp_version, char *snmp_c - void *sessp = NULL; - struct snmp_session session; - char hostnameport[BUFSIZE]; -- int snmp_errored; - - /* initialize SNMP */ - snmp_sess_init(&session); - -From 3f5decafe11103b59ce74b52a3db77190952fc8a Mon Sep 17 00:00:00 2001 -From: netniV -Date: Sun, 5 Sep 2021 14:22:30 +0000 -Subject: [PATCH] Disable DES if Net-SNMP doesn't have it (#220) - ---- - snmp.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/snmp.c b/snmp.c -index 0b716c0..95f9a8c 100644 ---- a/snmp.c -+++ b/snmp.c -@@ -126,7 +126,6 @@ void *snmp_host_init(int host_id, char *hostname, int snmp_version, char *snmp_c - - /* initialize SNMP */ - snmp_sess_init(&session); -- snmp_errored = 0; - - /* Bind to snmp_clientaddr if specified */ - size_t len = strlen(set.snmp_clientaddr); -@@ -249,7 +248,7 @@ void *snmp_host_init(int host_id, char *hostname, int snmp_version, char *snmp_c - } - } else { - if (strcmp(snmp_priv_protocol, "DES") == 0) { -- #if defined(USM_PRIV_PROTO_DES_LEN) -+ #if defined(USM_PRIV_PROTO_DES_LEN) && !defined(NETSNMP_DISABLE_DES) - session.securityPrivProto = snmp_duplicate_objid(usmDESPrivProtocol, USM_PRIV_PROTO_DES_LEN); - session.securityPrivProtoLen = USM_PRIV_PROTO_DES_LEN; - session.securityPrivKeyLen = USM_PRIV_KU_LEN; diff --git a/cacti-spine.spec b/cacti-spine.spec index 6988615..acedb70 100644 --- a/cacti-spine.spec +++ b/cacti-spine.spec @@ -1,11 +1,10 @@ Name: cacti-spine -Version: 1.2.17 -Release: 3%{?dist} +Version: 1.2.19 +Release: 1%{?dist} Summary: Threaded poller for Cacti written in C License: LGPLv2+ URL: https://cacti.net Source0: https://www.cacti.net/downloads/spine/%{name}-%{version}.tar.gz -Patch0: cacti-spine-disable-des.patch BuildRequires: gcc %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -49,6 +48,9 @@ autoreconf -fiv %{_mandir}/man1/spine.1.* %changelog +* Tue Nov 02 2021 Morten Stevens - 1.2.19-1 +- Update to 1.2.19 + * Sun Sep 05 2021 Morten Stevens - 1.2.17-3 - Added patch for #1987395 diff --git a/sources b/sources index 335ee64..06dbb10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cacti-spine-1.2.17.tar.gz) = 4c616af041d2f08e18fd274409c98d3efce84b7cca2d6e23db3d6c2a0d4c9a77a2c52c0ef8e0ed0c6ad409f28b56fdf3160e27654522d8aeb1b88e3cb4128d4a +SHA512 (cacti-spine-1.2.19.tar.gz) = 407a4e83aabaa62693c2f7c3d3952da9178bb28e2b8b914a5649e3eaccb9ea77d0c7db8e251a113a308bfaaa0674be941abfb2fc4f8e50d43fb73c8cd9deec63