From df34963277a78fbdb62c684cc012a31df26b5ac9 Mon Sep 17 00:00:00 2001 From: Johannes Morgenroth Date: Sat, 10 Jan 2015 15:27:06 +0100 Subject: [PATCH] ibrdtn-tools: Updated to 1.0.0 Signed-off-by: Johannes Morgenroth --- net/ibrdtn-tools/Makefile | 7 +- .../patches/100-add_configure_options.patch | 89 ------------------- 2 files changed, 3 insertions(+), 93 deletions(-) delete mode 100644 net/ibrdtn-tools/patches/100-add_configure_options.patch diff --git a/net/ibrdtn-tools/Makefile b/net/ibrdtn-tools/Makefile index f7dd3a804..5a1f58f96 100644 --- a/net/ibrdtn-tools/Makefile +++ b/net/ibrdtn-tools/Makefile @@ -8,17 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ibrdtn-tools -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:=0ce0c6e754263919ad48661967c2f6fd -PKG_MAINTAINER:=Johannes Morgenroth +PKG_MD5SUM:=ec522079278bcdf4181e6a1d86f8d72f +PKG_MAINTAINER:=Johannes Morgenroth PKG_LICENSE:=Apache-2.0 PKG_INSTALL:=1 -PKG_FIXUP:=autoreconf include $(INCLUDE_DIR)/package.mk diff --git a/net/ibrdtn-tools/patches/100-add_configure_options.patch b/net/ibrdtn-tools/patches/100-add_configure_options.patch deleted file mode 100644 index b918f3d8a..000000000 --- a/net/ibrdtn-tools/patches/100-add_configure_options.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -67,34 +67,57 @@ AC_TYPE_UINT8_T - AC_FUNC_MALLOC - AC_CHECK_FUNCS([memset]) - --PKG_CHECK_MODULES(DAEMON, libdaemon >= 0.12, [ -- AC_SUBST(DAEMON_CFLAGS) -- AC_SUBST(DAEMON_LIBS) -- AC_DEFINE(HAVE_LIBDAEMON, [1], ["daemon library is available"]) -- AC_CHECK_LIB(daemon, daemon_reset_sigs, [ -- AC_DEFINE(HAVE_DAEMON_RESET_SIGS, [1], ["daemon library has daemon_reset_sigs() and daemon_unblock_sigs() functions"]) -- ]) --], [ -- AC_MSG_WARN([daemon library not found, daemonize features disabled]) --]) -+AC_ARG_WITH([libdaemon], -+ AS_HELP_STRING([--without-libdaemon], [Build without daemonize support]), -+ [ -+ AC_MSG_NOTICE([daemonize support disabled]) -+ ], [ -+ PKG_CHECK_MODULES(DAEMON, libdaemon >= 0.12, [ -+ AC_SUBST(DAEMON_CFLAGS) -+ AC_SUBST(DAEMON_LIBS) -+ AC_DEFINE(HAVE_LIBDAEMON, [1], ["daemon library is available"]) -+ AC_CHECK_LIB(daemon, daemon_reset_sigs, [ -+ AC_DEFINE(HAVE_DAEMON_RESET_SIGS, [1], ["daemon library has daemon_reset_sigs() and daemon_unblock_sigs() functions"]) -+ ]) -+ ], [ -+ AC_MSG_WARN([daemon library not found, daemonize features disabled]) -+ ]) -+ ] -+) - --PKG_CHECK_MODULES(ARCHIVE, libarchive >= 3.0, [ -- AC_SUBST(ARCHIVE_CFLAGS) -- AC_SUBST(ARCHIVE_LIBS) -- AC_DEFINE(HAVE_LIBARCHIVE, [1], ["libarchive is available"]) -- has_libarchive="yes" --], [ -- AC_MSG_WARN([libarchive not found, dtninbox and dtnoutbox will not be compiled]) --]) -+AC_ARG_WITH([libarchive], -+ AS_HELP_STRING([--without-libarchive], [Build without archive support]), -+ [ -+ has_libarchive="no" -+ AC_MSG_NOTICE([archive support disabled, dtninbox and dtnoutbox will not be compiled]) -+ ], [ -+ PKG_CHECK_MODULES(ARCHIVE, libarchive >= 3.0, [ -+ AC_SUBST(ARCHIVE_CFLAGS) -+ AC_SUBST(ARCHIVE_LIBS) -+ AC_DEFINE(HAVE_LIBARCHIVE, [1], ["libarchive is available"]) -+ has_libarchive="yes" -+ ], [ -+ AC_MSG_WARN([libarchive not found, dtninbox and dtnoutbox will not be compiled]) -+ ]) -+ ] -+) - --PKG_CHECK_MODULES(OPENSSL, openssl, [ -- AC_SUBST(OPENSSL_CFLAGS) -- AC_SUBST(OPENSSL_LIBS) -- AC_DEFINE(HAVE_OPENSSL, [1], ["openssl available"]) -- has_openssl="yes" --], [ -- AC_MSG_WARN([openssl not found, dtninbox and dtnoutbox will not be compiled]) --]) -+AC_ARG_WITH([openssl], -+ AS_HELP_STRING([--without-openssl], [Build without openssl support]), -+ [ -+ has_openssl="no" -+ AC_MSG_NOTICE([openssl support disabled, dtninbox and dtnoutbox will not be compiled]) -+ ], [ -+ PKG_CHECK_MODULES(OPENSSL, openssl, [ -+ AC_SUBST(OPENSSL_CFLAGS) -+ AC_SUBST(OPENSSL_LIBS) -+ AC_DEFINE(HAVE_OPENSSL, [1], ["openssl available"]) -+ has_openssl="yes" -+ ], [ -+ AC_MSG_WARN([openssl not found, dtninbox and dtnoutbox will not be compiled]) -+ ]) -+ ] -+) - - AC_ARG_WITH([tffs], - AS_HELP_STRING([--with-tffs=PATH], [set the tffs path for fat-image support in dtnoutbox]), [ --- -1.9.1 -