Merge pull request #9035 from neheb/ibr

ibr*: Switch to uClibc++
This commit is contained in:
Rosen Penev
2019-06-15 15:00:44 -07:00
committed by GitHub
9 changed files with 170 additions and 5 deletions
+2 -1
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ibrdtn-tools
PKG_VERSION:=1.0.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases
@@ -19,6 +19,7 @@ PKG_LICENSE:=Apache-2.0
PKG_INSTALL:=1
include $(INCLUDE_DIR)/uclibc++.mk
include $(INCLUDE_DIR)/package.mk
define Package/ibrdtn-tools
+2 -1
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ibrdtnd
PKG_VERSION:=1.0.1
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases
@@ -20,6 +20,7 @@ PKG_LICENSE:=Apache-2.0
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
include $(INCLUDE_DIR)/uclibc++.mk
include $(INCLUDE_DIR)/package.mk
define Package/ibrdtnd
@@ -0,0 +1,20 @@
--- a/src/security/SecurityKeyManager.cpp
+++ b/src/security/SecurityKeyManager.cpp
@@ -29,6 +29,7 @@
#include <fstream>
#include <fcntl.h>
+#include <openssl/bn.h>
#include <openssl/pem.h>
#include <openssl/rsa.h>
#include <openssl/err.h>
--- a/src/security/exchange/DHProtocol.cpp
+++ b/src/security/exchange/DHProtocol.cpp
@@ -28,6 +28,7 @@
#include <ibrcommon/ssl/HMacStream.h>
#include <ibrcommon/Logger.h>
+#include <openssl/dh.h>
#include <openssl/rand.h>
#include <openssl/pem.h>
#include "openssl_compat.h"