diff mbox series

[1/1] package/snmppp: bump to version 3.5.1

Message ID 20240430203708.75367-1-jesseevg@gmail.com
State Accepted
Headers show
Series [1/1] package/snmppp: bump to version 3.5.1 | expand

Commit Message

Jesse Van Gavere April 30, 2024, 8:37 p.m. UTC 
Drop non-v3 fix patch as this was upstreamed

Signed-off-by: Jesse Van Gavere <jesseevg@gmail.com>
---
 .../snmppp/0001-fix-build-without-v3.patch    | 43 -------------------
 package/snmppp/snmppp.hash                    |  2 +-
 package/snmppp/snmppp.mk                      |  2 +-
 3 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 package/snmppp/0001-fix-build-without-v3.patch

Comments

Luca Ceresoli May 6, 2024, 10:19 a.m. UTC | #1 
Hello Jesse,

On Tue, 30 Apr 2024 22:37:08 +0200
Jesse Van Gavere <jesseevg@gmail.com> wrote:

> Drop non-v3 fix patch as this was upstreamed
> 
> Signed-off-by: Jesse Van Gavere <jesseevg@gmail.com>

Tested-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Thomas Petazzoni May 6, 2024, 8:15 p.m. UTC | #2 
On Tue, 30 Apr 2024 22:37:08 +0200
Jesse Van Gavere <jesseevg@gmail.com> wrote:

> Drop non-v3 fix patch as this was upstreamed
> 
> Signed-off-by: Jesse Van Gavere <jesseevg@gmail.com>
> ---
>  .../snmppp/0001-fix-build-without-v3.patch    | 43 -------------------
>  package/snmppp/snmppp.hash                    |  2 +-
>  package/snmppp/snmppp.mk                      |  2 +-
>  3 files changed, 2 insertions(+), 45 deletions(-)
>  delete mode 100644 package/snmppp/0001-fix-build-without-v3.patch

Updating .checkpackageignore after removing the patch was missing, so I
did that when applying. Thanks for the contribution!

Thomas
diff mbox series

Patch

diff --git a/package/snmppp/0001-fix-build-without-v3.patch b/package/snmppp/0001-fix-build-without-v3.patch
deleted file mode 100644
index 4e81f7bfc1..0000000000
--- a/package/snmppp/0001-fix-build-without-v3.patch
+++ /dev/null
@@ -1,43 +0,0 @@ 
-fix build without v3
-
-Fix the following build failure without version3 raised since version
-3.5.0:
-
-msgqueue.cpp: In member function 'int Snmp_pp::CSNMPMessage::ResendMessage()':
-msgqueue.cpp:263:34: error: 'version3' was not declared in this scope; did you mean 'version1'?
-  263 |   if (m_target->get_version() == version3) {
-      |                                  ^~~~~~~~
-      |                                  version1
-
-Fixes:
- - http://autobuild.buildroot.org/results/8ef3e4407a51c53c15e530606227338761dd905b
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: sent to katz.agentpp.com@magenta.de]
-
-diff -Nura snmp++-3.5.0.orig/src/msgqueue.cpp snmp++-3.5.0/src/msgqueue.cpp
---- snmp++-3.5.0.orig/src/msgqueue.cpp	2023-03-20 10:49:30.629000853 +0100
-+++ snmp++-3.5.0/src/msgqueue.cpp	2023-03-20 10:51:36.880664304 +0100
-@@ -260,18 +260,20 @@
-   m_target->set_retry(m_target->get_retry() - 1);
-   SetSendTime();
-   int status;
--  if (m_target->get_version() == version3) {
- #ifdef _SNMPv3
-+  if (m_target->get_version() == version3) {
-     // delete entry in cache
-     if (m_snmp->get_mpv3())
- 	    m_snmp->get_mpv3()->delete_from_cache(m_pdu.get_request_id());
--#endif
-     status = m_snmp->snmp_engine(m_pdu, m_pdu.get_error_status(), m_pdu.get_error_index(),
- 		    *m_target, m_callBack, m_callData, m_socket, 0, this);
-   }
-   else {
-+#endif
-     status = send_snmp_request(m_socket, m_rawPdu, m_rawPduLen, *m_address);
-+#ifdef _SNMPv3
-   }
-+#endif
-   if (status != 0)
-     return SNMP_CLASS_TL_FAILED;
- 
diff --git a/package/snmppp/snmppp.hash b/package/snmppp/snmppp.hash
index 74c6a3e98f..b66056ef40 100644
--- a/package/snmppp/snmppp.hash
+++ b/package/snmppp/snmppp.hash
@@ -1,3 +1,3 @@ 
 # Locally computed:
-sha256  43a433bd5f6fd67add5a26add6521ca664c41aead438405658ed57483664b4bf  snmp++-3.5.0.tar.gz
+sha256  034553f7cb75d7ce1fe70cb3ba06e88587b6bca4fa062d10344ce4555a1395f7  snmp++-3.5.1.tar.gz
 sha256  61337e799c8274e596e5783b22607beea8073ee296c6b27fc5c7487296e56851  src/v3.cpp
diff --git a/package/snmppp/snmppp.mk b/package/snmppp/snmppp.mk
index 9f1916dd66..966bb340fd 100644
--- a/package/snmppp/snmppp.mk
+++ b/package/snmppp/snmppp.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-SNMPPP_VERSION = 3.5.0
+SNMPPP_VERSION = 3.5.1
 SNMPPP_SOURCE = snmp++-$(SNMPPP_VERSION).tar.gz
 SNMPPP_SITE = http://www.agentpp.com/download
 SNMPPP_DEPENDENCIES = host-pkgconf