diff options
66 files changed, 607 insertions, 295 deletions
diff --git a/devel/gcc/Makefile b/devel/gcc/Makefile index 9cdde88dd..1f3f0e3db 100644 --- a/devel/gcc/Makefile +++ b/devel/gcc/Makefile @@ -54,6 +54,10 @@ define Build/Prepare # we have to download additional stuff before patching (cd $(PKG_BUILD_DIR) && ./contrib/download_prerequisites) $(Build/Patch) +# poor man's fix for `none-openwrt-linux' not recognized when building with musl + cp $(PKG_BUILD_DIR)/config.sub $(PKG_BUILD_DIR)/mpfr/ + cp $(PKG_BUILD_DIR)/config.sub $(PKG_BUILD_DIR)/gmp/ + cp $(PKG_BUILD_DIR)/config.sub $(PKG_BUILD_DIR)/mpc/ endef diff --git a/lang/perl-http-message/Makefile b/lang/perl-http-message/Makefile index ecbb31f08..f0bc5cb44 100644 --- a/lang/perl-http-message/Makefile +++ b/lang/perl-http-message/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-http-message -PKG_VERSION:=6.06 +PKG_VERSION:=6.10 PKG_RELEASE:=1 -PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS +PKG_SOURCE_URL:=http://www.cpan.org/authors/id/E/ET/ETHER PKG_SOURCE:=HTTP-Message-$(PKG_VERSION).tar.gz -PKG_MD5SUM:=e563ac516e28d33f65bc0f295f625f85 +PKG_MD5SUM:=b8a68ce1898691c536714eeae3f963d4 PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net> diff --git a/lang/perl-uri/Makefile b/lang/perl-uri/Makefile index 3508d903c..e3f566efb 100644 --- a/lang/perl-uri/Makefile +++ b/lang/perl-uri/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-uri -PKG_VERSION:=1.68 +PKG_VERSION:=1.69 PKG_RELEASE:=1 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/E/ET/ETHER/ PKG_SOURCE:=URI-$(PKG_VERSION).tar.gz -PKG_MD5SUM:=4a954ab8d79f831616ca817ba4b26cb9 +PKG_MD5SUM:=3c56aee0300bce5a440ccbd558277ea0 PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net> diff --git a/lang/python-pip/Makefile b/lang/python-pip/Makefile index d0607d16e..40f11402c 100644 --- a/lang/python-pip/Makefile +++ b/lang/python-pip/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-pip -PKG_VERSION:=1.5.6 +PKG_VERSION:=7.1.0 PKG_RELEASE:=1 PKG_SOURCE:=pip-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://pypi.python.org/packages/source/p/pip/ -PKG_MD5SUM:=01026f87978932060cc86c1dc527903e +PKG_MD5SUM:=d935ee9146074b1d3f26c5f0acfd120e PKG_BUILD_DIR:=$(BUILD_DIR)/pip-$(PKG_VERSION) PKG_USE_MIPS16:=0 diff --git a/lang/python-setuptools/Makefile b/lang/python-setuptools/Makefile index a25211926..22cff0cec 100644 --- a/lang/python-setuptools/Makefile +++ b/lang/python-setuptools/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-setuptools -PKG_VERSION:=7.0 +PKG_VERSION:=18.0.1 PKG_RELEASE:=1 PKG_SOURCE:=setuptools-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://pypi.python.org/packages/source/s/setuptools/ -PKG_MD5SUM:=6245d6752e2ef803c365f560f7f2f940 +PKG_MD5SUM:=cecd172c9ff7fd5f2e16b2fcc88bba51 PKG_BUILD_DIR:=$(BUILD_DIR)/setuptools-$(PKG_VERSION) diff --git a/lang/python/Makefile b/lang/python/Makefile index 0caa92ba2..935fc3960 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -221,6 +221,7 @@ HOST_CONFIGURE_ARGS+= \ --without-cxx-main \ --without-pymalloc \ --with-threads \ + --with-system-expat=$(STAGING_DIR_HOST) \ --prefix=$(STAGING_DIR_HOST) \ --with-ensurepip=upgrade \ CONFIG_SITE= \ diff --git a/libs/alsa-lib/Makefile b/libs/alsa-lib/Makefile index a4ccc2331..29fa9f70f 100644 --- a/libs/alsa-lib/Makefile +++ b/libs/alsa-lib/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2014 OpenWrt.org +# Copyright (C) 2006-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alsa-lib -PKG_VERSION:=1.0.28 +PKG_VERSION:=1.0.29 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \ http://alsa.cybermirror.org/lib/ -PKG_MD5SUM:=c9e21b88a2b3e6e12ea7ba0f3b271fc3 +PKG_MD5SUM:=de67e0eca72474d6b1121037dafe1024 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net> PKG_LICENSE:=LGPLv2.1 GPLv2 diff --git a/libs/boost/Makefile b/libs/boost/Makefile index ef0f31f02..c2d273e7e 100644 --- a/libs/boost/Makefile +++ b/libs/boost/Makefile @@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/target.mk PKG_NAME:=boost PKG_VERSION:=1_58_0 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/boost @@ -34,13 +34,13 @@ PKG_USE_MIPS16:=0 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk - +# For now, the combination TARGET_mpc85xx&&USE_UCLIBC disables boost due to incompatibility define Package/boost/Default SECTION:=libs CATEGORY:=Libraries TITLE:=Boost C++ source library URL:=http://www.boost.org - DEPENDS:=+libstdcpp +libpthread +librt + DEPENDS:=@(!(TARGET_mpc85xx&&USE_UCLIBC)) +libstdcpp +libpthread +librt endef define Package/boost/description/Default @@ -72,10 +72,11 @@ define Package/boost/install true endef +# For now, the combination TARGET_mpc85xx&&USE_UCLIBC disables boost due to incompatibility define Package/boost $(call Package/boost/Default) TITLE+= packages - DEPENDS:=+ALL:boost-libs +ALL:boost-test + DEPENDS:=@(!(TARGET_mpc85xx&&USE_UCLIBC)) +ALL:boost-libs +ALL:boost-test endef define Package/boost/config @@ -107,7 +108,7 @@ PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_boost-test define Package/boost-test $(call Package/boost/Default) TITLE+= (test) - HIDDEN:=1 + HIDDEN:=1 endef define Build/Configure @@ -148,7 +149,7 @@ $(eval $(call DefineBoostLibrary,filesystem,system,)) $(eval $(call DefineBoostLibrary,graph,regex,)) #$(eval $(call DefineBoostLibrary,graph_parallel,,)) $(eval $(call DefineBoostLibrary,iostreams,,+zlib)) -$(eval $(call DefineBoostLibrary,locale,system,$(ICONV_DEPENDS))) +$(eval $(call DefineBoostLibrary,locale,system,$(ICONV_DEPENDS) +@BUILD_NLS)) $(eval $(call DefineBoostLibrary,log,system chrono date_time thread filesystem regex,)) $(eval $(call DefineBoostLibrary,math,,)) #$(eval $(call DefineBoostLibrary,mpi,,)) diff --git a/libs/libidn/Makefile b/libs/libidn/Makefile index 99f4803cb..8bfe2a8e0 100644 --- a/libs/libidn/Makefile +++ b/libs/libidn/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libidn -PKG_VERSION:=1.31 +PKG_VERSION:=1.32 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/libidn -PKG_MD5SUM:=83806230fc0989a24cf9dfe6685563d9 +PKG_MD5SUM:=4dd8356ba577287ea7076bfa1554b534 PKG_LICENSE:=GPL-2.0+ GPL-3.0+ LGPL-2.1+ LGPL-3.0+ Apache-2.0 PKG_LICENSE_FILES:=COPYING COPYINGv2 COPYINGv3 COPYING.LESSERv2 COPYING.LESSERv3 java/LICENSE-2.0.txt diff --git a/libs/libinput/Makefile b/libs/libinput/Makefile index 26da26366..a17a4566c 100644 --- a/libs/libinput/Makefile +++ b/libs/libinput/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libinput -PKG_VERSION:=0.18.0 +PKG_VERSION:=0.20.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www.freedesktop.org/software/libinput/ -PKG_MD5SUM:=0ddbb0d53d58dec0a86de6791560011a +PKG_MD5SUM:=444f3a4061be560310cb761cac6fa178 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING diff --git a/libs/liblo/patches/001-fix-musl-include.patch b/libs/liblo/patches/001-fix-musl-include.patch new file mode 100644 index 000000000..f974bd3d1 --- /dev/null +++ b/libs/liblo/patches/001-fix-musl-include.patch @@ -0,0 +1,11 @@ +--- a/src/server.c ++++ b/src/server.c +@@ -48,7 +48,7 @@ + #include <netdb.h> + #include <sys/socket.h> + #ifdef HAVE_POLL +-#include <sys/poll.h> ++#include <poll.h> + #endif + #include <sys/un.h> + #include <arpa/inet.h> diff --git a/libs/libstrophe/Config.in b/libs/libstrophe/Config.in new file mode 100644 index 000000000..ec45f754c --- /dev/null +++ b/libs/libstrophe/Config.in @@ -0,0 +1,14 @@ +choice + depends on PACKAGE_libstrophe + prompt "Select XML library" + default libstrophe-expat + +config libstrophe-expat + bool "expat" + select PACKAGE_libexpat + +config libstrophe-libxml2 + bool "libxml2" + select PACKAGE_libxml2 + +endchoice diff --git a/libs/libstrophe/Makefile b/libs/libstrophe/Makefile new file mode 100644 index 000000000..662791650 --- /dev/null +++ b/libs/libstrophe/Makefile @@ -0,0 +1,65 @@ +# +# Copyright (C) 2015 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:=libstrophe +PKG_VERSION:=0.8.7 +PKG_RELEASE=1 + +PKG_LICENSE:=GPL-3.0 +PKG_LICENSE_FILES:=COPYING +PKG_MAINTAINER:=Chih-Wei Chen <changeway@gmail.com> + +PKG_SOURCE_URL:=https://github.com/strophe/libstrophe/archive/ +PKG_SOURCE:=$(PKG_VERSION).tar.gz + +PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 + +PKG_CONFIG_DEPENDS:= \ + CONFIG_libstrophe-libxml2 \ + CONFIG_libstrophe-expat + +include $(INCLUDE_DIR)/package.mk + +ifeq ($(CONFIG_libstrophe-libxml2),y) +CONFIGURE_ARGS += \ + --with-libxml2 +endif + +define Package/libstrophe + SECTION:=libs + CATEGORY:=Libraries + TITLE:=XMPP client library + URL:=http://strophe.im/libstrophe + DEPENDS:= +libopenssl +libstrophe-libxml2:libxml2 +libstrophe-expat:libexpat + MENU:=1 +endef + +define Package/libstrophe/description + A simple, lightweight C library for writing XMPP clients +endef + +define Package/libstrophe/config + source "$(SOURCE)/Config.in" +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/ $(1)/usr/ + + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libstrophe.{la,a,so*} $(1)/usr/lib/ +endef + +define Package/libstrophe/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libstrophe.so.* $(1)/usr/lib +endef + +$(eval $(call BuildPackage,libstrophe)) diff --git a/libs/opencv/Makefile b/libs/opencv/Makefile index bf80fbe9b..3b6efa599 100644 --- a/libs/opencv/Makefile +++ b/libs/opencv/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=opencv -PKG_VERSION:=2.4.11 -PKG_RELEASE:=3 +PKG_VERSION:=3.0.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip PKG_SOURCE_URL:=http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/$(PKG_VERSION)/ -PKG_MD5SUM:=32f498451bff1817a60e1aabc2939575 +PKG_MD5SUM:=09004c275d8092cbdf5b61675cecd399 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE @@ -22,7 +22,6 @@ PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk - define Package/opencv/Default/description OpenCV (Open Source Computer Vision Library) is an open source computer vision and machine learning software library. OpenCV was built to provide @@ -35,13 +34,12 @@ endef define Package/opencv SECTION:=libs CATEGORY:=Libraries - TITLE:=opencv-2.4.11 + TITLE:=OpenCV URL:=http://opencv.org/ MAINTAINER:=WRTnode Team <pub@wrtnode.com> DEPENDS:=+libpthread +librt +libstdcpp +zlib +libjpeg endef - PKG_INSTALL:=1 CMAKE_OPTIONS += -DBUILD_opencv_gpu:BOOL=OFF \ diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile index e25fc0152..a2423d297 100644 --- a/libs/openldap/Makefile +++ b/libs/openldap/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openldap PKG_VERSION:=2.4.41 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \ @@ -95,7 +95,6 @@ CONFIGURE_ARGS += \ --with-threads \ --with-tls \ --with-yielding_select="yes" \ - --without-cyrus-sasl \ --without-threads \ --enable-null \ --disable-bdb \ diff --git a/libs/sqlite3/Makefile b/libs/sqlite3/Makefile index 7f5d58a7c..0fdbedfc9 100644 --- a/libs/sqlite3/Makefile +++ b/libs/sqlite3/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sqlite -PKG_VERSION:=3081002 +PKG_VERSION:=3081101 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-autoconf-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.sqlite.org/2015/ -PKG_MD5SUM:=a18bfc015cd49a1e7a961b7b77bc3b37 +PKG_MD5SUM:=298c8d6af7ca314f68de92bc7a356cbe PKG_LICENSE:=PUBLICDOMAIN PKG_LICENSE_FILES:= diff --git a/libs/yajl/Makefile b/libs/yajl/Makefile new file mode 100644 index 000000000..f9a2877a0 --- /dev/null +++ b/libs/yajl/Makefile @@ -0,0 +1,59 @@ +# +# Copyright (C) 2014, 2015 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:=yajl +PKG_VERSION:=2.1.0 +PKG_RELEASE:=1 +PKG_MAINTAINER:=Charles Southerland <charlie@stuphlabs.com> +PKG_LICENSE:=ISC +PKG_LICENSE_FILES:=COPYING +PKG_REV:=66cb08ca2ad8581080b626a75dfca266a890afb2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_URL:=git://github.com/lloyd/yajl.git +PKG_SOURCE_PROTO:=git + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Package/yajl + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Yet Another JSON Library + URL:=http://lloyd.github.io/yajl +endef + +define Package/yajl/description + Yet Another JSON Library. YAJL is a small event-driven (SAX-style) +JSON parser written in ANSI C, and a small validating JSON generator. +YAJL is released under the ISC license. + + YAJL was created by Lloyd Hilaiel. +endef + +PKG_INSTALL:=1 + +CMAKE_OPTIONS += \ + -DCMAKE_BUILD_TYPE:String="Release" + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/yajl $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libyajl.so* $(1)/usr/lib/ +endef + +define Package/yajl/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libyajl.so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,yajl)) diff --git a/libs/yajl/patches/100-link-reformatter-uclibc-libm.patch b/libs/yajl/patches/100-link-reformatter-uclibc-libm.patch new file mode 100644 index 000000000..fd637eca5 --- /dev/null +++ b/libs/yajl/patches/100-link-reformatter-uclibc-libm.patch @@ -0,0 +1,11 @@ +--- a/reformatter/CMakeLists.txt ++++ b/reformatter/CMakeLists.txt +@@ -26,7 +26,7 @@ + + ADD_EXECUTABLE(json_reformat ${SRCS}) + +-TARGET_LINK_LIBRARIES(json_reformat yajl_s) ++TARGET_LINK_LIBRARIES(json_reformat yajl_s m) + + # copy the binary into the output directory + GET_TARGET_PROPERTY(binPath json_reformat LOCATION) diff --git a/libs/yajl/patches/101-link-perf-uclibc-libm.patch b/libs/yajl/patches/101-link-perf-uclibc-libm.patch new file mode 100644 index 000000000..0d6fd4795 --- /dev/null +++ b/libs/yajl/patches/101-link-perf-uclibc-libm.patch @@ -0,0 +1,8 @@ +--- a/perf/CMakeLists.txt ++++ b/perf/CMakeLists.txt +@@ -20,4 +20,4 @@ + + ADD_EXECUTABLE(perftest ${SRCS}) + +-TARGET_LINK_LIBRARIES(perftest yajl_s) ++TARGET_LINK_LIBRARIES(perftest yajl_s m) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 9aac9a80e..ed677cf3e 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ffmpeg -PKG_VERSION:=2.6.3 -PKG_RELEASE:=2 +PKG_VERSION:=2.7.2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://ffmpeg.org/releases/ -PKG_MD5SUM:=e2cc3c209f91393d35ab58598e41cf22 +PKG_MD5SUM:=7eb2140bab9f0a8669b65b50c8e4cfb5 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net> PKG_LICENSE:=LGPL-2.1+ GPL-2+ LGPL-3 diff --git a/net/bwm-ng/Makefile b/net/bwm-ng/Makefile index f2084bec9..21c896c17 100644 --- a/net/bwm-ng/Makefile +++ b/net/bwm-ng/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bwm-ng -PKG_VERSION:=0.6 -PKG_RELEASE:=2 +PKG_VERSION:=0.6.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.gropp.org/bwm-ng -PKG_MD5SUM:=d3a02484fb7946371bfb4e10927cebfb +PKG_MD5SUM:=ef0c7669508e95f56250ad4f8db98b7f PKG_MAINTAINER:=Julen Landa Alustiza <julen@zokormazo.info> PKG_LICENSE:=GPL2-2.0 PKG_LICENSE_FILES:=COPYING diff --git a/net/bwm-ng/patches/0001-fix-gcc-security-build.patch b/net/bwm-ng/patches/0001-fix-gcc-security-build.patch deleted file mode 100644 index 742e45d73..000000000 --- a/net/bwm-ng/patches/0001-fix-gcc-security-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/output.c -+++ b/src/output.c -@@ -234,7 +234,7 @@ int print_header(int option) { - if (output_method==PLAIN_OUT && ansi_output) printf("\033[1;2H"); - printf("bwm-ng v" VERSION " (delay %2.3fs); ",(float)delay/1000); - if (output_method==PLAIN_OUT) printf("press 'ctrl-c' to end this%s",(ansi_output ? "\033[2;2H" : "")); else printf("input: "); -- printf(input2str()); -+ printf("%s\n",input2str()); - printf("%s\n",show_all_if2str()); - if (output_method==PLAIN_OUT) { - if (ansi_output) diff --git a/net/dhcpcd/patches/001-fix-musl.patch b/net/dhcpcd/patches/001-fix-musl.patch new file mode 100644 index 000000000..5751a4c16 --- /dev/null +++ b/net/dhcpcd/patches/001-fix-musl.patch @@ -0,0 +1,13 @@ +--- a/dhcp6.c ++++ b/dhcp6.c +@@ -1047,8 +1047,8 @@ logsend: + + ctx = ifp->ctx->ipv6; + dst.sin6_scope_id = ifp->index; +- ctx->sndhdr.msg_name = (caddr_t)&dst; +- ctx->sndhdr.msg_iov[0].iov_base = (caddr_t)state->send; ++ ctx->sndhdr.msg_name = (void *)&dst; ++ ctx->sndhdr.msg_iov[0].iov_base = (void *)state->send; + ctx->sndhdr.msg_iov[0].iov_len = state->send_len; + + /* Set the outbound interface */ diff --git a/net/dnscrypt-proxy/Makefile b/net/dnscrypt-proxy/Makefile index 6439e92dc..ae7ab88c9 100644 --- a/net/dnscrypt-proxy/Makefile +++ b/net/dnscrypt-proxy/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnscrypt-proxy -PKG_VERSION:=1.5.0 +PKG_VERSION:=1.6.0 PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://download.dnscrypt.org/dnscrypt-proxy -PKG_MD5SUM:=bcaaaae4797082dd7a6ba618cc3e687c +PKG_MD5SUM:=039b8106cf4e15302dc2487cb7fbb17b PKG_FIXUP:=autoreconf PKG_INSTALL:=1 diff --git a/net/dnscrypt-proxy/files/dnscrypt-proxy.config b/net/dnscrypt-proxy/files/dnscrypt-proxy.config index 63e0e86b7..42e25bfb6 100644 --- a/net/dnscrypt-proxy/files/dnscrypt-proxy.config +++ b/net/dnscrypt-proxy/files/dnscrypt-proxy.config @@ -1,6 +1,8 @@ config dnscrypt-proxy option address '127.0.0.1' option port '5353' - # option resolver 'opendns' + # option resolver 'cisco' # option resolvers_list '/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv' # option ephemeral_keys '1' + # more details at https://github.com/jedisct1/dnscrypt-proxy#public-key-client-authentication + # option client_key '' diff --git a/net/dnscrypt-proxy/files/dnscrypt-proxy.init b/net/dnscrypt-proxy/files/dnscrypt-proxy.init index 7c9f58db4..16eaa3a06 100644 --- a/net/dnscrypt-proxy/files/dnscrypt-proxy.init +++ b/net/dnscrypt-proxy/files/dnscrypt-proxy.init @@ -8,14 +8,16 @@ start_instance () { config_get port "$section" 'port' config_get resolver "$section" 'resolver' config_get resolvers_list "$section" 'resolvers_list' + config_get client_key "$section" 'client_key' config_get_bool ephemeral_keys "$section" 'ephemeral_keys' service_start /usr/sbin/dnscrypt-proxy -d \ -a ${address}:${port} \ -u nobody \ -L ${resolvers_list:-'/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv'} \ - -R ${resolver:-'opendns'} \ - ${ephemeral_keys:+'-E'} + -R ${resolver:-'cisco'} \ + ${ephemeral_keys:+'-E'} \ + ${client_key:+'--client-key='$client_key} } start() { diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile index 82a125ba2..d116dba49 100644 --- a/net/freeradius2/Makefile +++ b/net/freeradius2/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freeradius2 -PKG_VERSION:=2.2.7 +PKG_VERSION:=2.2.8 PKG_RELEASE:=1 PKG_SOURCE:=freeradius-server-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=\ ftp://ftp.freeradius.org/pub/freeradius/ \ ftp://ftp.freeradius.org/pub/freeradius/old/ -PKG_MD5SUM:=b84b9ffa1ac9b20b2643e5a08ac483a1 +PKG_MD5SUM:=0adc2454392ab8a43664dea416022e28 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org> PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYRIGHT LICENSE diff --git a/net/git/Makefile b/net/git/Makefile index c088e722e..89ace0ba8 100644 --- a/net/git/Makefile +++ b/net/git/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=git -PKG_VERSION:=2.4.2 +PKG_VERSION:=2.4.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/scm/git/ -PKG_MD5SUM:=0b8dc818ed4766342978d744522aec49 +PKG_MD5SUM:=fb2c5214f5dc90bad0a2abdd4c425df6 PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 @@ -64,7 +64,6 @@ MAKE_FLAGS := \ NO_MKSTEMPS="YesPlease" \ NO_GETTEXT="YesPlease" \ NO_UNIX_SOCKETS="YesPlease" \ - NO_IPV6="YesPlease" \ NO_ICONV="YesPlease" \ NO_NSEC="YesPlease" \ NO_PERL="YesPlease" \ @@ -88,6 +87,7 @@ define Package/git/install $(RM) $(PKG_INSTALL_DIR)/usr/bin/git-cvsserver $(CP) $(PKG_INSTALL_DIR)/usr/bin/git-* $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/lib/git-core + $(LN) /usr/bin/git $(1)/usr/lib/git-core/git ( cd $(PKG_INSTALL_DIR); $(TAR) \ --exclude=usr/lib/git-core/git-http-backend \ --exclude=usr/lib/git-core/git-http-fetch \ diff --git a/net/git/patches/100-convert_builtin.patch b/net/git/patches/100-convert_builtin.patch index e3d42007d..b4920a5b7 100644 --- a/net/git/patches/100-convert_builtin.patch +++ b/net/git/patches/100-convert_builtin.patch @@ -49,7 +49,7 @@ git-http-fetch$X: http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ $(LIBS) $(CURL_LIBCURL) -@@ -2277,10 +2269,11 @@ endif +@@ -2279,10 +2271,11 @@ endif bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \ execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \ { test "$$bindir/" = "$$execdir/" || \ diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile index 75c8e5d86..898b8d394 100644 --- a/net/gnunet/Makefile +++ b/net/gnunet/Makefile @@ -8,11 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnunet -PKG_SOURCE_VERSION:=36094 +PKG_SOURCE_VERSION:=36190 PKG_VERSION:=0.10.1-svn$(PKG_SOURCE_VERSION) PKG_RELEASE:=1 # ToDo: +# - UCI integration # - break-out {peer,name,data}store for each backend # - package testing stuff @@ -166,6 +167,8 @@ define Package/gnunet/install $(INSTALL_BIN) ./files/gnunet.init $(1)/etc/init.d/gnunet $(INSTALL_DIR) $(1)/lib/upgrade/keep.d $(INSTALL_DATA) ./files/gnunet.upgrade $(1)/lib/upgrade/keep.d/gnunet + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_BIN) ./files/gnunet.defaults $(1)/etc/uci-defaults/gnunet endef define Build/InstallDev @@ -188,8 +191,8 @@ PLUGIN_transport-http_client:=transport_http_client transport_https_client DEPENDS_transport-http_server:=+libmicrohttpd PLUGIN_transport-http_server:=transport_http_server transport_https_server -PLUGIN_transport-wifi:=transport_wlan -LIBEXEC_transport-wifi:=helper-transport-wlan +PLUGIN_transport-wlan:=transport_wlan +LIBEXEC_transport-wlan:=helper-transport-wlan DEPENDS_experiments:=+libglpk PLUGIN_experiments:=ats_mlp ats_ril diff --git a/net/gnunet/files/gnunet.defaults b/net/gnunet/files/gnunet.defaults new file mode 100644 index 000000000..dbb505066 --- /dev/null +++ b/net/gnunet/files/gnunet.defaults @@ -0,0 +1,40 @@ +#!/bin/sh + +[ -e /etc/config/gnunet ] && exit 0 + +touch /etc/config/gnunet + +uci set gnunet.datastore=gnunet-config +uci set gnunet.datastore.DATABASE=heap +uci set gnunet.datastore.QUOTA="4 MB" + +uci set gnunet.fs=gnunet-config +uci set gnunet.fs.CONTENT_PUSHING=NO +uci set gnunet.fs.CONTENT_CACHING=NO + +# limit dhtcache memory usage to 4 MB +uci set gnunet.dhtcache=gnunet-config +uci set gnunet.dhtcache.QUOTA="4 MB" + +# enable dns2gns +uci set gnunet.dns2gns=gnunet-config +uci set gnunet.dns2gns.AUTOSTART=YES +uci set gnunet.dns2gns.FORCESTART=YES + +# enable v4/v6 protocol translation for EXIT/VPN +uci set gnunet.pt=gnunet-config +uci set gnunet.pt.FORCESTART=YES + +uci set gnunet.exit=gnunet-config +uci set gnunet.exit.AUTOSTART=YES +uci set gnunet.exit.FORCESTART=YES +uci set gnunet.exit.EXIT_IPV4=YES +uci set gnunet.exit.EXIT_RANGE_IPV4_POLICY="169.254.86.1:7;169.254.86.1:5201;" + +# iperf (TCP) and echo (UDP) for battlemesh +uci set gnunet.iperf=gnunet-exit-service +uci set gnunet.iperf.TCP_REDIRECTS="5201:169.254.86.1:5201" +uci set gnunet.echo=gnunet-exit-service +uci set gnunet.echo.UDP_REDIRECTS="7:169.254.86.1:7" + +uci commit gnunet diff --git a/net/gnunet/files/gnunet.init b/net/gnunet/files/gnunet.init index c21bbd55c..aa8742295 100644 --- a/net/gnunet/files/gnunet.init +++ b/net/gnunet/files/gnunet.init @@ -47,6 +47,8 @@ prepare_config() { mkdir -p /etc/gnunet chown gnunet:gnunet /etc/gnunet } + + # defaults paths gnunet-config -c $CONFIGFILE -s PATHS -o GNUNET_CONFIG_HOME -V /etc/gnunet gnunet-config -c $CONFIGFILE -s PEER -o PRIVATE_KEY -V /etc/gnunet/private_key.ecc gnunet-config -c $CONFIGFILE -s identity -o EGODIR -V /etc/gnunet/identity/egos @@ -54,15 +56,6 @@ prepare_config() { gnunet-config -c $CONFIGFILE -s nse -o PROOFFILE -V /etc/gnunet/proof.dat gnunet-config -c $CONFIGFILE -s namestore-sqlite -o FILENAME -V /etc/gnunet/namestore.sqlite - # minimal datastore (todo: make this configurable) - gnunet-config -c $CONFIGFILE -s datastore -o QUOTA -V "4 MB" - - # limit dhtcache memory usage to 4 MB - gnunet-config -c $CONFIGFILE -s dhtcache -o QUOTA -V "4 MB" - - # enable dns2gns - gnunet-config -c $CONFIGFILE -s dns2gns -o AUTOSTART -V YES - # enable all installed transport plugins transport_plugins=$(gnunet-config -c $CONFIGFILE -s transport -o PLUGINS) for transplug in /usr/lib/gnunet/libgnunet_plugin_transport_*.so; do @@ -72,6 +65,28 @@ prepare_config() { transport_plugins="$transport_plugins $transplug" done gnunet-config -c $CONFIGFILE -s transport -o PLUGINS -V "$transport_plugins" + + # apply config from UCI + _gnunet_section="" + config_cb() + { + # $1 "Type" + # $2 "Name" + local __TYPE="$1" + local __NAME="$2" + [ "${__TYPE}" = "gnunet-config" ] && _gnunet_section="${__NAME}" + [ "${__TYPE}" = "gnunet-exit-service" ] && _gnunet_section="${__NAME}.gnunet." + } + option_cb() { + # $1 name of variable + # $2 value + local __OPT="$1" + local __VAL="$2" + gnunet-config -c $CONFIGFILE -s ${_gnunet_section} -o ${__OPT} -V "${__VAL}" + } + config_load gnunet + + return 0 } start_service() { diff --git a/net/kismet/patches/010-dont-add-host-include-paths.patch b/net/kismet/patches/010-dont-add-host-include-paths.patch index 23a87bdcf..3b1858afb 100644 --- a/net/kismet/patches/010-dont-add-host-include-paths.patch +++ b/net/kismet/patches/010-dont-add-host-include-paths.patch @@ -1,9 +1,7 @@ -diff --git a/configure b/configure -index 6936a47..9a85269 100755 --- a/configure +++ b/configure -@@ -6980,9 +6980,6 @@ else - fi +@@ -5456,9 +5456,6 @@ fi + -# Add additional cflags since some distros bury panel.h diff --git a/net/kismet/patches/020-musl-include-fixes.patch b/net/kismet/patches/020-musl-include-fixes.patch new file mode 100644 index 000000000..7f2d52cb9 --- /dev/null +++ b/net/kismet/patches/020-musl-include-fixes.patch @@ -0,0 +1,22 @@ +--- a/configfile.cc ++++ b/configfile.cc +@@ -24,6 +24,7 @@ + #include <stdlib.h> + #include <stdio.h> + #include <errno.h> ++#include <time.h> + #include "configfile.h" + #include "util.h" + +--- a/dumpfile_tuntap.cc ++++ b/dumpfile_tuntap.cc +@@ -20,8 +20,8 @@ + + #include <errno.h> + +-#include "dumpfile_tuntap.h" + #include "ifcontrol.h" ++#include "dumpfile_tuntap.h" + #include "ipc_remote.h" + + #ifndef SYS_CYGWIN diff --git a/net/knxd/Makefile b/net/knxd/Makefile index efe1d0761..e0a6cd583 100644 --- a/net/knxd/Makefile +++ b/net/knxd/Makefile @@ -11,12 +11,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=knxd -PKG_VERSION=2015-06-27-$(PKG_SOURCE_VERSION) -PKG_RELEASE:=2 +PKG_VERSION=2015-07-19-$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/knxd/knxd.git -PKG_SOURCE_VERSION:=50e7f6e6bfa13c2b6140b0f76aaa70234bf44b1d +PKG_SOURCE_VERSION:=be1fcfe85cc1dfcc41f791cd9a45c57fe18da6a0 PKG_SOURCE_SUBDIR:=$(PKG_NAME) PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz @@ -38,7 +38,7 @@ define Package/knxd SECTION:=net CATEGORY:=Network TITLE:=EIB KNX daemon - DEPENDS:=+pthsem +libusb-1.0 +libstdcpp + DEPENDS:=+pthsem +libusb-1.0 endef define Package/knxd/description @@ -49,56 +49,39 @@ define Package/knxd/conffiles /etc/config/knxd endef -define Package/libeibclient - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Library for EIB clients - DEPENDS:=+pthsem -endef - -define Package/libeibclient/description -EIB KNX client library -endef - define Package/knxd-tools SECTION:=net CATEGORY:=Network TITLE:=EIB KNX Utils - DEPENDS:=+libeibclient endef define Package/knxd-tools/description EIB KNX Tools endef +TARGET_CXXFLAGS+= -fno-rtti +TARGET_CXX=$(TARGET_CC) + CONFIGURE_ARGS+= \ --disable-ft12 \ --enable-eibnetip \ --enable-eibnetiptunnel \ --enable-eibnetipserver \ --enable-usb \ - --enable-tpuart \ --enable-tpuarts \ - --disable-pei16 \ --disable-pei16s \ --enable-groupcache \ --without-pth-test \ + --disable-systemd \ --without-libstdc EXTRA_LDFLAGS+= \ -fno-builtin -largp -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/eib*.h $(1)/usr/include/ - - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libeibclient.{a,so*} $(1)/usr/lib/ -endef - define Package/knxd/install $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ + $(RM) $(1)/usr/bin/knxtool $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/knxd.init $(1)/etc/init.d/knxd @@ -107,46 +90,14 @@ define Package/knxd/install $(INSTALL_DATA) ./files/knxd.config $(1)/etc/config/knxd endef -define Package/libeibclient/install +define Package/knxd-tools/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libeibclient.so* $(1)/usr/lib/ -endef - -define Package/knxd-tools/install $(INSTALL_DIR) $(1)/usr/bin - - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/knxtool $(1)/usr/bin/ - ln -sf knxtool $(1)/usr/bin/knxread - ln -sf knxtool $(1)/usr/bin/knxreadtemp - ln -sf knxtool $(1)/usr/bin/knxwrite - ln -sf knxtool $(1)/usr/bin/knxlog - ln -sf knxtool $(1)/usr/bin/knxon - ln -sf knxtool $(1)/usr/bin/knxoff - ln -sf knxtool $(1)/usr/bin/knxif - ln -sf knxtool $(1)/usr/bin/knxswrite - ln -sf knxtool $(1)/usr/bin/knxbool - ln -sf knxtool $(1)/usr/bin/knxdimup - - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/busmonitor1 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/busmonitor2 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/busmonitor3 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/eibread-cgi $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/eibwrite-cgi $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/vbusmonitor1 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/vbusmonitor2 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/vbusmonitor3 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupwrite $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupswrite $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/grouplisten $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupread $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupresponse $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupreadresponse $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupsocketlisten $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupsocketread $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupsocketwrite $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/knxd/examples/bin/groupsocketswrite $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/knxtool $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/knxd/eibwrite-cgi $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/knxd/eibread-cgi $(1)/usr/bin/ endef $(eval $(call BuildPackage,knxd)) -$(eval $(call BuildPackage,libeibclient)) $(eval $(call BuildPackage,knxd-tools)) diff --git a/net/knxd/patches/0100-musl-compat b/net/knxd/patches/0100-musl-compat deleted file mode 100644 index 0c2a09b24..000000000 --- a/net/knxd/patches/0100-musl-compat +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/examples/common.h 2015-06-27 15:20:15.266563893 +0200 -+++ b/src/examples/common.h 2015-06-27 15:23:09.406457392 +0200 -@@ -20,6 +20,7 @@ - #include <stdlib.h> - #include <errno.h> - #include <unistd.h> -+#include <sys/select.h> - #include "eibclient.h" - - /** unsigned char*/ diff --git a/net/kplex/Makefile b/net/kplex/Makefile new file mode 100644 index 000000000..fc7dc2c47 --- /dev/null +++ b/net/kplex/Makefile @@ -0,0 +1,47 @@ +# +# Copyright (C) 2015 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:=kplex +PKG_VERSION:=20150728 + +PKG_RELEASE=$(PKG_SOURCE_VERSION) + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/stripydog/kplex.git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=fec47cd1877ec7903969adefa4220838a706d940 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz + +PKG_LICENSE:=GPL-3.0+ +PKG_LICENSE_FILES:=COPYING + +PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com> + +include $(INCLUDE_DIR)/package.mk + +define Package/kplex + SECTION:=net + CATEGORY:=Network + TITLE:=NMEA-0183 multiplexer and router + DEPENDS:=+libpthread + URL:=http://www.stripydog.com/kplex/ +endef + +define Package/kplex/description + Kplex is a program for combining and routing NMEA-0183 data to and from multiple + sources and destinations. kplex inputs and outputs may be any of Serial lines, + Pseudo Terminals (ptys), Network Interfaces and Files. +endef + + +define Package/kplex/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/kplex $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,kplex)) diff --git a/net/lighttpd/Makefile b/net/lighttpd/Makefile index b42e2a84d..5c6a10a9d 100644 --- a/net/lighttpd/Makefile +++ b/net/lighttpd/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2013 OpenWrt.org +# Copyright (C) 2006-2015 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:=lighttpd -PKG_VERSION:=1.4.35 -PKG_RELEASE:=5 +PKG_VERSION:=1.4.36 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://download.lighttpd.net/lighttpd/releases-1.4.x -PKG_MD5SUM:=c7ae774eab4cb7ac85e41b712f4ee9ba +PKG_MD5SUM:=1843daffcb018aa528f6d15d43544654 PKG_LICENSE:=BSD-3c PKG_LICENSE_FILES:=COPYING diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile index d714d4fe9..97511b998 100644 --- a/net/mwan3/Makefile +++ b/net/mwan3/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mwan3 PKG_VERSION:=1.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Jeroen Louwes <jeroen.louwes@gmail.com> PKG_LICENSE:=GPLv2 diff --git a/net/mwan3/files/usr/sbin/mwan3 b/net/mwan3/files/usr/sbin/mwan3 index c69d94eeb..b887fa5e6 100755 --- a/net/mwan3/files/usr/sbin/mwan3 +++ b/net/mwan3/files/usr/sbin/mwan3 @@ -58,7 +58,7 @@ ifup() config_get enabled "$1" enabled 0 - device=$(uci get -p /var/state network.$1.ifname) &> /dev/null + device=$(uci -p /var/state get network.$1.ifname) &> /dev/null if [ -n "$device" ] ; then [ "$enabled" -eq 1 ] && ACTION=ifup INTERFACE=$1 DEVICE=$device /sbin/hotplug-call iface @@ -76,7 +76,7 @@ interfaces() check_iface_status() { let iface_id++ - device=$(uci get -p /var/state network.$1.ifname) &> /dev/null + device=$(uci -p /var/state get network.$1.ifname) &> /dev/null if [ -z "$device" ]; then echo " interface $1 is unknown" @@ -92,7 +92,7 @@ interfaces() fi 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 + if [ -n "$(uci -p /var/state get mwan3.$1.track_ip 2> /dev/null)" ]; then echo " interface $1 is online (tracking $tracking)" else echo " interface $1 is online" @@ -101,7 +101,7 @@ interfaces() echo " interface $1 error" else if [ "$enabled" -eq 1 ]; then - if [ -n "$(uci get -p /var/state mwan3.$1.track_ip 2> /dev/null)" ]; then + if [ -n "$(uci -p /var/state get mwan3.$1.track_ip 2> /dev/null)" ]; then echo " interface $1 is offline (tracking $tracking)" else echo " interface $1 is offline" diff --git a/net/netperf/Makefile b/net/netperf/Makefile index 4d7ea00d7..fd824ba7c 100644 --- a/net/netperf/Makefile +++ b/net/netperf/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netperf -PKG_VERSION:=2.6.0 +PKG_VERSION:=2.7.0 PKG_RELEASE:=1 PKG_LICENSE:=Custom PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.netperf.org/netperf/ -PKG_MD5SUM:=9654ffdfd4c4f2c93ce3733cd9ed9236 +PKG_MD5SUM:=ad1c5342d61f297c417a93133aeba65a include $(INCLUDE_DIR)/package.mk diff --git a/net/shadowsocks-libev/Makefile b/net/shadowsocks-libev/Makefile index 2d057292f..415c2dfcc 100644 --- a/net/shadowsocks-libev/Makefile +++ b/net/shadowsocks-libev/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shadowsocks-libev -PKG_VERSION:=2.2.2 +PKG_VERSION:=2.2.3 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE) -PKG_SOURCE_VERSION:=4883903e657095b93f88a3a3b9a0dccdffdaa397 +PKG_SOURCE_VERSION:=2b1eef11973de3f7380401fd20f937e84bc2b756 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MAINTAINER:=Jian Chang <aa65535@live.com> @@ -36,14 +36,14 @@ define Package/shadowsocks-libev/Default TITLE:=Lightweight Secured Socks5 Proxy $(2) URL:=https://github.com/shadowsocks/shadowsocks-libev VARIANT:=$(1) - DEPENDS:=$(3) +resolveip +ipset +ip +iptables-mod-tproxy + DEPENDS:=$(3) +libpthread +ipset +ip +iptables-mod-tproxy endef Package/shadowsocks-libev = $(call Package/shadowsocks-libev/Default,openssl,(OpenSSL),+libopenssl) Package/shadowsocks-libev-polarssl = $(call Package/shadowsocks-libev/Default,polarssl,(PolarSSL),+libpolarssl) define Package/shadowsocks-libev/description -Shadowsocks-libev is a lightweight secured scoks5 proxy for embedded devices and low end boxes. +Shadowsocks-libev is a lightweight secured socks5 proxy for embedded devices and low end boxes. endef Package/shadowsocks-libev-polarssl/description = $(Package/shadowsocks-libev/description) diff --git a/net/shadowsocks-libev/files/shadowsocks-libev.config b/net/shadowsocks-libev/files/shadowsocks-libev.config index 2f7be3d2a..95aec7b2e 100644 --- a/net/shadowsocks-libev/files/shadowsocks-libev.config +++ b/net/shadowsocks-libev/files/shadowsocks-libev.config @@ -8,7 +8,7 @@ config shadowsocks-libev option timeout '60' option encrypt_method 'rc4-md5' option ignore_list '/dev/null' - option udp_relay '0' + option udp_mode '0' option tunnel_enable '1' option tunnel_port '5300' option tunnel_forward '8.8.4.4:53' diff --git a/net/shadowsocks-libev/files/shadowsocks-libev.init b/net/shadowsocks-libev/files/shadowsocks-libev.init index 3d149e754..9a64038a7 100644 --- a/net/shadowsocks-libev/files/shadowsocks-libev.init +++ b/net/shadowsocks-libev/files/shadowsocks-libev.init @@ -14,11 +14,17 @@ get_config() { config_get server $1 server config_get server_port $1 server_port config_get local_port $1 local_port - config_get password $1 password config_get timeout $1 timeout + config_get password $1 password config_get encrypt_method $1 encrypt_method config_get ignore_list $1 ignore_list - config_get udp_relay $1 udp_relay + config_get udp_mode $1 udp_mode + config_get udp_server $1 udp_server + config_get udp_server_port $1 udp_server_port + config_get udp_local_port $1 udp_local_port + config_get udp_timeout $1 udp_timeout + config_get udp_password $1 udp_password + config_get udp_encrypt_method $1 udp_encrypt_method config_get_bool tunnel_enable $1 tunnel_enable config_get tunnel_port $1 tunnel_port config_get tunnel_forward $1 tunnel_forward @@ -27,6 +33,8 @@ get_config() { config_get wan_bp_ip $1 wan_bp_ip config_get wan_fw_ip $1 wan_fw_ip config_get ipt_ext $1 ipt_ext + : ${timeout:=60} + : ${udp_timeout:=60} : ${tunnel_port:=5300} : ${tunnel_forward:=8.8.4.4:53} } @@ -45,6 +53,8 @@ start_rules() { /usr/bin/ss-rules \ -s "$server" \ -l "$local_port" \ + -S "$udp_server" \ + -L "$udp_local_port" \ -i "$ignore_list" \ -a "$ac_args" \ -b "$wan_bp_ip" \ @@ -55,17 +65,48 @@ start_rules() { } start_redir() { - service_start /usr/bin/ss-redir \ - -c "$CONFIG_FILE" $udp + cat <<-EOF >$CONFIG_FILE + { + "server": "$server", + "server_port": $server_port, + "local_address": "0.0.0.0", + "local_port": $local_port, + "password": "$password", + "timeout": $timeout, + "method": "$encrypt_method" + } +EOF + if [ "$udp_mode" = 2 ]; then + /usr/bin/ss-redir \ + -c $CONFIG_FILE \ + -f /var/run/ss-redir_t.pid + cat <<-EOF >$CONFIG_FILE + { + "server": "$udp_server", + "server_port": $udp_server_port, + "local_address": "0.0.0.0", + "local_port": $udp_local_port, + "password": "$udp_password", + "timeout": $udp_timeout, + "method": "$udp_encrypt_method" + } +EOF + fi + /usr/bin/ss-redir \ + -c $CONFIG_FILE \ + -f /var/run/ss-redir.pid \ + $udp return $? } start_tunnel() { - service_start /usr/bin/ss-tunnel \ - -c "$CONFIG_FILE" \ - -l "$tunnel_port" \ - -L "$tunnel_forward" \ - -u + : ${udp:="-u"} + /usr/bin/ss-tunnel \ + -c $CONFIG_FILE \ + -l $tunnel_port \ + -L $tunnel_forward \ + -f /var/run/ss-tunnel.pid \ + $udp return $? } @@ -73,25 +114,26 @@ rules() { config_load shadowsocks-libev config_foreach get_config shadowsocks-libev [ "$enable" = 1 ] || exit 0 - [ "$udp_relay" = 1 ] && udp="-u" - mkdir -p $(dirname $CONFIG_FILE) + mkdir -p /var/run /var/etc : ${server:?} : ${server_port:?} : ${local_port:?} : ${password:?} : ${encrypt_method:?} - cat <<-EOF >$CONFIG_FILE - { - "server": "$server", - "server_port": $server_port, - "local_address": "0.0.0.0", - "local_port": $local_port, - "password": "$password", - "timeout": $timeout, - "method": "$encrypt_method" - } -EOF + case $udp_mode in + 1) udp="-u" + ;; + 2) + udp="-U" + : ${udp_server:?} + : ${udp_server_port:?} + : ${udp_local_port:?} + : ${udp_password:?} + : ${udp_encrypt_method:?} + ;; + esac + start_rules } @@ -109,7 +151,6 @@ start() { stop() { /usr/bin/ss-rules -f - service_stop /usr/bin/ss-redir - service_stop /usr/bin/ss-tunnel - rm -f $CONFIG_FILE + killall -q -9 ss-redir + killall -q -9 ss-tunnel } diff --git a/net/shadowsocks-libev/files/ss-rules b/net/shadowsocks-libev/files/ss-rules index e9e229518..8ce1000cb 100644 --- a/net/shadowsocks-libev/files/ss-rules +++ b/net/shadowsocks-libev/files/ss-rules @@ -16,6 +16,8 @@ usage() { -e <extra_options> extra options for iptables -o apply the rules to the OUTPUT chain -u enable udprelay mode, TPROXY is required + -U enable udprelay mode, using different IP + and ports for TCP and UDP -f flush the rules EOF } @@ -69,7 +71,7 @@ EOF fw_rule() { $ipt_n -N SS_SPEC_WAN_FW && \ $ipt_n -A SS_SPEC_WAN_FW -p tcp \ - -j REDIRECT --to-ports $LOCAL_PORT 2>/dev/null || { + -j REDIRECT --to-ports $local_port 2>/dev/null || { loger 3 "Can't redirect, please check the iptables." exit 1 } @@ -111,7 +113,7 @@ EOF } tp_rule() { - [ "$TPROXY" = 1 ] || return 0 + [ -n "$TPROXY" ] || return 0 ip rule add fwmark 0x01/0x01 table 100 ip route add local 0.0.0.0/0 dev lo table 100 $ipt_m -N SS_SPEC_TPROXY @@ -123,12 +125,18 @@ tp_rule() { return $? } -while getopts ":s:l:c:i:e:a:b:w:ouf" arg; do +while getopts ":s:l:S:L:i:e:a:b:w:ouUf" arg; do case $arg in s) - SERVER=$OPTARG + server=$OPTARG ;; l) + local_port=$OPTARG + ;; + S) + SERVER=$OPTARG + ;; + L) LOCAL_PORT=$OPTARG ;; i) @@ -152,6 +160,9 @@ while getopts ":s:l:c:i:e:a:b:w:ouf" arg; do u) TPROXY=1 ;; + U) + TPROXY=2 + ;; f) flush_r exit 0 @@ -159,16 +170,20 @@ while getopts ":s:l:c:i:e:a:b:w:ouf" arg; do esac done -if [ -z "$SERVER" -o -z "$LOCAL_PORT" ]; then +if [ -z "$server" -o -z "$local_port" ]; then usage exit 2 fi -SERVER=$(resolveip -t60 $SERVER) +if [ "$TPROXY" = 1 ]; then + SERVER=$server + LOCAL_PORT=$local_port +fi -if [ -z "$SERVER" ]; then - loger 3 "Can't resolve the server hostname." - exit 1 +if [ "$TPROXY" = 2 ]; then + if [ -z "$SERVER" -o -z "$LOCAL_PORT" ]; then + loger 3 "Please use -S and -L specifies IP and port for UDP." + fi fi if [ -f "$IGNORE" ]; then @@ -176,6 +191,7 @@ if [ -f "$IGNORE" ]; then fi IPLIST=$(cat <<-EOF | grep -E "^([0-9]{1,3}\.){3}[0-9]{1,3}" + $server $SERVER 0.0.0.0/8 10.0.0.0/8 diff --git a/net/sslh/Makefile b/net/sslh/Makefile index 1c0fe7663..738b36b75 100644 --- a/net/sslh/Makefile +++ b/net/sslh/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sslh PKG_VERSION:=v1.17 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://rutschle.net/tech/ diff --git a/net/sslh/files/sslh.init b/net/sslh/files/sslh.init index cc146864d..f7fc64732 100644 --- a/net/sslh/files/sslh.init +++ b/net/sslh/files/sslh.init @@ -18,7 +18,7 @@ start_instance() { local val # A) listen parameter config_get vals "${section}" listen - [ -n "${vals}" ] && for val in $vals; do append args "-p ${val}"; done + [ -n "${vals}" ] && for val in $vals; do append args "-p${val}"; done # B) ssh parameter config_get val "${section}" ssh [ -n "${val}" ] && append args "--ssh ${val}" diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile index 840b02e11..a1df8afb6 100644 --- a/net/strongswan/Makefile +++ b/net/strongswan/Makefile @@ -39,6 +39,7 @@ PKG_MOD_AVAILABLE:= \ eap-md5 \ eap-mschapv2 \ eap-radius \ + eap-tls \ farp \ fips-prf \ gcm \ @@ -149,6 +150,7 @@ $(call Package/strongswan/Default) +strongswan-mod-eap-md5 \ +strongswan-mod-eap-mschapv2 \ +strongswan-mod-eap-radius \ + +strongswan-mod-eap-tls \ +strongswan-mod-farp \ +strongswan-mod-fips-prf \ +strongswan-mod-gcm \ @@ -336,7 +338,7 @@ define Package/strongswan/install $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/strongswan.conf $(1)/etc/ $(INSTALL_DIR) $(1)/usr/lib/ipsec - $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{libstrongswan.so.*,libhydra.so.*} $(1)/usr/lib/ipsec/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{libtls.so.*,libstrongswan.so.*,libhydra.so.*} $(1)/usr/lib/ipsec/ $(INSTALL_CONF) ./files/ipsec.secrets $(1)/etc/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/ipsec.init $(1)/etc/init.d/ipsec @@ -449,6 +451,7 @@ $(eval $(call BuildPlugin,eap-identity,EAP identity helper,)) $(eval $(call BuildPlugin,eap-md5,EAP MD5 (CHAP) EAP auth,)) $(eval $(call BuildPlugin,eap-mschapv2,EAP MS-CHAPv2 EAP auth,+strongswan-mod-md4 +strongswan-mod-des)) $(eval $(call BuildPlugin,eap-radius,EAP RADIUS auth,)) +$(eval $(call BuildPlugin,eap-tls,EAP TLS auth,)) $(eval $(call BuildPlugin,farp,fake arp respsonses,)) $(eval $(call BuildPlugin,fips-prf,FIPS PRF crypto,+strongswan-mod-sha1)) $(eval $(call BuildPlugin,gcm,GCM AEAD wrapper crypto,)) diff --git a/net/stunnel/Makefile b/net/stunnel/Makefile index 0b928b7f6..58a6bbea6 100644 --- a/net/stunnel/Makefile +++ b/net/stunnel/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=stunnel -PKG_VERSION:=5.14 +PKG_VERSION:=5.20 PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0+ @@ -17,7 +17,7 @@ PKG_LICENSE_FILES:=COPYING COPYRIGHT.GPL PKG_SOURCE_URL:=http://stunnel.cybermirror.org/archive/5.x/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_MD5SUM:=e716501960dc6856d80f92547298f724 +PKG_MD5SUM:=3264375026c2b496b5d258e243222de8 PKG_FIXUP:=autoreconf PKG_INSTALL:=1 diff --git a/net/stunnel/patches/010_fix_getnameinfo.patch b/net/stunnel/patches/010_fix_getnameinfo.patch deleted file mode 100644 index 03acfafac..000000000 --- a/net/stunnel/patches/010_fix_getnameinfo.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/src/prototypes.h -+++ b/src/prototypes.h -@@ -590,7 +590,7 @@ extern GETNAMEINFO s_getnameinfo; - - #endif /* USE_WIN32 */ - --int getnameinfo(const struct sockaddr *, int, char *, int, char *, int, int); -+int getnameinfo(const struct sockaddr *, socklen_t, char *, socklen_t, char *, socklen_t, unsigned int); - - #endif /* !defined HAVE_GETNAMEINFO */ - ---- a/src/resolver.c -+++ b/src/resolver.c -@@ -538,8 +538,9 @@ const char *s_gai_strerror(int err) { - /* implementation is limited to functionality needed by stunnel */ - - #ifndef HAVE_GETNAMEINFO --int getnameinfo(const struct sockaddr *sa, int salen, -- char *host, int hostlen, char *serv, int servlen, int flags) { -+int getnameinfo(const struct sockaddr *sa, socklen_t salen, -+ char *host, socklen_t hostlen, char *serv, socklen_t servlen, -+ unsigned int flags) { - - #if defined(USE_WIN32) && !defined(_WIN32_WCE) - if(s_getnameinfo) diff --git a/net/stunnel/patches/012-cron-without-pthread-fix.patch b/net/stunnel/patches/012-cron-without-pthread-fix.patch new file mode 100644 index 000000000..0f644b3c1 --- /dev/null +++ b/net/stunnel/patches/012-cron-without-pthread-fix.patch @@ -0,0 +1,14 @@ +Index: stunnel-5.20/src/cron.c +=================================================================== +--- stunnel-5.20.orig/src/cron.c ++++ stunnel-5.20/src/cron.c +@@ -46,6 +46,9 @@ NOEXPORT void cron_thread(void *arg); + #endif + #if defined(USE_PTHREAD) || defined(USE_WIN32) + NOEXPORT void cron_worker(void); ++#endif ++ ++#ifndef OPENSSL_NO_DH + NOEXPORT void cron_dh_param(void); + #endif + diff --git a/net/tor/Makefile b/net/tor/Makefile index d042ffbcc..79f61af32 100644 --- a/net/tor/Makefile +++ b/net/tor/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tor -PKG_VERSION:=0.2.5.12 +PKG_VERSION:=0.2.6.10 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.torproject.org/dist \ https://archive.torproject.org/tor-package-archive -PKG_MD5SUM:=89745069a7efb7aafd01ae263bd0fe5c +PKG_MD5SUM:=04f919e7882d1ca80f835545af562bad PKG_MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de> PKG_LICENSE_FILES:=LICENSE @@ -89,10 +89,10 @@ ifneq ($(CONFIG_SSP_SUPPORT),y) CONFIGURE_ARGS += \ --disable-gcc-hardening MAKE_FLAGS += \ - CFLAGS="$(TARGET_CFLAGS)" + CFLAGS="$(TARGET_CFLAGS) -std=gnu99" else MAKE_FLAGS += \ - CFLAGS="$(TARGET_CFLAGS) -fPIC" + CFLAGS="$(TARGET_CFLAGS) -fPIC -std=gnu99" endif CONFIGURE_VARS += \ diff --git a/net/transmission/Makefile b/net/transmission/Makefile index 8b50cd69c..1cd4b91f6 100644 --- a/net/transmission/Makefile +++ b/net/transmission/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=transmission PKG_VERSION:=2.84 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://download-origin.transmissionbt.com/files/ http://mirrors.m0k.org/transmission/files @@ -34,6 +34,7 @@ define Package/transmission-daemon $(call Package/transmission/template) DEPENDS:=+libcurl +libopenssl +libpthread +libevent2 +librt MENU:=1 + USERID:=transmission=224:transmission=224 endef define Package/transmission-cli diff --git a/net/transmission/files/transmission.config b/net/transmission/files/transmission.config index 31e2d5af4..2ea69d057 100644 --- a/net/transmission/files/transmission.config +++ b/net/transmission/files/transmission.config @@ -3,6 +3,8 @@ config transmission option config_dir '/tmp/transmission' #option user 'nobody' option mem_percentage 50 + option nice 10 + option ionice_flags '-c 3' option alt_speed_down 50 option alt_speed_enabled false option alt_speed_time_begin 540 diff --git a/net/transmission/files/transmission.init b/net/transmission/files/transmission.init index 535ace8bb..f7b1d41e1 100644 --- a/net/transmission/files/transmission.init +++ b/net/transmission/files/transmission.init @@ -47,8 +47,10 @@ transmission() { local USE local user - local download_dir + local download_dir config_dir local mem_percentage + local config_overwrite nice ionice_flags + local cmdline section_enabled "$section" || return 1 @@ -56,6 +58,10 @@ transmission() { config_get user "$cfg" 'user' config_get download_dir "$cfg" 'download_dir' '/var/etc/transmission' config_get mem_percentage "$cfg" 'mem_percentage' '50' + config_get config_overwrite "$cfg" config_overwrite 1 + config_get nice "$cfg" nice 0 + config_get ionice_flags "$cfg" ionice_flags '' + which ionice > /dev/null || ionice_flags='' local MEM=$(sed -ne 's!^MemTotal:[[:space:]]*\([0-9]*\) kB$!\1!p' /proc/meminfo) if test "$MEM" -gt 1;then @@ -69,38 +75,45 @@ transmission() { [ -z "$user" ] || chown -R $user $config_dir } - echo "{" > $config_file - - append_params "$cfg" \ - alt_speed_down alt_speed_enabled alt_speed_time_begin alt_speed_time_day \ - alt_speed_time_enabled alt_speed_time_end alt_speed_up blocklist_enabled \ - cache_size_mb download_queue_enabled download_queue_size \ - dht_enabled encryption idle_seeding_limit idle_seeding_limit_enabled \ - incomplete_dir_enabled lazy_bitfield_enabled lpd_enabled message_level \ - peer_limit_global peer_limit_per_torrent peer_port \ - peer_port_random_high peer_port_random_low peer_port_random_on_start \ - pex_enabled port_forwarding_enabled preallocation prefetch_enabled \ - ratio_limit ratio_limit_enabled rename_partial_files rpc_authentication_required \ - rpc_enabled rpc_port rpc_whitelist_enabled queue_stalled_enabled \ - queue_stalled_minutes scrape_paused_torrents_enabled script_torrent_done_enabled \ - seed_queue_enabled seed_queue_size \ - speed_limit_down speed_limit_down_enabled speed_limit_up \ - speed_limit_up_enabled start_added_torrents trash_original_torrent_files \ - umask upload_slots_per_torrent utp_enabled scrape_paused_torrents \ - watch_dir_enabled - - append_params_quotes "$cfg" \ - blocklist_url bind_address_ipv4 bind_address_ipv6 download_dir incomplete_dir \ - peer_congestion_algorithm peer_socket_tos rpc_bind_address rpc_password rpc_url \ - rpc_username rpc_whitelist script_torrent_done_filename watch_dir - - echo "\""invalid-key"\": false" >> $config_file - echo "}" >> $config_file + [ "$config_overwrite" == 0 ] || { + + echo "{" > $config_file + + append_params "$cfg" \ + alt_speed_down alt_speed_enabled alt_speed_time_begin alt_speed_time_day \ + alt_speed_time_enabled alt_speed_time_end alt_speed_up blocklist_enabled \ + cache_size_mb download_queue_enabled download_queue_size \ + dht_enabled encryption idle_seeding_limit idle_seeding_limit_enabled \ + incomplete_dir_enabled lazy_bitfield_enabled lpd_enabled message_level \ + peer_limit_global peer_limit_per_torrent peer_port \ + peer_port_random_high peer_port_random_low peer_port_random_on_start \ + pex_enabled port_forwarding_enabled preallocation prefetch_enabled \ + ratio_limit ratio_limit_enabled rename_partial_files rpc_authentication_required \ + rpc_enabled rpc_port rpc_whitelist_enabled queue_stalled_enabled \ + queue_stalled_minutes scrape_paused_torrents_enabled script_torrent_done_enabled \ + seed_queue_enabled seed_queue_size \ + speed_limit_down speed_limit_down_enabled speed_limit_up \ + speed_limit_up_enabled start_added_torrents trash_original_torrent_files \ + umask upload_slots_per_torrent utp_enabled scrape_paused_torrents \ + watch_dir_enabled + + append_params_quotes "$cfg" \ + blocklist_url bind_address_ipv4 bind_address_ipv6 download_dir incomplete_dir \ + peer_congestion_algorithm peer_socket_tos rpc_bind_address rpc_password rpc_url \ + rpc_username rpc_whitelist script_torrent_done_filename watch_dir + + echo "\""invalid-key"\": false" >> $config_file + echo "}" >> $config_file + } + + cmdline="/usr/bin/transmission-daemon -g $config_dir -f" + [ "$ionice_flags" ] && cmdline="ionice $ionice_flags $cmdline" procd_open_instance - procd_set_param command /usr/bin/transmission-daemon -g $config_dir -f + procd_set_param command $cmdline procd_set_param respawn retry=60 procd_set_param user "$user" + procd_set_param nice "$nice" if test -z "$USE";then procd_set_param limits core="0 0" else diff --git a/utils/alsa-utils/Makefile b/utils/alsa-utils/Makefile index f7c875265..44ff097bf 100644 --- a/utils/alsa-utils/Makefile +++ b/utils/alsa-utils/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2014 OpenWrt.org +# Copyright (C) 2006-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alsa-utils -PKG_VERSION:=1.0.28 -PKG_RELEASE:=2 +PKG_VERSION:=1.0.29 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/utils/ \ http://alsa.cybermirror.org/utils/ -PKG_MD5SUM:=361552d5b1cacd0a1e7ba09e69990211 +PKG_MD5SUM:=6b289bf874c4c9a63f4b3973093dd404 PKG_INSTALL:=1 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net> diff --git a/utils/bluez/Makefile b/utils/bluez/Makefile index ebc164639..ce1497582 100644 --- a/utils/bluez/Makefile +++ b/utils/bluez/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bluez -PKG_VERSION:=5.30 -PKG_RELEASE:=2 +PKG_VERSION:=5.31 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=http://www.kernel.org/pub/linux/bluetooth/ -PKG_MD5SUM:=24ba1d1e8e7ef5b8f4033a3059d7600e +PKG_SOURCE_URL:=@KERNEL/linux/bluetooth/ +PKG_MD5SUM:=cb1db487b65dd4d57a2dd6b8f063c393 PKG_LICENSE:=GPL-2.0+ PKG_LICENSE_FILES:=COPYING @@ -120,6 +120,7 @@ define Package/bluez-utils/install $(CP) $(PKG_INSTALL_DIR)/usr/bin/bccmd $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/bluemoon $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/btmon $(1)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/tools/btmgmt $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ciptool $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/hciattach $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/hciconfig $(1)/usr/bin/ diff --git a/utils/bluez/patches/201-readline.patch b/utils/bluez/patches/201-readline.patch index 58396dcb0..dba14b456 100644 --- a/utils/bluez/patches/201-readline.patch +++ b/utils/bluez/patches/201-readline.patch @@ -1,6 +1,6 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -2055,7 +2055,7 @@ unit_tests = $(am__append_32) unit/test- +@@ -2394,7 +2394,7 @@ unit_tests = $(am__append_32) unit/test- @CLIENT_TRUE@ monitor/uuid.h monitor/uuid.c @CLIENT_TRUE@client_bluetoothctl_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@ \ @@ -9,7 +9,7 @@ @MONITOR_TRUE@monitor_btmon_SOURCES = monitor/main.c monitor/bt.h \ @MONITOR_TRUE@ monitor/display.h monitor/display.c \ -@@ -2226,7 +2226,7 @@ unit_tests = $(am__append_32) unit/test- +@@ -2594,7 +2594,7 @@ unit_tests = $(am__append_32) unit/test- @EXPERIMENTAL_TRUE@tools_hcieventmask_LDADD = lib/libbluetooth-internal.la @EXPERIMENTAL_TRUE@tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c @EXPERIMENTAL_TRUE@tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \ @@ -18,7 +18,7 @@ @EXPERIMENTAL_TRUE@tools_btinfo_SOURCES = tools/btinfo.c monitor/bt.h @EXPERIMENTAL_TRUE@tools_btinfo_LDADD = src/libshared-mainloop.la -@@ -2266,13 +2266,13 @@ unit_tests = $(am__append_32) unit/test- +@@ -2642,13 +2642,13 @@ unit_tests = $(am__append_32) unit/test- @READLINE_TRUE@ client/display.h @READLINE_TRUE@attrib_gatttool_LDADD = lib/libbluetooth-internal.la \ @@ -34,7 +34,7 @@ @READLINE_TRUE@tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \ @READLINE_TRUE@ tools/obex-server-tool.c -@@ -2282,13 +2282,13 @@ unit_tests = $(am__append_32) unit/test- +@@ -2658,13 +2658,13 @@ unit_tests = $(am__append_32) unit/test- @READLINE_TRUE@ client/display.h client/display.c @READLINE_TRUE@tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ diff --git a/utils/i2c-tools/Makefile b/utils/i2c-tools/Makefile index 8c36ca9da..d77dbd564 100644 --- a/utils/i2c-tools/Makefile +++ b/utils/i2c-tools/Makefile @@ -8,13 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=i2c-tools -PKG_VERSION:=3.1.1 +PKG_VERSION:=3.1.2 PKG_RELEASE:=1 -PKG_SOURCE_URL:=http://dl.lm-sensors.org/i2c-tools/releases/ \ - http://web.archive.org/web/20150326044243/http://dl.lm-sensors.org/i2c-tools/releases/ +PKG_SOURCE_URL:=http://dl.lm-sensors.org/i2c-tools/releases/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_MD5SUM:=0fdbff53ebd0b8d9249256d6c56480b1 +PKG_MD5SUM:=7104a1043d11a5e2c7b131614eb1b962 PKG_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=PACKAGE_python-smbus:python diff --git a/utils/lcd4linux/Config.in b/utils/lcd4linux/Config.in index a57f79549..1410f2b85 100644 --- a/utils/lcd4linux/Config.in +++ b/utils/lcd4linux/Config.in @@ -79,7 +79,8 @@ config LCD4LINUX_CUSTOM_DRIVER_D4D config LCD4LINUX_CUSTOM_DRIVER_dpf bool prompt "dpf" - select LCD4LINUX_CUSTOM_NEEDS_libdpf + select LCD4LINUX_CUSTOM_NEEDS_libusb + select LCD4LINUX_CUSTOM_NEEDS_libgd config LCD4LINUX_CUSTOM_DRIVER_EA232graphic bool diff --git a/utils/lcd4linux/Makefile b/utils/lcd4linux/Makefile index 54b0ed82e..626795bf8 100644 --- a/utils/lcd4linux/Makefile +++ b/utils/lcd4linux/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lcd4linux PKG_REV:=1203 PKG_VERSION:=r$(PKG_REV) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://ssl.bulix.org/svn/lcd4linux/trunk/ diff --git a/utils/lvm2/Makefile b/utils/lvm2/Makefile index b035d1970..a9e65a198 100644 --- a/utils/lvm2/Makefile +++ b/utils/lvm2/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=LVM2 -PKG_VERSION:=2.02.125 +PKG_VERSION:=2.02.126 PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0 LGPL-2.1 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2 -PKG_MD5SUM:=2d24ba982c8a85e8c837210f087a6a51 +PKG_MD5SUM:=38cd1953b62bd256c9e924adee01e995 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org> PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION) diff --git a/utils/lvm2/patches/002-const-stdio.patch b/utils/lvm2/patches/002-const-stdio.patch index d06f4eb0f..b0c730af0 100644 --- a/utils/lvm2/patches/002-const-stdio.patch +++ b/utils/lvm2/patches/002-const-stdio.patch @@ -1,6 +1,6 @@ --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c -@@ -1690,8 +1690,10 @@ struct cmd_context *create_toolcontext(u +@@ -1686,8 +1686,10 @@ struct cmd_context *create_toolcontext(u unsigned threaded) { struct cmd_context *cmd; @@ -11,7 +11,7 @@ #ifdef M_MMAP_MAX mallopt(M_MMAP_MAX, 0); -@@ -1727,7 +1729,7 @@ struct cmd_context *create_toolcontext(u +@@ -1723,7 +1725,7 @@ struct cmd_context *create_toolcontext(u /* FIXME Make this configurable? */ reset_lvm_errno(1); @@ -20,7 +20,7 @@ /* Set in/out stream buffering before glibc */ if (set_buffering) { /* Allocate 2 buffers */ -@@ -2100,7 +2102,7 @@ void destroy_toolcontext(struct cmd_cont +@@ -2096,7 +2098,7 @@ void destroy_toolcontext(struct cmd_cont if (cmd->libmem) dm_pool_destroy(cmd->libmem); @@ -31,7 +31,7 @@ if (is_valid_fd(STDIN_FILENO) && --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c -@@ -1689,6 +1689,7 @@ int lvm_split(char *str, int *argc, char +@@ -1722,6 +1722,7 @@ int lvm_split(char *str, int *argc, char /* Make sure we have always valid filedescriptors 0,1,2 */ static int _check_standard_fds(void) { @@ -39,7 +39,7 @@ int err = is_valid_fd(STDERR_FILENO); if (!is_valid_fd(STDIN_FILENO) && -@@ -1715,6 +1716,12 @@ static int _check_standard_fds(void) +@@ -1748,6 +1749,12 @@ static int _check_standard_fds(void) strerror(errno)); return 0; } diff --git a/utils/pps-tools/Makefile b/utils/pps-tools/Makefile index 653f90fbc..91918e58b 100644 --- a/utils/pps-tools/Makefile +++ b/utils/pps-tools/Makefile @@ -26,7 +26,6 @@ define Package/pps-tools SECTION:=utils CATEGORY:=Utilities TITLE:=PPS-tools - DEPENDS:=@LINUX_3_10||@LINUX_3_13||@LINUX_3_14||@LINUX_3_18 endef define Package/pps-tools/description diff --git a/utils/rtl-sdr/Makefile b/utils/rtl-sdr/Makefile index 093b22cef..c716fb2ab 100644 --- a/utils/rtl-sdr/Makefile +++ b/utils/rtl-sdr/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2013 OpenWrt.org +# Copyright (C) 2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,14 +7,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rtl-sdr -PKG_VERSION:=2014-02-10 -PKG_RELEASE:=$(PKG_SOURCE_VERSION) +PKG_VERSION:=0.5.3-20150608-$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://git.osmocom.org/rtl-sdr.git +PKG_SOURCE_VERSION:=e3c03f738f5aef4dc51e2b741fbdb542b9cc1bb1 + PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=6ee557360645da158e3065111349c318894b497b -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) +PKG_BUILD_PARALLEL:=1 + CMAKE_INSTALL:=1 PKG_LICENSE:=GPLv2 diff --git a/utils/unrar/Makefile b/utils/unrar/Makefile index bcabfc567..b5ad45eb4 100644 --- a/utils/unrar/Makefile +++ b/utils/unrar/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=unrar -PKG_VERSION:=5.2.7 +PKG_VERSION:=5.3.1 PKG_RELEASE:=1 PKG_SOURCE:=unrarsrc-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.rarlab.com/rar -PKG_MD5SUM:=0c145e1ac47d428553123462c0740279 +PKG_MD5SUM:=c0471d0f5513fb3f8e3f019538a0fb7a PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com> PKG_LICENSE:=UnRAR |