Merge pull request #182 from antonlacon/license-updates

License updates (miscellaneous)
2014-08-10 13:36:41 +02:00 · 2014-08-10 13:36:41 +02:00 · 685da68df4
parent 048e700bfc f5a1d1bba6
commit 685da68df4
22 changed files with 40 additions and 19 deletions
--- 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 -

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

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

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

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

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

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

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

--- 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:= \
--- 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

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

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