[Buildroot] [PATCH 2/2] package/softether: New package

Bernd Kuhls bernd.kuhls at t-online.de
Sat Sep 27 16:39:16 UTC 2014


Package description was copied from
https://launchpad.net/~dajhorn/+archive/ubuntu/softether/

Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
---
 package/Config.in                                  |    1 +
 package/softether/Config.in                        |   28 +
 package/softether/softether-0001-debian.patch      | 2381 ++++++++++++++++++++
 .../softether/softether-0002-cross-compile.patch   |   30 +
 package/softether/softether-0003-iconv.patch       |   27 +
 package/softether/softether.mk                     |   36 +
 6 files changed, 2503 insertions(+)
 create mode 100644 package/softether/Config.in
 create mode 100644 package/softether/softether-0001-debian.patch
 create mode 100644 package/softether/softether-0002-cross-compile.patch
 create mode 100644 package/softether/softether-0003-iconv.patch
 create mode 100644 package/softether/softether.mk

diff --git a/package/Config.in b/package/Config.in
index 2eefc3f..f609cbe 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1069,6 +1069,7 @@ endif
 	source "package/smcroute/Config.in"
 	source "package/socat/Config.in"
 	source "package/socketcand/Config.in"
+	source "package/softether/Config.in"
 	source "package/spawn-fcgi/Config.in"
 	source "package/spice/Config.in"
 	source "package/spice-protocol/Config.in"
diff --git a/package/softether/Config.in b/package/softether/Config.in
new file mode 100644
index 0000000..15d5834
--- /dev/null
+++ b/package/softether/Config.in
@@ -0,0 +1,28 @@
+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_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
+	depends on BR2_USE_WCHAR
+	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.
+
+	  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.
+
+	  http://www.softether.org
+
+comment "softether needs a toolchain w/ largefile, wchar, threads"
+	depends on BR2_USE_MMU
+	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/softether/softether-0001-debian.patch b/package/softether/softether-0001-debian.patch
new file mode 100644
index 0000000..db6eacd
--- /dev/null
+++ b/package/softether/softether-0001-debian.patch
@@ -0,0 +1,2381 @@
+Add autoconf support, link binaries to libsoftether.so
+
+Rebased debian/patches/debian-changes, taken from
+https://launchpad.net/~dajhorn/+archive/ubuntu/softether/+files/softether_4.08.9449-4%7Eprecise.debian.tar.gz
+
+Pull request is pending upstream:
+https://github.com/SoftEtherVPN/SoftEtherVPN/pull/50
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
+
+diff -uNr SoftEtherVPN.org/autotools/ax_check_openssl.m4 SoftEtherVPN/autotools/ax_check_openssl.m4
+--- SoftEtherVPN.org/autotools/ax_check_openssl.m4	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/autotools/ax_check_openssl.m4	2014-09-25 22:02:04.292387830 +0200
+@@ -0,0 +1,124 @@
++# ===========================================================================
++#     http://www.gnu.org/software/autoconf-archive/ax_check_openssl.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_CHECK_OPENSSL([action-if-found[, action-if-not-found]])
++#
++# DESCRIPTION
++#
++#   Look for OpenSSL in a number of default spots, or in a user-selected
++#   spot (via --with-openssl).  Sets
++#
++#     OPENSSL_INCLUDES to the include directives required
++#     OPENSSL_LIBS to the -l directives required
++#     OPENSSL_LDFLAGS to the -L or -R flags required
++#
++#   and calls ACTION-IF-FOUND or ACTION-IF-NOT-FOUND appropriately
++#
++#   This macro sets OPENSSL_INCLUDES such that source files should use the
++#   openssl/ directory in include directives:
++#
++#     #include <openssl/hmac.h>
++#
++# LICENSE
++#
++#   Copyright (c) 2009,2010 Zmanda Inc. <http://www.zmanda.com/>
++#   Copyright (c) 2009,2010 Dustin J. Mitchell <dustin at zmanda.com>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved. This file is offered as-is, without any
++#   warranty.
++
++#serial 8
++
++AU_ALIAS([CHECK_SSL], [AX_CHECK_OPENSSL])
++AC_DEFUN([AX_CHECK_OPENSSL], [
++    found=false
++    AC_ARG_WITH([openssl],
++        [AS_HELP_STRING([--with-openssl=DIR],
++            [root of the OpenSSL directory])],
++        [
++            case "$withval" in
++            "" | y | ye | yes | n | no)
++            AC_MSG_ERROR([Invalid --with-openssl value])
++              ;;
++            *) ssldirs="$withval"
++              ;;
++            esac
++        ], [
++            # if pkg-config is installed and openssl has installed a .pc file,
++            # then use that information and don't search ssldirs
++            AC_PATH_PROG([PKG_CONFIG], [pkg-config])
++            if test x"$PKG_CONFIG" != x""; then
++                OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null`
++                if test $? = 0; then
++                    OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null`
++                    OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null`
++                    found=true
++                fi
++            fi
++
++            # no such luck; use some default ssldirs
++            if ! $found; then
++                ssldirs="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr"
++            fi
++        ]
++        )
++
++
++    # note that we #include <openssl/foo.h>, so the OpenSSL headers have to be in
++    # an 'openssl' subdirectory
++
++    if ! $found; then
++        OPENSSL_INCLUDES=
++        for ssldir in $ssldirs; do
++            AC_MSG_CHECKING([for openssl/ssl.h in $ssldir])
++            if test -f "$ssldir/include/openssl/ssl.h"; then
++                OPENSSL_INCLUDES="-I$ssldir/include"
++                OPENSSL_LDFLAGS="-L$ssldir/lib"
++                OPENSSL_LIBS="-lssl -lcrypto"
++                found=true
++                AC_MSG_RESULT([yes])
++                break
++            else
++                AC_MSG_RESULT([no])
++            fi
++        done
++
++        # if the file wasn't found, well, go ahead and try the link anyway -- maybe
++        # it will just work!
++    fi
++
++    # try the preprocessor and linker with our new flags,
++    # being careful not to pollute the global LIBS, LDFLAGS, and CPPFLAGS
++
++    AC_MSG_CHECKING([whether compiling and linking against OpenSSL works])
++    echo "Trying link with OPENSSL_LDFLAGS=$OPENSSL_LDFLAGS;" \
++        "OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES" >&AS_MESSAGE_LOG_FD
++
++    save_LIBS="$LIBS"
++    save_LDFLAGS="$LDFLAGS"
++    save_CPPFLAGS="$CPPFLAGS"
++    LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS"
++    LIBS="$OPENSSL_LIBS $LIBS"
++    CPPFLAGS="$OPENSSL_INCLUDES $CPPFLAGS"
++    AC_LINK_IFELSE(
++        [AC_LANG_PROGRAM([#include <openssl/ssl.h>], [SSL_new(NULL)])],
++        [
++            AC_MSG_RESULT([yes])
++            $1
++        ], [
++            AC_MSG_RESULT([no])
++            $2
++        ])
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++
++    AC_SUBST([OPENSSL_INCLUDES])
++    AC_SUBST([OPENSSL_LIBS])
++    AC_SUBST([OPENSSL_LDFLAGS])
++])
+diff -uNr SoftEtherVPN.org/autotools/ax_check_zlib.m4 SoftEtherVPN/autotools/ax_check_zlib.m4
+--- SoftEtherVPN.org/autotools/ax_check_zlib.m4	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/autotools/ax_check_zlib.m4	2014-09-25 22:02:04.296389701 +0200
+@@ -0,0 +1,142 @@
++# ===========================================================================
++#       http://www.gnu.org/software/autoconf-archive/ax_check_zlib.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_CHECK_ZLIB([action-if-found], [action-if-not-found])
++#
++# DESCRIPTION
++#
++#   This macro searches for an installed zlib library. If nothing was
++#   specified when calling configure, it searches first in /usr/local and
++#   then in /usr, /opt/local and /sw. If the --with-zlib=DIR is specified,
++#   it will try to find it in DIR/include/zlib.h and DIR/lib/libz.a. If
++#   --without-zlib is specified, the library is not searched at all.
++#
++#   If either the header file (zlib.h) or the library (libz) is not found,
++#   shell commands 'action-if-not-found' is run. If 'action-if-not-found' is
++#   not specified, the configuration exits on error, asking for a valid zlib
++#   installation directory or --without-zlib.
++#
++#   If both header file and library are found, shell commands
++#   'action-if-found' is run. If 'action-if-found' is not specified, the
++#   default action appends '-I${ZLIB_HOME}/include' to CPFLAGS, appends
++#   '-L$ZLIB_HOME}/lib' to LDFLAGS, prepends '-lz' to LIBS, and calls
++#   AC_DEFINE(HAVE_LIBZ). You should use autoheader to include a definition
++#   for this symbol in a config.h file. Sample usage in a C/C++ source is as
++#   follows:
++#
++#     #ifdef HAVE_LIBZ
++#     #include <zlib.h>
++#     #endif /* HAVE_LIBZ */
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Loic Dachary <loic at senga.org>
++#   Copyright (c) 2010 Bastien Chevreux <bach at chevreux.org>
++#
++#   This program 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.
++#
++#   This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
++#
++#   As a special exception, the respective Autoconf Macro's copyright owner
++#   gives unlimited permission to copy, distribute and modify the configure
++#   scripts that are the output of Autoconf when processing the Macro. You
++#   need not follow the terms of the GNU General Public License when using
++#   or distributing such scripts, even though portions of the text of the
++#   Macro appear in them. The GNU General Public License (GPL) does govern
++#   all other use of the material that constitutes the Autoconf Macro.
++#
++#   This special exception to the GPL applies to versions of the Autoconf
++#   Macro released by the Autoconf Archive. When you make and distribute a
++#   modified version of the Autoconf Macro, you may extend this special
++#   exception to the GPL to apply to your modified version as well.
++
++#serial 14
++
++AU_ALIAS([CHECK_ZLIB], [AX_CHECK_ZLIB])
++AC_DEFUN([AX_CHECK_ZLIB],
++#
++# Handle user hints
++#
++[AC_MSG_CHECKING(if zlib is wanted)
++zlib_places="/usr/local /usr /opt/local /sw"
++AC_ARG_WITH([zlib],
++[  --with-zlib=DIR         root directory path of zlib installation @<:@defaults to
++                          /usr/local or /usr if not found in /usr/local@:>@
++  --without-zlib          to disable zlib usage completely],
++[if test "$withval" != no ; then
++  AC_MSG_RESULT(yes)
++  if test -d "$withval"
++  then
++    zlib_places="$withval $zlib_places"
++  else
++    AC_MSG_WARN([Sorry, $withval does not exist, checking usual places])
++  fi
++else
++  zlib_places=
++  AC_MSG_RESULT(no)
++fi],
++[AC_MSG_RESULT(yes)])
++
++#
++# Locate zlib, if wanted
++#
++if test -n "${zlib_places}"
++then
++	# check the user supplied or any other more or less 'standard' place:
++	#   Most UNIX systems      : /usr/local and /usr
++	#   MacPorts / Fink on OSX : /opt/local respectively /sw
++	for ZLIB_HOME in ${zlib_places} ; do
++	  if test -f "${ZLIB_HOME}/include/zlib.h"; then break; fi
++	  ZLIB_HOME=""
++	done
++
++  ZLIB_OLD_LDFLAGS=$LDFLAGS
++  ZLIB_OLD_CPPFLAGS=$CPPFLAGS
++  if test -n "${ZLIB_HOME}"; then
++        LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
++        CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
++  fi
++  AC_LANG_SAVE
++  AC_LANG_C
++  AC_CHECK_LIB([z], [inflateEnd], [zlib_cv_libz=yes], [zlib_cv_libz=no])
++  AC_CHECK_HEADER([zlib.h], [zlib_cv_zlib_h=yes], [zlib_cv_zlib_h=no])
++  AC_LANG_RESTORE
++  if test "$zlib_cv_libz" = "yes" && test "$zlib_cv_zlib_h" = "yes"
++  then
++    #
++    # If both library and header were found, action-if-found
++    #
++    m4_ifblank([$1],[
++                CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
++                LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
++                LIBS="-lz $LIBS"
++                AC_DEFINE([HAVE_LIBZ], [1],
++                          [Define to 1 if you have `z' library (-lz)])
++               ],[
++                # Restore variables
++                LDFLAGS="$ZLIB_OLD_LDFLAGS"
++                CPPFLAGS="$ZLIB_OLD_CPPFLAGS"
++                $1
++               ])
++  else
++    #
++    # If either header or library was not found, action-if-not-found
++    #
++    m4_default([$2],[
++                AC_MSG_ERROR([either specify a valid zlib installation with --with-zlib=DIR or disable zlib usage with --without-zlib])
++                ])
++  fi
++fi
++])
+diff -uNr SoftEtherVPN.org/autotools/ax_lib_readline.m4 SoftEtherVPN/autotools/ax_lib_readline.m4
+--- SoftEtherVPN.org/autotools/ax_lib_readline.m4	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/autotools/ax_lib_readline.m4	2014-09-25 22:02:04.296389701 +0200
+@@ -0,0 +1,107 @@
++# ===========================================================================
++#      http://www.gnu.org/software/autoconf-archive/ax_lib_readline.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_LIB_READLINE
++#
++# DESCRIPTION
++#
++#   Searches for a readline compatible library. If found, defines
++#   `HAVE_LIBREADLINE'. If the found library has the `add_history' function,
++#   sets also `HAVE_READLINE_HISTORY'. Also checks for the locations of the
++#   necessary include files and sets `HAVE_READLINE_H' or
++#   `HAVE_READLINE_READLINE_H' and `HAVE_READLINE_HISTORY_H' or
++#   'HAVE_HISTORY_H' if the corresponding include files exists.
++#
++#   The libraries that may be readline compatible are `libedit',
++#   `libeditline' and `libreadline'. Sometimes we need to link a termcap
++#   library for readline to work, this macro tests these cases too by trying
++#   to link with `libtermcap', `libcurses' or `libncurses' before giving up.
++#
++#   Here is an example of how to use the information provided by this macro
++#   to perform the necessary includes or declarations in a C file:
++#
++#     #ifdef HAVE_LIBREADLINE
++#     #  if defined(HAVE_READLINE_READLINE_H)
++#     #    include <readline/readline.h>
++#     #  elif defined(HAVE_READLINE_H)
++#     #    include <readline.h>
++#     #  else /* !defined(HAVE_READLINE_H) */
++#     extern char *readline ();
++#     #  endif /* !defined(HAVE_READLINE_H) */
++#     char *cmdline = NULL;
++#     #else /* !defined(HAVE_READLINE_READLINE_H) */
++#       /* no readline */
++#     #endif /* HAVE_LIBREADLINE */
++#
++#     #ifdef HAVE_READLINE_HISTORY
++#     #  if defined(HAVE_READLINE_HISTORY_H)
++#     #    include <readline/history.h>
++#     #  elif defined(HAVE_HISTORY_H)
++#     #    include <history.h>
++#     #  else /* !defined(HAVE_HISTORY_H) */
++#     extern void add_history ();
++#     extern int write_history ();
++#     extern int read_history ();
++#     #  endif /* defined(HAVE_READLINE_HISTORY_H) */
++#       /* no history */
++#     #endif /* HAVE_READLINE_HISTORY */
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Ville Laurikari <vl at iki.fi>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved. This file is offered as-is, without any
++#   warranty.
++
++#serial 6
++
++AU_ALIAS([VL_LIB_READLINE], [AX_LIB_READLINE])
++AC_DEFUN([AX_LIB_READLINE], [
++  AC_CACHE_CHECK([for a readline compatible library],
++                 ax_cv_lib_readline, [
++    ORIG_LIBS="$LIBS"
++    for readline_lib in readline edit editline; do
++      for termcap_lib in "" termcap curses ncurses; do
++        if test -z "$termcap_lib"; then
++          TRY_LIB="-l$readline_lib"
++        else
++          TRY_LIB="-l$readline_lib -l$termcap_lib"
++        fi
++        LIBS="$ORIG_LIBS $TRY_LIB"
++        AC_TRY_LINK_FUNC(readline, ax_cv_lib_readline="$TRY_LIB")
++        if test -n "$ax_cv_lib_readline"; then
++          break
++        fi
++      done
++      if test -n "$ax_cv_lib_readline"; then
++        break
++      fi
++    done
++    if test -z "$ax_cv_lib_readline"; then
++      ax_cv_lib_readline="no"
++    fi
++    LIBS="$ORIG_LIBS"
++  ])
++
++  if test "$ax_cv_lib_readline" != "no"; then
++    LIBS="$LIBS $ax_cv_lib_readline"
++    AC_DEFINE(HAVE_LIBREADLINE, 1,
++              [Define if you have a readline compatible library])
++    AC_CHECK_HEADERS(readline.h readline/readline.h)
++    AC_CACHE_CHECK([whether readline supports history],
++                   ax_cv_lib_readline_history, [
++      ax_cv_lib_readline_history="no"
++      AC_TRY_LINK_FUNC(add_history, ax_cv_lib_readline_history="yes")
++    ])
++    if test "$ax_cv_lib_readline_history" = "yes"; then
++      AC_DEFINE(HAVE_READLINE_HISTORY, 1,
++                [Define if your readline library has \`add_history'])
++      AC_CHECK_HEADERS(history.h readline/history.h)
++    fi
++  fi
++])dnl
+diff -uNr SoftEtherVPN.org/autotools/ax_pthread.m4 SoftEtherVPN/autotools/ax_pthread.m4
+--- SoftEtherVPN.org/autotools/ax_pthread.m4	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/autotools/ax_pthread.m4	2014-09-25 22:02:04.296389701 +0200
+@@ -0,0 +1,332 @@
++# ===========================================================================
++#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
++#
++# DESCRIPTION
++#
++#   This macro figures out how to build C programs using POSIX threads. It
++#   sets the PTHREAD_LIBS output variable to the threads library and linker
++#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
++#   flags that are needed. (The user can also force certain compiler
++#   flags/libs to be tested by setting these environment variables.)
++#
++#   Also sets PTHREAD_CC to any special C compiler that is needed for
++#   multi-threaded programs (defaults to the value of CC otherwise). (This
++#   is necessary on AIX to use the special cc_r compiler alias.)
++#
++#   NOTE: You are assumed to not only compile your program with these flags,
++#   but also link it with them as well. e.g. you should link with
++#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
++#
++#   If you are only building threads programs, you may wish to use these
++#   variables in your default LIBS, CFLAGS, and CC:
++#
++#     LIBS="$PTHREAD_LIBS $LIBS"
++#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++#     CC="$PTHREAD_CC"
++#
++#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
++#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
++#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
++#
++#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
++#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
++#   PTHREAD_CFLAGS.
++#
++#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
++#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
++#   is not found. If ACTION-IF-FOUND is not specified, the default action
++#   will define HAVE_PTHREAD.
++#
++#   Please let the authors know if this macro fails on any platform, or if
++#   you have any other suggestions or comments. This macro was based on work
++#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
++#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
++#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
++#   grateful for the helpful feedback of numerous users.
++#
++#   Updated for Autoconf 2.68 by Daniel Richard G.
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Steven G. Johnson <stevenj at alum.mit.edu>
++#   Copyright (c) 2011 Daniel Richard G. <skunk at iSKUNK.ORG>
++#
++#   This program 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 3 of the License, or (at your
++#   option) any later version.
++#
++#   This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
++#
++#   As a special exception, the respective Autoconf Macro's copyright owner
++#   gives unlimited permission to copy, distribute and modify the configure
++#   scripts that are the output of Autoconf when processing the Macro. You
++#   need not follow the terms of the GNU General Public License when using
++#   or distributing such scripts, even though portions of the text of the
++#   Macro appear in them. The GNU General Public License (GPL) does govern
++#   all other use of the material that constitutes the Autoconf Macro.
++#
++#   This special exception to the GPL applies to versions of the Autoconf
++#   Macro released by the Autoconf Archive. When you make and distribute a
++#   modified version of the Autoconf Macro, you may extend this special
++#   exception to the GPL to apply to your modified version as well.
++
++#serial 21
++
++AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
++AC_DEFUN([AX_PTHREAD], [
++AC_REQUIRE([AC_CANONICAL_HOST])
++AC_LANG_PUSH([C])
++ax_pthread_ok=no
++
++# We used to check for pthread.h first, but this fails if pthread.h
++# requires special compiler flags (e.g. on True64 or Sequent).
++# It gets checked for in the link test anyway.
++
++# First of all, check if the user has set any of the PTHREAD_LIBS,
++# etcetera environment variables, and if threads linking works using
++# them:
++if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
++        save_CFLAGS="$CFLAGS"
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++        save_LIBS="$LIBS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
++        AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes])
++        AC_MSG_RESULT([$ax_pthread_ok])
++        if test x"$ax_pthread_ok" = xno; then
++                PTHREAD_LIBS=""
++                PTHREAD_CFLAGS=""
++        fi
++        LIBS="$save_LIBS"
++        CFLAGS="$save_CFLAGS"
++fi
++
++# We must check for the threads library under a number of different
++# names; the ordering is very important because some systems
++# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
++# libraries is broken (non-POSIX).
++
++# Create a list of thread flags to try.  Items starting with a "-" are
++# C compiler flags, and other items are library names, except for "none"
++# which indicates that we try without any flags at all, and "pthread-config"
++# which is a program returning the flags for the Pth emulation library.
++
++ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
++
++# The ordering *is* (sometimes) important.  Some notes on the
++# individual items follow:
++
++# pthreads: AIX (must check this before -lpthread)
++# none: in case threads are in libc; should be tried before -Kthread and
++#       other compiler flags to prevent continual compiler warnings
++# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
++# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
++# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
++# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
++# -pthreads: Solaris/gcc
++# -mthreads: Mingw32/gcc, Lynx/gcc
++# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
++#      doesn't hurt to check since this sometimes defines pthreads too;
++#      also defines -D_REENTRANT)
++#      ... -mt is also the pthreads flag for HP/aCC
++# pthread: Linux, etcetera
++# --thread-safe: KAI C++
++# pthread-config: use pthread-config program (for GNU Pth library)
++
++case ${host_os} in
++        solaris*)
++
++        # On Solaris (at least, for some versions), libc contains stubbed
++        # (non-functional) versions of the pthreads routines, so link-based
++        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
++        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
++        # a function called by this macro, so we could check for that, but
++        # who knows whether they'll stub that too in a future libc.)  So,
++        # we'll just look for -pthreads and -lpthread first:
++
++        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
++        ;;
++
++        darwin*)
++        ax_pthread_flags="-pthread $ax_pthread_flags"
++        ;;
++esac
++
++# Clang doesn't consider unrecognized options an error unless we specify
++# -Werror. We throw in some extra Clang-specific options to ensure that
++# this doesn't happen for GCC, which also accepts -Werror.
++
++AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
++save_CFLAGS="$CFLAGS"
++ax_pthread_extra_flags="-Werror"
++CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
++                  [AC_MSG_RESULT([yes])],
++                  [ax_pthread_extra_flags=
++                   AC_MSG_RESULT([no])])
++CFLAGS="$save_CFLAGS"
++
++if test x"$ax_pthread_ok" = xno; then
++for flag in $ax_pthread_flags; do
++
++        case $flag in
++                none)
++                AC_MSG_CHECKING([whether pthreads work without any flags])
++                ;;
++
++                -*)
++                AC_MSG_CHECKING([whether pthreads work with $flag])
++                PTHREAD_CFLAGS="$flag"
++                ;;
++
++                pthread-config)
++                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
++                if test x"$ax_pthread_config" = xno; then continue; fi
++                PTHREAD_CFLAGS="`pthread-config --cflags`"
++                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
++                ;;
++
++                *)
++                AC_MSG_CHECKING([for the pthreads library -l$flag])
++                PTHREAD_LIBS="-l$flag"
++                ;;
++        esac
++
++        save_LIBS="$LIBS"
++        save_CFLAGS="$CFLAGS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
++
++        # Check for various functions.  We must include pthread.h,
++        # since some functions may be macros.  (On the Sequent, we
++        # need a special flag -Kthread to make this header compile.)
++        # We check for pthread_join because it is in -lpthread on IRIX
++        # while pthread_create is in libc.  We check for pthread_attr_init
++        # due to DEC craziness with -lpthreads.  We check for
++        # pthread_cleanup_push because it is one of the few pthread
++        # functions on Solaris that doesn't have a non-functional libc stub.
++        # We try pthread_create on general principles.
++        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
++                        static void routine(void *a) { a = 0; }
++                        static void *start_routine(void *a) { return a; }],
++                       [pthread_t th; pthread_attr_t attr;
++                        pthread_create(&th, 0, start_routine, 0);
++                        pthread_join(th, 0);
++                        pthread_attr_init(&attr);
++                        pthread_cleanup_push(routine, 0);
++                        pthread_cleanup_pop(0) /* ; */])],
++                [ax_pthread_ok=yes],
++                [])
++
++        LIBS="$save_LIBS"
++        CFLAGS="$save_CFLAGS"
++
++        AC_MSG_RESULT([$ax_pthread_ok])
++        if test "x$ax_pthread_ok" = xyes; then
++                break;
++        fi
++
++        PTHREAD_LIBS=""
++        PTHREAD_CFLAGS=""
++done
++fi
++
++# Various other checks:
++if test "x$ax_pthread_ok" = xyes; then
++        save_LIBS="$LIBS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++        save_CFLAGS="$CFLAGS"
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++
++        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
++        AC_MSG_CHECKING([for joinable pthread attribute])
++        attr_name=unknown
++        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
++            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
++                           [int attr = $attr; return attr /* ; */])],
++                [attr_name=$attr; break],
++                [])
++        done
++        AC_MSG_RESULT([$attr_name])
++        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
++            AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
++                               [Define to necessary symbol if this constant
++                                uses a non-standard name on your system.])
++        fi
++
++        AC_MSG_CHECKING([if more special flags are required for pthreads])
++        flag=no
++        case ${host_os} in
++            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
++            osf* | hpux*) flag="-D_REENTRANT";;
++            solaris*)
++            if test "$GCC" = "yes"; then
++                flag="-D_REENTRANT"
++            else
++                # TODO: What about Clang on Solaris?
++                flag="-mt -D_REENTRANT"
++            fi
++            ;;
++        esac
++        AC_MSG_RESULT([$flag])
++        if test "x$flag" != xno; then
++            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
++        fi
++
++        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
++            [ax_cv_PTHREAD_PRIO_INHERIT], [
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
++                                                [[int i = PTHREAD_PRIO_INHERIT;]])],
++                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
++                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
++            ])
++        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
++            [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])
++
++        LIBS="$save_LIBS"
++        CFLAGS="$save_CFLAGS"
++
++        # More AIX lossage: compile with *_r variant
++        if test "x$GCC" != xyes; then
++            case $host_os in
++                aix*)
++                AS_CASE(["x/$CC"],
++                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
++                  [#handle absolute path differently from PATH based program lookup
++                   AS_CASE(["x$CC"],
++                     [x/*],
++                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
++                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
++                ;;
++            esac
++        fi
++fi
++
++test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
++
++AC_SUBST([PTHREAD_LIBS])
++AC_SUBST([PTHREAD_CFLAGS])
++AC_SUBST([PTHREAD_CC])
++
++# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
++if test x"$ax_pthread_ok" = xyes; then
++        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
++        :
++else
++        ax_pthread_ok=no
++        $2
++fi
++AC_LANG_POP
++])dnl AX_PTHREAD
+diff -uNr SoftEtherVPN.org/autotools/ax_with_curses.m4 SoftEtherVPN/autotools/ax_with_curses.m4
+--- SoftEtherVPN.org/autotools/ax_with_curses.m4	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/autotools/ax_with_curses.m4	2014-09-25 22:02:04.296389701 +0200
+@@ -0,0 +1,518 @@
++# ===========================================================================
++#      http://www.gnu.org/software/autoconf-archive/ax_with_curses.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_WITH_CURSES
++#
++# DESCRIPTION
++#
++#   This macro checks whether a SysV or X/Open-compatible Curses library is
++#   present, along with the associated header file.  The NcursesW
++#   (wide-character) library is searched for first, followed by Ncurses,
++#   then the system-default plain Curses.  The first library found is the
++#   one returned.
++#
++#   The following options are understood: --with-ncursesw, --with-ncurses,
++#   --without-ncursesw, --without-ncurses.  The "--with" options force the
++#   macro to use that particular library, terminating with an error if not
++#   found.  The "--without" options simply skip the check for that library.
++#   The effect on the search pattern is:
++#
++#     (no options)                           - NcursesW, Ncurses, Curses
++#     --with-ncurses     --with-ncursesw     - NcursesW only [*]
++#     --without-ncurses  --with-ncursesw     - NcursesW only [*]
++#                        --with-ncursesw     - NcursesW only [*]
++#     --with-ncurses     --without-ncursesw  - Ncurses only [*]
++#     --with-ncurses                         - NcursesW, Ncurses [**]
++#     --without-ncurses  --without-ncursesw  - Curses only
++#                        --without-ncursesw  - Ncurses, Curses
++#     --without-ncurses                      - NcursesW, Curses
++#
++#   [*]  If the library is not found, abort the configure script.
++#
++#   [**] If the second library (Ncurses) is not found, abort configure.
++#
++#   The following preprocessor symbols may be defined by this macro if the
++#   appropriate conditions are met:
++#
++#     HAVE_CURSES             - if any SysV or X/Open Curses library found
++#     HAVE_CURSES_ENHANCED    - if library supports X/Open Enhanced functions
++#     HAVE_CURSES_COLOR       - if library supports color (enhanced functions)
++#     HAVE_CURSES_OBSOLETE    - if library supports certain obsolete features
++#     HAVE_NCURSESW           - if NcursesW (wide char) library is to be used
++#     HAVE_NCURSES            - if the Ncurses library is to be used
++#
++#     HAVE_CURSES_H           - if <curses.h> is present and should be used
++#     HAVE_NCURSESW_H         - if <ncursesw.h> should be used
++#     HAVE_NCURSES_H          - if <ncurses.h> should be used
++#     HAVE_NCURSESW_CURSES_H  - if <ncursesw/curses.h> should be used
++#     HAVE_NCURSES_CURSES_H   - if <ncurses/curses.h> should be used
++#
++#   (These preprocessor symbols are discussed later in this document.)
++#
++#   The following output variable is defined by this macro; it is precious
++#   and may be overridden on the ./configure command line:
++#
++#     CURSES_LIB  - library to add to xxx_LDADD
++#
++#   The library listed in CURSES_LIB is NOT added to LIBS by default. You
++#   need to add CURSES_LIB to the appropriate xxx_LDADD line in your
++#   Makefile.am.  For example:
++#
++#     prog_LDADD = @CURSES_LIB@
++#
++#   If CURSES_LIB is set on the configure command line (such as by running
++#   "./configure CURSES_LIB=-lmycurses"), then the only header searched for
++#   is <curses.h>.  The user may use the CPPFLAGS precious variable to
++#   override the standard #include search path.  If the user needs to
++#   specify an alternative path for a library (such as for a non-standard
++#   NcurseW), the user should use the LDFLAGS variable.
++#
++#   The following shell variables may be defined by this macro:
++#
++#     ax_cv_curses           - set to "yes" if any Curses library found
++#     ax_cv_curses_enhanced  - set to "yes" if Enhanced functions present
++#     ax_cv_curses_color     - set to "yes" if color functions present
++#     ax_cv_curses_obsolete  - set to "yes" if obsolete features present
++#
++#     ax_cv_ncursesw      - set to "yes" if NcursesW library found
++#     ax_cv_ncurses       - set to "yes" if Ncurses library found
++#     ax_cv_plaincurses   - set to "yes" if plain Curses library found
++#     ax_cv_curses_which  - set to "ncursesw", "ncurses", "plaincurses" or "no"
++#
++#   These variables can be used in your configure.ac to determine the level
++#   of support you need from the Curses library.  For example, if you must
++#   have either Ncurses or NcursesW, you could include:
++#
++#     AX_WITH_CURSES
++#     if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
++#         AC_MSG_ERROR([requires either NcursesW or Ncurses library])
++#     fi
++#
++#   If any Curses library will do (but one must be present and must support
++#   color), you could use:
++#
++#     AX_WITH_CURSES
++#     if test "x$ax_cv_curses" != xyes || test "x$ax_cv_curses_color" != xyes; then
++#         AC_MSG_ERROR([requires an X/Open-compatible Curses library with color])
++#     fi
++#
++#   Certain preprocessor symbols and shell variables defined by this macro
++#   can be used to determine various features of the Curses library.  In
++#   particular, HAVE_CURSES and ax_cv_curses are defined if the Curses
++#   library found conforms to the traditional SysV and/or X/Open Base Curses
++#   definition.  Any working Curses library conforms to this level.
++#
++#   HAVE_CURSES_ENHANCED and ax_cv_curses_enhanced are defined if the
++#   library supports the X/Open Enhanced Curses definition.  In particular,
++#   the wide-character types attr_t, cchar_t and wint_t, the functions
++#   wattr_set() and wget_wch() and the macros WA_NORMAL and _XOPEN_CURSES
++#   are checked.  The Ncurses library does NOT conform to this definition,
++#   although NcursesW does.
++#
++#   HAVE_CURSES_COLOR and ax_cv_curses_color are defined if the library
++#   supports color functions and macros such as COLOR_PAIR, A_COLOR,
++#   COLOR_WHITE, COLOR_RED and init_pair().  These are NOT part of the
++#   X/Open Base Curses definition, but are part of the Enhanced set of
++#   functions.  The Ncurses library DOES support these functions, as does
++#   NcursesW.
++#
++#   HAVE_CURSES_OBSOLETE and ax_cv_curses_obsolete are defined if the
++#   library supports certain features present in SysV and BSD Curses but not
++#   defined in the X/Open definition.  In particular, the functions
++#   getattrs(), getcurx() and getmaxx() are checked.
++#
++#   To use the HAVE_xxx_H preprocessor symbols, insert the following into
++#   your system.h (or equivalent) header file:
++#
++#     #if defined HAVE_NCURSESW_CURSES_H
++#     #  include <ncursesw/curses.h>
++#     #elif defined HAVE_NCURSESW_H
++#     #  include <ncursesw.h>
++#     #elif defined HAVE_NCURSES_CURSES_H
++#     #  include <ncurses/curses.h>
++#     #elif defined HAVE_NCURSES_H
++#     #  include <ncurses.h>
++#     #elif defined HAVE_CURSES_H
++#     #  include <curses.h>
++#     #else
++#     #  error "SysV or X/Open-compatible Curses header file required"
++#     #endif
++#
++#   For previous users of this macro: you should not need to change anything
++#   in your configure.ac or Makefile.am, as the previous (serial 10)
++#   semantics are still valid.  However, you should update your system.h (or
++#   equivalent) header file to the fragment shown above. You are encouraged
++#   also to make use of the extended functionality provided by this version
++#   of AX_WITH_CURSES, as well as in the additional macros
++#   AX_WITH_CURSES_PANEL, AX_WITH_CURSES_MENU and AX_WITH_CURSES_FORM.
++#
++# LICENSE
++#
++#   Copyright (c) 2009 Mark Pulford <mark at kyne.com.au>
++#   Copyright (c) 2009 Damian Pietras <daper at daper.net>
++#   Copyright (c) 2012 Reuben Thomas <rrt at sc3d.org>
++#   Copyright (c) 2011 John Zaitseff <J.Zaitseff at zap.org.au>
++#
++#   This program 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 3 of the License, or (at your
++#   option) any later version.
++#
++#   This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
++#
++#   As a special exception, the respective Autoconf Macro's copyright owner
++#   gives unlimited permission to copy, distribute and modify the configure
++#   scripts that are the output of Autoconf when processing the Macro. You
++#   need not follow the terms of the GNU General Public License when using
++#   or distributing such scripts, even though portions of the text of the
++#   Macro appear in them. The GNU General Public License (GPL) does govern
++#   all other use of the material that constitutes the Autoconf Macro.
++#
++#   This special exception to the GPL applies to versions of the Autoconf
++#   Macro released by the Autoconf Archive. When you make and distribute a
++#   modified version of the Autoconf Macro, you may extend this special
++#   exception to the GPL to apply to your modified version as well.
++
++#serial 15
++
++AU_ALIAS([MP_WITH_CURSES], [AX_WITH_CURSES])
++AC_DEFUN([AX_WITH_CURSES], [
++    AC_ARG_VAR([CURSES_LIB], [linker library for Curses, e.g. -lcurses])
++    AC_ARG_WITH([ncurses], [AS_HELP_STRING([--with-ncurses],
++        [force the use of Ncurses or NcursesW])],
++        [], [with_ncurses=check])
++    AC_ARG_WITH([ncursesw], [AS_HELP_STRING([--without-ncursesw],
++        [do not use NcursesW (wide character support)])],
++        [], [with_ncursesw=check])
++
++    ax_saved_LIBS=$LIBS
++    AS_IF([test "x$with_ncurses" = xyes || test "x$with_ncursesw" = xyes],
++        [ax_with_plaincurses=no], [ax_with_plaincurses=check])
++
++    ax_cv_curses_which=no
++
++    # Test for NcursesW
++
++    AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncursesw" != xno], [
++        LIBS="$ax_saved_LIBS -lncursesw"
++
++        AC_CACHE_CHECK([for NcursesW wide-character library], [ax_cv_ncursesw], [
++            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
++                [ax_cv_ncursesw=yes], [ax_cv_ncursesw=no])
++        ])
++        AS_IF([test "x$ax_cv_ncursesw" = xno && test "x$with_ncursesw" = xyes], [
++            AC_MSG_ERROR([--with-ncursesw specified but could not find NcursesW library])
++        ])
++
++        AS_IF([test "x$ax_cv_ncursesw" = xyes], [
++            ax_cv_curses=yes
++            ax_cv_curses_which=ncursesw
++            CURSES_LIB="-lncursesw"
++            AC_DEFINE([HAVE_NCURSESW], [1], [Define to 1 if the NcursesW library is present])
++            AC_DEFINE([HAVE_CURSES],   [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
++
++            AC_CACHE_CHECK([for working ncursesw/curses.h], [ax_cv_header_ncursesw_curses_h], [
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                        @%:@define _XOPEN_SOURCE_EXTENDED 1
++                        @%:@include <ncursesw/curses.h>
++                    ]], [[
++                        chtype a = A_BOLD;
++                        int b = KEY_LEFT;
++                        chtype c = COLOR_PAIR(1) & A_COLOR;
++                        attr_t d = WA_NORMAL;
++                        cchar_t e;
++                        wint_t f;
++                        int g = getattrs(stdscr);
++                        int h = getcurx(stdscr) + getmaxx(stdscr);
++                        initscr();
++                        init_pair(1, COLOR_WHITE, COLOR_RED);
++                        wattr_set(stdscr, d, 0, NULL);
++                        wget_wch(stdscr, &f);
++                    ]])],
++                    [ax_cv_header_ncursesw_curses_h=yes],
++                    [ax_cv_header_ncursesw_curses_h=no])
++            ])
++            AS_IF([test "x$ax_cv_header_ncursesw_curses_h" = xyes], [
++                ax_cv_curses_enhanced=yes
++                ax_cv_curses_color=yes
++                ax_cv_curses_obsolete=yes
++                AC_DEFINE([HAVE_CURSES_ENHANCED],   [1], [Define to 1 if library supports X/Open Enhanced functions])
++                AC_DEFINE([HAVE_CURSES_COLOR],      [1], [Define to 1 if library supports color (enhanced functions)])
++                AC_DEFINE([HAVE_CURSES_OBSOLETE],   [1], [Define to 1 if library supports certain obsolete features])
++                AC_DEFINE([HAVE_NCURSESW_CURSES_H], [1], [Define to 1 if <ncursesw/curses.h> is present])
++            ])
++
++            AC_CACHE_CHECK([for working ncursesw.h], [ax_cv_header_ncursesw_h], [
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                        @%:@define _XOPEN_SOURCE_EXTENDED 1
++                        @%:@include <ncursesw.h>
++                    ]], [[
++                        chtype a = A_BOLD;
++                        int b = KEY_LEFT;
++                        chtype c = COLOR_PAIR(1) & A_COLOR;
++                        attr_t d = WA_NORMAL;
++                        cchar_t e;
++                        wint_t f;
++                        int g = getattrs(stdscr);
++                        int h = getcurx(stdscr) + getmaxx(stdscr);
++                        initscr();
++                        init_pair(1, COLOR_WHITE, COLOR_RED);
++                        wattr_set(stdscr, d, 0, NULL);
++                        wget_wch(stdscr, &f);
++                    ]])],
++                    [ax_cv_header_ncursesw_h=yes],
++                    [ax_cv_header_ncursesw_h=no])
++            ])
++            AS_IF([test "x$ax_cv_header_ncursesw_h" = xyes], [
++                ax_cv_curses_enhanced=yes
++                ax_cv_curses_color=yes
++                ax_cv_curses_obsolete=yes
++                AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions])
++                AC_DEFINE([HAVE_CURSES_COLOR],    [1], [Define to 1 if library supports color (enhanced functions)])
++                AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features])
++                AC_DEFINE([HAVE_NCURSESW_H],      [1], [Define to 1 if <ncursesw.h> is present])
++            ])
++
++            AC_CACHE_CHECK([for working ncurses.h], [ax_cv_header_ncurses_h_with_ncursesw], [
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                        @%:@define _XOPEN_SOURCE_EXTENDED 1
++                        @%:@include <ncurses.h>
++                    ]], [[
++                        chtype a = A_BOLD;
++                        int b = KEY_LEFT;
++                        chtype c = COLOR_PAIR(1) & A_COLOR;
++                        attr_t d = WA_NORMAL;
++                        cchar_t e;
++                        wint_t f;
++                        int g = getattrs(stdscr);
++                        int h = getcurx(stdscr) + getmaxx(stdscr);
++                        initscr();
++                        init_pair(1, COLOR_WHITE, COLOR_RED);
++                        wattr_set(stdscr, d, 0, NULL);
++                        wget_wch(stdscr, &f);
++                    ]])],
++                    [ax_cv_header_ncurses_h_with_ncursesw=yes],
++                    [ax_cv_header_ncurses_h_with_ncursesw=no])
++            ])
++            AS_IF([test "x$ax_cv_header_ncurses_h_with_ncursesw" = xyes], [
++                ax_cv_curses_enhanced=yes
++                ax_cv_curses_color=yes
++                ax_cv_curses_obsolete=yes
++                AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions])
++                AC_DEFINE([HAVE_CURSES_COLOR],    [1], [Define to 1 if library supports color (enhanced functions)])
++                AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features])
++                AC_DEFINE([HAVE_NCURSES_H],       [1], [Define to 1 if <ncurses.h> is present])
++            ])
++
++            AS_IF([test "x$ax_cv_header_ncursesw_curses_h" = xno && test "x$ax_cv_header_ncursesw_h" = xno && test "x$ax_cv_header_ncurses_h_with_ncursesw" = xno], [
++                AC_MSG_WARN([could not find a working ncursesw/curses.h, ncursesw.h or ncurses.h])
++            ])
++        ])
++    ])
++
++    # Test for Ncurses
++
++    AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [
++        LIBS="$ax_saved_LIBS -lncurses"
++
++        AC_CACHE_CHECK([for Ncurses library], [ax_cv_ncurses], [
++            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
++                [ax_cv_ncurses=yes], [ax_cv_ncurses=no])
++        ])
++        AS_IF([test "x$ax_cv_ncurses" = xno && test "x$with_ncurses" = xyes], [
++            AC_MSG_ERROR([--with-ncurses specified but could not find Ncurses library])
++        ])
++
++        AS_IF([test "x$ax_cv_ncurses" = xyes], [
++            ax_cv_curses=yes
++            ax_cv_curses_which=ncurses
++            CURSES_LIB="-lncurses"
++            AC_DEFINE([HAVE_NCURSES], [1], [Define to 1 if the Ncurses library is present])
++            AC_DEFINE([HAVE_CURSES],  [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
++
++            AC_CACHE_CHECK([for working ncurses/curses.h], [ax_cv_header_ncurses_curses_h], [
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                        @%:@include <ncurses/curses.h>
++                    ]], [[
++                        chtype a = A_BOLD;
++                        int b = KEY_LEFT;
++                        chtype c = COLOR_PAIR(1) & A_COLOR;
++                        int g = getattrs(stdscr);
++                        int h = getcurx(stdscr) + getmaxx(stdscr);
++                        initscr();
++                        init_pair(1, COLOR_WHITE, COLOR_RED);
++                    ]])],
++                    [ax_cv_header_ncurses_curses_h=yes],
++                    [ax_cv_header_ncurses_curses_h=no])
++            ])
++            AS_IF([test "x$ax_cv_header_ncurses_curses_h" = xyes], [
++                ax_cv_curses_color=yes
++                ax_cv_curses_obsolete=yes
++                AC_DEFINE([HAVE_CURSES_COLOR],     [1], [Define to 1 if library supports color (enhanced functions)])
++                AC_DEFINE([HAVE_CURSES_OBSOLETE],  [1], [Define to 1 if library supports certain obsolete features])
++                AC_DEFINE([HAVE_NCURSES_CURSES_H], [1], [Define to 1 if <ncurses/curses.h> is present])
++            ])
++
++            AC_CACHE_CHECK([for working ncurses.h], [ax_cv_header_ncurses_h], [
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                        @%:@include <ncurses.h>
++                    ]], [[
++                        chtype a = A_BOLD;
++                        int b = KEY_LEFT;
++                        chtype c = COLOR_PAIR(1) & A_COLOR;
++                        int g = getattrs(stdscr);
++                        int h = getcurx(stdscr) + getmaxx(stdscr);
++                        initscr();
++                        init_pair(1, COLOR_WHITE, COLOR_RED);
++                    ]])],
++                    [ax_cv_header_ncurses_h=yes],
++                    [ax_cv_header_ncurses_h=no])
++            ])
++            AS_IF([test "x$ax_cv_header_ncurses_h" = xyes], [
++                ax_cv_curses_color=yes
++                ax_cv_curses_obsolete=yes
++                AC_DEFINE([HAVE_CURSES_COLOR],    [1], [Define to 1 if library supports color (enhanced functions)])
++                AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features])
++                AC_DEFINE([HAVE_NCURSES_H],       [1], [Define to 1 if <ncurses.h> is present])
++            ])
++
++            AS_IF([test "x$ax_cv_header_ncurses_curses_h" = xno && test "x$ax_cv_header_ncurses_h" = xno], [
++                AC_MSG_WARN([could not find a working ncurses/curses.h or ncurses.h])
++            ])
++        ])
++    ])
++
++    # Test for plain Curses (or if CURSES_LIB was set by user)
++
++    AS_IF([test "x$with_plaincurses" != xno && test "x$ax_cv_curses_which" = xno], [
++        AS_IF([test "x$CURSES_LIB" != x], [
++            LIBS="$ax_saved_LIBS $CURSES_LIB"
++        ], [
++            LIBS="$ax_saved_LIBS -lcurses"
++        ])
++
++        AC_CACHE_CHECK([for Curses library], [ax_cv_plaincurses], [
++            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
++                [ax_cv_plaincurses=yes], [ax_cv_plaincurses=no])
++        ])
++
++        AS_IF([test "x$ax_cv_plaincurses" = xyes], [
++            ax_cv_curses=yes
++            ax_cv_curses_which=plaincurses
++            AS_IF([test "x$CURSES_LIB" = x], [
++                CURSES_LIB="-lcurses"
++            ])
++            AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
++
++            # Check for base conformance (and header file)
++
++            AC_CACHE_CHECK([for working curses.h], [ax_cv_header_curses_h], [
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                        @%:@include <curses.h>
++                    ]], [[
++                        chtype a = A_BOLD;
++                        int b = KEY_LEFT;
++                        initscr();
++                    ]])],
++                    [ax_cv_header_curses_h=yes],
++                    [ax_cv_header_curses_h=no])
++            ])
++            AS_IF([test "x$ax_cv_header_curses_h" = xyes], [
++                AC_DEFINE([HAVE_CURSES_H], [1], [Define to 1 if <curses.h> is present])
++
++                # Check for X/Open Enhanced conformance
++
++                AC_CACHE_CHECK([for X/Open Enhanced Curses conformance], [ax_cv_plaincurses_enhanced], [
++                    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                            @%:@define _XOPEN_SOURCE_EXTENDED 1
++                            @%:@include <curses.h>
++                            @%:@ifndef _XOPEN_CURSES
++                            @%:@error "this Curses library is not enhanced"
++                            "this Curses library is not enhanced"
++                            @%:@endif
++                        ]], [[
++                            chtype a = A_BOLD;
++                            int b = KEY_LEFT;
++                            chtype c = COLOR_PAIR(1) & A_COLOR;
++                            attr_t d = WA_NORMAL;
++                            cchar_t e;
++                            wint_t f;
++                            initscr();
++                            init_pair(1, COLOR_WHITE, COLOR_RED);
++                            wattr_set(stdscr, d, 0, NULL);
++                            wget_wch(stdscr, &f);
++                        ]])],
++                        [ax_cv_plaincurses_enhanced=yes],
++                        [ax_cv_plaincurses_enhanced=no])
++                ])
++                AS_IF([test "x$ax_cv_plaincurses_enhanced" = xyes], [
++                    ax_cv_curses_enhanced=yes
++                    ax_cv_curses_color=yes
++                    AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions])
++                    AC_DEFINE([HAVE_CURSES_COLOR],    [1], [Define to 1 if library supports color (enhanced functions)])
++                ])
++
++                # Check for color functions
++
++                AC_CACHE_CHECK([for Curses color functions], [ax_cv_plaincurses_color], [
++                    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                        @%:@define _XOPEN_SOURCE_EXTENDED 1
++                        @%:@include <curses.h>
++                        ]], [[
++                            chtype a = A_BOLD;
++                            int b = KEY_LEFT;
++                            chtype c = COLOR_PAIR(1) & A_COLOR;
++                            initscr();
++                            init_pair(1, COLOR_WHITE, COLOR_RED);
++                        ]])],
++                        [ax_cv_plaincurses_color=yes],
++                        [ax_cv_plaincurses_color=no])
++                ])
++                AS_IF([test "x$ax_cv_plaincurses_color" = xyes], [
++                    ax_cv_curses_color=yes
++                    AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)])
++                ])
++
++                # Check for obsolete functions
++
++                AC_CACHE_CHECK([for obsolete Curses functions], [ax_cv_plaincurses_obsolete], [
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                        @%:@include <curses.h>
++                    ]], [[
++                        chtype a = A_BOLD;
++                        int b = KEY_LEFT;
++                        int g = getattrs(stdscr);
++                        int h = getcurx(stdscr) + getmaxx(stdscr);
++                        initscr();
++                    ]])],
++                    [ax_cv_plaincurses_obsolete=yes],
++                    [ax_cv_plaincurses_obsolete=no])
++                ])
++                AS_IF([test "x$ax_cv_plaincurses_obsolete" = xyes], [
++                    ax_cv_curses_obsolete=yes
++                    AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features])
++                ])
++            ])
++
++            AS_IF([test "x$ax_cv_header_curses_h" = xno], [
++                AC_MSG_WARN([could not find a working curses.h])
++            ])
++        ])
++    ])
++
++    AS_IF([test "x$ax_cv_curses"          != xyes], [ax_cv_curses=no])
++    AS_IF([test "x$ax_cv_curses_enhanced" != xyes], [ax_cv_curses_enhanced=no])
++    AS_IF([test "x$ax_cv_curses_color"    != xyes], [ax_cv_curses_color=no])
++    AS_IF([test "x$ax_cv_curses_obsolete" != xyes], [ax_cv_curses_obsolete=no])
++
++    LIBS=$ax_saved_LIBS
++])dnl
+diff -uNr SoftEtherVPN.org/autotools/softether.am SoftEtherVPN/autotools/softether.am
+--- SoftEtherVPN.org/autotools/softether.am	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/autotools/softether.am	2014-09-25 22:02:04.296389701 +0200
+@@ -0,0 +1,40 @@
++#  Copyright 2014 Darik Horn <dajhorn at 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/>.
++
++
++if CONFIGURE_ENABLE_DEBUG
++DEBUG_CFLAGS = -g -D_DEBUG -DDEBUG
++else
++DEBUG_CFLAGS = -DNDEBUG -DVPN_SPEED
++endif
++
++AM_CFLAGS = \
++	$(DEBUG_CFLAGS) \
++	-I$(top_srcdir)/src \
++	-I$(top_srcdir)/src/Mayaqua \
++	-I$(top_srcdir)/src/Cedar \
++	-DSTATE_DIR='"@localstatedir@/lib/softether"' \
++	-DUNIX \
++	-DUNIX_LINUX \
++	-D_REENTRANT \
++	-DREENTRANT \
++	-D_THREAD_SAFE \
++	-D_THREADSAFE \
++	-DTHREAD_SAFE \
++	-DTHREADSAFE \
++	-D_FILE_OFFSET_BITS=64 \
++	-fsigned-char
+diff -uNr SoftEtherVPN.org/configure.ac SoftEtherVPN/configure.ac
+--- SoftEtherVPN.org/configure.ac	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/configure.ac	2014-09-25 22:02:04.296389701 +0200
+@@ -0,0 +1,99 @@
++#  Copyright 2014 Darik Horn <dajhorn at 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/>.
++
++
++AC_INIT([SoftEther], [1], [http://www.vpnusers.com/], [softether], [http://www.softether.org/])
++AC_CONFIG_AUX_DIR([autotools])
++AC_CONFIG_MACRO_DIR([autotools])
++AM_INIT_AUTOMAKE([foreign -Wall -Werror])
++AM_PROG_AR
++AC_PROG_CC
++AC_PROG_LIBTOOL
++AC_CONFIG_HEADERS([softether_config.h])
++AC_CONFIG_FILES([
++	Makefile
++	src/Makefile
++	src/Mayaqua/Makefile
++	src/Cedar/Makefile
++	src/hamcorebuilder/Makefile
++	src/libsoftether/Makefile
++	src/bin/hamcore/Makefile
++	src/vpnserver/Makefile
++	src/vpnclient/Makefile
++	src/vpnbridge/Makefile
++	src/vpncmd/Makefile
++	src/softetherd/Makefile
++])
++
++
++AC_ARG_ENABLE(
++	[debug],
++	AS_HELP_STRING([--enable-debug], [build SoftEther with debugging features]),
++	[debug=yes]
++)
++AM_CONDITIONAL([CONFIGURE_ENABLE_DEBUG], [test _"$debug" = _yes])
++
++
++AX_PTHREAD([
++	AC_SUBST(PTHREAD_CC)
++	AC_SUBST(PTHREAD_CFLAGS)
++	AC_SUBST(PTHREAD_LIBS)
++],[
++	AC_MSG_ERROR([pthread capabilities not found])
++])
++
++CC="$PTHREAD_CC"
++CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++LIBS="$PTHREAD_LIBS $LIBS"
++
++AC_CHECK_LIB([rt],[clock_gettime])
++
++AX_CHECK_OPENSSL([
++	AC_SUBST(OPENSSL_LIBS)
++	AC_SUBST(OPENSSL_LDFLAGS)
++],[
++	AC_MSG_ERROR([openssl not found])
++])
++
++LIBS="$LIBS $OPENSSL_LIBS"
++LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS"
++
++
++# This macro automatically updates build variables.
++AX_CHECK_ZLIB(, AC_MSG_ERROR([zlib not found]))
++
++
++AX_WITH_CURSES
++if test "_$ax_cv_curses" != _yes
++then
++	AC_MSG_ERROR([libcurses, libncurses, or libncursesw not found])
++else
++	AC_SUBST(CURSES_LIB)
++	LIBS="$LIBS $CURSES_LIB"
++fi
++
++
++AX_LIB_READLINE
++if test "_$ax_cv_lib_readline" = _no
++then
++	AC_MSG_ERROR([libreadline not found])
++else
++	: This macro automatically updates build variables.
++fi
++
++
++AC_OUTPUT
+diff -uNr SoftEtherVPN.org/Makefile.am SoftEtherVPN/Makefile.am
+--- SoftEtherVPN.org/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/Makefile.am	2014-09-25 22:02:04.292387830 +0200
+@@ -0,0 +1,21 @@
++#  Copyright 2014 Darik Horn <dajhorn at 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/>.
++
++
++ACLOCAL_AMFLAGS = -I autotools
++include $(top_srcdir)/autotools/softether.am
++SUBDIRS = src
+diff -uNr SoftEtherVPN.org/manual_configure SoftEtherVPN/manual_configure
+--- SoftEtherVPN.org/manual_configure	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/manual_configure	2014-09-25 22:02:04.296389701 +0200
+@@ -0,0 +1,83 @@
++#!/bin/sh
++
++echo '---------------------------------------------------------------------'
++echo 'SoftEther VPN for Unix'
++echo
++echo 'Copyright (c) SoftEther VPN Project at University of Tsukuba, Japan.'
++echo 'Copyright (c) Daiyuu Nobori. All Rights Reserved.'
++echo
++echo 'This program is free software; you can redistribute it and/or'
++echo 'modify it under the terms of the GNU General Public License'
++echo 'version 2 as published by the Free Software Foundation.'
++echo
++echo 'Read and understand README.TXT, LICENSE.TXT and WARNING.TXT before use.'
++echo '---------------------------------------------------------------------'
++echo
++
++echo 'Welcome to the corner-cutting configure script !'
++echo
++echo 'Select your operating system below:'
++echo ' 1: Linux'
++echo ' 2: FreeBSD'
++echo ' 3: Solaris'
++echo ' 4: Mac OS X'
++echo ' 5: OpenBSD'
++echo
++echo -n 'Which is your operating system (1 - 5) ? : '
++read TMP
++echo
++OS=""
++if test "$TMP" = "1"
++then
++	OS="linux"
++fi
++if test "$TMP" = "2"
++then
++	OS="freebsd"
++fi
++if test "$TMP" = "3"
++then
++	OS="solaris"
++fi
++if test "$TMP" = "4"
++then
++	OS="macos"
++fi
++if test "$TMP" = "5"
++then
++	OS="openbsd"
++fi
++
++if test "$OS" = ""
++then
++	echo "Wrong number."
++	exit 1
++fi
++
++echo 'Select your CPU bits below:'
++echo ' 1: 32-bit'
++echo ' 2: 64-bit'
++echo
++echo -n 'Which is the type of your CPU (1 - 2) ? : '
++read TMP
++echo
++CPU=""
++if test "$TMP" = "1"
++then
++	CPU="32bit"
++fi
++if test "$TMP" = "2"
++then
++	CPU="64bit"
++fi
++
++if test "$CPU" = ""
++then
++	echo "Wrong number."
++	exit 1
++fi
++
++cp src/makefiles/${OS}_${CPU}.mak Makefile
++
++echo "The Makefile is generated. Run 'make' to build SoftEther VPN."
++
+diff -uNr SoftEtherVPN.org/src/bin/hamcore/Makefile.am SoftEtherVPN/src/bin/hamcore/Makefile.am
+--- SoftEtherVPN.org/src/bin/hamcore/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/src/bin/hamcore/Makefile.am	2014-09-25 22:02:04.320400653 +0200
+@@ -0,0 +1,33 @@
++#  Copyright 2014 Darik Horn <dajhorn at 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
++
++# An empty EXEEXT required for overrides with -Wall and -Werror enabled.
++AUTOMAKE_OPTIONS = -Wno-override
++EXEEXT =
++
++HAMCOREBUILDER = $(top_builddir)/src/hamcorebuilder/hamcorebuilder
++
++noinst_PROGRAMS = hamcore.se2
++
++hamcore.se2$(EXEEXT): $(HAMCOREBUILDER)
++	$(HAMCOREBUILDER) $(top_srcdir)/src/bin/hamcore $@
++
++install-exec-local: hamcore.se2$(EXEEXT)
++	$(INSTALL_DATA) -D hamcore.se2$(EXEEXT) $(DESTDIR)$(localstatedir)/lib/softether/hamcore.se2
+diff -uNr SoftEtherVPN.org/src/bin/hamcore/strtable_en.stb SoftEtherVPN/src/bin/hamcore/strtable_en.stb
+--- SoftEtherVPN.org/src/bin/hamcore/strtable_en.stb	2014-09-25 21:45:40.000000000 +0200
++++ SoftEtherVPN/src/bin/hamcore/strtable_en.stb	2014-09-25 22:03:20.234337518 +0200
+@@ -1062,6 +1062,7 @@
+ 
+ 
+ # Concerning services (UNIX)
++UNIX_DAEMON_HELP               SoftEther VPN non-forking daemon for upstart and systemd.\nCommand Usage:\n %S vpnbridge  - Enable bridging features.\n %S vpnclient  - Enable client features.\n %S vpnserver  - Enable all features.\nThe parameter can be set in the SOFTETHER_MODE environment variable.\n\n
+ UNIX_SVC_HELP			%S service program\nCopyright (c) SoftEther VPN Project. All Rights Reserved.\n\n%S command usage:\n %S start  - Start the %S service.\n %S stop   - Stop the %S service if the service has been already started.\n\n
+ UNIX_SVC_STARTED		The %S service has been started.\n
+ UNIX_SVC_STOPPING		Stopping the %S service ...\n
+diff -uNr SoftEtherVPN.org/src/Cedar/Admin.c SoftEtherVPN/src/Cedar/Admin.c
+--- SoftEtherVPN.org/src/Cedar/Admin.c	2014-09-25 21:45:40.000000000 +0200
++++ SoftEtherVPN/src/Cedar/Admin.c	2014-09-25 22:02:04.300391465 +0200
+@@ -10334,7 +10334,7 @@
+ 
+ 	Zero(t, sizeof(RPC_READ_LOG_FILE));
+ 
+-	GetExeDir(exe_dir, sizeof(exe_dir));
++	GetStateDir(exe_dir, sizeof(exe_dir));
+ 	Format(full_path, sizeof(full_path), "%s/%s", exe_dir, filepath);
+ 
+ 	// Read file
+diff -uNr SoftEtherVPN.org/src/Cedar/Command.c SoftEtherVPN/src/Cedar/Command.c
+--- SoftEtherVPN.org/src/Cedar/Command.c	2014-09-25 21:45:40.000000000 +0200
++++ SoftEtherVPN/src/Cedar/Command.c	2014-09-25 22:02:04.308395022 +0200
+@@ -527,7 +527,7 @@
+ 	UINT i;
+ 
+ 	GetExeName(exe, sizeof(exe));
+-	GetExeDir(exe_dir, sizeof(exe_dir));
++	GetStateDir(exe_dir, sizeof(exe_dir));
+ 
+ 	ok = false;
+ 	dirs = EnumDir(exe_dir);
+@@ -552,7 +552,11 @@
+ 		UCHAR *buf;
+ 		IO *io;
+ #ifndef	OS_WIN32
++#ifdef STATE_DIR
++		wchar_t *filename = L"" STATE_DIR L"/vpn_checker_tmp";
++#else
+ 		wchar_t *filename = L"/tmp/vpn_checker_tmp";
++#endif
+ #else	// OS_WIN32
+ 		wchar_t filename[MAX_PATH];
+ 		CombinePathW(filename, sizeof(filename), MsGetMyTempDirW(), L"vpn_checker_tmp");
+diff -uNr SoftEtherVPN.org/src/Cedar/Logging.c SoftEtherVPN/src/Cedar/Logging.c
+--- SoftEtherVPN.org/src/Cedar/Logging.c	2014-09-25 21:45:40.000000000 +0200
++++ SoftEtherVPN/src/Cedar/Logging.c	2014-09-25 22:02:04.308395022 +0200
+@@ -508,7 +508,7 @@
+ 
+ 	e = ZeroMalloc(sizeof(ERASER));
+ 
+-	GetExeDir(dir, sizeof(dir));
++	GetStateDir(dir, sizeof(dir));
+ 
+ 	e->Log = log;
+ 	e->MinFreeSpace = min_size;
+diff -uNr SoftEtherVPN.org/src/Cedar/Makefile.am SoftEtherVPN/src/Cedar/Makefile.am
+--- SoftEtherVPN.org/src/Cedar/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/src/Cedar/Makefile.am	2014-09-25 22:02:04.312396894 +0200
+@@ -0,0 +1,82 @@
++#  Copyright 2014 Darik Horn <dajhorn at 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
++
++noinst_LTLIBRARIES = libcedar.la
++
++libcedar_la_SOURCES = \
++	Account.c \
++	Admin.c \
++	AzureClient.c \
++	AzureServer.c \
++	Bridge.c \
++	BridgeUnix.c \
++	BridgeWin32.c \
++	Cedar.c \
++	CedarPch.c \
++	Client.c \
++	CM.c \
++	Command.c \
++	Connection.c \
++	Console.c \
++	Database.c \
++	DDNS.c \
++	EM.c \
++	EtherLog.c \
++	Hub.c \
++	Interop_OpenVPN.c \
++	Interop_SSTP.c \
++	IPsec.c \
++	IPsec_EtherIP.c \
++	IPsec_IKE.c \
++	IPsec_IkePacket.c \
++	IPsec_IPC.c \
++	IPsec_L2TP.c \
++	IPsec_PPP.c \
++	IPsec_Win7.c \
++	Layer3.c \
++	Link.c \
++	Listener.c \
++	Logging.c \
++	Nat.c \
++	NativeStack.c \
++	NM.c \
++	NullLan.c \
++	Protocol.c \
++	Radius.c \
++	Remote.c \
++	Sam.c \
++	SecureInfo.c \
++	SecureNAT.c \
++	SeLowUser.c \
++	Server.c \
++	Session.c \
++	SM.c \
++	SW.c \
++	UdpAccel.c \
++	UT.c \
++	VG.c \
++	Virtual.c \
++	VLan.c \
++	VLanUnix.c \
++	VLanWin32.c \
++	WaterMark.c \
++	WebUI.c \
++	WinUi.c \
++	Wpc.c
+diff -uNr SoftEtherVPN.org/src/Cedar/Protocol.c SoftEtherVPN/src/Cedar/Protocol.c
+--- SoftEtherVPN.org/src/Cedar/Protocol.c	2014-09-25 21:45:40.000000000 +0200
++++ SoftEtherVPN/src/Cedar/Protocol.c	2014-09-25 22:02:04.312396894 +0200
+@@ -161,10 +161,10 @@
+ 		UINT i;
+ 		DIRLIST *dir;
+ 		wchar_t dirname[MAX_SIZE];
+-		wchar_t exedir[MAX_SIZE];
++		wchar_t statedir[MAX_SIZE];
+ 
+-		GetExeDirW(exedir, sizeof(exedir));
+-		CombinePathW(dirname, sizeof(dirname), exedir, L"chain_certs");
++		GetStateDirW(statedir, sizeof(statedir));
++		CombinePathW(dirname, sizeof(dirname), statedir, L"chain_certs");
+ 		MakeDirExW(dirname);
+ 
+ 		if (auto_save)
+@@ -461,7 +461,7 @@
+ void AddAllChainCertsToCertList(LIST *o)
+ {
+ 	wchar_t dirname[MAX_SIZE];
+-	wchar_t exedir[MAX_SIZE];
++	wchar_t statedir[MAX_SIZE];
+ 	DIRLIST *dir;
+ 	// Validate arguments
+ 	if (o == NULL)
+@@ -469,9 +469,9 @@
+ 		return;
+ 	}
+ 
+-	GetExeDirW(exedir, sizeof(exedir));
++	GetStateDirW(statedir, sizeof(statedir));
+ 
+-	CombinePathW(dirname, sizeof(dirname), exedir, L"chain_certs");
++	CombinePathW(dirname, sizeof(dirname), statedir, L"chain_certs");
+ 
+ 	MakeDirExW(dirname);
+ 
+diff -uNr SoftEtherVPN.org/src/Cedar/Server.c SoftEtherVPN/src/Cedar/Server.c
+--- SoftEtherVPN.org/src/Cedar/Server.c	2014-09-25 21:45:40.000000000 +0200
++++ SoftEtherVPN/src/Cedar/Server.c	2014-09-25 22:02:04.312396894 +0200
+@@ -1060,7 +1060,7 @@
+ 		hubname = NULL;
+ 	}
+ 
+-	GetExeDir(exe_dir, sizeof(exe_dir));
++	GetStateDir(exe_dir, sizeof(exe_dir));
+ 
+ 	// Enumerate in the server_log
+ 	if (hubname == NULL)
+@@ -1134,7 +1134,7 @@
+ 		return;
+ 	}
+ 
+-	GetExeDir(exe_dir, sizeof(exe_dir));
++	GetStateDir(exe_dir, sizeof(exe_dir));
+ 	Format(dir_full_path, sizeof(dir_full_path), "%s/%s", exe_dir, dirname);
+ 
+ 	dir = EnumDir(dir_full_path);
+diff -uNr SoftEtherVPN.org/src/hamcorebuilder/Makefile.am SoftEtherVPN/src/hamcorebuilder/Makefile.am
+--- SoftEtherVPN.org/src/hamcorebuilder/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/src/hamcorebuilder/Makefile.am	2014-09-25 22:02:04.328404611 +0200
+@@ -0,0 +1,29 @@
++#  Copyright 2014 Darik Horn <dajhorn at 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
++
++noinst_PROGRAMS = \
++	hamcorebuilder
++
++hamcorebuilder_SOURCES = \
++	hamcorebuilder.c
++
++hamcorebuilder_LDADD = \
++	$(top_builddir)/src/Mayaqua/libmayaqua.la \
++	$(top_builddir)/src/Cedar/libcedar.la
+diff -uNr SoftEtherVPN.org/src/libsoftether/Makefile.am SoftEtherVPN/src/libsoftether/Makefile.am
+--- SoftEtherVPN.org/src/libsoftether/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/src/libsoftether/Makefile.am	2014-09-25 22:02:04.328404611 +0200
+@@ -0,0 +1,34 @@
++#  Copyright 2014 Darik Horn <dajhorn at 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 -uNr SoftEtherVPN.org/src/Makefile.am SoftEtherVPN/src/Makefile.am
+--- SoftEtherVPN.org/src/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/src/Makefile.am	2014-09-25 22:02:04.316398747 +0200
+@@ -0,0 +1,32 @@
++#  Copyright 2014 Darik Horn <dajhorn at 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/>.
++
++
++# These components are built as libtool convenience libraries.
++SUBDIRS = Mayaqua Cedar
++
++# This is a nodist helper.
++SUBDIRS += hamcorebuilder
++
++# These are shared components.
++SUBDIRS += libsoftether bin/hamcore
++
++# These are the final build products.
++SUBDIRS += vpnserver vpnclient vpnbridge vpncmd
++
++# This is a daemon for upstart and systemd.
++SUBDIRS += softetherd
+diff -uNr SoftEtherVPN.org/src/Mayaqua/Encrypt.c SoftEtherVPN/src/Mayaqua/Encrypt.c
+--- SoftEtherVPN.org/src/Mayaqua/Encrypt.c	2014-09-25 21:45:40.000000000 +0200
++++ SoftEtherVPN/src/Mayaqua/Encrypt.c	2014-09-25 22:02:04.316398747 +0200
+@@ -579,7 +579,7 @@
+ 		return false;
+ 	}
+ 
+-	GetExeDir(dirname, sizeof(dirname));
++	GetStateDir(dirname, sizeof(dirname));
+ 
+ 	// Search the CRL file
+ 	t = EnumDir(dirname);
+diff -uNr SoftEtherVPN.org/src/Mayaqua/FileIO.c SoftEtherVPN/src/Mayaqua/FileIO.c
+--- SoftEtherVPN.org/src/Mayaqua/FileIO.c	2014-09-25 21:45:40.000000000 +0200
++++ SoftEtherVPN/src/Mayaqua/FileIO.c	2014-09-25 22:02:04.316398747 +0200
+@@ -122,8 +122,14 @@
+ #include <errno.h>
+ #include <Mayaqua/Mayaqua.h>
+ 
++#ifdef STATE_DIR
++static char exe_file_name[MAX_SIZE] = STATE_DIR "/a.out";
++static wchar_t exe_file_name_w[MAX_SIZE] = L"" STATE_DIR L"/a.out";
++#else
+ static char exe_file_name[MAX_SIZE] = "/tmp/a.out";
+ static wchar_t exe_file_name_w[MAX_SIZE] = L"/tmp/a.out";
++#endif
++
+ static LIST *hamcore = NULL;
+ static IO *hamcore_io = NULL;
+ 
+@@ -1038,7 +1044,7 @@
+ 	}
+ 
+ 	// If the file exist in hamcore/ directory on the local disk, read it
+-	GetExeDirW(exe_dir, sizeof(exe_dir));
++	GetStateDirW(exe_dir, sizeof(exe_dir));
+ 
+ 	UniFormat(tmp, sizeof(tmp), L"%s/%S/%S", exe_dir, HAMCORE_DIR_NAME, filename);
+ 
+@@ -1154,7 +1160,7 @@
+ 		return;
+ 	}
+ 
+-	GetExeDirW(exe_dir, sizeof(exe_dir));
++	GetStateDirW(exe_dir, sizeof(exe_dir));
+ 	UniFormat(tmp, sizeof(tmp), L"%s/%S", exe_dir, HAMCORE_FILE_NAME);
+ 
+ 	UniFormat(tmp2, sizeof(tmp2), L"%s/%S", exe_dir, HAMCORE_FILE_NAME_2);
+@@ -1438,6 +1444,33 @@
+ 	GetDirNameFromFilePathW(name, size, exe_file_name_w);
+ }
+ 
++void GetStateDir(char *name, UINT size)
++{
++	// Validate arguments
++	if (name == NULL)
++	{
++		return;
++	}
++#ifdef STATE_DIR
++	StrCpy(name, size, STATE_DIR);
++#else
++	GetExeDir(name, size)
++#endif
++}
++void GetStateDirW(wchar_t *name, UINT size)
++{
++	// Validate arguments
++	if (name == NULL)
++	{
++		return;
++	}
++#ifdef STATE_DIR
++	UniStrCpy(name, size, L"" STATE_DIR L"");
++#else
++	GetExeDirW(name, size)
++#endif
++}
++
+ // Get the EXE file name
+ void GetExeName(char *name, UINT size)
+ {
+@@ -2389,7 +2422,7 @@
+ 	else
+ 	{
+ 		wchar_t dir[MAX_SIZE];
+-		GetExeDirW(dir, sizeof(dir));
++		GetStateDirW(dir, sizeof(dir));
+ 		ConbinePathW(dst, size, dir, &src[1]);
+ 	}
+ }
+diff -uNr SoftEtherVPN.org/src/Mayaqua/FileIO.h SoftEtherVPN/src/Mayaqua/FileIO.h
+--- SoftEtherVPN.org/src/Mayaqua/FileIO.h	2014-09-25 21:45:40.000000000 +0200
++++ SoftEtherVPN/src/Mayaqua/FileIO.h	2014-09-25 22:02:04.316398747 +0200
+@@ -349,6 +349,8 @@
+ void GetExeNameW(wchar_t *name, UINT size);
+ void GetExeDir(char *name, UINT size);
+ void GetExeDirW(wchar_t *name, UINT size);
++void GetStateDir(char *name, UINT size);
++void GetStateDirW(wchar_t *name, UINT size);
+ void BuildHamcore(char *dst_filename, char *src_dir, bool unix_only);
+ int CompareHamcore(void *p1, void *p2);
+ void InitHamcore();
+diff -uNr SoftEtherVPN.org/src/Mayaqua/Makefile.am SoftEtherVPN/src/Mayaqua/Makefile.am
+--- SoftEtherVPN.org/src/Mayaqua/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/src/Mayaqua/Makefile.am	2014-09-25 22:02:04.316398747 +0200
+@@ -0,0 +1,43 @@
++#  Copyright 2014 Darik Horn <dajhorn at 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
++
++noinst_LTLIBRARIES = libmayaqua.la
++
++libmayaqua_la_SOURCES = \
++	Cfg.c \
++	Encrypt.c \
++	FileIO.c \
++	Internat.c \
++	Kernel.c \
++	Mayaqua.c \
++	Memory.c \
++	Microsoft.c \
++	Network.c \
++	Object.c \
++	OS.c \
++	Pack.c \
++	Secure.c \
++	Str.c \
++	Table.c \
++	TcpIp.c \
++	Tick64.c \
++	Tracking.c \
++	Unix.c \
++	Win32.c
+diff -uNr SoftEtherVPN.org/src/Mayaqua/Mayaqua.c SoftEtherVPN/src/Mayaqua/Mayaqua.c
+--- SoftEtherVPN.org/src/Mayaqua/Mayaqua.c	2014-09-25 21:45:40.000000000 +0200
++++ SoftEtherVPN/src/Mayaqua/Mayaqua.c	2014-09-25 22:02:04.316398747 +0200
+@@ -611,7 +611,11 @@
+ 		_exit(0);
+ 	}
+ 
++#ifndef STATE_DIR
++	// This check causes hamcorebuilder to fail in an unprivileged
++	// environment, and is unnecessary for a managed installation.
+ 	CheckUnixTempDir();
++#endif
+ 
+ 	// Initialization of Probe
+ 	InitProbe();
+diff -uNr SoftEtherVPN.org/src/Mayaqua/Network.c SoftEtherVPN/src/Mayaqua/Network.c
+--- SoftEtherVPN.org/src/Mayaqua/Network.c	2014-09-25 21:45:40.000000000 +0200
++++ SoftEtherVPN/src/Mayaqua/Network.c	2014-09-25 22:02:04.320400653 +0200
+@@ -12588,7 +12588,7 @@
+ void AddChainSslCertOnDirectory(struct ssl_ctx_st *ctx)
+ {
+ 	wchar_t dirname[MAX_SIZE];
+-	wchar_t exedir[MAX_SIZE];
++	wchar_t statedir[MAX_SIZE];
+ 	wchar_t txtname[MAX_SIZE];
+ 	DIRLIST *dir;
+ 	LIST *o;
+@@ -12602,9 +12602,9 @@
+ 
+ 	o = NewListFast(NULL);
+ 
+-	GetExeDirW(exedir, sizeof(exedir));
++	GetStateDirW(statedir, sizeof(statedir));
+ 
+-	CombinePathW(dirname, sizeof(dirname), exedir, L"chain_certs");
++	CombinePathW(dirname, sizeof(dirname), statedir, L"chain_certs");
+ 
+ 	MakeDirExW(dirname);
+ 
+diff -uNr SoftEtherVPN.org/src/Mayaqua/Table.c SoftEtherVPN/src/Mayaqua/Table.c
+--- SoftEtherVPN.org/src/Mayaqua/Table.c	2014-09-25 21:45:40.000000000 +0200
++++ SoftEtherVPN/src/Mayaqua/Table.c	2014-09-25 22:02:04.320400653 +0200
+@@ -1191,7 +1191,7 @@
+ 		return;
+ 	}
+ 
+-	GetExeDirW(exe, sizeof(exe));
++	GetStateDirW(exe, sizeof(exe));
+ 	UniStrCpy(hashtemp, sizeof(hashtemp), strfilename);
+ 	BinToStrW(tmp, sizeof(tmp), filehash, MD5_SIZE);
+ 	UniStrCat(hashtemp, sizeof(hashtemp), tmp);
+@@ -1204,7 +1204,11 @@
+ 	UniStrLower(tmp);
+ 
+ #ifndef	OS_WIN32
++#ifdef STATE_DIR
++	UniStrCpy(exe, sizeof(exe), L"" STATE_DIR L"");
++#else
+ 	UniStrCpy(exe, sizeof(exe), L"/tmp");
++#endif
+ #else	// OS_WIN32
+ 	StrToUni(exe, sizeof(exe), MsGetTempDir());
+ #endif	// OS_WIN32
+diff -uNr SoftEtherVPN.org/src/Mayaqua/Unix.c SoftEtherVPN/src/Mayaqua/Unix.c
+--- SoftEtherVPN.org/src/Mayaqua/Unix.c	2014-09-25 21:45:40.000000000 +0200
++++ SoftEtherVPN/src/Mayaqua/Unix.c	2014-09-25 22:02:04.320400653 +0200
+@@ -928,7 +928,7 @@
+ 		StrCpy(tmp, sizeof(tmp), instance_name);
+ 	}
+ 
+-	GetExeDir(dir, sizeof(dir));
++	GetStateDir(dir, sizeof(dir));
+ 
+ 	// File name generation
+ 	Format(name, sizeof(name), "%s/.%s", dir, tmp);
+@@ -2260,7 +2260,7 @@
+ 		return;
+ 	}
+ 
+-	GetExeDir(dir, sizeof(dir));
++	GetStateDir(dir, sizeof(dir));
+ 
+ 	GetExeName(exe_name, sizeof(exe_name));
+ 	StrCat(exe_name, sizeof(exe_name), ":pid_hash");
+@@ -2305,7 +2305,7 @@
+ 		return;
+ 	}
+ 
+-	GetExeDir(dir, sizeof(dir));
++	GetStateDir(dir, sizeof(dir));
+ 
+ 	GetExeName(exe_name, sizeof(exe_name));
+ 	StrCat(exe_name, sizeof(exe_name), ":pid_hash");
+diff -uNr SoftEtherVPN.org/src/softetherd/Makefile.am SoftEtherVPN/src/softetherd/Makefile.am
+--- SoftEtherVPN.org/src/softetherd/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/src/softetherd/Makefile.am	2014-09-25 22:02:04.328404611 +0200
+@@ -0,0 +1,28 @@
++#  Copyright 2014 Darik Horn <dajhorn at 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
++
++sbin_PROGRAMS = \
++	softetherd
++
++softetherd_SOURCES = \
++	softetherd.c
++
++softetherd_LDADD = \
++	$(top_builddir)/src/libsoftether/libsoftether.la
+diff -uNr SoftEtherVPN.org/src/softetherd/softetherd.c SoftEtherVPN/src/softetherd/softetherd.c
+--- SoftEtherVPN.org/src/softetherd/softetherd.c	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/src/softetherd/softetherd.c	2014-09-25 22:02:04.328404611 +0200
+@@ -0,0 +1,114 @@
++//  SoftEther VPN daemon for upstart and systemd.
++//
++//  Copyright 2014 Darik Horn <dajhorn at 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 <GlobalConst.h>
++
++#define	VPN_EXE
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <wchar.h>
++#include <stdarg.h>
++#include <time.h>
++#include <Mayaqua/Mayaqua.h>
++#include <Cedar/Cedar.h>
++
++void DaemonUsage(char *name)
++{
++	UniPrint(_UU("UNIX_DAEMON_HELP"), name, name, name);
++}
++
++
++void DaemonStartProcess()
++{
++	// This environment variable is exported by upstart.
++	char *upstart_job = getenv("UPSTART_JOB");
++
++	InitCedar();
++	StInit();
++	StStartServer(false);
++
++	// Notify upstart that softetherd is ready.
++	if (upstart_job != NULL)
++	{
++		unsetenv("UPSTART_JOB");
++		raise(SIGSTOP);
++	}
++}
++
++
++void DaemonStopProcess()
++{
++	StStopServer();
++	StFree();
++	FreeCedar();
++}
++
++
++int main(int argc, char *argv[])
++{
++	// This environment variable is sourced and exported by the init process from /etc/default/softether.
++	char *softether_mode = getenv("SOFTETHER_MODE");
++
++	InitMayaqua(false, false, argc, argv);
++
++	// Check for an explicit invocation. (eg: "/usr/sbin/softetherd vpnserver")
++	if (argc >= 2)
++	{
++		if (StrCmpi(argv[1], "vpnbridge") == 0
++		 || StrCmpi(argv[1], "vpnclient") == 0
++		 || StrCmpi(argv[1], "vpnserver") == 0)
++		{
++			UnixExecService(argv[1], DaemonStartProcess, DaemonStopProcess);
++			FreeMayaqua();
++			return 0;
++		}
++
++		// Exit status codes 150..199 are reserved for the application by the LSB.
++		fprintf(stderr, "Error: Unrecognized parameter: %s\n", argv[1]);
++		fflush(stderr);
++		FreeMayaqua();
++		return 150;
++	}
++
++	// Alternatively, use the environment variable.
++	if (softether_mode != NULL)
++	{
++		if (StrCmpi(softether_mode, "vpnbridge") == 0 
++		 || StrCmpi(softether_mode, "vpnclient") == 0
++		 || StrCmpi(softether_mode, "vpnserver") == 0)
++		{
++			UnixExecService(softether_mode, DaemonStartProcess, DaemonStopProcess);
++			FreeMayaqua();
++			return 0;
++		}
++
++		// Exit status codes 150..199 are reserved for the application by the LSB.
++		fprintf(stderr, "Error: Unrecognized environment variable: SOFTETHER_MODE=%s\n", softether_mode);
++		fflush(stderr);
++		FreeMayaqua();
++		return 151;
++	}
++
++	DaemonUsage(argv[0]);
++	FreeMayaqua();
++	return 3;
++}
+diff -uNr SoftEtherVPN.org/src/vpnbridge/Makefile.am SoftEtherVPN/src/vpnbridge/Makefile.am
+--- SoftEtherVPN.org/src/vpnbridge/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/src/vpnbridge/Makefile.am	2014-09-25 22:02:04.328404611 +0200
+@@ -0,0 +1,28 @@
++#  Copyright 2014 Darik Horn <dajhorn at 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
++
++sbin_PROGRAMS = \
++	vpnbridge
++
++vpnbridge_SOURCES = \
++	vpnbridge.c
++
++vpnbridge_LDADD = \
++	$(top_builddir)/src/libsoftether/libsoftether.la
+diff -uNr SoftEtherVPN.org/src/vpnclient/Makefile.am SoftEtherVPN/src/vpnclient/Makefile.am
+--- SoftEtherVPN.org/src/vpnclient/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/src/vpnclient/Makefile.am	2014-09-25 22:02:04.328404611 +0200
+@@ -0,0 +1,28 @@
++#  Copyright 2014 Darik Horn <dajhorn at 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
++
++sbin_PROGRAMS = \
++	vpnclient
++
++vpnclient_SOURCES = \
++	vpncsvc.c
++
++vpnclient_LDADD = \
++	$(top_builddir)/src/libsoftether/libsoftether.la
+diff -uNr SoftEtherVPN.org/src/vpncmd/Makefile.am SoftEtherVPN/src/vpncmd/Makefile.am
+--- SoftEtherVPN.org/src/vpncmd/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/src/vpncmd/Makefile.am	2014-09-25 22:02:04.328404611 +0200
+@@ -0,0 +1,28 @@
++#  Copyright 2014 Darik Horn <dajhorn at 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
++
++sbin_PROGRAMS = \
++	vpncmd
++
++vpncmd_SOURCES = \
++	vpncmd.c
++
++vpncmd_LDADD = \
++	$(top_builddir)/src/libsoftether/libsoftether.la
+diff -uNr SoftEtherVPN.org/src/vpnserver/Makefile.am SoftEtherVPN/src/vpnserver/Makefile.am
+--- SoftEtherVPN.org/src/vpnserver/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ SoftEtherVPN/src/vpnserver/Makefile.am	2014-09-25 22:02:04.328404611 +0200
+@@ -0,0 +1,28 @@
++#  Copyright 2014 Darik Horn <dajhorn at 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
++
++sbin_PROGRAMS = \
++	vpnserver
++
++vpnserver_SOURCES = \
++	vpnserver.c
++
++vpnserver_LDADD = \
++	$(top_builddir)/src/libsoftether/libsoftether.la
diff --git a/package/softether/softether-0002-cross-compile.patch b/package/softether/softether-0002-cross-compile.patch
new file mode 100644
index 0000000..0b31eca
--- /dev/null
+++ b/package/softether/softether-0002-cross-compile.patch
@@ -0,0 +1,30 @@
+Host version of hamcorebuilder is needed during cross-compile
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
+
+diff -uNr SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824.org/src/bin/hamcore/Makefile.am SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824/src/bin/hamcore/Makefile.am
+--- SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824.org/src/bin/hamcore/Makefile.am	2014-09-27 12:56:53.108725793 +0200
++++ SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824/src/bin/hamcore/Makefile.am	2014-09-27 12:57:50.280009025 +0200
+@@ -26,8 +26,8 @@
+ 
+ noinst_PROGRAMS = hamcore.se2
+ 
+-hamcore.se2$(EXEEXT): $(HAMCOREBUILDER)
+-	$(HAMCOREBUILDER) $(top_srcdir)/src/bin/hamcore $@
++hamcore.se2$(EXEEXT):
++	hamcorebuilder $(top_srcdir)/src/bin/hamcore $@
+ 
+ install-exec-local: hamcore.se2$(EXEEXT)
+ 	$(INSTALL_DATA) -D hamcore.se2$(EXEEXT) $(DESTDIR)$(localstatedir)/lib/softether/hamcore.se2
+diff -uNr SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824.org/src/Makefile.am SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824/src/Makefile.am
+--- SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824.org/src/Makefile.am	2014-09-27 12:56:53.136726809 +0200
++++ SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824/src/Makefile.am	2014-09-27 12:58:12.959723109 +0200
+@@ -20,7 +20,7 @@
+ SUBDIRS = Mayaqua Cedar
+ 
+ # This is a nodist helper.
+-SUBDIRS += hamcorebuilder
++# SUBDIRS += hamcorebuilder
+ 
+ # These are shared components.
+ SUBDIRS += libsoftether bin/hamcore
diff --git a/package/softether/softether-0003-iconv.patch b/package/softether/softether-0003-iconv.patch
new file mode 100644
index 0000000..5d45115
--- /dev/null
+++ b/package/softether/softether-0003-iconv.patch
@@ -0,0 +1,27 @@
+Fix linking with libiconv
+
+Inspired by https://github.com/el1n/OpenWRT-package-softether/blob/4cb1cd9073a76edf34c512e587069626e02e2404/patches/120-fix-iconv-headers-common.patch
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
+
+--- a/src/Mayaqua/Mayaqua.h	2014-07-11 20:00:27.000000000 +0200
++++ b/src/Mayaqua/Mayaqua.h	2014-09-27 15:30:09.633111125 +0200
+@@ -282,17 +282,7 @@
+ #include <ifaddrs.h>
+ #endif	// MAYAQUA_SUPPORTS_GETIFADDRS
+ 
+-#ifdef	UNIX_LINUX
+-typedef void *iconv_t;
+-iconv_t iconv_open (__const char *__tocode, __const char *__fromcode);
+-size_t iconv (iconv_t __cd, char **__restrict __inbuf,
+-                     size_t *__restrict __inbytesleft,
+-                     char **__restrict __outbuf,
+-                     size_t *__restrict __outbytesleft);
+-int iconv_close (iconv_t __cd);
+-#else	// UNIX_LINUX
+-#include <iconv.h>
+-#endif	// UNIX_LINUX
++#include <iconv.h>
+ 
+ 
+ 
diff --git a/package/softether/softether.mk b/package/softether/softether.mk
new file mode 100644
index 0000000..0b0de77
--- /dev/null
+++ b/package/softether/softether.mk
@@ -0,0 +1,36 @@
+################################################################################
+#
+# softether
+#
+################################################################################
+
+SOFTETHER_VERSION = 16b713b98da8dba29f0f845d5a8c36d6f7c34824
+SOFTETHER_SITE = $(call github,SoftEtherVPN,SoftEtherVPN,$(SOFTETHER_VERSION))
+SOFTETHER_LICENSE = GPLv2
+SOFTETHER_LICENSE_FILES = LICENSE
+SOFTETHER_DEPENDENCIES = host-softether openssl readline
+SOFTETHER_AUTORECONF = YES
+ifeq ($(BR2_ENABLE_LOCALE),)
+SOFTETHER_DEPENDENCIES += libiconv
+SOFTETHER_CONF_ENV = LIBS="-liconv"
+endif
+SOFTETHER_CONF_OPT = --with-openssl="$(STAGING_DIR)/usr" \
+	--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
+
+# 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
+define HOST_SOFTETHER_BUILD_CMDS
+	$(MAKE) -C $(@D)/src/Mayaqua
+	$(MAKE) -C $(@D)/src/Cedar
+	$(MAKE) -C $(@D)/src/hamcorebuilder
+endef
+
+define HOST_SOFTETHER_INSTALL_CMDS
+	$(INSTALL) -m 0755 $(@D)/src/hamcorebuilder/hamcorebuilder $(HOST_DIR)/usr/bin
+endef
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
-- 
1.7.10.4



More information about the buildroot mailing list