From 531b9adf9025f1101a5e740423456ef385bb2d73 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 2 May 2019 23:35:07 -0700
Subject: ibrdtnd: Fix compilation with uClibc-ng and/or uClibc++

For some reason, several C++ headers are not included. Include them.

Also added const fixes to get it to build with uClibc++.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 net/ibrdtnd/patches/010-no-const.patch  | 33 +++++++++++++++++++++++++++++++++
 net/ibrdtnd/patches/020-uClibc-ng.patch | 20 ++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 net/ibrdtnd/patches/010-no-const.patch
 create mode 100644 net/ibrdtnd/patches/020-uClibc-ng.patch

(limited to 'net/ibrdtnd/patches')

diff --git a/net/ibrdtnd/patches/010-no-const.patch b/net/ibrdtnd/patches/010-no-const.patch
new file mode 100644
index 000000000..a6c80db52
--- /dev/null
+++ b/net/ibrdtnd/patches/010-no-const.patch
@@ -0,0 +1,33 @@
+--- a/src/routing/SchedulingBundleIndex.cpp
++++ b/src/routing/SchedulingBundleIndex.cpp
+@@ -28,7 +28,7 @@ namespace dtn
+ 		void SchedulingBundleIndex::remove(const dtn::data::BundleID &id)
+ 		{
+ 			ibrcommon::MutexLock l(_index_mutex);
+-			for (priority_index::const_iterator iter = _priority_index.begin(); iter != _priority_index.end(); ++iter)
++			for (priority_index::iterator iter = _priority_index.begin(); iter != _priority_index.end(); ++iter)
+ 			{
+ 				const dtn::data::MetaBundle &b = (*iter);
+ 				if (id == (const dtn::data::BundleID&)b) {
+--- a/src/storage/MemoryBundleStorage.cpp
++++ b/src/storage/MemoryBundleStorage.cpp
+@@ -217,7 +217,7 @@ namespace dtn
+ 			ibrcommon::MutexLock l(_bundleslock);
+ 
+ 			// search for the bundle in the bundle list
+-			const bundle_list::const_iterator iter = find(_bundles.begin(), _bundles.end(), id);
++			const bundle_list::iterator iter = find(_bundles.begin(), _bundles.end(), id);
+ 
+ 			// if no bundle was found throw an exception
+ 			if (iter == _bundles.end()) throw NoBundleFoundException();
+--- a/src/storage/MetaStorage.cpp
++++ b/src/storage/MetaStorage.cpp
+@@ -66,7 +66,7 @@ namespace dtn
+ 		{
+ 			std::set<dtn::data::EID> ret;
+ 
+-			for (dtn::data::BundleList::const_iterator iter = begin(); iter != end(); ++iter)
++			for (const_iterator iter = begin(); iter != end(); ++iter)
+ 			{
+ 				const dtn::data::MetaBundle &bundle = (*iter);
+ 
diff --git a/net/ibrdtnd/patches/020-uClibc-ng.patch b/net/ibrdtnd/patches/020-uClibc-ng.patch
new file mode 100644
index 000000000..abe2209ae
--- /dev/null
+++ b/net/ibrdtnd/patches/020-uClibc-ng.patch
@@ -0,0 +1,20 @@
+--- a/src/security/SecurityCertificateManager.cpp
++++ b/src/security/SecurityCertificateManager.cpp
+@@ -23,6 +23,7 @@
+ #include "Configuration.h"
+ 
+ #include <cstdlib>
++#include <cstring>
+ 
+ #include <ibrcommon/Logger.h>
+ #include <ibrcommon/ssl/TLSStream.h>
+--- a/src/security/SecurityManager.cpp
++++ b/src/security/SecurityManager.cpp
+@@ -28,6 +28,7 @@
+ #include <ibrdtn/security/PayloadConfidentialBlock.h>
+ #include <ibrdtn/security/ExtensionSecurityBlock.h>
+ #include <ibrcommon/Logger.h>
++#include <cstring>
+ 
+ #ifdef __DEVELOPMENT_ASSERTIONS__
+ #include <cassert>
-- 
cgit v1.2.3