From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2B00C158020 for ; Fri, 16 Dec 2022 05:20:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 654D2E0824; Fri, 16 Dec 2022 05:20:45 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4EE32E0824 for ; Fri, 16 Dec 2022 05:20:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 82CFD340E39 for ; Fri, 16 Dec 2022 05:20:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E055B780 for ; Fri, 16 Dec 2022 05:20:42 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1671168005.ca305be17ae525e1b4ed7ba9bf87dba5f9d5c326.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/vtun/files/, net-vpn/vtun/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/vtun/files/vtun-3.0.3-includes.patch net-vpn/vtun/files/vtun-3.0.4-includes.patch net-vpn/vtun/vtun-3.0.3-r2.ebuild net-vpn/vtun/vtun-3.0.3-r3.ebuild net-vpn/vtun/vtun-3.0.4-r1.ebuild net-vpn/vtun/vtun-3.0.4.ebuild X-VCS-Directories: net-vpn/vtun/ net-vpn/vtun/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ca305be17ae525e1b4ed7ba9bf87dba5f9d5c326 X-VCS-Branch: master Date: Fri, 16 Dec 2022 05:20:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ca158fa3-0958-4d61-94db-58f1d37acdf7 X-Archives-Hash: daf22101ac0b3ccec3c830e4a3bba922 commit: ca305be17ae525e1b4ed7ba9bf87dba5f9d5c326 Author: Jan-Espen Oversand radiotube org> AuthorDate: Tue Dec 13 18:31:51 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Dec 16 05:20:05 2022 +0000 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"