Merge pull request #2763 from kuoruan/lrzsz
authorYousong Zhou <yszhou4tech@gmail.com>
Sat, 4 Jun 2016 03:27:34 +0000 (11:27 +0800)
committerYousong Zhou <yszhou4tech@gmail.com>
Sat, 4 Jun 2016 03:27:34 +0000 (11:27 +0800)
Import lrzsz from oldpackages

58 files changed:
lang/node-arduino-firmata/Makefile
lang/node-cylon/Makefile
lang/node-hid/Makefile
lang/node-serialport/Makefile
lang/node/Makefile
lang/node/patches/004-gcc6-undefined-behaviour.patch [deleted file]
libs/intltool/Makefile
libs/intltool/patches/100-optional-perl-xml-parser.patch [new file with mode: 0644]
libs/libftdi1/Makefile
libs/libmodbus/Makefile
libs/libsoup/Makefile
libs/libssh2/Makefile
libs/libtasn1/Makefile
libs/libupnpp/Makefile
libs/libxml2/Makefile
libs/libxslt/Makefile
libs/tiff/Makefile
multimedia/crtmpserver/Makefile
multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch
multimedia/crtmpserver/patches/030-default-config.patch
multimedia/crtmpserver/patches/040-use-select.patch
multimedia/crtmpserver/patches/050-add-missing-make-defines.patch
multimedia/crtmpserver/patches/060-add-missing-includes.patch
multimedia/crtmpserver/patches/070-missing-include-gcc-47.patch
multimedia/xupnpd/Makefile
multimedia/xupnpd/patches/100-default_config.patch
multimedia/xupnpd/patches/101-root_dir_param.patch
multimedia/youtube-dl/Makefile
net/adblock/Makefile
net/adblock/files/README.md
net/adblock/files/adblock-helper.sh
net/adblock/files/adblock-update.sh
net/adblock/files/adblock.conf
net/adblock/files/adblock.init
net/aria2/Config.in
net/aria2/Makefile
net/aria2/files/aria2.conf [new file with mode: 0644]
net/aria2/files/aria2.init [new file with mode: 0755]
net/ddns-scripts/Makefile
net/ddns-scripts/files/dynamic_dns_functions.sh
net/ddns-scripts/files/dynamic_dns_updater.sh
net/nginx/Makefile
net/tgt/Makefile
net/tgt/patches/020-usr_Makefile.patch
net/vnstat/files/vnstat.init
net/webui-aria2/Makefile [new file with mode: 0644]
net/yaaw/Makefile [new file with mode: 0644]
sound/shairport-sync/Makefile
sound/shairport-sync/files/shairport-sync.config
sound/shairport-sync/files/shairport-sync.init
sound/upmpdcli/Makefile
sound/upmpdcli/patches/010-Add_icon_config.patch
utils/dump1090/Makefile
utils/gammu/Makefile
utils/pciutils/Makefile
utils/smartmontools/Makefile
utils/tar/Makefile
utils/zsh/Makefile

index 58dc2417ec86ecfa8761e368d1d2353d3e93d652..d90a6048e19d25e4be63bdc44debac8537a3dc3c 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NPM_NAME:=arduino-firmata
 PKG_NAME:=node-$(PKG_NPM_NAME)
 PKG_VERSION:=0.3.3
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/shokai/node-arduino-firmata.git
@@ -19,7 +19,7 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 
 PKG_BUILD_DEPENDS:=node/host
-PKG_NODE_VERSION:=4.4.4
+PKG_NODE_VERSION:=4.4.5
 
 PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
 PKG_LICENSE:=MIT
index ad7e5257804b8dbadd25bdff1d94df955cfd7cbc..07e56a63e27675a2f780856e686a46531a869fad 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NPM_NAME:=cylon
 PKG_NAME:=node-$(PKG_NPM_NAME)
 PKG_VERSION:=0.22.0
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/hybridgroup/cylon-firmata.git
@@ -19,7 +19,7 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 
 PKG_BUILD_DEPENDS:=node/host
-PKG_NODE_VERSION:=4.4.4
+PKG_NODE_VERSION:=4.4.5
 
 PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
 PKG_LICENSE:=Apache-2.0
index fb29eae4958b9808483f9173c7ad8b94afac0625..e5d5c70fdc2ab6737c93203dbdd92ba8baa313f9 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NPM_NAME:=hid
 PKG_NAME:=node-$(PKG_NPM_NAME)
 PKG_VERSION:=0.5.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/node-hid/node-hid.git
@@ -19,7 +19,7 @@ PKG_SOURCE_VERSION:=35d830b7810c87d32484d0a346621568c4849441
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 PKG_BUILD_DEPENDS:=node/host
-PKG_NODE_VERSION:=4.4.4
+PKG_NODE_VERSION:=4.4.5
 
 PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
 PKG_LICENSE:=Custom
index b787479e53e7ca7bb8315cb6ad2bf97fb81b4673..e4ca1eba37c5041e404a8878afc6589025234caa 100644 (file)
@@ -10,14 +10,14 @@ include $(TOPDIR)/rules.mk
 PKG_NPM_NAME:=serialport
 PKG_NAME:=node-$(PKG_NPM_NAME)
 PKG_VERSION:=3.0.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://registry.npmjs.org/$(PKG_NPM_NAME)/-/
 PKG_MD5SUM:=ea20a17746dd64e72d5f6f2019d9e28d
 
 PKG_BUILD_DEPENDS:=node/host
-PKG_NODE_VERSION:=4.4.4
+PKG_NODE_VERSION:=4.4.5
 
 PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
 PKG_LICENSE:=Custom
index 7effb08ea1389ef9056f01fb6a914aac1598a40a..4f9aa7960567252470b20ba8348dd854355f9e36 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=node
-PKG_VERSION:=v4.4.4
+PKG_VERSION:=v4.4.5
 PKG_RELEASE:=1
 
 PKG_SOURCE:=node-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://nodejs.org/dist/${PKG_VERSION}
-PKG_MD5SUM:=1ad7915688df85f62a57f43860dc54c6
+PKG_MD5SUM:=376140907bbe362f36065a30af04f020
 
 HOST_BUILD_DEPENDS:=python/host
 PKG_BUILD_DEPENDS:=python/host
@@ -35,7 +35,7 @@ define Package/node
   SUBMENU:=Node.js
   TITLE:=Node.js is a platform built on Chrome's JavaScript runtime
   URL:=http://nodejs.org/
-  DEPENDS:=+libpthread +librt +libstdcpp +libopenssl +libuv +zlib
+  DEPENDS:=+libpthread +librt +libstdcpp +libopenssl +zlib
 endef
 
 define Package/node/description
@@ -44,7 +44,7 @@ define Package/node/description
    package ecosystem, npm, is the largest ecosystem of open source libraries in the world.
 endef
 
-CPU:=$(subst x86_64,x64,$(subst i386,ia32,$(ARCH)))
+CPU:=$(subst aarch64,arm64,$(subst x86_64,x64,$(subst i386,ia32,$(ARCH))))
 
 MAKE_VARS += \
        DESTCPU=$(CPU)
diff --git a/lang/node/patches/004-gcc6-undefined-behaviour.patch b/lang/node/patches/004-gcc6-undefined-behaviour.patch
deleted file mode 100644 (file)
index 11b0132..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/deps/v8/src/heap/incremental-marking.cc b/deps/v8/src/heap/incremental-marking.cc
-index 58eb0aa..b2b796f 100644
---- a/deps/v8/src/heap/incremental-marking.cc
-+++ b/deps/v8/src/heap/incremental-marking.cc
-@@ -364,7 +364,7 @@ void IncrementalMarking::DeactivateIncrementalWriteBarrier() {
-   DeactivateIncrementalWriteBarrierForSpace(heap_->new_space());
-   LargePage* lop = heap_->lo_space()->first_page();
--  while (lop->is_valid()) {
-+  while (LargePage::IsValid(lop)) {
-     SetOldSpacePageFlags(lop, false, false);
-     lop = lop->next_page();
-   }
-@@ -396,7 +396,7 @@ void IncrementalMarking::ActivateIncrementalWriteBarrier() {
-   ActivateIncrementalWriteBarrier(heap_->new_space());
-   LargePage* lop = heap_->lo_space()->first_page();
--  while (lop->is_valid()) {
-+  while (LargePage::IsValid(lop)) {
-     SetOldSpacePageFlags(lop, true, is_compacting_);
-     lop = lop->next_page();
-   }
-diff --git a/deps/v8/src/heap/spaces-inl.h b/deps/v8/src/heap/spaces-inl.h
-index c2c4d12..d63ee63 100644
---- a/deps/v8/src/heap/spaces-inl.h
-+++ b/deps/v8/src/heap/spaces-inl.h
-@@ -155,7 +155,7 @@ Page* Page::Initialize(Heap* heap, MemoryChunk* chunk, Executability executable,
- bool PagedSpace::Contains(Address addr) {
-   Page* p = Page::FromAddress(addr);
--  if (!p->is_valid()) return false;
-+  if (!Page::IsValid(p)) return false;
-   return p->owner() == this;
- }
-diff --git a/deps/v8/src/heap/spaces.cc b/deps/v8/src/heap/spaces.cc
-index 0806b25..c0e109b 100644
---- a/deps/v8/src/heap/spaces.cc
-+++ b/deps/v8/src/heap/spaces.cc
-@@ -2953,7 +2953,7 @@ LargePage* LargeObjectSpace::FindPage(Address a) {
-   if (e != NULL) {
-     DCHECK(e->value != NULL);
-     LargePage* page = reinterpret_cast<LargePage*>(e->value);
--    DCHECK(page->is_valid());
-+    DCHECK(LargePage::IsValid(page));
-     if (page->Contains(a)) {
-       return page;
-     }
-diff --git a/deps/v8/src/heap/spaces.h b/deps/v8/src/heap/spaces.h
-index 3461de3..e35c057 100644
---- a/deps/v8/src/heap/spaces.h
-+++ b/deps/v8/src/heap/spaces.h
-@@ -278,9 +278,9 @@ class MemoryChunk {
-   // Only works for addresses in pointer spaces, not data or code spaces.
-   static inline MemoryChunk* FromAnyPointerAddress(Heap* heap, Address addr);
--  Address address() { return reinterpret_cast<Address>(this); }
-+  static bool IsValid(MemoryChunk* chunk) { return chunk != nullptr; }
--  bool is_valid() { return address() != NULL; }
-+  Address address() { return reinterpret_cast<Address>(this); }
-   MemoryChunk* next_chunk() const {
-     return reinterpret_cast<MemoryChunk*>(base::Acquire_Load(&next_chunk_));
index 7c24469e4c3803fcd0af0200a194a6eee64c0841..a84ea94772b10ce0ce977f157c66d0e03c22b053 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=intltool
 PKG_LIBVER:=0.40
 PKG_VERSION:=$(PKG_LIBVER).6
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@GNOME/intltool/$(PKG_LIBVER)
@@ -18,6 +18,7 @@ PKG_MD5SUM:=69bc0353323112f42ad4f9cf351bc3e5
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
 PKG_HOST_ONLY:=1
+HOST_FIXUP:=autoreconf
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
@@ -35,13 +36,5 @@ define Package/intltool/description
   file formats using GNU gettext-compatible PO files.
 endef
 
-define Require/perl-xml-parser
-  perl -e 'use XML::Parser;'
-endef
-
-$(eval $(call Require,perl-xml-parser, \
-       Please install Perl XML::Parser \
-))
-
 $(eval $(call BuildPackage,intltool))
 $(eval $(call HostBuild))
diff --git a/libs/intltool/patches/100-optional-perl-xml-parser.patch b/libs/intltool/patches/100-optional-perl-xml-parser.patch
new file mode 100644 (file)
index 0000000..4615d1d
--- /dev/null
@@ -0,0 +1,22 @@
+--- a/configure.in
++++ b/configure.in
+@@ -25,7 +25,7 @@ AC_MSG_CHECKING([for XML::Parser])
+ if `$PERL -e "require XML::Parser" 2>/dev/null`; then
+    AC_MSG_RESULT([ok])
+ else
+-   AC_MSG_ERROR([XML::Parser perl module is required for intltool])
++   AC_MSG_RESULT([XML::Parser perl module is required for some intltool utilitities])
+ fi
+ AC_OUTPUT([
+--- a/intltool.m4
++++ b/intltool.m4
+@@ -127,7 +127,7 @@ if test "x$2" != "xno-xml"; then
+    if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+        AC_MSG_RESULT([ok])
+    else
+-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
++       AC_MSG_RESULT([XML::Parser perl module is required for some intltool utilitities])
+    fi
+ fi
index ed7ff2d2d60f2937ac1dfa0db0a87e6c2d2734d5..cf2ba17ae8c25fc310a4669b0ef0cd39fc70e301 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2015 OpenWrt.org
+# Copyright (C) 2014-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libftdi1
-PKG_VERSION:=1.2
-PKG_RELEASE:=3
+PKG_VERSION:=1.3
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.intra2net.com/en/developer/libftdi/download/
-PKG_MD5SUM:=89dff802d89c4c0d55d8b4665fd52d0b
+PKG_MD5SUM:=156cdf40cece9f8a3ce1582db59a502a
 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
 
 PKG_LICENSE:=LGPL-2.0
@@ -22,6 +22,8 @@ PKG_LICENSE_FILES:=COPYING.LIB
 PKG_INSTALL:=1
 PKG_USE_MIPS16:=0
 
+CMAKE_OPTIONS:=-DBUILD_TESTS=OFF
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
index 65fb00e03f1908821e7a9dd8b1677e8210340c7b..4f9bab2e2ac8cc52a09eec4537f92fb1011e51db 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2015 OpenWrt.org
+# Copyright (C) 2006-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmodbus
-PKG_VERSION:=3.1.2
+PKG_VERSION:=3.1.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://libmodbus.org/releases
-PKG_MD5SUM:=dd4262f87ed835c4d1e560f8321a222c
+PKG_MD5SUM:=b1a8fd3a40d2db4de51fb0cbcb201806
 
 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
 
@@ -36,7 +36,7 @@ define Package/libmodbus/description
   A Modbus library for Linux, Mac OS X, FreeBSD, QNX and Win32.
 endef
 
-CONFIGURE_ARGS += --without-documentation
+CONFIGURE_ARGS += --without-documentation --disable-tests
 TARGET_CFLAGS += $(FPIC)
 
 define Build/InstallDev
index 873632a8d7ba49458fde7c88069e167760fd694c..5bb9c5b6b07b4d0ff07e05bb31b0658d259fc34a 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libsoup
 PKG_VERSION:=2.53.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.53
@@ -19,6 +19,7 @@ PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
 
 PKG_FIXUP:=autoreconf
+PKG_REMOVE_FILES:=m4/intltool.m4
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -43,6 +44,7 @@ define Build/Configure
                --without-apache-httpd \
                --without-gnome \
                --enable-vala=no \
+               --disable-more-warnings \
        )
 endef
 
index 7951f63efa1f57b7859acb1e1cca47825349b00a..774ae85e04090de82b3a13ba0f81328dfd7c799b 100644 (file)
@@ -28,7 +28,7 @@ define Package/libssh2
   TITLE:=SSH2 library
   URL:=http://www.libssh2.org/
   DEPENDS:=+libopenssl +zlib
-  MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+  MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 endef
 
 define Package/libssh2/description
index 63ddaba985ac2038798ba29635ab3b480d386931..c70eadbb44c11082bdceb3cdcfcc7bcff4e139fd 100644 (file)
@@ -9,11 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtasn1
 PKG_VERSION:=4.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/libtasn1
 PKG_MD5SUM:=9a6767705725544f2b86670dcfb34107
+PKG_LICENSE:=GPL-3.0
+PKG_LICENSE_FILES:=COPYING
 
 #PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
index 923187465212367189380b94041b3ef2345c2335..9a7db84a2d35e29ed2afa4ba58039e31a55858b6 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libupnpp
-PKG_VERSION:=0.11.0
+PKG_VERSION:=0.14.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.lesbonscomptes.com/upmpdcli/downloads
-PKG_MD5SUM:=faefaef9e7dbfe57d9224cf49aab6e2e
+PKG_MD5SUM:=1b10905a365fc6277e1d8ced77278666
 PKG_MAINTAINER:=Petko Bordjukov <bordjukov@gmail.com>
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
index fd025148969db1c87020535ee6218e90c16d5a07..155640c656ab5014fd9ff66daf147c4c2ee7fb9c 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2015 OpenWrt.org
+# Copyright (C) 2006-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libxml2
-PKG_VERSION:=2.9.3
+PKG_VERSION:=2.9.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://gd.tuwien.ac.at/languages/libxml/ \
        http://xmlsoft.org/sources/ \
        ftp://fr.rpmfind.net/pub/libxml/
-PKG_MD5SUM:=daece17e045f1c107610e137ab50c179
+PKG_MD5SUM:=ae249165c173b1ff386ee8ad676815f5
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
index 20a62210cc4e470dfef2518852506263e87ed283..955073a0073e2c7c2bf3cf9234011d9317004f9b 100644 (file)
@@ -20,7 +20,7 @@ PKG_MD5SUM:=9667bf6f9310b957254fdcf6596600b7
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
 
-PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
index 317572590dcebb1073a7f344e07d47f8506ef3b3..6d83fe79a97ae5ae8b82cabe600577fcc56aa0e4 100644 (file)
@@ -31,7 +31,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/tiff/Default
   TITLE:=TIFF
   URL:=http://www.remotesensing.org/libtiff/
-  MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+  MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 endef
 
 define Package/libtiff
index 5f2a31eb427bae4139f58940b29faba49dddbdc9..972fff837a6adf41d60feb2fd46a03896f2f0cc2 100644 (file)
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=crtmpserver
-PKG_REV:=811
-PKG_VERSION:=r$(PKG_REV)
+PKG_REV:=b6fdcdb
+PKG_VERSION:=2012-07-18+git-$(PKG_REV)
 PKG_RELEASE:=1
 PKG_BUILD_PARALLEL:=2
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
@@ -17,10 +17,10 @@ PKG_LICENSE:=GPL-3.0
 
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=--username=anonymous --password= https://svn.rtmpd.com/crtmpserver/branches/1.0
+PKG_SOURCE_URL:=https://github.com/j0sh/crtmpserver.git
 PKG_SOURCE_SUBDIR:=crtmpserver-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_PROTO:=git
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -66,6 +66,9 @@ define Build/Configure
                        -e 's,^OPTIMIZATIONS[[:space:]]*=.*,OPTIMIZATIONS=-O2,' \
                        -e 's,^SSL_BASE[[:space:]]*=.*,SSL_BASE=$(STAGING_DIR)/usr,' \
                        linux-openwrt-uclibc.mk)
+       (cd $(PKG_BUILD_DIR)/sources/common/include/; \
+               echo '#define CRTMPSERVER_VERSION_RELEASE_NUMBER "$(PKG_VERSION)\n"' > version.h; \
+               echo '#define CRTMPSERVER_VERSION_CODE_NAME "Git\n"'                >> version.h)
 endef
 
 define Build/Compile
index ec758188eccc1605f2f183ff313b366579002b98..cc49523aec3513aa24ad8aaa0d396b8a120d39e5 100644 (file)
@@ -1,6 +1,6 @@
 --- a/builders/make/compile.mk
 +++ b/builders/make/compile.mk
-@@ -67,7 +67,7 @@ TINYXML_OBJS = $(TINYXML_SRCS:.cpp=.tiny
+@@ -72,7 +72,7 @@ TINYXML_OBJS = $(TINYXML_SRCS:.cpp=.tiny
  
  #common
  COMMON_INCLUDE=$(LUA_INCLUDE) $(TINYXML_INCLUDE) $(SSL_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/common/include
index c37644ce97e7272155ce77366208b87498148438..2975f000c4dc578d2a9862cb3ed2ff18f806f2f4 100644 (file)
@@ -23,7 +23,7 @@
                        -- It is optional. If not specified, it will be defaulted to:
                        -- <rootDirectory>/<name>/mediaFolder
 -                      -- mediaFolder="/some/directory/where/media/files/are/stored"
-+                      mediaFolder="/usr/share/crtmpserver/appselector",
++                      mediaFolder="/media",
                        -- the application will also be known by that names. It is optional
                        --aliases=
                        --{
                                        port=8080,
                                        protocol="inboundRtmpt"
                  },
-@@ -105,7 +98,7 @@ configuration=
-                       description="FLV Playback Sample",
-                       name="flvplayback",
-                       protocol="dynamiclinklibrary",
--                      mediaFolder="/Volumes/android/backup/media/",
-+                      mediaFolder="/media/",
-                       aliases=
-                       {
-                               "simpleLive",
-@@ -183,6 +176,7 @@ configuration=
+@@ -184,6 +177,7 @@ configuration=
                        name="samplefactory",
                        description="asdsadasdsa",
                        protocol="dynamiclinklibrary",
index 466f86c9e698ec92e4adf3f70346b9a29e0b3178..380208e803c69659458245efc5bcd00fa8e6176c 100644 (file)
@@ -1,7 +1,5 @@
-Index: crtmpserver-r726/builders/make/linux.mk
-===================================================================
---- crtmpserver-r726.orig/builders/make/linux.mk
-+++ crtmpserver-r726/builders/make/linux.mk
+--- a/builders/make/linux.mk
++++ b/builders/make/linux.mk
 @@ -38,7 +38,7 @@ dynamic_exec_flags = $(FPIC) $(OPTIMIZAT
  PLATFORM_DEFINES = \
        -DLINUX \
index f9ff617b9a0f688fc3e7be813092a1894416f9b9..25694b8f70f70fb15c391c51caeb28cc16dd4965 100644 (file)
@@ -1,22 +1,6 @@
 --- a/builders/make/compile.mk
 +++ b/builders/make/compile.mk
-@@ -43,17 +43,22 @@ FEATURES_DEFINES = \
-       -DHAS_PROTOCOL_RTP \
-       -DHAS_PROTOCOL_TS \
-       -DHAS_PROTOCOL_VAR \
-+      -DHAS_PROTOCOL_CLI \
-+      -DHAS_PROTOCOL_HLS \
-+      -DHAS_PROTOCOL_RAWHTTPSTREAM \
-       -DHAS_LUA \
-       -DHAS_MEDIA_MP3 \
-       -DHAS_MEDIA_MP4 \
--      -DHAS_MEDIA_FLV
-+      -DHAS_MEDIA_FLV \
-+      -DHAS_SYSLOG
-+      
- DEFINES = $(PLATFORM_DEFINES) $(FEATURES_DEFINES)
+@@ -58,7 +58,7 @@ DEFINES = $(PLATFORM_DEFINES) $(FEATURES
  
  #library paths
  SSL_INCLUDE=-I$(SSL_BASE)/include
@@ -25,7 +9,7 @@
  
  #lua
  LUA_INCLUDE=-I$(PROJECT_BASE_PATH)/3rdparty/lua-dev
-@@ -67,25 +72,25 @@ TINYXML_OBJS = $(TINYXML_SRCS:.cpp=.tiny
+@@ -72,25 +72,25 @@ TINYXML_OBJS = $(TINYXML_SRCS:.cpp=.tiny
  
  #common
  COMMON_INCLUDE=$(LUA_INCLUDE) $(TINYXML_INCLUDE) $(SSL_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/common/include
index 505b5f33786d832ff3728631709088c576d2b813..7b9da39a2b36a3a99e2745e224b38e70d2f14a9f 100644 (file)
@@ -23,4 +23,4 @@
 +
  #include "utils/logging/fileloglocation.h"
  #include "utils/lua/luautils.h"
+ #include "utils/misc/file.h"
index 94d80e79326d56f985aac177cdd6fb863b036375..534046f07507fad6a28b404afa6c69b2a6996ac9 100644 (file)
@@ -5,6 +5,6 @@
  #include <iostream>
  #include <sstream>
 +#include "lstate.h"
+ using namespace std;
  
  // Help out windows:
- #if defined( _DEBUG ) && !defined( DEBUG )
index 9522e83fd75b392b96e4a60ab746a9c7656c49ec..35b1aad72a2b04892c3854f11dd515a14a1cd437 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013-2015 OpenWrt.org
+# Copyright (C) 2013-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,15 +8,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xupnpd
-PKG_REV:=404
-PKG_VERSION:=$(PKG_REV)
+PKG_REV:=fdeeb919264c1dde4a2ead5045eefbe54011b2dc
+PKG_VERSION:=2016-05-11
 PKG_RELEASE:=1
 
-PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_SUBDIR:=xupnpd-$(PKG_VERSION)
-PKG_SOURCE_URL:=http://tsdemuxer.googlecode.com/svn/trunk/xupnpd/src/
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=https://github.com/clark15b/xupnpd.git
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
 
 include $(INCLUDE_DIR)/package.mk
@@ -24,7 +28,7 @@ include $(INCLUDE_DIR)/package.mk
 LUA_FLAGS:=-llua
 
 define Build/Compile
-       (cd $(PKG_BUILD_DIR); $(TARGET_CC) -v $(LUA_FLAGS) $(TARGET_CFLAGS) -fno-exceptions -fno-rtti -DWITH_URANDOM $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -lm -ldl -lcrypt -o xupnpd *.c *.cpp)
+       (cd $(PKG_BUILD_DIR)/src; $(TARGET_CC) -v $(LUA_FLAGS) $(TARGET_CFLAGS) -fno-exceptions -fno-rtti -DWITH_URANDOM $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -lm -ldl -lcrypt -o xupnpd *.c *.cpp)
 endef
 
 define Package/xupnpd
@@ -50,18 +54,18 @@ endef
 
 define Package/xupnpd/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/xupnpd $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/xupnpd $(1)/usr/bin
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/xupnpd.init $(1)/etc/init.d/xupnpd
        $(INSTALL_DIR) $(1)/usr/share/xupnpd
-       $(CP) $(PKG_BUILD_DIR)/*.lua $(1)/usr/share/xupnpd
+       $(CP) $(PKG_BUILD_DIR)/src/*.lua $(1)/usr/share/xupnpd
        $(INSTALL_DIR) $(1)/usr/share/xupnpd/ui
-       $(CP) $(PKG_BUILD_DIR)/ui/* $(1)/usr/share/xupnpd/ui
+       $(CP) $(PKG_BUILD_DIR)/src/ui/* $(1)/usr/share/xupnpd/ui
        $(INSTALL_DIR) $(1)/usr/share/xupnpd/www
-       $(CP) $(PKG_BUILD_DIR)/www/* $(1)/usr/share/xupnpd/www
+       $(CP) $(PKG_BUILD_DIR)/src/www/* $(1)/usr/share/xupnpd/www
        $(INSTALL_DIR) $(1)/usr/share/xupnpd/playlists
        $(INSTALL_DIR) $(1)/usr/share/xupnpd/plugins
-       $(CP) $(PKG_BUILD_DIR)/plugins/* $(1)/usr/share/xupnpd/plugins
+       $(CP) $(PKG_BUILD_DIR)/src/plugins/* $(1)/usr/share/xupnpd/plugins
        $(INSTALL_DIR) $(1)/usr/share/xupnpd/config
        $(INSTALL_DIR) $(1)/etc/xupnpd
        (cd $(1)/etc/xupnpd; ln -s ../../usr/share/xupnpd/config ./; ln -s ../../usr/share/xupnpd/xupnpd.lua ./)
index 89958c7fe64db8a4e84291ec824376971392ab3a..dee21a9972bff8093d50ce66a9db18d6c5f8a365 100644 (file)
@@ -1,5 +1,5 @@
---- a/xupnpd.lua
-+++ b/xupnpd.lua
+--- a/src/xupnpd.lua
++++ b/src/xupnpd.lua
 @@ -1,10 +1,10 @@
  cfg={}
  
index 68ea3e82e2c24a92897b0d1d0909569bf5180df1..4dac9d944436825ebd2d2bdd17753ee7ec935111 100644 (file)
@@ -1,5 +1,5 @@
---- a/main.cpp
-+++ b/main.cpp
+--- a/src/main.cpp
++++ b/src/main.cpp
 @@ -4,11 +4,14 @@
   * https://tsdemuxer.googlecode.com/svn/trunk/xupnpd
   */
index a83eaea094208456d91ff0d69556c49f72246cfc..eaa43393dac783e8e34b82e824d149888d241557 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=youtube-dl
-PKG_VERSION:=2016.04.19
+PKG_VERSION:=2016.05.16
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://youtube-dl.org/downloads/$(PKG_VERSION)/
-PKG_MD5SUM:=7e5c7abc22a58ed55412fe7b263ae644
+PKG_MD5SUM:=f50b53b9938eeb43a2466e451e71f474
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
 PKG_LICENSE:=Unlicense
index 3bc057cd866f5e82de82f3c7a6512251b9644606..4fa8fdf5183521195304336dcfe720af196e1f17 100644 (file)
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
-PKG_VERSION:=1.1.15
-PKG_RELEASE:=1
+PKG_VERSION:=1.1.16
+PKG_RELEASE:=2
 PKG_LICENSE:=GPL-3.0+
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 
index 7bdc729a38fc864b3399d0ccdf950eb24274fe77..86fcb208b4d04d6b16283beea0811390ba50719d 100644 (file)
@@ -103,8 +103,8 @@ A lot of people already use adblocker plugins within their desktop browsers, but
 * **new list sources:** you could add new blocklist sources on your own via uci config, all you need is a source url and an awk one-liner (see example below)
 * **AP mode:** in AP mode adblock uses automatically the local router ip as nullip address. To make sure that your LuCI interface will be still accessible, please change the local uhttpd instance to ports <> 80/443 (see example below)
 * **adblock toggle:** to quickly switch adblocking 'on' or 'off', simply use _/etc/init.d/adblock toggle_
-* **outdated configuration:** if adblock detects an outdated config file, please copy the current version from '/etc/adblock/adblock.conf.default' to '/etc/config/adblock', make your individual changes and finally restart the adblock service
-* **debugging:** for script debugging please change the 'DEBUG' variable in the header of _/usr/bin/adblock-update.sh_ from '0' to '1' and start this script directly (without any parameters)
+* **outdated configuration:** to update an outdated adblock config file, please use _/etc/init.d/adblock cfgup_, make your individual changes and restart the adblock service
+* **debugging:** for script debugging please set the 'adb\_debug' variable in the header of _/etc/init.d/adblock_ to '1'
 * **disable active dns probing in windows:** to prevent a possible yellow exclamation mark on your internet connection icon (which wrongly means connected, but no internet), please change the following registry key/value from "1" to "0" _HKLM\SYSTEM\CurrentControlSet\Services\NlaSvc\Parameters\Internet\EnableActiveProbing_
 
 ## Further adblock config options
@@ -117,6 +117,7 @@ A lot of people already use adblocker plugins within their desktop browsers, but
     * adb\_nullipv6 => IPv6 blackhole ip address (default: '::ffff:c000:0201', in AP mode: local router ip)
     * adb\_forcedns => redirect all DNS queries to local dnsmasq resolver (default: '1', enabled)
     * adb\_fetchttl => set the timeout for list downloads (default: '5' seconds)
+    * adb\_restricted => disable updates of the adblock config file (no flash writes) during runtime (default: '0', disabled)
 
 ## Examples
 
index 15773efbef09acce0e4f4ba604973d211d63ee19..c6ebc271c899379ea976a161e50bfa343ec7ef6e 100644 (file)
@@ -12,8 +12,8 @@ f_envload()
     then
         . "/lib/functions.sh"
     else
-        rc=110
-        f_log "system function library not found" "${rc}"
+        rc=-1
+        f_log "system function library not found, please check your installation"
         f_exit
     fi
 
@@ -23,8 +23,8 @@ f_envload()
     then
         . "/lib/functions/network.sh"
     else
-        rc=115
-        f_log "system network library not found" "${rc}"
+        rc=-1
+        f_log "system network library not found, please check your installation"
         f_exit
     fi
 
@@ -39,6 +39,7 @@ f_envload()
     adb_whitelist_rset="\$1 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$1)}"
     adb_forcedns=1
     adb_fetchttl=5
+    adb_restricted=0
 
     # function to parse global section by callback
     #
@@ -95,8 +96,8 @@ f_envload()
     pkg_list="$(opkg list-installed)"
     if [ -z "${pkg_list}" ]
     then
-        rc=120
-        f_log "empty package list" "${rc}"
+        rc=-1
+        f_log "empty package list, please check your installation"
         f_exit
     fi
 
@@ -114,10 +115,11 @@ f_envload()
     adb_dnsdir="/tmp/dnsmasq.d"
     adb_dnshidedir="${adb_dnsdir}/.adb_hidden"
     adb_dnsprefix="adb_list"
-    adb_uci="$(which uci)"
     adb_iptv4="$(which iptables)"
     adb_iptv6="$(which ip6tables)"
     adb_fetch="$(which wget)"
+    adb_uci="$(which uci)"
+    adb_date="$(which date)"
     unset adb_srclist adb_revsrclist adb_errsrclist
 
     # check 'enabled' & 'version' config options
@@ -125,7 +127,7 @@ f_envload()
     if [ -z "${adb_enabled}" ] || [ -z "${adb_cfgver}" ] || [ "${adb_cfgver%%.*}" != "${adb_mincfgver%%.*}" ]
     then
         rc=-1
-        f_log "outdated adblock config (${adb_mincfgver} vs. ${adb_cfgver}), please use latest version from '/etc/adblock/adblock.conf.default'"
+        f_log "outdated adblock config (${adb_mincfgver} vs. ${adb_cfgver}), please run '/etc/init.d/adblock cfgup' to update your configuration"
         f_exit
     elif [ "${adb_cfgver#*.}" != "${adb_mincfgver#*.}" ]
     then
@@ -140,8 +142,8 @@ f_envload()
 
     # check running dnsmasq instance
     #
-    rc="$(ps | grep -q "[d]nsmasq"; printf ${?})"
-    if [ $((rc)) -ne 0 ]
+    check="$(ps | pgrep -f "dnsmasq")"
+    if [ -z "${check}" ]
     then
         rc=-1
         f_log "please enable the local dnsmasq instance to use adblock"
@@ -167,6 +169,9 @@ f_envload()
         rc=-1
         f_log "no valid IPv4/IPv6 configuration found (${adb_lanif}), please set 'adb_lanif' manually"
         f_exit
+    else
+        network_get_device adb_landev4 "${adb_lanif}"
+        network_get_device adb_landev6 "${adb_lanif}"
     fi
 
     # check logical update interfaces (with default route)
@@ -184,8 +189,8 @@ f_envload()
     then
         adb_nullipv4="${adb_ipv4}"
         adb_nullipv6="${adb_ipv6}"
-        if [ "$(uci get uhttpd.main.listen_http | grep -Fo "80")" = "80" ] ||
-           [ "$(uci get uhttpd.main.listen_https | grep -Fo "443")" = "443" ]
+        if [ "$(${adb_uci} get uhttpd.main.listen_http | grep -Fo "80")" = "80" ] ||
+           [ "$(${adb_uci} get uhttpd.main.listen_https | grep -Fo "443")" = "443" ]
         then
             rc=-1
             f_log "AP mode detected, set local LuCI instance to ports <> 80/443"
@@ -207,16 +212,28 @@ f_envcheck()
 {
     local check
 
+    # log partially outdated config
+    #
     if [ "${outdate_ok}" = "true" ]
     then
-        f_log "partially outdated adblock config (${adb_mincfgver} vs. ${adb_cfgver}), please use latest version from '/etc/adblock/adblock.conf.default'"
+        f_log "partially outdated adblock config (${adb_mincfgver} vs. ${adb_cfgver}), please run '/etc/init.d/adblock cfgup' to update your configuration"
     fi
 
+    # log ap mode
+    #
     if [ "${apmode_ok}" = "true" ]
     then
         f_log "AP mode enabled"
     fi
 
+    # set & log restricted mode
+    #
+    if [ $((adb_restricted)) -eq 1 ]
+    then
+        adb_uci="$(which true)"
+        f_log "Restricted mode enabled"
+    fi
+
     # check general package dependencies
     #
     f_depend "busybox"
@@ -272,7 +289,7 @@ f_envcheck()
         then
             if [ $((av_space)) -le 2000 ]
             then
-                rc=125
+                rc=105
                 f_log "not enough free space in '${adb_tmpdir}' (avail. ${av_space} kb)" "${rc}"
                 f_exit
             else
@@ -280,7 +297,7 @@ f_envcheck()
             fi
         fi
     else
-        rc=130
+        rc=110
         f_log "temp directory not found" "${rc}"
         f_exit
     fi
@@ -337,10 +354,10 @@ f_envcheck()
         f_firewall "IPv4" "filter" "A" "forwarding_rule" "adb-fwd" "-d ${adb_nullipv4} -j REJECT --reject-with icmp-host-unreachable"
         f_firewall "IPv4" "filter" "A" "output_rule" "adb-out" "-p tcp -d ${adb_nullipv4} -j REJECT --reject-with tcp-reset"
         f_firewall "IPv4" "filter" "A" "output_rule" "adb-out" "-d ${adb_nullipv4} -j REJECT --reject-with icmp-host-unreachable"
-        if [ $((adb_forcedns)) -eq 1 ]
+        if [ $((adb_forcedns)) -eq 1 ] && [ -n "${adb_landev4}" ]
         then
-            f_firewall "IPv4" "nat" "A" "prerouting_rule" "adb-dns" "-p udp --dport 53 -j DNAT --to-destination ${adb_ipv4}:53"
-            f_firewall "IPv4" "nat" "A" "prerouting_rule" "adb-dns" "-p tcp --dport 53 -j DNAT --to-destination ${adb_ipv4}:53"
+            f_firewall "IPv4" "nat" "A" "prerouting_rule" "adb-dns" "-i ${adb_landev4} -p udp --dport 53 -j DNAT --to-destination ${adb_ipv4}:53"
+            f_firewall "IPv4" "nat" "A" "prerouting_rule" "adb-dns" "-i ${adb_landev4} -p tcp --dport 53 -j DNAT --to-destination ${adb_ipv4}:53"
         fi
         if [ "${fw_done}" = "true" ]
         then
@@ -358,10 +375,10 @@ f_envcheck()
         f_firewall "IPv6" "filter" "A" "forwarding_rule" "adb-fwd" "-d ${adb_nullipv6} -j REJECT --reject-with icmp6-addr-unreachable"
         f_firewall "IPv6" "filter" "A" "output_rule" "adb-out" "-p tcp -d ${adb_nullipv6} -j REJECT --reject-with tcp-reset"
         f_firewall "IPv6" "filter" "A" "output_rule" "adb-out" "-d ${adb_nullipv6} -j REJECT --reject-with icmp6-addr-unreachable"
-        if [ $((adb_forcedns)) -eq 1 ]
+        if [ $((adb_forcedns)) -eq 1 ] && [ -n "${adb_landev6}" ]
         then
-            f_firewall "IPv6" "nat" "A" "PREROUTING" "adb-dns" "-p udp --dport 53 -j DNAT --to-destination [${adb_ipv6}]:53"
-            f_firewall "IPv6" "nat" "A" "PREROUTING" "adb-dns" "-p tcp --dport 53 -j DNAT --to-destination [${adb_ipv6}]:53"
+            f_firewall "IPv6" "nat" "A" "PREROUTING" "adb-dns" "-i ${adb_landev6} -p udp --dport 53 -j DNAT --to-destination [${adb_ipv6}]:53"
+            f_firewall "IPv6" "nat" "A" "PREROUTING" "adb-dns" "-i ${adb_landev6} -p tcp --dport 53 -j DNAT --to-destination [${adb_ipv6}]:53"
         fi
         if [ "${fw_done}" = "true" ]
         then
@@ -372,8 +389,8 @@ f_envcheck()
 
     # check volatile adblock uhttpd instance configuration
     #
-    rc="$(ps | grep -q "[u]httpd.*\-h /www/adblock"; printf ${?})"
-    if [ $((rc)) -ne 0 ]
+    check="$(ps | pgrep -f "uhttpd -h /www/adblock")"
+    if [ -z "${check}" ]
     then
         if [ -n "${adb_wanif4}" ] && [ -n "${adb_wanif6}" ]
         then
@@ -418,7 +435,7 @@ f_depend()
     check="$(printf "${pkg_list}" | grep "^${package} -")"
     if [ -z "${check}" ]
     then
-        rc=135
+        rc=115
         f_log "package '${package}' not found" "${rc}"
         f_exit
     fi
@@ -600,14 +617,14 @@ f_restore()
     then
         /etc/init.d/dnsmasq restart
         sleep 1
-        rc="$(ps | grep -q "[d]nsmasq"; printf ${?})"
-        if [ $((rc)) -eq 0 ]
+        check="$(ps | pgrep -f "dnsmasq")"
+        if [ -n "${check}" ]
         then
             rc=0
             f_cntconfig
             f_log "adblock lists with overall ${adb_count} domains loaded"
         else
-            rc=140
+            rc=120
             f_log "dnsmasq restart failed, please check 'logread' output" "${rc}"
         fi
     fi
@@ -620,6 +637,7 @@ f_exit()
 {
     local ipv4_adblock=0
     local ipv6_adblock=0
+    local lastrun="$(${adb_date} "+%d.%m.%Y %H:%M:%S")"
 
     # delete temporary files & directories
     #
@@ -651,14 +669,14 @@ f_exit()
             "${adb_uci}" -q commit "adblock"
         fi
         f_log "firewall statistics (IPv4/IPv6): ${ipv4_adblock}/${ipv6_adblock} ad related packets blocked"
-        f_log "domain adblock processing finished successfully (${adb_scriptver}, ${adb_sysver}, $(/bin/date "+%d.%m.%Y %H:%M:%S"))"
+        f_log "domain adblock processing finished successfully (${adb_scriptver}, ${adb_sysver}, ${lastrun})"
     elif [ $((rc)) -gt 0 ]
     then
         if [ -n "$(${adb_uci} -q changes adblock)" ]
         then
             "${adb_uci}" -q revert "adblock"
         fi
-        f_log "domain adblock processing failed (${adb_scriptver}, ${adb_sysver}, $(/bin/date "+%d.%m.%Y %H:%M:%S"))"
+        f_log "domain adblock processing failed (${adb_scriptver}, ${adb_sysver}, ${lastrun})"
     else
         rc=0
     fi
index 222e41247bed745dafc517e0460f9095f169d42c..b5dbed9e1f1b37e063065cc2a5653b53d7ea7321 100755 (executable)
 #
 LC_ALL=C
 
-# script debug switch (disabled by default)
-# set 'DEBUG=1' to enable script debugging
+# quiet output if 'adb_debug' not set
 #
-DEBUG=0
-if [ $((DEBUG)) -eq 0 ]
+if [ -z "${adb_debug}" ]
 then
     exec 2>/dev/null
 fi
@@ -37,7 +35,7 @@ fi
 # get current directory and set script/config version
 #
 adb_scriptdir="${0%/*}"
-adb_scriptver="1.1.15"
+adb_scriptver="1.1.16"
 adb_mincfgver="2.0"
 
 # source in adblock function library
@@ -303,8 +301,8 @@ then
     "${adb_uci}" -q set "adblock.global.adb_dnstoggle=on"
     /etc/init.d/dnsmasq restart
     sleep 1
-    rc="$(ps | grep -q "[d]nsmasq"; printf ${?})"
-    if [ $((rc)) -eq 0 ]
+    check="$(ps | pgrep -f "dnsmasq")"
+    if [ -n "${check}" ]
     then
         f_log "adblock lists with overall ${adb_count} domains loaded"
     else
index c3a0845961533f35096680520d1ac2af6012a73d..de4c2fb933755ebf17e77db8a0c48b7093958cef 100644 (file)
@@ -7,7 +7,6 @@ config adblock 'global'
        option adb_whitelist '/etc/adblock/adblock.whitelist'
        option adb_whitelist_rset '\$1 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$1)}'
        option adb_forcedns '1'
-       option adb_dnstoggle 'on'
 
 config service 'backup'
        option enabled '0'
index edd29a1101f605046eb24127b629fbef43899b17..e27a3fd16dc1748ed624c9ac12a9d1ad93bbc87e 100755 (executable)
@@ -2,18 +2,29 @@
 #
 
 START=99
-EXTRA_COMMANDS="toggle"
-EXTRA_HELP="        toggle  Toggle adblocking 'on' or 'off'"
+EXTRA_COMMANDS="toggle cfgup"
+EXTRA_HELP="   toggle  Toggle adblocking 'on' or 'off'
+       cfgup   Update the adblock configuration file"
 
-exec 2>/dev/null
+PATH="/usr/sbin:/usr/bin:/sbin:/bin"
+
+adb_debug=0
+if [ $((adb_debug)) -eq 0 ]
+then
+    exec 2>/dev/null
+fi
 adb_pid="${$}"
 adb_script="/usr/bin/adblock-update.sh"
 adb_dnsdir="/tmp/dnsmasq.d"
 adb_dnshidedir="${adb_dnsdir}/.adb_hidden"
 adb_dnsprefix="adb_list"
 adb_pidfile="/var/run/adblock.pid"
-adb_logger="$(which logger)"
+adb_log="$(which logger)"
 adb_uci="$(which uci)"
+if [ "$(${adb_uci} -q get "adblock.global.adb_restricted")" = "1" ]
+then
+    adb_uci="$(which true)"
+fi
 
 if [ -t 1 ]
 then
@@ -26,11 +37,11 @@ fi
 
 if [ -r "${adb_pidfile}" ]
 then
-    "${adb_logger}" ${log_parm} -t "adblock[${adb_pid}] error" "adblock service already running ($(cat ${adb_pidfile})" 2>&1
+    "${adb_log}" ${log_parm} -t "adblock[${adb_pid}] error" "adblock service already running ($(cat ${adb_pidfile}))" 2>&1
     exit 255
 fi
 
-remove_config()
+rm_config()
 {
     local value opt section="${1}" options="adb_src_timestamp adb_src_count"
     for opt in ${options}
@@ -62,32 +73,17 @@ reload()
     start
 }
 
-toggle()
+stop()
 {
-if [ -d "${adb_dnshidedir}" ]
-then
-    list_dns="$(find "${adb_dnsdir}" -maxdepth 1 -type f -name "${adb_dnsprefix}*" -print)"
-    list_dnshide="$(find "${adb_dnshidedir}" -maxdepth 1 -type f -name "${adb_dnsprefix}*" -print)"
-    if [ -n "${list_dns}" ]
-    then
-        mv -f "${adb_dnsdir}/${adb_dnsprefix}"* "${adb_dnshidedir}"
-        "${adb_uci}" -q set "adblock.global.adb_dnstoggle=off"
-        "${adb_uci}" -q commit "adblock"
-        /etc/init.d/dnsmasq restart
-        "${adb_logger}" ${log_parm} -t "adblock[${adb_pid}] info " "toggle for adblocking switched 'off'" 2>&1
-    elif [ -n "${list_dnshide}" ]
+    if [ -n "$(${adb_uci} -q get "adblock.global.adb_overall_count")" ]
     then
-        mv -f "${adb_dnshidedir}/${adb_dnsprefix}"* "${adb_dnsdir}"
-        "${adb_uci}" -q set "adblock.global.adb_dnstoggle=on"
+        . "/lib/functions.sh"
+        config_load adblock
+        config_foreach rm_config source
+        "${adb_uci}" -q delete "adblock.global.adb_dnstoggle"
+        "${adb_uci}" -q delete "adblock.global.adb_overall_count"
         "${adb_uci}" -q commit "adblock"
-        /etc/init.d/dnsmasq restart
-        "${adb_logger}" ${log_parm} -t "adblock[${adb_pid}] info " "toggle for adblocking switched 'on'" 2>&1
     fi
-fi
-}
-
-stop()
-{
     if [ -d "${adb_dnshidedir}" ]
     then
         find "${adb_dnshidedir}" -maxdepth 1 -type f -name "${adb_dnsprefix}*" -exec mv -f "{}" "${adb_dnsdir}" \;
@@ -96,26 +92,55 @@ stop()
     rc=${?}
     if [ $((rc)) -eq 0 ] && [ -n "${rm_done}" ]
     then
-        . "/lib/functions.sh"
-        config_load adblock
-        config_foreach remove_config source
-        "${adb_uci}" -q set "adblock.global.adb_dnstoggle=on"
-        "${adb_uci}" -q delete "adblock.global.adb_overall_count"
-        "${adb_uci}" -q commit "adblock"
         rm -rf "${adb_dnshidedir}"
         /etc/init.d/dnsmasq restart
         /etc/init.d/firewall restart
     fi
-
-    uhttpd_pid="$(ps | grep "[u]httpd.*\-h /www/adblock" | awk '{print $1}')"
+    uhttpd_pid="$(ps | pgrep -f "uhttpd -h /www/adblock")"
     if [ -n "${uhttpd_pid}" ]
     then
         kill -9 "${uhttpd_pid}"
     fi
-
     if [ -n "${rm_done}" ] || [ -n "${uhttpd_pid}" ]
     then
-        "${adb_logger}" ${log_parm} -t "adblock[${adb_pid}] info " "all adblock related services stopped" 2>&1
+        "${adb_log}" ${log_parm} -t "adblock[${adb_pid}] info " "all adblock related services stopped" 2>&1
     fi
     return 0
 }
+
+toggle()
+{
+    if [ -d "${adb_dnshidedir}" ]
+    then
+        list_dns="$(find "${adb_dnsdir}" -maxdepth 1 -type f -name "${adb_dnsprefix}*" -print)"
+        list_dnshide="$(find "${adb_dnshidedir}" -maxdepth 1 -type f -name "${adb_dnsprefix}*" -print)"
+        if [ -n "${list_dns}" ]
+        then
+            mv -f "${adb_dnsdir}/${adb_dnsprefix}"* "${adb_dnshidedir}"
+            "${adb_uci}" -q set "adblock.global.adb_dnstoggle=off"
+            "${adb_uci}" -q commit "adblock"
+            /etc/init.d/dnsmasq restart
+            "${adb_log}" ${log_parm} -t "adblock[${adb_pid}] info " "toggle for adblocking switched 'off'" 2>&1
+        elif [ -n "${list_dnshide}" ]
+        then
+            mv -f "${adb_dnshidedir}/${adb_dnsprefix}"* "${adb_dnsdir}"
+            "${adb_uci}" -q set "adblock.global.adb_dnstoggle=on"
+            "${adb_uci}" -q commit "adblock"
+            /etc/init.d/dnsmasq restart
+            "${adb_log}" ${log_parm} -t "adblock[${adb_pid}] info " "toggle for adblocking switched 'on'" 2>&1
+        fi
+    fi
+}
+
+cfgup()
+{
+    stop
+    cp -pf "/etc/adblock/adblock.conf.default" "/etc/config/adblock"
+    rc=$?
+    if [ $((rc)) -eq 0 ]
+    then
+        "${adb_log}" ${log_parm} -t "adblock[${adb_pid}] info " "default adblock configuration applied, please check the settings in '/etc/config/adblock'" 2>&1
+    else
+        "${adb_log}" ${log_parm} -t "adblock[${adb_pid}] info " "default adblock configuration not found, please re-install the package via 'opkg install adblock --force-maintainer'" 2>&1
+    fi
+}
index ec21fafe7dab98d5a081308ec3669b95f3e07bc4..b0d7309d33c00320aeda1d65ff94a688426282e6 100644 (file)
@@ -23,6 +23,23 @@ config ARIA2_BITTORRENT
 
 config ARIA2_METALINK
        bool "Enable metalink support"
-       default N
+       default n
+
+config ARIA2_SFTP
+        bool "Enable sftp support"
+        default n
+
+choice
+       prompt "XML library"
+       default ARIA2_EXPAT
+       depends on ARIA2_METALINK
+
+config ARIA2_EXPAT
+       bool "EXPAT"
+
+config ARIA2_LIBXML2
+       bool "LIBXML2"
+
+endchoice
 
 endmenu
index cac017a6c0f450abdd72a84cb3584afeaa98d2b0..c8f4cef0c0ef3d9bfbf734b687e72f5208d7c932 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012-2014 OpenWrt.org
+# Copyright (C) 2012-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,15 +7,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=aria2
-PKG_VERSION:=1.18.7
-PKG_RELEASE:=1
+PKG_VERSION:=1.23.0
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/aria2
-PKG_MD5SUM:=36e92af92b4370817c577ed802546842
+PKG_SOURCE_URL:=https://github.com/aria2/aria2/releases/download/release-$(PKG_VERSION)/
+PKG_MD5SUM:=bc41d919e7d89835ee01c1175300eddc
 PKG_INSTALL:=1
 
-PKG_MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
+PKG_MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>, Hsing-Wang Liao <kuoruan@gmail.com>
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=COPYING
 
@@ -24,7 +24,10 @@ PKG_CONFIG_DEPENDS := \
   ARIA2_OPENSSL \
   ARIA2_GNUTLS \
   ARIA2_BITTORRENT \
-  ARIA2_METALINK
+  ARIA2_METALINK \
+  ARIA2_SFTP \
+  ARIA2_EXPAT \
+  ARIA2_LIBXML2
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -37,8 +40,8 @@ define Package/aria2
   CATEGORY:=Network
   SUBMENU:=File Transfer
   TITLE:=lightweight download utility
-  URL:=http://aria2.sourceforge.net/
-  DEPENDS:=+zlib +ARIA2_METALINK:libxml2 +libstdcpp +ARIA2_OPENSSL:libopenssl +ARIA2_GNUTLS:libgnutls
+  URL:=https://aria2.github.io/
+  DEPENDS:=+zlib +ARIA2_SFTP:libssh2 +ARIA2_LIBXML2:libxml2 +ARIA2_EXPAT:libexpat +libstdcpp +ARIA2_OPENSSL:libopenssl +ARIA2_GNUTLS:libgnutls
 endef
 
 define Package/aria2/description
@@ -53,18 +56,26 @@ CONFIGURE_ARGS += \
        $(if $(CONFIG_ARIA2_GNUTLS),--with,--without)-gnutls \
        $(if $(CONFIG_ARIA2_BITTORRENT),--enable,--disable)-bittorrent \
        $(if $(CONFIG_ARIA2_METALINK),--enable,--disable)-metalink \
-       $(if $(CONFIG_ARIA2_METALINK),--with,--without)-libxml2 \
+       $(if $(CONFIG_ARIA2_SFTP),--with,--without)-libssh2 \
+       $(if $(CONFIG_ARIA2_LIBXML2),--with,--without)-libxml2 \
+       $(if $(CONFIG_ARIA2_EXPAT),--with,--without)-libexpat \
        --without-libnettle \
        --without-libgmp \
        --without-libgcrypt \
-       --without-libexpat \
        --without-libcares \
+       --without-libuv \
        --without-sqlite3 \
        --with-libz
 
 define Package/aria2/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aria2c $(1)/usr/bin
+
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/aria2.init $(1)/etc/init.d/aria2
+
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_CONF) ./files/aria2.conf $(1)/etc/config/aria2
 endef
 
 $(eval $(call BuildPackage,aria2))
diff --git a/net/aria2/files/aria2.conf b/net/aria2/files/aria2.conf
new file mode 100644 (file)
index 0000000..22aca30
--- /dev/null
@@ -0,0 +1,10 @@
+
+config aria2 'main'
+       option enabled '0'
+       option file_allocation 'none'
+       option bt_enable_lpd 'true'
+       option enable_dht 'true'
+       option follow_torrent 'true'
+       option user 'root'
+       option dir '/mnt/sda1'
+       option save_session_interval '30'
diff --git a/net/aria2/files/aria2.init b/net/aria2/files/aria2.init
new file mode 100755 (executable)
index 0000000..4205273
--- /dev/null
@@ -0,0 +1,78 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2014-2016 nanpuyue <nanpuyue@gmail.com>
+
+START=99
+SERVICE_WRITE_PID=1
+SERVICE_DAEMONIZE=1
+
+
+append_params() {
+       local p; local v; local s="$1"; shift
+       for p in $*; do
+               config_get v "$s" "$p"
+               [ -n "$v" ] && (
+                       p=$(echo "$p" | sed -e 's|_|-|g');
+                       echo "$p=$v" >> $config_file
+                       )
+       done
+}
+
+section_enabled() {
+       local result
+       config_get_bool result "$1" 'enabled' 0
+       [ $result -eq 1 ]
+}
+
+option_disabled() {
+       local result
+       config_get_bool result "$1" "$2" 1
+       [ $result -eq 0 ]
+}
+
+start_instance() {
+       local s="$1"
+       local user
+
+       section_enabled "$s" || return 1
+
+       config_get config_dir "$s" 'config_dir' '/var/etc/aria2'
+       config_get user "$s" 'user'
+
+       config_file="$config_dir/aria2.conf"
+       session_file="$config_dir/aria2.session"
+       dht_file="$config_dir/dht.dat"
+       [ -d "$config_dir" ] || {
+               mkdir -m 0755 -p "$config_dir"
+               touch "$config_file"
+               [ -z "$user" ] || chown -R $user $config_dir
+       }
+       touch "$session_file"
+
+       echo -e "enable-rpc=true\nrpc-allow-origin-all=true\nrpc-listen-all=true\nquiet=true" > $config_file
+       echo -e "continue=true\ninput-file=$session_file\nsave-session=$session_file" >> $config_file
+       option_disabled "$s" 'enable_dht' || echo "dht-file-path=$dht_file" >> $config_file
+
+       append_params "$s" \
+               file_allocation bt_enable_lpd enable_dht rpc_user rpc_passwd rpc_listen_port dir bt_tracker disk_cache \
+               max_overall_download_limit max_overall_upload_limit max_download_limit max_upload_limit max_concurrent_downloads \
+               max_connection_per_server min_split_size split save_session_interval follow_torrent listen_port bt_max_peers \
+               peer_id_prefix user_agent rpc_secret
+       
+       config_list_foreach "$s" extra_settings append_extrasettings
+       
+       SERVICE_UID="$user" \
+       service_start /usr/bin/aria2c --conf-path="$config_file"
+}
+
+append_extrasettings() {
+       echo "$1" >> $config_file
+}
+
+start() {
+       config_load 'aria2'
+       config_foreach start_instance 'aria2'
+}
+
+stop() {
+       service_stop /usr/bin/aria2c
+}
index 3724d36d5ef295042ff0d9023c203f3f705bb195..5e6f3acdfde7e87633c185eb55d640cddd51b236 100755 (executable)
@@ -12,7 +12,7 @@ PKG_NAME:=ddns-scripts
 PKG_VERSION:=2.7.1
 # Release == build
 # increase on changes of services files or tld_names.dat
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>
index 72deca0bf475c51530dd74ba3d92bc827913f246..93a35c8c30aa3611f0088ef94e460d70f659c968 100755 (executable)
@@ -956,6 +956,7 @@ get_registered_ip() {
        # 1     no IP detected
 
        [ $# -lt 1 -o $# -gt 2 ] && write_log 12 "Error calling 'get_registered_ip()' - wrong number of parameters"
+       [ $is_glue -eq 1 ] && [ -z "$(which host)" ] && write_log 12 "Update of glue records is only supported using BIND host"
        write_log 7 "Detect registered/public IP"
 
        # set correct regular expression
@@ -968,6 +969,7 @@ get_registered_ip() {
                        [ $use_ipv6 -eq 0 ] && __PROG="$__PROG -4"  || __PROG="$__PROG -6"
                fi
                [ $force_dnstcp -eq 1 ] && __PROG="$__PROG -T"  # force TCP
+               [ $is_glue -eq 1 ] && __PROG="$__PROG -v" # use verbose output to get additional section
 
                __RUNPROG="$__PROG $lookup_host $dns_server >$DATFILE 2>$ERRFILE"
                __PROG="BIND host"
@@ -1039,6 +1041,12 @@ get_registered_ip() {
                else
                        if [ "$__PROG" = "BIND host" ]; then
                                __DATA=$(cat $DATFILE | awk -F "address " '/has/ {print $2; exit}' )
+
+                               if [ $is_glue -eq 1 ]; then
+                                       __DATA=$(cat $DATFILE | grep "^$lookup_host" | grep -m 1 -o "$__REGEX" )
+                               else
+                                       __DATA=$(cat $DATFILE | awk -F "address " '/has/ {print $2; exit}' )
+                               fi
                        elif [ "$__PROG" = "Knot host" ]; then
                                __DATA=$(cat $DATFILE | awk -F "address " '/has/ {print $2; exit}' )
                        elif [ "$__PROG" = "drill" ]; then
index 02a61dfe90205a900c9bddb6050337c19aaff1be..31dac5eff64097b000f9f7e3b47c9fb89c56accf 100755 (executable)
@@ -110,6 +110,7 @@ trap "trap_handler 15" 15   # SIGTERM       Termination
 # force_dnstcp         force communication with DNS server via TCP instead of default UDP
 # proxy                        using a proxy for communication !!! ALSO used to detect local IP via web => return proxy's IP !!!
 # use_logfile          self-explanatory "/var/log/ddns/$SECTION_ID.log"
+# is_glue                      the record that should be updated is a glue record
 #
 # some functionality needs
 # - GNU Wget or cURL installed for sending updates to DDNS service
index af07476366145ae08ef44b7c4118570652c37133..d27ee6412e46ab79111dea18d6754c3f4b72c6bd 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nginx
-PKG_VERSION:=1.10.0
+PKG_VERSION:=1.10.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://nginx.org/download/
-PKG_MD5SUM:=c184c873d2798c5ba92be95ed1209c02
+PKG_MD5SUM:=088292d9caf6059ef328aa7dda332e44
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
 PKG_LICENSE:=2-clause BSD-like license
 
index 93c1a88dee23972e4d9f2e20676924a5ab56f4bd..266dfb2eb2fb26fdee17ef3e3c97b08c0a14c1f3 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012-2015 OpenWrt.org
+# Copyright (C) 2012-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tgt
-PKG_VERSION:=1.0.61
-PKG_REV:=f13345e12f49e5bcae2cfd6c5c7d530b328753f0
+PKG_VERSION:=1.0.64
+PKG_REV:=c4d6222b996cae8065fbede9fb2fa2b3cc48290d
 PKG_RELEASE:=1
 PKG_USE_MIPS16:=0
 
index c67d68542dc00606c127904ca18a6fca5339e281..0120595fd21fc5b3883f93de6f61822ec2b50c3d 100644 (file)
@@ -1,38 +1,31 @@
 diff --git a/usr/Makefile b/usr/Makefile
-index 1fae7e7..b05b970 100644
+index d4e3eaf..ec1c9a3 100644
 --- a/usr/Makefile
 +++ b/usr/Makefile
-@@ -1,13 +1,13 @@
+@@ -1,11 +1,11 @@
  sbindir ?= $(PREFIX)/sbin
  libdir ?= $(PREFIX)/lib/tgt
  
 -ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),)
-+#ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),)
++ifneq ($(shell test -n $(shell find $(STAGING_DIR)/usr/include -name "signalfd.h" | head -n1) && echo 1),)
  CFLAGS += -DUSE_SIGNALFD
--endif
-+#endif
+ endif
  
--ifneq ($(shell test -e /usr/include/sys/timerfd.h && echo 1),)
-+#ifneq ($(shell test -e /usr/include/sys/timerfd.h && echo 1),)
+-ifneq ($(shell test -n $(shell find /usr/include -name "timerfd.h" | head -n1) && echo 1),)
++ifneq ($(shell test -n $(shell find $(STAGING_DIR)/usr/include -name "timerfd.h" | head -n1) && echo 1),)
  CFLAGS += -DUSE_TIMERFD
--endif
-+#endif
+ endif
  
- TGTD_OBJS += $(addprefix iscsi/, conn.o param.o session.o \
-               iscsid.o target.o chap.o sha1.o md5.o transport.o iscsi_tcp.o \
-@@ -25,8 +25,9 @@ ifneq ($(SD_NOTIFY),)
+@@ -25,7 +25,7 @@ ifneq ($(SD_NOTIFY),)
  CFLAGS += -DUSE_SYSTEMD
  endif
  
 -ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),)
--CFLAGS += -DUSE_EVENTFD
-+#ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e $(STAGING_DIR)/usr/include/libaio.h && echo 1),)
-+ifneq ((test -e $(STAGING_DIR)/usr/include/libaio.h && echo 1),)
-+CFLAGS += -DUSE_EVENTFD -I$(STAGING_DIR)/usr/include/
++ifneq ($(shell test -n $(shell find $(STAGING_DIR)/usr/include -name "eventfd.h" | head -n1) && test -n $(shell find $(STAGING_DIR)/usr/include -name "libaio.h" | head -n1) && echo 1),)
+ CFLAGS += -DUSE_EVENTFD
  TGTD_OBJS += bs_aio.o
  LIBS += -laio
- endif
-@@ -55,7 +56,7 @@ ifneq ($(SD_NOTIFY),)
+@@ -55,7 +55,7 @@ ifneq ($(SD_NOTIFY),)
  LIBS += -lsystemd
  endif
  
@@ -41,13 +34,13 @@ index 1fae7e7..b05b970 100644
  TGTD_OBJS += tgtd.o mgmt.o target.o scsi.o log.o driver.o util.o work.o \
                concat_buf.o parser.o spc.o sbc.o mmc.o osd.o scc.o smc.o \
                ssc.o libssc.o bs_rdwr.o bs_ssc.o \
-@@ -82,14 +83,8 @@ tgtadm: $(TGTADM_OBJS)
+@@ -82,14 +82,6 @@ tgtadm: $(TGTADM_OBJS)
  
  -include $(TGTADM_DEP)
  
 -TGTIMG_OBJS = tgtimg.o libssc.o libcrc32c.o
- TGTIMG_DEP = $(TGTIMG_OBJS:.o=.d)
+-TGTIMG_DEP = $(TGTIMG_OBJS:.o=.d)
+-
 -tgtimg: $(TGTIMG_OBJS)
 -      $(CC) $^ -o $@
 -
index 802e60b066b92f1832d2f8d12576751eb0112f3d..7921cbcde2291926d0a6cbdf84f099a15a029dfd 100644 (file)
@@ -31,7 +31,7 @@ start() {
                init_iface() {
                        local ifn="$1"
 
-                       [ -n "$url" ] && {
+                       if [ -n "$url" ]; then
                                local try=0
                                local max=3
                                local hostname="$(cat /proc/sys/kernel/hostname)"
@@ -45,7 +45,13 @@ start() {
                                                sleep 30
                                        fi
                                done
-                       }
+                       elif [ -n "$backup_dir" ]; then
+                               if cp -f "$backup_dir/$ifn" "$lib/" &>/dev/null; then
+                                       logger -t "vnstat" "Restored backup for database $ifn"
+                               else
+                                       logger -t "vnstat" "Restore of backup for database $ifn failed"
+                               fi
+                       fi
 
                        /usr/bin/vnstat -u -i "$ifn" >/dev/null
 
@@ -57,6 +63,7 @@ start() {
 
                config_get url "$cfg" remote
                config_get lnk "$cfg" symlink
+               config_get backup_dir "$cfg" backup_dir
                config_list_foreach "$cfg" interface init_iface
 
                return 1
diff --git a/net/webui-aria2/Makefile b/net/webui-aria2/Makefile
new file mode 100644 (file)
index 0000000..02ec30e
--- /dev/null
@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2016 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=webui-aria2
+PKG_VERSION:=2016-05-30
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/ziahamza/webui-aria2.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=a4b1e954f15a2cc69dd0cb2092c44a549715b2e7
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=Hsing-Wang Liao <kuoruan@gmail.com>
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/webui-aria2
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Download Manager
+  DEPENDS:=
+  TITLE:=An interface to interact with aria2
+  URL:=https://github.com/ziahamza/webui-aria2
+  PKGARCH:=all
+endef
+
+define Package/webui-aria2/description
+       The aim for this project is to create the worlds best and hottest interface to interact with aria2. Very simple to use.
+endef
+
+define Build/Compile
+endef
+
+define Package/webui-aria2/install
+       $(INSTALL_DIR) $(1)/www/webui-aria2
+
+       $(CP) $(PKG_BUILD_DIR)/fonts $(1)/www/webui-aria2
+       $(CP) $(PKG_BUILD_DIR)/flags $(1)/www/webui-aria2
+       $(CP) $(PKG_BUILD_DIR)/js $(1)/www/webui-aria2
+       $(CP) $(PKG_BUILD_DIR)/img $(1)/www/webui-aria2
+       $(CP) $(PKG_BUILD_DIR)/css $(1)/www/webui-aria2
+       $(CP) $(PKG_BUILD_DIR)/index.html $(1)/www/webui-aria2
+       $(CP) $(PKG_BUILD_DIR)/favicon.ico $(1)/www/webui-aria2
+       $(CP) $(PKG_BUILD_DIR)/configuration.js $(1)/www/webui-aria2
+endef
+
+$(eval $(call BuildPackage,webui-aria2))
diff --git a/net/yaaw/Makefile b/net/yaaw/Makefile
new file mode 100644 (file)
index 0000000..e78a7d6
--- /dev/null
@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2016 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=yaaw
+PKG_VERSION:=2016-05-28
+PKG_RELEASE:=1
+PKG_MAINTAINER:=Hsing-Wang Liao <kuoruan@gmail.com>
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/binux/yaaw.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=c28cde2252b707fe0661693f78c5e5e3beee09a1
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+
+PKG_LICENSE:=LGPL-3.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/yaaw
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Download Manager
+  DEPENDS:=
+  TITLE:=Yet another aria2 web frontend
+  URL:=https://github.com/binux/yaaw
+  PKGARCH:=all
+endef
+
+define Package/yaaw/description
+       Yet Another Aria2 Web Frontend in pure HTML/CSS/Javascirpt.
+endef
+
+define Build/Compile
+endef
+
+define Package/yaaw/install
+       $(INSTALL_DIR) $(1)/www/yaaw
+       $(CP) $(PKG_BUILD_DIR)/js $(1)/www/yaaw
+       $(CP) $(PKG_BUILD_DIR)/img $(1)/www/yaaw
+       $(CP) $(PKG_BUILD_DIR)/css $(1)/www/yaaw
+       $(CP) $(PKG_BUILD_DIR)/index.html $(1)/www/yaaw
+       $(CP) $(PKG_BUILD_DIR)/offline.appcache $(1)/www/yaaw
+endef
+
+$(eval $(call BuildPackage,yaaw))
index a35f64386cfd796e8d401712c072cd32bfb1bf97..8c253f970f7ff9fcfa28b2a66e73c22c353f6d76 100644 (file)
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shairport-sync
-PKG_VERSION:=2.8.2
+PKG_VERSION:=2.8.4
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
index f2256a4e2cabba0d2101ed1c1030382511f47784..96917af6cc8c1e407d81caa8c59f508ffc035598 100644 (file)
@@ -10,7 +10,7 @@ config shairport-sync 'shairport_sync'
        option disabled '1'
        option respawn '1'
        # General
-       option name 'Shairport-Sync'
+       option name 'Shairport-Sync-%v-%h'
        option password ''
        option interpolation '' # basic/soxr
        option output_backend '' # alsa/pipe/stdout/ao/dummy/pulse/sndio
@@ -25,10 +25,15 @@ config shairport-sync 'shairport_sync'
        option ignore_volume_control '' # no/yes
        option volume_range_db '' # 30 to 150
        option regtype '' # _raop._tcp
+       option playback_mode '' # stereo/mono
        # Metadata
        option metadata_enabled '' # no/yes
        option metadata_cover_art '' # no/yes
        option metadata_pipe_name '' # /tmp/shairport-sync-metadata
+       option metadata_pipe_timeout '' # 5000
+       option metadata_socket_address '' # 226.0.0.1
+       option metadata_socket_port '' # 5555
+       option metadata_socket_msglength # 65000
        # Session Control
        option sesctl_run_before_play_begins '' # /etc/shairport-sync-start.sh
        option sesctl_run_after_play_ends '' # /etc/shairport-sync-stop.sh
index 68c5a6d30718ee3b4981cf9d2fbc9f8d413385e9..afda520e8e192bfa88d0c706bd2b4ee7ee4f56ec 100644 (file)
@@ -60,6 +60,7 @@ start_instance() {
                append_str "$cfg" "$conf_file" ignore_volume_control "ignore_volume_control"
                append_num "$cfg" "$conf_file" volume_range_db "volume_range_db"
                append_str "$cfg" "$conf_file" regtype "regtype"
+               append_str "$cfg" "$conf_file" playback_mode "playback_mode"
                echo -e "};\n" >> $conf_file
 
                # Metadata
@@ -68,6 +69,10 @@ start_instance() {
                append_str "$cfg" "$conf_file" metadata_enabled "enabled"
                append_str "$cfg" "$conf_file" metadata_cover_art "include_cover_art"
                append_str "$cfg" "$conf_file" metadata_pipe_name "pipe_name"
+               append_num "$cfg" "$conf_file" metadata_pipe_timeout "pipe_timeout"
+               append_str "$cfg" "$conf_file" metadata_socket_address "socket_address"
+               append_num "$cfg" "$conf_file" metadata_socket_port "socket_port"
+               append_num "$cfg" "$conf_file" metadata_socket_msglength "socket_msglength"
                echo -e "};\n" >> $conf_file
 
                # Session control
index 9c2c1cc95256c4d2da5b78277b67addb7405fb9a..27bbee8594d44d50a6e8456c1b966b9eb65add06 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2015 OpenWrt.org
+# Copyright (C) 2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=upmpdcli
-PKG_VERSION:=0.11.0
-PKG_RELEASE:=1
+PKG_VERSION:=1.1.3
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.lesbonscomptes.com/upmpdcli/downloads
-PKG_MD5SUM:=40eb2a1988ca367a690fb2506e0f73c1
+PKG_MD5SUM:=de9f232d6d5f746ec81ec239e11bdda4
 PKG_MAINTAINER:=Petko Bordjukov <bordjukov@gmail.com>
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
@@ -55,7 +55,7 @@ ifneq ($(CONFIG_PACKAGE_UPMPDCLI_SC_WEB_INTERFACE),y)
        $(RM) -rf $(PKG_INSTALL_DIR)/usr/share/upmpdcli/web
 endif
        $(CP) $(PKG_INSTALL_DIR)/usr/share/upmpdcli $(1)/usr/share/
-       $(INSTALL_DATA) ./files/upmpdcli.png $(1)/usr/share/upmpdcli/
+       $(INSTALL_DATA) ./files/upmpdcli.png $(1)/usr/share/upmpdcli/icon.png
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/upmpdcli.init $(1)/etc/init.d/upmpdcli
 endef
index 9b1ca6db7302bc01ade78cc488761ce1c6c49d84..3030ae3a4d7efd8e0bd007753c78c2d33a2fe48d 100644 (file)
@@ -1,9 +1,11 @@
---- a/src/upmpdcli.conf
-+++ b/src/upmpdcli.conf
-@@ -53,3 +53,6 @@ ohmetapersist = 1
- #  Path to the sc2mpd if it is not in /usr/bin and the location is not in
- #  the PATH for the init scripts.
- #sc2mpd = /usr/bin/sc2mpd
-+
-+# Icon for MPD UPnP interface
-+iconpath = /usr/share/upmpdcli/upmpdcli.png
+--- a/src/upmpdcli.conf-dist
++++ b/src/upmpdcli.conf-dist
+@@ -24,7 +24,7 @@
+ # You can set a path to an icon here. The icon will be displayed by a control
+ # point. The icon will only be read once, when upmpdcli starts up.
+-# iconpath = /usr/share/upmpdcli/icon.png
++iconpath = /usr/share/upmpdcli/icon.png
+ # You can set a path to an html file here, to replace the default
+ # presentation page. The page will only be read once, when upmpdcli starts
index 4f174ae3d475923ff50836d63c4650b34e850453..9c6eac623455ce339aa305e552a8348fbd367002 100644 (file)
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dump1090
-PKG_VERSION:=2016-02-25
+PKG_VERSION:=2016-06-01
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/mutability/dump1090.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=214bc0e587fa70b7206c094e10e62c88bf387322
+PKG_SOURCE_VERSION:=8b341f39e514aa77ed3b33cee65697394cb9f1a7
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
 
index da8f9c2c8b306151b2434cd9f7af6a1725d5db87..d1cb71d09d752d53919b7a7772d172ecdd526a5e 100644 (file)
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gammu
-PKG_VERSION:=1.37.2
+PKG_VERSION:=1.37.3
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://dl.cihar.com/gammu/releases/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_MD5SUM:=c31bd4a81a447e98ea66797429b55281
+PKG_MD5SUM:=bdb20d5e52f750dbe9aaf1cc8eed0822
 PKG_MAINTAINER:=Vitaly Protsko <villy@sft.ru>
 PKG_LICENCE:=GPL-2.0
 
index 209a3ed09b157b422476c4da1217147053628308..921916815ff6769004ed7ab4ff546ddc6fc6e747 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pciutils
-PKG_VERSION:=3.4.1
-PKG_RELEASE:=3
+PKG_VERSION:=3.5.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@KERNEL/software/utils/pciutils
-PKG_MD5SUM:=e901d17fcc6850747f43efde4de3452b
+PKG_MD5SUM:=979e4b1c17e9be83c00113f0f99a8a7b
 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
 
 PKG_LICENSE:=GPL-2.0
index 3632fca9b14f0c9d136ea61e5b4aae556aecfc78..88d68402042d4d240a87deae1a0bf1e75849214a 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2012 OpenWrt.org
+# Copyright (C) 2006-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/uclibc++.mk
 
 PKG_NAME:=smartmontools
-PKG_VERSION:=6.4
+PKG_VERSION:=6.5
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/smartmontools
-PKG_MD5SUM:=56812c8312fd123ed40ef65afde1049e
+PKG_MD5SUM:=093aeec3f8f39fa9a37593c4012d3156
 PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
 PKG_LICENSE:=GPL-2.0+
 PKG_LICENSE_FILES:=COPYING
index 02d796b326e43f16de44161624c36c7293b42b3d..d317329dce5233010726dd0aa28c029e00dca139 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008-2015 OpenWrt.org
+# Copyright (C) 2008-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tar
-PKG_VERSION:=1.28
-PKG_RELEASE:=2
+PKG_VERSION:=1.29
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_MD5SUM:=8f32b2bc1ed7ddf4cf4e4a39711341b0
+PKG_MD5SUM:=955cd533955acb1804b83fd70218da51
 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
 
 PKG_LICENSE:=GPL-3.0
@@ -21,14 +21,44 @@ PKG_LICENSE_FILES:=COPYING
 
 PKG_INSTALL:=1
 
+BUILD_DEPENDS:=xz
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/tar
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+bzip2 +libacl +libattr
+  DEPENDS:=+PACKAGE_TAR_POSIX_ACL:libacl +PACKAGE_TAR_XATTR:libattr +PACKAGE_TAR_BZIP2:bzip2
+  EXTRA_DEPENDS:=$(if $(CONFIG_PACKAGE_TAR_XZ),xz)
   TITLE:=GNU tar
   URL:=http://www.gnu.org/software/tar/
+  MENU:=1
+endef
+
+define Package/tar/config
+       if PACKAGE_tar
+               config PACKAGE_TAR_POSIX_ACL
+                       bool "tar: Enable POSIX ACL support"
+                       default n
+
+               config PACKAGE_TAR_XATTR
+                       bool "tar: Enable extended attribute (xattr) support"
+                       default n
+
+               config PACKAGE_TAR_GZIP
+                       bool "tar: Enable seamless gzip support"
+                       default y
+
+               config PACKAGE_TAR_BZIP2
+                       bool "tar: Enable seamless bzip2 support"
+                       default y
+
+               config PACKAGE_TAR_XZ
+                       bool "tar: Enable seamless xz support"
+                       select PACKAGE_xz-utils
+                       select PACKAGE_xz
+                       default y
+       endif
 endef
 
 define Package/tar/description
@@ -52,6 +82,18 @@ $${IPKG_INSTROOT}/bin/tar 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm
 exit 0
 endef
 
+CONFIGURE_ARGS += \
+       $(if $(CONFIG_PACKAGE_TAR_POSIX_ACL),--with,--without)-posix-acls \
+       $(if $(CONFIG_PACKAGE_TAR_XATTR),--with,--without)-xattrs \
+       $(if $(CONFIG_PACKAGE_TAR_GZIP),--with-gzip=gzip,--without-gzip) \
+       $(if $(CONFIG_PACKAGE_TAR_BZIP2),--with-bzip2=bzip2,--without-bzip2) \
+       $(if $(CONFIG_PACKAGE_TAR_XZ),--with-xz=xz,--without-xz) \
+       --without-compress \
+       --without-lzip \
+       --without-lzma \
+       --without-lzop \
+       --without-selinux
+
 MAKE_FLAGS += \
        CFLAGS="$(TARGET_CFLAGS)" \
        LDFLAGS="$(TARGET_LDLAGS)"
index 19a909c885a7ba819b5b9031fe7eee831895d3d6..2144a5b712533dc24aeb941b8ff24be9d055c971 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013-2014 OpenWrt.org
+# Copyright (C) 2013-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zsh
-PKG_VERSION:=5.1.1
+PKG_VERSION:=5.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@SF/zsh
-PKG_MD5SUM:=0e8ea3313300277a04cee80836507bae
+PKG_MD5SUM:=afe96fde08b70e23c1cab1ca7a68fb34
 PKG_MAINTAINER:=Vadim A. Misbakh-Soloviov <openwrt-zsh@mva.name>
 PKG_LICENSE:=ZSH