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 12E7615ACFB for ; Fri, 28 Apr 2023 20:52:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4836EE0837; Fri, 28 Apr 2023 20:52:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 E1AD8E0837 for ; Fri, 28 Apr 2023 20:52:02 +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 CF2CD340BD3 for ; Fri, 28 Apr 2023 20:52:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D288A40 for ; Fri, 28 Apr 2023 20:52:00 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1682715035.ba13e6934df6244c76a02674ae55c81af2716c5d.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/pptpd/files/, net-vpn/pptpd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/pptpd/files/pptpd-1.4.0-ppp-2.5.0.patch net-vpn/pptpd/pptpd-1.4.0-r3.ebuild X-VCS-Directories: net-vpn/pptpd/files/ net-vpn/pptpd/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: ba13e6934df6244c76a02674ae55c81af2716c5d X-VCS-Branch: master Date: Fri, 28 Apr 2023 20:52:00 +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: 8bfeb420-6431-4f07-b561-7b7dea4b3c0a X-Archives-Hash: e28e0dae538403190f190daf8c1a2359 commit: ba13e6934df6244c76a02674ae55c81af2716c5d Author: Mike Gilbert gentoo org> AuthorDate: Fri Apr 28 20:50:35 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Fri Apr 28 20:50:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba13e693 net-vpn/pptpd: fix build with ppp-2.5.0 Closes: https://bugs.gentoo.org/904877 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/pptpd/files/pptpd-1.4.0-ppp-2.5.0.patch | 83 +++++++++++++++++++++++++ net-vpn/pptpd/pptpd-1.4.0-r3.ebuild | 29 +++++---- 2 files changed, 97 insertions(+), 15 deletions(-) diff --git a/net-vpn/pptpd/files/pptpd-1.4.0-ppp-2.5.0.patch b/net-vpn/pptpd/files/pptpd-1.4.0-ppp-2.5.0.patch new file mode 100644 index 000000000000..b3525052a873 --- /dev/null +++ b/net-vpn/pptpd/files/pptpd-1.4.0-ppp-2.5.0.patch @@ -0,0 +1,83 @@ +https://bugs.gentoo.org/904877 + +From ea207b89c61e3a201155b973307ee45413f0d058 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Fri, 28 Apr 2023 16:37:44 -0400 +Subject: [PATCH] pptp-logwtmp: update for ppp-2.5.0 + +Signed-off-by: Mike Gilbert +--- + plugins/pptpd-logwtmp.c | 25 +++++++++++++++---------- + 1 file changed, 15 insertions(+), 10 deletions(-) + +diff --git a/plugins/pptpd-logwtmp.c b/plugins/pptpd-logwtmp.c +index ac5ecc2..457bbce 100644 +--- a/plugins/pptpd-logwtmp.c ++++ b/plugins/pptpd-logwtmp.c +@@ -12,14 +12,16 @@ + #include + #include + #include ++#include + #include ++#include + +-char pppd_version[] = VERSION; ++char pppd_version[] = PPPD_VERSION; + + static char pptpd_original_ip[PATH_MAX+1]; + static bool pptpd_logwtmp_strip_domain = 0; + +-static option_t options[] = { ++static struct option options[] = { + { "pptpd-original-ip", o_string, pptpd_original_ip, + "Original IP address of the PPTP connection", + OPT_STATIC, NULL, PATH_MAX }, +@@ -28,7 +30,7 @@ static option_t options[] = { + { NULL } + }; + +-static char *reduce(char *user) ++static const char *reduce(const char *user) + { + char *sep; + if (!pptpd_logwtmp_strip_domain) return user; +@@ -42,8 +44,10 @@ static char *reduce(char *user) + + static void ip_up(void *opaque, int arg) + { +- char *user = reduce(peer_authname); +- if (debug) ++ const char *peer_authname = ppp_peer_authname(NULL, 0); ++ const char *user = reduce(peer_authname); ++ const char *ifname = ppp_ifname(); ++ if (debug_on()) + notice("pptpd-logwtmp.so ip-up %s %s %s", ifname, user, + pptpd_original_ip); + logwtmp(ifname, user, pptpd_original_ip); +@@ -51,16 +55,17 @@ static void ip_up(void *opaque, int arg) + + static void ip_down(void *opaque, int arg) + { +- if (debug) ++ const char *ifname = ppp_ifname(); ++ if (debug_on()) + notice("pptpd-logwtmp.so ip-down %s", ifname); + logwtmp(ifname, "", ""); + } + + void plugin_init(void) + { +- add_options(options); +- add_notifier(&ip_up_notifier, ip_up, NULL); +- add_notifier(&ip_down_notifier, ip_down, NULL); +- if (debug) ++ ppp_add_options(options); ++ ppp_add_notify(NF_IP_UP, ip_up, NULL); ++ ppp_add_notify(NF_IP_DOWN, ip_down, NULL); ++ if (debug_on()) + notice("pptpd-logwtmp: $Version$"); + } +-- +2.40.1 + diff --git a/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild b/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild index 227b7be9450d..3a013c769e13 100644 --- a/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild +++ b/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild @@ -14,28 +14,14 @@ LICENSE="GPL-2" KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" IUSE="gre-extreme-debug tcpd" -RDEPEND="=net-dialup/ppp-2.5.0"; then + # https://bugs.gentoo.org/904877 + PATCHES+=( "${FILESDIR}/${P}-ppp-2.5.0.patch" ) + fi + # Call to default src_prepare to apply patches default