gentoo auto-resync : 13:04:2023 - 23:44:17

4 files changed, 63 insertions, 5 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 0477bca17a45..214c490cb858 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index b7c21006f8b9..696ccd6baec0 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -3,11 +3,13 @@ AUX modules.ppp 299 BLAKE2B d5c0dcf135dd0a33288f27c95133d4dc980b84dc62bf8eca5b35
 AUX ppp-2.4.9-fix-MPPE-sstpc.patch 1008 BLAKE2B 255ac4374ef4845220c8c0709a0582fbc9dbb6c423d11b8132607c9bd39517e4e2c830a75ba35b27bba975c245f2e86d08bd9280b4ab0bc184e30db15179118d SHA512 cb16688634e4b6332b728511e0a70f80e7e29fdcc6b0d737745200381cc272daae80ddadd9f5fe4259113453596fd261f52249f80521b63506095a312c5bff33
 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.5.0-add-dhcp-plugin.patch 1014 BLAKE2B 65d8dcbc6419699068c6c19bd34881e96cf070a5349b34a785e2e6da7042dff02b968719b8d52f6f39a8e2b276adfcbcf9fcba7f8c35f21732a176f3c326137f SHA512 ea209cfb0fe66961bb760c23578d408aadebaa3160be20924827aff7925cf9a2cace8a60dab0dd4e089e406edc5374c0a38b558d5a17ce8cbef303fa3f31d59a
 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-dhcp-patches.tar.gz 3653 BLAKE2B 61c8d57a24ea09c03b7db26aec7ec14b31fb4f3829a01e2cf6430e6734a499def490879ea9168e5a1619eb274489ca868b09fe81f16ccdc27a0bbb18a4b00849 SHA512 96030473d1dc541a0abd63ca683eea728c1fe3811d8a2cb3fccef2b0c6fc02c10e1c01b49a05ac66222bf7477c431eeb89d8a6f6223efd3c2ae00bc4524abdf2
 DIST ppp-2.5.0.tar.gz 1170057 BLAKE2B 6a0e9efcbff3cb499705071cc7d0e3411cf4871fd53b2bfedbb1f2cf3ad80728eb436050cf33b78e36d473be64f15907a21da17f283337455f0af379bc18272d SHA512 094368ea2aa6c6e8dfba4443509857a7c1c7ff839bb6d6657743802477208c01e87db31593cef0932d3725c640e9c103179da6b742825034cda82bd31ddcc2ed
 DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
 DIST pppgetpass.8 154398 BLAKE2B 0e74b96df6171b7382874ce08375d0122df2b564ce8c3e8081022c38ef433e22d15ad13a51d553c6e18ee6277d9c67302b50afa59126bf74a6e3dcd1b03a2b2b SHA512 aca33e489d3e78a7accced4d3c33c03d933cf4c0b6607e8a6bbefef202c853248fa85caa36b53b9cbaf8b21ae60bb00fb3f95577418112630dfa6d67ad700359
 EBUILD ppp-2.4.9-r8.ebuild 7819 BLAKE2B 34256667e43c310b5a9abe2ad4e902ba68b6bab142d3b59d17d224c23d7487e113f0f0223b1afb86f48a0f2097f388cca9818db1793ba7c587724105359e1b24 SHA512 edb72438225c88ff9d9ca2b310f08c23e8c92b71e5fe1f0ea2e06a1897b8c924c15d6ebaddf3df85b091c6b67c9c2170d4333a1b76b824c8483bd0689a061b69
-EBUILD ppp-2.5.0.ebuild 3773 BLAKE2B 84fc40254bbb1edcfb11450767c5963a8a27d79737277225b67d9485a0bd6825cbee25cb5647a469bad8ce5f8a0d203460f1436670ceb8b83a9683899458d4c8 SHA512 6b73ad65756c5b67d71c2aa9852c63c47b2bfa09706a6ce8091727edc968b5f9f31ca31658c9a82a9ca4be8a6bc65986b51ca7266c627ed363094d3488762620
+EBUILD ppp-2.5.0.ebuild 4261 BLAKE2B 1d1fc348f55780c3fdcaa1ce05ff5f3b8e8077befe2058466c14f6c241dca83659a7d26799554607d2c7dd9164fba5617413a6ce7a3603dc6904d0c0162cc9da SHA512 9e0bcfe0470a6a54591efe15f52a91e443e6acf1be2b96a884e4621cb65f31809b70615ba5ce54d1a31284c941d2ccd1b322a6f69dd69d7c54af1bfc37d95ada
 MISC metadata.xml 1002 BLAKE2B 9ce1dcb685ed4f0d6dfe2e6c885b8feca8d81fd1fea5bde44a40900d65b2f9e9a45bd03f3708d4969c51880bb7ffb791bfbc972d4ec06a3124c4215e2b66424b SHA512 cdfa0b69fab5a530b36093bc84c352da1f8acbdf3d31e2b9a4d58bde7dc7bbbce9c54000d9f874eac2ddcc803bafc89ea2a74b03cac23dca295815ece6cb2157
diff --git a/net-dialup/ppp/files/ppp-2.5.0-add-dhcp-plugin.patch b/net-dialup/ppp/files/ppp-2.5.0-add-dhcp-plugin.patch
new file mode 100644
index 000000000000..d5ad7a76138c
--- /dev/null
+++ b/net-dialup/ppp/files/ppp-2.5.0-add-dhcp-plugin.patch
@@ -0,0 +1,36 @@
+From de05f72948317b40c19b1c113e18713816010dd9 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 13 Apr 2023 16:26:56 -0400
+Subject: [PATCH] Add dhcp plugin
+
+---
+ configure.ac             | 1 +
+ pppd/plugins/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1180f64..5db4197 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -329,6 +329,7 @@ AC_CONFIG_FILES([
+     pppd/Makefile
+     pppd/pppd.pc
+     pppd/plugins/Makefile
++    pppd/plugins/dhcp/Makefile
+     pppd/plugins/pppoe/Makefile
+     pppd/plugins/pppoatm/Makefile
+     pppd/plugins/pppol2tp/Makefile
+diff --git a/pppd/plugins/Makefile.am b/pppd/plugins/Makefile.am
+index 2826148..9708ab1 100644
+--- a/pppd/plugins/Makefile.am
++++ b/pppd/plugins/Makefile.am
+@@ -21,5 +21,5 @@ winbind_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ winbind_la_SOURCES = winbind.c
+ 
+ if !SUNOS
+-SUBDIRS = pppoe pppoatm pppol2tp radius
++SUBDIRS = dhcp pppoe pppoatm pppol2tp radius
+ endif
+-- 
+2.40.0
+
diff --git a/net-dialup/ppp/ppp-2.5.0.ebuild b/net-dialup/ppp/ppp-2.5.0.ebuild
index 7213230de0e6..58672da24450 100644
--- a/net-dialup/ppp/ppp-2.5.0.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0.ebuild
@@ -2,20 +2,25 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+AUTOTOOLS_AUTO_DEPEND=no
 
-inherit linux-info pam
+inherit autotools 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://github.com/ppp-project/ppp/blob/${P}/contrib/pppgetpass/pppgetpass.8"
+	https://github.com/ppp-project/ppp/blob/${P}/contrib/pppgetpass/pppgetpass.8
+	dhcp? (
+		http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
+		https://dev.gentoo.org/~floppym/dist/${P}-dhcp-patches.tar.gz
+	)"
 #https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz
 
 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"
+IUSE="activefilter atm dhcp gtk pam systemd"
 
 DEPEND="
 	dev-libs/openssl:0=
@@ -28,9 +33,24 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!<net-misc/netifrc-0.7.1-r2"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig
+	dhcp? ( ${AUTOTOOLS_DEPEND} )"
 PDEPEND="net-dialup/ppp-scripts"
 
+src_prepare() {
+	if use dhcp; then
+		eapply "${FILESDIR}/ppp-2.5.0-add-dhcp-plugin.patch"
+		cd "${WORKDIR}/dhcp" || die
+		eapply "${WORKDIR}/ppp-2.5.0-dhcp-patches"
+		cd "${S}" || die
+		mv "${WORKDIR}/dhcp" "${S}/pppd/plugins/dhcp" || die
+	fi
+	default
+	if use dhcp; then
+		eautoreconf
+	fi
+}
+
 src_configure() {
 	local args=(
 		--localstatedir="${EPREFIX}"/var