From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 3 Sep 2012 19:33:25 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=32a0454d3c495b12824ef4a0d0341237302d148a;p=buildroot.git

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

32a0454d3c495b12824ef4a0d0341237302d148a
diff --cc package/e2fsprogs/e2fsprogs.mk
index 9f2a5f742a,16085210d6..e0746406cf
--- a/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 246697fdd4,8be3456771..c8c01303d3
--- a/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 7c88b9c2a3,bf4610e1c0..28cb4d21d3
--- a/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 5ed43a13c7,3576cb725a..415fc242f5
--- a/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 4ae65b1230,16d13946b7..0917344afa
--- a/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 ad3bc18d79,3c573f84e9..7b4c7f98a3
--- a/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))