From bcd5192beae47c7c53357e29fcdc6050090e2d68 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Fri, 18 Jul 2014 17:50:00 -0700 Subject: [PATCH 01/37] flac: Convert license to SPDX format. Signed-off-by: Ian Leonard --- libs/flac/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/flac/Makefile b/libs/flac/Makefile index 1a9574277..edfcb1dcf 100644 --- a/libs/flac/Makefile +++ b/libs/flac/Makefile @@ -18,7 +18,7 @@ PKG_MAINTAINER:=Ted Hess 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 From 814516c14c92cdd9507eac06861e244837d8df4b Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Fri, 18 Jul 2014 17:50:33 -0700 Subject: [PATCH 02/37] libid3tag: Convert license format to SPDX format. Signed-off-by: Ian Leonard --- libs/libid3tag/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/libid3tag/Makefile b/libs/libid3tag/Makefile index 7af23b7d4..127bc17d7 100644 --- a/libs/libid3tag/Makefile +++ b/libs/libid3tag/Makefile @@ -16,7 +16,7 @@ PKG_SOURCE_URL:=@SF/mad PKG_MD5SUM:=e5808ad997ba32c498803822078748c3 PKG_MAINTAINER:=Ted Hess -PKG_LICENSE:=GPLv2 +PKG_LICENSE:=GPL-2 PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf From c3e0b5396eef2771fb76de927afa8d9cdd88e0f1 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Fri, 18 Jul 2014 17:50:48 -0700 Subject: [PATCH 03/37] libvorbis: Convert license to SPDX format. Signed-off-by: Ian Leonard --- libs/libvorbis/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/libvorbis/Makefile b/libs/libvorbis/Makefile index fbc39b807..6ce3734fe 100644 --- 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 -PKG_LICENSE:=BSD-3c +PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf From c7293134253948436b3443f4eca5761705082f25 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Fri, 18 Jul 2014 17:51:16 -0700 Subject: [PATCH 04/37] ffmpeg: convert license to SPDX format. Signed-off-by: Ian Leonard --- multimedia/ffmpeg/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index be90b3ebc..357e46b47 100644 --- 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 -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:= \ From c0be98e88d98dbf5377178f0385348cc5ad0b5e6 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 19 Jul 2014 00:08:40 -0700 Subject: [PATCH 05/37] libexif: Add PKG_LICENSE information. Signed-off-by: Ian Leonard --- libs/libexif/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/libexif/Makefile b/libs/libexif/Makefile index 44857ef05..c290bddb6 100644 --- 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 From 88cc5288ed209d4d25e5a49a2b1755fc16ff2fb8 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 19 Jul 2014 03:46:05 -0700 Subject: [PATCH 06/37] rsync: add licensing information. Signed-off-by: Ian Leonard --- net/rsync/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/rsync/Makefile b/net/rsync/Makefile index a732722b4..e73aebca3 100644 --- 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 PKG_INSTALL:=1 From 572ecf828de7b4cf4365908268e220e97b3afbbd Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Wed, 23 Jul 2014 18:43:21 -0700 Subject: [PATCH 07/37] minidlna: add licensing information Signed-off-by: Ian Leonard --- multimedia/minidlna/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile index 3812af485..2306788d0 100644 --- a/multimedia/minidlna/Makefile +++ b/multimedia/minidlna/Makefile @@ -14,6 +14,8 @@ 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 PKG_BUILD_PARALLEL:=0 PKG_BUILD_DEPENDS:=util-linux From 97be1d810aa5caaf14a06428f7942ef2aa3693de Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Fri, 1 Aug 2014 13:45:04 -0700 Subject: [PATCH 08/37] zabbix: Convert license to SPDX format. Signed-off-by: Ian Leonard --- admin/zabbix/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile index f015aca27..c05aa449c 100644 --- 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 From ecfed433dbc6bbbfc27e0ba9809dee914c8ce09b Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 2 Aug 2014 01:07:03 -0700 Subject: [PATCH 09/37] htop: Add PKG_LICENSE_FILES Signed-off-by: Ian Leonard --- admin/htop/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/htop/Makefile b/admin/htop/Makefile index a27ce03c6..7cb47067a 100644 --- 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 From ea0a5049eb82f8a58f5f5d725402b49823e95392 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 2 Aug 2014 01:09:29 -0700 Subject: [PATCH 10/37] monit: add PKG_LICENSE_FILES Signed-off-by: Ian Leonard --- admin/monit/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/monit/Makefile b/admin/monit/Makefile index fb2b15857..fd8a979e9 100644 --- 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 From 9b028e3f9cfedde6a5bd72c82e97e3e097d949fc Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 2 Aug 2014 01:18:39 -0700 Subject: [PATCH 11/37] debootstrap: Add PKG_LICENSE information. Adopted the license term "Unique" to signify a license not listed by SDPX. Signed-off-by: Ian Leonard --- admin/debootstrap/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/admin/debootstrap/Makefile b/admin/debootstrap/Makefile index 8089f92de..9c3fc6171 100644 --- a/admin/debootstrap/Makefile +++ b/admin/debootstrap/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2010 Gianluigi Tiesi -# 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 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 - From 863c1dc6847b2eb2208f1853bdfacf76f6acc6ee Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 2 Aug 2014 01:26:29 -0700 Subject: [PATCH 12/37] muninlite: Add PKG_LICENSE information Signed-off-by: Ian Leonard --- admin/muninlite/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/admin/muninlite/Makefile b/admin/muninlite/Makefile index 3388a2b87..b65de1d10 100644 --- 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 From 9bbed19d90afcbb64c252220a010f6f06bf6b2aa Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 2 Aug 2014 01:34:16 -0700 Subject: [PATCH 13/37] patch: add PKG_LICENSE information. Signed-off-by: Ian Leonard --- devel/patch/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/devel/patch/Makefile b/devel/patch/Makefile index 15804c0c9..2532ef2cd 100644 --- a/devel/patch/Makefile +++ b/devel/patch/Makefile @@ -14,6 +14,8 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/patch PKG_MD5SUM:=95dd8d7e41dcbcecdd5cd88ef915378d +PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk From 64c633daa646d2780621187c4f8ee348f312c044 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 2 Aug 2014 01:45:55 -0700 Subject: [PATCH 14/37] aiccu: Add PKG_LICENSE information Signed-off-by: Ian Leonard --- ipv6/aiccu/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ipv6/aiccu/Makefile b/ipv6/aiccu/Makefile index fe1f162dd..bfa8a8320 100644 --- 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) From 2d003b823862c9d3dd5057216e386fa69a6bf70f Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 2 Aug 2014 01:49:06 -0700 Subject: [PATCH 15/37] tayga: add PKG_LICENSE ifnromation Signed-off-by: Ian Leonard --- ipv6/tayga/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ipv6/tayga/Makefile b/ipv6/tayga/Makefile index 5f8418770..8b645650f 100644 --- 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 From ceb66884d39e2f62cc1eb530053da9d9081ccd63 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 2 Aug 2014 01:53:00 -0700 Subject: [PATCH 16/37] libogg: convert PKG_LICENSE to SPDX format Signed-off-by: Ian Leonard --- libs/libogg/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/libogg/Makefile b/libs/libogg/Makefile index c40c4328b..e5be95220 100644 --- 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 -PKG_LICENSE:=BSD-3c +PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf From d4c57f1bded765b394813e14ca34d1f28026f43b Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 2 Aug 2014 01:54:50 -0700 Subject: [PATCH 17/37] libvorbisidec: Convert PKG_LICENSE to SPDX format. Signed-off-by: Ian Leonard --- libs/libvorbisidec/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/libvorbisidec/Makefile b/libs/libvorbisidec/Makefile index 9f8a99bb4..cb87ee91a 100644 --- 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 -PKG_LICENSE:=BSD-3c +PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf From 66cde69e79dcfcb3df82122baea35086f7b47fdd Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 2 Aug 2014 02:04:52 -0700 Subject: [PATCH 18/37] dovecot: add PKG_LICENSE information Signed-off-by: Ian Leonard --- mail/dovecot/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index fdc29303d..1f6becff7 100644 --- 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 From 39da48b23cd6c72057159c7bb9983df2e222d765 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sun, 3 Aug 2014 17:19:38 -0700 Subject: [PATCH 19/37] sox: convert license format to SPDX Signed-off-by: Ian Leonard --- sound/sox/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/sox/Makefile b/sound/sox/Makefile index 6977a777c..8fa571325 100644 --- 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 From faa613fe20dc4c238069e8ff48eda79d46fb50ef Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sun, 3 Aug 2014 17:26:15 -0700 Subject: [PATCH 20/37] lame: convert license to SPDX format Signed-off-by: Ian Leonard --- sound/lame/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/lame/Makefile b/sound/lame/Makefile index d342bc92f..e7057e5e9 100644 --- a/sound/lame/Makefile +++ b/sound/lame/Makefile @@ -19,7 +19,7 @@ PKG_FIXUP:=autoreconf PKG_MAINTAINER:=Ted Hess -PKG_LICENSE:=LGPLv2 +PKG_LICENSE:=LGPL-2.0 PKG_LICENSE_FILES:=COPYING LICENSE include $(INCLUDE_DIR)/package.mk From 0fa1106b83f09cc581960617fd14a3e692e473a2 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sun, 3 Aug 2014 17:31:00 -0700 Subject: [PATCH 21/37] mpc: add PKG_LICENSE information Signed-off-by: Ian Leonard --- sound/mpc/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/mpc/Makefile b/sound/mpc/Makefile index 184ca9bf9..e6b62633a 100644 --- 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 include $(INCLUDE_DIR)/package.mk From d55f37ea1a920beea420a50f4104a3d4109b095a Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sun, 3 Aug 2014 17:35:12 -0700 Subject: [PATCH 22/37] pulseaudio: add PKG_LICENSE information Signed-off-by: Ian Leonard --- sound/pulseaudio/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/pulseaudio/Makefile b/sound/pulseaudio/Makefile index 1571b256a..a3e99d2f1 100644 --- 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 From c1185dbd3d745c2234101b77c78069d3c665c6bf Mon Sep 17 00:00:00 2001 From: Aedan ARFETT Renner Date: Sat, 9 Aug 2014 13:28:02 -0700 Subject: [PATCH 23/37] version bumped to 1.3-1 shortened title so it fits on menuconfig screen added newline in description so no menuconfig side scrolling required Signed-off-by: Aedan Renner chipdankly@gmail.com --- net/mwan3-luci/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/net/mwan3-luci/Makefile b/net/mwan3-luci/Makefile index e221705c7..465363326 100644 --- a/net/mwan3-luci/Makefile +++ b/net/mwan3-luci/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-mwan3 -PKG_VERSION:=1.2 -PKG_RELEASE:=19 +PKG_VERSION:=1.3 +PKG_RELEASE:=1 PKG_MAINTAINER:=Aedan Renner PKG_LICENSE:=GPLv2 @@ -19,14 +19,15 @@ define Package/luci-app-mwan3 SECTION:=LuCI CATEGORY:=LuCI SUBMENU:=3. Applications - TITLE:=LuCI support for MWAN3 Multiwan hotplug script with connection tracking support + TITLE:=LuCI support for the MWAN3 multiwan hotplug script DEPENDS:=+mwan3 PKGARCH:=all MAINTAINER:=Aedan Renner endef define Package/luci-app-mwan3/description - Hotplug script which makes configuration of multiple WAN interfaces simple and manageable. With loadbalancing/failover support for up to 250 wan interfaces, connection tracking and an easy to manage traffic ruleset. +Hotplug script which makes configuration of multiple WAN interfaces simple and manageable +With loadbalancing/failover support for up to 250 WAN interfaces, connection tracking and an easy to manage traffic ruleset endef define Build/Compile From 90c93bed5c41c85856ee2278355db57fcc7a17d8 Mon Sep 17 00:00:00 2001 From: Jiri Slachta Date: Sun, 10 Aug 2014 09:24:48 +0200 Subject: [PATCH 24/37] libxslt: add licensing information Signed-off-by: Jiri Slachta --- libs/libxslt/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/libxslt/Makefile b/libs/libxslt/Makefile index b338653f0..df80b65b0 100644 --- a/libs/libxslt/Makefile +++ b/libs/libxslt/Makefile @@ -9,14 +9,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libxslt PKG_VERSION:=1.1.28 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ -ยจ http://xmlsoft.org/sources/ \ + http://xmlsoft.org/sources/ \ ftp://fr.rpmfind.net/pub/libxml/ PKG_MD5SUM:=9667bf6f9310b957254fdcf6596600b7 +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=COPYING + PKG_MAINTAINER:=Jiri Slachta PKG_FIXUP:=autoreconf @@ -45,7 +48,7 @@ define Package/libexslt endef define Package/libexslt/description - A extention for XSLT. + An extension for XSLT. endef define Package/xsltproc From 364de5bc3f16eba42f93d36e848b998b3579e39e Mon Sep 17 00:00:00 2001 From: Jiri Slachta Date: Sun, 10 Aug 2014 09:25:21 +0200 Subject: [PATCH 25/37] tiff: add licensing information Signed-off-by: Jiri Slachta --- libs/tiff/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile index 1db3d3739..6476c46d9 100644 --- a/libs/tiff/Makefile +++ b/libs/tiff/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tiff PKG_VERSION:=4.0.3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://download.osgeo.org/libtiff @@ -18,6 +18,9 @@ PKG_MD5SUM:=051c1068e6a0627f461948c365290410 PKG_FIXUP:=autoreconf PKG_REMOVE_FILES:=autogen.sh aclocal.m4 +PKG_LICENSE:=BSD +PKG_LICENSE_FILES:=COPYRIGHT + PKG_INSTALL:=1 PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_libtiffxx From f2d0e23959ddc28161c454f10afea09f45722c0b Mon Sep 17 00:00:00 2001 From: Jiri Slachta Date: Sun, 10 Aug 2014 09:25:44 +0200 Subject: [PATCH 26/37] libssh2: add licensing information Signed-off-by: Jiri Slachta --- libs/libssh2/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/libssh2/Makefile b/libs/libssh2/Makefile index 5ab4f1871..4497f389c 100644 --- a/libs/libssh2/Makefile +++ b/libs/libssh2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libssh2 PKG_VERSION:=1.4.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.libssh2.org/download @@ -17,6 +17,9 @@ PKG_MD5SUM:=071004c60c5d6f90354ad1b701013a0b PKG_INSTALL:=1 +PKG_LICENSE:=BSD +PKG_LICENSE_FILES:=COPYING + include $(INCLUDE_DIR)/package.mk define Package/libssh2 From 869e4539f6390e430014b38d344622a90132400f Mon Sep 17 00:00:00 2001 From: Adze1502 Date: Sun, 10 Aug 2014 13:18:54 +0200 Subject: [PATCH 27/37] mwan3: Update to version 1.5-1 Add iptables -w option, which increases stability, requires iptables v1.4.20. Code cleanup Signed-off-by: Jeroen Louwes --- net/mwan3/Makefile | 8 +- net/mwan3/files/etc/hotplug.d/iface/15-mwan3 | 186 +++++++++---------- net/mwan3/files/etc/init.d/mwan3 | 1 - net/mwan3/files/usr/sbin/mwan3 | 67 ++++--- 4 files changed, 131 insertions(+), 131 deletions(-) diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile index 49c8d592d..673fd908b 100644 --- a/net/mwan3/Makefile +++ b/net/mwan3/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mwan3 -PKG_VERSION:=1.4 -PKG_RELEASE:=22 +PKG_VERSION:=1.5 +PKG_RELEASE:=1 PKG_MAINTAINER:=Jeroen Louwes PKG_LICENSE:=GPLv2 @@ -26,7 +26,9 @@ define Package/mwan3 endef define Package/mwan3/description - Hotplug script which makes configuration of multiple WAN interfaces simple and manageable. With loadbalancing/failover support for up to 250 wan interfaces, connection tracking and an easy to manage traffic ruleset. + Hotplug script which makes configuration of multiple WAN interfaces simple + and manageable. With loadbalancing/failover support for up to 250 wan + interfaces, connection tracking and an easy to manage traffic ruleset. endef define Package/mwan3/conffiles diff --git a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 index fe1375df8..8a0878f37 100644 --- a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 +++ b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 @@ -6,68 +6,61 @@ mwan3_get_iface_id() [ "$1" == "$INTERFACE" ] && iface_id=$iface_count } -mwan3_get_route_args() -{ - route_args=$(ip -4 route list dev $DEVICE default | head -1 | sed '/.*via \([^ ]*\) .*$/!d;s//\1/;q' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}') - [ -n "$route_args" ] && route_args="via $route_args" - route_args="nexthop $route_args dev $DEVICE" -} - mwan3_set_general_iptables() { - if ! iptables -S mwan3_ifaces -t mangle &> /dev/null; then - iptables -N mwan3_ifaces -t mangle + if ! $IPT -S mwan3_ifaces &> /dev/null; then + $IPT -N mwan3_ifaces fi - if ! iptables -S mwan3_rules -t mangle &> /dev/null; then - iptables -N mwan3_rules -t mangle + if ! $IPT -S mwan3_rules &> /dev/null; then + $IPT -N mwan3_rules fi - if ! iptables -S mwan3_connected -t mangle &> /dev/null; then - iptables -N mwan3_connected -t mangle + if ! $IPT -S mwan3_connected &> /dev/null; then + $IPT -N mwan3_connected fi - if ! iptables -S mwan3_hook -t mangle &> /dev/null; then - iptables -N mwan3_hook -t mangle - iptables -A mwan3_hook -t mangle -j CONNMARK --restore-mark --nfmask 0xff00 --ctmask 0xff00 - iptables -A mwan3_hook -t mangle -m mark --mark 0x0/0xff00 -j mwan3_ifaces - iptables -A mwan3_hook -t mangle -m mark --mark 0x0/0xff00 -j mwan3_connected - iptables -A mwan3_hook -t mangle -m mark --mark 0x0/0xff00 -j mwan3_rules - iptables -A mwan3_hook -t mangle -j CONNMARK --save-mark --nfmask 0xff00 --ctmask 0xff00 + if ! $IPT -S mwan3_hook &> /dev/null; then + $IPT -N mwan3_hook + $IPT -A mwan3_hook -j CONNMARK --restore-mark --nfmask 0xff00 --ctmask 0xff00 + $IPT -A mwan3_hook -m mark --mark 0x0/0xff00 -j mwan3_ifaces + $IPT -A mwan3_hook -m mark --mark 0x0/0xff00 -j mwan3_connected + $IPT -A mwan3_hook -m mark --mark 0x0/0xff00 -j mwan3_rules + $IPT -A mwan3_hook -j CONNMARK --save-mark --nfmask 0xff00 --ctmask 0xff00 fi - if ! iptables -S mwan3_track_hook -t mangle &> /dev/null; then - iptables -N mwan3_track_hook -t mangle + if ! $IPT -S mwan3_track_hook &> /dev/null; then + $IPT -N mwan3_track_hook fi - if ! iptables -S PREROUTING -t mangle | grep mwan3_hook &> /dev/null; then - iptables -A PREROUTING -t mangle -j mwan3_hook + if ! $IPT -S PREROUTING | grep mwan3_hook &> /dev/null; then + $IPT -A PREROUTING -j mwan3_hook fi - if ! iptables -S OUTPUT -t mangle | grep mwan3_hook &> /dev/null; then - iptables -A OUTPUT -t mangle -j mwan3_hook + if ! $IPT -S OUTPUT | grep mwan3_hook &> /dev/null; then + $IPT -A OUTPUT -j mwan3_hook fi - if ! iptables -S OUTPUT -t mangle | grep mwan3_track_hook &> /dev/null; then - iptables -A OUTPUT -t mangle -j mwan3_track_hook + if ! $IPT -S OUTPUT | grep mwan3_track_hook &> /dev/null; then + $IPT -A OUTPUT -j mwan3_track_hook fi - iptables -F mwan3_rules -t mangle + $IPT -F mwan3_rules } mwan3_set_connected_iptables() { local connected_networks - if iptables -S mwan3_connected -t mangle &> /dev/null; then - iptables -F mwan3_connected -t mangle + if $IPT -S mwan3_connected &> /dev/null; then + $IPT -F mwan3_connected - for connected_networks in $(ip -4 route | awk '{print $1}' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}'); do - iptables -A mwan3_connected -t mangle -d $connected_networks -m mark --mark 0x0/0xff00 -j MARK --set-xmark 0xff00/0xff00 + for connected_networks in $($IP route | awk '{print $1}' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}'); do + $IPT -A mwan3_connected -d $connected_networks -m mark --mark 0x0/0xff00 -j MARK --set-xmark 0xff00/0xff00 done - iptables -I mwan3_connected -t mangle -d 224.0.0.0/3 -m mark --mark 0x0/0xff00 -j MARK --set-xmark 0xff00/0xff00 - iptables -I mwan3_connected -t mangle -d 127.0.0.0/8 -m mark --mark 0x0/0xff00 -j MARK --set-xmark 0xff00/0xff00 + $IPT -I mwan3_connected -d 224.0.0.0/3 -m mark --mark 0x0/0xff00 -j MARK --set-xmark 0xff00/0xff00 + $IPT -I mwan3_connected -d 127.0.0.0/8 -m mark --mark 0x0/0xff00 -j MARK --set-xmark 0xff00/0xff00 fi } @@ -75,56 +68,56 @@ mwan3_set_iface_iptables() { local local_net local_nets - local_net=$(ip -4 route list dev $DEVICE scope link | awk '{print $1}' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}') + local_net=$($IP route list dev $DEVICE scope link | awk '{print $1}' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}') - if ! iptables -S mwan3_iface_$INTERFACE -t mangle &> /dev/null; then - iptables -N mwan3_iface_$INTERFACE -t mangle + if ! $IPT -S mwan3_iface_$INTERFACE &> /dev/null; then + $IPT -N mwan3_iface_$INTERFACE fi - iptables -F mwan3_iface_$INTERFACE -t mangle - iptables -D mwan3_ifaces -t mangle -i $DEVICE -m mark --mark 0x0/0xff00 -j mwan3_iface_$INTERFACE &> /dev/null + $IPT -F mwan3_iface_$INTERFACE + $IPT -D mwan3_ifaces -i $DEVICE -m mark --mark 0x0/0xff00 -j mwan3_iface_$INTERFACE &> /dev/null if [ $ACTION == "ifup" ]; then if [ -n "$local_net" ]; then for local_nets in $local_net ; do if [ $ACTION == "ifup" ]; then - iptables -I mwan3_iface_$INTERFACE -t mangle -s $local_net -m mark --mark 0x0/0xff00 -m comment --comment "$INTERFACE" -j MARK --set-xmark 0xff00/0xff00 + $IPT -I mwan3_iface_$INTERFACE -s $local_net -m mark --mark 0x0/0xff00 -m comment --comment "$INTERFACE" -j MARK --set-xmark 0xff00/0xff00 fi done fi - iptables -A mwan3_iface_$INTERFACE -t mangle -m mark --mark 0x0/0xff00 -m comment --comment "$INTERFACE" -j MARK --set-xmark $(($iface_id*256))/0xff00 - iptables -A mwan3_ifaces -t mangle -i $DEVICE -m mark --mark 0x0/0xff00 -j mwan3_iface_$INTERFACE + $IPT -A mwan3_iface_$INTERFACE -m mark --mark 0x0/0xff00 -m comment --comment "$INTERFACE" -j MARK --set-xmark $(($iface_id*256))/0xff00 + $IPT -A mwan3_ifaces -i $DEVICE -m mark --mark 0x0/0xff00 -j mwan3_iface_$INTERFACE fi if [ $ACTION == "ifdown" ]; then - iptables -X mwan3_iface_$INTERFACE -t mangle + $IPT -X mwan3_iface_$INTERFACE fi } mwan3_set_iface_route() { - ip -4 route flush table $iface_id - [ $ACTION == "ifup" ] && ip -4 route add table $iface_id default $route_args + $IP route flush table $iface_id + [ $ACTION == "ifup" ] && $IP route add table $iface_id default $route_args } mwan3_set_iface_rules() { - while [ -n "$(ip -4 rule list | awk '$1 == "'$(($iface_id+1000)):'"')" ]; do - ip -4 rule del pref $(($iface_id+1000)) + while [ -n "$($IP rule list | awk '$1 == "'$(($iface_id+1000)):'"')" ]; do + $IP rule del pref $(($iface_id+1000)) done - while [ -n "$(ip -4 rule list | awk '$1 == "'$(($iface_id+2000)):'"')" ]; do - ip -4 rule del pref $(($iface_id+2000)) + while [ -n "$($IP rule list | awk '$1 == "'$(($iface_id+2000)):'"')" ]; do + $IP rule del pref $(($iface_id+2000)) done - while [ -n "$(ip -4 rule list | awk '$1 == "2254:"')" ]; do - ip -4 rule del pref 2254 + while [ -n "$($IP rule list | awk '$1 == "2254:"')" ]; do + $IP rule del pref 2254 done - [ $ACTION == "ifup" ] && ip -4 rule add pref $(($iface_id+1000)) iif $DEVICE lookup main - [ $ACTION == "ifup" ] && ip -4 rule add pref $(($iface_id+2000)) fwmark $(($iface_id*256))/0xff00 lookup $iface_id - ip rule add pref 2254 fwmark 0xfe00/0xff00 unreachable + [ $ACTION == "ifup" ] && $IP rule add pref $(($iface_id+1000)) iif $DEVICE lookup main + [ $ACTION == "ifup" ] && $IP rule add pref $(($iface_id+2000)) fwmark $(($iface_id*256))/0xff00 lookup $iface_id + $IP rule add pref 2254 fwmark 0xfe00/0xff00 unreachable } mwan3_track() @@ -145,28 +138,28 @@ mwan3_track() config_get down $INTERFACE down 5 config_get up $INTERFACE up 5 - if ! iptables -S mwan3_track_$INTERFACE -t mangle &> /dev/null; then - iptables -N mwan3_track_$INTERFACE -t mangle - iptables -A mwan3_track_hook -t mangle -p icmp -m icmp --icmp-type 8 -m length --length 32 -j mwan3_track_$INTERFACE + if ! $IPT -S mwan3_track_$INTERFACE &> /dev/null; then + $IPT -N mwan3_track_$INTERFACE + $IPT -A mwan3_track_hook -p icmp -m icmp --icmp-type 8 -m length --length 32 -j mwan3_track_$INTERFACE fi - iptables -F mwan3_track_$INTERFACE -t mangle + $IPT -F mwan3_track_$INTERFACE for track_ip in $track_ips; do - iptables -A mwan3_track_$INTERFACE -t mangle -d $track_ip -j MARK --set-xmark 0xff00/0xff00 + $IPT -A mwan3_track_$INTERFACE -d $track_ip -j MARK --set-xmark 0xff00/0xff00 done [ -x /usr/sbin/mwan3track ] && /usr/sbin/mwan3track $INTERFACE $DEVICE $reliability $count $timeout $interval $down $up $track_ips & else - iptables -D mwan3_track_hook -t mangle -p icmp -m icmp --icmp-type 8 -m length --length 32 -j mwan3_track_$INTERFACE &> /dev/null - iptables -F mwan3_track_$INTERFACE -t mangle &> /dev/null - iptables -X mwan3_track_$INTERFACE -t mangle &> /dev/null + $IPT -D mwan3_track_hook -p icmp -m icmp --icmp-type 8 -m length --length 32 -j mwan3_track_$INTERFACE &> /dev/null + $IPT -F mwan3_track_$INTERFACE &> /dev/null + $IPT -X mwan3_track_$INTERFACE &> /dev/null fi } mwan3_set_policy() { - local iface_count iface_id metric probability weight + local iface_count iface_id INTERFACE metric probability weight config_get INTERFACE $1 interface config_get metric $1 metric 1 @@ -178,12 +171,12 @@ mwan3_set_policy() [ -n "$iface_id" ] || return 0 - if iptables -S mwan3_iface_$INTERFACE -t mangle &> /dev/null; then + if $IPT -S mwan3_iface_$INTERFACE &> /dev/null; then if [ "$metric" -lt "$lowest_metric" ]; then total_weight=$weight - iptables -F mwan3_policy_$policy -t mangle - iptables -A mwan3_policy_$policy -t mangle -m mark --mark 0x0/0xff00 -m comment --comment "$INTERFACE $weight $weight" -j MARK --set-xmark $(($iface_id*256))/0xff00 + $IPT -F mwan3_policy_$policy + $IPT -A mwan3_policy_$policy -m mark --mark 0x0/0xff00 -m comment --comment "$INTERFACE $weight $weight" -j MARK --set-xmark $(($iface_id*256))/0xff00 lowest_metric=$metric @@ -204,7 +197,7 @@ mwan3_set_policy() probability="-m statistic --mode random --probability $probability" - iptables -I mwan3_policy_$policy -t mangle -m mark --mark 0x0/0xff00 $probability -m comment --comment "$INTERFACE $weight $total_weight" -j MARK --set-xmark $(($iface_id*256))/0xff00 + $IPT -I mwan3_policy_$policy -m mark --mark 0x0/0xff00 $probability -m comment --comment "$INTERFACE $weight $total_weight" -j MARK --set-xmark $(($iface_id*256))/0xff00 fi fi } @@ -216,22 +209,22 @@ mwan3_set_policies_iptables() policy=$1 if [ "$policy" != $(echo "$policy" | cut -c1-15) ]; then - logger -t mwan3 -p warn "Policy $policy exceeds max of 15 chars. Not setting policy" && return 0 + $LOG warn "Policy $policy exceeds max of 15 chars. Not setting policy" && return 0 fi - if ! iptables -S mwan3_policy_$policy -t mangle &> /dev/null; then - iptables -N mwan3_policy_$policy -t mangle + if ! $IPT -S mwan3_policy_$policy &> /dev/null; then + $IPT -N mwan3_policy_$policy fi - iptables -F mwan3_policy_$policy -t mangle - iptables -A mwan3_policy_$policy -t mangle -m mark --mark 0x0/0xff00 -m comment --comment "unreachable" -j MARK --set-xmark 0xfe00/0xff00 + $IPT -F mwan3_policy_$policy + $IPT -A mwan3_policy_$policy -m mark --mark 0x0/0xff00 -m comment --comment "unreachable" -j MARK --set-xmark 0xfe00/0xff00 lowest_metric=256 total_weight=0 config_list_foreach $policy use_member mwan3_set_policy - iptables -X $policy -t mangle &> /dev/null + $IPT -X $policy &> /dev/null } mwan3_set_user_rules_iptables() @@ -256,10 +249,10 @@ mwan3_set_user_rules_iptables() case $proto in tcp|udp) - iptables -A mwan3_rules -t mangle -p $proto -s $src_ip -d $dest_ip -m multiport --sports $src_port -m multiport --dports $dest_port -m mark --mark 0/0xff00 -m comment --comment "$1" -j $use_policy &> /dev/null + $IPT -A mwan3_rules -p $proto -s $src_ip -d $dest_ip -m multiport --sports $src_port -m multiport --dports $dest_port -m mark --mark 0/0xff00 -m comment --comment "$1" -j $use_policy &> /dev/null ;; *) - iptables -A mwan3_rules -t mangle -p $proto -s $src_ip -d $dest_ip -m mark --mark 0/0xff00 -m comment --comment "$1" -j $use_policy &> /dev/null + $IPT -A mwan3_rules -p $proto -s $src_ip -d $dest_ip -m mark --mark 0/0xff00 -m comment --comment "$1" -j $use_policy &> /dev/null ;; esac fi @@ -269,45 +262,41 @@ mwan3_ifupdown() { local counter enabled iface_count iface_id route_args wan_metric - [ -n "$DEVICE" ] || exit 0 - [ -n "$INTERFACE" ] || exit 0 - [ "$(uci get -P /var/state mwan3.$INTERFACE 2> /dev/null)" == "interface" ] || return 0 - config_load mwan3 + config_foreach mwan3_get_iface_id interface + + [ -n "$iface_id" ] || return 0 + [ "$iface_count" -le 250 ] || return 0 + unset iface_count + config_get enabled $INTERFACE enabled 0 counter=0 if [ $ACTION == "ifup" ]; then - [ "$enabled" -eq 1 ] || exit 0 + [ "$enabled" -eq 1 ] || return 0 - while [ -z "$(ip -4 route list dev $DEVICE default | head -1)" -a "$counter" -lt 10 ]; do + while [ -z "$($IP route list dev $DEVICE default | head -1)" -a "$counter" -lt 10 ]; do sleep 1 let counter++ if [ "$counter" -ge 10 ]; then - logger -t mwan3 -p warn "Could not find gateway for interface $INTERFACE ($DEVICE)" && exit 0 + $LOG warn "Could not find gateway for interface $INTERFACE ($DEVICE)" && return 0 fi done - mwan3_get_route_args + route_args=$($IP route list dev $DEVICE default | head -1 | sed '/.*via \([^ ]*\) .*$/!d;s//via \1/;q' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}') + route_args="nexthop $route_args dev $DEVICE" fi while [ "$(pgrep -f -o hotplug-call)" -ne $$ -a "$counter" -lt 60 ]; do sleep 1 let counter++ if [ "$counter" -ge 60 ]; then - logger -t mwan3 -p warn "Timeout waiting for older hotplug processes to finish. $ACTION interface $INTERFACE ($DEVICE) aborted" && exit 0 + $LOG warn "Timeout waiting for older hotplug processes to finish. $ACTION interface $INTERFACE ($DEVICE) aborted" && return 0 fi done - config_foreach mwan3_get_iface_id interface - - [ -n "$iface_id" ] || exit 0 - [ "$iface_count" -le 250 ] || exit 0 - unset iface_count - unset counter - - logger -t mwan3 -p notice "$ACTION interface $INTERFACE ($DEVICE)" + $LOG notice "$ACTION interface $INTERFACE ($DEVICE)" mwan3_set_general_iptables mwan3_set_iface_iptables @@ -320,9 +309,20 @@ mwan3_ifupdown() config_foreach mwan3_set_user_rules_iptables rule } +[ -n "$DEVICE" ] || exit 0 +[ -n "$INTERFACE" ] || exit 0 + +local IP IPT LOG + +IP="/usr/sbin/ip -4" +IPT="/usr/sbin/iptables -t mangle -w" +LOG="/usr/bin/logger -t mwan3 -p" + case "$ACTION" in ifup|ifdown) mwan3_ifupdown mwan3_set_connected_iptables ;; esac + +exit 0 diff --git a/net/mwan3/files/etc/init.d/mwan3 b/net/mwan3/files/etc/init.d/mwan3 index 44af759ed..981154c7d 100755 --- a/net/mwan3/files/etc/init.d/mwan3 +++ b/net/mwan3/files/etc/init.d/mwan3 @@ -15,6 +15,5 @@ restart() { } boot() { - # Don't start on boot, mwan3 is started by hotplug event. return 0 } diff --git a/net/mwan3/files/usr/sbin/mwan3 b/net/mwan3/files/usr/sbin/mwan3 index 7d274d430..3bda73f11 100755 --- a/net/mwan3/files/usr/sbin/mwan3 +++ b/net/mwan3/files/usr/sbin/mwan3 @@ -16,10 +16,13 @@ EOF EXTRA_COMMANDS="ifdown ifup interfaces policies rules status" EXTRA_HELP="$(extra_help)" - +IP="/usr/sbin/ip -4" +IPT="/usr/sbin/iptables -t mangle -w" ifdown() { + local device + if [ -z "$1" ]; then echo "Error: Expecting interface. Usage: mwan3 ifdown " && exit 0 fi @@ -28,8 +31,6 @@ ifdown() echo "Error: Too many arguments. Usage: mwan3 ifdown " && exit 0 fi - local device - device=$(uci get -p /var/state network.$1.ifname) &> /dev/null if [ -e /var/run/mwan3track-$1.pid ] ; then @@ -44,6 +45,8 @@ ifdown() ifup() { + local device enabled + config_load mwan3 if [ -z "$1" ]; then @@ -53,8 +56,6 @@ ifup() if [ -n "$2" ]; then echo "Too many arguments. Usage: mwan3 ifup " && exit 0 fi - - local device enabled config_get enabled "$1" enabled 0 @@ -67,10 +68,10 @@ ifup() interfaces() { - config_load mwan3 - local device enabled iface_id tracking + config_load mwan3 + echo "Interface status:" check_iface_status() @@ -91,13 +92,13 @@ interfaces() tracking="down" fi - if [ -n "$(ip rule | awk '$5 == ("'$device'")')" -a -n "$(iptables -S mwan3_iface_$1 -t mangle 2> /dev/null)" -a -n "$(ip -4 route list table $iface_id default dev $device 2> /dev/null)" ]; then + if [ -n "$($IP rule | awk '$5 == ("'$device'")')" -a -n "$($IPT -S mwan3_iface_$1 2> /dev/null)" -a -n "$($IP route list table $iface_id default dev $device 2> /dev/null)" ]; then if [ -n "$(uci get -p /var/state mwan3.$1.track_ip 2> /dev/null)" ]; then echo "Interface $1 is online (tracking $tracking)" else echo "Interface $1 is online" fi - elif [ -n "$(ip rule | awk '$5 == ("'$device'")')" -o -n "$(iptables -S mwan3_iface_$1 -t mangle 2> /dev/null)" -o -n "$(ip -4 route list table $iface_id default dev $device 2> /dev/null)" ]; then + elif [ -n "$($IP rule | awk '$5 == ("'$device'")')" -o -n "$($IPT -S mwan3_iface_$1 2> /dev/null)" -o -n "$($IP route list table $iface_id default dev $device 2> /dev/null)" ]; then echo "Interface $1 error" else if [ "$enabled" -eq 1 ]; then @@ -119,21 +120,21 @@ policies() { local percent policy share total_weight weight iface - for policy in $(iptables -S -t mangle | awk '{print $2}' | grep mwan3_policy_ | sort -u); do + for policy in $($IPT -S | awk '{print $2}' | grep mwan3_policy_ | sort -u); do echo "Policy $policy:" | sed 's/mwan3_policy_//g' - for iface in $(iptables -S $policy -t mangle | cut -s -d'"' -f2 | awk '{print $1}'); do - [ -n "$total_weight" ] || total_weight=$(iptables -S $policy -t mangle | grep "$iface " | cut -s -d'"' -f2 | awk '{print $3}') + for iface in $($IPT -S $policy | cut -s -d'"' -f2 | awk '{print $1}'); do + [ -n "$total_weight" ] || total_weight=$($IPT -S $policy | grep "$iface " | cut -s -d'"' -f2 | awk '{print $3}') done if [ ! -z "${total_weight##*[!0-9]*}" ]; then - for iface in $(iptables -S $policy -t mangle | cut -s -d'"' -f2 | awk '{print $1}'); do - weight=$(iptables -S $policy -t mangle | grep "$iface " | cut -s -d'"' -f2 | awk '{print $2}') + for iface in $($IPT -S $policy | cut -s -d'"' -f2 | awk '{print $1}'); do + weight=$($IPT -S $policy | grep "$iface " | cut -s -d'"' -f2 | awk '{print $2}') percent=$(($weight*100/$total_weight)) echo " $iface ($percent%)" done else - echo " $(iptables -S $policy -t mangle | sed '/.*--comment \([^ ]*\) .*$/!d;s//\1/;q')" + echo " $($IPT -S $policy | sed '/.*--comment \([^ ]*\) .*$/!d;s//\1/;q')" fi echo -e @@ -144,19 +145,17 @@ policies() } rules() { - if [ -n "$(iptables -S mwan3_connected -t mangle 2> /dev/null)" ]; then + if [ -n "$($IPT -S mwan3_connected 2> /dev/null)" ]; then echo "Known networks:" - echo "destination policy hits" | awk '{ printf "%-19s%-19s%-9s%s\n",$1,$2,$3}' - echo "------------------------------------------------" - iptables -L mwan3_connected -t mangle -n -v 2> /dev/null | tail -n+3 | sed 's/mark.*//' | sed 's/mwan3_policy_//g' | awk '{printf "%-19s%-19s%-9s%s\n",$9,"default",$1}' + echo "destination policy hits" | awk '{ printf "%-19s%-19s%-9s%s\n",$1,$2,$3}' | awk '1; {gsub(".","-")}1' + $IPT -L mwan3_connected -n -v 2> /dev/null | tail -n+3 | sed 's/mark.*//' | sed 's/mwan3_policy_//g' | awk '{printf "%-19s%-19s%-9s%s\n",$9,"default",$1}' echo -e fi - if [ -n "$(iptables -S mwan3_rules -t mangle 2> /dev/null)" ]; then + if [ -n "$($IPT -S mwan3_rules 2> /dev/null)" ]; then echo "Active rules:" - echo "source destination proto src-port dest-port policy hits" | awk '{ printf "%-19s%-19s%-7s%-14s%-14s%-16s%-9s%s\n",$1,$2,$3,$4,$5,$6,$7}' - echo "---------------------------------------------------------------------------------------------------" - iptables -L mwan3_rules -t mangle -n -v 2> /dev/null | tail -n+3 | sed 's/mark.*//' | sed 's/mwan3_policy_//g' | awk '{ printf "%-19s%-19s%-7s%-14s%-14s%-16s%-9s%s\n",$8,$9,$4,$12,$15,$3,$1}' + echo "source destination proto src-port dest-port policy hits" | awk '{ printf "%-19s%-19s%-7s%-14s%-14s%-16s%-9s%s\n",$1,$2,$3,$4,$5,$6,$7}' | awk '1; {gsub(".","-")}1' + $IPT -L mwan3_rules -n -v 2> /dev/null | tail -n+3 | sed 's/mark.*//' | sed 's/mwan3_policy_//g' | awk '{ printf "%-19s%-19s%-7s%-14s%-14s%-16s%-9s%s\n",$8,$9,$4,$12,$15,$3,$1}' echo -e fi } @@ -181,24 +180,24 @@ stop() killall mwan3track &> /dev/null rm /var/run/mwan3track-* &> /dev/null - for route in $(ip route list table all | sed 's/.*table \([^ ]*\) .*/\1/' | awk '{print $1}' | awk '{for(i=1;i<=NF;i++) if($i+0>0) if($i+0<255) {print;break}}'); do - ip -4 route flush table $route &> /dev/null + for route in $($IP route list table all | sed 's/.*table \([^ ]*\) .*/\1/' | awk '{print $1}' | awk '{for(i=1;i<=NF;i++) if($i+0>0) if($i+0<255) {print;break}}'); do + $IP route flush table $route &> /dev/null done - for rule in $(ip -4 rule list | egrep '^[1-2][0-9]{3}\:' | cut -d ':' -f 1); do - ip -4 rule del pref $rule &> /dev/null + for rule in $($IP rule list | egrep '^[1-2][0-9]{3}\:' | cut -d ':' -f 1); do + $IP rule del pref $rule &> /dev/null done - iptables -D PREROUTING -t mangle -j mwan3_hook &> /dev/null - iptables -D OUTPUT -t mangle -j mwan3_hook &> /dev/null - iptables -D OUTPUT -t mangle -j mwan3_track_hook &> /dev/null + $IPT -D PREROUTING -j mwan3_hook &> /dev/null + $IPT -D OUTPUT -j mwan3_hook &> /dev/null + $IPT -D OUTPUT -j mwan3_track_hook &> /dev/null - for table in $(iptables -S -t mangle | awk '{print $2}' | grep mwan3 | sort -u); do - iptables -F $table -t mangle &> /dev/null + for table in $($IPT -S | awk '{print $2}' | grep mwan3 | sort -u); do + $IPT -F $table &> /dev/null done - for table in $(iptables -S -t mangle | awk '{print $2}' | grep mwan3 | sort -u); do - iptables -X $table -t mangle &> /dev/null + for table in $($IPT -S | awk '{print $2}' | grep mwan3 | sort -u); do + $IPT -X $table &> /dev/null done } From cb5bdba27336e0d425b34fc43775cc6ae6dd4f7c Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 10 Aug 2014 13:02:03 +0200 Subject: [PATCH 28/37] opensc: add PKG_LICENSE information Signed-off-by: Daniel Golle --- utils/opensc/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/opensc/Makefile b/utils/opensc/Makefile index a31d38ae2..f17357055 100644 --- a/utils/opensc/Makefile +++ b/utils/opensc/Makefile @@ -10,6 +10,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=opensc PKG_VERSION:=20140317 PKG_RELEASE:=1 +PKG_LICENSE:=LGPL-2.1+ +PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Daniel Golle PKG_RELEASE=$(PKG_SOURCE_VERSION) From be3948f08ac521dae75801fe17a9b1b037a9ba36 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 10 Aug 2014 13:05:54 +0200 Subject: [PATCH 29/37] ccid: add PKG_LICENSE information Signed-off-by: Daniel Golle --- utils/ccid/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/ccid/Makefile b/utils/ccid/Makefile index dc3e16dc2..1d8c1739a 100644 --- a/utils/ccid/Makefile +++ b/utils/ccid/Makefile @@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://alioth.debian.org/frs/download.php/file/4091 PKG_MD5SUM:=a227a20a0dd034cd4bb7400806a0a2d0 PKG_MAINTAINER:=Daniel Golle +PKG_LICENSE:=LGPL-2.1+ +PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=libtool PKG_INSTALL:=1 From 7216a7affccd6e0d86de08a51139a79d83ae1762 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 10 Aug 2014 13:12:45 +0200 Subject: [PATCH 30/37] pcsc-lite: add PKG_LICENSE information Signed-off-by: Daniel Golle --- utils/pcsc-lite/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/pcsc-lite/Makefile b/utils/pcsc-lite/Makefile index 5ff3a14eb..df0cdeaec 100644 --- a/utils/pcsc-lite/Makefile +++ b/utils/pcsc-lite/Makefile @@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://alioth.debian.org/frs/download.php/file/3991 PKG_MD5SUM:=73502ca4ba6526727f9f49c63d805408 PKG_MAINTAINER:=Daniel Golle +PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf PKG_INSTALL:=1 From 6b4b73f18730b2dce481362c165f34ae1b827195 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 10 Aug 2014 13:25:00 +0200 Subject: [PATCH 31/37] mktorrent: add PKG_LICENSE information Signed-off-by: Daniel Golle --- utils/mktorrent/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/mktorrent/Makefile b/utils/mktorrent/Makefile index 3ff981377..2e23e23bb 100644 --- a/utils/mktorrent/Makefile +++ b/utils/mktorrent/Makefile @@ -11,6 +11,8 @@ PKG_NAME:=mktorrent PKG_VERSION:=1.0 PKG_RELEASE:=1 PKG_MAINTAINER:=Daniel Golle +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILES:=COPYING PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.sourceforge.net/$(PKG_NAME)/ From c39083fe33fd1ed175b8648cafb16f081f35c0e6 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 10 Aug 2014 13:43:03 +0200 Subject: [PATCH 32/37] xl2tpd: add PKG_LICENSE information Signed-off-by: Daniel Golle --- net/xl2tpd/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/xl2tpd/Makefile b/net/xl2tpd/Makefile index 4e108ab80..b99641c5f 100644 --- a/net/xl2tpd/Makefile +++ b/net/xl2tpd/Makefile @@ -11,6 +11,8 @@ PKG_NAME:=xl2tpd PKG_VERSION:=1.3.6 PKG_RELEASE:=1 PKG_MAINTAINER:=Daniel Golle +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILES:=LICENSE PKG_RELEASE=$(PKG_SOURCE_VERSION) From 9584a1fd4258a069ee8a4453537fd645c430e9cf Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 10 Aug 2014 13:49:40 +0200 Subject: [PATCH 33/37] opentracker: add PKG_LICENSE information Signed-off-by: Daniel Golle --- net/opentracker/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/net/opentracker/Makefile b/net/opentracker/Makefile index 64646164f..bfcf65cba 100644 --- a/net/opentracker/Makefile +++ b/net/opentracker/Makefile @@ -12,6 +12,7 @@ PKG_VERSION:=20130804 PKG_RELEASE:=1 PKG_REV:=954f5029dfa17734dc408336ef710c192268e8a4 PKG_MAINTAINER:=Daniel Golle +PKG_LICENSE:=Beerware PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=git://erdgeist.org/opentracker From 60e2f882b8fb16b536732fe46a8a08eed26b5cf8 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 10 Aug 2014 13:52:59 +0200 Subject: [PATCH 34/37] libp11: add PKG_LICENSE information Signed-off-by: Daniel Golle --- libs/libp11/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/libp11/Makefile b/libs/libp11/Makefile index 2fc1eb2a0..4258604e5 100644 --- a/libs/libp11/Makefile +++ b/libs/libp11/Makefile @@ -11,6 +11,8 @@ PKG_NAME:=libp11 PKG_VERSION:=20131021 PKG_RELEASE:=1 PKG_MAINTAINER:=Daniel Golle +PKG_LICENSE:=LGPL-2.1+ +PKG_LICENSE_FILES:=COPYING PKG_RELEASE=$(PKG_SOURCE_VERSION) From b6a8ac8b9ba8c2449a7e191d899b28cdf55c463f Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 10 Aug 2014 13:53:19 +0200 Subject: [PATCH 35/37] freeradius2: add PKG_LICENSE information Signed-off-by: Daniel Golle --- net/freeradius2/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile index 4eddb26b2..745dca878 100644 --- a/net/freeradius2/Makefile +++ b/net/freeradius2/Makefile @@ -15,6 +15,8 @@ PKG_SOURCE:=freeradius-server-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.freeradius.org/pub/freeradius/ PKG_MD5SUM:=40535bace507d7a3134c3d858f3cbc5a PKG_MAINTAINER:=Daniel Golle +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILES:=COPYRIGHT LICENSE PKG_BUILD_DIR:=$(BUILD_DIR)/freeradius-server-$(PKG_VERSION) PKG_FIXUP:=autoreconf From a2d793286bcb551c91da84d81b13e9992bf53d20 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 10 Aug 2014 13:54:18 +0200 Subject: [PATCH 36/37] engine_pkcs11: add PKG_LICENSE information Signed-off-by: Daniel Golle --- libs/engine_pkcs11/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/engine_pkcs11/Makefile b/libs/engine_pkcs11/Makefile index d91cfba04..dbdafdab6 100644 --- a/libs/engine_pkcs11/Makefile +++ b/libs/engine_pkcs11/Makefile @@ -11,6 +11,7 @@ PKG_NAME:=engine_pkcs11 PKG_VERSION:=20131021 PKG_RELEASE:=1 PKG_MAINTAINER:=Daniel Golle +PKG_LICENSE:=LGPL-2.1+ PKG_RELEASE=$(PKG_SOURCE_VERSION) From 96cec85081102bbae3a80a96fc866bdc8c7277a1 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 10 Aug 2014 13:58:18 +0200 Subject: [PATCH 37/37] libowfat: add PKG_LICENSE information Signed-off-by: Daniel Golle --- libs/libowfat/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/libowfat/Makefile b/libs/libowfat/Makefile index 3a0bcc310..f7ed2ae4b 100644 --- a/libs/libowfat/Makefile +++ b/libs/libowfat/Makefile @@ -17,6 +17,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://dl.fefe.de PKG_MD5SUM:=6bbee9a86506419657d87123b7a6f2c1 PKG_MAINTAINER:=Daniel Golle +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk