[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/, net-dialup/ppp/
commit: fb8a1f91bb2425e9a871ac5bad40bb925a53732a
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Mar 26 23:01:45 2024 +
Commit: Mike Gilbert gentoo org>
CommitDate: Wed Mar 27 00:10:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb8a1f91
net-dialup/ppp: backport radius mppe fix
Closes: https://bugs.gentoo.org/915686
Signed-off-by: Mike Gilbert gentoo.org>
net-dialup/ppp/files/ppp-2.5.0-radius-mppe.patch | 167 +
.../{ppp-2.5.0-r6.ebuild => ppp-2.5.0-r7.ebuild} | 3 +-
2 files changed, 169 insertions(+), 1 deletion(-)
diff --git a/net-dialup/ppp/files/ppp-2.5.0-radius-mppe.patch
b/net-dialup/ppp/files/ppp-2.5.0-radius-mppe.patch
new file mode 100644
index ..7bb63c964605
--- /dev/null
+++ b/net-dialup/ppp/files/ppp-2.5.0-radius-mppe.patch
@@ -0,0 +1,167 @@
+https://github.com/ppp-project/ppp/pull/463
+https://bugs.gentoo.org/915686
+
+From 77693b89fed6d4110184789f8e7dfd31710f3190 Mon Sep 17 00:00:00 2001
+From: Jaco Kroon
+Date: Thu, 23 Nov 2023 14:54:42 +0200
+Subject: [PATCH] radius: fix the MPPE key decryption for the second-half of
+ the key block.
+
+During he refactor in commit 4cb90c1 the key material used to decrypt
+the second-half of the encrypted block was accidentally updated from:
+
+MD5(radius_secret + crypt[0..15]); to:
+
+MD5(radius_secret + crypt[0..15] + salt)
+
+Which would obviously mismatch.
+
+This also refactors back into what I believe to be a more readable block
+with lower nesting and more comprehensive error reporting.
+
+Closes: #453
+Signed-off-by: Jaco Kroon
+---
+ pppd/plugins/radius/radius.c | 115 +--
+ 1 file changed, 55 insertions(+), 60 deletions(-)
+
+diff --git a/pppd/plugins/radius/radius.c b/pppd/plugins/radius/radius.c
+index c73ca0b53..e99bc7511 100644
+--- a/pppd/plugins/radius/radius.c
b/pppd/plugins/radius/radius.c
+@@ -897,80 +897,75 @@ radius_setmppekeys2(VALUE_PAIR *vp, REQUEST_INFO
*req_info)
+ memcpy(plain, crypt, 32);
+
+ ctx = PPP_MD_CTX_new();
+-if (ctx) {
+-
+-if (PPP_DigestInit(ctx, PPP_md5())) {
+-
+-if (PPP_DigestUpdate(ctx, req_info->secret,
strlen(req_info->secret))) {
+-
+-if (PPP_DigestUpdate(ctx, req_info->request_vector,
AUTH_VECTOR_LEN)) {
+-
+-if (PPP_DigestUpdate(ctx, salt, 2)) {
+-
+-buflen = sizeof(buf);
+-if (PPP_DigestFinal(ctx, buf, &buflen)) {
+-
+-status = 1;
+-}
+-}
+-}
+-}
+-}
+-
+-PPP_MD_CTX_free(ctx);
++if (!ctx) {
++ error("RADIUS: Error creating PPP_MD_CTX for MS-MPPE-%s-Key attribute",
type);
++ return -1;
+ }
+
+-if (status) {
+-
+-for (i = 0; i < 16; i++) {
+-plain[i] ^= buf[i];
+-}
++buflen = sizeof(buf);
++if (!PPP_DigestInit(ctx, PPP_md5())) {
++ error("RADIUS: Error setting hash algorithm to MD5 for MS-MPPE-%s-Key
attribute", type);
++} else if (!PPP_DigestUpdate(ctx, req_info->secret,
strlen(req_info->secret))) {
++ error("RADIUS: Error mixing in radius secret for MS-MPPE-%s-Key
attribute", type);
++} else if (!PPP_DigestUpdate(ctx, req_info->request_vector,
AUTH_VECTOR_LEN)) {
++ error("RADIUS: Error mixing in request vector for MS-MPPE-%s-Key
attribute", type);
++} else if (!PPP_DigestUpdate(ctx, salt, 2)) {
++ error("RADIUS: Error mixing in salt for MS-MPPE-%s-Key attribute",
type);
++} else if (!PPP_DigestFinal(ctx, buf, &buflen)) {
++ error("RADIUS: Error finalizing key buffer for MS-MPPE-%s-Key
attribute", type);
++} else {
++ status = 1;
++}
+
+-if (plain[0] != 16) {
+-error("RADIUS: Incorrect key length (%d) for MS-MPPE-%s-Key
attribute",
+- (int) plain[0], type);
+-return -1;
+-}
++PPP_MD_CTX_free(ctx);
+
+-status = 0;
+-ctx = PPP_MD_CTX_new();
+-if (ctx) {
+-
+-if (PPP_DigestInit(ctx, PPP_md5())) {
++if (!status)
++ return -1;
+
+-if (PPP_DigestUpdate(ctx, req_info->secret,
strlen(req_info->secret))) {
++for (i = 0; i < 16; i++) {
++ plain[i] ^= buf[i];
++}
+
+-if (PPP_DigestUpdate(ctx, crypt, 16)) {
++if (plain[0] != 16) {
++ error("RADIUS: Incorrect key length (%d) for MS-MPPE-%s-Key attribute",
++ (int) plain[0], type);
++ return -1;
++}
+
+-if (PPP_DigestUpdate(ctx, salt, 2)) {
++status = 0;
++ctx = PPP_MD_CTX_new();
++if (!ctx) {
++ error("RADIUS: Error creating PPP_MD_CTX for MS-MPPE-%s-Key(2)
attribute", type);
++ return -1;
++}
+
+-buflen = sizeof(buf);
+-if (PPP_DigestFinal(ctx, buf, &buflen)) {
++buflen = sizeof(buf);
+
[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/
commit: 4d112f4403030a22551802299a3ff14dec61c295 Author: Mike Gilbert gentoo org> AuthorDate: Mon May 29 00:48:08 2023 + Commit: Mike Gilbert gentoo org> CommitDate: Mon May 29 00:48:08 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d112f44 net-dialup/ppp: add upstream PR links to patches Signed-off-by: Mike Gilbert gentoo.org> net-dialup/ppp/files/ppp-2.5.0-passwordfd-read-early.patch | 2 ++ net-dialup/ppp/files/ppp-2.5.0-pidfile.patch | 2 ++ 2 files changed, 4 insertions(+) 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?= Date: Fri, 20 Jun 2008 18:34:06 + diff --git a/net-dialup/ppp/files/ppp-2.5.0-pidfile.patch b/net-dialup/ppp/files/ppp-2.5.0-pidfile.patch index 0196dff2929f..538ddfb0a2c1 100644 --- a/net-dialup/ppp/files/ppp-2.5.0-pidfile.patch +++ b/net-dialup/ppp/files/ppp-2.5.0-pidfile.patch @@ -1,3 +1,5 @@ +https://github.com/ppp-project/ppp/pull/427 + From 0c9f2cb93f56d2a14ffcc97f53f4665b7728d8e4 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sun, 28 May 2023 17:01:12 -0400
[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/, net-dialup/ppp/
commit: fdeaefbbdb36dfdf8bd040fb3f11fd99bea5136e
Author: Mike Gilbert gentoo org>
AuthorDate: Sun May 28 21:16:18 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun May 28 21:25:54 2023 +
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 ..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 ..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}
+ !https://github.com/ppp-project/ppp/pull/412
+ #doman contrib/pppgetpass/pppgetpass.8
+ doman "${DISTDIR}/pppgetpass.8"
+}
+
+pkg_postinst() {
+ tmpfiles_process pppd.conf
+}
[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/
commit: d2351cff97ffeda00c4960eaf7dd6774d4f81428 Author: Mike Gilbert gentoo org> AuthorDate: Thu Apr 27 04:34:19 2023 + Commit: Mike Gilbert gentoo org> CommitDate: Thu Apr 27 04:34:19 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2351cff net-dialup/ppp: update patch metadata Signed-off-by: Mike Gilbert gentoo.org> net-dialup/ppp/files/ppp-2.5.0-passwordfd-read-early.patch | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) 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 f61e8227efe2..2600a1d85f21 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,8 +1,10 @@ -From a198cd83dfba6a738a4df80abd2675b4e8ee193c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Fri, 3 Jan 2020 17:19:09 +0100 -Subject: [PATCH] passwordfd: read early +From df35ecb4ab63e8f89f57aa5d593441765a96ed62 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alin=20N=C4=83stac?= +Date: Fri, 20 Jun 2008 18:34:06 + +Subject: [PATCH] passwordfd: read password early +Bug: https://bugs.gentoo.org/209294 +Bug: https://bugs.gentoo.org/905112 --- pppd/plugins/passwordfd.c | 54 ++- 1 file changed, 25 insertions(+), 29 deletions(-) @@ -93,5 +95,5 @@ index c1f782e..13aec56 100644 } -- -2.40.0 +2.40.1
[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/, net-dialup/ppp/, net-dialup/ppp/files/ppp-2.5.0-dhcp/
commit: e91bc0db2a20c45fbfb03e9fc0e8c573ebb33811
Author: Mike Gilbert gentoo org>
AuthorDate: Sat Apr 22 18:24:17 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sat Apr 22 18:45:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e91bc0db
net-dialup/ppp: drop dhcp plugin again
It's unclear if anyone is actually using this. We can restore it if
someone asks for it.
Signed-off-by: Mike Gilbert gentoo.org>
.../ppp/files/ppp-2.5.0-add-dhcp-plugin.patch | 36 -
.../0001-Convert-sys_errlist-to-strerror.patch | 148 -
.../ppp-2.5.0-dhcp/0002-Add-Makefile.am.patch | 35 -
.../0003-Fix-build-with-ppp-2.5.0.patch| 126 --
net-dialup/ppp/ppp-2.5.0.ebuild| 25 +---
5 files changed, 4 insertions(+), 366 deletions(-)
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
deleted file mode 100644
index d5ad7a76138c..
--- a/net-dialup/ppp/files/ppp-2.5.0-add-dhcp-plugin.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From de05f72948317b40c19b1c113e18713816010dd9 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert
-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/files/ppp-2.5.0-dhcp/0001-Convert-sys_errlist-to-strerror.patch
b/net-dialup/ppp/files/ppp-2.5.0-dhcp/0001-Convert-sys_errlist-to-strerror.patch
deleted file mode 100644
index 193e90b78a9a..
---
a/net-dialup/ppp/files/ppp-2.5.0-dhcp/0001-Convert-sys_errlist-to-strerror.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From e21d256cded13a625bc28d3fe812141a202be696 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert
-Date: Thu, 13 Apr 2023 14:59:35 -0400
-Subject: [PATCH 1/3] Convert sys_errlist to strerror
-
- dhcpc.c | 8
- packet.c | 6 +++---
- socket.c | 14 +++---
- 3 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/dhcpc.c b/dhcpc.c
-index fcff8b9..ff83b53 100644
a/dhcpc.c
-+++ b/dhcpc.c
-@@ -144,7 +144,7 @@ void change_mode(int new_mode)
- fd = raw_socket(client_config.ifindex);
-
- if (listen_mode != LISTEN_NONE && fd < 0) {
--fatal("DHCPC: couldn't listen on socket, %s", sys_errlist[errno]);
-+fatal("DHCPC: couldn't listen on socket, %s", strerror(errno));
- }
-
- }
-@@ -208,7 +208,7 @@ void dhcp_rx(void *dummy) {
- len = get_packet(&packet, fd);
-
- if (len == -1 && errno != EINTR) {
-- dbglog("DHCPC: error on read, %s, reopening socket",
sys_errlist[errno]);
-+ dbglog("DHCPC: error on read, %s, reopening socket", strerror(errno));
- change_mode(LISTEN_KERNEL);
- }
- if (len < 0) continue;
-@@ -380,7 +380,7 @@ void dhcp_request_new() {
- else len = get_raw_packet(&packet, fd);
-
- if (len == -1 && errno != EINTR) {
-- dbglog("DHCPC: error on read, %s, reopening socket",
sys_errlist[errno]);
-+ dbglog("DHCPC: error on read, %s, reopening socket", strerror(errno));
- change_mode(listen_mode); /* just close and reopen */
- }
- if (len < 0) continue;
-@@ -445,7 +445,7 @@ void dhcp_request_new() {
-
- } else {
- /* An error occured */
--dbglog("DHCPC: error on select, %s, reopening socket",
sys_errlist[errno]);
-+dbglog("DHCPC: error on select, %s, reopening socket",
strerror(errno));
- change_mode(listen_mode); /* just close and reopen */
- }
-
-diff --git a/packet.c b/packet.c
-index 00b5202..07a1aac 100644
a/packet.c
-+++ b/packet.c
-@@ -125,7 +125,7 @@ int raw_packet(struct dhcpMessage *payload, u_int32_t
source_ip, int source_port
- return
kernel_packet(payload,payload->giaddr,CLIENT_PORT,dest_ip,dest_port);
-
- if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) {
-- DEBUG(LOG_ERR, "socket call failed: %s", sys_errlist[errno]);
-+ DEBUG(LOG_ERR, "socket call failed: %s", strerror(errno));
- return -1;
- }
-
-@@ -138,7 +138,7 @@ int raw_packet(struct dhcpM
[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/ppp-2.5.0-dhcp/, net-dialup/ppp/
commit: 831f1a3cac976e569e457d0b41c2f530e91b342b
Author: Mike Gilbert gentoo org>
AuthorDate: Fri Apr 14 17:04:34 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Fri Apr 14 17:07:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=831f1a3c
net-dialup/ppp: move dhcp patches to FILESDIR
Signed-off-by: Mike Gilbert gentoo.org>
net-dialup/ppp/Manifest| 1 -
.../0001-Convert-sys_errlist-to-strerror.patch | 148 +
.../ppp-2.5.0-dhcp/0002-Add-Makefile.am.patch | 35 +
.../0003-Fix-build-with-ppp-2.5.0.patch| 126 ++
net-dialup/ppp/ppp-2.5.0.ebuild| 7 +-
5 files changed, 311 insertions(+), 6 deletions(-)
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index bb3a3fd78f67..4582f760fc8f 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,6 +1,5 @@
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
diff --git
a/net-dialup/ppp/files/ppp-2.5.0-dhcp/0001-Convert-sys_errlist-to-strerror.patch
b/net-dialup/ppp/files/ppp-2.5.0-dhcp/0001-Convert-sys_errlist-to-strerror.patch
new file mode 100644
index ..193e90b78a9a
--- /dev/null
+++
b/net-dialup/ppp/files/ppp-2.5.0-dhcp/0001-Convert-sys_errlist-to-strerror.patch
@@ -0,0 +1,148 @@
+From e21d256cded13a625bc28d3fe812141a202be696 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert
+Date: Thu, 13 Apr 2023 14:59:35 -0400
+Subject: [PATCH 1/3] Convert sys_errlist to strerror
+
+---
+ dhcpc.c | 8
+ packet.c | 6 +++---
+ socket.c | 14 +++---
+ 3 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/dhcpc.c b/dhcpc.c
+index fcff8b9..ff83b53 100644
+--- a/dhcpc.c
b/dhcpc.c
+@@ -144,7 +144,7 @@ void change_mode(int new_mode)
+ fd = raw_socket(client_config.ifindex);
+
+ if (listen_mode != LISTEN_NONE && fd < 0) {
+-fatal("DHCPC: couldn't listen on socket, %s", sys_errlist[errno]);
++fatal("DHCPC: couldn't listen on socket, %s", strerror(errno));
+ }
+
+ }
+@@ -208,7 +208,7 @@ void dhcp_rx(void *dummy) {
+ len = get_packet(&packet, fd);
+
+ if (len == -1 && errno != EINTR) {
+- dbglog("DHCPC: error on read, %s, reopening socket",
sys_errlist[errno]);
++ dbglog("DHCPC: error on read, %s, reopening socket", strerror(errno));
+ change_mode(LISTEN_KERNEL);
+ }
+ if (len < 0) continue;
+@@ -380,7 +380,7 @@ void dhcp_request_new() {
+ else len = get_raw_packet(&packet, fd);
+
+ if (len == -1 && errno != EINTR) {
+- dbglog("DHCPC: error on read, %s, reopening socket",
sys_errlist[errno]);
++ dbglog("DHCPC: error on read, %s, reopening socket", strerror(errno));
+ change_mode(listen_mode); /* just close and reopen */
+ }
+ if (len < 0) continue;
+@@ -445,7 +445,7 @@ void dhcp_request_new() {
+
+ } else {
+ /* An error occured */
+-dbglog("DHCPC: error on select, %s, reopening socket",
sys_errlist[errno]);
++dbglog("DHCPC: error on select, %s, reopening socket",
strerror(errno));
+ change_mode(listen_mode); /* just close and reopen *
[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/, net-dialup/ppp/
commit: 47e87dea4c5942ba6f4866b770d4b490303b4e03
Author: Mike Gilbert gentoo org>
AuthorDate: Thu Apr 13 20:45:06 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Thu Apr 13 20:46:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47e87dea
net-dialup/ppp: restore dhcp plugin
Signed-off-by: Mike Gilbert gentoo.org>
net-dialup/ppp/Manifest| 1 +
.../ppp/files/ppp-2.5.0-add-dhcp-plugin.patch | 36 ++
net-dialup/ppp/ppp-2.5.0.ebuild| 28 ++---
3 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 4582f760fc8f..bb3a3fd78f67 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,5 +1,6 @@
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
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 ..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
+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 ~amd6
[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/, net-dialup/ppp/
commit: 868a874d9e6cb7f604cf6400f75da559a971a339
Author: Sam James gentoo org>
AuthorDate: Wed May 18 03:04:25 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed May 18 03:04:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868a874d
net-dialup/ppp: fix build with clang
Revbump as the nested functions bit can/will affect codegen (trampolines...).
Closes: https://bugs.gentoo.org/831305
Thanks-to: Leonardo Neumann neumann.dev.br>
Signed-off-by: Sam James gentoo.org>
.../ppp-2.4.9-fix-clang-nested-functions.patch | 65 ++
.../ppp-2.4.9-fix-openssl-sysroot-clang.patch | 14 ++
net-dialup/ppp/ppp-2.4.9-r8.ebuild | 256 +
3 files changed, 335 insertions(+)
diff --git a/net-dialup/ppp/files/ppp-2.4.9-fix-clang-nested-functions.patch
b/net-dialup/ppp/files/ppp-2.4.9-fix-clang-nested-functions.patch
new file mode 100644
index ..0a089e95430d
--- /dev/null
+++ b/net-dialup/ppp/files/ppp-2.4.9-fix-clang-nested-functions.patch
@@ -0,0 +1,65 @@
+https://github.com/ppp-project/ppp/commit/6e6a48fe628b76ec368277fd52685428e3dc8766
+https://bugs.gentoo.org/831305
+
+From: =?UTF-8?q?Eivind=20N=C3=A6ss?=
+Date: Sun, 11 Jul 2021 14:36:44 -0700
+Subject: [PATCH] Compiling with clang encounters an error in eap-tls.c
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This moves the inline functions to outside the function and declares them
static.
+
+Signed-off-by: Eivind Næss
+--- a/pppd/eap-tls.c
b/pppd/eap-tls.c
+@@ -285,6 +285,23 @@ ENGINE *eaptls_ssl_load_engine( char *engine_name )
+ #endif
+
+
++#ifndef OPENSSL_NO_ENGINE
++static int eaptls_UI_writer(UI *ui, UI_STRING *uis)
++{
++PW_CB_DATA* cb_data = (PW_CB_DATA*)UI_get0_user_data(ui);
++UI_set_result(ui, uis, cb_data->password);
++return 1;
++}
++
++static int eaptls_UI_stub(UI* ui) {
++return 1;
++}
++
++static int eaptls_UI_reader(UI *ui, UI_STRING *uis) {
++return 1;
++}
++#endif
++
+ /*
+ * Initialize the SSL stacks and tests if certificates, key and crl
+ * for client or server use can be loaded.
+@@ -578,20 +595,11 @@ SSL_CTX *eaptls_init_ssl(int init_server, char
*cacertfile, char *capath,
+ {
+ UI_METHOD* transfer_pin = UI_create_method("transfer_pin");
+
+-int writer (UI *ui, UI_STRING *uis)
+-{
+-PW_CB_DATA* cb_data = (PW_CB_DATA*)UI_get0_user_data(ui);
+-UI_set_result(ui, uis, cb_data->password);
+-return 1;
+-};
+-int stub (UI* ui) {return 1;};
+-int stub_reader (UI *ui, UI_STRING *uis) {return 1;};
+-
+-UI_method_set_writer(transfer_pin, writer);
+-UI_method_set_opener(transfer_pin, stub);
+-UI_method_set_closer(transfer_pin, stub);
+-UI_method_set_flusher(transfer_pin, stub);
+-UI_method_set_reader(transfer_pin, stub_reader);
++UI_method_set_writer(transfer_pin, eaptls_UI_writer);
++UI_method_set_opener(transfer_pin, eaptls_UI_stub);
++UI_method_set_closer(transfer_pin, eaptls_UI_stub);
++UI_method_set_flusher(transfer_pin, eaptls_UI_stub);
++UI_method_set_reader(transfer_pin, eaptls_UI_reader);
+
+ dbglog( "Using our private key URI: '%s' in engine", privkeyfile
);
+ pkey = ENGINE_load_private_key(pkey_engine, privkeyfile,
transfer_pin, &cb_data);
diff --git a/net-dialup/ppp/files/ppp-2.4.9-fix-openssl-sysroot-clang.patch
b/net-dialup/ppp/files/ppp-2.4.9-fix-openssl-sysroot-clang.patch
new file mode 100644
index ..2bf8c45e9027
--- /dev/null
+++ b/net-dialup/ppp/files/ppp-2.4.9-fix-openssl-sysroot-clang.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/831305
+
+Upstream git has merged autotoolsification PR so no need for this.
+--- a/pppd/Makefile.linux
b/pppd/Makefile.linux
+@@ -155,7 +155,7 @@ endif
+
+ ifdef NEEDDES
+ ifndef USE_CRYPT
+-CFLAGS += -I$(shell $(CC) --print-sysroot)/usr/include/openssl
++CFLAGS += -I$(INSTROOT)/usr/include/openssl
+ NEEDCRYPTOLIB = y
+ else
+ CFLAGS += -DUSE_CRYPT=1
diff --git a/net-dialup/ppp/ppp-2.4.9-r8.ebuild
b/net-dialup/ppp/ppp-2.4.9-r8.ebuild
new file mode 100644
index ..0c8abaf35c41
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.9-r8.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info pam toolchain-funcs
+
+PATCH_TARBALL_NAME="${PN}-2.4.9-patches-03"
+DESCRIPTION="Point-to-Point Protocol (PPP)"
+HOMEPAGE="https://ppp.samba.org/";
+SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
+ https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz
+ http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz";
+
+LICENSE="BSD GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hp
