Merge branch 'master' of git+ssh://openadk.org/git/openadk

9 files changed, 94 insertions, 23 deletions

diff --git a/package/libcap/Makefile b/package/libcap/Makefile
index af8fef397..40ebae489 100644
--- a/package/libcap/Makefile
+++ b/package/libcap/Makefile
@@ -5,10 +5,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libcap
 PKG_VERSION:=		2.22
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		ce64058bdb3f086ddbfca8ce6c919845
 PKG_DESCR:=		capabilities library
 PKG_SECTION:=		libs
+PKG_BUILDDEP:=		pam
 PKG_URL:=		http://www.friedhoff.org/posixfilecaps.html
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_OPTS:=		dev
@@ -19,6 +20,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBCAP,libcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+CPPFLAGS_FOR_BUILD+=	-I$(LINUX_HEADER_DIR)/include
 CONFIG_STYLE:=		manual
 
 libcap-install:
diff --git a/package/libcap/patches/patch-Make_Rules b/package/libcap/patches/patch-Make_Rules
index 95bd663d9..09f31b3b4 100644
--- a/package/libcap/patches/patch-Make_Rules
+++ b/package/libcap/patches/patch-Make_Rules
@@ -1,5 +1,5 @@
 --- libcap-2.22.orig/Make.Rules	2011-07-25 04:18:23.000000000 +0200
-+++ libcap-2.22/Make.Rules	2013-10-28 11:38:54.000000000 +0100
++++ libcap-2.22/Make.Rules	2013-11-08 16:22:41.000000000 +0100
 @@ -12,10 +12,6 @@ FAKEROOT=$(DESTDIR)
  # These choices are motivated by the fact that getcap and setcap are
  # administrative operations that could be needed to recover a system.
@@ -29,7 +29,7 @@
  
  # common defines for libcap
  LIBTITLE=libcap
-@@ -47,8 +43,9 @@ MINOR=22
+@@ -47,12 +43,13 @@ MINOR=22
  KERNEL_HEADERS := $(topdir)/libcap/include
  IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
  
@@ -40,7 +40,13 @@
 +CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
  BUILD_CC := $(CC)
  BUILD_CFLAGS := $(CFLAGS) $(IPATH)
- AR := ar
+-AR := ar
+-RANLIB := ranlib
++AR ?= ar
++RANLIB ?= ranlib
+ DEBUG = -g #-DDEBUG
+ WARNINGS=-Wall -Wwrite-strings \
+         -Wpointer-arith -Wcast-qual -Wcast-align \
 @@ -64,11 +61,11 @@ LDFLAGS := #-g
  SYSTEM_HEADERS = /usr/include
  INCS=$(topdir)/libcap/include/sys/capability.h
diff --git a/package/libcap/patches/patch-libcap_Makefile b/package/libcap/patches/patch-libcap_Makefile
index 034353ad5..f45b642c9 100644
--- a/package/libcap/patches/patch-libcap_Makefile
+++ b/package/libcap/patches/patch-libcap_Makefile
@@ -5,7 +5,7 @@
  
  _makenames: _makenames.c cap_names.list.h
 -	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@
++	$(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@
  
  cap_names.h: _makenames
  	./_makenames > cap_names.h
diff --git a/package/libcap/patches/patch-pam_cap_Makefile b/package/libcap/patches/patch-pam_cap_Makefile
new file mode 100644
index 000000000..5608fece5
--- /dev/null
+++ b/package/libcap/patches/patch-pam_cap_Makefile
@@ -0,0 +1,10 @@
+--- libcap-2.22.orig/pam_cap/Makefile	2010-08-09 02:08:01.000000000 +0200
++++ libcap-2.22/pam_cap/Makefile	2013-11-08 16:29:05.000000000 +0100
+@@ -10,7 +10,6 @@ include ../Make.Rules
+ LDLIBS += -L../libcap -lcap
+ 
+ all: pam_cap.so
+-	$(MAKE) testcompile
+ 
+ install: all
+ 	mkdir -p -m 0755 $(LIBDIR)/security
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)
diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile
index b4c1fd139..d0337d8f5 100644
--- a/package/valgrind/Makefile
+++ b/package/valgrind/Makefile
@@ -13,7 +13,7 @@ PKG_BUILDDEP:=		autotool
 PKG_URL:=		http://valgrind.org/
 PKG_SITES:=		http://valgrind.org/downloads/
 
-PKG_ARCH_DEPENDS:=	ppc ppc64 mips mipsel mips64 mips64el x86 x86_64 arm native
+PKG_ARCH_DEPENDS:=	ppc ppc64 mips mipsel mips64 mips64el x86 x86_64 native
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
diff --git a/package/valgrind/patches/patch-configure_ac b/package/valgrind/patches/patch-configure_ac
index 4683f78fa..844275cca 100644
--- a/package/valgrind/patches/patch-configure_ac
+++ b/package/valgrind/patches/patch-configure_ac
@@ -1,6 +1,42 @@
 --- valgrind-3.9.0.orig/configure.ac	2013-11-01 00:28:16.000000000 +0100
-+++ valgrind-3.9.0/configure.ac	2013-11-03 15:21:25.000000000 +0100
-@@ -792,6 +792,15 @@ AC_EGREP_CPP([BIONIC_LIBC], [
++++ valgrind-3.9.0/configure.ac	2013-11-07 17:26:16.000000000 +0100
+@@ -155,6 +155,7 @@ esac
+ # configure-time, and distinguishes them from the VGA_*/VGO_*/VGP_*
+ # variables used when compiling C files.
+ 
++VGCONF_PLATFORM_ARM_ARCH=
+ AC_CANONICAL_HOST
+ 
+ AC_MSG_CHECKING([for a supported CPU])
+@@ -191,8 +192,18 @@ case "${host_cpu}" in
+         ;;
+ 
+      armv7*)
++	# This means we use a armv7 toolchain - at least Cortex-A8
+ 	AC_MSG_RESULT([ok (${host_cpu})])
+ 	ARCH_MAX="arm"
++	VGCONF_PLATFORM_ARM_ARCH="-march=armv7 -mcpu=cortex-a8"
++	;;
++
++     arm*)
++	# Generic arm toolchain - we will target armv6
++	AC_MSG_RESULT([(${host_cpu}) - no armv7 toolchain specified, will enforce armv6 when compiling])
++	ARCH_MAX="arm"
++	VGCONF_PLATFORM_ARM_ARCH="-march=armv6"
++	AC_DEFINE(ARM_ARCH_V6,1,"Defined for v6 architectures")
+ 	;;
+ 
+      mips)
+@@ -225,6 +236,8 @@ case "${host_cpu}" in
+ 	;;
+ esac
+ 
++AC_SUBST(VGCONF_PLATFORM_ARM_ARCH)
++
+ #----------------------------------------------------------------------------
+ 
+ # Sometimes it's convenient to subvert the bi-arch build system and
+@@ -792,6 +805,15 @@ AC_EGREP_CPP([BIONIC_LIBC], [
  ],
  GLIBC_VERSION="bionic")
  
@@ -16,7 +52,7 @@
  
  AC_MSG_CHECKING([the GLIBC_VERSION version])
  
-@@ -928,10 +937,13 @@ case "${GLIBC_VERSION}" in
+@@ -928,10 +950,13 @@ case "${GLIBC_VERSION}" in
  	AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic])
  	DEFAULT_SUPP="bionic.supp ${DEFAULT_SUPP}"
  	;;