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

mk/pkg-bottom.mk

@@ -17,6 +17,9 @@ pre-configure:
 do-configure:
 post-configure:
 ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE}
+ifneq (,$(filter ,${AUTOTOOL_STYLE}))
+	cd ${WRKSRC}; env ${AUTOTOOL_ENV} $(BASH) bootstrap $(MAKE_TRACE)
+endif
 ifneq (,$(filter autogen,${AUTOTOOL_STYLE}))
 	cd ${WRKSRC}; env ${AUTOTOOL_ENV} $(BASH) autogen.sh $(MAKE_TRACE)
 endif

package/cairo/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cairo
 PKG_VERSION:=		1.12.16
-PKG_RELEASE:=		1
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		a1304edcdc99282f478b995ee5f8f854
 PKG_DESCR:=		cairo graphics library
 PKG_SECTION:=		libs
@@ -33,7 +33,10 @@ endif
 CONFIGURE_ARGS+=	--enable-ft=yes \
 			--enable-fc=yes \
 			--enable-tee=yes \
-			--enable-xlib=yes
+			--enable-xlib=yes \
+			--enable-pdf=yes \
+			--disable-test-surfaces \
+			--disable-full-testing
 
 cairo-install:
 	${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib/cairo

package/cairo/patches/patch-Makefile_in

@@ -0,0 +1,20 @@
+--- cairo-1.12.16.orig/Makefile.in	2013-08-26 19:00:44.000000000 +0200
++++ cairo-1.12.16/Makefile.in	2014-02-10 14:44:58.000000000 +0100
+@@ -80,7 +80,7 @@ EXTRA_PROGRAMS =
+ TESTS =
+ check_PROGRAMS =
+ # libpng is required for our test programs
+-@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = boilerplate test perf
++@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = boilerplate perf
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \
+@@ -439,7 +439,7 @@ MAINTAINERCLEANFILES = Makefile.in $(src
+ #	$(srcdir)/build/Makefile.win32.features-h \
+ #	$(NULL)
+ ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
+-DIST_SUBDIRS = src doc util boilerplate test perf
++DIST_SUBDIRS = src doc util boilerplate perf
+ SUBDIRS = src doc util $(am__append_1)
+ DISTCHECK_CONFIGURE_FLAGS = \
+ 	--enable-gtk-doc \

package/git/Makefile

@@ -10,7 +10,7 @@ PKG_MD5SUM:=		6f63d103465b86ca0ebe4189ea54731c
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		scm
 PKG_BUILDDEP:=		openssl curl expat autotool
-PKG_DEPENDS:=		libopenssl libcurl libexpat libpthread
+PKG_DEPENDS:=		libopenssl libcurl libexpat libpthread libgcc
 PKG_URL:=		http://git-scm.com/
 PKG_SITES:=		http://git-core.googlecode.com/files/
 

package/ipsec-tools/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ipsec-tools
 PKG_VERSION:=		0.8.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		b79aae3055a51f8de5c0f1b8ca6cf619
 PKG_DESCR:=		IPsec management tools
 PKG_SECTION:=		net/security
@@ -14,6 +14,7 @@ PKG_DEPENDS:=		libopenssl
 PKG_URL:=		http://ipsec-tools.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ipsec-tools/}
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 PKG_CFLINE_IPSEC_TOOLS:=depends on !ADK_TOOLCHAIN_ONLY
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 

package/ipsec-tools/patches/patch-ltmain_sh

@@ -1,11 +0,0 @@
---- ipsec-tools-0.8.0.orig/ltmain.sh	2011-03-18 14:27:39.000000000 +0100
-+++ ipsec-tools-0.8.0/ltmain.sh	2011-03-31 13:16:42.511821748 +0200
-@@ -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"

package/ipvsadm/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		ipvsadm
 PKG_VERSION:=		1.26
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		eac3ba3f62cd4dea2da353aeddd353a8
 PKG_DESCR:=		IPVS admin utility
 PKG_SECTION:=		net

package/ipvsadm/patches/patch-libipvs_ip_vs_h

@@ -0,0 +1,10 @@
+--- ipvsadm-1.26.orig/libipvs/ip_vs.h	2011-02-07 03:38:57.000000000 +0100
++++ ipvsadm-1.26/libipvs/ip_vs.h	2014-02-11 12:45:07.000000000 +0100
+@@ -10,6 +10,7 @@
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <linux/types.h>	/* For __beXX types in userland */
++#include <sys/types.h>
+ 
+ #ifdef LIBIPVS_USE_NL
+ #include <netlink/netlink.h>

package/libgd/Makefile

@@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libgd
 PKG_VERSION:=		2.1.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		03588159bf4faab9079849c8d709acc6
 PKG_DESCR:=		A library for the dynamic creation of images
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libjpeg-turbo libpng
+PKG_DEPENDS:=		libpng libjpeg-turbo
 PKG_BUILDDEP:=		libpng libjpeg-turbo
 PKG_URL:=		http://www.libgd.org/
 PKG_SITES:=		https://bitbucket.org/libgd/gd-libgd/downloads/
@@ -26,6 +26,8 @@ CONFIGURE_ARGS+=	--without-x \
 			--without-freetype \
 			--with-jpeg=${STAGING_TARGET_DIR}/usr \
 			--with-png=${STAGING_TARGET_DIR}/usr \
+			--without-tiff \
+			--without-vpx \
 			--without-xpm
 
 libgd-install:

package/mdadm/Makefile

@@ -17,8 +17,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,MDADM,mdadm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
-
-XAKE_FLAGS+=		CROSS_COMPILE="${TARGET_CROSS}"
+XAKE_FLAGS+=		CROSS_COMPILE="${TARGET_CROSS}" CHECK_RUN_DIR=0
 
 mdadm-install:
 	${INSTALL_DIR} ${IDIR_MDADM}/usr/sbin

package/monit/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		monit
 PKG_VERSION:=		5.6
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		19dfc1ce8512e832134d06eedd96ba50
 PKG_DESCR:=		An utility for system services monitoring
 PKG_SECTION:=		admin
@@ -20,7 +20,8 @@ $(eval $(call PKG_template,MONIT,monit,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
 
 CONFIGURE_ENV+=		libmonit_cv_setjmp_available=yes \
 			libmonit_cv_vsnprintf_c99_conformant=yes
-CONFIGURE_ARGS+=	--with-ssl --with-ssl-dir="${STAGING_TARGET_DIR}/usr"
+CONFIGURE_ARGS+=	--with-ssl --with-ssl-dir="${STAGING_TARGET_DIR}/usr" \
+			--without-pam
 
 monit-install:
 	${INSTALL_DIR} ${IDIR_MONIT}/etc

package/openjdk7/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		openjdk7
-PKG_VERSION:=		2.3.12
+PKG_VERSION:=		2.4.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9b3afa162021e3fca6161ba8f9f7dc11
+PKG_MD5SUM:=		6dcc544657ade213d01017354a6f9858
 PKG_DESCR:=		OpenJDK 7 Java VM
 PKG_SECTION:=		lang
 PKG_BUILDDEP:=		gettext-tiny-host glib-host flex-host bison-host qemu-host
@@ -74,6 +74,7 @@ CONFIGURE_COMMON:=	--disable-docs \
 			--disable-system-gif \
 			--disable-system-gtk \
 			--disable-system-gio \
+			--disable-system-kerberos \
 			--disable-system-fontconfig \
 			--disable-compile-against-syscalls \
 			--without-rhino
@@ -126,6 +127,7 @@ HOST_CONFIGURE_ARGS+=\
                 --disable-system-gif \
                 --disable-system-gtk \
                 --disable-system-gio \
+                --disable-system-kerberos \
                 --disable-system-fontconfig \
                 --disable-compile-against-syscalls \
 		--without-rhino \

package/pam/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.1.8
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		5107bbf54042400b6200e8367cc7feef
 PKG_DESCR:=		Pluggable Authentication Modules
-PKG_BUILDDEP:=		flex
+PKG_BUILDDEP:=		flex-host flex
 PKG_SECTION:=		misc
 PKG_URL:=		http://www.linux-pam.org/
 PKG_SITES:=		http://www.linux-pam.org/library/
@@ -21,8 +21,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,PAM,pam,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-#XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 CONFIGURE_ARGS+=	--disable-nis \
+			--disable-regenerate-docu \
 			--enable-db=no
 
 post-install:

package/pam/patches/patch-Makefile_in

@@ -0,0 +1,11 @@
+--- Linux-PAM-1.1.8.orig/Makefile.in	2013-09-19 10:01:36.000000000 +0200
++++ Linux-PAM-1.1.8/Makefile.in	2014-02-10 15:26:20.000000000 +0100
+@@ -288,7 +288,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news
+-SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests
++SUBDIRS = libpam tests libpamc libpam_misc modules po conf examples xtests
+ CLEANFILES = *~
+ EXTRA_DIST = pgp.keys.asc CHANGELOG ChangeLog-CVS Copyright Make.xml.rules
+ ACLOCAL_AMFLAGS = -I m4

package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c

@@ -1,6 +1,6 @@
 --- Linux-PAM-1.1.8.orig/modules/pam_succeed_if/pam_succeed_if.c	2013-06-18 16:11:21.000000000 +0200
-+++ Linux-PAM-1.1.8/modules/pam_succeed_if/pam_succeed_if.c	2013-12-21 18:30:19.000000000 +0100
-@@ -233,16 +233,20 @@ evaluate_notingroup(pam_handle_t *pamh,
++++ Linux-PAM-1.1.8/modules/pam_succeed_if/pam_succeed_if.c	2014-02-10 11:36:17.000000000 +0100
+@@ -233,16 +233,20 @@ evaluate_notingroup(pam_handle_t *pamh, 
  static int
  evaluate_innetgr(const char *host, const char *user, const char *group)
  {

package/pam/patches/patch-modules_pam_time_pam_time_c

@@ -1,6 +1,6 @@
 --- Linux-PAM-1.1.8.orig/modules/pam_time/pam_time.c	2013-06-18 16:11:21.000000000 +0200
-+++ Linux-PAM-1.1.8/modules/pam_time/pam_time.c	2013-12-21 18:30:19.000000000 +0100
-@@ -554,9 +554,11 @@ check_account(pam_handle_t *pamh, const
++++ Linux-PAM-1.1.8/modules/pam_time/pam_time.c	2014-02-10 11:36:17.000000000 +0100
+@@ -554,9 +554,11 @@ check_account(pam_handle_t *pamh, const 
  	       continue;
  	  }
  	  /* If buffer starts with @, we are using netgroups */

package/poppler/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		poppler
-PKG_VERSION:=		0.24.4
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		2da22b966cf7a2f8da5bf021e68188ce
+PKG_VERSION:=		0.24.5
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		334f2ac95cc8039f2a57fe63e4a81c69
 PKG_DESCR:=		pdf rendering library
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		fontconfig libstdcxx libpng cairo

package/vsftpd/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		vsftpd
 PKG_VERSION:=		3.0.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		8b00c749719089401315bd3c44dddbb2
 PKG_DESCR:=		a fast and secure FTP server
 PKG_SECTION:=		www

package/vsftpd/patches/patch-Makefile

@@ -1,5 +1,5 @@
 --- vsftpd-3.0.2.orig/Makefile	2012-09-16 09:27:35.000000000 +0200
-+++ vsftpd-3.0.2/Makefile	2013-11-09 11:38:47.000000000 +0100
++++ vsftpd-3.0.2/Makefile	2014-02-11 12:59:30.000000000 +0100
 @@ -1,16 +1,16 @@
  # Makefile for systems with GNU tools
 -CC 	=	gcc
@@ -21,7 +21,7 @@
  
  OBJS	=	main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
  		tunables.o ftpdataio.o secbuf.o ls.o \
-@@ -29,21 +29,8 @@ vsftpd: $(OBJS) 
+@@ -29,21 +29,8 @@ vsftpd: $(OBJS)
  	$(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS)
  
  install:

package/vsftpd/patches/patch-sysdeputil_c

@@ -0,0 +1,13 @@
+--- vsftpd-3.0.2.orig/sysdeputil.c	2012-09-16 06:18:04.000000000 +0200
++++ vsftpd-3.0.2/sysdeputil.c	2014-02-11 14:21:18.000000000 +0100
+@@ -81,6 +81,10 @@
+   #include <linux/unistd.h>
+   #include <errno.h>
+   #include <syscall.h>
++/* for musl */
++#if !defined(__GLIBC__)
++#define WTMPX_FILE "/dev/null"
++#endif
+ #endif
+ 
+ #if defined(__linux__) && !defined(__ia64__) && !defined(__s390__)