[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/, net-vpn/vtun/files/
commit: ce94e4574d13d9a3bdd78114d9df75a938ad62d4
Author: Jan-Espen Oversand radiotube org>
AuthorDate: Sat Jun 10 21:14:06 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Jun 10 21:36:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce94e457
net-vpn/vtun: add 3.0.4-r4
explicit bdep bison due to using extension features
Closes: https://bugs.gentoo.org/907988
Signed-off-by: Jan-Espen Oversand radiotube.org>
Closes: https://github.com/gentoo/gentoo/pull/31379
Signed-off-by: Sam James gentoo.org>
.../vtun/files/vtun-3.0.4-use-bison-for-yacc.patch | 40 ++
net-vpn/vtun/vtun-3.0.4-r4.ebuild | 62 ++
2 files changed, 102 insertions(+)
diff --git a/net-vpn/vtun/files/vtun-3.0.4-use-bison-for-yacc.patch
b/net-vpn/vtun/files/vtun-3.0.4-use-bison-for-yacc.patch
new file mode 100644
index ..40c934c7ea81
--- /dev/null
+++ b/net-vpn/vtun/files/vtun-3.0.4-use-bison-for-yacc.patch
@@ -0,0 +1,40 @@
+--- a/configure.in 2016-10-01 23:46:01.0 +0200
b/configure.in 2023-06-10 22:44:20.873592074 +0200
+@@ -82,11 +82,14 @@
+ AC_CANONICAL_SYSTEM
+
+ dnl Check for programs.
+-AC_PROG_YACC
+ AC_PROG_LEX
+ AC_PROG_CC
+ AC_PROG_INSTALL
+
++AC_ARG_VAR([BISON], [bison command for yacc parsing])
++AC_CHECK_PROG([BISON], [bison -y], [bison -y], [no])
++AS_IF([test "x$BISON" = "xno"], [AC_MSG_ERROR([bison not found])])
++
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_C_INLINE
+--- a/Makefile.in 2016-10-01 23:46:00.0 +0200
b/Makefile.in 2023-06-10 23:00:25.278904190 +0200
+@@ -21,8 +21,8 @@
+ CFLAGS = @CFLAGS@ @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@ @LIBS@
+
+-YACC = @YACC@
+-YACCFLAGS = -d
++BISON = @BISON@
++BISONFLAGS = -d
+
+ LEX = @LEX@
+ LEXFLAGS = -t
+@@ -62,7 +62,7 @@
+ $(CC) $(CFLAGS) -o vtund $(OBJS) $(LFD_OBJS) $(LDFLAGS)
+
+ cfg_file.tab.h:
+- $(YACC) $(YACCFLAGS) -b cfg_file cfg_file.y
++ $(BISON) $(BISONFLAGS) -b cfg_file cfg_file.y
+
+ cfg_file.tab.c: cfg_file.y cfg_kwords.h config.h cfg_file.tab.h
+
diff --git a/net-vpn/vtun/vtun-3.0.4-r4.ebuild
b/net-vpn/vtun/vtun-3.0.4-r4.ebuild
new file mode 100644
index ..81eaa36bd9e3
--- /dev/null
+++ b/net-vpn/vtun/vtun-3.0.4-r4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info autotools
+
+DESCRIPTION="Create tunnels over TCP/IP networks with shaping, encryption, and
compression"
+SRC_URI="https://sourceforge.net/projects/vtun/files/${PN}/${PV}/${P}.tar.gz;
+HOMEPAGE="https://vtun.sourceforge.net/;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="lzo socks5 ssl zlib"
+
+RDEPEND="
+ lzo? ( dev-libs/lzo:2 )
+ socks5? ( net-proxy/dante )
+ ssl? ( dev-libs/openssl:0= )
+ zlib? ( sys-libs/zlib )
+ dev-libs/libbsd"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-alternatives/lex
+ sys-devel/bison
+"
+
+DOCS=( ChangeLog Credits FAQ README README.Setup README.Shaper TODO )
+CONFIG_CHECK="~TUN"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-libssl-ctx.patch
+ "${FILESDIR}"/${P}-includes.patch
+ "${FILESDIR}"/${P}-naughty-inlines.patch
+ "${FILESDIR}"/${P}-autoconf-fork-not-working.patch
+ "${FILESDIR}"/${P}-use-bison-for-yacc.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+ sed -i -e '/^LDFLAGS/s|=|+=|g' Makefile.in || die
+ sed -i 's:$(BIN_DIR)/strip $(DESTDIR)$(SBIN_DIR)/vtund::' Makefile.in
|| die
+}
+
+src_configure() {
+ econf \
+ $(use_enable ssl) \
+ $(use_enable zlib) \
+ $(use_enable lzo) \
+ $(use_enable socks5 socks) \
+ --enable-shaper
+}
+
+src_install() {
+ default
+ newinitd "${FILESDIR}"/vtun.rc vtun
+ insinto /etc
+ doins "${FILESDIR}"/vtund-start.conf
+ rm -r "${ED}"/var || die
+}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/, net-vpn/vtun/files/
commit: fe3fa6289e6a4c6d013aa06abf609f628a10
Author: Jakov Smolic sartura hr>
AuthorDate: Tue Jan 12 10:48:46 2021 +
Commit: David Seifert gentoo org>
CommitDate: Tue Jan 12 10:48:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe3fa628
net-vpn/vtun: Port to EAPI 7
Closes: https://bugs.gentoo.org/708372
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
.../vtun-3.0.2-remove-config-presence-check.patch | 4 +-
net-vpn/vtun/files/vtun-3.0.3-C99-inline.patch | 49 +++
net-vpn/vtun/files/vtun-3.0.3-fno-common.patch | 25 ++
net-vpn/vtun/files/vtun-3.0.3-gcc5.patch | 6 +-
net-vpn/vtun/files/vtun-3.0.3-includes.patch | 24 +-
net-vpn/vtun/files/vtun-libssl-1.1.patch | 458 ++---
.../{vtun-3.0.3-r1.ebuild => vtun-3.0.3-r2.ebuild} | 44 +-
7 files changed, 342 insertions(+), 268 deletions(-)
diff --git a/net-vpn/vtun/files/vtun-3.0.2-remove-config-presence-check.patch
b/net-vpn/vtun/files/vtun-3.0.2-remove-config-presence-check.patch
index 15b3bf273c3..c2d9e7d999a 100644
--- a/net-vpn/vtun/files/vtun-3.0.2-remove-config-presence-check.patch
+++ b/net-vpn/vtun/files/vtun-3.0.2-remove-config-presence-check.patch
@@ -1,5 +1,5 @@
Makefile.in.orig 2012-06-11 23:31:11.416075337 +0400
-+++ Makefile.in2012-06-11 23:31:21.247324839 +0400
+--- a/Makefile.in
b/Makefile.in
@@ -86,9 +86,7 @@
install_config:
diff --git a/net-vpn/vtun/files/vtun-3.0.3-C99-inline.patch
b/net-vpn/vtun/files/vtun-3.0.3-C99-inline.patch
new file mode 100644
index 000..0e7c68be8f1
--- /dev/null
+++ b/net-vpn/vtun/files/vtun-3.0.3-C99-inline.patch
@@ -0,0 +1,49 @@
+--- a/lfd_shaper.c
b/lfd_shaper.c
+@@ -69,7 +69,7 @@ int shaper_counter(int len, char *in, char **out)
+ }
+
+ /* Convert tv struct to milisec */
+-unsigned long inline tv2ms(struct timeval tv)
++unsigned long tv2ms(struct timeval tv)
+ {
+ register unsigned long ms = (tv.tv_sec * 1000)+(tv.tv_usec / 1000);
+ return ms ? ms : 1;
+--- a/linkfd.c
b/linkfd.c
+@@ -105,7 +105,7 @@ int lfd_free_mod(void)
+ }
+
+ /* Run modules down (from head to tail) */
+-inline int lfd_run_down(int len, char *in, char **out)
++int lfd_run_down(int len, char *in, char **out)
+ {
+ register struct lfd_mod *mod;
+
+@@ -119,7 +119,7 @@ inline int lfd_run_down(int len, char *in, char **out)
+ }
+
+ /* Run modules up (from tail to head) */
+-inline int lfd_run_up(int len, char *in, char **out)
++int lfd_run_up(int len, char *in, char **out)
+ {
+ register struct lfd_mod *mod;
+
+@@ -133,7 +133,7 @@ inline int lfd_run_up(int len, char *in, char **out)
+ }
+
+ /* Check if modules are accepting the data(down) */
+-inline int lfd_check_down(void)
++int lfd_check_down(void)
+ {
+ register struct lfd_mod *mod;
+ int err = 1;
+@@ -145,7 +145,7 @@ inline int lfd_check_down(void)
+ }
+
+ /* Check if modules are accepting the data(up) */
+-inline int lfd_check_up(void)
++int lfd_check_up(void)
+ {
+ register struct lfd_mod *mod;
+ int err = 1;
diff --git a/net-vpn/vtun/files/vtun-3.0.3-fno-common.patch
b/net-vpn/vtun/files/vtun-3.0.3-fno-common.patch
new file mode 100644
index 000..2dd6dd2e334
--- /dev/null
+++ b/net-vpn/vtun/files/vtun-3.0.3-fno-common.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/708372
+--- a/auth.c
b/auth.c
+@@ -70,7 +70,7 @@ void gen_chal(char *buf)
+ void encrypt_chal(char *chal, char *pwd)
+ {
+register int i;
+- BF_KEY key;
++ extern BF_KEY key;
+
+BF_set_key(, 16, MD5(pwd,strlen(pwd),NULL));
+
+--- a/lfd_encrypt.c
b/lfd_encrypt.c
+@@ -64,8 +64,8 @@
+ #define ENC_BUF_SIZE VTUN_FRAME_SIZE + 128
+ #define ENC_KEY_SIZE 16
+
+-BF_KEY key;
+-char * enc_buf;
++extern BF_KEY key;
++extern char * enc_buf;
+ char * dec_buf;
+
+ #define CIPHER_INIT 0
diff --git a/net-vpn/vtun/files/vtun-3.0.3-gcc5.patch
b/net-vpn/vtun/files/vtun-3.0.3-gcc5.patch
index 99c6531d726..8270f7a4d9e 100644
--- a/net-vpn/vtun/files/vtun-3.0.3-gcc5.patch
+++ b/net-vpn/vtun/files/vtun-3.0.3-gcc5.patch
@@ -1,7 +1,5 @@
-Index: vtun-3.0.3/cfg_file.y
-===
vtun-3.0.3.orig/cfg_file.y
-+++ vtun-3.0.3/cfg_file.y
+--- a/cfg_file.y
b/cfg_file.y
@@ -624,7 +624,7 @@ int clear_nat_hack_client(void *d, void
}
diff --git a/net-vpn/vtun/files/vtun-3.0.3-includes.patch
b/net-vpn/vtun/files/vtun-3.0.3-includes.patch
index cd7cf6a2a2e..46ff5eca90a 100644
--- a/net-vpn/vtun/files/vtun-3.0.3-includes.patch
+++ b/net-vpn/vtun/files/vtun-3.0.3-includes.patch
@@ -1,5 +1,5 @@
a/lfd_encrypt.c2008-01-07 23:35:32.0 +0100
-+++ b/lfd_encrypt.c2010-09-18 04:53:31.0 +0200
+--- a/lfd_encrypt.c
b/lfd_encrypt.c
@@ -44,6 +44,7 @@
#include
#include
@@ -8,8 +8,8 @@
#include "vtun.h"
#include "linkfd.h"
a/lib.c2008-01-07
[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/, net-vpn/vtun/files/
commit: ce831f8c08bc53e1d1cd6af329f7bcd902aa7b9d
Author: Hans de Graaff gentoo org>
AuthorDate: Sun Jul 14 07:18:16 2019 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sun Jul 14 07:18:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce831f8c
net-vpn/vtun: fix openssl 1.1 compatibility
Fixes: https://bugs.gentoo.org/674280
Signed-off-by: Hans de Graaff gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
net-vpn/vtun/files/vtun-libssl-1.1.patch | 229 +++
net-vpn/vtun/vtun-3.0.3-r1.ebuild| 59
2 files changed, 288 insertions(+)
diff --git a/net-vpn/vtun/files/vtun-libssl-1.1.patch
b/net-vpn/vtun/files/vtun-libssl-1.1.patch
new file mode 100644
index 000..76a3c027d88
--- /dev/null
+++ b/net-vpn/vtun/files/vtun-libssl-1.1.patch
@@ -0,0 +1,229 @@
+--- vtun-3.0.3/lfd_encrypt.c.orig 2019-02-25 18:43:39.310480427 -0500
vtun-3.0.3/lfd_encrypt.c2019-02-25 18:55:26.956441285 -0500
+@@ -96,11 +96,11 @@
+ char * pkey;
+ char * iv_buf;
+
+-EVP_CIPHER_CTX ctx_enc;/* encrypt */
+-EVP_CIPHER_CTX ctx_dec;/* decrypt */
++EVP_CIPHER_CTX *ctx_enc; /* encrypt */
++EVP_CIPHER_CTX *ctx_dec; /* decrypt */
+
+-EVP_CIPHER_CTX ctx_enc_ecb;/* sideband ecb encrypt */
+-EVP_CIPHER_CTX ctx_dec_ecb;/* sideband ecb decrypt */
++EVP_CIPHER_CTX *ctx_enc_ecb; /* sideband ecb encrypt */
++EVP_CIPHER_CTX *ctx_dec_ecb; /* sideband ecb decrypt */
+
+ int prep_key(char **key, int size, struct vtun_host *host)
+ {
+@@ -152,6 +152,11 @@
+EVP_CIPHER_CTX *pctx_enc;
+EVP_CIPHER_CTX *pctx_dec;
+
++ ctx_enc = EVP_CIPHER_CTX_new();
++ ctx_dec = EVP_CIPHER_CTX_new();
++ ctx_enc_ecb = EVP_CIPHER_CTX_new();
++ ctx_dec_ecb = EVP_CIPHER_CTX_new();
++
+enc_init_first_time = 1;
+dec_init_first_time = 1;
+
+@@ -178,15 +183,15 @@
+ keysize = 32;
+ sb_init = 1;
+ cipher_type = EVP_aes_256_ecb();
+- pctx_enc = _enc_ecb;
+- pctx_dec = _dec_ecb;
++ pctx_enc = ctx_enc_ecb;
++ pctx_dec = ctx_dec_ecb;
+ break;
+
+ case VTUN_ENC_AES256ECB:
+ blocksize = 16;
+ keysize = 32;
+- pctx_enc = _enc;
+- pctx_dec = _dec;
++ pctx_enc = ctx_enc;
++ pctx_dec = ctx_dec;
+ cipher_type = EVP_aes_256_ecb();
+ strcpy(cipher_name,"AES-256-ECB");
+ break;
+@@ -197,14 +202,14 @@
+ keysize = 16;
+ sb_init=1;
+ cipher_type = EVP_aes_128_ecb();
+- pctx_enc = _enc_ecb;
+- pctx_dec = _dec_ecb;
++ pctx_enc = ctx_enc_ecb;
++ pctx_dec = ctx_dec_ecb;
+ break;
+ case VTUN_ENC_AES128ECB:
+ blocksize = 16;
+ keysize = 16;
+- pctx_enc = _enc;
+- pctx_dec = _dec;
++ pctx_enc = ctx_enc;
++ pctx_dec = ctx_dec;
+ cipher_type = EVP_aes_128_ecb();
+ strcpy(cipher_name,"AES-128-ECB");
+ break;
+@@ -217,16 +222,16 @@
+ var_key = 1;
+ sb_init = 1;
+ cipher_type = EVP_bf_ecb();
+- pctx_enc = _enc_ecb;
+- pctx_dec = _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 = _enc;
+- pctx_dec = _dec;
++ pctx_enc = ctx_enc;
++ pctx_dec = ctx_dec;
+ cipher_type = EVP_bf_ecb();
+ strcpy(cipher_name,"Blowfish-256-ECB");
+ break;
+@@ -239,16 +244,16 @@
+ var_key = 1;
+ sb_init = 1;
+ cipher_type = EVP_bf_ecb();
+- pctx_enc = _enc_ecb;
+- pctx_dec = _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 = _enc;
+- pctx_dec = _dec;
++ pctx_enc = ctx_enc;
++ pctx_dec = ctx_dec;
+ cipher_type = EVP_bf_ecb();
+ strcpy(cipher_name,"Blowfish-128-ECB");
+ break;
+@@ -290,10 +295,10 @@
+lfd_free(enc_buf); enc_buf = NULL;
+lfd_free(dec_buf); dec_buf = NULL;
+
+- EVP_CIPHER_CTX_cleanup(_enc);
+- EVP_CIPHER_CTX_cleanup(_dec);
+- EVP_CIPHER_CTX_cleanup(_enc_ecb);
+- EVP_CIPHER_CTX_cleanup(_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;
+ }
+@@ -319,7 +324,7 @@
+outlen=len+pad;
+if (pad == blocksize)
+ RAND_bytes(in_ptr+len, blocksize-1);
+- EVP_EncryptUpdate(_enc, out_ptr, , in_ptr, len+pad);
++ EVP_EncryptUpdate(ctx_enc, out_ptr, , in_ptr, len+pad);
+*out = enc_buf;
+
+sequence_num++;
+@@ -339,7 +344,7 @@
+
+outlen=len;
