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

5 files changed, 43 insertions, 9 deletions

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"