Merge branch 'next'

Conflicts:
	package/e2fsprogs/e2fsprogs.mk
	package/libfuse/libfuse.mk
	package/multimedia/mpd/mpd.mk
	package/smartmontools/smartmontools.mk

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --cc boot/uboot/uboot.mk
Simple merge

diff --cc package/e2fsprogs/e2fsprogs.mk
index 9f2a5f742a97fb198fda94457f35bee4aa00ad01,16085210d60d6844cb84ae959626d1d01d629f36..e0746406cff3ea5b61fa5edc4aecf1df71196a5d
--- 1/package/e2fsprogs/e2fsprogs.mk
--- 2/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@@ -4,8 -4,8 +4,8 @@@
  #
  #############################################################
  
- E2FSPROGS_VERSION = 1.42.4
+ E2FSPROGS_VERSION = 1.42.5
 -E2FSPROGS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
 +E2FSPROGS_SITE = http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/$(E2FSPROGS_VERSION)
  
  E2FSPROGS_CONF_OPT = \
        --disable-tls \

diff --cc package/libfuse/libfuse.mk
index 246697fdd46a1e66ba6c0bbb6a0f74afdd530f1d,8be3456771c48206bf9082ece0dab09bed02bb5b..c8c01303d32ed1bd01dc6755a406a8ba0669b407
--- 1/package/libfuse/libfuse.mk
--- 2/package/libfuse/libfuse.mk
+++ b/package/libfuse/libfuse.mk
@@@ -4,9 -4,11 +4,11 @@@
  #
  #############################################################
  
- LIBFUSE_VERSION = 2.9.0
+ LIBFUSE_VERSION = 2.9.1
  LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
 -LIBFUSE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/fuse/fuse-2.X/$(LIBFUSE_VERSION)
 +LIBFUSE_SITE = http://downloads.sourceforge.net/project/fuse/fuse-2.X/$(LIBFUSE_VERSION)
+ LIBFUSE_LICENSE = GPLv2 LGPLv2.1
+ LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB
  
  LIBFUSE_INSTALL_STAGING = YES
  LIBFUSE_CONF_OPT= --disable-nls \

diff --cc package/multimedia/mpd/mpd.mk
index 7c88b9c2a3f1f6bfdf9930b2d0d708ab10f9ba26,bf4610e1c031871b441421dc15d6948f03130789..28cb4d21d3d0a26561a367ef7be4007b9806c326
--- 1/package/multimedia/mpd/mpd.mk
--- 2/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@@ -4,9 -4,11 +4,11 @@@
  #
  #############################################################
  
- MPD_VERSION = 0.16.8
+ MPD_VERSION = 0.17.1
 -MPD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/musicpd/mpd/$(MPD_VERSION)
 +MPD_SITE = http://downloads.sourceforge.net/project/musicpd/mpd/$(MPD_VERSION)
  MPD_DEPENDENCIES = host-pkg-config libglib2
+ MPD_LICENSE = GPLv2
+ MPD_LICENSE_FILES = COPYING
  
  # Some options need an explicit --disable or --enable
  

diff --cc package/multimedia/mpg123/mpg123.mk
index 5ed43a13c7ebc0744a14f3e3019daef6dbe57db3,3576cb725a2f62617f21c0168ae91aad8a2e541e..415fc242f54d86bc92f903beab8ed59db754c02e
--- 1/package/multimedia/mpg123/mpg123.mk
--- 2/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@@ -4,11 -4,13 +4,13 @@@
  #
  #############################################################
  
- MPG123_VERSION = 1.14.2
+ MPG123_VERSION = 1.14.4
  MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
 -MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION)
 +MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION)
  MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias
  MPG123_INSTALL_STAGING = YES
+ MPG123_LICENSE = LGPLv2.1
+ MPG123_LICENSE_FILES = COPYING
  
  MPG123_CPU = $(if $(BR2_SOFT_FLOAT),generic_nofpu,generic_fpu)
  

diff --cc package/openssl/openssl.mk
index 4ae65b123072d432a8e57925cc7d7d8f2cbc0508,16d13946b7ff33acba46db48915bf3486eeff7ac..0917344afa9a8a3181d003785f41cbb70c76ffc9
--- 1/package/openssl/openssl.mk
--- 2/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@@ -4,10 -4,8 +4,10 @@@
  #
  #############################################################
  
- OPENSSL_VERSION = 1.0.0j
+ OPENSSL_VERSION = 1.0.1c
  OPENSSL_SITE = http://www.openssl.org/source
 +OPENSSL_LICENSE = OpenSSL or SSLeay
 +OPENSSL_LICENSE_FILES = LICENSE
  OPENSSL_INSTALL_STAGING = YES
  OPENSSL_DEPENDENCIES = zlib
  OPENSSL_TARGET_ARCH = generic32

diff --cc package/smartmontools/smartmontools.mk
index ad3bc18d79ab3a0bafac6cdc603bd4c273242b4b,3c573f84e92882f25668bca84afda2edfd71d0af..7b4c7f98a358dbd3a649ccd0648cd9a39036430d
--- 1/package/smartmontools/smartmontools.mk
--- 2/package/smartmontools/smartmontools.mk
+++ b/package/smartmontools/smartmontools.mk
@@@ -4,7 -4,9 +4,9 @@@
  #
  #############################################################
  
- SMARTMONTOOLS_VERSION = 5.42
+ SMARTMONTOOLS_VERSION = 5.43
 -SMARTMONTOOLS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/smartmontools
 +SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VERSION)
+ SMARTMONTOOLS_LICENSE = GPLv2+
+ SMARTMONTOOLS_LICENSE_FILES = COPYING
  
  $(eval $(autotools-package))

diff --cc package/sudo/sudo.mk
Simple merge