diff mbox series

package/agentpp: fix build error due to type mismatch

Message ID 20230626162057.562236-1-luca.ceresoli@bootlin.com
State Accepted
Headers show
Series package/agentpp: fix build error due to type mismatch | expand

Commit Message

Luca Ceresoli June 26, 2023, 4:20 p.m. UTC 
This was supposedly fixed by commit 5f06ecf5e151 ("package/agentpp:
security bump to version 4.6.0") but has kept happening so far.

No public place for contributions, thus this patch has been sent to private
e-mail.

Fixes:
  http://autobuild.buildroot.net/results/e8abd6bdc62a028955915706b03d72239786c703/
  http://autobuild.buildroot.net/results/24441fb679fbf5f913c9b6431c98aec596ead587/

Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
---
 ...mpx-fix-const-nonconst-type-mismatch.patch | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 package/agentpp/0001-Snmpx-fix-const-nonconst-type-mismatch.patch

Comments

Thomas Petazzoni July 1, 2023, 2:36 p.m. UTC | #1 
Hello Luca,

On Mon, 26 Jun 2023 18:20:57 +0200
Luca Ceresoli via buildroot <buildroot@buildroot.org> wrote:

> +Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
> +[Upstream status: sent to katz.agentpp.com@magenta.de and support@agentpp.com]

This now needs to be:

Upstream: blablabla

otherwise it causes "make check-package" to complain.

If fixed that up when applying. Thanks a lot for having provided this
build fix!

Thomas
Peter Korsgaard July 16, 2023, 4 p.m. UTC | #2 
>>>>> "Luca" == Luca Ceresoli via buildroot <buildroot@buildroot.org> writes:

 > This was supposedly fixed by commit 5f06ecf5e151 ("package/agentpp:
 > security bump to version 4.6.0") but has kept happening so far.

 > No public place for contributions, thus this patch has been sent to private
 > e-mail.

 > Fixes:
 >   http://autobuild.buildroot.net/results/e8abd6bdc62a028955915706b03d72239786c703/
 >   http://autobuild.buildroot.net/results/24441fb679fbf5f913c9b6431c98aec596ead587/

 > Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>

Committed to 2023.02.x and 2023.05.x, thanks.
diff mbox series

Patch

diff --git a/package/agentpp/0001-Snmpx-fix-const-nonconst-type-mismatch.patch b/package/agentpp/0001-Snmpx-fix-const-nonconst-type-mismatch.patch
new file mode 100644
index 000000000000..52c7ca965343
--- /dev/null
+++ b/package/agentpp/0001-Snmpx-fix-const-nonconst-type-mismatch.patch
@@ -0,0 +1,51 @@ 
+From 7e541e6dba8d4976bbb490838a09b569f38b047d Mon Sep 17 00:00:00 2001
+From: Luca Ceresoli <luca.ceresoli@bootlin.com>
+Date: Mon, 26 Jun 2023 17:45:00 +0200
+Subject: [PATCH] Snmpx: fix const/nonconst type mismatch
+
+Fixes build failure:
+
+  snmp_pp_ext.cpp:1176:28: error: binding reference of type 'Snmp_pp::Pdu&' to 'const Snmp_pp::Pdu' discards qualifiers
+   1176 |     status = snmpmsg.load( pdu, community, version);
+        |                            ^~~
+
+Fixes:
+  http://autobuild.buildroot.net/results/e8abd6bdc62a028955915706b03d72239786c703/
+  http://autobuild.buildroot.net/results/24441fb679fbf5f913c9b6431c98aec596ead587/
+
+Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
+[Upstream status: sent to katz.agentpp.com@magenta.de and support@agentpp.com]
+---
+ include/agent_pp/snmp_pp_ext.h | 2 +-
+ src/snmp_pp_ext.cpp            | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/agent_pp/snmp_pp_ext.h b/include/agent_pp/snmp_pp_ext.h
+index 7c5a6783ee70..d8a46060db98 100644
+--- a/include/agent_pp/snmp_pp_ext.h
++++ b/include/agent_pp/snmp_pp_ext.h
+@@ -807,7 +807,7 @@ public:
+ 	 *   SNMP_CLASS_SUCCESS on success and SNMP_CLASS_ERROR,
+ 	 *   SNMP_CLASS_TL_FAILED on failure.
+ 	 */
+-        int send (Pdux const &, NS_SNMP UdpAddress const &, NS_SNMP snmp_version, NS_SNMP OctetStr const &);
++        int send (Pdux &, NS_SNMP UdpAddress const &, NS_SNMP snmp_version, NS_SNMP OctetStr const &);
+ #endif
+ 
+ 	/**
+diff --git a/src/snmp_pp_ext.cpp b/src/snmp_pp_ext.cpp
+index 54a29ec8ea28..b61cbf056246 100644
+--- a/src/snmp_pp_ext.cpp
++++ b/src/snmp_pp_ext.cpp
+@@ -1203,7 +1203,7 @@ int Snmpx::send (Pdux &pdu, SnmpTarget* target)
+ 
+ #else  // _SNMPv3 is not defined
+ 
+-int Snmpx::send (Pdux  const &pdu,
++int Snmpx::send (Pdux  &pdu,
+ 		 UdpAddress  const &udp_address,
+ 		 snmp_version version,
+ 		 OctetStr  const &community)
+-- 
+2.34.1
+