francesco/fml13v01-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

initial buildroot for linux 5.15

Browse Source
This commit is contained in:
Huan.Feng
2021-12-06 14:12:13 +08:00
parent d7767d594e
commit 7b6fc358fa
12736 changed files with 508822 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package/vtun/0001-fix-installation.patch
+44
View File
@@ -0,0 +1,44 @@
Makefile.in: fix installation steps
Not sure what the reason for that patch is, but originally added by Ulf
Samuelsson <ulf.samuelsson@atmel.com>, when upgrading from 2.6.x to 3.0.2.
yann.morin.1998@free.fr: the initial commit in the Buildroot tree had the
SoB by Ulf, but it was not explicitly reproduced here in the patch; so I
added it here directly in the patch.
Somewhat-signed-off-by: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
diff -durN vtun-3.0.3.orig/Makefile.in vtun-3.0.3/Makefile.in
--- vtun-3.0.3.orig/Makefile.in 2012-07-09 06:55:38.000000000 +0200
+++ vtun-3.0.3/Makefile.in 2013-02-16 23:28:47.034036869 +0100
@@ -28,7 +28,7 @@
LEXFLAGS = -t
INSTALL = @INSTALL@
-INSTALL_OWNER = -o root -g 0
+INSTALL_OWNER =
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -89,16 +89,15 @@
install_config:
$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR)
- if [ ! -f $(ETC_DIR)/vtund.conf ]; then \
- $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \
- fi
+ $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR);
+ $(INSTALL) -m 600 $(INSTALL_OWNER) scripts/vtund-start.conf $(DESTDIR)$(ETC_DIR);
install: vtund install_config install_man
- $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run
$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR)
$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR)
$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR)
$(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR)
- $(BIN_DIR)/strip $(DESTDIR)$(SBIN_DIR)/vtund
+ $(INSTALL) -m 755 -D $(INSTALL_OWNER) scripts/vtund.rc.debian \
+ $(DESTDIR)$(ETC_DIR)/init.d/S90vtun
# DO NOT DELETE THIS LINE -- make depend depends on it.
package/vtun/0002-fix-ssl-headers-checks.patch
+47
View File
@@ -0,0 +1,47 @@
configure.in: do not hard-code search patch for SSL headers
Do. Not. Do. That. It breaks cross-compilation.
Also use the SSL headers dir to look for blowfish headers.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
diff -durN vtun-3.0.3.orig/configure.in vtun-3.0.3/configure.in
--- vtun-3.0.3.orig/configure.in 2009-03-29 12:08:51.000000000 +0200
+++ vtun-3.0.3/configure.in 2013-02-16 23:44:44.004339680 +0100
@@ -166,7 +166,7 @@
AC_MSG_RESULT()
AC_CHECKING( for md5 Library and Header files ... )
AC_SEARCH_HEADERS(md5.h,
- $SSL_HDR_DIR /usr/include/openssl "" /usr/include /usr/include/ssl /usr/local/include /usr/local/ssl/include /usr/include/sys,
+ $SSL_HDR_DIR "" ,
,
AC_MSG_ERROR( SSL headers not found. )
)
@@ -176,7 +176,7 @@
AC_MSG_RESULT()
AC_CHECKING( for blowfish Library and Header files ... )
AC_SEARCH_HEADERS(blowfish.h,
- $BLOWFISH_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include /usr/include/crypto,
+ $BLOWFISH_HDR_DIR $SSL_HDR_DIR,
AC_CHECK_LIB(crypto, BF_set_key,
[
LIBS="$LIBS -lcrypto"
@@ -193,7 +193,7 @@
AC_MSG_RESULT()
AC_CHECKING( for AES Library and Header files ... )
AC_SEARCH_HEADERS(aes.h,
- $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include /usr/include/crypto,
+ $SSL_HDR_DIR ,
AC_CHECK_LIB(crypto, AES_set_encrypt_key,
[
AC_DEFINE(HAVE_SSL_AES)
@@ -208,7 +208,7 @@
AC_MSG_RESULT()
AC_CHECKING( for EVP Library and Header files ... )
AC_SEARCH_HEADERS(evp.h,
- $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include /usr/include/crypto,
+ $SSL_HDR_DIR ,
AC_CHECK_LIB(crypto, EVP_EncryptInit,
[
AC_DEFINE(HAVE_SSL_EVP)
package/vtun/0003-openssl11.patch
+294
View File
@@ -0,0 +1,294 @@
Fix build with OpenSSL 1.1.x
Extracted vtun-openssl.patch from
http://dl.fedoraproject.org/pub/fedora/linux/releases/27/Everything/source/tree/Packages/v/vtun-3.0.4-4.fc27.src.rpm
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
diff -NarU5 a/lfd_encrypt.c b/lfd_encrypt.c
--- a/lfd_encrypt.c 2016-10-01 17:27:51.000000000 -0400
+++ b/lfd_encrypt.c 2017-03-20 08:43:48.013308435 -0400
@@ -93,15 +93,15 @@
static int dec_init_first_time;
static unsigned long sequence_num;
static char * pkey;
static char * iv_buf;
-static EVP_CIPHER_CTX ctx_enc; /* encrypt */
-static EVP_CIPHER_CTX ctx_dec; /* decrypt */
+static EVP_CIPHER_CTX *ctx_enc; /* encrypt */
+static EVP_CIPHER_CTX *ctx_dec; /* decrypt */
-static EVP_CIPHER_CTX ctx_enc_ecb; /* sideband ecb encrypt */
-static EVP_CIPHER_CTX ctx_dec_ecb; /* sideband ecb decrypt */
+static EVP_CIPHER_CTX *ctx_enc_ecb; /* sideband ecb encrypt */
+static EVP_CIPHER_CTX *ctx_dec_ecb; /* sideband ecb decrypt */
static int send_msg(int len, char *in, char **out);
static int recv_msg(int len, char *in, char **out);
static int send_ib_mesg(int *len, char **in);
static int recv_ib_mesg(int *len, char **in);
@@ -180,37 +180,37 @@
case VTUN_ENC_AES256CBC:
blocksize = 16;
keysize = 32;
sb_init = 1;
cipher_type = EVP_aes_256_ecb();
- pctx_enc = &ctx_enc_ecb;
- pctx_dec = &ctx_dec_ecb;
+ pctx_enc = ctx_enc_ecb;
+ pctx_dec = ctx_dec_ecb;
break;
case VTUN_ENC_AES256ECB:
blocksize = 16;
keysize = 32;
- pctx_enc = &ctx_enc;
- pctx_dec = &ctx_dec;
+ pctx_enc = ctx_enc;
+ pctx_dec = ctx_dec;
cipher_type = EVP_aes_256_ecb();
strcpy(cipher_name,"AES-256-ECB");
break;
case VTUN_ENC_AES128OFB:
case VTUN_ENC_AES128CFB:
case VTUN_ENC_AES128CBC:
blocksize = 16;
keysize = 16;
sb_init=1;
cipher_type = EVP_aes_128_ecb();
- pctx_enc = &ctx_enc_ecb;
- pctx_dec = &ctx_dec_ecb;
+ pctx_enc = ctx_enc_ecb;
+ pctx_dec = ctx_dec_ecb;
break;
case VTUN_ENC_AES128ECB:
blocksize = 16;
keysize = 16;
- pctx_enc = &ctx_enc;
- pctx_dec = &ctx_dec;
+ pctx_enc = ctx_enc;
+ pctx_dec = ctx_dec;
cipher_type = EVP_aes_128_ecb();
strcpy(cipher_name,"AES-128-ECB");
break;
case VTUN_ENC_BF256OFB:
@@ -219,20 +219,20 @@
blocksize = 8;
keysize = 32;
var_key = 1;
sb_init = 1;
cipher_type = EVP_bf_ecb();
- pctx_enc = &ctx_enc_ecb;
- pctx_dec = &ctx_dec_ecb;
+ pctx_enc = ctx_enc_ecb;
+ pctx_dec = ctx_dec_ecb;
break;
case VTUN_ENC_BF256ECB:
blocksize = 8;
keysize = 32;
var_key = 1;
- pctx_enc = &ctx_enc;
- pctx_dec = &ctx_dec;
+ pctx_enc = ctx_enc;
+ pctx_dec = ctx_dec;
cipher_type = EVP_bf_ecb();
strcpy(cipher_name,"Blowfish-256-ECB");
break;
case VTUN_ENC_BF128OFB:
@@ -241,26 +241,28 @@
blocksize = 8;
keysize = 16;
var_key = 1;
sb_init = 1;
cipher_type = EVP_bf_ecb();
- pctx_enc = &ctx_enc_ecb;
- pctx_dec = &ctx_dec_ecb;
+ pctx_enc = ctx_enc_ecb;
+ pctx_dec = ctx_dec_ecb;
break;
case VTUN_ENC_BF128ECB: /* blowfish 128 ecb is the default */
default:
blocksize = 8;
keysize = 16;
var_key = 1;
- pctx_enc = &ctx_enc;
- pctx_dec = &ctx_dec;
+ pctx_enc = ctx_enc;
+ pctx_dec = ctx_dec;
cipher_type = EVP_bf_ecb();
strcpy(cipher_name,"Blowfish-128-ECB");
break;
} /* switch(host->cipher) */
if (prep_key(&pkey, keysize, host) != 0) return -1;
+ pctx_enc = EVP_CIPHER_CTX_new();
+ pctx_dec = EVP_CIPHER_CTX_new();
EVP_CIPHER_CTX_init(pctx_enc);
EVP_CIPHER_CTX_init(pctx_dec);
EVP_EncryptInit_ex(pctx_enc, cipher_type, NULL, NULL, NULL);
EVP_DecryptInit_ex(pctx_dec, cipher_type, NULL, NULL, NULL);
if (var_key)
@@ -292,14 +294,14 @@
free_key(pkey); pkey = NULL;
lfd_free(enc_buf); enc_buf = NULL;
lfd_free(dec_buf); dec_buf = NULL;
- EVP_CIPHER_CTX_cleanup(&ctx_enc);
- EVP_CIPHER_CTX_cleanup(&ctx_dec);
- EVP_CIPHER_CTX_cleanup(&ctx_enc_ecb);
- EVP_CIPHER_CTX_cleanup(&ctx_dec_ecb);
+ EVP_CIPHER_CTX_free(ctx_enc);
+ EVP_CIPHER_CTX_free(ctx_dec);
+ EVP_CIPHER_CTX_free(ctx_enc_ecb);
+ EVP_CIPHER_CTX_free(ctx_dec_ecb);
return 0;
}
static int encrypt_buf(int len, char *in, char **out)
@@ -321,11 +323,11 @@
memset(in_ptr+len, pad, pad);
outlen=len+pad;
if (pad == blocksize)
RAND_bytes(in_ptr+len, blocksize-1);
- EVP_EncryptUpdate(&ctx_enc, out_ptr, &outlen, in_ptr, len+pad);
+ EVP_EncryptUpdate(ctx_enc, out_ptr, &outlen, in_ptr, len+pad);
*out = enc_buf;
sequence_num++;
return outlen+msg_len;
@@ -341,11 +343,11 @@
in = *out;
in_ptr = in;
outlen=len;
if (!len) return 0;
- EVP_DecryptUpdate(&ctx_dec, out_ptr, &outlen, in_ptr, len);
+ EVP_DecryptUpdate(ctx_dec, out_ptr, &outlen, in_ptr, len);
recv_ib_mesg(&outlen, &out_ptr);
if (!outlen) return 0;
tmp_ptr = out_ptr + outlen; tmp_ptr--;
pad = *tmp_ptr;
if (pad < 1 || pad > blocksize) {
@@ -429,17 +431,18 @@
/* if we're here, something weird's going on */
return -1;
break;
} /* switch(cipher) */
- EVP_CIPHER_CTX_init(&ctx_enc);
- EVP_EncryptInit_ex(&ctx_enc, cipher_type, NULL, NULL, NULL);
+ ctx_enc = EVP_CIPHER_CTX_new();
+ EVP_CIPHER_CTX_init(ctx_enc);
+ EVP_EncryptInit_ex(ctx_enc, cipher_type, NULL, NULL, NULL);
if (var_key)
- EVP_CIPHER_CTX_set_key_length(&ctx_enc, keysize);
- EVP_EncryptInit_ex(&ctx_enc, NULL, NULL, pkey, NULL);
- EVP_EncryptInit_ex(&ctx_enc, NULL, NULL, NULL, iv);
- EVP_CIPHER_CTX_set_padding(&ctx_enc, 0);
+ EVP_CIPHER_CTX_set_key_length(ctx_enc, keysize);
+ EVP_EncryptInit_ex(ctx_enc, NULL, NULL, pkey, NULL);
+ EVP_EncryptInit_ex(ctx_enc, NULL, NULL, NULL, iv);
+ EVP_CIPHER_CTX_set_padding(ctx_enc, 0);
if (enc_init_first_time)
{
sprintf(tmpstr,"%s encryption initialized", cipher_name);
vtun_syslog(LOG_INFO, tmpstr);
enc_init_first_time = 0;
@@ -519,17 +522,18 @@
/* if we're here, something weird's going on */
return -1;
break;
} /* switch(cipher) */
- EVP_CIPHER_CTX_init(&ctx_dec);
- EVP_DecryptInit_ex(&ctx_dec, cipher_type, NULL, NULL, NULL);
+ ctx_dec = EVP_CIPHER_CTX_new();
+ EVP_CIPHER_CTX_init(ctx_dec);
+ EVP_DecryptInit_ex(ctx_dec, cipher_type, NULL, NULL, NULL);
if (var_key)
- EVP_CIPHER_CTX_set_key_length(&ctx_dec, keysize);
- EVP_DecryptInit_ex(&ctx_dec, NULL, NULL, pkey, NULL);
- EVP_DecryptInit_ex(&ctx_dec, NULL, NULL, NULL, iv);
- EVP_CIPHER_CTX_set_padding(&ctx_dec, 0);
+ EVP_CIPHER_CTX_set_key_length(ctx_dec, keysize);
+ EVP_DecryptInit_ex(ctx_dec, NULL, NULL, pkey, NULL);
+ EVP_DecryptInit_ex(ctx_dec, NULL, NULL, NULL, iv);
+ EVP_CIPHER_CTX_set_padding(ctx_dec, 0);
if (dec_init_first_time)
{
sprintf(tmpstr,"%s decryption initialized", cipher_name);
vtun_syslog(LOG_INFO, tmpstr);
dec_init_first_time = 0;
@@ -557,11 +561,11 @@
memset(iv,0,blocksize); free(iv); iv = NULL;
RAND_bytes(in_ptr, in - in_ptr);
in_ptr = in - blocksize*2;
outlen = blocksize*2;
- EVP_EncryptUpdate(&ctx_enc_ecb, in_ptr,
+ EVP_EncryptUpdate(ctx_enc_ecb, in_ptr,
&outlen, in_ptr, blocksize*2);
*out = in_ptr;
len = outlen;
cipher_enc_state = CIPHER_SEQUENCE;
break;
@@ -584,11 +588,11 @@
{
case CIPHER_INIT:
in_ptr = in;
iv = malloc(blocksize);
outlen = blocksize*2;
- EVP_DecryptUpdate(&ctx_dec_ecb, in_ptr, &outlen, in_ptr, blocksize*2);
+ EVP_DecryptUpdate(ctx_dec_ecb, in_ptr, &outlen, in_ptr, blocksize*2);
if ( !strncmp(in_ptr, "ivec", 4) )
{
memcpy(iv, in_ptr+4, blocksize);
cipher_dec_init(iv);
@@ -627,11 +631,11 @@
"Max. gibberish threshold reached");
#endif
if (cipher_enc_state != CIPHER_INIT)
{
cipher_enc_state = CIPHER_INIT;
- EVP_CIPHER_CTX_cleanup(&ctx_enc);
+ EVP_CIPHER_CTX_free(ctx_enc);
#ifdef LFD_ENCRYPT_DEBUG
vtun_syslog(LOG_INFO,
"Forcing local encryptor re-init");
#endif
}
@@ -708,11 +712,11 @@
*len -= blocksize;
if (cipher_enc_state != CIPHER_INIT)
{
cipher_enc_state = CIPHER_INIT;
- EVP_CIPHER_CTX_cleanup(&ctx_enc);
+ EVP_CIPHER_CTX_free(ctx_enc);
}
#ifdef LFD_ENCRYPT_DEBUG
vtun_syslog(LOG_INFO, "Remote requests encryptor re-init");
#endif
}
@@ -722,11 +726,11 @@
if (cipher_dec_state != CIPHER_INIT &&
cipher_enc_state != CIPHER_REQ_INIT &&
cipher_enc_state != CIPHER_INIT)
{
- EVP_CIPHER_CTX_cleanup (&ctx_dec);
+ EVP_CIPHER_CTX_free (ctx_dec);
cipher_dec_state = CIPHER_INIT;
cipher_enc_state = CIPHER_REQ_INIT;
}
#ifdef LFD_ENCRYPT_DEBUG
vtun_syslog(LOG_INFO, "Local decryptor out of sync");
package/vtun/Config.in
+14
View File
@@ -0,0 +1,14 @@
config BR2_PACKAGE_VTUN
bool "vtun"
depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_LZO
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH if BR2_PACKAGE_LIBOPENSSL
select BR2_PACKAGE_ZLIB
help
Tool for easily creating Virtual Tunnels over TCP/IP networks
with traffic shaping, compression, and encryption.
It supports IP, PPP, SLIP, Ethernet and other tunnel types.
http://vtun.sourceforge.net/
package/vtun/vtun.hash
+6
View File
@@ -0,0 +1,6 @@
# From https://sourceforge.net/projects/vtun/files/vtun/3.0.4/
md5 f952c5895ae8f40235aaad9a8f41a4bd vtun-3.0.4.tar.gz
sha1 2335c21b56fadf9ce851dd7f342fb0ed4f522c47 vtun-3.0.4.tar.gz
# Locally computed:
sha256 abf8df6b15e3febeaaeae2ce24ead7105eb1537ad4ec0d830c83cbb684fd98b9 vtun-3.0.4.tar.gz
sha256 5692a9a69dc5abc1aa9cbc54899d114b65c4cefbd9d7fcecc304316a2f26ced3 README.OpenSSL
package/vtun/vtun.mk
+26
View File
@@ -0,0 +1,26 @@
################################################################################
#
# vtun
#
################################################################################
VTUN_VERSION = 3.0.4
VTUN_SITE = http://downloads.sourceforge.net/project/vtun/vtun/$(VTUN_VERSION)
VTUN_LICENSE = GPL-2.0+ with OpenSSL exception
VTUN_LICENSE_FILES = README.OpenSSL
VTUN_DEPENDENCIES = host-bison host-flex host-pkgconf zlib lzo openssl
VTUN_AUTORECONF = YES
VTUN_CONF_OPTS = \
--with-ssl-headers=$(STAGING_DIR)/usr/include/openssl \
--with-lzo-headers=$(STAGING_DIR)/usr/include/lzo \
--with-lzo-lib=$(STAGING_DIR)/usr/lib
# Assumes old-style gcc inline symbol visibility rules
VTUN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu89"
# configure.in forgets to link to dependent libraries of openssl breaking static
# linking
VTUN_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
$(eval $(autotools-package))