gentoo auto-resync : 16:12:2022 - 09:35:57

9 files changed, 43 insertions, 216 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index c8963e3622f1..371afb800e55 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 9378faccb437..644517ca4853 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -1,20 +1,15 @@
 AUX README.gentoo 316 BLAKE2B 9c962395e49a2eff8411e7fb3996d99e504b0023712151acdd6bee43755be89d52c970cbf7e5aae62c0adfb33ff7ad072578b88a40857bffb359a3d2c8571947 SHA512 6ca305c710562c0f9a3f0cba07760adf300ea166c8baa47e8872719190d779fb63d4dd6c9193fb60ddb51015138790aaa93935668423e0f861f05496d22ce660
 AUX tor-0.2.7.4-torrc.sample.patch 1341 BLAKE2B c6b398d6fd417e9029196046529109ed52c7c5dd6bd38505261116e15d1516a6e200583b480fe50b6e971d2ab4336673f9e75effa9dc8d3858c6248fbe31a69b SHA512 4a6b855734717416b6615fbd76bb75a54731767a74d3ade8c58fe52f4a42ee51c93ff8d591943343f319018e18d65b768bbe8fe936200ad829ab1e262c5e9b0f
-AUX tor-0.4.7.10-strict-prototypes-clang16.patch 3287 BLAKE2B 763ab2742939dcc8aba5619d9c7d0d3bc7274075baf80a97a991fe6119527d4e5317c9c051006b16276500d034b5372a9cde96cd20d19d20b15f3ae28fc22068 SHA512 57aa9c0a94dfc366ed06589d4374f529484f305556f8154aabca9e900ffdf6acd10aa822f4a3ff640a86621ebcd45d7f8269dcbffad5952238ee9b35df538784
 AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c196d49df4492471cb8b21dde43d668b31171ee2dfae81562a70367c72801ae60046908b022e SHA512 9028ac41e3acdf4405095addb69537e87edecafaec840296ac27a5a8992fe132dc822e4e4abb8826f76460c438da2719dea17859690d03e17198a82086a3d660
 AUX tor.initd-r9 942 BLAKE2B 1008ed981e1e7040b098f5c8c509e6a5de89e94b6fa110998c50b0521b99cb80e9b793a78de3de0e0e89d56553c32f3a6566015dd2c4fd77c812577f6f637d7a SHA512 fa3a6f52dc733d27f954299cfb32fc813ef731e1d124096450f7b53f0e4fce9f41cf48b66651d1f5383c18bdca8a87d6bbe03c65dc8a5f9a58660bb8db0040a1
 AUX tor.service 1050 BLAKE2B 7f6553b9f4b928f0c924d73ee6f9df8a99ee75ec1801f6b865a7d8e40ff30290bf836907b561586d0f429b7ddf05286ab51974d207906a0fe52cb2fbcc8e160f SHA512 786481b20d7cab9696656c5136ff74c9c2aaa73ca3d63b163a294b9b3c4b628da387cb5ec3ada81277ca81cff16ead5162f3b4d64cb0d773c22f2e4607c3194b
 AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9d1fee71aa3b4faa425274437f8a7c2f9c608b4f8f9be6d4dd7c7bc4a58bd1ea096353e698 SHA512 7cf8c81e2e84b12bfc1242782b370335041f566165be6d9742d10768f0541d921caa378c6429fdb55f2c3e1433141f65bc936795126e677cc0921ce82de22bc2
-DIST tor-0.4.7.10.tar.gz 7933376 BLAKE2B 46a9d932e7451bcc683e18d296d7a26bb4b544767cf4622910ebf90d82715718451ec3e0d6cd215eff5fe2cc3ae8441b8e6065c5877d7fc92c2f26ab5c7fa0cb SHA512 e82877807d9e73fe12ab424830641e52b9b45034ca06f07e37648f50a3c1c10cd1b07081d8646b8e92c58658bdff5f6e9670e5104e9d05a531b1d85d0851a606
-DIST tor-0.4.7.10.tar.gz.sha256sum 86 BLAKE2B 4b372b3508ffee497ecc9adab4a4d3d2b548100bb7dd54e1036c71004503d96148899096bbae807f2d626a5e26d0a947f7546df0a708a78b59b4d39bed3e849c SHA512 518b6e617702386df7a84155d528f1a904a45221c946402da3fc3d40170dcdac117bff38c92a2e58ef4dd8d422433950f3904d27da66a99d808204432732cc9b
-DIST tor-0.4.7.10.tar.gz.sha256sum.asc 1321 BLAKE2B fc7fd43115992e5d434cc1bf2808eeb971ead532935be7493b4eef7804a65cad3cf4f9fd18158a0c8f3e19bb9e55c5fe7487ded9adb6782cbc1583e1159aaf7c SHA512 789923b465e72a1a77b1b1951cd0f66c266c10119a480ce8b622f1f4aa07381b7403c27aca3badf51381da0b41498c9b0d42b2c5cedd6c54a617df9dc138689e
 DIST tor-0.4.7.11.tar.gz 7983705 BLAKE2B 2d743e7d0aea63e76f6e24aa235792af8691fde419f56bbdf8c6ee865250a09ec06454ec84abac8ba47e3d61a363c937fc050376172d3ec6b0815998d1c8679e SHA512 318377916880310438aa9804d1ea0154c5416d6b13988c4ff7f2e65fd38c94e2cd6c53252fd76a4dcb488f452837468e19197bf5feee4020e3c1927a76ed2937
 DIST tor-0.4.7.11.tar.gz.sha256sum 86 BLAKE2B 1e49ba88ae21af6589a9815603ee375cc0dc85fcd8dd5a5f52cd44659438874ae9d10b09b7f15cadd2c30d2e8012a27be4233dcb19195d4627f19a59ccf68d0b SHA512 cfdae54a70dc0d8eb0eaf8b8c9902a7dd8bc8d597a678d5a0bf431c3e09a8b56206b70b6f9207e3c06e1ba11913b25b81d7c269e49cde5f297ff7b165a3348a9
 DIST tor-0.4.7.11.tar.gz.sha256sum.asc 716 BLAKE2B 2336ff3869b3a759626cd68c0c931dbdb6cf5b13e7a99e2dcc1c784e3832ba2f0314c1c2f3a9e5ccaba3f20d7aab9b9c918373194290769e358cbb5411323012 SHA512 b5e3c82378bc18268d6d4523787e12ece39246cc0f035fd1aedc50c2182d1ba3d2a8f8817a3dada2cd60acabb78f604f06ab347b92c6f42a82f260cc49285c2c
 DIST tor-0.4.7.12.tar.gz 8009573 BLAKE2B 13e9a796d9e5b024aa01b9aaab389b580df41641013721e4c2821cfee4edc6fb562d997be70ecc3908ac5e43187978b1be63f78ac72c73e8ea3617d6b5cf1ea9 SHA512 b97a6cc3fd3353cc1cdbb47df6d8895d0f730967083171795be56ffab4660c9a0f8f73ce83a98eff1fbd0793bae28c987d53c29f57fc5e0f26dddc30c197abb2
 DIST tor-0.4.7.12.tar.gz.sha256sum 86 BLAKE2B 0402bdf641c8142f91df7a80ad726ce3a1eeb3265f385b5b818440e6c25a5424db467714baee0dfaaf61edf482814a1de5c4d53fd4d61a26c194037a71928580 SHA512 c9a197bb563b05632cc5bfe4dfe5d2dd02427591816997726e2fbc9ec94b17d52295f33c946bea51ac6a2ef76d94a14b9e96daf951eeab57a8ee0d7d513c62c1
 DIST tor-0.4.7.12.tar.gz.sha256sum.asc 716 BLAKE2B c148062a35e232d08cd1e0971e467cddee7836932984f778ab923ff38e717c2a8f3985ff63591002b179eaeb12e04b066366a2a3ed76e00d436a76f0eacaea67 SHA512 afa1208758f0b385cea36660db4739353237b5a4608c374db9115e3584ba96bdabe18ea811752a847eb3e5012919c9f3ed06129f1ec40465d18dc27de4b961fc
-EBUILD tor-0.4.7.10-r1.ebuild 3234 BLAKE2B a80b64e1f6e6a0b158cfd42e44782b563b4f6020560f930caeb56db931ea8bc0f8f4e43cf7b14436cc81d91baf474c9ce9643e88dca873f0f354fa30261fed9f SHA512 17780bc894b55b1fd5b4dfab4b789034518f0d8e1d534f1ea9d61f66c7c7a2eb189feec70cba38e9d30a48629c07888877e4d4de2bd9f0526ae5f7ff21693677
 EBUILD tor-0.4.7.11.ebuild 3182 BLAKE2B 0a9d4c581b51b370fba88c124df05938111ea4cc404b6f134f364a705ef0d07b106b1eddedaa67ddab845948f8840745eb08032aae874b9906ea4705a30a76eb SHA512 d237932416e70bf209f389bd18ff43f7fb4e95c61f6b141ae609b90b9428550e296f23f9ea26e7f758237c1719663639cd22215629aabb56ab1a002ab734d242
 EBUILD tor-0.4.7.12.ebuild 3188 BLAKE2B 948b2ab80d768661c147fe3d214af39b4c50182ad9a6656f2e3f44d2c069411579526ced7e149128c56fd0d979d6061726c0fc6315991c02de1b7469f3b0be22 SHA512 4d706594f7d17e5e77ada92519001c2b9a790e41398f84ebb7fbf7bb2a61eb9ffdd303e9c154c4b304fab185429d2a37e14177b236ef1865a514c5085e702f2e
 MISC metadata.xml 550 BLAKE2B 483cfc846fb5d2996ca0b1b947df203a3470c8ea4a9ed655ce7c40b6ee3bde22d9fc41945c1fda79bfd2f5d91c6c7886e8b3fa1b6f385c802722ddba927980be SHA512 85ff349fc58d1e122c8ae0476a6143585190928c1abf0d4b228ad7f2e991e813d19a8b75a89421acfb96fc8c1d73e34be0c1a0ff70c9c68594518047a0de3df9
diff --git a/net-vpn/tor/files/tor-0.4.7.10-strict-prototypes-clang16.patch b/net-vpn/tor/files/tor-0.4.7.10-strict-prototypes-clang16.patch
deleted file mode 100644
index 9317b6b215b7..000000000000
--- a/net-vpn/tor/files/tor-0.4.7.10-strict-prototypes-clang16.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-https://gitlab.torproject.org/tpo/core/tor/-/commit/ee38514cc4372bfb7d01ee96a1110d600a30e061
-
-From ee38514cc4372bfb7d01ee96a1110d600a30e061 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 8 Nov 2022 06:42:59 +0000
-Subject: [PATCH] build: fix -Wstrict-prototypes (Clang 16)
-
-Clang 16 warns on -Wstrict-prototypes in preparation for C23 which can
-among other things, lead to some configure tests silently failing/returning the wrong result.
-
-Fixes this error:
-```
--ignoreme: warning: a function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes]
-+ignoreme: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
- main ()
-```
-
-For more information, see LWN.net [0] or LLVM's Discourse [1], gentoo-dev@ [2],
-or the (new) c-std-porting mailing list [3].
-
-[0] https://lwn.net/Articles/913505/
-[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
-[2] https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240
-[3] hosted at lists.linux.dev.
-
-Bug: https://bugs.gentoo.org/879747
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -1982,7 +1982,7 @@ AC_CACHE_CHECK([whether memset(0) sets pointers to NULL], tor_cv_null_is_zero,
- #ifdef HAVE_STDDEF_H
- #include <stddef.h>
- #endif
--int main () { char *p1,*p2; p1=NULL; memset(&p2,0,sizeof(p2));
-+int main (void) { char *p1,*p2; p1=NULL; memset(&p2,0,sizeof(p2));
- return memcmp(&p1,&p2,sizeof(char*))?1:0; }]])],
-        [tor_cv_null_is_zero=yes],
-        [tor_cv_null_is_zero=no],
-@@ -2006,7 +2006,7 @@ AC_CACHE_CHECK([whether memset(0) sets doubles to 0.0], tor_cv_dbl0_is_zero,
- #ifdef HAVE_STDDEF_H
- #include <stddef.h>
- #endif
--int main () { double d1,d2; d1=0; memset(&d2,0,sizeof(d2));
-+int main (void) { double d1,d2; d1=0; memset(&d2,0,sizeof(d2));
- return memcmp(&d1,&d2,sizeof(d1))?1:0; }]])],
-        [tor_cv_dbl0_is_zero=yes],
-        [tor_cv_dbl0_is_zero=no],
-@@ -2031,7 +2031,7 @@ AC_CACHE_CHECK([whether we can malloc(0) safely.], tor_cv_malloc_zero_works,
- #ifdef HAVE_STDDEF_H
- #include <stddef.h>
- #endif
--int main () { return malloc(0)?0:1; }]])],
-+int main (void) { return malloc(0)?0:1; }]])],
-        [tor_cv_malloc_zero_works=yes],
-        [tor_cv_malloc_zero_works=no],
-        [tor_cv_malloc_zero_works=cross])])
-@@ -2049,7 +2049,7 @@ fi
- # whether we seem to be in a 2s-complement world.
- AC_CACHE_CHECK([whether we are using 2s-complement arithmetic], tor_cv_twos_complement,
- [AC_RUN_IFELSE([AC_LANG_SOURCE(
--[[int main () { int problem = ((-99) != (~99)+1);
-+[[int main (void) { int problem = ((-99) != (~99)+1);
- return problem ? 1 : 0; }]])],
-        [tor_cv_twos_complement=yes],
-        [tor_cv_twos_complement=no],
-@@ -2069,7 +2069,7 @@ fi
- # What does shifting a negative value do?
- AC_CACHE_CHECK([whether right-shift on negative values does sign-extension], tor_cv_sign_extend,
- [AC_RUN_IFELSE([AC_LANG_SOURCE(
--[[int main () { int okay = (-60 >> 8) == -1; return okay ? 0 : 1; }]])],
-+[[int main (void) { int okay = (-60 >> 8) == -1; return okay ? 0 : 1; }]])],
-        [tor_cv_sign_extend=yes],
-        [tor_cv_sign_extend=no],
-        [tor_cv_sign_extend=cross])])
-GitLab
diff --git a/net-vpn/tor/tor-0.4.7.10-r1.ebuild b/net-vpn/tor/tor-0.4.7.10-r1.ebuild
deleted file mode 100644
index 219a9712b0bd..000000000000
--- a/net-vpn/tor/tor-0.4.7.10-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-any-r1 readme.gentoo-r1 systemd verify-sig
-
-MY_PV="$(ver_rs 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="https://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
-	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz
-	verify-sig? (
-		https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum
-		https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum.asc
-	)"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
-fi
-IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
-RESTRICT="!test? ( test )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
-
-BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20220216 )"
-DEPEND="
-	dev-libs/libevent:=[ssl]
-	sys-libs/zlib
-	caps? ( sys-libs/libcap )
-	man? ( app-text/asciidoc )
-	dev-libs/openssl:0=[-bindist(-)]
-	lzma? ( app-arch/xz-utils )
-	scrypt? ( app-crypt/libscrypt )
-	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
-	systemd? ( sys-apps/systemd )
-	zstd? ( app-arch/zstd )"
-RDEPEND="
-	acct-user/tor
-	acct-group/tor
-	${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-# bug #764260
-DEPEND+="
-	test? (
-		${DEPEND}
-		${PYTHON_DEPS}
-	)"
-
-DOCS=()
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-	"${FILESDIR}"/${P}-strict-prototypes-clang16.patch
-)
-
-# EAPI 8 tries to append it but it doesn't exist here
-# bug #831311 etc
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_detached ${MY_PF}.tar.gz.sha256sum{,.asc}
-		verify-sig_verify_unsigned_checksums \
-			${MY_PF}.tar.gz.sha256sum sha256 ${MY_PF}.tar.gz
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-src_configure() {
-	use doc && DOCS+=( README.md ChangeLog ReleaseNotes doc/HACKING )
-	export ac_cv_lib_cap_cap_init=$(usex caps)
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--disable-all-bugs-are-fatal \
-		--enable-system-torrc \
-		--disable-android \
-		--disable-html-manual \
-		--disable-libfuzzer \
-		--enable-missing-doc-warnings \
-		--disable-module-dirauth \
-		--enable-pic \
-		--disable-restart-debugging \
-		--disable-zstd-advanced-apis  \
-		$(use_enable man asciidoc) \
-		$(use_enable man manpage) \
-		$(use_enable lzma) \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(use_enable server module-relay) \
-		$(use_enable systemd) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable test unittests) \
-		$(use_enable test coverage) \
-		$(use_enable zstd)
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r9 tor
-	systemd_dounit "${FILESDIR}"/tor.service
-
-	keepdir /var/lib/tor
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r2 torrc
-}
diff --git a/net-vpn/vtun/Manifest b/net-vpn/vtun/Manifest
index b6612b5a404f..7cbdb094b077 100644
--- a/net-vpn/vtun/Manifest
+++ b/net-vpn/vtun/Manifest
@@ -2,9 +2,9 @@ AUX vtun-3.0.2-remove-config-presence-check.patch 440 BLAKE2B 06c5d806e03aa0a3ab
 AUX vtun-3.0.3-C99-inline.patch 1351 BLAKE2B b693e76957e22c8433e8f731b1ac52997c174be05e94c4001bf81e9e4d2e78edfe2bb4bc5a1133da11165bd55913d091f58fbe214b7cdcc0d0d00b053e90c684 SHA512 2a930a4a070d21407a74968d16faa2158ac30af40003100876452577affdca04b4916594d684d2346f660fd1165b92856be4815c24b9c56e72bb5d4b41ff40c6
 AUX vtun-3.0.3-fno-common.patch 509 BLAKE2B 25610e7e6acc5ec2af0ab4add1e749ef7212edf405d3c1f0acdf6a72357ccee267c14002774e2d5818ced52745e6f11f7ee45fad83a98e4e3dad65170f9fe66c SHA512 ad8921aabd3a0a9da002ad10aae07c90df8394ab93bfa7eeeb347e93de14a52bebab0326061728a5331f777076d9038064359f2fd2a5b37c8292ff51ce4ac485
 AUX vtun-3.0.3-gcc5.patch 348 BLAKE2B c92930137debd4fc6883e0e71f072b4e2957cd3c188a092be160d9e8bccca3416dc9b8cfd404f35747782755bc6de6cdfb63ccab9592f4ed926f8c51e7adcdff SHA512 e619b623599a722bf9e9cd44682800eaafd8fd097308fce1a3c062a8d4b68363662c46598c2a47e6c846077a6686a2169608bb3d0073fc49d7054297bf6cc917
-AUX vtun-3.0.3-includes.patch 1316 BLAKE2B 9c76d59d1585acb614f7ee0d632bbc03823630913716035613239abc3317bf7271452ea7baef0e0dee312f19986f6844725534241232495d2c5ad9964b00ab74 SHA512 352f050f997eb3d749291f6c3e55138f5a6caa15fdce142c884766812fd62b2981dab24f0cc2376e8d192755ed419a809473ba2fe090ab6758415ca9a899195a
+AUX vtun-3.0.3-includes.patch 1694 BLAKE2B 9e51814c3584b9e4f5817dab6b06422f94972414249c6dcfbe724656c019b86a18f269c0ded042867a5d54d7a0725aa0ff92e5e9ee5c45f622ef33dbb5802fbf SHA512 c5e5fdda6ae4d4ca850dba46132732dd9290535c7d94400bcb988e7602bb22f76463652f1df2886e01cfb3836448cd32fbd6c2bce3139a14f8378fa881a77efe
 AUX vtun-3.0.4-autoconf-fork-not-working.patch 300 BLAKE2B 12db3576c0575af1ff6198a60c40c7c3dfab6317472e7552b7afb3a5f73f3ea0a7c3b77d29f058c57311daee3660257844906e7bada166e3b1e7752b4e8b190e SHA512 b2af31b137ea365a094730e3f0cf77824f0bf8c0a533c0af25c8d86ac6a2607fe842e76bd9cb0d818eea7373489fc2649235faa2ad1d7ff4f47c35cd710b3e16
-AUX vtun-3.0.4-includes.patch 970 BLAKE2B a39bc50134e237d0b3308942e2e3301719410b093f480165e7133112bd094f8225044b6ca8f7734b633dae9696c6f507a62580b77e2daeebef5f561cb4aa6803 SHA512 f7811fc35531b8d24f4829aea798bb9fdfa86c2b3d634eef188146f12f9339417f80091f810630f4decdbb928a0ae85dc76798c76661e6fc734dc75f4bc2737f
+AUX vtun-3.0.4-includes.patch 1577 BLAKE2B 7f5eceeb032eb0c9150376f3fe9e2d5adbf36eba5fe113d899b12130e6050a698fff71695781b1df355d53642d60c6a8231382b4c09c69ee47a9d87651dc7e8a SHA512 f576f0ba6ed6302aacf8a3af6d261ce67af5dd484f1d4f1eaf062f89fb56a68db1a66ca543710aae856c4d256601f8e93fe4e3d48065aa304b5f4e8724697e43
 AUX vtun-3.0.4-libssl-ctx.patch 8088 BLAKE2B 5cbc357cc445b189885cb062b85dbc86a24d2418c0a378daff72813d6b1c63d573a831d9d362f57cd541e30f49d6ee42951fc9702b8c2eb2848665c4a6bf785c SHA512 f67105188b0e757904cea480b22778b26a20bba650a27674f1312c58bafe95383a9f14df74004fd5f119ce9ed3df189ae64e1ca051ac73b713c4c03088326be1
 AUX vtun-3.0.4-naughty-inlines.patch 688 BLAKE2B e0ea216161f6c6f106109382cdfdebecc69ebdbd11ea2997ecf05fea04564c0f7a37b76302a01a3507d80fcaf09e3b503a49e1df4cd94871a3532cffd237e463 SHA512 36be4de6b507d5737e2c5757ee004f081dcda63e59d37aa1404b6bbbcd6ca62fd9856799dcec751a51f1027c1ed0f8221e0407f00853de960b78753be2aff8ed
 AUX vtun-libssl-1.1.patch 8162 BLAKE2B bc72068291b6f790e8a8bb7ecf51c6d7f5e6bb13a544fd557202c4244b3a2397b23982102f608124cf6e31bd399b9ef298b1ce90bf41ea23273099932b0011f5 SHA512 db4d6d8d929994593fd447a9b837b560a7774bdcf5241aade136dc6fb3f1effb0032813d2374a40945c85979059a8643465be3a49ba2bcd18d13d208627eba2f
@@ -12,6 +12,6 @@ AUX vtun.rc 669 BLAKE2B beb4f78d4a4c8a83ea7d102a9c508125cf0942081aebeb0d6196fa8a
 AUX vtund-start.conf 1174 BLAKE2B 3bce3aa808286c554accb71876314bbe8ecbd5e02b16b804f911201a0fbfd8fae25f9f6a702d2de4ef5254d50661d9d1c578f5d6b7e9dcec5b92ebe8b4724007 SHA512 7ec2a8f64380483b8e311bbefb78675a457e27088888e654f8c5fee5f14a77a72f1319b9c7e2dd38763c86728e4f44d6eb87c286103e547e19f329f1550e6710
 DIST vtun-3.0.3.tar.gz 130051 BLAKE2B 9bbc11724fb75acd024fda8b4e84af425c5377b3d8a938f7e789ecb1c2cdb95f109a1edc59f3fcbd2c5898bd17be76054060e8e36a1fb4355b40b61cc64adaad SHA512 5fa789d08b556f97492b89515a89c2322c4b0a8fa95bd1035f5ed19061b3654a6a36a9911792096ac872ae9ae5451848cab87d0343dc0ffc064affea1f7d0d54
 DIST vtun-3.0.4.tar.gz 132691 BLAKE2B 040c3c66074a1ebdd8a2f32c988b7f4d9423d248ad1259456cd8cdbe0b9adbbaca4cd1e1a4e8c4e6a936a221a9443c099d5d8a219f830925f220bc09e5e7feae SHA512 b1bb7294bd745c2ca888704e2b0f8e05447b5e01bec0f921648afe363d61a19508dea9e26663993cd69c506aa92621e76f36045bddf7c3723d13a72741ca6781
-EBUILD vtun-3.0.3-r2.ebuild 1544 BLAKE2B 2794ab671fa0ff86dbd88f990839dc8ee8e7804ed77421d4657572fe9a65588e884e6c83c6afae53ab7634cb0a85e3eaf4c1e131985b4c0b9954a7681572afbc SHA512 63b86c9d9807084cdc167489bcbe99247a8ca05ac0c8fc1bda169476364439eb5f4729c32830a7a00952ca29e50b1e8d52631667aacd75f3538eaef5e3830dcf
-EBUILD vtun-3.0.4.ebuild 1322 BLAKE2B c4c3d3732beba92d2993d9a0ac854e93d4410539f4ea69428a2b69fc53f6f2958a28c9c5f59e27f55aa5720f17e22c45fad99f666b0d891860e0d71a4d830bb0 SHA512 3da545f128f31d05646b99854ace0d56fa462e3785eb938c5ca2ce02b4f8203bc639524df56198834d099e9e5f33e350e973025cbdd1cdd8a93b9c2502216575
+EBUILD vtun-3.0.3-r3.ebuild 1561 BLAKE2B 06548a23927d550db3a0bb64d2f7092c14fa93858172d503ad0ea65befd920f5394658aabb0fe4a23800321ac98101be17aa13fe50445f06487a088e8b8a03d4 SHA512 9a1a0dee7144a7db14611d7f16ea2e2d997e1b808de0f7372d598b4222ef49bb6bec2de7465a06db4a9972f1ff717487304ded7f857c3ca9c215aeffe2f6dd28
+EBUILD vtun-3.0.4-r1.ebuild 1339 BLAKE2B b5233e22b30bfec4e9a8c520daaff2adc1c1b397744d8358071095d2b497600120d03b7b0ba9a04bc20af4bc28da865b5b8aa82b04c800b41b586a186b14640a SHA512 9ae3803f6c6ae25041d48e6d6d3b011e652b05555cab843edc771e5535b0f2dace18e3ea6b9ee952d86fd0a4d2005ee688dbbc8b2db64204a7c38bfa967e3e1f
 MISC metadata.xml 242 BLAKE2B 74d13684461c03caae9e00b295b675b72449f248f4ce4b0d74b975c13cd96ab3349c3a4e0cd728a343c9173d442c74367dd67592a3a099ebe142d1f27de1e499 SHA512 dcba2b9a055c4e512e46a2ed4b5a846a0fb4d87e934a037b6464d7c84a5840114702d07aff5093b9ccf2739dbf349fdeb7213e719dcc332eb745b498f4966656
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 <sys/types.h>
  #include <signal.h>
  #include <errno.h>
 +#include <unistd.h> /* read(), write() */
++#include <bsd/unistd.h> /* setproctitle(), see man libbsd(7) */
  
  #ifdef HAVE_LIBUTIL_H
  #include <libutil.h>
+@@ -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 <sys/types.h>
  #include <signal.h>
  #include <errno.h>
 +#include <unistd.h> /* read(), write() */
++#include <bsd/unistd.h> /* setproctitle(), see man libbsd(7) */
  
  #ifdef HAVE_LIBUTIL_H
  #include <libutil.h>
+@@ -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 <unistd.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
+
diff --git a/net-vpn/vtun/vtun-3.0.3-r2.ebuild b/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
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"