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

mk/vars.mk

@@ -218,7 +218,7 @@ QUIET:=
 else
 QUIET:=			--quiet
 endif
-FETCH_CMD?=		wget --timeout=$(ADK_WGET_TIMEOUT) -t 3 $(QUIET)
+FETCH_CMD?=		wget --timeout=$(ADK_WGET_TIMEOUT) -t 3 --no-check-certificate $(QUIET)
 
 ifeq ($(ADK_HOST_CYGWIN),y)
 EXEEXT:=		.exe

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/eglibc/files/libc.so.sparc

@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf32-sparc)
+GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux.so.2 ) )

package/hdparm/patches/patch-Makefile

@@ -0,0 +1,15 @@
+--- hdparm-9.43.orig/Makefile	2012-03-08 21:14:40.000000000 +0100
++++ hdparm-9.43/Makefile	2014-02-07 20:38:09.000000000 +0100
+@@ -48,9 +48,9 @@ install: all hdparm.8
+ 	if [ -f $(DESTDIR)$(sbindir)/hdparm ]; then rm -f $(DESTDIR)$(sbindir)/hdparm ; fi
+ 	if [ -f $(DESTDIR)$(mandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(mandir)/man8/hdparm.8 ;\
+ 	elif [ -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi
+-	$(INSTALL_PROGRAM) -D hdparm $(DESTDIR)$(sbindir)/hdparm
+-	if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\
+-	elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi
++	$(INSTALL_PROGRAM) hdparm $(DESTDIR)$(sbindir)/hdparm
++	if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\
++	elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi
+ 
+ clean:
+ 	-rm -f hdparm $(OBJS) core 2>/dev/null

package/iproute2/patches/patch-netem_normal_c

@@ -1,10 +1,13 @@
---- iproute2-2.6.29-1.orig/netem/normal.c	2009-03-24 23:40:54.000000000 +0100
-+++ iproute2-2.6.29-1/netem/normal.c	2009-12-11 16:35:38.000000000 +0100
-@@ -8,7 +8,6 @@
+--- iproute2-3.12.0.orig/netem/normal.c	2013-11-23 02:10:33.000000000 +0100
++++ iproute2-3.12.0/netem/normal.c	2014-02-09 11:40:30.000000000 +0100
+@@ -8,9 +8,7 @@
  #include <string.h>
  #include <limits.h>
  
 -#include <linux/types.h>
- #include <linux/pkt_sched.h>
- 
+-#include <linux/pkt_sched.h>
+-
++#define NETEM_DIST_SCALE	8192
  #define TABLESIZE 16384
+ #define TABLEFACTOR NETEM_DIST_SCALE
+ 

package/iproute2/patches/patch-netem_pareto_c

@@ -0,0 +1,14 @@
+--- iproute2-3.12.0.orig/netem/pareto.c	2013-11-23 02:10:33.000000000 +0100
++++ iproute2-3.12.0/netem/pareto.c	2014-02-09 11:46:07.000000000 +0100
+@@ -7,10 +7,8 @@
+ #include <math.h>
+ #include <limits.h>
+ 
+-#include <linux/types.h>
+-#include <linux/pkt_sched.h>
+-
+ static const double a=3.0;
++#define NETEM_DIST_SCALE        8192
+ #define TABLESIZE	16384
+ #define TABLEFACTOR	NETEM_DIST_SCALE
+ 

package/iproute2/patches/patch-netem_paretonormal_c

@@ -1,6 +1,6 @@
---- iproute2-2.6.29-1.orig/netem/paretonormal.c	2009-03-24 23:40:54.000000000 +0100
-+++ iproute2-2.6.29-1/netem/paretonormal.c	2009-12-11 16:59:02.000000000 +0100
-@@ -11,11 +11,9 @@
+--- iproute2-3.12.0.orig/netem/paretonormal.c	2013-11-23 02:10:33.000000000 +0100
++++ iproute2-3.12.0/netem/paretonormal.c	2014-02-09 12:22:09.000000000 +0100
+@@ -11,15 +11,11 @@
   */
  #include <stdio.h>
  #include <stdlib.h>
@@ -9,6 +9,11 @@
  #include <math.h>
  #include <limits.h>
 -#include <malloc.h>
+-
+-#include <linux/types.h>
+-#include <linux/pkt_sched.h>
+ 
++#define NETEM_DIST_SCALE	8192
+ #define TABLESIZE	16384
+ #define TABLEFACTOR	NETEM_DIST_SCALE
  
- #include <linux/types.h>
- #include <linux/pkt_sched.h>

package/iproute2/patches/patch-tc_tc_core_h

@@ -0,0 +1,11 @@
+--- iproute2-3.12.0.orig/tc/tc_core.h	2013-11-23 02:10:33.000000000 +0100
++++ iproute2-3.12.0/tc/tc_core.h	2014-02-08 20:19:59.000000000 +0100
+@@ -1,7 +1,7 @@
+ #ifndef _TC_CORE_H_
+ #define _TC_CORE_H_ 1
+ 
+-#include <asm/types.h>
++#include <sys/types.h>
+ #include <linux/pkt_sched.h>
+ 
+ #define TIME_UNITS_PER_SEC	1000000

package/kexec-tools/Makefile

@@ -4,15 +4,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		kexec-tools
-PKG_VERSION:=		2.0.3
+PKG_VERSION:=		2.0.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		1b362abd2e8669171a5ba50a9cc26183
+PKG_MD5SUM:=		da5887e30eec16895e9d98ef072dc257
 PKG_DESCR:=		kexec tools
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		zlib
 PKG_BUILDEP:=		zlib
 PKG_URL:=		http://kernel.org/pub/linux/utils/kernel/kexec/
-PKG_SITES:=		http://kernel.org/pub/linux/utils/kernel/kexec/
+PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_ARCH_DEPENDS:=	!mips !m68k
 PKG_CFLINE_KEXEC_TOOLS:=	select ADK_KERNEL_KEXEC

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/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

target/packages/pkg-available/development

@@ -33,6 +33,7 @@ config ADK_PKG_DEVELOPMENT
 	select ADK_PACKAGE_ZLIB
 	select ADK_PACKAGE_ZLIB_DEV
 	select ADK_PACKAGE_XZ
+	select ADK_PACKAGE_WGET
 	# optional
 	select ADK_PACKAGE_STRACE
 	select ADK_PACKAGE_GDB