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

16 files changed, 59 insertions, 88 deletions

diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index cfc3d47f7..149f3d2ae 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		alsa-lib
 PKG_VERSION:=		1.0.28
-PKG_RELEASE:=		5
+PKG_RELEASE:=		6
 PKG_MD5SUM:=		c9e21b88a2b3e6e12ea7ba0f3b271fc3
 PKG_DESCR:=		sound library
 PKG_SECTION:=		libs/audio
@@ -33,13 +33,10 @@ CONFIGURE_ARGS+=	--disable-python
 
 alsa-lib-install:
 	${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib 
-	${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/share/alsa/{cards,pcm}
+	${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/share/alsa
 	${CP} ${WRKINST}/usr/lib/libasound.so* ${IDIR_ALSA_LIB}/usr/lib
-	${CP} ${WRKINST}/usr/share/alsa/alsa.conf ${IDIR_ALSA_LIB}/usr/share/alsa
-	${CP} ${WRKINST}//usr/share/alsa/cards/aliases.conf \
-		${IDIR_ALSA_LIB}/usr/share/alsa/cards
-	${CP} ${WRKINST}//usr/share/alsa/pcm/*.conf \
-		${IDIR_ALSA_LIB}/usr/share/alsa/pcm
+	${CP} ${WRKINST}//usr/share/alsa/* \
+		${IDIR_ALSA_LIB}/usr/share/alsa
 
 include ${ADK_TOPDIR}/mk/host-bottom.mk
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/base-files/src/etc/init.d/fs b/package/base-files/src/etc/init.d/fs
index 9527070a1..b110af3b9 100755
--- a/package/base-files/src/etc/init.d/fs
+++ b/package/base-files/src/etc/init.d/fs
@@ -24,14 +24,14 @@ for fs in $fstypes; do
 	disks=$(grep -v "^#" /etc/fstab|grep $fs|awk '{ print $1 }')
 	for disk in $disks; do
 		logger -t 'Filesystem' "Found $disk with filesystem $fs"
-		mnt=$(grep -v "^#" /etc/fstab|grep "$disk "|awk '{ print $2 }')
+		mnt=$(grep -v "^#" /etc/fstab|grep "${disk}[[:blank:]]"|awk '{ print $2 }')
 		grep $fs /proc/filesystems >/dev/null 2>&1
 		if [ $? -eq 0 ];then
 			[ -x /usr/sbin/fsck.$fs ] && {
 				logger -t 'Filesystem' "checking $fs filesystem on $disk"
 				fsck -p $disk >/dev/null 2>&1
 			}
-			logger -t 'Filesystem' "Mounting local filesystems"
+			logger -t 'Filesystem' "Mounting $disk to $mnt"
 			mkdir -p $mnt > /dev/null 2>&1
 			mount $disk
 		else
diff --git a/package/base-files/src/etc/mdev/fs b/package/base-files/src/etc/mdev/fs
index 6c8b08699..4f1e100f4 100755
--- a/package/base-files/src/etc/mdev/fs
+++ b/package/base-files/src/etc/mdev/fs
@@ -26,7 +26,7 @@ fi
 
 # check if already mounted via /etc/init.d/fs
 adk_check() {
-	mount | grep "${MDEV} "
+	mount | grep "${MDEV}[[:blank:]]"
 	if [ $? -eq 0 ];then
 		logger -t mdev "Filesystem on ${MDEV} already mounted"
 		exit 0
@@ -46,8 +46,8 @@ adk_mount() {
 	mkdir -p $mnt >/dev/null 2>&1
 	grep $procfs /proc/filesystems >/dev/null 2>&1
 	if [ $? -eq 0 ];then
-		logger -t mdev "Mounting local filesystems"
-		mount $mnt
+		logger -t mdev "Mounting $disk to $mnt"
+		mount $mnt 2>/dev/null
 		if [ $? -ne 0 ];then
 			logger -s -t 'Filesystem' "Mounting $disk failed"
 		fi
diff --git a/package/bcm2835-vc/Makefile b/package/bcm2835-vc/Makefile
index b2246307d..d3e7c18d9 100644
--- a/package/bcm2835-vc/Makefile
+++ b/package/bcm2835-vc/Makefile
@@ -4,11 +4,10 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		bcm2835-vc
-# actually git checkout from 21.09.2014
-# ffcc4bd7c4875b71376c4240116e251652c9bec0
-PKG_VERSION:=		0.8
+# actually git checkout from 10.10.2014
+PKG_VERSION:=		0.9
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		963b2dc026c5ee98cae093af56006b4c
+PKG_MD5SUM:=		4a3104d86b116a60921c04127a6ca3ac
 PKG_DESCR:=		videocore tools and libraries for raspberry pi
 PKG_SECTION:=		libs/video
 PKG_DEPENDS:=		libpthread
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 9734c6dcb..53d32c6a1 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		curl
-PKG_VERSION:=		7.37.1
+PKG_VERSION:=		7.38.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a944b069ac70c3e574c25def6e1d6b2f
+PKG_MD5SUM:=		b6e3ea55bb718f2270489581efa50a8a
 PKG_DESCR:=		client-side url transfer tool
 PKG_SECTION:=		net/http
 PKG_DEPENDS:=		libcurl
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 3b9dbeafa..87d487894 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -5,8 +5,8 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		kodi
 PKG_VERSION:=		14.0alpha4
-PKG_RELEASE:=		4
-PKG_MD5SUM:=		ac54bdac1f5c6dd2a2c75818391740a4
+PKG_RELEASE:=		5
+PKG_MD5SUM:=		88a68db6e653b2029efddbfa0a855e1c
 PKG_DESCR:=		software media player
 PKG_SECTION:=		mm/video
 PKG_DEPENDS:=		boost python2 libstdcxx glibc-gconv
@@ -107,7 +107,7 @@ CONFIGURE_ARGS+=	--disable-optical-drive \
 			--disable-mid \
 			--enable-alsa \
 			--enable-libvorbisenc \
-			--enable-debug \
+			--disable-debug \
 			--enable-udev \
 			--with-ffmpeg=shared
 
diff --git a/package/kodi/patches/patch-configure_in b/package/kodi/patches/patch-configure_in
index bfe90410a..3db5985c7 100644
--- a/package/kodi/patches/patch-configure_in
+++ b/package/kodi/patches/patch-configure_in
@@ -1,11 +1,11 @@
---- kodi-14.0alpha4.orig/configure.in	2014-09-05 14:09:58.000000000 +0200
-+++ kodi-14.0alpha4/configure.in	2014-09-21 10:23:38.000000000 +0200
-@@ -1004,7 +1004,7 @@ if test "$use_gles" = "yes"; then
+--- kodi-14.0alpha4.orig/configure.in	2014-10-06 11:34:24.000000000 -0500
++++ kodi-14.0alpha4/configure.in	2014-10-08 01:40:53.444436000 -0500
+@@ -1011,7 +1011,7 @@ if test "$use_gles" = "yes"; then
        AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."])
        AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."])
        AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.)
--      LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm"
-+      LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lkhrn_static -lpthread -lm"
+-      LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util"
++      LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util -lkhrn_static -lpthread -lm"
      else
        AC_CHECK_LIB([EGL],   [main],, AC_MSG_ERROR($missing_library))
        AC_CHECK_LIB([GLESv2],[main],, AC_MSG_ERROR($missing_library))
diff --git a/package/kodi/patches/patch-xbmc_Application_cpp b/package/kodi/patches/patch-xbmc_Application_cpp
index b8a942c03..a90c36f89 100644
--- a/package/kodi/patches/patch-xbmc_Application_cpp
+++ b/package/kodi/patches/patch-xbmc_Application_cpp
@@ -1,6 +1,6 @@
---- kodi-14.0alpha4.orig/xbmc/Application.cpp	2014-09-05 14:09:59.000000000 +0200
-+++ kodi-14.0alpha4/xbmc/Application.cpp	2014-09-05 15:48:59.475115902 +0200
-@@ -679,7 +679,7 @@ bool CApplication::Create()
+--- kodi-14.0alpha4.orig/xbmc/Application.cpp	2014-10-06 11:34:37.000000000 -0500
++++ kodi-14.0alpha4/xbmc/Application.cpp	2014-10-08 01:25:47.880436000 -0500
+@@ -642,7 +642,7 @@ bool CApplication::Create()
  
    if (!CLog::Init(CSpecialProtocol::TranslatePath(g_advancedSettings.m_logFolder).c_str()))
    {
@@ -9,7 +9,7 @@
        CSpecialProtocol::TranslatePath(g_advancedSettings.m_logFolder).c_str());
      return false;
    }
-@@ -1090,10 +1090,13 @@ bool CApplication::InitDirectoriesLinux(
+@@ -1064,10 +1064,13 @@ bool CApplication::InitDirectoriesLinux(
      userName = "root";
  
    CStdString userHome;
@@ -23,7 +23,7 @@
  
    CStdString xbmcBinPath, xbmcPath;
    CUtil::GetHomePath(xbmcBinPath, "XBMC_BIN_HOME");
-@@ -1125,11 +1128,11 @@ bool CApplication::InitDirectoriesLinux(
+@@ -1099,11 +1102,11 @@ bool CApplication::InitDirectoriesLinux(
      // map our special drives
      CSpecialProtocol::SetXBMCBinPath(xbmcBinPath);
      CSpecialProtocol::SetXBMCPath(xbmcPath);
diff --git a/package/libressl/Makefile b/package/libressl/Makefile
index f9d54a941..a013d18b5 100644
--- a/package/libressl/Makefile
+++ b/package/libressl/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libressl
-PKG_VERSION:=		2.0.4
+PKG_VERSION:=		2.0.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d30576bfd0e92dbb5b860e0e03281e5c
+PKG_MD5SUM:=		77b5385251e6edabc4cd74ffccc7e418
 PKG_DESCR:=		ssl library
 PKG_SECTION:=		libs/crypto
 PKG_URL:=		http://www.libressl.org
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 1eef11a96..0951ee9d1 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		openssh
-PKG_VERSION:=		6.6p1
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		3e9800e6bca1fbac0eea4d41baa7f239
+PKG_VERSION:=		6.7p1
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		3246aa79317b1d23cae783a3bf8275d6
 PKG_DESCR:=		secure shell implementation
 PKG_SECTION:=		net/security
 PKG_BUILDDEP:=		zlib openssl
@@ -45,6 +45,8 @@ $(eval $(call PKG_template,OPENSSH_CLIENT_UTILS,openssh-client-utils,${PKG_VERSI
 $(eval $(call PKG_template,OPENSSH_SFTP_CLIENT,openssh-sftp-client,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSH_SFTP_CLIENT},${PKGSD_OPENSSH_SFTP_CLIENT},${PKG_SECTION}))
 $(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSH_SFTP_SERVER},${PKGSD_OPENSSH_SFTP_SERVER},${PKG_SECTION}))
 
+AUTOTOOL_STYLE:=	autoreconf
+
 ifeq ($(ADK_PACKAGE_OPENSSH_WITH_KRB5),y)
 CONFIGURE_ARGS+=	--with-kerberos5="${STAGING_TARGET_DIR}/usr"
 endif
@@ -55,6 +57,12 @@ else
 CONFIGURE_ARGS+=	--without-stackprotect
 endif
 
+ifeq ($(ADK_TARGET_USE_PIE),y)
+CONFIGURE_ARGS+=	--with-pie
+else
+CONFIGURE_ARGS+=	--without-pie
+endif
+
 CONFIGURE_ENV+=		LD='${TARGET_CC}' \
 			ac_cv_func_setlogin=no \
 			ac_cv_have_decl_PR_SET_NO_NEW_PRIVS=no \
diff --git a/package/openssh/patches/patch-channels_c b/package/openssh/patches/patch-channels_c
deleted file mode 100644
index 11b870703..000000000
--- a/package/openssh/patches/patch-channels_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- openssh-6.2p1.orig/channels.c	2012-12-02 23:50:55.000000000 +0100
-+++ openssh-6.2p1/channels.c	2013-08-20 18:00:56.929029538 +0200
-@@ -42,6 +42,7 @@
- #include "includes.h"
- 
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <sys/ioctl.h>
- #include <sys/un.h>
- #include <sys/socket.h>
diff --git a/package/openssh/patches/patch-cipher_c b/package/openssh/patches/patch-cipher_c
index 059d3cf86..1f6e6ec66 100644
--- a/package/openssh/patches/patch-cipher_c
+++ b/package/openssh/patches/patch-cipher_c
@@ -1,19 +1,9 @@
-diff -Nur openssh-6.2p1.orig/cipher.c openssh-6.2p1/cipher.c
---- openssh-6.5p1.orig/cipher.c	2014-01-25 23:37:26.000000000 +0100
-+++ openssh-6.5p1/cipher.c	2014-02-11 15:26:16.000000000 +0100
-@@ -75,23 +75,33 @@ static const struct Cipher ciphers[] = {
- 	{ "none",	SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null },
- 	{ "des",	SSH_CIPHER_DES, 8, 8, 0, 0, 0, 1, EVP_des_cbc },
- 	{ "3des",	SSH_CIPHER_3DES, 8, 16, 0, 0, 0, 1, evp_ssh1_3des },
-+#ifndef OPENSSL_NO_BF
- 	{ "blowfish",	SSH_CIPHER_BLOWFISH, 8, 32, 0, 0, 0, 1, evp_ssh1_bf },
-+#endif
- 
+--- openssh-6.7p1.orig/cipher.c	2014-07-20 18:24:59.000000000 +0200
++++ openssh-6.7p1/cipher.c	2014-10-11 21:51:33.000000000 +0200
+@@ -88,8 +88,10 @@ static const struct sshcipher ciphers[]
  	{ "3des-cbc",	SSH_CIPHER_SSH2, 8, 24, 0, 0, 0, 1, EVP_des_ede3_cbc },
-+#ifndef OPENSSL_NO_BF
  	{ "blowfish-cbc",
  			SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_bf_cbc },
-+#endif
 +#ifndef OPENSSL_NO_CAST
  	{ "cast128-cbc",
  			SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_cast5_cbc },
@@ -21,17 +11,3 @@ diff -Nur openssh-6.2p1.orig/cipher.c openssh-6.2p1/cipher.c
  	{ "arcfour",	SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 0, EVP_rc4 },
  	{ "arcfour128",	SSH_CIPHER_SSH2, 8, 16, 0, 0, 1536, 0, EVP_rc4 },
  	{ "arcfour256",	SSH_CIPHER_SSH2, 8, 32, 0, 0, 1536, 0, EVP_rc4 },
- 	{ "aes128-cbc",	SSH_CIPHER_SSH2, 16, 16, 0, 0, 0, 1, EVP_aes_128_cbc },
-+#ifndef OPENSSL_NO_AES192
- 	{ "aes192-cbc",	SSH_CIPHER_SSH2, 16, 24, 0, 0, 0, 1, EVP_aes_192_cbc },
-+#endif
- 	{ "aes256-cbc",	SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 1, EVP_aes_256_cbc },
- 	{ "rijndael-cbc@lysator.liu.se",
- 			SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 1, EVP_aes_256_cbc },
- 	{ "aes128-ctr",	SSH_CIPHER_SSH2, 16, 16, 0, 0, 0, 0, EVP_aes_128_ctr },
-+#ifndef OPENSSL_NO_AES192
- 	{ "aes192-ctr",	SSH_CIPHER_SSH2, 16, 24, 0, 0, 0, 0, EVP_aes_192_ctr },
-+#endif
- 	{ "aes256-ctr",	SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 0, EVP_aes_256_ctr },
- #ifdef OPENSSL_HAVE_EVPGCM
- 	{ "aes128-gcm@openssh.com",
diff --git a/package/openssh/patches/patch-configure_ac b/package/openssh/patches/patch-configure_ac
new file mode 100644
index 000000000..eceb331cd
--- /dev/null
+++ b/package/openssh/patches/patch-configure_ac
@@ -0,0 +1,13 @@
+--- openssh-6.7p1.orig/configure.ac	2014-08-26 22:32:01.000000000 +0200
++++ openssh-6.7p1/configure.ac	2014-10-11 21:42:45.000000000 +0200
+@@ -2526,8 +2526,8 @@ AC_CHECK_FUNCS([SHA256_Update EVP_sha256
+ # Search for RIPE-MD support in OpenSSL
+ AC_CHECK_FUNCS([EVP_ripemd160], ,
+     [unsupported_algorithms="$unsupported_algorithms \
+-	hmac-ripemd160
+-	hmac-ripemd160@openssh.com
++	hmac-ripemd160 \
++	hmac-ripemd160@openssh.com \
+ 	hmac-ripemd160-etm@openssh.com"
+      ]
+ )
diff --git a/package/openssh/patches/patch-digest-openssl_c b/package/openssh/patches/patch-digest-openssl_c
deleted file mode 100644
index dc8aeb4f6..000000000
--- a/package/openssh/patches/patch-digest-openssl_c
+++ /dev/null
@@ -1,12 +0,0 @@
---- openssh-6.6p1.orig/digest-openssl.c	2014-02-04 01:25:45.000000000 +0100
-+++ openssh-6.6p1/digest-openssl.c	2014-03-24 13:42:01.000000000 +0100
-@@ -44,7 +44,9 @@ struct ssh_digest {
- /* NB. Indexed directly by algorithm number */
- const struct ssh_digest digests[] = {
- 	{ SSH_DIGEST_MD5,	"MD5",	 	16,	EVP_md5 },
-+#ifndef OPENSSL_NO_RIPEMD
- 	{ SSH_DIGEST_RIPEMD160,	"RIPEMD160",	20,	EVP_ripemd160 },
-+#endif
- 	{ SSH_DIGEST_SHA1,	"SHA1",	 	20,	EVP_sha1 },
- #ifdef HAVE_EVP_SHA256 /* XXX replace with local if missing */
- 	{ SSH_DIGEST_SHA256,	"SHA256", 	32,	EVP_sha256 },
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 769bdf628..be0b943c3 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		openssl
 PKG_VERSION:=		1.0.1i
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		c8dc151a671b9b92ff3e4c118b174972
 PKG_DESCR:=		secure socket layer libraries
 PKG_SECTION:=		libs/crypto
@@ -37,7 +37,7 @@ BUILD_STYLE:=		manual
 INSTALL_TARGET:=	install_sw
 FAKE_FLAGS+=		INSTALL_PREFIX=${WRKINST}
 
-OPENSSL_OPTIONS:= shared threads no-err no-krb5 zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast
+OPENSSL_OPTIONS:= shared threads no-err no-krb5 zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-cast
 
 ifneq ($(ADK_PACKAGE_LIBOPENSSL_WITH_CRYPTODEV),)
 OPENSSL_OPTIONS+= -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile
index 785f473fa..acb4bb89f 100644
--- a/package/pulseaudio/Makefile
+++ b/package/pulseaudio/Makefile
@@ -18,7 +18,7 @@ PKG_URL:=		http://www.freedesktop.org/wiki/Software/PulseAudio/
 PKG_SITES:=		http://freedesktop.org/software/pulseaudio/releases/
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc-ng uclibc glibc
 
 include $(ADK_TOPDIR)/mk/package.mk