gentoo auto-resync : 29:05:2023 - 03:16:09

5 files changed, 159 insertions, 1 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 3c3730c91da5..836d97ca5d28 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 4fa5f0c2ad76..05e7995ec772 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -4,7 +4,8 @@ AUX ppp-2.4.9-fix-MPPE-sstpc.patch 1008 BLAKE2B 255ac4374ef4845220c8c0709a0582fb
 AUX ppp-2.4.9-fix-clang-nested-functions.patch 2439 BLAKE2B 834d675ebcb4a3af7350d4206c546b89c92f914931db81e07e7997196d86dee6703260e9c603819d6fb72aec518dc5dbcc240f2a074043837d8d17356a483da3 SHA512 0d8faec40b0d3ea1a96a66bb4d96d129c7c0af14e76c222fc997c2eebeba80918a1681929a844d0d17713f124b862364ca1bf7cd70d2d7be46fb37458b3fb62d
 AUX ppp-2.4.9-fix-openssl-sysroot-clang.patch 377 BLAKE2B 9919669d6707394600c2b04f49dab212e220549395f34c52f641e6a87c2133eeaad00992fca5c3a9d84f60d7c17f1078aab78b8579906c93ee5cad4264a2569b SHA512 d816cbf65f1845851f8bd673fbe374987afbe6e3c0eb425455d0cc7269e96f5315caf1e38c320121650b088621c099c36f6b1c8d80ada0dbff07ab4e8151d42b
 AUX ppp-2.4.9-pppol2tp-ipv6.patch 1008 BLAKE2B 7c4ad1ce6ba6277c1d0fa8afa7491bdc3f0afba450c3d2ade39a9d0b555dd35e578abc5df24f7b0b011634bc020292ad6b2510ffbc8f03b1e3eabbf37cdb6e20 SHA512 071ef66e5ab9e08037100f2d6cdbdc452ea30d4a2241ef2abc2a7acc23ce21a5f90e5753a4790af5ed8e21baf976010a340ac4d4368adb8a9f5b42d52b519702
-AUX ppp-2.5.0-passwordfd-read-early.patch 2378 BLAKE2B 87ee9ecbf323d751354e0d82553b4ce01e664d76cb60cd722b498483aeaaf48ae23238b1960f4324bd2147e80a64704cea6440e5b093b37d8aec7f5fd6a8bccd SHA512 b4d5154fe7c36f34684dc1ee347dbc1d90b00e7b87727029c6097a48036347242d82ab1940ee9a0a68f1ad42a723e2bef1597e7ee038c8dd78a11948605f6579
+AUX ppp-2.5.0-passwordfd-read-early.patch 2423 BLAKE2B e0393149fcd0468be000ab125c8318a4f295c5343525b1cad17ec8eb4f87b2b759bdb898bf1fc56304ed6f06418f1536e15209df18dfe719ff9865a3ff3f02c6 SHA512 52fc5d0e7f2540c7eb01101cd8e10abd5b0eaacde007b3480c27136d439527c70c568f63139590d00cab5450edfa1a63d06b7aac078f7d4ed9d0cddad106bc66
+AUX ppp-2.5.0-pidfile.patch 1257 BLAKE2B 220ada7acaf45c2cd614d2ce8883fb91c282d18a729e871316dae5209b8c97a5a7990e7c673a7ca80dd8a8116782eb46efcd94ee4d27c111b839750fd0be9d0a SHA512 cedce4514bd055b5c0600c012b87312d30f24e086750d81d218db2eb5a8a509904de99f5e1cfa7fd018533cdd45ebbe86ebbdfdfda8fa8109128ae857f3e38ec
 AUX pppd.tmpfiles 45 BLAKE2B 00daff2cb2f359640b41f8e13b08817754fa77e7a743910fb3e3cf100fffc77ea8bc38739c90123ac6bf44b417f25feedd0b2e2c91ead98b7affb7c92d22eed9 SHA512 8cb2aef7c17481f891cef981d47aceb879bbc64fe0766d193f23824484299414f0a576c45215ceaea18d39291b5ffe4c80aa4c00f0c68d88aeb924ace2ad5a8c
 DIST ppp-2.4.9-patches-03.tar.xz 18520 BLAKE2B b3da095672fa57727ba11a5dba761ea3f24ee330f27252f0379dab5761d5381809176faafed86d97a6b89cc8a4cb958baa07f4900e22fe6e76b6c852e0703f0c SHA512 9a035acf1915225340c12e6242f0c5db399b5f5970888d7f1799a5f125cf97b95d9fcb8c9aa2f6bd56c1544d2b10585f772d4fc1025002e3e8403011e3d2c029
 DIST ppp-2.4.9.tar.gz 719904 BLAKE2B 7ba3eb8c98fec5599635dbd302399617e1075f3a1df090f1a94ce2bb8a5c7631e6eea82246adc33711aba5fe95e7ba7c982e2cbf1fb0d71e45f877d9b092ffb7 SHA512 c309f8f69f534c05547cd2f66dade0e0f198ea4c2928a7e899e660280786b3e965437a67b8c5bb81c59d0fa1818b4eb7b701d2dce015a420d380422d2bca4e1a
@@ -13,4 +14,5 @@ DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d
 DIST pppgetpass.8 450 BLAKE2B 4e9805cfecb4d07c302682c1ced42cc5d247d18fae904b909e126874af962cf48bb703cd75b0cefce4e19404f2e757602d3b57f187567fc23d4b93d9598d1486 SHA512 21f6dda908cf73ee27bfa39d2b50e7f76b371e50bd7d5a0586174b30129c119accbd260d7f9e0e6aa6aabfa5ba11a13ba560588a99672c9dd4e9f33254f88836
 EBUILD ppp-2.4.9-r9.ebuild 7866 BLAKE2B e2f6012eb93f27271c775b75fa52e0d1307adee4afdcb09bf8ae78e1ddefe451bd7782c4f5412ef264366c8db4e20bb3621c4c032c1261166c70473a94552880 SHA512 a3931bedeac10a6facc0fe354eee0e26e6c237f21f9e4d69196d657d388d1624e4bf8054c670568c0ba689d859bca87a21410da08f35baf33fc12d39cfe2263e
 EBUILD ppp-2.5.0-r2.ebuild 3452 BLAKE2B 59ae8469e5a95a2c68364a7a487e45e9e101cb342456e7a60c4abcb5db0e4f5207a2227a88ad9ae6438f1c655668294e58a9d8c821e52b03dc9e2a0200ba29d8 SHA512 bad4912c44bde1a66351d8e17e0c48cf6c1e0b800f6205e107ee78b49a84fc24bbe98356c0dffbd59af81abd08e0571d113aad50e4864fc1062a47e58d5effe4
+EBUILD ppp-2.5.0-r3.ebuild 3496 BLAKE2B eee803a066bb088b95e23445fba4876f7bd099c3f63210e454c482f1c4b0c34ccaddb4dd814d4ed625853b803739559a99ff2eaa2dc1c690fb3b5ee54ae1ac2b SHA512 5a6f23e9bc2d5ef3b7dad0136a71b984b9a974c9d09283f0904c003e3982a2af078735a1ab47dc40b8988fdc9c5641f3f11032c0b32423a09bcefc2e38e2a85a
 MISC metadata.xml 1002 BLAKE2B 9ce1dcb685ed4f0d6dfe2e6c885b8feca8d81fd1fea5bde44a40900d65b2f9e9a45bd03f3708d4969c51880bb7ffb791bfbc972d4ec06a3124c4215e2b66424b SHA512 cdfa0b69fab5a530b36093bc84c352da1f8acbdf3d31e2b9a4d58bde7dc7bbbce9c54000d9f874eac2ddcc803bafc89ea2a74b03cac23dca295815ece6cb2157
diff --git a/net-dialup/ppp/files/ppp-2.5.0-passwordfd-read-early.patch b/net-dialup/ppp/files/ppp-2.5.0-passwordfd-read-early.patch
index 2600a1d85f21..5c7067c5307b 100644
--- a/net-dialup/ppp/files/ppp-2.5.0-passwordfd-read-early.patch
+++ b/net-dialup/ppp/files/ppp-2.5.0-passwordfd-read-early.patch
@@ -1,3 +1,5 @@
+https://github.com/ppp-project/ppp/pull/420
+
 From df35ecb4ab63e8f89f57aa5d593441765a96ed62 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Alin=20N=C4=83stac?= <mrness@gentoo.org>
 Date: Fri, 20 Jun 2008 18:34:06 +0000
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..538ddfb0a2c1
--- /dev/null
+++ b/net-dialup/ppp/files/ppp-2.5.0-pidfile.patch
@@ -0,0 +1,39 @@
+https://github.com/ppp-project/ppp/pull/427
+
+From 0c9f2cb93f56d2a14ffcc97f53f4665b7728d8e4 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+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 <floppym@gentoo.org>
+---
+ 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}
+	!<net-misc/netifrc-0.7.1-r2"
+BDEPEND="virtual/pkgconfig"
+PDEPEND="net-dialup/ppp-scripts"
+
+PATCHES=(
+	"${FILESDIR}"/ppp-2.5.0-passwordfd-read-early.patch
+	"${FILESDIR}"/ppp-2.5.0-pidfile.patch
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
+	local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
+	local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline"
+	ERROR_PPP_ASYNC+=" (optional, but highly recommended)"
+	local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline"
+	WARNING_PPP_SYNC_TTY+=" (optional; used by 'sync' pppd option)"
+	if use activefilter ; then
+		CONFIG_CHECK+=" ~PPP_FILTER"
+		local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
+	fi
+	CONFIG_CHECK+=" ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
+	local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
+	local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
+	local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
+	CONFIG_CHECK+=" ~PPPOE ~PACKET"
+	local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by pppoe plugin)"
+	local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by pppoe plugin)"
+	if use atm ; then
+		CONFIG_CHECK+=" ~PPPOATM"
+		local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_configure() {
+	local args=(
+		--localstatedir="${EPREFIX}"/var
+		--runstatedir="${EPREFIX}"/run
+		$(use_enable systemd)
+		$(use_with atm)
+		$(use_with pam)
+		$(use_with activefilter pcap)
+		$(use_with gtk)
+		--enable-cbcp
+	)
+	econf "${args[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	if use pam; then
+		pamd_mimic_system ppp auth account session
+	fi
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}/modules.ppp" ppp.conf
+
+	dosbin scripts/p{on,off,log}
+	doman scripts/pon.1
+	dosym pon.1 /usr/share/man/man1/poff.1
+	dosym pon.1 /usr/share/man/man1/plog.1
+
+	# Adding misc. specialized scripts to doc dir
+	dodoc -r scripts
+
+	if use gtk ; then
+		dosbin contrib/pppgetpass/pppgetpass.{gtk,vt}
+		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
+	else
+		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
+	fi
+
+	newtmpfiles "${FILESDIR}/pppd.tmpfiles" pppd.conf
+
+	# Missing from upstream tarball
+	# https://github.com/ppp-project/ppp/pull/412
+	#doman contrib/pppgetpass/pppgetpass.8
+	doman "${DISTDIR}/pppgetpass.8"
+}
+
+pkg_postinst() {
+	tmpfiles_process pppd.conf
+}