[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/

2023-08-02 Thread Joonas Niilola 
commit: 5dedefb900a80a2a744f4cd0324eeb783814c5fe
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Aug  2 06:52:18 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug  2 06:52:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dedefb9

net-vpn/vtun: Stabilize 3.0.4-r4 ppc, #910695

Signed-off-by: Joonas Niilola  gentoo.org>

 net-vpn/vtun/vtun-3.0.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/vtun/vtun-3.0.4-r4.ebuild 
b/net-vpn/vtun/vtun-3.0.4-r4.ebuild
index a517b0a9002a..bf3f14e1e39a 100644
--- a/net-vpn/vtun/vtun-3.0.4-r4.ebuild
+++ b/net-vpn/vtun/vtun-3.0.4-r4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://vtun.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 IUSE="lzo socks5 ssl zlib"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/

2023-07-22 Thread Sam James 
commit: 43a425daeeff780956f0dcdad5b5d9c008d901d7
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 23 02:05:53 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 23 02:05:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43a425da

net-vpn/vtun: Stabilize 3.0.4-r4 x86, #910695

Signed-off-by: Sam James  gentoo.org>

 net-vpn/vtun/vtun-3.0.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/vtun/vtun-3.0.4-r4.ebuild 
b/net-vpn/vtun/vtun-3.0.4-r4.ebuild
index f7c4985111d5..a517b0a9002a 100644
--- a/net-vpn/vtun/vtun-3.0.4-r4.ebuild
+++ b/net-vpn/vtun/vtun-3.0.4-r4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://vtun.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 IUSE="lzo socks5 ssl zlib"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/

2023-07-22 Thread Sam James 
commit: 3dfaff07fb2d59a89d210942ee969518c5b61c84
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 22 18:36:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 22 18:36:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dfaff07

net-vpn/vtun: Stabilize 3.0.4-r4 amd64, #910695

Signed-off-by: Sam James  gentoo.org>

 net-vpn/vtun/vtun-3.0.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/vtun/vtun-3.0.4-r4.ebuild 
b/net-vpn/vtun/vtun-3.0.4-r4.ebuild
index 81eaa36bd9e3..f7c4985111d5 100644
--- a/net-vpn/vtun/vtun-3.0.4-r4.ebuild
+++ b/net-vpn/vtun/vtun-3.0.4-r4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://vtun.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86"
 IUSE="lzo socks5 ssl zlib"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/files/

2023-06-10 Thread Sam James 
commit: 146621109cad9e9742ab6a71f7d66be1a76eea26
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 10 21:36:15 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 10 21:36:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14662110

net-vpn/vtun: add bug link to patch

Bug: https://bugs.gentoo.org/907988
Signed-off-by: Sam James  gentoo.org>

 net-vpn/vtun/files/vtun-3.0.4-use-bison-for-yacc.patch | 1 +
 1 file changed, 1 insertion(+)

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
index 40c934c7ea81..70a28befe486 100644
--- 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
@@ -1,3 +1,4 @@
+https://bugs.gentoo.org/907988
 --- 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 @@

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/, net-vpn/vtun/files/

2023-06-10 Thread Sam James 
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/

2023-06-10 Thread Sam James 
commit: a12ebe4a213e68522f1b4ad7d095c404f6800255
Author: Jan-Espen Oversand  radiotube  org>
AuthorDate: Sat Jun 10 19:00:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 10 21:36:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a12ebe4a

net-vpn/vtun: drop 3.0.4-r2

Signed-off-by: Jan-Espen Oversand  radiotube.org>
Signed-off-by: Sam James  gentoo.org>

 net-vpn/vtun/vtun-3.0.4-r2.ebuild | 60 ---
 1 file changed, 60 deletions(-)

diff --git a/net-vpn/vtun/vtun-3.0.4-r2.ebuild 
b/net-vpn/vtun/vtun-3.0.4-r2.ebuild
deleted file mode 100644
index 6f2661a261b8..
--- a/net-vpn/vtun/vtun-3.0.4-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info
-
-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
-   app-alternatives/yacc
-"
-
-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
-)
-
-src_prepare() {
-   default
-   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/

2023-05-12 Thread Sam James 
commit: a2e07a295796ef4d54315382f88430c67ffc0188
Author: Sam James  gentoo  org>
AuthorDate: Sat May 13 00:56:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 13 00:56:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e07a29

net-vpn/vtun: Stabilize 3.0.4-r3 amd64, #906228

Signed-off-by: Sam James  gentoo.org>

 net-vpn/vtun/vtun-3.0.4-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/vtun/vtun-3.0.4-r3.ebuild 
b/net-vpn/vtun/vtun-3.0.4-r3.ebuild
index 6aa76ddf8156..f7b6d838ab57 100644
--- a/net-vpn/vtun/vtun-3.0.4-r3.ebuild
+++ b/net-vpn/vtun/vtun-3.0.4-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://vtun.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86"
 IUSE="lzo socks5 ssl zlib"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/

2023-05-12 Thread Sam James 
commit: 83e7307cade96cb1e66c0e0b3a8ea4cdd79b47d2
Author: Sam James  gentoo  org>
AuthorDate: Sat May 13 00:56:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 13 00:56:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e7307c

net-vpn/vtun: Stabilize 3.0.4-r3 ppc, #906228

Signed-off-by: Sam James  gentoo.org>

 net-vpn/vtun/vtun-3.0.4-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/vtun/vtun-3.0.4-r3.ebuild 
b/net-vpn/vtun/vtun-3.0.4-r3.ebuild
index 9daf9f410350..8d889a7404e6 100644
--- a/net-vpn/vtun/vtun-3.0.4-r3.ebuild
+++ b/net-vpn/vtun/vtun-3.0.4-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://vtun.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 IUSE="lzo socks5 ssl zlib"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/

2023-05-12 Thread Sam James 
commit: a3ac43dd3c471ec1de19f16593db76489c1830a9
Author: Sam James  gentoo  org>
AuthorDate: Sat May 13 00:56:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 13 00:56:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3ac43dd

net-vpn/vtun: Stabilize 3.0.4-r3 x86, #906228

Signed-off-by: Sam James  gentoo.org>

 net-vpn/vtun/vtun-3.0.4-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/vtun/vtun-3.0.4-r3.ebuild 
b/net-vpn/vtun/vtun-3.0.4-r3.ebuild
index f7b6d838ab57..9daf9f410350 100644
--- a/net-vpn/vtun/vtun-3.0.4-r3.ebuild
+++ b/net-vpn/vtun/vtun-3.0.4-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://vtun.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 IUSE="lzo socks5 ssl zlib"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/files/, net-vpn/vtun/

2023-04-10 Thread Joonas Niilola 
commit: a833e8490840f789b92f17bf6a08db13f1ca9944
Author: Jan-Espen Oversand  radiotube  org>
AuthorDate: Fri Mar 10 19:13:49 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Apr 10 08:10:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a833e849

net-vpn/vtun: drop 3.0.3-r4

Closes: https://bugs.gentoo.org/900336
Signed-off-by: Jan-Espen Oversand  radiotube.org>
Signed-off-by: Joonas Niilola  gentoo.org>

 net-vpn/vtun/Manifest  |   1 -
 .../vtun-3.0.2-remove-config-presence-check.patch  |  13 --
 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   |  11 -
 net-vpn/vtun/files/vtun-3.0.3-includes.patch   |  72 ---
 net-vpn/vtun/files/vtun-libssl-1.1.patch   | 229 -
 net-vpn/vtun/vtun-3.0.3-r4.ebuild  |  62 --
 8 files changed, 462 deletions(-)

diff --git a/net-vpn/vtun/Manifest b/net-vpn/vtun/Manifest
index 69aacb9b0565..92748306cddb 100644
--- a/net-vpn/vtun/Manifest
+++ b/net-vpn/vtun/Manifest
@@ -1,2 +1 @@
-DIST vtun-3.0.3.tar.gz 130051 BLAKE2B 
9bbc11724fb75acd024fda8b4e84af425c5377b3d8a938f7e789ecb1c2cdb95f109a1edc59f3fcbd2c5898bd17be76054060e8e36a1fb4355b40b61cc64adaad
 SHA512 
5fa789d08b556f97492b89515a89c2322c4b0a8fa95bd1035f5ed19061b3654a6a36a9911792096ac872ae9ae5451848cab87d0343dc0ffc064affea1f7d0d54
 DIST vtun-3.0.4.tar.gz 132691 BLAKE2B 
040c3c66074a1ebdd8a2f32c988b7f4d9423d248ad1259456cd8cdbe0b9adbbaca4cd1e1a4e8c4e6a936a221a9443c099d5d8a219f830925f220bc09e5e7feae
 SHA512 
b1bb7294bd745c2ca888704e2b0f8e05447b5e01bec0f921648afe363d61a19508dea9e26663993cd69c506aa92621e76f36045bddf7c3723d13a72741ca6781

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
deleted file mode 100644
index c2d9e7d999a7..
--- a/net-vpn/vtun/files/vtun-3.0.2-remove-config-presence-check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 a/Makefile.in
-+++ b/Makefile.in
-@@ -86,9 +86,7 @@
- 
- 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: vtund install_config install_man
-   $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run

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
deleted file mode 100644
index 0e7c68be8f13..
--- a/net-vpn/vtun/files/vtun-3.0.3-C99-inline.patch
+++ /dev/null
@@ -1,49 +0,0 @@
 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
deleted file mode 100644
index 2dd6dd2e3348..
--- a/net-vpn/vtun/files/vtun-3.0.3-fno-common.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 *

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/

2023-04-10 Thread Joonas Niilola 
commit: dbeeaa226d6be4c217e5de37351b3afa7fca1d99
Author: Jan-Espen Oversand  radiotube  org>
AuthorDate: Tue Mar 28 19:08:15 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Apr 10 08:10:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbeeaa22

net-vpn/vtun: add 3.0.4-r3

regen autoconf to fix old test. clang-16 prep

Bug: https://bugs.gentoo.org/900336
Signed-off-by: Jan-Espen Oversand  radiotube.org>
Closes: https://github.com/gentoo/gentoo/pull/30384
Signed-off-by: Joonas Niilola  gentoo.org>

 net-vpn/vtun/vtun-3.0.4-r3.ebuild | 61 +++
 1 file changed, 61 insertions(+)

diff --git a/net-vpn/vtun/vtun-3.0.4-r3.ebuild 
b/net-vpn/vtun/vtun-3.0.4-r3.ebuild
new file mode 100644
index ..6aa76ddf8156
--- /dev/null
+++ b/net-vpn/vtun/vtun-3.0.4-r3.ebuild
@@ -0,0 +1,61 @@
+# 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
+   app-alternatives/yacc
+"
+
+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
+)
+
+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/

2023-01-21 Thread Sam James 
commit: 9ee56729a06cd035c275d48439cf6092845b2d01
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 22 07:09:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 22 07:09:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ee56729

net-vpn/vtun: add lex BDEPEND, switch to yacc BDEPEND (not just bison)

Closes: https://bugs.gentoo.org/891649
Signed-off-by: Sam James  gentoo.org>

 net-vpn/vtun/vtun-3.0.4-r2.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net-vpn/vtun/vtun-3.0.4-r2.ebuild 
b/net-vpn/vtun/vtun-3.0.4-r2.ebuild
index 4673a825b363..6f2661a261b8 100644
--- a/net-vpn/vtun/vtun-3.0.4-r2.ebuild
+++ b/net-vpn/vtun/vtun-3.0.4-r2.ebuild
@@ -21,7 +21,10 @@ RDEPEND="
zlib? ( sys-libs/zlib )
dev-libs/libbsd"
 DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/bison"
+BDEPEND="
+   app-alternatives/lex
+   app-alternatives/yacc
+"
 
 DOCS=( ChangeLog Credits FAQ README README.Setup README.Shaper TODO )
 CONFIG_CHECK="~TUN"

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/

2023-01-21 Thread Joonas Niilola 
commit: b9ef09784880a73b090695eeffb9bf85b3738192
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Jan 22 06:55:25 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jan 22 06:55:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9ef0978

net-vpn/vtun: Stabilize 3.0.4-r2 amd64, #891595

Signed-off-by: Joonas Niilola  gentoo.org>

 net-vpn/vtun/vtun-3.0.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/vtun/vtun-3.0.4-r2.ebuild 
b/net-vpn/vtun/vtun-3.0.4-r2.ebuild
index c5f5d5e8d591..4673a825b363 100644
--- a/net-vpn/vtun/vtun-3.0.4-r2.ebuild
+++ b/net-vpn/vtun/vtun-3.0.4-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://vtun.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 IUSE="lzo socks5 ssl zlib"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/

2023-01-21 Thread Sam James 
commit: 5de652e0448432c7eb57f4b93be4f68c341afc27
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 22 01:38:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 22 01:38:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5de652e0

net-vpn/vtun: Stabilize 3.0.4-r2 x86, #891595

Signed-off-by: Sam James  gentoo.org>

 net-vpn/vtun/vtun-3.0.4-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-vpn/vtun/vtun-3.0.4-r2.ebuild 
b/net-vpn/vtun/vtun-3.0.4-r2.ebuild
index 800d5d0feb11..312af8bfefa6 100644
--- a/net-vpn/vtun/vtun-3.0.4-r2.ebuild
+++ b/net-vpn/vtun/vtun-3.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ HOMEPAGE="https://vtun.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
 IUSE="lzo socks5 ssl zlib"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/

2023-01-21 Thread Sam James 
commit: 1b82bc20cb29281a4d2634d56fd292cefc68fa82
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 22 01:38:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 22 01:38:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b82bc20

net-vpn/vtun: Stabilize 3.0.4-r2 ppc, #891595

Signed-off-by: Sam James  gentoo.org>

 net-vpn/vtun/vtun-3.0.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/vtun/vtun-3.0.4-r2.ebuild 
b/net-vpn/vtun/vtun-3.0.4-r2.ebuild
index 312af8bfefa6..c5f5d5e8d591 100644
--- a/net-vpn/vtun/vtun-3.0.4-r2.ebuild
+++ b/net-vpn/vtun/vtun-3.0.4-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://vtun.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ppc ~sparc x86"
 IUSE="lzo socks5 ssl zlib"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/

2022-12-18 Thread Sam James 
commit: 4fd941025bfebc7b8f8d3fa5c4108e05026161fa
Author: Jan-Espen Oversand  radiotube  org>
AuthorDate: Sun Dec 18 10:26:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 18 10:40:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fd94102

net-vpn/vtun: adopt package

Signed-off-by: Jan-Espen Oversand  radiotube.org>
Closes: https://github.com/gentoo/gentoo/pull/28700
Signed-off-by: Sam James  gentoo.org>

 net-vpn/vtun/metadata.xml | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/net-vpn/vtun/metadata.xml b/net-vpn/vtun/metadata.xml
index ff77edd66cd7..ddf7a62b90b1 100644
--- a/net-vpn/vtun/metadata.xml
+++ b/net-vpn/vtun/metadata.xml
@@ -1,7 +1,14 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   sigs...@radiotube.org
+   Jan-Espen Oversand
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   

vtun

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/files/, net-vpn/vtun/

2022-12-16 Thread Sam James 
commit: c89929c39b281565db5dd4fd51c7c1509db976d6
Author: Jan-Espen Oversand  radiotube  org>
AuthorDate: Fri Dec 16 20:16:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 16 22:57:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c89929c3

net-vpn/vtun: Fix bashism in shell script

Fix shell script compatibility issue in rc script (bashism).

Closes: https://bugs.gentoo.org/849446
Signed-off-by: Jan-Espen Oversand  radiotube.org>
Closes: https://github.com/gentoo/gentoo/pull/28682
Signed-off-by: Sam James  gentoo.org>

 net-vpn/vtun/files/vtun.rc  | 3 ++-
 net-vpn/vtun/{vtun-3.0.3-r3.ebuild => vtun-3.0.3-r4.ebuild} | 0
 net-vpn/vtun/{vtun-3.0.4-r1.ebuild => vtun-3.0.4-r2.ebuild} | 0
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-vpn/vtun/files/vtun.rc b/net-vpn/vtun/files/vtun.rc
index 7ef322985043..9d081eeb4f06 100644
--- a/net-vpn/vtun/files/vtun.rc
+++ b/net-vpn/vtun/files/vtun.rc
@@ -7,7 +7,8 @@ depend() {
 }
 
 start() {
-   IFS=$'\n'
+   IFS=$(printf '\n.'); # Set separator (IFS) to 
+   IFS=${IFS%.};# Remove  - The  was because shells 
remove trailing newlines with $(..)
for line in `grep -v '^[[:space:]]*#' /etc/vtund-start.conf | grep -v 
'^[[:space:]]*$'`
do
echo $line | 

diff --git a/net-vpn/vtun/vtun-3.0.3-r3.ebuild 
b/net-vpn/vtun/vtun-3.0.3-r4.ebuild
similarity index 100%
rename from net-vpn/vtun/vtun-3.0.3-r3.ebuild
rename to net-vpn/vtun/vtun-3.0.3-r4.ebuild

diff --git a/net-vpn/vtun/vtun-3.0.4-r1.ebuild 
b/net-vpn/vtun/vtun-3.0.4-r2.ebuild
similarity index 100%
rename from net-vpn/vtun/vtun-3.0.4-r1.ebuild
rename to net-vpn/vtun/vtun-3.0.4-r2.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/files/, net-vpn/vtun/

2022-12-15 Thread Sam James 
commit: ca305be17ae525e1b4ed7ba9bf87dba5f9d5c326
Author: Jan-Espen Oversand  radiotube  org>
AuthorDate: Tue Dec 13 18:31:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 16 05:20:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca305be1

net-vpn/vtun: fix implicit function decls

Fix implicit setproctitle, also this is libbsd so libbsd is a runtime 
depencency.

Also fix implicit getpt, grantpt, ptsname, by enabling nonstandard (_GNU_SOURCE)
gnu extensions and extra open/posix (_XOPEN_SOURCE).

Closes: https://bugs.gentoo.org/875443
Signed-off-by: Jan-Espen Oversand  radiotube.org>
Closes: https://github.com/gentoo/gentoo/pull/28656
Signed-off-by: Sam James  gentoo.org>

 net-vpn/vtun/files/vtun-3.0.3-includes.patch   | 12 ++-
 net-vpn/vtun/files/vtun-3.0.4-includes.patch   | 24 +-
 .../{vtun-3.0.3-r2.ebuild => vtun-3.0.3-r3.ebuild} |  5 +++--
 .../{vtun-3.0.4.ebuild => vtun-3.0.4-r1.ebuild}|  3 ++-
 4 files changed, 39 insertions(+), 5 deletions(-)

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 46ff5eca90a4..517ddf3cbb9c 100644
--- a/net-vpn/vtun/files/vtun-3.0.3-includes.patch
+++ b/net-vpn/vtun/files/vtun-3.0.3-includes.patch
@@ -20,14 +20,24 @@
  #include "linkfd.h"
 --- a/lib.h
 +++ b/lib.h
-@@ -26,6 +26,7 @@
+@@ -26,6 +26,8 @@
  #include 
  #include 
  #include 
 +#include  /* read(), write() */
++#include  /* setproctitle(), see man libbsd(7) */
  
  #ifdef HAVE_LIBUTIL_H
  #include 
+@@ -35,7 +37,7 @@
+   void init_title(int argc,char *argv[],char *env[], char *name);
+   void set_title(const char *ftm, ...);
+ #else
+-  #define init_title( a... ) 
++  #define init_title(argc, argv, env, name) setproctitle_init(argc, argv, env)
+   #define set_title setproctitle
+ #endif /* HAVE_SETPROC_TITLE */
+ 
 --- a/vtun.h
 +++ b/vtun.h
 @@ -232,5 +232,9 @@

diff --git a/net-vpn/vtun/files/vtun-3.0.4-includes.patch 
b/net-vpn/vtun/files/vtun-3.0.4-includes.patch
index d17e4acbc5c4..06546c6bd815 100644
--- a/net-vpn/vtun/files/vtun-3.0.4-includes.patch
+++ b/net-vpn/vtun/files/vtun-3.0.4-includes.patch
@@ -20,14 +20,24 @@
  #include "linkfd.h"
 --- a/lib.h
 +++ b/lib.h
-@@ -26,6 +26,7 @@
+@@ -26,6 +26,8 @@
  #include 
  #include 
  #include 
 +#include  /* read(), write() */
++#include  /* setproctitle(), see man libbsd(7) */
  
  #ifdef HAVE_LIBUTIL_H
  #include 
+@@ -35,7 +37,7 @@
+   void init_title(int argc,char *argv[],char *env[], char *name);
+   void set_title(const char *ftm, ...);
+ #else
+-  #define init_title( a... ) 
++  #define init_title(argc, argv, env, name) setproctitle_init(argc, argv, env)
+   #define set_title setproctitle
+ #endif /* HAVE_SETPROC_TITLE */
+ 
 --- a/lock.c
 +++ b/lock.c
 @@ -32,6 +32,7 @@
@@ -48,3 +58,15 @@
  
  #include "vtun.h"
  #include "linkfd.h"
+--- a/generic/pty_dev.c
 b/generic/pty_dev.c
+@@ -22,6 +22,8 @@
+ 
+ #include "config.h"
+ 
++#define _GNU_SOURCE // getpt, grantpt 
++#define _XOPEN_SOURCE // unlockpt
+ #include 
+ #include 
+ #include 
+

diff --git a/net-vpn/vtun/vtun-3.0.3-r2.ebuild 
b/net-vpn/vtun/vtun-3.0.3-r3.ebuild
similarity index 94%
rename from net-vpn/vtun/vtun-3.0.3-r2.ebuild
rename to net-vpn/vtun/vtun-3.0.3-r3.ebuild
index 2152bb74e3ce..aeebc636d14f 100644
--- a/net-vpn/vtun/vtun-3.0.3-r2.ebuild
+++ b/net-vpn/vtun/vtun-3.0.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,8 @@ RDEPEND="
lzo? ( dev-libs/lzo:2 )
socks5? ( net-proxy/dante )
ssl? ( dev-libs/openssl:0= )
-   zlib? ( sys-libs/zlib )"
+   zlib? ( sys-libs/zlib )
+   dev-libs/libbsd"
 DEPEND="${RDEPEND}"
 BDEPEND="sys-devel/bison"
 

diff --git a/net-vpn/vtun/vtun-3.0.4.ebuild b/net-vpn/vtun/vtun-3.0.4-r1.ebuild
similarity index 96%
rename from net-vpn/vtun/vtun-3.0.4.ebuild
rename to net-vpn/vtun/vtun-3.0.4-r1.ebuild
index a1c1e76bb471..800d5d0feb11 100644
--- a/net-vpn/vtun/vtun-3.0.4.ebuild
+++ b/net-vpn/vtun/vtun-3.0.4-r1.ebuild
@@ -18,7 +18,8 @@ RDEPEND="
lzo? ( dev-libs/lzo:2 )
socks5? ( net-proxy/dante )
ssl? ( dev-libs/openssl:0= )
-   zlib? ( sys-libs/zlib )"
+   zlib? ( sys-libs/zlib )
+   dev-libs/libbsd"
 DEPEND="${RDEPEND}"
 BDEPEND="sys-devel/bison"

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/

2022-12-08 Thread Joonas Niilola 
commit: 68070d7c87533a5c385e8607ec8d02e388bc5c7f
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Dec  9 06:51:14 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Dec  9 06:54:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68070d7c

net-vpn/vtun: drop to maintainer-needed

 - previous contributor does not have a bugzilla account.

Signed-off-by: Joonas Niilola  gentoo.org>

 net-vpn/vtun/metadata.xml | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/net-vpn/vtun/metadata.xml b/net-vpn/vtun/metadata.xml
index d47d668be1d7..ff77edd66cd7 100644
--- a/net-vpn/vtun/metadata.xml
+++ b/net-vpn/vtun/metadata.xml
@@ -1,14 +1,7 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   sigs...@radiotube.org
-   Jan-Espen Oversand
-   
-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   
+   

vtun

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/files/, net-vpn/vtun/

2022-12-08 Thread Joonas Niilola 
commit: 90c904faf227c902da129eb569563cc6d669550a
Author: Jan-Espen Oversand  radiotube  org>
AuthorDate: Mon Nov 28 19:26:31 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Dec  9 06:54:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90c904fa

net-vpn/vtun: add 3.0.4

 It is a little bit tricky to build properly, which is probably at
 least partly because approx 5 years have gone by with no new
 upstream releases.

Signed-off-by: Jan-Espen Oversand  radiotube.org>
Signed-off-by: Joonas Niilola  gentoo.org>

 net-vpn/vtun/Manifest  |   1 +
 .../vtun-3.0.4-autoconf-fork-not-working.patch |  11 +
 net-vpn/vtun/files/vtun-3.0.4-includes.patch   |  50 
 net-vpn/vtun/files/vtun-3.0.4-libssl-ctx.patch | 253 +
 .../vtun/files/vtun-3.0.4-naughty-inlines.patch|  21 ++
 net-vpn/vtun/metadata.xml  |   9 +-
 net-vpn/vtun/vtun-3.0.4.ebuild |  56 +
 7 files changed, 400 insertions(+), 1 deletion(-)

diff --git a/net-vpn/vtun/Manifest b/net-vpn/vtun/Manifest
index f1d679b89a2e..69aacb9b0565 100644
--- a/net-vpn/vtun/Manifest
+++ b/net-vpn/vtun/Manifest
@@ -1 +1,2 @@
 DIST vtun-3.0.3.tar.gz 130051 BLAKE2B 
9bbc11724fb75acd024fda8b4e84af425c5377b3d8a938f7e789ecb1c2cdb95f109a1edc59f3fcbd2c5898bd17be76054060e8e36a1fb4355b40b61cc64adaad
 SHA512 
5fa789d08b556f97492b89515a89c2322c4b0a8fa95bd1035f5ed19061b3654a6a36a9911792096ac872ae9ae5451848cab87d0343dc0ffc064affea1f7d0d54
+DIST vtun-3.0.4.tar.gz 132691 BLAKE2B 
040c3c66074a1ebdd8a2f32c988b7f4d9423d248ad1259456cd8cdbe0b9adbbaca4cd1e1a4e8c4e6a936a221a9443c099d5d8a219f830925f220bc09e5e7feae
 SHA512 
b1bb7294bd745c2ca888704e2b0f8e05447b5e01bec0f921648afe363d61a19508dea9e26663993cd69c506aa92621e76f36045bddf7c3723d13a72741ca6781

diff --git a/net-vpn/vtun/files/vtun-3.0.4-autoconf-fork-not-working.patch 
b/net-vpn/vtun/files/vtun-3.0.4-autoconf-fork-not-working.patch
new file mode 100644
index ..258e4d736ccd
--- /dev/null
+++ b/net-vpn/vtun/files/vtun-3.0.4-autoconf-fork-not-working.patch
@@ -0,0 +1,11 @@
+--- a/config.h.in  2022-11-28 07:10:54.564387362 +0100
 b/config.h.in  2022-11-28 07:12:15.435007668 +0100
+@@ -156,3 +156,8 @@
+ 
+ /* Define as `fork' if `vfork' does not work. */
+ #undef vfork
++
++#if !defined(HAVE_WORKING_FORK) && !defined(HAVE_WORKING_VFORK)
++#define HAVE_WORKING_FORK 1
++#endif
++

diff --git a/net-vpn/vtun/files/vtun-3.0.4-includes.patch 
b/net-vpn/vtun/files/vtun-3.0.4-includes.patch
new file mode 100644
index ..d17e4acbc5c4
--- /dev/null
+++ b/net-vpn/vtun/files/vtun-3.0.4-includes.patch
@@ -0,0 +1,50 @@
+--- a/lfd_encrypt.c
 b/lfd_encrypt.c
+@@ -44,6 +44,7 @@
+ #include 
+ #include 
+ #include 
++#include  /* htonl() */
+ 
+ #include "vtun.h"
+ #include "linkfd.h"
+--- a/lib.c
 b/lib.c
+@@ -34,6 +34,7 @@
+ #include 
+ #include 
+ #include 
++#include  /* nanosleep() */
+ 
+ #include "vtun.h"
+ #include "linkfd.h"
+--- a/lib.h
 b/lib.h
+@@ -26,6 +26,7 @@
+ #include 
+ #include 
+ #include 
++#include  /* read(), write() */
+ 
+ #ifdef HAVE_LIBUTIL_H
+ #include 
+--- a/lock.c
 b/lock.c
+@@ -32,6 +32,7 @@
+ #include 
+ #include 
+ #include 
++#include  /* nanosleep() */
+ 
+ #include "vtun.h"
+ #include "linkfd.h"
+--- a/lfd_shaper.c
 b/lfd_shaper.c
+@@ -27,6 +27,7 @@
+ #include 
+ #include 
+ #include 
++#include  /* nanosleep() */
+ 
+ #include "vtun.h"
+ #include "linkfd.h"

diff --git a/net-vpn/vtun/files/vtun-3.0.4-libssl-ctx.patch 
b/net-vpn/vtun/files/vtun-3.0.4-libssl-ctx.patch
new file mode 100644
index ..6df2ca344e1f
--- /dev/null
+++ b/net-vpn/vtun/files/vtun-3.0.4-libssl-ctx.patch
@@ -0,0 +1,253 @@
+--- a/lfd_encrypt.c2016-10-01 23:27:51.0 +0200
 b/lfd_encrypt.c2022-11-27 19:30:55.119047677 +0100
+@@ -95,11 +95,11 @@
+ 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 = NULL;/* encrypt */
++static EVP_CIPHER_CTX *ctx_dec = NULL;/* 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 = NULL;/* sideband ecb encrypt */
++static EVP_CIPHER_CTX *ctx_dec_ecb = NULL;/* sideband ecb decrypt */
+ 
+ static int send_msg(int len, char *in, char **out);
+ static int recv_msg(int len, char *in, char **out);
+@@ -146,6 +146,22 @@
+free(key);
+ }
+ 
++static void setup_ctx_ptrs()
++{
++   if (ctx_enc_ecb == NULL) {
++   ctx_enc_ecb = EVP_CIPHER_CTX_new();
++   }
++   if (ctx_dec_ecb == NULL) {
++   ctx_dec_ecb = EVP_CIPHER_CTX_new();
++   }
++   if (ctx_enc == NULL) {
++   ctx_enc = EVP_CIPHER_CTX_new();
++   }
++   if (ctx_dec == NULL) {
++   ctx_dec = EVP_CIPHER_CTX_new();
++   }
++}
++
+

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/

2022-12-08 Thread Joonas Niilola 
commit: 5f26449585659f72218ec5c58b7c2ee17a636b64
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Dec  9 06:52:56 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Dec  9 06:54:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f264495

net-vpn/vtun: update EAPI 7 -> 8

Signed-off-by: Joonas Niilola  gentoo.org>

 net-vpn/vtun/vtun-3.0.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-vpn/vtun/vtun-3.0.4.ebuild b/net-vpn/vtun/vtun-3.0.4.ebuild
index c48f4f30a1cd..a1c1e76bb471 100644
--- a/net-vpn/vtun/vtun-3.0.4.ebuild
+++ b/net-vpn/vtun/vtun-3.0.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit linux-info
 
 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="http://vtun.sourceforge.net/;
+HOMEPAGE="https://vtun.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/, net-vpn/vtun/files/

2021-01-12 Thread David Seifert 
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/

2020-12-02 Thread Sergey Popov 
commit: bce1bac6d4a2fb68f8717348c1510a9cb924ef08
Author: Sergey Popov  gentoo  org>
AuthorDate: Wed Dec  2 08:11:47 2020 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Wed Dec  2 08:14:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bce1bac6

net-vpn/vtun: maintainer needed

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergey Popov  gentoo.org>

 net-vpn/vtun/metadata.xml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net-vpn/vtun/metadata.xml b/net-vpn/vtun/metadata.xml
index 6c796b6d02c..8a832320c0c 100644
--- a/net-vpn/vtun/metadata.xml
+++ b/net-vpn/vtun/metadata.xml
@@ -1,10 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   pinkb...@gentoo.org
-   Sergey Popov
-   
+   

vtun

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/

2020-11-28 Thread Aaron Bauman 
commit: 7c887c1630b20bda8ad6a5407ce37b4438b7705e
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sat Nov 28 16:42:12 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat Nov 28 16:44:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c887c16

net-vpn/vtun: drop old

Signed-off-by: Aaron Bauman  gentoo.org>

 net-vpn/vtun/vtun-3.0.3.ebuild | 57 --
 1 file changed, 57 deletions(-)

diff --git a/net-vpn/vtun/vtun-3.0.3.ebuild b/net-vpn/vtun/vtun-3.0.3.ebuild
deleted file mode 100644
index 153cff659a9..000
--- a/net-vpn/vtun/vtun-3.0.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils linux-info
-
-DESCRIPTION="Create tunnels over TCP/IP networks with shaping, encryption, and 
compression"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://vtun.sourceforge.net/;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
-IUSE="lzo socks5 ssl zlib"
-
-RDEPEND="ssl? ( dev-libs/openssl:0 )
-   lzo? ( dev-libs/lzo:2 )
-   zlib? ( sys-libs/zlib )
-   socks5? ( net-proxy/dante )"
-DEPEND="${RDEPEND}
-   sys-devel/bison"
-
-DOCS="ChangeLog Credits FAQ README README.Setup README.Shaper TODO"
-
-CONFIG_CHECK="~TUN"
-
-src_prepare() {
-   sed -i Makefile.in \
-   -e '/^LDFLAGS/s|=|+=|g' \
-   || die "sed Makefile"
-   epatch "${FILESDIR}"/${P}-includes.patch
-   # remove unneeded checking for /etc/vtund.conf
-   epatch "${FILESDIR}"/${PN}-3.0.2-remove-config-presence-check.patch
-   # GCC 5 compatibility, patch from 
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778164
-   epatch "${FILESDIR}"/${P}-gcc5.patch
-   # portage takes care about striping binaries itself
-   sed -i 's:$(BIN_DIR)/strip $(DESTDIR)$(SBIN_DIR)/vtund::' Makefile.in 
|| die
-
-   epatch_user
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/

2019-08-22 Thread Agostino Sarubbo 
commit: a49be5042d6325244f042b078ff7f96ee9de4f94
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Aug 22 22:00:25 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Aug 22 22:00:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a49be504

net-vpn/vtun: ppc stable wrt bug #689872

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-vpn/vtun/vtun-3.0.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/vtun/vtun-3.0.3-r1.ebuild 
b/net-vpn/vtun/vtun-3.0.3-r1.ebuild
index 66e0df51bca..48ca1ccaade 100644
--- a/net-vpn/vtun/vtun-3.0.3-r1.ebuild
+++ b/net-vpn/vtun/vtun-3.0.3-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://vtun.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 IUSE="lzo socks5 ssl zlib"
 
 RDEPEND="ssl? ( dev-libs/openssl:0 )

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/

2019-08-22 Thread Agostino Sarubbo 
commit: 45eaefd703bcc4bda5a03c17809a620ebcea7dc9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Aug 22 11:48:10 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Aug 22 11:48:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45eaefd7

net-vpn/vtun: x86 stable wrt bug #689872

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-vpn/vtun/vtun-3.0.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/vtun/vtun-3.0.3-r1.ebuild 
b/net-vpn/vtun/vtun-3.0.3-r1.ebuild
index afb8c920267..66e0df51bca 100644
--- a/net-vpn/vtun/vtun-3.0.3-r1.ebuild
+++ b/net-vpn/vtun/vtun-3.0.3-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://vtun.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 IUSE="lzo socks5 ssl zlib"
 
 RDEPEND="ssl? ( dev-libs/openssl:0 )

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/

2019-08-21 Thread Agostino Sarubbo 
commit: 72070d7a7d269db0d632fb87dba6dddc7079d458
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug 21 21:06:21 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug 21 21:06:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72070d7a

net-vpn/vtun: amd64 stable wrt bug #689872

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-vpn/vtun/vtun-3.0.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/vtun/vtun-3.0.3-r1.ebuild 
b/net-vpn/vtun/vtun-3.0.3-r1.ebuild
index d56bcd52fbd..afb8c920267 100644
--- a/net-vpn/vtun/vtun-3.0.3-r1.ebuild
+++ b/net-vpn/vtun/vtun-3.0.3-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://vtun.sourceforge.net/;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86"
 IUSE="lzo socks5 ssl zlib"
 
 RDEPEND="ssl? ( dev-libs/openssl:0 )

[gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/, net-vpn/vtun/files/

2019-07-14 Thread Hans de Graaff 
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;