Merge pull request #182 from antonlacon/license-updates

License updates (miscellaneous)

diff --git a/admin/debootstrap/Makefile b/admin/debootstrap/Makefile
index 8089f92de96e985c33ecd15ff85bfb2ca865cb6e..9c3fc617174bf172a28473d1d2eb56dedca7c235 100644 (file)
--- a/admin/debootstrap/Makefile
+++ b/admin/debootstrap/Makefile
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2010 Gianluigi Tiesi <sherpya@netfarm.it>
-# Copyright (C) 2011-2013 OpenWrt.org
+# Copyright (C) 2011-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -16,6 +16,8 @@ PKG_MAINTAINER=Daniel Golle <daniel@makrotopia.org>
 PKG_SOURCE:=$(PKG_NAME)-udeb_$(PKG_VERSION)_all.udeb
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/d/debootstrap
 PKG_MD5SUM:=6d4e3b97981b9e0bb86f49d8edac91af
+PKG_LICENSE:=Unique
+PKG_LICENSE_FILES:=debian/copyright
 
 UNPACK_CMD=ar -p "$(DL_DIR)/$(PKG_SOURCE)" data.tar.xz | xzcat | tar -C $(1) -xf -
 

diff --git a/admin/htop/Makefile b/admin/htop/Makefile
index a27ce03c65092f999521d2fc5d89e1562219cdac..7cb47067a1d772281d4f634ae55e7806e29823bd 100644 (file)
--- a/admin/htop/Makefile
+++ b/admin/htop/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2012 OpenWrt.org
+# Copyright (C) 2007-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://hisham.hm/htop/releases/$(PKG_VERSION)/
 PKG_MD5SUM:=e768b9b55c033d9c1dffda72db3a6ac7
 
 PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=
+PKG_LICENSE_FILES:=COPYING
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1

diff --git a/admin/monit/Makefile b/admin/monit/Makefile
index fb2b15857014d76b3507472b5c664d71cd283af5..fd8a979e9a8f5d39d14ef41440cf4b0cc0ec2ba4 100644 (file)
--- a/admin/monit/Makefile
+++ b/admin/monit/Makefile
@@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://mmonit.com/monit/dist
 PKG_MD5SUM:=9467328f1da0b644a766a387443db2ea
 
 PKG_LICENSE:=AGPL-3.0
-PKG_LICENSE_FILES:=
+PKG_LICENSE_FILES:=COPYING
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL:=1

diff --git a/admin/muninlite/Makefile b/admin/muninlite/Makefile
index 3388a2b87df1a3eb06fddaa2721eb595637fd4f9..b65de1d10c64af45c5e8dfeaab558d14ff1fb3d4 100644 (file)
--- a/admin/muninlite/Makefile
+++ b/admin/muninlite/Makefile
@@ -14,6 +14,8 @@ PKG_RELEASE:=5
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=a8cc86f0cc536a6c22dc298f4ed55339
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile
index f015aca276ff233e81f075dff14c76624bec03c9..c05aa449c4f2bf3ee1200c360b9831a9bf1464dc 100644 (file)
--- a/admin/zabbix/Makefile
+++ b/admin/zabbix/Makefile
@@ -15,8 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/zabbix
 PKG_MD5SUM:=e7b74a0208743f743585d9cc1d46eccf
 
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=COPYING
 
 PKG_INSTALL:=1
 

diff --git a/devel/patch/Makefile b/devel/patch/Makefile
index 0177d707a3e904d41b5d97e9b5ed99d49742b79b..63809c5b8c92127912a1c463f2d727ba44e4953d 100644 (file)
--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@@ -14,6 +14,8 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/patch
 PKG_MD5SUM:=e9ae5393426d3ad783a300a338c09b72
+PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE_FILES:=COPYING
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/ipv6/aiccu/Makefile b/ipv6/aiccu/Makefile
index fe1f162ddb7bdfa2858a42fb3b687f1548bc218e..bfa8a83206c2f09c417ea2889a40ced1715fea54 100644 (file)
--- a/ipv6/aiccu/Makefile
+++ b/ipv6/aiccu/Makefile
@@ -14,6 +14,8 @@ PKG_RELEASE:=11
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.sixxs.net/archive/sixxs/aiccu/unix
 PKG_MD5SUM:=c9bcc83644ed788e22a7c3f3d4021350
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=doc/LICENSE
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 

diff --git a/ipv6/tayga/Makefile b/ipv6/tayga/Makefile
index 5f8418770d23030390afb5f53a58bc211cb7ed65..8b645650fb80301226ad0f2ab18a71ae49238c2b 100644 (file)
--- a/ipv6/tayga/Makefile
+++ b/ipv6/tayga/Makefile
@@ -9,8 +9,10 @@ PKG_RELEASE:=2
 PKG_SOURCE:=tayga-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.litech.org/tayga/
 PKG_MD5SUM:=7a7b24165ce008df772f398d86fa280e
-PKG_CAT:=bzcat
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=COPYING
 
+PKG_CAT:=bzcat
 PKG_BUILD_DIR:=$(BUILD_DIR)/tayga-$(PKG_VERSION)
 PKG_FIXUP:=autoreconf
 

diff --git a/libs/flac/Makefile b/libs/flac/Makefile
index 1a9574277f6503146d3c38d53da975914134fdba..edfcb1dcf64b262a23363500cb566fe18101426c 100644 (file)
--- a/libs/flac/Makefile
+++ b/libs/flac/Makefile
@@ -18,7 +18,7 @@ PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
 PKG_INSTALL:=1
 
-PKG_LICENSE:=GFDLv1.2 GPLv2 LGPLv2.1 BSD-3c
+PKG_LICENSE:=GFDL-1.2 GPL-2 LGPL-2.1 BSD-3-Clause
 PKG_LICENSE_FILES:=README COPYING.FDL COPYING.GPL COPYING.LGPL COPYING.Xiph
 
 PKG_FIXUP:=autoreconf

diff --git a/libs/libexif/Makefile b/libs/libexif/Makefile
index 44857ef055aa3504d58cb06c8108d5506aabf8cc..c290bddb6c6804e504ceffe16f10b058e3b1c5fe 100644 (file)
--- a/libs/libexif/Makefile
+++ b/libs/libexif/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -15,6 +15,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/libexif
 PKG_MD5SUM:=27339b89850f28c8f1c237f233e05b27
 
+PKG_LICENSE:=LGPL-2.1
+PKG_LICENSE_FILES:=COPYING
+
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 

diff --git a/libs/libid3tag/Makefile b/libs/libid3tag/Makefile
index 7af23b7d491d9cbc2f9e9d9b5f1a34fdc18b3f7a..127bc17d7eafed6fb36f96c8d5c6b8d5492cd074 100644 (file)
--- a/libs/libid3tag/Makefile
+++ b/libs/libid3tag/Makefile
@@ -16,7 +16,7 @@ PKG_SOURCE_URL:=@SF/mad
 PKG_MD5SUM:=e5808ad997ba32c498803822078748c3
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
-PKG_LICENSE:=GPLv2
+PKG_LICENSE:=GPL-2
 PKG_LICENSE_FILES:=COPYING
 
 PKG_FIXUP:=autoreconf

diff --git a/libs/libogg/Makefile b/libs/libogg/Makefile
index c40c4328bf68197856618656c9d65efb8daa10bc..e5be95220402dac565954e04763f247c82398b96 100644 (file)
--- a/libs/libogg/Makefile
+++ b/libs/libogg/Makefile
@@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://downloads.xiph.org/releases/ogg/
 PKG_MD5SUM:=5c3a34309d8b98640827e5d0991a4015
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
-PKG_LICENSE:=BSD-3c
+PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYING
 
 PKG_FIXUP:=autoreconf

diff --git a/libs/libvorbis/Makefile b/libs/libvorbis/Makefile
index fbc39b8070a05386bc58df1e18d61dcf0859e984..6ce3734fe3439450459a2fb31027be5fca8f9ef9 100644 (file)
--- a/libs/libvorbis/Makefile
+++ b/libs/libvorbis/Makefile
@@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://downloads.xiph.org/releases/vorbis/
 PKG_MD5SUM:=55f2288055e44754275a17c9a2497391
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
-PKG_LICENSE:=BSD-3c
+PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYING
 
 PKG_FIXUP:=autoreconf

diff --git a/libs/libvorbisidec/Makefile b/libs/libvorbisidec/Makefile
index 9f8a99bb47ae6177a1a81f97464942ec05a6b0f3..cb87ee91a40aa89642df8f4c5dd13822f896bb57 100644 (file)
--- a/libs/libvorbisidec/Makefile
+++ b/libs/libvorbisidec/Makefile
@@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/libv/libvorbisidec/
 PKG_MD5SUM:=4190859414c5d6760e316b5cf00fe7c5
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
-PKG_LICENSE:=BSD-3c
+PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYING
 
 PKG_FIXUP:=autoreconf

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index fdc29303d568da75f90a4c61c0d18c36c922bfef..1f6becff7c04f2404a571ee5d5d58269313c40d1 100644 (file)
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -14,6 +14,8 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.dovecot.org/releases/2.2
 PKG_MD5SUM:=a3eb1c0b1822c4f2b0fe9247776baa71
+PKG_LICENSE:=LGPL-2.1 MIT BSD-3-Clause Unique
+PKG_LICENSE_FILES:=COPYING COPYING.LGPL COPYING.MIT
 
 PKG_BUILD_DEPENDS:=libiconv
 

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index be90b3ebc3dcc97b388b04710a5916474eefb35c..357e46b47cecb3192c52f078acb20a292cd6adad 100644 (file)
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://ffmpeg.org/releases/
 PKG_MD5SUM:=ea25fc252c132141f12988ed5506bfe8
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
-PKG_LICENSE:=LGPLv2.1+ GPLv2+ LGPLv3
+PKG_LICENSE:=LGPL-2.1+ GPL-2+ LGPL-3
 PKG_LICENSE_FILES:=COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 COPYING.LGPLv3
 
 FFMPEG_CUSTOM_ENCODERS:= \

diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile
index a4ab71d540a9caab748ddd657babebedbcc6a380..2b30ba83965696970abe79c44783383eef68c025 100644 (file)
--- a/multimedia/minidlna/Makefile
+++ b/multimedia/minidlna/Makefile
@@ -14,11 +14,11 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/minidlna
 PKG_MD5SUM:=879027192c89e5376cdd2ae2d1aa33b4
+PKG_LICENSE:=GPL-2.0 BSD-3-Clause
+PKG_LICENSE_FILES:=COPYING LICENCE.miniupnpd
 
 PKG_MAINTAINER:=Knyazkov Dmitry <medavedik@gmail.com>
 
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILE:=COPYING
 PKG_BUILD_PARALLEL:=0
 PKG_BUILD_DEPENDS:=util-linux
 

diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 0231047a8eb8859d5f64ec3240920f336ec3ca0f..6d6d201b6c2bebe2db90a6581ee88dd734aa911e 100644 (file)
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -14,6 +14,8 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://rsync.samba.org/ftp/rsync/src
 PKG_MD5SUM:=43bd6676f0b404326eee2d63be3cdcfe
+PKG_LICENSE:=GPL-3.0
+PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
 PKG_LICENSE:=GPL-3.0
 

diff --git a/sound/lame/Makefile b/sound/lame/Makefile
index d342bc92f2b5536335372a6b959aff5aa6197b2d..e7057e5e9db9078ffef962c06e3167384e88e7b3 100644 (file)
--- a/sound/lame/Makefile
+++ b/sound/lame/Makefile
@@ -19,7 +19,7 @@ PKG_FIXUP:=autoreconf
 
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
-PKG_LICENSE:=LGPLv2
+PKG_LICENSE:=LGPL-2.0
 PKG_LICENSE_FILES:=COPYING LICENSE
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/sound/mpc/Makefile b/sound/mpc/Makefile
index 184ca9bf99801548bbb8f33cdc914abaab304e0a..e6b62633a5bce03319fc2aefadf9827796f1c6ad 100644 (file)
--- a/sound/mpc/Makefile
+++ b/sound/mpc/Makefile
@@ -14,6 +14,8 @@ PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://www.musicpd.org/download/mpc/0
 PKG_MD5SUM:=d4f37e7e6b32c804a870192d1eb86199
+PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/sound/pulseaudio/Makefile b/sound/pulseaudio/Makefile
index 1571b256aedb449dd8d7ddf42a2c235b7d07bf71..a3e99d2f18429c3efd822f41e15ca114c4f788f8 100644 (file)
--- a/sound/pulseaudio/Makefile
+++ b/sound/pulseaudio/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011 OpenWrt.org
+# Copyright (C) 2011-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -14,6 +14,8 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://freedesktop.org/software/pulseaudio/releases/
 PKG_MD5SUM:=c43749838612f4860465e83ed62ca38e
+PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE_FILES:=GPL LICENSE
 
 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=intltool/host

diff --git a/sound/sox/Makefile b/sound/sox/Makefile
index 6977a777cc2f1633e663dc68e0b341bb5357d5be..8fa571325773145de12215ff0be3b175e584d747 100644 (file)
--- a/sound/sox/Makefile
+++ b/sound/sox/Makefile
@@ -16,7 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/sox
 PKG_MD5SUM:=ff9ca6aca972549de0e80e8e30ed379c
 
-PKG_LICENSE:=LGPLv2.1 GPLv2
+PKG_LICENSE:=LGPL-2.1 GPL-2.0
 PKG_LICENSE_FILES:=COPYING LICENSE.LGPL LICENSE.GPL
 
 PKG_INSTALL:=1