diff options
Diffstat (limited to 'package/miredo')
| -rw-r--r-- | package/miredo/Makefile | 9 | ||||
| -rw-r--r-- | package/miredo/patches/patch-admin_ltmain_sh | 11 | ||||
| -rw-r--r-- | package/miredo/patches/patch-configure_ac | 25 |
3 files changed, 31 insertions, 14 deletions
diff --git a/package/miredo/Makefile b/package/miredo/Makefile index 66fdcdee6..87aecf3e4 100644 --- a/package/miredo/Makefile +++ b/package/miredo/Makefile @@ -4,26 +4,29 @@ include ${TOPDIR}/rules.mk PKG_NAME:= miredo -PKG_VERSION:= 1.2.3 +PKG_VERSION:= 1.2.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= 6ba484ad5e331514a8a3452da2b144e7 +PKG_MD5SUM:= 5bcdbaced54f40b6cb1e9c9a8dbac411 PKG_DESCR:= A Teredo client and relay daemon PKG_SECTION:= ipv6 +PKG_BUILDDEP:= autotool PKG_URL:= http://www.remlab.net/ PKG_SITES:= http://www.remlab.net/files/miredo/ PKG_SUBPKGS:= MIREDO MIREDO_SERVER -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MIREDO,miredo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,MIREDO_SERVER,miredo-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf TARGET_CFLAGS+= -std=gnu99 CONFIGURE_ENV+= ac_cv_file__proc_self_maps=yes CONFIGURE_ARGS+= --without-Judy \ + --without-libcap \ --enable-teredo-client \ --enable-miredo-user=root diff --git a/package/miredo/patches/patch-admin_ltmain_sh b/package/miredo/patches/patch-admin_ltmain_sh deleted file mode 100644 index af6e9f095..000000000 --- a/package/miredo/patches/patch-admin_ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- miredo-1.2.3.orig/admin/ltmain.sh 2009-12-10 00:55:19.000000000 +0100 -+++ miredo-1.2.3/admin/ltmain.sh 2011-01-16 00:19:27.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/miredo/patches/patch-configure_ac b/package/miredo/patches/patch-configure_ac new file mode 100644 index 000000000..f2e24d7b4 --- /dev/null +++ b/package/miredo/patches/patch-configure_ac @@ -0,0 +1,25 @@ +--- miredo-1.2.6.orig/configure.ac 2013-05-23 17:51:41.000000000 +0200 ++++ miredo-1.2.6/configure.ac 2013-11-08 16:09:54.000000000 +0100 +@@ -149,12 +149,17 @@ LIBS="$LIBS_save" + AS_MESSAGE([checking optional features...]) + + # POSIX capabilities ++AC_ARG_WITH(libcap, ++ [AS_HELP_STRING(--with-libcap, ++ [use POSIX capabilities (default auto)])]) + LIBCAP="" +-AC_CHECK_HEADERS([sys/capability.h], [ +- AC_CHECK_LIB(cap, cap_set_proc, [ +- LIBCAP="-lcap" +- AC_DEFINE(HAVE_LIBCAP, 1, +- [Define to 1 if you have the `cap' library (-lcap).]) ++AS_IF([test "x${with_libcap}" != "xno"], [ ++ AC_CHECK_HEADERS([sys/capability.h], [ ++ AC_CHECK_LIB(cap, cap_set_proc, [ ++ LIBCAP="-lcap" ++ AC_DEFINE(HAVE_LIBCAP, 1, ++ [Define to 1 if you have the `cap' library (-lcap).]) ++ ]) + ]) + ]) + AC_SUBST(LIBCAP) |