Bump buildroot to 2019.02

2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions
--- a/bsp/buildroot/package/shadowsocks-libev/0001-configure.ac-fix-static-build-with-netfilter_conntra.patch
+++ b/bsp/buildroot/package/shadowsocks-libev/0001-configure.ac-fix-static-build-with-netfilter_conntra.patch
@@ -0,0 +1,31 @@
+From 9b4aebc840f444e5aa83633838e3890cec523017 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 18 Jan 2019 21:05:34 +0100
+Subject: [PATCH] configure.ac: fix static build with netfilter_conntrack
+
+Fixes:
+ - http://autobuild.buildroot.org/results/22a28e8fd8182e1c908541dbc5b0ee087c3803e6
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status:
+https://github.com/shadowsocks/shadowsocks-libev/pull/2270]
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a706591..c6dab8b 100755
+--- a/configure.ac
+++ b/configure.ac
+@@ -256,7 +256,7 @@ if test x"$enable_connmarktos" = "xyes" ; then
+ 	        if test x"$enable_connmarktos" = "xyes"; then
+ 	            AC_MSG_ERROR([--enable-connmarktos specified but libnetfilter-conntrack library not found])
+ 	        fi
+-	        with_netfilter_conntrack=no])
+	        with_netfilter_conntrack=no], [-lnfnetlink])
+ 	    AC_CHECK_HEADERS([libnetfilter_conntrack/libnetfilter_conntrack.h \
+ 	        libnetfilter_conntrack/libnetfilter_conntrack_tcp.h],,[
+ 	        if test x"$enable_connmarktos" = "xyes"; then
+-- 
+2.14.1
+
--- a/bsp/buildroot/package/shadowsocks-libev/Config.in
+++ b/bsp/buildroot/package/shadowsocks-libev/Config.in
@@ -0,0 +1,34 @@
+config BR2_PACKAGE_SHADOWSOCKS_LIBEV
+	bool "shadowsocks-libev"
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # for libcork
+	depends on BR2_TOOLCHAIN_HAS_SYNC_8 || !BR2_ARCH_IS_64 # for libcork
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_C_ARES
+	select BR2_PACKAGE_LIBEV
+	select BR2_PACKAGE_LIBSODIUM
+	select BR2_PACKAGE_MBEDTLS
+	select BR2_PACKAGE_PCRE
+	help
+	  Shadowsocks-libev is a lightweight secured SOCKS5 proxy for
+	  embedded devices and low-end boxes.
+
+	  https://github.com/shadowsocks/shadowsocks-libev
+
+config BR2_PACKAGE_SHADOWSOCKS_LIBEV_CONNMARKTOS
+	bool "connmarktos support in ss-server"
+	depends on BR2_PACKAGE_SHADOWSOCKS_LIBEV
+	select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
+	help
+	  Build ss-server with the connmark to TOS feature.
+
+	  This feature requires advanced tc, iptables and conntrack
+	  rules to perform QoS on the server side.
+
+	  If unsure, don't enable this option
+
+comment "shadowsocks-libev needs a toolchain w/ threads"
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	depends on BR2_TOOLCHAIN_HAS_SYNC_8 || !BR2_ARCH_IS_64
+	depends on BR2_USE_MMU
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
--- a/bsp/buildroot/package/shadowsocks-libev/shadowsocks-libev.hash
+++ b/bsp/buildroot/package/shadowsocks-libev/shadowsocks-libev.hash
@@ -0,0 +1,7 @@
+# Locally computed
+sha256 2befc27b1cc62af0450702343d17e347936f0d4e3d4b04ba9246c4f9b409b742 shadowsocks-libev-3.2.3.tar.gz
+
+# License files, locally calculated
+sha256 736883f97d44dbec288bb82819f18f4f86d02ae3192f6a9abefa00db76bace41  COPYING
+sha256 c41a4bc2c4c43e4daa3051e77e31b2d5c8500498afaeac6d831d55a4bb8de3fb  libbloom/LICENSE
+sha256 4fa2ada54f8c0410ec243265378242ffe862386d5ac517f8dd30a1911d25ae93  libcork/COPYING
--- a/bsp/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk
+++ b/bsp/buildroot/package/shadowsocks-libev/shadowsocks-libev.mk
@@ -0,0 +1,26 @@
+################################################################################
+#
+# shadowsocks-libev
+#
+################################################################################
+
+SHADOWSOCKS_LIBEV_VERSION = 3.2.3
+SHADOWSOCKS_LIBEV_SITE = https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(SHADOWSOCKS_LIBEV_VERSION)
+SHADOWSOCKS_LIBEV_LICENSE = GPL-3.0+, BSD-2-Clause (libbloom), BSD-3-Clause (libcork, libipset)
+SHADOWSOCKS_LIBEV_LICENSE_FILES = COPYING libbloom/LICENSE libcork/COPYING
+SHADOWSOCKS_LIBEV_DEPENDENCIES = host-pkgconf c-ares libev libsodium mbedtls pcre
+SHADOWSOCKS_LIBEV_INSTALL_STAGING = YES
+# We're patching configure.ac
+SHADOWSOCKS_LIBEV_AUTORECONF = YES
+SHADOWSOCKS_LIBEV_CONF_OPTS = \
+	--with-pcre=$(STAGING_DIR)/usr \
+	--disable-ssp
+
+ifeq ($(BR2_PACKAGE_SHADOWSOCKS_LIBEV_CONNMARKTOS),y)
+SHADOWSOCKS_LIBEV_DEPENDENCIES += libnetfilter_conntrack
+SHADOWSOCKS_LIBEV_CONF_OPTS += --enable-connmarktos
+else
+SHADOWSOCKS_LIBEV_CONF_OPTS += --disable-connmarktos
+endif
+
+$(eval $(autotools-package))