gentoo auto-resync : 29:04:2023 - 11:14:33

5 files changed, 10 insertions, 116 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 3f17b604aaec..428007aa5f7e 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 486542087833..4d5f2af0270b 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -5,12 +5,12 @@ AUX ppp-2.4.9-fix-clang-nested-functions.patch 2439 BLAKE2B 834d675ebcb4a3af7350
 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 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
 DIST ppp-2.5.0.tar.gz 1170057 BLAKE2B 6a0e9efcbff3cb499705071cc7d0e3411cf4871fd53b2bfedbb1f2cf3ad80728eb436050cf33b78e36d473be64f15907a21da17f283337455f0af379bc18272d SHA512 094368ea2aa6c6e8dfba4443509857a7c1c7ff839bb6d6657743802477208c01e87db31593cef0932d3725c640e9c103179da6b742825034cda82bd31ddcc2ed
 DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
 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-r1.ebuild 3609 BLAKE2B e82df99ebf6251ee7bb9c36742dd1af2dea33fc6c8c576957c90132cee50903bc455e717cf63b300b58a1b0cf1bb1bbd15560a698a0d70c32e73f3d3129f6770 SHA512 d70d31fb0a9de16c1056d28795e6099c14612c77ecb0854b45d70846b5d8331c66551e8a870291271f9f7114cbf920b8ec716ad7842965d4eacfdbc761e458a0
-EBUILD ppp-2.5.0.ebuild 3543 BLAKE2B b91503648960cd9ab19883bf816a9bf9a635cdd92aad0c3fcf5e5cef91f3ef061a76e5bf3ccf685af051fa1ebf64615aeaa6b379200b24c94e6c0add4a82c7eb SHA512 6de778112d7924fde826cc95f5be6dbc7ff2dc3ff9326a59de83d84646fc01197c1542467e493556577f84334dc6af37a0f641d35854f99eabce2d3744adbc38
+EBUILD ppp-2.5.0-r2.ebuild 3700 BLAKE2B 187bc08ef0cb290f599f42409ae3ad9ff10659cbd93fcc729aa3595859bb41148ef4f4973af0aa70f54eee145f5c0a41a5ee8349b494b2f831b336623efb3b6d SHA512 7bd35672c7e06a7752caaa6529dbb0e0f96416747f1cba8c9880a3c7d49a1130f6d1965cb2c06f686f2ffd0b852bab1cc68c757c711ec4295f76796ddfd0c927
 MISC metadata.xml 1002 BLAKE2B 9ce1dcb685ed4f0d6dfe2e6c885b8feca8d81fd1fea5bde44a40900d65b2f9e9a45bd03f3708d4969c51880bb7ffb791bfbc972d4ec06a3124c4215e2b66424b SHA512 cdfa0b69fab5a530b36093bc84c352da1f8acbdf3d31e2b9a4d58bde7dc7bbbce9c54000d9f874eac2ddcc803bafc89ea2a74b03cac23dca295815ece6cb2157
diff --git a/net-dialup/ppp/files/pppd.tmpfiles b/net-dialup/ppp/files/pppd.tmpfiles
new file mode 100644
index 000000000000..81b402e77055
--- /dev/null
+++ b/net-dialup/ppp/files/pppd.tmpfiles
@@ -0,0 +1,2 @@
+d /run/pppd
+L /run/pppd/lock - - - - ../lock
diff --git a/net-dialup/ppp/ppp-2.5.0-r1.ebuild b/net-dialup/ppp/ppp-2.5.0-r2.ebuild
index 9e490709f159..cf06b10cd4b8 100644
--- a/net-dialup/ppp/ppp-2.5.0-r1.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit linux-info pam
+inherit linux-info pam tmpfiles
 
 PATCH_TARBALL_NAME="${PN}-2.4.9-patches-03"
 DESCRIPTION="Point-to-Point Protocol (PPP)"
@@ -79,6 +79,9 @@ src_install() {
 	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
@@ -86,6 +89,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process pppd.conf
+
 	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"
diff --git a/net-dialup/ppp/ppp-2.5.0.ebuild b/net-dialup/ppp/ppp-2.5.0.ebuild
deleted file mode 100644
index bae82377db29..000000000000
--- a/net-dialup/ppp/ppp-2.5.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info pam
-
-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"
-
-pkg_setup() {
-	# Avoid 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
-	# Missing from upstream tarball
-	# https://github.com/ppp-project/ppp/pull/412
-	#doman contrib/pppgetpass/pppgetpass.8
-	doman "${DISTDIR}/pppgetpass.8"
-}
-
-pkg_postinst() {
-	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
-
-	echo
-	elog "pon, poff and plog scripts have been supplied for experienced users."
-	elog "Users needing particular scripts (ssh,rsh,etc.) should check out the"
-	elog "/usr/share/doc/${PF}/scripts directory."
-}