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 F20B815806E for ; Sun, 28 May 2023 21:25:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 351A4E0858; Sun, 28 May 2023 21:25:59 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 171FDE0858 for ; Sun, 28 May 2023 21:25:59 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16012340E19 for ; Sun, 28 May 2023 21:25:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A9437A58 for ; Sun, 28 May 2023 21:25:56 +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: <1685309154.fdeaefbbdb36dfdf8bd040fb3f11fd99bea5136e.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/, net-dialup/ppp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dialup/ppp/files/ppp-2.5.0-pidfile.patch net-dialup/ppp/ppp-2.5.0-r3.ebuild X-VCS-Directories: net-dialup/ppp/ net-dialup/ppp/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: fdeaefbbdb36dfdf8bd040fb3f11fd99bea5136e X-VCS-Branch: master Date: Sun, 28 May 2023 21:25:56 +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: ebc9ce31-3f29-4e60-b5be-719f23d7f6da X-Archives-Hash: 73899aae90f738259180c95b9e25c51e commit: fdeaefbbdb36dfdf8bd040fb3f11fd99bea5136e Author: Mike Gilbert gentoo org> AuthorDate: Sun May 28 21:16:18 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun May 28 21:25:54 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdeaefbb net-dialup/ppp: fix pidfile path Bug: https://bugs.gentoo.org/907311 Signed-off-by: Mike Gilbert gentoo.org> net-dialup/ppp/files/ppp-2.5.0-pidfile.patch | 37 +++++++++ net-dialup/ppp/ppp-2.5.0-r3.ebuild | 115 +++++++++++++++++++++++++++ 2 files changed, 152 insertions(+) diff --git a/net-dialup/ppp/files/ppp-2.5.0-pidfile.patch b/net-dialup/ppp/files/ppp-2.5.0-pidfile.patch new file mode 100644 index 000000000000..0196dff2929f --- /dev/null +++ b/net-dialup/ppp/files/ppp-2.5.0-pidfile.patch @@ -0,0 +1,37 @@ +From 0c9f2cb93f56d2a14ffcc97f53f4665b7728d8e4 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sun, 28 May 2023 17:01:12 -0400 +Subject: [PATCH] Ensure there is a '/' between PPP_PATH_VARRUN and the PID + filename + +Bug: https://bugs.gentoo.org/907311 +Signed-off-by: Mike Gilbert +--- + pppd/main.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pppd/main.c b/pppd/main.c +index 4455199..c207d10 100644 +--- a/pppd/main.c ++++ b/pppd/main.c +@@ -888,7 +888,7 @@ create_pidfile(int pid) + { + FILE *pidfile; + +- slprintf(pidfilename, sizeof(pidfilename), "%s%s.pid", ++ slprintf(pidfilename, sizeof(pidfilename), "%s/%s.pid", + PPP_PATH_VARRUN, ifname); + if ((pidfile = fopen(pidfilename, "w")) != NULL) { + fprintf(pidfile, "%d\n", pid); +@@ -907,7 +907,7 @@ create_linkpidfile(int pid) + if (linkname[0] == 0) + return; + ppp_script_setenv("LINKNAME", linkname, 1); +- slprintf(linkpidfile, sizeof(linkpidfile), "%sppp-%s.pid", ++ slprintf(linkpidfile, sizeof(linkpidfile), "%s/ppp-%s.pid", + PPP_PATH_VARRUN, linkname); + if ((pidfile = fopen(linkpidfile, "w")) != NULL) { + fprintf(pidfile, "%d\n", pid); +-- +2.40.1 + diff --git a/net-dialup/ppp/ppp-2.5.0-r3.ebuild b/net-dialup/ppp/ppp-2.5.0-r3.ebuild new file mode 100644 index 000000000000..7dd9216c9f76 --- /dev/null +++ b/net-dialup/ppp/ppp-2.5.0-r3.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info pam tmpfiles + +PATCH_TARBALL_NAME="${PN}-2.4.9-patches-03" +DESCRIPTION="Point-to-Point Protocol (PPP)" +HOMEPAGE="https://ppp.samba.org/" +SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz + https://raw.githubusercontent.com/ppp-project/ppp/${P}/contrib/pppgetpass/pppgetpass.8" + +LICENSE="BSD GPL-2" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="activefilter atm gtk pam systemd" + +DEPEND=" + dev-libs/openssl:0= + virtual/libcrypt:= + activefilter? ( net-libs/libpcap ) + atm? ( net-dialup/linux-atm ) + gtk? ( x11-libs/gtk+:2 ) + pam? ( sys-libs/pam ) + systemd? ( sys-apps/systemd ) +" +RDEPEND="${DEPEND} + !