ibrdtnd: Updated to 1.0.0

Signed-off-by: Johannes Morgenroth <[email protected]>

diff --git a/net/ibrdtnd/Makefile b/net/ibrdtnd/Makefile
index c6281a7b6661313c0414bfca72eb3c6602022145..7b72ac98177e722959f735ec073522a92d0384cf 100644 (file)
--- a/net/ibrdtnd/Makefile
+++ b/net/ibrdtnd/Makefile
@@ -8,17 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ibrdtnd
-PKG_VERSION:=0.12.1
+PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases
-PKG_MD5SUM:=8dad5ebbcfaa4c16ba151c9c289066c3
-PKG_MAINTAINER:=Johannes Morgenroth <[email protected].de>
+PKG_MD5SUM:=7fd48b2eec5058fa15f6977afd4e8dab
+PKG_MAINTAINER:=Johannes Morgenroth <jm@m-network.de>
 PKG_LICENSE:=Apache-2.0
 
 PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,7 +25,7 @@ define Package/ibrdtnd
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=+dtndht +ibrdtn +libsqlite3
-  TITLE:=DTN Deamon
+  TITLE:=DTN Daemon
 endef
 
 define Package/ibrdtnd/conffiles
@@ -40,6 +39,7 @@ endef
 CONFIGURE_ARGS += \
        --with-tls \
        --with-sqlite \
+       --with-dht \
        --without-wifip2p \
        --without-vmime \
        --disable-libdaemon

diff --git a/net/ibrdtnd/files/build-config.sh b/net/ibrdtnd/files/build-config.sh
index 82f161cc509d7539b12a68528e47b5b022ff914e..c9a6128cd1eba50ecbc041cacb44a3702e102797 100644 (file)
--- a/net/ibrdtnd/files/build-config.sh
+++ b/net/ibrdtnd/files/build-config.sh
@@ -116,6 +116,7 @@ add_param $CONFFILE "ibrdtn.dht.allow_neighbour_announcement" "dht_allow_neighbo
 # iterate through all network interfaces
 iter=0
 netinterfaces=
+netinternet=
 while [ 1 == 1 ]; do
        $UCI -q get "ibrdtn.@network[$iter]" > /dev/null
        if [ $? == 0 ]; then
@@ -123,6 +124,9 @@ while [ 1 == 1 ]; do
                add_param $CONFFILE "ibrdtn.@network[$iter].type" "net_lan${iter}_type"
                add_param $CONFFILE "ibrdtn.@network[$iter].interface" "net_lan${iter}_interface"
                add_param $CONFFILE "ibrdtn.@network[$iter].port" "net_lan${iter}_port"
+               if [ "$(uci -q get ibrdtn.@network[$iter].global)" == "yes" ]; then
+                       netinternet="${netinternet} $(uci -q get ibrdtn.@network[$iter].interface)"
+               fi
        else
                break
        fi
@@ -132,6 +136,7 @@ done
 
 # write list of network interfaces
 echo "net_interfaces =$netinterfaces" >> $CONFFILE
+echo "net_internet =${netinternet}" >> $CONFFILE
 
 # iterate through all static routes
 iter=0

diff --git a/net/ibrdtnd/files/ibrdtn.uci b/net/ibrdtnd/files/ibrdtn.uci
index ab4504487c7256536981165ef02a94c07f065712..e0256818031d3ff5d86b852f13dd7ba98df6069c 100644 (file)
--- a/net/ibrdtnd/files/ibrdtn.uci
+++ b/net/ibrdtnd/files/ibrdtn.uci
@@ -109,6 +109,7 @@ config 'network'
        option type                     tcp
        option interface        eth0
        option port                     4556
+       option global           yes
        
 #config 'network'
 #      option type                     tcp

diff --git a/net/ibrdtnd/patches/100-add_configure_options.patch b/net/ibrdtnd/patches/100-add_configure_options.patch
deleted file mode 100644 (file)
index 360bd69..0000000
--- a/net/ibrdtnd/patches/100-add_configure_options.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -333,30 +333,46 @@ AS_IF([test "x$enable_android" = "xyes"], [
-       dnl optional parameter: Wifi-P2P support
-       dnl -----------------------------------------------
- 
--      PKG_CHECK_MODULES([WIFIP2P], wifip2p >= 0.1 , [
--                              with_wifi_p2p="yes"
--                              AC_SUBST(WIFIP2P_CFLAGS)
--                              AC_SUBST(WIFIP2P_LIBS)
--                              AC_DEFINE(WITH_WIFIP2P, [1], ["wifi-p2p support enabled"])
--                      ], [
--                              with_wifi_p2p="no"
--                              AC_MSG_WARN([wifi-p2p library not found. wifi-p2p support is disabled.])
--                      ])
-+      AC_ARG_WITH([wifip2p],
-+              AS_HELP_STRING([--without-wifip2p], [Build without wifip2p support]),
-+              [
-+                      with_wifi_p2p="no"
-+                      AC_MSG_NOTICE([WIFIP2P support disabled])
-+              ], [
-+                      PKG_CHECK_MODULES([WIFIP2P], wifip2p >= 0.1 , [
-+                                              with_wifi_p2p="yes"
-+                                              AC_SUBST(WIFIP2P_CFLAGS)
-+                                              AC_SUBST(WIFIP2P_LIBS)
-+                                              AC_DEFINE(WITH_WIFIP2P, [1], ["wifi-p2p support enabled"])
-+                                      ], [
-+                                              with_wifi_p2p="no"
-+                                              AC_MSG_WARN([wifi-p2p library not found. wifi-p2p support is disabled.])
-+                                      ])
-+              ]
-+      )
- 
--    dnl -----------------------------------------------
--    dnl optional parameter: VMime support
--    dnl -----------------------------------------------
--
--    PKG_CHECK_MODULES([VMIME], vmime >= 0.9.1 , [
--                with_vmime="yes"
--                AC_SUBST(VMIME_CFLAGS)
--                AC_SUBST(VMIME_LIBS)
--                AC_DEFINE(HAVE_VMIME, [1], ["Email Convergence Layer is available"])
--                AC_CHECK_HEADERS([vmime/utility/smartPtrInt.hpp])
--            ], [
--                with_vmime="no"
--                AC_MSG_WARN([VMime library not found. Email Convergence Layer is disabled.])
--            ])
-+      dnl -----------------------------------------------
-+      dnl optional parameter: VMime support
-+      dnl -----------------------------------------------
-+
-+      AC_ARG_WITH([vmime],
-+              AS_HELP_STRING([--without-vmime], [Build without vmime support]),
-+              [
-+                      with_vmime="no"
-+                      AC_MSG_NOTICE([VMIME support disabled])
-+              ], [
-+                      PKG_CHECK_MODULES([VMIME], vmime >= 0.9.1 , [
-+                                              with_vmime="yes"
-+                                              AC_SUBST(VMIME_CFLAGS)
-+                                              AC_SUBST(VMIME_LIBS)
-+                                              AC_DEFINE(HAVE_VMIME, [1], ["Email Convergence Layer is available"])
-+                                              AC_CHECK_HEADERS([vmime/utility/smartPtrInt.hpp])
-+                                      ], [
-+                                              with_vmime="no"
-+                                              AC_MSG_WARN([VMime library not found. Email Convergence Layer is disabled.])
-+                                      ])
-+              ]
-+      )
- 
-       dnl -----------------------------------------------
-       dnl check for regex capabilities
--- 
-1.9.1
-

diff --git a/net/ibrdtnd/patches/110-add_configure_options_docs.patch b/net/ibrdtnd/patches/110-add_configure_options_docs.patch
deleted file mode 100644 (file)
index 4efdbe2..0000000
--- a/net/ibrdtnd/patches/110-add_configure_options_docs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -138,11 +138,17 @@ AS_IF([test "x$enable_android" = "xyes"], [
-       # Checks for library functions.
-       AC_CHECK_FUNCS([gethostname socket])
- 
--      # Check for presence of pdfLaTeX
--      AC_CHECK_PROG(PDFLATEX, pdflatex, pdflatex)
--      if test -z "$PDFLATEX"; then
--      AC_MSG_WARN([Unable to create PDF version of the documentation.])
--      fi
-+      AC_ARG_ENABLE([docs],
-+              AS_HELP_STRING([--enable-docs], [Build documentation using PDFLaTeX]),
-+      [
-+              # Check for presence of pdfLaTeX
-+              AC_CHECK_PROG(PDFLATEX, pdflatex, pdflatex)
-+              if test -z "$PDFLATEX"; then
-+                      AC_MSG_WARN([Unable to create PDF version of the documentation.])
-+              fi
-+      ], [
-+              PDFLATEX="no"
-+      ])
- 
-       AC_ARG_ENABLE([libdaemon],
-               AS_HELP_STRING([--disable-libdaemon], [Build without libdaemon support]),
---