Bump buidlroot version to 2018.02.6
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,133 @@
|
||||
From 75625af541fd128f51079d0ffe5ef24645b8f421 Mon Sep 17 00:00:00 2001
|
||||
From: Darik Horn <dajhorn@vanadac.com>
|
||||
Date: Sun, 13 Apr 2014 12:51:15 -0400
|
||||
Subject: [PATCH] Create libsoftether.so and dynamically link the userland.
|
||||
|
||||
Sharing object code between vpnbridge, vpnclient, vpnserver, and vpncmd
|
||||
reduces the binary size of SoftEther by 85% and its administrative memory
|
||||
footprint by 50%.
|
||||
|
||||
[Upstream commit https://github.com/dajhorn/SoftEtherVPN/commit/75625af541fd128f51079d0ffe5ef24645b8f421]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
configure.ac | 1 +
|
||||
src/Makefile.am | 7 +++++--
|
||||
src/libsoftether/Makefile.am | 34 ++++++++++++++++++++++++++++++++++
|
||||
src/vpnbridge/Makefile.am | 3 +--
|
||||
src/vpnclient/Makefile.am | 3 +--
|
||||
src/vpncmd/Makefile.am | 3 +--
|
||||
src/vpnserver/Makefile.am | 3 +--
|
||||
7 files changed, 44 insertions(+), 10 deletions(-)
|
||||
create mode 100644 src/libsoftether/Makefile.am
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 4a3fc2ba..94639c44 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -30,6 +30,7 @@ AC_CONFIG_FILES([
|
||||
src/Mayaqua/Makefile
|
||||
src/Cedar/Makefile
|
||||
src/hamcorebuilder/Makefile
|
||||
+ src/libsoftether/Makefile
|
||||
src/bin/hamcore/Makefile
|
||||
src/vpnserver/Makefile
|
||||
src/vpnclient/Makefile
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index dc745426..1d041d47 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -22,5 +22,8 @@ SUBDIRS = Mayaqua Cedar
|
||||
# This is a nodist helper.
|
||||
SUBDIRS += hamcorebuilder
|
||||
|
||||
-# These are final build products.
|
||||
-SUBDIRS += bin/hamcore vpnserver vpnclient vpnbridge vpncmd
|
||||
+# These are shared components.
|
||||
+SUBDIRS += libsoftether bin/hamcore
|
||||
+
|
||||
+# These are the final build products.
|
||||
+SUBDIRS += vpnserver vpnclient vpnbridge vpncmd
|
||||
diff --git a/src/libsoftether/Makefile.am b/src/libsoftether/Makefile.am
|
||||
new file mode 100644
|
||||
index 00000000..601920d9
|
||||
--- /dev/null
|
||||
+++ b/src/libsoftether/Makefile.am
|
||||
@@ -0,0 +1,34 @@
|
||||
+# Copyright 2014 Darik Horn <dajhorn@vanadac.com>
|
||||
+#
|
||||
+# This file is part of SoftEther.
|
||||
+#
|
||||
+# SoftEther is free software: you can redistribute it and/or modify it under
|
||||
+# the terms of the GNU General Public License as published by the Free
|
||||
+# Software Foundation, either version 2 of the License, or (at your option)
|
||||
+# any later version.
|
||||
+#
|
||||
+# SoftEther is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
||||
+# details.
|
||||
+#
|
||||
+# You should have received a copy of the GNU General Public License along with
|
||||
+# SoftEther. If not, see <http://www.gnu.org/licenses/>.
|
||||
+
|
||||
+
|
||||
+include $(top_srcdir)/autotools/softether.am
|
||||
+
|
||||
+lib_LTLIBRARIES = \
|
||||
+ libsoftether.la
|
||||
+
|
||||
+libsoftether_la_SOURCES =
|
||||
+
|
||||
+libsoftether_la_LDFLAGS = \
|
||||
+ -avoid-version
|
||||
+
|
||||
+libsoftether_la_LIBTOOLFLAGS = \
|
||||
+ --tag=disable-static
|
||||
+
|
||||
+libsoftether_la_LIBADD = \
|
||||
+ $(top_builddir)/src/Mayaqua/libmayaqua.la \
|
||||
+ $(top_builddir)/src/Cedar/libcedar.la
|
||||
diff --git a/src/vpnbridge/Makefile.am b/src/vpnbridge/Makefile.am
|
||||
index 35fe043d..fb91dd2d 100644
|
||||
--- a/src/vpnbridge/Makefile.am
|
||||
+++ b/src/vpnbridge/Makefile.am
|
||||
@@ -25,5 +25,4 @@ vpnbridge_SOURCES = \
|
||||
vpnbridge.c
|
||||
|
||||
vpnbridge_LDADD = \
|
||||
- $(top_builddir)/src/Mayaqua/libmayaqua.la \
|
||||
- $(top_builddir)/src/Cedar/libcedar.la
|
||||
+ $(top_builddir)/src/libsoftether/libsoftether.la
|
||||
diff --git a/src/vpnclient/Makefile.am b/src/vpnclient/Makefile.am
|
||||
index 1aa55330..c225c416 100644
|
||||
--- a/src/vpnclient/Makefile.am
|
||||
+++ b/src/vpnclient/Makefile.am
|
||||
@@ -25,5 +25,4 @@ vpnclient_SOURCES = \
|
||||
vpncsvc.c
|
||||
|
||||
vpnclient_LDADD = \
|
||||
- $(top_builddir)/src/Mayaqua/libmayaqua.la \
|
||||
- $(top_builddir)/src/Cedar/libcedar.la
|
||||
+ $(top_builddir)/src/libsoftether/libsoftether.la
|
||||
diff --git a/src/vpncmd/Makefile.am b/src/vpncmd/Makefile.am
|
||||
index d8042aa2..271affb0 100644
|
||||
--- a/src/vpncmd/Makefile.am
|
||||
+++ b/src/vpncmd/Makefile.am
|
||||
@@ -25,5 +25,4 @@ vpncmd_SOURCES = \
|
||||
vpncmd.c
|
||||
|
||||
vpncmd_LDADD = \
|
||||
- $(top_builddir)/src/Mayaqua/libmayaqua.la \
|
||||
- $(top_builddir)/src/Cedar/libcedar.la
|
||||
+ $(top_builddir)/src/libsoftether/libsoftether.la
|
||||
diff --git a/src/vpnserver/Makefile.am b/src/vpnserver/Makefile.am
|
||||
index c1c33570..1f7b7f98 100644
|
||||
--- a/src/vpnserver/Makefile.am
|
||||
+++ b/src/vpnserver/Makefile.am
|
||||
@@ -25,5 +25,4 @@ vpnserver_SOURCES = \
|
||||
vpnserver.c
|
||||
|
||||
vpnserver_LDADD = \
|
||||
- $(top_builddir)/src/Mayaqua/libmayaqua.la \
|
||||
- $(top_builddir)/src/Cedar/libcedar.la
|
||||
+ $(top_builddir)/src/libsoftether/libsoftether.la
|
||||
@@ -1,24 +1,27 @@
|
||||
config BR2_PACKAGE_SOFTETHER
|
||||
bool "softether"
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
select BR2_PACKAGE_READLINE
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_USE_WCHAR
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
|
||||
select BR2_PACKAGE_READLINE
|
||||
help
|
||||
The SoftEther Server is a fully integrated implementation of the SSTP,
|
||||
L2TP, L2TPv3, OpenVPN, and IPSec virtual private networking protocols
|
||||
on Linux and several other platforms. It is generally compatible with
|
||||
other implementations by Apple, Cisco, Juniper, Microsoft, et al.
|
||||
The SoftEther Server is a fully integrated implementation of
|
||||
the SSTP, L2TP, L2TPv3, OpenVPN, and IPSec virtual private
|
||||
networking protocols on Linux and several other
|
||||
platforms. It is generally compatible with other
|
||||
implementations by Apple, Cisco, Juniper, Microsoft, et al.
|
||||
|
||||
Convenient Layer-2 and Layer-3 bridging capabilities can connect
|
||||
several branch offices into a single broadcast or routing domain, even
|
||||
behind a NAT or without a static IPv4 address.
|
||||
Convenient Layer-2 and Layer-3 bridging capabilities can
|
||||
connect several branch offices into a single broadcast or
|
||||
routing domain, even behind a NAT or without a static IPv4
|
||||
address.
|
||||
|
||||
In addition to supporting most VPN protocols, the SoftEther Client can
|
||||
penetrate hardened firewalls and captured gateways through HTTPS, DNS,
|
||||
and ICMP exfiltration.
|
||||
In addition to supporting most VPN protocols, the SoftEther
|
||||
Client can penetrate hardened firewalls and captured
|
||||
gateways through HTTPS, DNS, and ICMP exfiltration.
|
||||
|
||||
http://www.softether.org
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 4bdcc05fcd163eea735444283264e40b86626d24fddf110aa416f2c8cb82448b softether-1e17c9bcfd7e7b31756aa5389bcbff76c2c9c88a.tar.gz
|
||||
sha256 fe5ff8f13b42737dfd5eb53f14c55aed714c380f181a1ae112055b04e8c97229 c5e5d7e93c6f3302adf5821c29c4efdb7630e418.patch
|
||||
sha256 b5a8750426387b9211754b199f7f9f6a013dba6a1cd731c210a205679ffa1d1c 75625af541fd128f51079d0ffe5ef24645b8f421.patch
|
||||
sha256 8e6310d36e579ea07171ce5fcb9ebe31235d218444c4e4836ca6c32aa49c1f93 softether-v4.22-9634-beta.tar.gz
|
||||
sha256 7aeb873293fa0e44425dabf68a8e46e26c848fe58efcfd3ac7c90a3386f3edd1 LICENSE
|
||||
|
||||
@@ -4,14 +4,11 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SOFTETHER_VERSION = 1e17c9bcfd7e7b31756aa5389bcbff76c2c9c88a
|
||||
SOFTETHER_VERSION = v4.22-9634-beta
|
||||
SOFTETHER_SITE = $(call github,SoftEtherVPN,SoftEtherVPN,$(SOFTETHER_VERSION))
|
||||
SOFTETHER_PATCH = \
|
||||
https://github.com/dajhorn/SoftEtherVPN/commit/c5e5d7e93c6f3302adf5821c29c4efdb7630e418.patch \
|
||||
https://github.com/dajhorn/SoftEtherVPN/commit/75625af541fd128f51079d0ffe5ef24645b8f421.patch
|
||||
SOFTETHER_LICENSE = GPLv2
|
||||
SOFTETHER_LICENSE = GPL-2.0
|
||||
SOFTETHER_LICENSE_FILES = LICENSE
|
||||
SOFTETHER_DEPENDENCIES = host-softether openssl readline
|
||||
SOFTETHER_DEPENDENCIES = host-softether libopenssl readline
|
||||
SOFTETHER_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_ENABLE_LOCALE),)
|
||||
@@ -29,7 +26,7 @@ SOFTETHER_CONF_OPTS = \
|
||||
--with-zlib="$(STAGING_DIR)/usr"
|
||||
|
||||
# host-libiconv does not exist, therefore we need this extra line
|
||||
HOST_SOFTETHER_DEPENDENCIES = host-pkgconf host-openssl host-readline
|
||||
HOST_SOFTETHER_DEPENDENCIES = host-pkgconf host-libopenssl host-readline
|
||||
|
||||
# target build creates the file hamcore.se2 which needs the host variant of
|
||||
# hamcorebuilder, for details see http://www.vpnusers.com/viewtopic.php?p=5426
|
||||
@@ -40,7 +37,7 @@ define HOST_SOFTETHER_BUILD_CMDS
|
||||
endef
|
||||
|
||||
define HOST_SOFTETHER_INSTALL_CMDS
|
||||
$(INSTALL) -m 0755 $(@D)/src/hamcorebuilder/hamcorebuilder $(HOST_DIR)/usr/bin/hamcorebuilder
|
||||
$(INSTALL) -m 0755 $(@D)/src/hamcorebuilder/hamcorebuilder $(HOST_DIR)/bin/hamcorebuilder
|
||||
endef
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user