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

mk/build.mk

@@ -47,6 +47,7 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_VIRTINST=n \
 			ADK_PACKAGE_URLGRABBER=n \
 			ADK_PACKAGE_PERL=n \
+			ADK_PACKAGE_LIBSSP=n \
 			ADK_PKG_DESKTOP=n \
 			ADK_PKG_LAPTOP=n \
 			ADK_PKG_MPDBOX=n \

mk/modules.mk

@@ -740,7 +740,6 @@ $(eval $(call KMOD_template,BLK_DEV_NBD,blk-dev-nbd,\
 ,20))
 
 $(eval $(call KMOD_template,SCSI,scsi,\
-    $(MODULES_DIR)/kernel/drivers/scsi/scsi_wait_scan \
     $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod \
 ,20))
 

package/binutils/Makefile

@@ -13,6 +13,7 @@ PKGSD_LIBBFD:=		Binary File Descriptor library
 PKGSC_LIBBFD:=		libs
 
 PKG_HOST_DEPENDS:=      !cygwin
+PKG_ARCH_DEPENDS:=	!avr32
 
 include ${TOPDIR}/mk/package.mk
 

package/corosync/Makefile

@@ -15,6 +15,7 @@ PKG_URL:=		http://www.corosync.org/
 PKG_SITES:=		http://corosync.org/download/
 
 PKG_CFLINE_COROSYNC:=	select ADK_KERNEL_IP_MULTICAST
+PKG_LIBC_DEPENDS:=	eglibc glibc musl
 
 include $(TOPDIR)/mk/package.mk
 

package/dansguardian/Makefile

@@ -20,7 +20,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DANSGUARDIAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+ifeq ($(ADK_LINUX_AVR32),y)
+LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc
+else
 LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc -lgcc_s
+endif
+
 ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
 LIBRARIES+=-lssp
 endif

package/e2fsprogs/Makefile

@@ -58,7 +58,8 @@ $(eval $(call PKG_template,MKE2FS,mke2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_M
 $(eval $(call PKG_template,E2FSCK,e2fsck,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_E2FSCK),${PKGSD_E2FSCK},${PKGSC_E2FSCK}))
 
 CONFIGURE_ARGS+=	--enable-elf-shlibs --disable-rpath \
-			--disable-libuuid --disable-libblkid 
+			--disable-libuuid --disable-libblkid \
+			--disable-defrag
 INSTALL_TARGET+=	install-libs
 TARGET_LDFLAGS+=	-lpthread
 TARGET_CFLAGS+=		$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include

package/iproute2/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		iproute2
 PKG_VERSION:=		3.10.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		45fb5427fc723a0001c72b92c931ba02
 PKG_DESCR:=		iproute2 routing control utility
 PKG_SECTION:=		route

package/iproute2/patches/patch-Makefile

@@ -0,0 +1,11 @@
+--- iproute2-3.10.0.orig/Makefile	2013-07-16 19:06:36.000000000 +0200
++++ iproute2-3.10.0/Makefile	2013-10-10 15:30:09.000000000 +0200
+@@ -30,7 +30,7 @@ CC = gcc
+ HOSTCC = gcc
+ DEFINES += -D_GNU_SOURCE
+ CCOPTS = -O2
+-WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes
++WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes
+ WFLAGS += -Wmissing-declarations -Wold-style-definition
+ 
+ CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)

package/krb5/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		krb5
 PKG_VERSION:=		1.11.3
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		56f0ae274b285320b8a597cb89442449
 PKG_DESCR:=		MIT kerberos server
 PKG_SECTION:=		crypto

package/krb5/patches/patch-src_kadmin_ktutil_ktutil_funcs_c

@@ -0,0 +1,11 @@
+--- krb5-1.11.3.orig/src/kadmin/ktutil/ktutil_funcs.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/kadmin/ktutil/ktutil_funcs.c	2013-10-09 09:54:40.000000000 +0200
+@@ -64,7 +64,7 @@ krb5_error_code ktutil_delete(context, l
+     krb5_kt_list *list;
+     int idx;
+ {
+-    krb5_kt_list lp, prev;
++    krb5_kt_list lp, prev = NULL;
+     int i;
+ 
+     for (lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) {

package/krb5/patches/patch-src_lib_kadm5_alt_prof_c

@@ -0,0 +1,11 @@
+--- krb5-1.11.3.orig/src/lib/kadm5/alt_prof.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/lib/kadm5/alt_prof.c	2013-10-09 09:42:35.000000000 +0200
+@@ -164,7 +164,7 @@ krb5_aprof_get_boolean(krb5_pointer acon
+     char **values;
+     char *valp;
+     int idx;
+-    krb5_boolean val;
++    krb5_boolean val = 0;
+ 
+     kret = krb5_aprof_getvals (acontext, hierarchy, &values);
+     if (kret)

package/krb5/patches/patch-src_lib_krb5_krb_preauth2_c

@@ -0,0 +1,11 @@
+--- krb5-1.11.3.orig/src/lib/krb5/krb/preauth2.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/lib/krb5/krb/preauth2.c	2013-10-09 09:30:28.000000000 +0200
+@@ -957,7 +957,7 @@ krb5_do_preauth(krb5_context context, kr
+     size_t i, h;
+     int out_pa_list_size = 0;
+     krb5_pa_data **out_pa_list = NULL;
+-    krb5_error_code ret, module_ret;
++    krb5_error_code ret, module_ret = 0;
+     krb5_responder_fn responder = opte->opt_private->responder;
+     static const int paorder[] = { PA_INFO, PA_REAL };
+ 

package/krb5/patches/patch-src_lib_krb5_unicode_ucstr_c

@@ -0,0 +1,11 @@
+--- krb5-1.11.3.orig/src/lib/krb5/unicode/ucstr.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/lib/krb5/unicode/ucstr.c	2013-10-09 09:34:54.000000000 +0200
+@@ -109,7 +109,7 @@ krb5int_utf8_normalize(
+ 		       krb5_data ** newdataptr,
+ 		       unsigned flags)
+ {
+-    int i, j, len, clen, outpos, ucsoutlen, outsize;
++    int i, j, len, clen, outpos = 0, ucsoutlen, outsize;
+     char *out = NULL, *outtmp, *s;
+     krb5_ucs4 *ucs = NULL, *p, *ucsout = NULL;
+     krb5_data *newdata;

package/libIDL/Makefile

@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		531fbc1b40b80dd1d6f3b5e76b99067c
 PKG_DESCR:=		libraries for Interface Definition Language files
 PKG_SECTION:=		libs
+PKG_DEPENDS:=		glib
+PKG_BUILDDEP:=		glib
 PKG_URL:=		http://www.gnome.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/
 

package/libbluray/Makefile

@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libbluray
+PKG_VERSION:=		0.4.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c7a1cc71cb9747f93122ec650d4ae933
+PKG_DESCR:=		bluray library
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.videolan.org/developers/libbluray.html
+PKG_SITES:=		ftp://ftp.videolan.org/pub/videolan/libbluray/${PKG_VERSION}/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBBLURAY,libbluray,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+libbluray-install:
+	$(INSTALL_DIR) $(IDIR_LIBBLURAY)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libbluray*.so* \
+		$(IDIR_LIBBLURAY)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/libqb/Makefile

@@ -12,6 +12,8 @@ PKG_SECTION:=		libs
 PKG_URL:=		https://github.com/asalkeld/libqb/wiki#wiki-Releases
 PKG_SITES:=		https://fedorahosted.org/releases/q/u/quarterback/
 
+PKG_LIBC_DEPENDS:=	eglibc glibc musl
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBQB,libqb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/libstdcxx/Makefile

@@ -36,10 +36,10 @@ do-install:
 ifeq ($(ADK_NATIVE),y)
 	$(CP) /usr/lib/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/lib
 else
-	(cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.17 libstdc++.so.6)
-	(cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.17 libstdc++.so)
-	(cd ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/; ln -sf libstdc++.so.6.0.17 libstdc++.so)
-	$(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so.6.0.17 ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
+	(cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.1? libstdc++.so.6)
+	(cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.1? libstdc++.so)
+	(cd ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/; ln -sf libstdc++.so.6.0.1? libstdc++.so)
+	$(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so.6.0.1? ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
 	-@rm ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}/libstdc++.so.*-gdb.py
 endif
 

package/libusb/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libusbx
 PKG_VERSION:=		1.0.16
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		7f5715d624cd6c26b30a317eb6c2fe5e
 PKG_DESCR:=		a library for accessing Linux USB devices
 PKG_SECTION:=		libs
@@ -24,8 +24,8 @@ DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBUSB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBUSB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_DEV},${PKGSC_LIBUSB_DEV},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBUSB,libusb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBUSB_DEV,libusb-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUSB_DEV},${PKGSC_LIBUSB_DEV},${PKG_OPTS}))
 
 TARGET_CPPFLAGS=	-DTIMESPEC_TO_TIMEVAL=
 CONFIGURE_ARGS+=	--disable-udev

package/mdadm/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mdadm
-PKG_VERSION:=		3.2.5
+PKG_VERSION:=		3.2.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3f5750c5b1b175f71199e93cd4e5aa2b
+PKG_MD5SUM:=		dd2472f07993496ca4f4e3e8f6746517
 PKG_DESCR:=		tool for managing Linux Software RAID arrays
 PKG_SECTION:=		fs
 PKG_URL:=		http://neil.brown.name/blog/mdadm

package/motion/Makefile

@@ -10,8 +10,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		6b8730c875e0f550c1abdb647027d8e1
 PKG_DESCR:=		Webcam motion sensing and logging
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		libjpeg libpthread
-PKG_BUILDDEP:=		jpeg
+PKG_DEPENDS:=		libjpeg libpthread libsdl
+PKG_BUILDDEP:=		jpeg sdl
 PKG_URL:=		http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=motion/}
 

package/mpd/files/mpd.conf

@@ -2,6 +2,7 @@
 user				"mpd"
 music_directory			"/music"
 playlist_directory		"/etc/mpd/playlists"
+state_file			"/etc/mpd/state"
 db_file				"/etc/mpd/database"
 pid_file			"/var/run/mpd/mpd.pid"
 log_file			"syslog"

package/mpd/patches/patch-src_db_simple_db_plugin_c

@@ -0,0 +1,11 @@
+--- mpd-0.17.5.orig/src/db/simple_db_plugin.c	2013-08-01 09:15:41.000000000 +0200
++++ mpd-0.17.5/src/db/simple_db_plugin.c	2013-10-08 15:28:10.000000000 +0200
+@@ -338,6 +338,8 @@ simple_db_save(struct db *_db, GError **
+ 
+ 	fclose(fp);
+ 
++	g_message("Successfully written database to file: %s", db->path);	
++
+ 	struct stat st;
+ 	if (stat(db->path, &st) == 0)
+ 		db->mtime = st.st_mtime;

package/orbit2/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		ORBit2
 PKG_VERSION:=		2.14.19
 PKG_EXTRAVER:=		2.14
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		87c69c56c6d0bdafa4de5e18ae115cc9
 PKG_DESCR:=		a CORBA 2.4-compliant Object Request Broker
 PKG_SECTION:=		libs
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		libIDL
 PKG_URL:=		http://projects.gnome.org/ORBit2/
 PKG_SITES:=		ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/
 
-PKG_ARCH_DEPENDS:=	!arm !cris
+PKG_ARCH_DEPENDS:=	!cris
 
 PKG_SUBPKGS:=		ORBIT2 ORBIT2_DEV
 PKGSD_ORBIT2_DEV:=	orbit2 headers
@@ -26,7 +26,6 @@ $(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
 $(eval $(call PKG_template,ORBIT2_DEV,orbit2-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ORBIT2_DEV},${PKGSC_ORBIT2_DEV}))
 
 CFLAGS_FOR_BUILD+=	$(shell ${BUILD_LIBIDL_CONFIG} --cflags)
-CFLAGS_FOR_BUILD+=	-I/usr/local/include -I/usr/include
 LDFLAGS_FOR_BUILD+=	$(shell ${BUILD_LIBIDL_CONFIG} --libs)
 LDFLAGS_FOR_BUILD+=	-lgmodule-2.0
 CONFIGURE_ENV+=		ac_cv_alignof_CORBA_octet=1 \

package/orbit2/patches/patch-Makefile_in

@@ -0,0 +1,11 @@
+--- ORBit2-2.14.19.orig/Makefile.in	2010-09-28 11:39:41.000000000 +0200
++++ ORBit2-2.14.19/Makefile.in	2013-10-10 10:22:00.000000000 +0200
+@@ -296,7 +296,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+-SUBDIRS = linc2 src include test docs
++SUBDIRS = linc2 src include docs
+ bin_SCRIPTS = orbit2-config
+ EXTRA_DIST = \
+ 	ORBit2.m4	\

package/postfix/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		postfix
-PKG_VERSION:=		2.8.7
+PKG_VERSION:=		2.10.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b3ff47a38db920fc15bb207f42da53db
+PKG_MD5SUM:=		109e753aecafe487207b425dd46e6ee9
 PKG_DESCR:=		Postfix MTA
 PKG_SECTION:=		mail
 PKG_BUILDDEP:=		tinycdb
@@ -25,7 +25,7 @@ ALL_TARGET:=
 INSTALL_STYLE:=		manual
 
 do-configure:
-	(cd $(WRKBUILD) && make -f Makefile.init makefiles "CCARGS=-DHAS_CDB -I$(STAGING_DIR)/usr/include" "AUXLIBS=$(STAGING_DIR)/usr/lib/libcdb.a")
+	(cd $(WRKBUILD) && make -f Makefile.init makefiles "CCARGS=-DNO_PCRE -DNO_NIS -DNO_DB -DHAS_CDB -I$(STAGING_DIR)/usr/include" "AUXLIBS=$(STAGING_DIR)/usr/lib/libcdb.a")
 
 postfix-install:
 	$(INSTALL_DIR) $(IDIR_POSTFIX)/etc/postfix

package/postfix/patches/patch-makedefs

@@ -1,38 +1,12 @@
---- postfix-2.8.7.orig/makedefs	2011-11-03 00:46:22.000000000 +0100
-+++ postfix-2.8.7/makedefs	2011-12-04 11:53:35.807716569 +0100
-@@ -97,8 +97,8 @@ error() {
- 
- case $# in
-  # Officially supported usage.
-- 0) SYSTEM=`(uname -s) 2>/dev/null`
--    RELEASE=`(uname -r) 2>/dev/null`
-+ 0) SYSTEM=Linux
-+    RELEASE=3.1.4
-     VERSION=`(uname -v) 2>/dev/null`
-     case "$VERSION" in
-      dcosx*) SYSTEM=$VERSION;;
-@@ -343,31 +343,7 @@ EOF
+--- postfix-2.10.2.orig/makedefs	2013-02-04 02:33:13.000000000 +0100
++++ postfix-2.10.2/makedefs	2013-10-10 16:28:03.000000000 +0200
+@@ -366,16 +366,7 @@ EOF
+ 		    SYSLIBS="-ldb"
+ 		    ;;
  		esac
- 		;;
-     Linux.3*)	SYSTYPE=LINUX3
--		if [ -f /usr/include/db.h ]
--		then
--		    : we are all set
--		elif [ -f /usr/include/db/db.h ]
--		then
--		    CCARGS="$CCARGS -I/usr/include/db"
--		else
--		    # On a properly installed system, Postfix builds
--		    # by including <db.h> and by linking with -ldb
--		    echo "No <db.h> include file found." 1>&2
--		    echo "Install the appropriate db*-devel package first." 1>&2
--		    echo "See the RELEASE_NOTES file for more information." 1>&2
--		    exit 1
--		fi
--		SYSLIBS="-ldb"
 -		for name in nsl resolv
 -		do
--		    for lib in /usr/lib64 /lib64 /usr/lib /lib
+-		    for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/*
 -		    do
 -			test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
 -			    SYSLIBS="$SYSLIBS -l$name"

package/postfix/patches/patch-src_util_sys_defs_h

@@ -1,15 +1,13 @@
---- postfix-2.8.7.orig/src/util/sys_defs.h	2011-11-03 00:46:22.000000000 +0100
-+++ postfix-2.8.7/src/util/sys_defs.h	2011-12-04 11:50:06.187711393 +0100
-@@ -721,10 +721,8 @@ extern int initgroups(const char *, int)
- #define INTERNAL_LOCK	MYFLOCK_STYLE_FLOCK
+--- postfix-2.10.2.orig/src/util/sys_defs.h	2012-09-25 01:53:56.000000000 +0200
++++ postfix-2.10.2/src/util/sys_defs.h	2013-10-10 16:30:37.000000000 +0200
+@@ -753,8 +753,8 @@ extern int initgroups(const char *, int)
  #define DEF_MAILBOX_LOCK "fcntl, dotlock"	/* RedHat >= 4.x */
  #define HAS_FSYNC
--#define HAS_DB
+ #define HAS_DB
 -#define DEF_DB_TYPE	"hash"
 -#define ALIAS_DB_MAP	"hash:/etc/aliases"
--#define HAS_NIS
-+#define DEF_DB_TYPE	"cdb"
-+#define ALIAS_DB_MAP	"cdb:/etc/postfix/aliases"
- #define GETTIMEOFDAY(t)	gettimeofday(t,(struct timezone *) 0)
- #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"
- #define FIONREAD_IN_TERMIOS_H
++#define DEF_DB_TYPE    "cdb"
++#define ALIAS_DB_MAP   "cdb:/etc/postfix/aliases"
+ #ifndef NO_NIS
+ #define HAS_NIS
+ #endif

package/taglib/Makefile

@@ -12,7 +12,7 @@ PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
 PKG_BUILDDEP:=		zlib
 PKG_URL:=		http://taglib.github.com/
-PKG_SITES:=		http://taglib.github.io/releases/
+PKG_SITES:=		http://openadk.org/distfiles/
 
 include $(TOPDIR)/mk/package.mk
 

package/tzdata/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		tzdata
 PKG_VERSION:=		2013d
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		65b6818162230fc02f86f293376c73df 4616a9560270f180eeb9a08540636890
 PKG_DESCR:=		Timezone data (/usr/share/zoneinfo)
 PKG_SECTION:=		utils
@@ -39,7 +39,7 @@ ALL_TARGET:=		ALL
 INSTALL_TARGET:=	INSTALL
 
 post-install:
-	$(INSTALL_DIR) $(IDIR_TZDATA)/usr/share
+	$(INSTALL_DIR) $(IDIR_TZDATA)/usr/share $(IDIR_TZDATA)/etc
 	$(CP) $(WRKINST)/usr/share/zoneinfo $(IDIR_TZDATA)/usr/share
 	${INSTALL_DIR} ${IDIR_ZDUMP}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/etc/zdump ${IDIR_ZDUMP}/usr/sbin/
@@ -47,5 +47,16 @@ post-install:
 	${INSTALL_BIN} ${WRKINST}/etc/zic ${IDIR_ZIC}/usr/sbin/
 	${INSTALL_DIR} ${IDIR_DATE}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/bin/date ${IDIR_DATE}/usr/bin/
+	tz=; cd $(IDIR_TZDATA)/usr/share/zoneinfo || exit 1; \
+		for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \
+			test -s "$$f" || continue; \
+			tz=$$f; \
+	done; if test x"$$tz" = x""; then \
+		echo >&2 Error during timezone installation; \
+		exit 1; \
+	else \
+		ln -sf "../usr/share/zoneinfo/$$tz" \
+		$(IDIR_TZDATA)/etc/localtime; \
+	fi	
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/xbmc/Makefile

@@ -16,12 +16,13 @@ PKG_DEPENDS+=		libflac libopenssl libbz2 libtiff liblzo
 PKG_DEPENDS+=		yajl tinyxml libsqlite libpcrecpp libpng
 PKG_DEPENDS+=		libpcre libcdio libfreetype libsamplerate
 PKG_DEPENDS+=		taglib libjasper libmp3lame libmicrohttpd
+PKG_DEPENDS+=		omxplayer libusb-compat libbluray
 PKG_BUILDDEP:=		boost ffmpeg python2 MesaLib libglew libass
 PKG_BUILDDEP+=		libmpeg2 libmad jpeg libogg libvorbis libmodplug
 PKG_BUILDDEP+=		curl flac openssl bzip2 libtiff liblzo yajl
 PKG_BUILDDEP+=		tinyxml sqlite pcre libpng libcdio freetype 
 PKG_BUILDDEP+=		libsamplerate taglib libjasper lame libmicrohttpd
-PKG_BUILDDEP+=		bcm2835-vc libgpg-error dbus
+PKG_BUILDDEP+=		bcm2835-vc libgpg-error dbus libusb-compat libbluray
 PKG_URL:=		http://xbmc.org/
 PKG_SITES:=		http://mirrors.xbmc.org/releases/source/
 
@@ -45,6 +46,8 @@ CONFIGURE_ARGS+=	--disable-optical-drive \
 			--disable-ssh \
 			--disable-samba \
 			--disable-mysql \
+			--enable-libusb \
+			--enable-libbluray \
 			--enable-external-libraries \
 			--enable-player=omxplayer \
 			--enable-gles \

package/xbmc/patches/patch-xbmc_Application_cpp

@@ -0,0 +1,41 @@
+--- xbmc-12.2.orig/xbmc/Application.cpp	2013-05-03 07:57:41.000000000 +0200
++++ xbmc-12.2/xbmc/Application.cpp	2013-10-08 13:55:01.000000000 +0200
+@@ -615,7 +615,7 @@ bool CApplication::Create()
+ 
+   if (!CLog::Init(CSpecialProtocol::TranslatePath(g_settings.m_logFolder).c_str()))
+   {
+-    fprintf(stderr,"Could not init logging classes. Permission errors on ~/.xbmc (%s)\n",
++    fprintf(stderr,"Could not init logging classes. Permission errors on %s\n",
+       CSpecialProtocol::TranslatePath(g_settings.m_logFolder).c_str());
+     return false;
+   }
+@@ -966,10 +966,13 @@ bool CApplication::InitDirectoriesLinux(
+     userName = "root";
+ 
+   CStdString userHome;
++  userHome = "/etc/xbmc";
++/*
+   if (getenv("HOME"))
+     userHome = getenv("HOME");
+   else
+     userHome = "/root";
++*/
+ 
+   CStdString xbmcBinPath, xbmcPath;
+   CUtil::GetHomePath(xbmcBinPath, "XBMC_BIN_HOME");
+@@ -1001,11 +1004,11 @@ bool CApplication::InitDirectoriesLinux(
+     // map our special drives
+     CSpecialProtocol::SetXBMCBinPath(xbmcBinPath);
+     CSpecialProtocol::SetXBMCPath(xbmcPath);
+-    CSpecialProtocol::SetHomePath(userHome + "/.xbmc");
+-    CSpecialProtocol::SetMasterProfilePath(userHome + "/.xbmc/userdata");
++    CSpecialProtocol::SetHomePath(userHome);
++    CSpecialProtocol::SetMasterProfilePath(userHome + "/userdata");
+ 
+-    CStdString strTempPath = userHome;
+-    strTempPath = URIUtils::AddFileToFolder(strTempPath, ".xbmc/temp");
++    CStdString strTempPath = "/tmp";
++    strTempPath = URIUtils::AddFileToFolder(strTempPath, "/.xbmc/temp");
+     if (getenv("XBMC_TEMP"))
+       strTempPath = getenv("XBMC_TEMP");
+     CSpecialProtocol::SetTempPath(strTempPath);

package/xf86-input-evdev/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		xf86-input-evdev
 PKG_VERSION:=		2.7.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		95d35eea1dad1c4828d0027f3be5325c
+PKG_MD5SUM:=		2d3f7111b8284cec81884023c4bb4a11
 PKG_DESCR:=		X11 driver for Event driver
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server kmod-input-evdev

package/xkbcomp/Makefile

@@ -5,10 +5,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xkbcomp
 PKG_VERSION:=		1.0.5
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		10e6661a35aa994a9aa73ded0cf70259
 PKG_DESCR:=		x11 keyboard compiler
 PKG_SECTION:=		x11/libs
+PKG_BUILDDEP:=		libxkbfile libX11
+PKG_DEPENDS:=		libxkbfile libx11
 PKG_SITES:=		http://xorg.freedesktop.org/releases/X11R7.4/src/everything/
 
 include $(TOPDIR)/mk/package.mk

scripts/scan-pkgs.sh

@@ -77,6 +77,10 @@ if [[ -n $ADK_PACKAGE_LIBVPX ]]; then
 	NEED_YASM="$NEED_YASM libvpx"
 fi
 
+if [[ -n $ADK_COMPILE_ORBIT2 ]]; then
+	NEED_LIBIDL="$NEED_LIBIDL orbit2"
+fi
+
 if [[ -n $ADK_PACKAGE_FIREFOX ]]; then
 	NEED_YASM="$NEED_YASM firefox"
 	NEED_LIBIDL="$NEED_LIBIDL firefox"

target/arm/Makefile

@@ -51,7 +51,11 @@ imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL)
 	@echo "If you just want to update, use adkupdate."
 endif
 ifeq ($(ADK_TARGET_FS),archive)
+ifeq ($(ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20),y)
+imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL)
+else
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
+endif
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 	@echo "Use following command to install it on SD card:"

target/packages/pkg-available/mpdbox

@@ -30,7 +30,10 @@ config ADK_PKG_MPDBOX
 	select ADK_PACKAGE_LIGHTTPD_WITH_IPV6
 	select ADK_PACKAGE_LIGHTTPD_WITH_SSL
 	select ADK_PACKAGE_LIGHTTPD_MOD_FASTCGI
+	select ADK_PACKAGE_LIGHTTPD_MOD_DIRLISTING
 	select ADK_PACKAGE_PHP
+	select ADK_PACKAGE_PHP_MOD_SESSION
+	select ADK_PACKAGE_PHP_MOD_SQLITE
 	select ADK_PACKAGE_PHP_FASTCGI
 	select ADK_PACKAGE_SCREEN
 	select ADK_PACKAGE_VIM

toolchain/uClibc/patches/0.9.33.2/avr32_atomic_fix.patch

@@ -0,0 +1,10 @@
+--- a/libc/sysdeps/linux/avr32/bits/atomic.h
++++ b/libc/sysdeps/linux/avr32/bits/atomic.h
+@@ -28,6 +28,7 @@ typedef uintmax_t uatomic_max_t;
+ 
+ #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval)	\
+ 	({								\
++		__uint32_t __result;					\
+ 		__typeof__(*(mem)) __prev;				\
+ 		__asm__ __volatile__(					\
+ 			"/* __arch_compare_and_exchange_val_32_acq */\n" \