[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2024-04-13 Thread Arthur Zamarin
commit: 3b8823ce3886f2c525319d965f5c912dbbb7b562
Author: Matoro Mahri  matoro  tk>
AuthorDate: Fri Apr 12 22:00:04 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 13 06:25:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b8823ce

net-dialup/ppp: Stabilize 2.5.0-r7 sparc, #927923

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Arthur Zamarin  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r7.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r7.ebuild
index bbe9e3fca683..a68b9f331754 100644
--- a/net-dialup/ppp/ppp-2.5.0-r7.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 IUSE="activefilter atm gtk pam selinux systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/, net-dialup/ppp/

2024-03-26 Thread Mike Gilbert
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, )) {
+-
+-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, )) {
++  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 = sizeof(buf);
+ 
+-  

[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2024-03-07 Thread Mike Gilbert
commit: 6e879aec0e9af7894661b52c930fc92974177c6e
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Mar  6 20:35:39 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Mar  7 21:48:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e879aec

net-dialup/ppp: drop 2.5.0-r3, 2.5.0-r4

Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r3.ebuild | 115 ---
 net-dialup/ppp/ppp-2.5.0-r4.ebuild | 120 -
 2 files changed, 235 deletions(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r3.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r3.ebuild
deleted file mode 100644
index eb638501c713..
--- a/net-dialup/ppp/ppp-2.5.0-r3.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2024 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
-}

diff --git a/net-dialup/ppp/ppp-2.5.0-r4.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r4.ebuild
deleted file mode 100644
index c459aa21366d..
--- a/net-dialup/ppp/ppp-2.5.0-r4.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info pam tmpfiles
-
-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 selinux 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/

2024-03-05 Thread Jakov Smolić
commit: c52f654967727f69c419385b800efee5c47f1b2f
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Mar  6 00:24:18 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Mar  6 00:24:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c52f6549

net-dialup/ppp: Stabilize 2.5.0-r6 arm64, #926217

Signed-off-by: Jakov Smolić  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r6.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r6.ebuild
index 29be6e58ce01..fb5b219ceab6 100644
--- a/net-dialup/ppp/ppp-2.5.0-r6.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="activefilter atm gtk pam selinux systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2024-03-05 Thread Jakov Smolić
commit: 9990be3ed11aab95c21ef6fa57fdd8a4990f3e6a
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Mar  6 00:24:22 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Mar  6 00:24:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9990be3e

net-dialup/ppp: Stabilize 2.5.0-r6 arm, #926217

Signed-off-by: Jakov Smolić  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r6.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r6.ebuild
index ca16324c3c80..4890690c1cee 100644
--- a/net-dialup/ppp/ppp-2.5.0-r6.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="activefilter atm gtk pam selinux systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2024-03-05 Thread Jakov Smolić
commit: c835680d36abeadd96cbd8812d90fbce5922d5fd
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Mar  6 00:24:20 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Mar  6 00:24:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c835680d

net-dialup/ppp: Stabilize 2.5.0-r6 ppc, #926217

Signed-off-by: Jakov Smolić  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r6.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r6.ebuild
index fb5b219ceab6..43ad3615db98 100644
--- a/net-dialup/ppp/ppp-2.5.0-r6.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="activefilter atm gtk pam selinux systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2024-03-05 Thread Jakov Smolić
commit: 843babda353861f370335712dbe4a77e51a2d275
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Mar  6 00:24:23 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Mar  6 00:24:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=843babda

net-dialup/ppp: Stabilize 2.5.0-r6 ppc64, #926217

Signed-off-by: Jakov Smolić  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r6.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r6.ebuild
index 4890690c1cee..12bcb53cc006 100644
--- a/net-dialup/ppp/ppp-2.5.0-r6.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="activefilter atm gtk pam selinux systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2024-03-05 Thread Jakov Smolić
commit: 3bf69836a9f40f4c0054f11226e76ff6f0d1917f
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Mar  6 00:24:14 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Mar  6 00:24:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bf69836

net-dialup/ppp: Stabilize 2.5.0-r6 x86, #926217

Signed-off-by: Jakov Smolić  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r6.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r6.ebuild
index b324ff383605..29be6e58ce01 100644
--- a/net-dialup/ppp/ppp-2.5.0-r6.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
 IUSE="activefilter atm gtk pam selinux systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2024-03-05 Thread Jakov Smolić
commit: b323fce59e1df40669db6340991048683d356da3
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Mar  6 00:24:21 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Mar  6 00:24:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b323fce5

net-dialup/ppp: Stabilize 2.5.0-r6 amd64, #926217

Signed-off-by: Jakov Smolić  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r6.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r6.ebuild
index 43ad3615db98..ca16324c3c80 100644
--- a/net-dialup/ppp/ppp-2.5.0-r6.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="activefilter atm gtk pam selinux systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2024-03-05 Thread Mike Gilbert
commit: 95ec382366f185207e825453dd032e1f1f3e084d
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Mar  5 19:57:50 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Mar  5 19:57:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95ec3823

net-dialup/ppp: destabilize 2.5.0-r3 for ~sparc

Bug: https://bugs.gentoo.org/918992
Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r3.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r3.ebuild
index f1649c66765c..eb638501c713 100644
--- a/net-dialup/ppp/ppp-2.5.0-r3.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="activefilter atm gtk pam systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/, net-dialup/ppp/files/

2024-03-05 Thread Mike Gilbert
commit: c77e202de12022ab787403085c70c7b4c6801591
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Mar  5 19:49:19 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Mar  5 19:49:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c77e202d

net-dialup/ppp: fix build with lld

Closes: https://bugs.gentoo.org/905442
Signed-off-by: Mike Gilbert  gentoo.org>

 .../ppp/files/ppp-2.5.0-openssl-pkgconfig.patch| 79 +
 net-dialup/ppp/files/ppp-2.5.0-pam-pkgconfig.patch | 81 ++
 net-dialup/ppp/ppp-2.5.0-r6.ebuild |  7 +-
 3 files changed, 165 insertions(+), 2 deletions(-)

diff --git a/net-dialup/ppp/files/ppp-2.5.0-openssl-pkgconfig.patch 
b/net-dialup/ppp/files/ppp-2.5.0-openssl-pkgconfig.patch
new file mode 100644
index ..893b623a4ea5
--- /dev/null
+++ b/net-dialup/ppp/files/ppp-2.5.0-openssl-pkgconfig.patch
@@ -0,0 +1,79 @@
+https://bugs.gentoo.org/905442
+https://github.com/ppp-project/ppp/pull/438
+
+From 9b4bdca70081abbad26277b009ef9c4ab7e276d0 Mon Sep 17 00:00:00 2001
+From: Brahmajit Das 
+Date: Thu, 2 Nov 2023 11:26:18 +0530
+Subject: [PATCH] Fix linking error with lld linkers (#438)
+
+When using lld linker, build fails with
+
+ld.lld: error: /usr/lib/gcc/x86_64-pc-linux-gnu/12/../../../../lib64/Scrt1.o 
is incompatible with elf32-i386
+ld.lld: error: /usr/lib/gcc/x86_64-pc-linux-gnu/12/../../../../lib64/crti.o is 
incompatible with elf32-i386
+ld.lld: error: /usr/lib/llvm/16/bin/../../../../lib/clang/16/lib/linux
+
+The fix is to check pkg-config first, and not force manual -L /usr/lib.
+If pkg-config succeeded, then we don't bother with -L /usr/lib
+
+Our guess is this what the actual intention was based upon the coments
+
+if pkg-config is installed and openssl has installed a .pc file,
+then use that information and don't search ssldirs
+
+First found on gentoo linux with llvm profile, please check out Bug:
+section of the commit for more info and a complete build log.
+
+Bug: https://bugs.gentoo.org/905442
+
+Signed-off-by: Brahmajit Das 
+Co-authored-by: Sam James 
+---
+ m4/ax_check_openssl.m4 | 28 ++--
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/m4/ax_check_openssl.m4 b/m4/ax_check_openssl.m4
+index 8ae39cae6..39154c856 100644
+--- a/m4/ax_check_openssl.m4
 b/m4/ax_check_openssl.m4
+@@ -55,6 +55,20 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
+ ])
+ 
+ AS_IF([test "${with_openssl}" != "no"], [
++# if pkg-config is installed and openssl has installed a .pc file,
++# then use that information and don't search ssldirs
++AC_PATH_PROG([PKG_CONFIG], [pkg-config])
++if test x"$PKG_CONFIG" != x""; then
++OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null`
++if test $? = 0; then
++OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null`
++OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 
2>/dev/null`
++found=true
++fi
++fi
++])
++
++AS_IF([test "${with_openssl}" != "no" && test ! ${found}], [
+ OPENSSL_INCLUDES=
+ for ssldir in $ssldirs; do
+ AC_MSG_CHECKING([for openssl/ssl.h in $ssldir])
+@@ -69,20 +83,6 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
+ AC_MSG_RESULT([no])
+ ])
+ done])
+- 
+-AS_IF([test "${with_openssl}" != "no" && test ! ${found}], [ 
+-# if pkg-config is installed and openssl has installed a .pc file,
+-# then use that information and don't search ssldirs
+-AC_PATH_PROG([PKG_CONFIG], [pkg-config])
+-if test x"$PKG_CONFIG" != x""; then
+-OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null`
+-if test $? = 0; then
+-OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null`
+-OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 
2>/dev/null`
+-found=true
+-fi
+-fi
+-])
+ 
+ AS_IF([test "${with_openssl}" != "no" && test ${found}], [
+ 

diff --git a/net-dialup/ppp/files/ppp-2.5.0-pam-pkgconfig.patch 
b/net-dialup/ppp/files/ppp-2.5.0-pam-pkgconfig.patch
new file mode 100644
index ..40488fee96b7
--- /dev/null
+++ b/net-dialup/ppp/files/ppp-2.5.0-pam-pkgconfig.patch
@@ -0,0 +1,81 @@
+https://github.com/ppp-project/ppp/pull/479
+
+From c73498fad415d99aa566b11256938272e62b22dd Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Tue, 5 Mar 2024 14:41:10 -0500
+Subject: [PATCH] Use pkg-config to detect PAM when possible
+
+Signed-off-by: Mike Gilbert 
+---
+ m4/ax_check_pam.m4 | 50 --
+ 1 file changed, 22 insertions(+), 28 deletions(-)
+
+diff --git a/m4/ax_check_pam.m4 b/m4/ax_check_pam.m4
+index b17a7573c..7ebd79b61 100644
+--- a/m4/ax_check_pam.m4
 b/m4/ax_check_pam.m4
+@@ -26,34 +26,28 @@
+ 

[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-10-23 Thread Mike Gilbert
commit: 4648cd71f8e822d6419da6fac0ea26345735b6c2
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Oct 24 02:44:03 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Oct 24 02:44:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4648cd71

net-dialup/ppp: drop 2.5.0-r2

Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r2.ebuild | 114 -
 1 file changed, 114 deletions(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r2.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r2.ebuild
deleted file mode 100644
index f2d110d039b4..
--- a/net-dialup/ppp/ppp-2.5.0-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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/

2023-10-23 Thread Mike Gilbert
commit: 54591b758f75145958f6152db955ff333feeb215
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Oct 24 02:47:27 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Oct 24 02:47:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54591b75

net-dialup/ppp: enable multilink

Closes: https://bugs.gentoo.org/916196
Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/{ppp-2.5.0-r5.ebuild => ppp-2.5.0-r6.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-dialup/ppp/ppp-2.5.0-r5.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r6.ebuild
similarity index 99%
rename from net-dialup/ppp/ppp-2.5.0-r5.ebuild
rename to net-dialup/ppp/ppp-2.5.0-r6.ebuild
index a97d33222c22..17550d021c06 100644
--- a/net-dialup/ppp/ppp-2.5.0-r5.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r6.ebuild
@@ -89,6 +89,7 @@ src_configure() {
$(use_with activefilter pcap)
$(use_with gtk)
--enable-cbcp
+   --enable-multilink
)
econf "${args[@]}"
 }



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-09-26 Thread Sam James
commit: f8537d0b53676480cfe2802c60f225f74011133d
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 27 02:40:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 27 02:40:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8537d0b

net-dialup/ppp: Stabilize 2.5.0-r4 arm64, #914547

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r4.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r4.ebuild
index 17265b591f54..c459aa21366d 100644
--- a/net-dialup/ppp/ppp-2.5.0-r4.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="activefilter atm gtk pam selinux systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-09-26 Thread Mike Gilbert
commit: 834dd1aed415d4acd38932b650ca17b76abb0502
Author: Jaco Kroon  uls  co  za>
AuthorDate: Tue Sep 26 21:06:19 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Sep 26 21:12:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=834dd1ae

net-dialup/ppp: add 2.5.0-r5

Install radius support files so radius client will (mostly) work out of
the box.

Closes: https://bugs.gentoo.org/914767
Signed-off-by: Jaco Kroon  uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/33077
Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r5.ebuild | 136 +
 1 file changed, 136 insertions(+)

diff --git a/net-dialup/ppp/ppp-2.5.0-r5.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r5.ebuild
new file mode 100644
index ..a97d33222c22
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.5.0-r5.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info pam tmpfiles
+
+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 selinux 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"
+
+   insinto /etc/ppp/radius
+   doins 
pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
+}
+
+pkg_postinst() {
+   tmpfiles_process pppd.conf
+}



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-09-22 Thread Sam James
commit: 7c4b29f0c6d04f56d0cf66c45fc2469f8132ad8d
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 22 20:52:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 22 20:52:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c4b29f0

net-dialup/ppp: Stabilize 2.5.0-r4 ppc64, #914547

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r4.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r4.ebuild
index ba00b0f05032..17265b591f54 100644
--- a/net-dialup/ppp/ppp-2.5.0-r4.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="activefilter atm gtk pam selinux systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-09-22 Thread Sam James
commit: 8cbbd94b7bfee7125568f30df8ecbfc27053ff70
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 22 20:25:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 22 20:25:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cbbd94b

net-dialup/ppp: Stabilize 2.5.0-r4 amd64, #914547

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r4.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r4.ebuild
index c92e5d3a26fe..620fcc1cabc8 100644
--- a/net-dialup/ppp/ppp-2.5.0-r4.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="activefilter atm gtk pam selinux systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-09-22 Thread Sam James
commit: a7d2b2b8b3be8bc7bb1f82507a7a38f1d2595c86
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 22 20:25:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 22 20:25:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7d2b2b8

net-dialup/ppp: Stabilize 2.5.0-r4 x86, #914547

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r4.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r4.ebuild
index 620fcc1cabc8..ba00b0f05032 100644
--- a/net-dialup/ppp/ppp-2.5.0-r4.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="activefilter atm gtk pam selinux systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-09-22 Thread Arthur Zamarin
commit: effa4bf76b10f553441b6af1bbe7dd8949c1137b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Sep 22 18:57:15 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Sep 22 18:57:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=effa4bf7

net-dialup/ppp: stabilize 2.5.0-r4 for arm

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r4.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r4.ebuild
index 7f006a9d017d..c92e5d3a26fe 100644
--- a/net-dialup/ppp/ppp-2.5.0-r4.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="activefilter atm gtk pam selinux systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-09-09 Thread Sam James
commit: 980e13a4ba2f94b1c862ff0cf6383f528a315699
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 10 05:54:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 10 05:54:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=980e13a4

net-dialup/ppp: Stabilize 2.5.0-r3 sparc, #907274

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r3.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r3.ebuild
index 6dd2d0e68154..f1649c66765c 100644
--- a/net-dialup/ppp/ppp-2.5.0-r3.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 IUSE="activefilter atm gtk pam systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-06-28 Thread Sam James
commit: bfaeee64b00fd4114792bcb747ca8b3e699ff043
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 28 07:13:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 28 07:19:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfaeee64

net-dialup/ppp: add missing selinux policy dep

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r4.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r4.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r4.ebuild
index 70a453504c7b..7f006a9d017d 100644
--- a/net-dialup/ppp/ppp-2.5.0-r4.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 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 gtk pam selinux systemd"
 
 DEPEND="
dev-libs/openssl:0=
@@ -29,6 +29,7 @@ DEPEND="
 RDEPEND="
${DEPEND}
!

[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/, net-dialup/ppp/files/

2023-06-12 Thread Sam James
commit: 81e2e7dd402b7cae4e2591bd07b958948b7e335b
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 12 10:50:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 12 11:15:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81e2e7dd

net-dialup/ppp: backport radiusclient.conf parsing fix

Closes: https://bugs.gentoo.org/908396
Signed-off-by: Sam James  gentoo.org>

 .../ppp-2.5.0-radiusclient.conf-parsing.patch  |  48 +
 net-dialup/ppp/ppp-2.5.0-r4.ebuild | 119 +
 2 files changed, 167 insertions(+)

diff --git a/net-dialup/ppp/files/ppp-2.5.0-radiusclient.conf-parsing.patch 
b/net-dialup/ppp/files/ppp-2.5.0-radiusclient.conf-parsing.patch
new file mode 100644
index ..9916f766c7af
--- /dev/null
+++ b/net-dialup/ppp/files/ppp-2.5.0-radiusclient.conf-parsing.patch
@@ -0,0 +1,48 @@
+https://github.com/ppp-project/ppp/issues/411
+https://github.com/ppp-project/ppp/commit/7f89208b860ea0c41636410bfdb6a609b2772f47
+https://bugs.gentoo.org/908396
+
+From 7f89208b860ea0c41636410bfdb6a609b2772f47 Mon Sep 17 00:00:00 2001
+From: Eivind Naess 
+Date: Sun, 23 Apr 2023 11:37:01 -0700
+Subject: [PATCH] Closes #411, Fixing up parsing in radiusclient.conf
+
+Adding curly braces to fix the code.
+
+Signed-off-by: Eivind Naess 
+--- a/pppd/plugins/radius/config.c
 b/pppd/plugins/radius/config.c
+@@ -235,24 +235,28 @@ int rc_read_config(char *filename)
+ 
+   switch (option->type) {
+   case OT_STR:
+-   if (set_option_str(filename, line, option, p) 
< 0)
++  if (set_option_str(filename, line, option, p) < 
0) {
+   fclose(configfd);
+   return (-1);
++  }
+   break;
+   case OT_INT:
+-   if (set_option_int(filename, line, option, p) 
< 0)
++  if (set_option_int(filename, line, option, p) < 
0) {
+   fclose(configfd);
+   return (-1);
++  }
+   break;
+   case OT_SRV:
+-   if (set_option_srv(filename, line, option, p) 
< 0)
++  if (set_option_srv(filename, line, option, p) < 
0) {
+   fclose(configfd);
+   return (-1);
++  }
+   break;
+   case OT_AUO:
+-   if (set_option_auo(filename, line, option, p) 
< 0)
++  if (set_option_auo(filename, line, option, p) < 
0) {
+   fclose(configfd);
+   return (-1);
++  }
+   break;
+   default:
+   fatal("rc_read_config: impossible case 
branch!");
+

diff --git a/net-dialup/ppp/ppp-2.5.0-r4.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r4.ebuild
new file mode 100644
index ..70a453504c7b
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.5.0-r4.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info pam tmpfiles
+
+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/

2023-05-31 Thread Joonas Niilola
commit: ccdc9fdd87c460c348f1581de3993ead0eef432c
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed May 31 06:15:46 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed May 31 06:15:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccdc9fdd

net-dialup/ppp: Stabilize 2.5.0-r3 x86, #907274

Signed-off-by: Joonas Niilola  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r3.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r3.ebuild
index f76379cf5de3..6dd2d0e68154 100644
--- a/net-dialup/ppp/ppp-2.5.0-r3.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="activefilter atm gtk pam systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-05-31 Thread Joonas Niilola
commit: 1d9ac598b9ba7655fbc177923619e0791808e383
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed May 31 06:15:25 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed May 31 06:15:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d9ac598

net-dialup/ppp: Stabilize 2.5.0-r3 amd64, #907274

Signed-off-by: Joonas Niilola  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r3.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r3.ebuild
index b190dd8e015a..f76379cf5de3 100644
--- a/net-dialup/ppp/ppp-2.5.0-r3.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="activefilter atm gtk pam systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-05-30 Thread Arthur Zamarin
commit: 8165436eded70d112a1f9001c3e523de383ced3e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue May 30 16:51:23 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue May 30 16:51:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8165436e

net-dialup/ppp: Stabilize 2.5.0-r3 arm64, #907274

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r3.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r3.ebuild
index 56a259948e75..b190dd8e015a 100644
--- a/net-dialup/ppp/ppp-2.5.0-r3.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="activefilter atm gtk pam systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-05-29 Thread Arthur Zamarin
commit: 42c4047c547b7062c6226da875e65e200f23fbb0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon May 29 17:48:52 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon May 29 17:48:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c4047c

net-dialup/ppp: Stabilize 2.5.0-r3 arm, #907274

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r3.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r3.ebuild
index 7dd9216c9f76..4d612ba2f001 100644
--- a/net-dialup/ppp/ppp-2.5.0-r3.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="activefilter atm gtk pam systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-05-29 Thread Arthur Zamarin
commit: b97782764b9df5f39636a9744dc792212f5e8c09
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon May 29 17:48:53 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon May 29 17:48:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9778276

net-dialup/ppp: Stabilize 2.5.0-r3 ppc64, #907274

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r3.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r3.ebuild
index 4d612ba2f001..b004ed14b405 100644
--- a/net-dialup/ppp/ppp-2.5.0-r3.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="activefilter atm gtk pam systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-05-29 Thread Arthur Zamarin
commit: 6d111c3db1357b21695a27cb5d2c506634becccd
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon May 29 17:48:54 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon May 29 17:48:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d111c3d

net-dialup/ppp: Stabilize 2.5.0-r3 ppc, #907274

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r3.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r3.ebuild
index b004ed14b405..56a259948e75 100644
--- a/net-dialup/ppp/ppp-2.5.0-r3.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="activefilter atm gtk pam systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/

2023-05-28 Thread Mike Gilbert
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/

2023-05-28 Thread Mike Gilbert
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/

2023-05-28 Thread Sam James
commit: 7589fc5b6c0dc88ad8abcf3aae22d2107751f23e
Author: Sam James  gentoo  org>
AuthorDate: Sun May 28 11:55:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 28 11:55:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7589fc5b

net-dialup/ppp: Stabilize 2.5.0-r2 arm, #907274

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r2.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r2.ebuild
index ef3c213f17b8..f2d110d039b4 100644
--- a/net-dialup/ppp/ppp-2.5.0-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="activefilter atm gtk pam systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-05-28 Thread Sam James
commit: 7bd3a3035e07b8d65433462ba743b9b78b3e349e
Author: Sam James  gentoo  org>
AuthorDate: Sun May 28 11:35:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 28 11:35:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bd3a303

net-dialup/ppp: Stabilize 2.5.0-r2 ppc64, #907274

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r2.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r2.ebuild
index 8ae843f1decd..ef3c213f17b8 100644
--- a/net-dialup/ppp/ppp-2.5.0-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="activefilter atm gtk pam systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-05-28 Thread Sam James
commit: 17f673845403f30498ed13438c022f234f2f6cb4
Author: Sam James  gentoo  org>
AuthorDate: Sun May 28 11:35:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 28 11:35:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17f67384

net-dialup/ppp: Stabilize 2.5.0-r2 ppc, #907274

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r2.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r2.ebuild
index 7475f180717c..8ae843f1decd 100644
--- a/net-dialup/ppp/ppp-2.5.0-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="activefilter atm gtk pam systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-05-28 Thread Joonas Niilola
commit: ff302e3c0181a12a6556b47b6e88002ef3df3ef9
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun May 28 07:10:57 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun May 28 07:11:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff302e3c

net-dialup/ppp: Stabilize 2.5.0-r2 x86, #907274

Signed-off-by: Joonas Niilola  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r2.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r2.ebuild
index ed77a2ebf4cf..7475f180717c 100644
--- a/net-dialup/ppp/ppp-2.5.0-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="activefilter atm gtk pam systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-05-28 Thread Joonas Niilola
commit: 9d44818d92ed7ba089f2fb0425888bd5526b14ad
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun May 28 07:10:39 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun May 28 07:11:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d44818d

net-dialup/ppp: Stabilize 2.5.0-r2 amd64, #907274

Signed-off-by: Joonas Niilola  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r2.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r2.ebuild
index 16cdb369410e..ed77a2ebf4cf 100644
--- a/net-dialup/ppp/ppp-2.5.0-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="activefilter atm gtk pam systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-05-27 Thread Mike Gilbert
commit: 480ab1f451094ad901c1f2658daa94d26967109d
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat May 27 22:59:42 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat May 27 23:01:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=480ab1f4

net-dialup/ppp: move kernel checks to pkg_setup

Also drop message about pon/poff/plog.

Closes: https://bugs.gentoo.org/440424
Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/ppp-2.5.0-r2.ebuild | 54 --
 1 file changed, 23 insertions(+), 31 deletions(-)

diff --git a/net-dialup/ppp/ppp-2.5.0-r2.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r2.ebuild
index cf06b10cd4b8..16cdb369410e 100644
--- a/net-dialup/ppp/ppp-2.5.0-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r2.ebuild
@@ -35,8 +35,29 @@ PATCHES=(
 )
 
 pkg_setup() {
-   # Avoid linux-info_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() {
@@ -90,33 +111,4 @@ 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"
-   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."
 }



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/, net-dialup/ppp/files/

2023-04-28 Thread Mike Gilbert
commit: 8f6433c8eb43faef9a1b87de9534c54c0bc4c07f
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Apr 29 03:48:07 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr 29 03:48:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f6433c8

net-dialup/ppp: install tmpfiles snippet to create /run/pppd

Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/files/pppd.tmpfiles  | 2 ++
 net-dialup/ppp/{ppp-2.5.0-r1.ebuild => ppp-2.5.0-r2.ebuild} | 7 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/net-dialup/ppp/files/pppd.tmpfiles 
b/net-dialup/ppp/files/pppd.tmpfiles
new file mode 100644
index ..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
similarity index 96%
rename from net-dialup/ppp/ppp-2.5.0-r1.ebuild
rename to 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"



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-04-28 Thread Mike Gilbert
commit: ef0b13e288a205155963b9776d55a72237c68912
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Apr 29 03:48:53 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr 29 03:48:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef0b13e2

net-dialup/ppp: drop 2.5.0

Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/ppp-2.5.0.ebuild | 113 
 1 file changed, 113 deletions(-)

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..
--- 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}
-   !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."
-}



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/

2023-04-26 Thread Mike Gilbert
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/, net-dialup/ppp/files/

2023-04-26 Thread Mike Gilbert
commit: 15e49b95c5b14796f6819b13fcbf8714ea0e9235
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Apr 26 15:43:59 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Apr 26 15:44:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e49b95

net-dialup/ppp: apply passwordfd-read-early.patch

Bug: https://bugs.gentoo.org/905112
Signed-off-by: Mike Gilbert  gentoo.org>

 .../files/ppp-2.5.0-passwordfd-read-early.patch|  97 +
 net-dialup/ppp/ppp-2.5.0-r1.ebuild | 117 +
 2 files changed, 214 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
new file mode 100644
index ..f61e8227efe2
--- /dev/null
+++ b/net-dialup/ppp/files/ppp-2.5.0-passwordfd-read-early.patch
@@ -0,0 +1,97 @@
+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
+
+---
+ pppd/plugins/passwordfd.c | 54 ++-
+ 1 file changed, 25 insertions(+), 29 deletions(-)
+
+diff --git a/pppd/plugins/passwordfd.c b/pppd/plugins/passwordfd.c
+index c1f782e..13aec56 100644
+--- a/pppd/plugins/passwordfd.c
 b/pppd/plugins/passwordfd.c
+@@ -24,11 +24,11 @@
+ 
+ char pppd_version[] = PPPD_VERSION;
+ 
+-static int passwdfd = -1;
+ static char save_passwd[MAXSECRETLEN];
+ 
++static int readpassword (char **);
+ static struct option options[] = {
+-{ "passwordfd", o_int, ,
++{ "passwordfd", o_special, (void *)readpassword,
+   "Receive password on this file descriptor" },
+ { NULL }
+ };
+@@ -38,43 +38,39 @@ static int pwfd_check (void)
+ return 1;
+ }
+ 
+-static int pwfd_passwd (char *user, char *passwd)
++static int readpassword(char **argv)
+ {
+-int readgood, red;
+-
+-if (passwdfd == -1)
+-  return -1;
++char *arg = *argv;
++int passwdfd = -1;
++int chunk, len;
+ 
+-if (passwd == NULL)
+-  return 1;
+-
+-if (passwdfd == -2) {
+-  strcpy (passwd, save_passwd);
+-  return 1;
++if (sscanf(arg, "%d", ) != 1 || passwdfd < 0)
++{
++  error ("\"%s\" is not a valid file descriptor number", arg);
++  return 0;
+ }
+ 
+-readgood = 0;
++len = 0;
+ do {
+-  red = read (passwdfd, passwd + readgood, MAXSECRETLEN - 1 - readgood);
+-  if (red == 0)
+-  break;
+-  if (red < 0) {
+-  error ("Can't read secret from fd\n");
+-  readgood = -1;
++  chunk = read (passwdfd, save_passwd + len, MAXSECRETLEN - 1 - len);
++  if (chunk == 0)
+   break;
++  if (chunk < 0) {
++  error ("Can't read secret from fd %d", passwdfd);
++  return 0;
+   }
+-  readgood += red;
+-} while (readgood < MAXSECRETLEN - 1);
+-
++  len += chunk;
++} while (len < MAXSECRETLEN - 1);
++save_passwd[len] = 0;
+ close (passwdfd);
+ 
+-if (readgood < 0)
+-  return 0;
+-
+-passwd[readgood] = 0;
+-strcpy (save_passwd, passwd);
+-passwdfd = -2;
++return 1;
++}
+ 
++static int pwfd_passwd (char *user, char *passwd)
++{
++if (passwd != NULL)
++  strcpy (passwd, save_passwd);
+ return 1;
+ }
+ 
+-- 
+2.40.0
+

diff --git a/net-dialup/ppp/ppp-2.5.0-r1.ebuild 
b/net-dialup/ppp/ppp-2.5.0-r1.ebuild
new file mode 100644
index ..9e490709f159
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.5.0-r1.ebuild
@@ -0,0 +1,117 @@
+# 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}
+   !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 

[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-04-23 Thread Mike Gilbert
commit: 9a6ae49db366cf373a0b185bfd62bc5f2de85e00
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Apr 23 17:05:46 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Apr 23 17:05:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a6ae49d

net-dialup/ppp: drop redundant src_compile function

Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/ppp-2.5.0.ebuild | 4 
 1 file changed, 4 deletions(-)

diff --git a/net-dialup/ppp/ppp-2.5.0.ebuild b/net-dialup/ppp/ppp-2.5.0.ebuild
index dc7b51c7c782..bae82377db29 100644
--- a/net-dialup/ppp/ppp-2.5.0.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0.ebuild
@@ -49,10 +49,6 @@ src_configure() {
econf "${args[@]}"
 }
 
-src_compile() {
-   default
-}
-
 src_install() {
default
 



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-04-22 Thread Mike Gilbert
commit: 251f86f99a94af852f5f3e5737aef93f7d96368a
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Apr 22 23:05:47 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr 22 23:06:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=251f86f9

net-dialup/ppp: fix manpage in SRC_URI

Closes: https://bugs.gentoo.org/904831
Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/Manifest | 2 +-
 net-dialup/ppp/ppp-2.5.0.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 4582f760fc8f..84e1b64ccc57 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -2,4 +2,4 @@ DIST ppp-2.4.9-patches-03.tar.xz 18520 BLAKE2B 
b3da095672fa57727ba11a5dba761ea3f
 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 154398 BLAKE2B 
0e74b96df6171b7382874ce08375d0122df2b564ce8c3e8081022c38ef433e22d15ad13a51d553c6e18ee6277d9c67302b50afa59126bf74a6e3dcd1b03a2b2b
 SHA512 
aca33e489d3e78a7accced4d3c33c03d933cf4c0b6607e8a6bbefef202c853248fa85caa36b53b9cbaf8b21ae60bb00fb3f95577418112630dfa6d67ad700359
+DIST pppgetpass.8 450 BLAKE2B 
4e9805cfecb4d07c302682c1ced42cc5d247d18fae904b909e126874af962cf48bb703cd75b0cefce4e19404f2e757602d3b57f187567fc23d4b93d9598d1486
 SHA512 
21f6dda908cf73ee27bfa39d2b50e7f76b371e50bd7d5a0586174b30129c119accbd260d7f9e0e6aa6aabfa5ba11a13ba560588a99672c9dd4e9f33254f88836

diff --git a/net-dialup/ppp/ppp-2.5.0.ebuild b/net-dialup/ppp/ppp-2.5.0.ebuild
index 8df0af957ebd..dc7b51c7c782 100644
--- a/net-dialup/ppp/ppp-2.5.0.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0.ebuild
@@ -9,7 +9,7 @@ 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://raw.githubusercontent.com/ppp-project/ppp/${P}/contrib/pppgetpass/pppgetpass.8;
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-04-22 Thread Mike Gilbert
commit: 8a0f16785f360707d394c748b910d8e21c5e7ea2
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Apr 22 18:41:49 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr 22 18:45:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a0f1678

net-dialup/ppp: tweak kernel config check

Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/ppp-2.5.0.ebuild | 49 +
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/net-dialup/ppp/ppp-2.5.0.ebuild b/net-dialup/ppp/ppp-2.5.0.ebuild
index 3fc74c3ec69a..d0bd4b47176a 100644
--- a/net-dialup/ppp/ppp-2.5.0.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0.ebuild
@@ -30,6 +30,11 @@ RDEPEND="${DEPEND}
 BDEPEND="virtual/pkgconfig"
 PDEPEND="net-dialup/ppp-scripts"
 
+pkg_setup() {
+   # Avoid linux-info_pkg_setup
+   :
+}
+
 src_configure() {
local args=(
--localstatedir="${EPREFIX}"/var
@@ -81,31 +86,27 @@ src_install() {
 }
 
 pkg_postinst() {
-   if linux-info_get_any_version && linux_config_src_exists ; then
-   echo
-   ewarn "If the following test report contains a missing kernel 
configuration option that you need,"
-   ewarn "you should reconfigure and rebuild your kernel before 
running pppd."
-   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 (optional, but highly recommended)"
-   local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing 
synchronous serial line discipline (optional; used by 'sync' pppd option)"
-   if use activefilter ; then
-   CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
-   local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing 
PPP filtering support (REQUIRED)"
-   fi
-   CONFIG_CHECK="${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="${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="${CONFIG_CHECK} ~PPPOATM"
-   local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA 
support (optional, needed by pppoatm plugin)"
-   fi
-   check_extra_config
+   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 (optional, but highly recommended)"
+   local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous 
serial line discipline (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."



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/, net-dialup/ppp/, net-dialup/ppp/files/ppp-2.5.0-dhcp/

2023-04-22 Thread Mike Gilbert
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(, 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(, 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 dhcpMessage 

[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-04-22 Thread Mike Gilbert
commit: 74164e7fb960ccf295783e2efa7c238b2dec65fb
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Apr 22 18:45:26 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr 22 18:45:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74164e7f

net-dialup/ppp: break lines to appease pkgcheck

Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/ppp-2.5.0.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-dialup/ppp/ppp-2.5.0.ebuild b/net-dialup/ppp/ppp-2.5.0.ebuild
index d0bd4b47176a..8df0af957ebd 100644
--- a/net-dialup/ppp/ppp-2.5.0.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0.ebuild
@@ -88,8 +88,10 @@ src_install() {
 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 (optional, but highly recommended)"
-   local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous 
serial line discipline (optional; used by 'sync' pppd option)"
+   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)"



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-04-22 Thread Mike Gilbert
commit: add43e6272f4c62adedc50fbe83ab2ced94a10e8
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Apr 22 18:25:23 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr 22 18:45:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=add43e62

net-dialup/ppp: keyword 2.5.0

Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/ppp-2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0.ebuild b/net-dialup/ppp/ppp-2.5.0.ebuild
index 52bf959c8521..6ae589dd967b 100644
--- a/net-dialup/ppp/ppp-2.5.0.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 IUSE="activefilter atm gtk pam systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-04-22 Thread Mike Gilbert
commit: ef9e0bbe6323970142943a88e39a7bbf5e18b290
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Apr 22 18:32:39 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr 22 18:45:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef9e0bbe

net-dialup/ppp: install adjustments

Move pon, poff, plog to sbin.
Install manpage symlinks.

Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/ppp-2.5.0.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0.ebuild b/net-dialup/ppp/ppp-2.5.0.ebuild
index 6ae589dd967b..3fc74c3ec69a 100644
--- a/net-dialup/ppp/ppp-2.5.0.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0.ebuild
@@ -60,8 +60,10 @@ src_install() {
insinto /etc/modprobe.d
newins "${FILESDIR}/modules.ppp" ppp.conf
 
-   dobin scripts/p{on,off,log}
+   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



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-04-22 Thread Mike Gilbert
commit: 0030397c197b547ccbe76c99620f3aa5545a7adb
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Apr 22 18:20:38 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr 22 18:45:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0030397c

net-dialup/ppp: remove comment

Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/ppp-2.5.0.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.5.0.ebuild b/net-dialup/ppp/ppp-2.5.0.ebuild
index 1994d63f1948..4ffe5b4c57e2 100644
--- a/net-dialup/ppp/ppp-2.5.0.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0.ebuild
@@ -12,7 +12,6 @@ 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
dhcp? ( http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz )"
-#https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/, net-dialup/ppp/files/

2023-04-21 Thread Mike Gilbert
commit: 7fba1ae8a6a18bd43afc1f23171b6cbfab7832aa
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Apr 21 17:41:40 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Apr 21 17:41:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fba1ae8

net-dialup/ppp: fix pppol2tp plugin with USE=-ipv6

Closes: https://bugs.gentoo.org/904740
Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/files/ppp-2.4.9-pppol2tp-ipv6.patch | 28 ++
 .../{ppp-2.4.9-r8.ebuild => ppp-2.4.9-r9.ebuild}   |  3 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/net-dialup/ppp/files/ppp-2.4.9-pppol2tp-ipv6.patch 
b/net-dialup/ppp/files/ppp-2.4.9-pppol2tp-ipv6.patch
new file mode 100644
index ..40773b2b0d54
--- /dev/null
+++ b/net-dialup/ppp/files/ppp-2.4.9-pppol2tp-ipv6.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/904740
+https://github.com/ppp-project/ppp/pull/319
+
+From 44a70d6f9eb6d1843868da1d45de382134a03630 Mon Sep 17 00:00:00 2001
+From: str8fast <52187302+str8f...@users.noreply.github.com>
+Date: Thu, 28 Oct 2021 14:55:56 +
+Subject: [PATCH] pppol2tp.c add '#ifdef INET6' for optional ipv6
+
+Without it, l2tp daemon can't launch ppp, cuz undefined symbol 
ipv6_up_notifier.
+---
+ pppd/plugins/pppol2tp/pppol2tp.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/pppd/plugins/pppol2tp/pppol2tp.c 
b/pppd/plugins/pppol2tp/pppol2tp.c
+index ed2d7c79..c9902afe 100644
+--- a/pppd/plugins/pppol2tp/pppol2tp.c
 b/pppd/plugins/pppol2tp/pppol2tp.c
+@@ -509,8 +509,10 @@ void plugin_init(void)
+*/
+   add_notifier(_up_notifier, pppol2tp_ip_up, NULL);
+   add_notifier(_down_notifier, pppol2tp_ip_down, NULL);
++#ifdef INET6
+   add_notifier(_up_notifier, pppol2tp_ip_up, NULL);
+   add_notifier(_down_notifier, pppol2tp_ip_down, NULL);
++#endif
+ }
+ 
+ struct channel pppol2tp_channel = {

diff --git a/net-dialup/ppp/ppp-2.4.9-r8.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r9.ebuild
similarity index 98%
rename from net-dialup/ppp/ppp-2.4.9-r8.ebuild
rename to net-dialup/ppp/ppp-2.4.9-r9.ebuild
index bd9aed59ed9f..6e5887b815f6 100644
--- a/net-dialup/ppp/ppp-2.4.9-r8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,6 +40,7 @@ src_prepare() {
eapply "${FILESDIR}"/${P}-fix-MPPE-sstpc.patch
eapply "${FILESDIR}"/${P}-fix-clang-nested-functions.patch
eapply "${FILESDIR}"/${P}-fix-openssl-sysroot-clang.patch
+   eapply "${FILESDIR}"/${P}-pppol2tp-ipv6.patch
 
#IPX Support is removed in kernel >= 5.15
sed -i 's/-DIPX_CHANGE //' pppd/Makefile.linux || die



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/ppp-2.5.0-dhcp/, net-dialup/ppp/

2023-04-14 Thread Mike Gilbert
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(, 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(, 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/

2023-04-13 Thread Mike Gilbert
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 ~amd64 

[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2023-04-12 Thread Mike Gilbert
commit: 869a1d167c73725fceb873e0f36fe689deac156e
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Apr 12 20:37:56 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Apr 12 20:51:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=869a1d16

net-dialup/ppp: add 2.5.0 without KEYWORDS

ebuild changes:

- EAPI 8
- autotools
- Drop dhcpc plugin (fails to build)
- Enable eap-tls, ipv6, radius unconditionally

Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/Manifest |   2 +
 net-dialup/ppp/ppp-2.5.0.ebuild | 113 
 2 files changed, 115 insertions(+)

diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 8c80bdd736d5..4582f760fc8f 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,3 +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.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/ppp-2.5.0.ebuild b/net-dialup/ppp/ppp-2.5.0.ebuild
new file mode 100644
index ..7213230de0e6
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.5.0.ebuild
@@ -0,0 +1,113 @@
+# 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://github.com/ppp-project/ppp/blob/${P}/contrib/pppgetpass/pppgetpass.8;
+#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"
+
+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() {
+   if linux-info_get_any_version && linux_config_src_exists ; then
+   echo
+   ewarn "If the following test report contains a missing kernel 
configuration option that you need,"
+   ewarn "you should reconfigure and rebuild your kernel before 
running pppd."
+   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 (optional, but highly recommended)"
+   local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing 
synchronous serial line discipline (optional; used by 'sync' pppd option)"
+   if use activefilter ; then
+   CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
+   local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing 
PPP filtering support (REQUIRED)"
+   fi
+   CONFIG_CHECK="${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)"
+  

[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2022-06-13 Thread Jakov Smolić
commit: 52c7dbaf4465c137e7f5e5727a07bd7a07f8a36d
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Jun 13 20:59:58 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Jun 13 20:59:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52c7dbaf

net-dialup/ppp: Stabilize 2.4.9-r8 amd64, #851243

Signed-off-by: Jakov Smolić  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r8.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r8.ebuild
index 6d0f3841eecb..bd9aed59ed9f 100644
--- a/net-dialup/ppp/ppp-2.4.9-r8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2022-06-12 Thread Agostino Sarubbo
commit: ccbea81239cc018c9ba93a8b56a46b1f648dcbbc
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun 12 08:32:16 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun 12 08:32:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccbea812

net-dialup/ppp: x86 stable wrt bug #851243

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r8.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r8.ebuild
index c13cb8b7f409..6d0f3841eecb 100644
--- a/net-dialup/ppp/ppp-2.4.9-r8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2022-06-12 Thread Agostino Sarubbo
commit: 22aa5496d204a73793b764fc48554ceb3447edc4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun 12 08:30:54 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun 12 08:30:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22aa5496

net-dialup/ppp: sparc stable wrt bug #851243

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r8.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r8.ebuild
index 8db7100d5cfa..c13cb8b7f409 100644
--- a/net-dialup/ppp/ppp-2.4.9-r8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2022-06-12 Thread Agostino Sarubbo
commit: 3270ce7364f94f6302fa6dea02704c5bd5335eba
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun 12 08:30:38 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun 12 08:30:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3270ce73

net-dialup/ppp: ppc64 stable wrt bug #851243

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r8.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r8.ebuild
index 1ec804085147..8db7100d5cfa 100644
--- a/net-dialup/ppp/ppp-2.4.9-r8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2022-06-12 Thread Agostino Sarubbo
commit: 44d113df7402512c4530b1f362b99e1bc9c2aaa1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun 12 08:30:21 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun 12 08:30:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d113df

net-dialup/ppp: ppc stable wrt bug #851243

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r8.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r8.ebuild
index 5dbc0e394173..1ec804085147 100644
--- a/net-dialup/ppp/ppp-2.4.9-r8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2022-06-12 Thread Agostino Sarubbo
commit: 55d243ed24e6b8a5c237af152bf0bff895926e9f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun 12 08:30:02 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun 12 08:30:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55d243ed

net-dialup/ppp: arm64 stable wrt bug #851243

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="arm64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r8.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r8.ebuild
index 41f64ca4146a..5dbc0e394173 100644
--- a/net-dialup/ppp/ppp-2.4.9-r8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2022-06-12 Thread Agostino Sarubbo
commit: 22565820ddd55ac0040d0a8e997ee8fdd4877552
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun 12 08:29:28 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun 12 08:29:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22565820

net-dialup/ppp: arm stable wrt bug #851243

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r8.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r8.ebuild
index 0c8abaf35c41..41f64ca4146a 100644
--- a/net-dialup/ppp/ppp-2.4.9-r8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/, net-dialup/ppp/

2022-05-17 Thread Sam James
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, _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 ~hppa 

[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2022-05-17 Thread WANG Xuerui
commit: 5e0076d37af0a7a5fb775439bc54bdf913aa091f
Author: WANG Xuerui  gentoo  org>
AuthorDate: Tue May 17 10:32:59 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Tue May 17 11:53:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e0076d3

net-dialup/ppp: keyword 2.4.9-r7 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r7.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r7.ebuild
index 560d483d8dc4..8019a5659608 100644
--- a/net-dialup/ppp/ppp-2.4.9-r7.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp-scripts/

2022-05-17 Thread WANG Xuerui
commit: e8701ea0e075d43c5ed4d49068268296739588a2
Author: WANG Xuerui  gentoo  org>
AuthorDate: Tue May 17 10:32:56 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Tue May 17 11:53:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8701ea0

net-dialup/ppp-scripts: keyword 0 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 net-dialup/ppp-scripts/ppp-scripts-0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-dialup/ppp-scripts/ppp-scripts-0.ebuild 
b/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
index 5cfe76c23ab5..f201e9b0d5db 100644
--- a/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
+++ b/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/${P}.tar.xz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 
 DEPEND="!

[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/, net-dialup/ppp/files/

2022-05-10 Thread Sam James
commit: 3eccc071acd18d4db8fbfadab7f6e2fe6ec1343d
Author: Sam James  gentoo  org>
AuthorDate: Tue May 10 19:35:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 10 19:36:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eccc071

net-dialup/ppp: backport MPPE sstpc fix

Big thanks to Eivind for reaching out and pointing out we need
this with the sstpc bump that's also being pushed (sstpc-client
and networkmanager-sstpc).

Thanks-to: Eivind Næss  yahoo.com>
Signed-off-by: Sam James  gentoo.org>

 .../ppp/files/ppp-2.4.9-fix-MPPE-sstpc.patch   |  25 ++
 net-dialup/ppp/ppp-2.4.9-r7.ebuild | 254 +
 2 files changed, 279 insertions(+)

diff --git a/net-dialup/ppp/files/ppp-2.4.9-fix-MPPE-sstpc.patch 
b/net-dialup/ppp/files/ppp-2.4.9-fix-MPPE-sstpc.patch
new file mode 100644
index ..15a1298ce303
--- /dev/null
+++ b/net-dialup/ppp/files/ppp-2.4.9-fix-MPPE-sstpc.patch
@@ -0,0 +1,25 @@
+https://github.com/ppp-project/ppp/commit/d7e62a8499c4032d79e05afbd8fd3efd51c5b148
+https://bugs.launchpad.net/ubuntu/+source/ppp/+bug/1958196
+
+From: =?UTF-8?q?Eivind=20N=C3=A6ss?= 
+Date: Thu, 3 Feb 2022 14:28:22 -0800
+Subject: [PATCH] pppd/eap: Fix bug causing incorrect response length (#334)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Need to update the esp->ea_client.ea_namelen variable. A plugin can override 
the
+name of the user, and the variable is passed onto the eap_chap2_response 
generating
+the wrong response length.
+
+Signed-off-by: Eivind Næss 
+--- a/pppd/eap.c
 b/pppd/eap.c
+@@ -2182,6 +2182,7 @@ eap_request(eap_state *esp, u_char *inp, int id, int len)
+   eap_send_nak(esp, id, EAPT_SRP);
+   break;
+   }
++  esp->es_client.ea_namelen = strlen(esp->es_client.ea_name);
+ 
+   /* Create the MSCHAPv2 response (and add to cache) */
+   unsigned char response[MS_CHAP2_RESPONSE_LEN+1]; // VLEN + VALUE

diff --git a/net-dialup/ppp/ppp-2.4.9-r7.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r7.ebuild
new file mode 100644
index ..560d483d8dc4
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.9-r7.ebuild
@@ -0,0 +1,254 @@
+# 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius 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}
+   != 5.15
+   sed -i 's/-DIPX_CHANGE //' pppd/Makefile.linux || die
+
+   if use atm ; then
+   einfo "Enabling PPPoATM support"
+   sed -i '/^#HAVE_LIBATM=yes/s:#::' \
+   pppd/plugins/pppoatm/Makefile.linux || die
+   fi
+
+   if ! use activefilter ; then
+   einfo "Disabling active filter"
+   sed -i '/^FILTER=y/s:^:#:' pppd/Makefile.linux || die
+   fi
+
+   if use pam ; then
+   einfo "Enabling PAM"
+   sed -i '/^#USE_PAM=y/s:^#::' pppd/Makefile.linux || die
+   fi
+
+   if ! use ipv6 ; then
+   einfo "Disabling IPv6"
+   sed -i '/^HAVE_INET6/s:^:#:' pppd/Makefile.linux || die
+   else
+   echo "+ipv6" >> etc.ppp/options || die
+   fi
+
+   einfo "Enabling CBCP"
+   sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die
+
+   if use dhcp ; then
+   einfo "Adding ppp-dhcp plugin files"
+   sed \
+   -e '/^SUBDIRS :=/s:$: dhcp:' \
+   -i pppd/plugins/Makefile.linux || die
+   fi
+
+   if ! use eap-tls ; then
+   einfo "Disabling EAP-TLS pppd auth support"
+   sed -i '/^USE_EAPTLS=y/s:^:#:' pppd/Makefile.linux || die
+   einfo "Disabling EAP-TLS plugin support"
+   sed -i '/^CFLAGS += -DUSE_EAPTLS=1/s:^:#:' \
+   pppd/plugins/Makefile.linux || die
+   fi
+
+   # Set correct libdir
+   sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
+   pppd/{pathnames.h,pppd.8} || die
+
+   if use radius ; then
+   # Set the right paths in radiusclient.conf
+   sed -e 

[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2022-05-05 Thread Lars Wendler
commit: 8c92f9f4eea0a998f0bdc7b451c89c7737940176
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu May  5 08:34:13 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu May  5 08:36:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c92f9f4

net-dialup/ppp: Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r4.ebuild | 244 -
 1 file changed, 244 deletions(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r4.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r4.ebuild
deleted file mode 100644
index 6459f5145ad8..
--- a/net-dialup/ppp/ppp-2.4.9-r4.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2021 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 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
-IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius"
-
-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 )
-"
-RDEPEND="${DEPEND}
-   !> etc.ppp/options || die
-   fi
-
-   einfo "Enabling CBCP"
-   sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die
-
-   if use dhcp ; then
-   einfo "Adding ppp-dhcp plugin files"
-   sed \
-   -e '/^SUBDIRS :=/s:$: dhcp:' \
-   -i pppd/plugins/Makefile.linux || die
-   fi
-
-   if ! use eap-tls ; then
-   einfo "Disabling EAP-TLS pppd auth support"
-   sed -i '/^USE_EAPTLS=y/s:^:#:' pppd/Makefile.linux || die
-   einfo "Disabling EAP-TLS plugin support"
-   sed -i '/^CFLAGS += -DUSE_EAPTLS=1/s:^:#:' \
-   pppd/plugins/Makefile.linux || die
-   fi
-
-   # Set correct libdir
-   sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
-   pppd/{pathnames.h,pppd.8} || die
-
-   if use radius ; then
-   # Set the right paths in radiusclient.conf
-   sed -e "s:/usr/local/etc:/etc:" \
-   -e "s:/usr/local/sbin:/usr/sbin:" \
-   -i pppd/plugins/radius/etc/radiusclient.conf || die
-   # Set config dir to /etc/ppp/radius
-   sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
-   pppd/plugins/radius/{*.8,*.c,*.h} \
-   pppd/plugins/radius/etc/* || die
-   else
-   einfo "Disabling radius"
-   sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die
-   fi
-
-   # Respect our pkg-config settings.
-   sed -i \
-   -e 's:pkg-config:$(PKG_CONFIG):' \
-   contrib/pppgetpass/Makefile.linux || die
-   sed -i \
-   -e '/^LIBS/{s:-L/usr/local/ssl/lib::;s:-lcrypto:`$(PKG_CONFIG) 
--libs libcrypto`:}' \
-   pppd/Makefile.linux || die
-
-   eapply_user #549588
-}
-
-src_compile() {
-   tc-export AR CC PKG_CONFIG
-   emake CC="${CC}" COPTS="${CFLAGS} -D_GNU_SOURCE"
-
-   # build pppgetpass
-   cd contrib/pppgetpass || die
-   if use gtk ; then
-   emake -f Makefile.linux
-   else
-   emake pppgetpass.vt
-   fi
-}
-
-src_install() {
-   local i
-   for i in chat pppd pppdump pppstats ; do
-   doman ${i}/${i}.8
-   dosbin ${i}/${i}
-   done
-   fperms u+s-w /usr/sbin/pppd
-
-   # Install pppd header files
-   emake -C pppd INSTROOT="${D}" install-devel
-
-   dosbin pppd/plugins/pppoe/pppoe-discovery
-
-   dodir /etc/ppp/peers
-   insinto /etc/ppp
-   insopts -m0600
-   newins etc.ppp/pap-secrets pap-secrets.example
-   newins etc.ppp/chap-secrets chap-secrets.example
-
-   insopts -m0644
-   doins etc.ppp/options
-
-   if use pam; then
-   pamd_mimic_system ppp auth account session
-   fi
-
-   local PLUGINS_DIR="/usr/$(get_libdir)/pppd/${PV}"
-   insinto "${PLUGINS_DIR}"
-   insopts -m0755
-   doins pppd/plugins/minconn.so
-   doins pppd/plugins/passprompt.so
-   doins pppd/plugins/passwordfd.so
-   doins pppd/plugins/winbind.so
-   doins pppd/plugins/pppoe/pppoe.so
-   doins pppd/plugins/pppol2tp/openl2tp.so
-   doins pppd/plugins/pppol2tp/pppol2tp.so
-   if use atm ; then
-   doins pppd/plugins/pppoatm/pppoatm.so
-   fi
-   if use dhcp ; then

[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2022-05-05 Thread Lars Wendler
commit: efbe724d52da612394800212d386e4d82de2994a
Author: Dillon  simplelogin  co>
AuthorDate: Wed May  4 22:58:02 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu May  5 08:36:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efbe724d

net-dialup/ppp bug #828772 Remove IPX

Remove IPX, allowing build on musl systems.
Note that IPX support has been removed from kernel >= 5.15

Closes: https://bugs.gentoo.org/828772
Signed-off-by: Dillon Butler  vanish-media.xyz>
Closes: https://github.com/gentoo/gentoo/pull/25331
Signed-off-by: Lars Wendler  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r6.ebuild | 253 +
 1 file changed, 253 insertions(+)

diff --git a/net-dialup/ppp/ppp-2.4.9-r6.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r6.ebuild
new file mode 100644
index ..768c97c176e6
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.9-r6.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2021 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius 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}
+   != 5.15
+   sed -i 's/-DIPX_CHANGE //' pppd/Makefile.linux || die
+
+   if use atm ; then
+   einfo "Enabling PPPoATM support"
+   sed -i '/^#HAVE_LIBATM=yes/s:#::' \
+   pppd/plugins/pppoatm/Makefile.linux || die
+   fi
+
+   if ! use activefilter ; then
+   einfo "Disabling active filter"
+   sed -i '/^FILTER=y/s:^:#:' pppd/Makefile.linux || die
+   fi
+
+   if use pam ; then
+   einfo "Enabling PAM"
+   sed -i '/^#USE_PAM=y/s:^#::' pppd/Makefile.linux || die
+   fi
+
+   if ! use ipv6 ; then
+   einfo "Disabling IPv6"
+   sed -i '/^HAVE_INET6/s:^:#:' pppd/Makefile.linux || die
+   else
+   echo "+ipv6" >> etc.ppp/options || die
+   fi
+
+   einfo "Enabling CBCP"
+   sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die
+
+   if use dhcp ; then
+   einfo "Adding ppp-dhcp plugin files"
+   sed \
+   -e '/^SUBDIRS :=/s:$: dhcp:' \
+   -i pppd/plugins/Makefile.linux || die
+   fi
+
+   if ! use eap-tls ; then
+   einfo "Disabling EAP-TLS pppd auth support"
+   sed -i '/^USE_EAPTLS=y/s:^:#:' pppd/Makefile.linux || die
+   einfo "Disabling EAP-TLS plugin support"
+   sed -i '/^CFLAGS += -DUSE_EAPTLS=1/s:^:#:' \
+   pppd/plugins/Makefile.linux || die
+   fi
+
+   # Set correct libdir
+   sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
+   pppd/{pathnames.h,pppd.8} || die
+
+   if use radius ; then
+   # Set the right paths in radiusclient.conf
+   sed -e "s:/usr/local/etc:/etc:" \
+   -e "s:/usr/local/sbin:/usr/sbin:" \
+   -i pppd/plugins/radius/etc/radiusclient.conf || die
+   # Set config dir to /etc/ppp/radius
+   sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
+   pppd/plugins/radius/{*.8,*.c,*.h} \
+   pppd/plugins/radius/etc/* || die
+   else
+   einfo "Disabling radius"
+   sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die
+   fi
+
+   if use systemd ; then
+   einfo "Enabling systemd notification"
+   sed '/SYSTEMD=/s@^#@@' -i pppd/Makefile.linux || die
+   fi
+
+   # Respect our pkg-config settings.
+   sed -i \
+   -e 's:pkg-config:$(PKG_CONFIG):' \
+   contrib/pppgetpass/Makefile.linux || die
+   sed -i \
+   -e '/^LIBS/{s:-L/usr/local/ssl/lib::;s:-lcrypto:`$(PKG_CONFIG) 
--libs libcrypto`:}' \
+   pppd/Makefile.linux || die
+
+   eapply_user #549588
+}
+
+src_compile() {
+   tc-export AR CC PKG_CONFIG
+   emake CC="${CC}" COPTS="${CFLAGS} -D_GNU_SOURCE"
+
+   # build pppgetpass
+   cd contrib/pppgetpass || die
+   if use gtk ; then
+   emake -f Makefile.linux
+   else
+   

[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-12-06 Thread Sam James
commit: aab8bd0521b9d0a3c7f58f5fa0579ac313509c5e
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  6 15:20:52 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  6 15:20:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aab8bd05

net-dialup/ppp: Stabilize 2.4.9-r5 arm, #828267

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r5.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r5.ebuild
index 321e43a68ce2..6dc1478db04b 100644
--- a/net-dialup/ppp/ppp-2.4.9-r5.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-12-06 Thread Sam James
commit: 5c9ef5720bbf250a0f0a47dff9ff8a37fd724f65
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  6 15:17:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  6 15:17:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c9ef572

net-dialup/ppp: Stabilize 2.4.9-r5 arm64, #828267

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r5.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r5.ebuild
index e01a2e65806e..321e43a68ce2 100644
--- a/net-dialup/ppp/ppp-2.4.9-r5.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-12-05 Thread Sam James
commit: 276c08bad7959ee0f176f0d17ccbfdc557401681
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  6 01:17:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  6 01:17:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=276c08ba

net-dialup/ppp: Stabilize 2.4.9-r5 sparc, #828267

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r5.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r5.ebuild
index 058a8878d6a8..e01a2e65806e 100644
--- a/net-dialup/ppp/ppp-2.4.9-r5.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-12-05 Thread Sam James
commit: 1836d376d6efbd843627cc833ef9cc4bf5177262
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  5 18:29:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  5 18:29:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1836d376

net-dialup/ppp: Stabilize 2.4.9-r5 x86, #828267

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r5.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r5.ebuild
index 08fa00b184c8..a063eda02a9c 100644
--- a/net-dialup/ppp/ppp-2.4.9-r5.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-12-04 Thread Sam James
commit: 27394b6ffec3c3867dcfef1a3df6c156fcb61a16
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  5 03:59:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  5 03:59:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27394b6f

net-dialup/ppp: Stabilize 2.4.9-r5 amd64, #828267

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r5.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r5.ebuild
index 679207465c5a..08fa00b184c8 100644
--- a/net-dialup/ppp/ppp-2.4.9-r5.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius systemd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-08-27 Thread Lars Wendler
commit: 88bb9835259c5ee71c994269963e2723fb6b0fc7
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Aug 27 14:19:38 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Aug 27 14:19:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88bb9835

net-dialup/ppp: Fixed "|| die" call

Signed-off-by: Lars Wendler  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r5.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r5.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r5.ebuild
index 092ae4b58bc..679207465c5 100644
--- a/net-dialup/ppp/ppp-2.4.9-r5.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r5.ebuild
@@ -99,8 +99,7 @@ src_prepare() {
 
if use systemd ; then
einfo "Enabling systemd notification"
-   sed '/SYSTEMD=/s@^#@@' -i pppd/Makefile.linux \
-   die
+   sed '/SYSTEMD=/s@^#@@' -i pppd/Makefile.linux || die
fi
 
# Respect our pkg-config settings.



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-08-27 Thread Lars Wendler
commit: 62e75843d667106005d59275a569af6a7ae2b294
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Aug 27 12:02:06 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Aug 27 12:13:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62e75843

net-dialup/ppp: Revbump to implement systemd notification

Thanks-to: Steven Davies  steev.me.uk>
Closes: https://bugs.gentoo.org/810652
Signed-off-by: Lars Wendler  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r5.ebuild | 251 +
 1 file changed, 251 insertions(+)

diff --git a/net-dialup/ppp/ppp-2.4.9-r5.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r5.ebuild
new file mode 100644
index 000..092ae4b58bc
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.9-r5.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2021 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius 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}
+   !> etc.ppp/options || die
+   fi
+
+   einfo "Enabling CBCP"
+   sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die
+
+   if use dhcp ; then
+   einfo "Adding ppp-dhcp plugin files"
+   sed \
+   -e '/^SUBDIRS :=/s:$: dhcp:' \
+   -i pppd/plugins/Makefile.linux || die
+   fi
+
+   if ! use eap-tls ; then
+   einfo "Disabling EAP-TLS pppd auth support"
+   sed -i '/^USE_EAPTLS=y/s:^:#:' pppd/Makefile.linux || die
+   einfo "Disabling EAP-TLS plugin support"
+   sed -i '/^CFLAGS += -DUSE_EAPTLS=1/s:^:#:' \
+   pppd/plugins/Makefile.linux || die
+   fi
+
+   # Set correct libdir
+   sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
+   pppd/{pathnames.h,pppd.8} || die
+
+   if use radius ; then
+   # Set the right paths in radiusclient.conf
+   sed -e "s:/usr/local/etc:/etc:" \
+   -e "s:/usr/local/sbin:/usr/sbin:" \
+   -i pppd/plugins/radius/etc/radiusclient.conf || die
+   # Set config dir to /etc/ppp/radius
+   sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
+   pppd/plugins/radius/{*.8,*.c,*.h} \
+   pppd/plugins/radius/etc/* || die
+   else
+   einfo "Disabling radius"
+   sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die
+   fi
+
+   if use systemd ; then
+   einfo "Enabling systemd notification"
+   sed '/SYSTEMD=/s@^#@@' -i pppd/Makefile.linux \
+   die
+   fi
+
+   # Respect our pkg-config settings.
+   sed -i \
+   -e 's:pkg-config:$(PKG_CONFIG):' \
+   contrib/pppgetpass/Makefile.linux || die
+   sed -i \
+   -e '/^LIBS/{s:-L/usr/local/ssl/lib::;s:-lcrypto:`$(PKG_CONFIG) 
--libs libcrypto`:}' \
+   pppd/Makefile.linux || die
+
+   eapply_user #549588
+}
+
+src_compile() {
+   tc-export AR CC PKG_CONFIG
+   emake CC="${CC}" COPTS="${CFLAGS} -D_GNU_SOURCE"
+
+   # build pppgetpass
+   cd contrib/pppgetpass || die
+   if use gtk ; then
+   emake -f Makefile.linux
+   else
+   emake pppgetpass.vt
+   fi
+}
+
+src_install() {
+   local i
+   for i in chat pppd pppdump pppstats ; do
+   doman ${i}/${i}.8
+   dosbin ${i}/${i}
+   done
+   fperms u+s-w /usr/sbin/pppd
+
+   # Install pppd header files
+   emake -C pppd INSTROOT="${D}" install-devel
+
+   dosbin pppd/plugins/pppoe/pppoe-discovery
+
+   dodir /etc/ppp/peers
+   insinto /etc/ppp
+   insopts -m0600
+   newins etc.ppp/pap-secrets pap-secrets.example
+   newins etc.ppp/chap-secrets chap-secrets.example
+
+   insopts -m0644
+   doins etc.ppp/options
+
+   if use pam; then
+   pamd_mimic_system ppp auth account session
+   fi
+
+   local PLUGINS_DIR="/usr/$(get_libdir)/pppd/${PV}"
+   insinto "${PLUGINS_DIR}"
+   insopts -m0755
+   doins pppd/plugins/minconn.so
+   doins 

[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-07-13 Thread Lars Wendler
commit: a7fb43f73a44554b3db5e876a22f9e74446d494b
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jul 13 09:19:45 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jul 13 09:22:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7fb43f7

net-dialup/ppp: Revbump to fix Acct Session ID in radius

Bumped straight to stable

Thanks-to: Jaco Kroon  uls.co.za>
Closes: https://bugs.gentoo.org/800668
Signed-off-by: Lars Wendler  gentoo.org>

 net-dialup/ppp/Manifest | 2 +-
 net-dialup/ppp/{ppp-2.4.9-r3.ebuild => ppp-2.4.9-r4.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 73a1151e4a1..8c80bdd736d 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,3 +1,3 @@
-DIST ppp-2.4.9-patches-02.tar.xz 18056 BLAKE2B 
d2632811b7146214ad4cf59bee2834abda59b04c44990d5c135d85fad883371b4813e145e11a6bdff449670acda2e2ef3647c54387800f23111e975b54c5e08c
 SHA512 
5978aa12cd669f858acf2ca9d604d9e830c4d2bd21ed1473823d4da02866d693724d0682c0d65fa4569b89d6b6e430505d307556a61f4ff927590d1357d52e93
+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-dhcpc.tgz 33497 BLAKE2B 
ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da
 SHA512 
aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738

diff --git a/net-dialup/ppp/ppp-2.4.9-r3.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r4.ebuild
similarity index 99%
rename from net-dialup/ppp/ppp-2.4.9-r3.ebuild
rename to net-dialup/ppp/ppp-2.4.9-r4.ebuild
index ee2c42158a5..6459f5145ad 100644
--- a/net-dialup/ppp/ppp-2.4.9-r3.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit linux-info pam toolchain-funcs
 
-PATCH_TARBALL_NAME="${PN}-2.4.9-patches-02"
+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



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp-scripts/

2021-06-12 Thread Mike Gilbert
commit: 6cc4ef67b5af5c1e809bb6846ea0d619a350fa69
Author: David Michael  gmail  com>
AuthorDate: Sat Jun 12 18:35:50 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jun 12 18:45:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cc4ef67

net-dialup/ppp-scripts: EAPI 7

Closes: https://bugs.gentoo.org/795657
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: David Michael  gmail.com>
Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp-scripts/ppp-scripts-0.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-dialup/ppp-scripts/ppp-scripts-0.ebuild 
b/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
index 9299c2d744b..5cfe76c23ab 100644
--- a/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
+++ b/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Common set of scripts for various PPP implementations"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
@@ -20,8 +20,8 @@ src_install() {
exeinto /etc/ppp
for i in ip-up ip-down ; do
doexe "scripts/${i}"
-   insinto /etc/ppp/${i}.d
dosym ${i} /etc/ppp/${i/ip/ipv6}
+   insinto /etc/ppp/${i}.d
doins "scripts/${i}.d"/*
done
 }



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-06-12 Thread Mike Gilbert
commit: 6155a61ea868948eebbfd12f0f4054c437e97aa6
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Jun 12 18:48:57 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jun 12 18:48:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6155a61e

net-dialup/ppp: remove redundant USE flag descriptions

Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/net-dialup/ppp/metadata.xml b/net-dialup/ppp/metadata.xml
index a0beaacabe4..4088e8b313f 100644
--- a/net-dialup/ppp/metadata.xml
+++ b/net-dialup/ppp/metadata.xml
@@ -11,8 +11,6 @@
   
   
 Enables active filter support
-Enables ATM (Asynchronous Transfer Mode) protocol
-support
 Installs PPP DHCP client plugin for IP address allocation
 by a DHCP server (see http://www.netservers.co.uk/gpl/)
 Enables support for Extensible Authentication
@@ -21,7 +19,6 @@
 Installs GTK+ password prompting program that can be used
 by passprompt.so PPP plugin for reading the password from a X11 input
 terminal
-Enables support for IP version 6
 Enables RADIUS support
   
   



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-06-12 Thread Mike Gilbert
commit: 517654d83e64c8c38435f388c1cb9cd8390330f6
Author: David Michael  gmail  com>
AuthorDate: Sat Jun 12 18:38:36 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jun 12 18:45:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=517654d8

net-dialup/ppp: respect CC with USE=gtk

Closes: https://bugs.gentoo.org/795660
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: David Michael  gmail.com>
Signed-off-by: Mike Gilbert  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r2.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
index 61bbe8a8906..a949862b2b6 100644
--- a/net-dialup/ppp/ppp-2.4.9-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
@@ -107,8 +107,8 @@ src_prepare() {
 }
 
 src_compile() {
-   tc-export AR PKG_CONFIG
-   emake COPTS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)"
+   tc-export AR CC PKG_CONFIG
+   emake CC="${CC}" COPTS="${CFLAGS} -D_GNU_SOURCE"
 
# build pppgetpass
cd contrib/pppgetpass || die



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-05-13 Thread David Seifert
commit: de99ed2a83bcdacfd4ca30239b8a43e7edc8ef7f
Author: Sam James  gentoo  org>
AuthorDate: Thu May 13 13:53:55 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu May 13 13:53:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de99ed2a

net-dialup/ppp: drop unused multilib inherit

Signed-off-by: David Seifert  gentoo.org>

 net-dialup/ppp/ppp-2.4.8-r1.ebuild | 6 +++---
 net-dialup/ppp/ppp-2.4.9-r2.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-dialup/ppp/ppp-2.4.8-r1.ebuild 
b/net-dialup/ppp/ppp-2.4.8-r1.ebuild
index e280893bbb4..918a005e2ed 100644
--- a/net-dialup/ppp/ppp-2.4.8-r1.ebuild
+++ b/net-dialup/ppp/ppp-2.4.8-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-info multilib pam toolchain-funcs
+inherit linux-info pam toolchain-funcs
 
 PATCH_VER="02"
 DESCRIPTION="Point-to-Point Protocol (PPP)"
@@ -76,11 +76,11 @@ src_prepare() {
pppd/{pathnames.h,pppd.8} || die
 
if use radius ; then
-   #set the right paths in radiusclient.conf
+   # Set the right paths in radiusclient.conf
sed -e "s:/usr/local/etc:/etc:" \
-e "s:/usr/local/sbin:/usr/sbin:" \
-i pppd/plugins/radius/etc/radiusclient.conf || die
-   #set config dir to /etc/ppp/radius
+   # Set config dir to /etc/ppp/radius
sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
pppd/plugins/radius/{*.8,*.c,*.h} \
pppd/plugins/radius/etc/* || die

diff --git a/net-dialup/ppp/ppp-2.4.9-r2.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
index 5150bff5a5b..61bbe8a8906 100644
--- a/net-dialup/ppp/ppp-2.4.9-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-info multilib pam toolchain-funcs
+inherit linux-info pam toolchain-funcs
 
 PATCH_TARBALL_NAME="${PN}-2.4.9-patches-02"
 DESCRIPTION="Point-to-Point Protocol (PPP)"
@@ -82,11 +82,11 @@ src_prepare() {
pppd/{pathnames.h,pppd.8} || die
 
if use radius ; then
-   #set the right paths in radiusclient.conf
+   # Set the right paths in radiusclient.conf
sed -e "s:/usr/local/etc:/etc:" \
-e "s:/usr/local/sbin:/usr/sbin:" \
-i pppd/plugins/radius/etc/radiusclient.conf || die
-   #set config dir to /etc/ppp/radius
+   # Set config dir to /etc/ppp/radius
sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
pppd/plugins/radius/{*.8,*.c,*.h} \
pppd/plugins/radius/etc/* || die



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-05-01 Thread Mikle Kolyada
commit: 023c4f77e653f609d88ea29d4c5aaa4ecb3e
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat May  1 07:13:11 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat May  1 07:13:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=023c4f77

net-dialup/ppp: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-dialup/ppp/ppp-2.4.8-r1.ebuild | 5 ++---
 net-dialup/ppp/ppp-2.4.9-r2.ebuild | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/net-dialup/ppp/ppp-2.4.8-r1.ebuild 
b/net-dialup/ppp/ppp-2.4.8-r1.ebuild
index 387ac5a6dbd..94962cff030 100644
--- a/net-dialup/ppp/ppp-2.4.8-r1.ebuild
+++ b/net-dialup/ppp/ppp-2.4.8-r1.ebuild
@@ -15,15 +15,14 @@ 
SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
-IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
+IUSE="activefilter atm dhcp eap-tls gtk ipv6 pam radius"
 
 DEPEND="
activefilter? ( net-libs/libpcap )
atm? ( net-dialup/linux-atm )
pam? ( sys-libs/pam )
gtk? ( x11-libs/gtk+:2 )
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
+   dev-libs/openssl:0=
 "
 RDEPEND="${DEPEND}
!https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
-IUSE="activefilter atm dhcp +eap-tls gtk ipv6 libressl pam radius"
+IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius"
 
 DEPEND="
activefilter? ( net-libs/libpcap )
atm? ( net-dialup/linux-atm )
pam? ( sys-libs/pam )
gtk? ( x11-libs/gtk+:2 )
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
+   dev-libs/openssl:0=
 "
 RDEPEND="${DEPEND}
!

[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-04-11 Thread Sam James
commit: a76ae282b01c3ce2f220455aa7381facf81b0e4d
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 11 15:55:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 11 15:55:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a76ae282

net-dialup/ppp: Stabilize 2.4.9-r2 ppc, #782100

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r2.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
index 8095cf5b285..a1bdb87aeff 100644
--- a/net-dialup/ppp/ppp-2.4.9-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 libressl pam radius"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-04-11 Thread Sam James
commit: d9410cb35b300f42eb0ff6f649c9b719aadf6553
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 11 15:43:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 11 15:43:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9410cb3

net-dialup/ppp: Stabilize 2.4.9-r2 amd64, #782100

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r2.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
index 1668de9d8ce..8095cf5b285 100644
--- a/net-dialup/ppp/ppp-2.4.9-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
sparc x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 libressl pam radius"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-04-11 Thread Sam James
commit: b50f284010fc58e03b310b3c61d04efb0bfd8bec
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 11 15:43:34 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 11 15:43:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b50f2840

net-dialup/ppp: Stabilize 2.4.9-r2 x86, #782100

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r2.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
index f5f3cc674f3..1668de9d8ce 100644
--- a/net-dialup/ppp/ppp-2.4.9-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
sparc x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 libressl pam radius"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-04-11 Thread Sam James
commit: d14149f55ddc0e9881dfc9768731d7dc9c53afea
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 11 15:41:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 11 15:41:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d14149f5

net-dialup/ppp: Stabilize 2.4.9-r2 sparc, #782100

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r2.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
index afd0d1c4f5d..f5f3cc674f3 100644
--- a/net-dialup/ppp/ppp-2.4.9-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
sparc ~x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 libressl pam radius"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-04-11 Thread Sam James
commit: 7c6f43837f4b154901b2099017ff96e14268cbe1
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 11 15:41:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 11 15:41:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c6f4383

net-dialup/ppp: Stabilize 2.4.9-r2 arm, #782100

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r2.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
index fb10d278b27..afd0d1c4f5d 100644
--- a/net-dialup/ppp/ppp-2.4.9-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
~sparc ~x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 libressl pam radius"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-04-11 Thread Sam James
commit: 657da3a887003ab6f15a743ee36a3c06f7e89520
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 11 15:39:55 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 11 15:39:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=657da3a8

net-dialup/ppp: Stabilize 2.4.9-r2 ppc64, #782100

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r2.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
index 7976760e3e1..fb10d278b27 100644
--- a/net-dialup/ppp/ppp-2.4.9-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
~sparc ~x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 libressl pam radius"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-04-11 Thread Sam James
commit: af6afc57d6cb08648c241ca880e2a4fa1d52abbf
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 11 13:31:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 11 13:31:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af6afc57

net-dialup/ppp: Stabilize 2.4.9-r2 arm64, #782100

Signed-off-by: Sam James  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r2.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
index 6a3902fbd72..7976760e3e1 100644
--- a/net-dialup/ppp/ppp-2.4.9-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 libressl pam radius"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-02-26 Thread Lars Wendler
commit: 5493d58f7193edba37a56af5f1afdd631554c115
Author: Adrian Ratiu  collabora  com>
AuthorDate: Fri Feb 19 16:46:27 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Feb 26 16:53:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5493d58f

net-dialup/ppp: add back option to disable eap-tls

The eap-tls use flag went away between ppp-2.4.8 and ppp-2.4.9
maybe due to the fact that upstream now supports eap-tls and has
it enabled by default (no more ebuild patches for it).

Regardless, having an option to disable it is still useful for
those who want to minimize attack vector surface so add it back.

Signed-off-by: Adrian Ratiu  collabora.com>
Closes: https://github.com/gentoo/gentoo/pull/19546
Signed-off-by: Lars Wendler  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r2.ebuild | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r2.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
index ac481c696fb..6a3902fbd72 100644
--- a/net-dialup/ppp/ppp-2.4.9-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
-IUSE="activefilter atm dhcp gtk ipv6 libressl pam radius"
+IUSE="activefilter atm dhcp +eap-tls gtk ipv6 libressl pam radius"
 
 DEPEND="
activefilter? ( net-libs/libpcap )
@@ -69,6 +69,14 @@ src_prepare() {
-i pppd/plugins/Makefile.linux || die
fi
 
+   if ! use eap-tls ; then
+   einfo "Disabling EAP-TLS pppd auth support"
+   sed -i '/^USE_EAPTLS=y/s:^:#:' pppd/Makefile.linux || die
+   einfo "Disabling EAP-TLS plugin support"
+   sed -i '/^CFLAGS += -DUSE_EAPTLS=1/s:^:#:' \
+   pppd/plugins/Makefile.linux || die
+   fi
+
# Set correct libdir
sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
pppd/{pathnames.h,pppd.8} || die



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-01-22 Thread Mikle Kolyada
commit: 5ecd2ae79529fbfc8adf804304511821a19497e6
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Jan 22 15:52:26 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Jan 22 15:52:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ecd2ae7

net-dialup/ppp: install pam files conditionally

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-dialup/ppp/{ppp-2.4.8.ebuild => ppp-2.4.8-r1.ebuild}| 6 --
 net-dialup/ppp/{ppp-2.4.9-r1.ebuild => ppp-2.4.9-r2.ebuild} | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/net-dialup/ppp/ppp-2.4.8.ebuild 
b/net-dialup/ppp/ppp-2.4.8-r1.ebuild
similarity index 98%
rename from net-dialup/ppp/ppp-2.4.8.ebuild
rename to net-dialup/ppp/ppp-2.4.8-r1.ebuild
index e0bd7d646d7..387ac5a6dbd 100644
--- a/net-dialup/ppp/ppp-2.4.8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -135,7 +135,9 @@ src_install() {
insopts -m0644
doins etc.ppp/options
 
-   pamd_mimic_system ppp auth account session
+   if use pam; then
+   pamd_mimic_system ppp auth account session
+   fi
 
local PLUGINS_DIR="/usr/$(get_libdir)/pppd/${PV}"
insinto "${PLUGINS_DIR}"

diff --git a/net-dialup/ppp/ppp-2.4.9-r1.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
similarity index 99%
rename from net-dialup/ppp/ppp-2.4.9-r1.ebuild
rename to net-dialup/ppp/ppp-2.4.9-r2.ebuild
index 89627e1475d..ac481c696fb 100644
--- a/net-dialup/ppp/ppp-2.4.9-r1.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
@@ -133,7 +133,9 @@ src_install() {
insopts -m0644
doins etc.ppp/options
 
-   pamd_mimic_system ppp auth account session
+   if use pam; then
+   pamd_mimic_system ppp auth account session
+   fi
 
local PLUGINS_DIR="/usr/$(get_libdir)/pppd/${PV}"
insinto "${PLUGINS_DIR}"



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-01-05 Thread Lars Wendler
commit: 72db8dbf2eb92d55b726211d2deeea254e0cf30c
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jan  5 16:58:54 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jan  5 16:59:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72db8dbf

net-dialup/ppp: Adjusted net-misc/netifrc blocker

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 net-dialup/ppp/ppp-2.4.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.9-r1.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r1.ebuild
index 203ef94fa00..89627e1475d 100644
--- a/net-dialup/ppp/ppp-2.4.9-r1.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r1.ebuild
@@ -26,7 +26,7 @@ DEPEND="
libressl? ( dev-libs/libressl:= )
 "
 RDEPEND="${DEPEND}
-   !

[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-01-05 Thread Lars Wendler
commit: c8e50e56b3d003cbcad7c2020fcec3daaf42c43f
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jan  5 16:48:38 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jan  5 16:49:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8e50e56

net-dialup/ppp: Don't call CC directly

Closes: https://bugs.gentoo.org/763915
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 net-dialup/ppp/Manifest  | 2 +-
 net-dialup/ppp/{ppp-2.4.9.ebuild => ppp-2.4.9-r1.ebuild} | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 5ac15a69943..636a3c9114b 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,5 +1,5 @@
 DIST ppp-2.4.8-patches-02.tar.xz 39868 BLAKE2B 
b933bbdabb7ace06cb20b77012a21621f2be7b78c2bf6a57c99e4feef0e22828406ea46046f7f7c80a52821105da45f65b1d82d7bb98f6431946b3f3eaca99f7
 SHA512 
f987d755bb9d10b2ce7f9bc7ee9242af46dae24c5d964ec9b130d56ab818940ed5f45fa25e3323ec2eefad7d3a487d8dc49406b7534738952430cb8c4a409591
 DIST ppp-2.4.8.tar.gz 697530 BLAKE2B 
235114288699db45501bc7d9ce8f36c0b5684ab0dab09da93d7f2b4f7c3eca030ae26e34dfff25efa971374fbd7fde62f121ea6aa69872658f44c5ac8c7850a2
 SHA512 
a99b3b6c7bd80cd133bda4e29d33c793a76f3b67e1f8db774547e88932ce29564fad390a4f51d3fe30a75e006499b95000b042ae0f64cd360548426f8091a478
-DIST ppp-2.4.9-patches-01.tar.xz 17856 BLAKE2B 
f344f0a17b98c87414bd5b3050da32f00812792bcb0b59fe88622c9bbff8f5919529628f4bd218ead9f243f7664673e9b83f2557698759f1253fd8d7bbbc7fb1
 SHA512 
be2b17400420829451a7c42f7d89e3349cc26830ce3e816852a25faba1ea4585a5b2c5c727df957a746b800eb7f9c44a00ab5cff93d61793933cadfc8202fbf1
+DIST ppp-2.4.9-patches-02.tar.xz 18056 BLAKE2B 
d2632811b7146214ad4cf59bee2834abda59b04c44990d5c135d85fad883371b4813e145e11a6bdff449670acda2e2ef3647c54387800f23111e975b54c5e08c
 SHA512 
5978aa12cd669f858acf2ca9d604d9e830c4d2bd21ed1473823d4da02866d693724d0682c0d65fa4569b89d6b6e430505d307556a61f4ff927590d1357d52e93
 DIST ppp-2.4.9.tar.gz 719904 BLAKE2B 
7ba3eb8c98fec5599635dbd302399617e1075f3a1df090f1a94ce2bb8a5c7631e6eea82246adc33711aba5fe95e7ba7c982e2cbf1fb0d71e45f877d9b092ffb7
 SHA512 
c309f8f69f534c05547cd2f66dade0e0f198ea4c2928a7e899e660280786b3e965437a67b8c5bb81c59d0fa1818b4eb7b701d2dce015a420d380422d2bca4e1a
 DIST ppp-dhcpc.tgz 33497 BLAKE2B 
ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da
 SHA512 
aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738

diff --git a/net-dialup/ppp/ppp-2.4.9.ebuild 
b/net-dialup/ppp/ppp-2.4.9-r1.ebuild
similarity index 98%
rename from net-dialup/ppp/ppp-2.4.9.ebuild
rename to net-dialup/ppp/ppp-2.4.9-r1.ebuild
index bf179996e7a..203ef94fa00 100644
--- a/net-dialup/ppp/ppp-2.4.9.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit linux-info multilib pam toolchain-funcs
 
-PATCH_TARBALL_NAME="${PN}-2.4.9-patches-01"
+PATCH_TARBALL_NAME="${PN}-2.4.9-patches-02"
 DESCRIPTION="Point-to-Point Protocol (PPP)"
 HOMEPAGE="https://ppp.samba.org/;
 SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
@@ -99,8 +99,8 @@ src_prepare() {
 }
 
 src_compile() {
-   tc-export AR CC PKG_CONFIG
-   emake COPTS="${CFLAGS} -D_GNU_SOURCE"
+   tc-export AR PKG_CONFIG
+   emake COPTS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)"
 
# build pppgetpass
cd contrib/pppgetpass || die



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-01-05 Thread Lars Wendler
commit: b1b2708c26923dfa6472089af5172495951ae3a5
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jan  5 12:25:49 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jan  5 15:20:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1b2708c

net-dialup/ppp: Bump to version 2.4.9

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 net-dialup/ppp/Manifest |   2 +
 net-dialup/ppp/ppp-2.4.9.ebuild | 233 
 2 files changed, 235 insertions(+)

diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 93b9820023d..5ac15a69943 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,3 +1,5 @@
 DIST ppp-2.4.8-patches-02.tar.xz 39868 BLAKE2B 
b933bbdabb7ace06cb20b77012a21621f2be7b78c2bf6a57c99e4feef0e22828406ea46046f7f7c80a52821105da45f65b1d82d7bb98f6431946b3f3eaca99f7
 SHA512 
f987d755bb9d10b2ce7f9bc7ee9242af46dae24c5d964ec9b130d56ab818940ed5f45fa25e3323ec2eefad7d3a487d8dc49406b7534738952430cb8c4a409591
 DIST ppp-2.4.8.tar.gz 697530 BLAKE2B 
235114288699db45501bc7d9ce8f36c0b5684ab0dab09da93d7f2b4f7c3eca030ae26e34dfff25efa971374fbd7fde62f121ea6aa69872658f44c5ac8c7850a2
 SHA512 
a99b3b6c7bd80cd133bda4e29d33c793a76f3b67e1f8db774547e88932ce29564fad390a4f51d3fe30a75e006499b95000b042ae0f64cd360548426f8091a478
+DIST ppp-2.4.9-patches-01.tar.xz 17856 BLAKE2B 
f344f0a17b98c87414bd5b3050da32f00812792bcb0b59fe88622c9bbff8f5919529628f4bd218ead9f243f7664673e9b83f2557698759f1253fd8d7bbbc7fb1
 SHA512 
be2b17400420829451a7c42f7d89e3349cc26830ce3e816852a25faba1ea4585a5b2c5c727df957a746b800eb7f9c44a00ab5cff93d61793933cadfc8202fbf1
+DIST ppp-2.4.9.tar.gz 719904 BLAKE2B 
7ba3eb8c98fec5599635dbd302399617e1075f3a1df090f1a94ce2bb8a5c7631e6eea82246adc33711aba5fe95e7ba7c982e2cbf1fb0d71e45f877d9b092ffb7
 SHA512 
c309f8f69f534c05547cd2f66dade0e0f198ea4c2928a7e899e660280786b3e965437a67b8c5bb81c59d0fa1818b4eb7b701d2dce015a420d380422d2bca4e1a
 DIST ppp-dhcpc.tgz 33497 BLAKE2B 
ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da
 SHA512 
aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738

diff --git a/net-dialup/ppp/ppp-2.4.9.ebuild b/net-dialup/ppp/ppp-2.4.9.ebuild
new file mode 100644
index 000..bf179996e7a
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.9.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info multilib pam toolchain-funcs
+
+PATCH_TARBALL_NAME="${PN}-2.4.9-patches-01"
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+IUSE="activefilter atm dhcp gtk ipv6 libressl pam radius"
+
+DEPEND="
+   activefilter? ( net-libs/libpcap )
+   atm? ( net-dialup/linux-atm )
+   pam? ( sys-libs/pam )
+   gtk? ( x11-libs/gtk+:2 )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
+"
+RDEPEND="${DEPEND}
+   !> etc.ppp/options || die
+   fi
+
+   einfo "Enabling CBCP"
+   sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die
+
+   if use dhcp ; then
+   einfo "Adding ppp-dhcp plugin files"
+   sed \
+   -e '/^SUBDIRS :=/s:$: dhcp:' \
+   -i pppd/plugins/Makefile.linux || die
+   fi
+
+   # Set correct libdir
+   sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
+   pppd/{pathnames.h,pppd.8} || die
+
+   if use radius ; then
+   #set the right paths in radiusclient.conf
+   sed -e "s:/usr/local/etc:/etc:" \
+   -e "s:/usr/local/sbin:/usr/sbin:" \
+   -i pppd/plugins/radius/etc/radiusclient.conf || die
+   #set config dir to /etc/ppp/radius
+   sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
+   pppd/plugins/radius/{*.8,*.c,*.h} \
+   pppd/plugins/radius/etc/* || die
+   else
+   einfo "Disabling radius"
+   sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die
+   fi
+
+   # Respect our pkg-config settings.
+   sed -i \
+   -e 's:pkg-config:$(PKG_CONFIG):' \
+   contrib/pppgetpass/Makefile.linux || die
+   sed -i \
+   -e '/^LIBS/{s:-L/usr/local/ssl/lib::;s:-lcrypto:`$(PKG_CONFIG) 
--libs libcrypto`:}' \
+   pppd/Makefile.linux || die
+
+   eapply_user #549588
+}
+
+src_compile() {
+ 

[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-01-04 Thread Lars Wendler
commit: a60bceec15cf5a812dd469c94bd527f70621a266
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jan  4 12:08:38 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jan  4 12:08:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a60bceec

net-dialup/ppp: Fixed broken patch tarball

Closes: https://bugs.gentoo.org/763498
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 net-dialup/ppp/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 3d8a60aa5e9..93b9820023d 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,3 +1,3 @@
-DIST ppp-2.4.8-patches-02.tar.xz 39528 BLAKE2B 
0bd4a62f188d7a691d6c0a45f93728ffd991fcbfbc7671dcb07906b4b4e20b8b4eb883b34045d1315a87eeca9a1bfe95703e3d10b63fa42b2c9e6e2ba3d6925b
 SHA512 
aacc18ebbe19fc4a55487dd58f529026d81b968e3c0aa4da5de22f30f7862bb3418be5b5f150ae6bd56bacc3c99010119f2cfd9e8a2d99816ca4294653ae98a8
+DIST ppp-2.4.8-patches-02.tar.xz 39868 BLAKE2B 
b933bbdabb7ace06cb20b77012a21621f2be7b78c2bf6a57c99e4feef0e22828406ea46046f7f7c80a52821105da45f65b1d82d7bb98f6431946b3f3eaca99f7
 SHA512 
f987d755bb9d10b2ce7f9bc7ee9242af46dae24c5d964ec9b130d56ab818940ed5f45fa25e3323ec2eefad7d3a487d8dc49406b7534738952430cb8c4a409591
 DIST ppp-2.4.8.tar.gz 697530 BLAKE2B 
235114288699db45501bc7d9ce8f36c0b5684ab0dab09da93d7f2b4f7c3eca030ae26e34dfff25efa971374fbd7fde62f121ea6aa69872658f44c5ac8c7850a2
 SHA512 
a99b3b6c7bd80cd133bda4e29d33c793a76f3b67e1f8db774547e88932ce29564fad390a4f51d3fe30a75e006499b95000b042ae0f64cd360548426f8091a478
 DIST ppp-dhcpc.tgz 33497 BLAKE2B 
ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da
 SHA512 
aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2021-01-03 Thread Lars Wendler
commit: 429c6f61c83d62af321d91248958117a80b25fcd
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Jan  3 23:42:03 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Jan  3 23:42:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=429c6f61

net-dialup/ppp: Fixed manifest for patch tarball

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 net-dialup/ppp/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 7ecead42b4f..3d8a60aa5e9 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,3 +1,3 @@
-DIST ppp-2.4.8-patches-02.tar.xz 39700 BLAKE2B 
8e03ecf306ff415370a96ba2eca4ecdb9daed2eaa569cabbd49b94ff279dc04081cbf6749463556ba42832f4baf6f8f4cbdc0c79d6419f57080b14f3214ca992
 SHA512 
4f2c08a8c1d659d79c18471b41aac2d18383f86ac22231993609b548f899ee32d1ea3cc25952f00b85d1357e53bad6cf93842c49a59ecf29ed20be3020378e78
+DIST ppp-2.4.8-patches-02.tar.xz 39528 BLAKE2B 
0bd4a62f188d7a691d6c0a45f93728ffd991fcbfbc7671dcb07906b4b4e20b8b4eb883b34045d1315a87eeca9a1bfe95703e3d10b63fa42b2c9e6e2ba3d6925b
 SHA512 
aacc18ebbe19fc4a55487dd58f529026d81b968e3c0aa4da5de22f30f7862bb3418be5b5f150ae6bd56bacc3c99010119f2cfd9e8a2d99816ca4294653ae98a8
 DIST ppp-2.4.8.tar.gz 697530 BLAKE2B 
235114288699db45501bc7d9ce8f36c0b5684ab0dab09da93d7f2b4f7c3eca030ae26e34dfff25efa971374fbd7fde62f121ea6aa69872658f44c5ac8c7850a2
 SHA512 
a99b3b6c7bd80cd133bda4e29d33c793a76f3b67e1f8db774547e88932ce29564fad390a4f51d3fe30a75e006499b95000b042ae0f64cd360548426f8091a478
 DIST ppp-dhcpc.tgz 33497 BLAKE2B 
ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da
 SHA512 
aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2020-04-02 Thread Lars Wendler
commit: d97a6cdaa517c0c7c2a5658100bc99ea2dc7188c
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Apr  2 07:18:30 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Apr  2 07:18:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d97a6cda

net-dialup/ppp: Security cleanup

Bug: https://bugs.gentoo.org/710308
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 net-dialup/ppp/Manifest|   2 -
 net-dialup/ppp/ppp-2.4.7-r7.ebuild | 230 -
 2 files changed, 232 deletions(-)

diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 193696f8047..7ecead42b4f 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,5 +1,3 @@
-DIST ppp-2.4.7-patches-7.tar.xz 40540 BLAKE2B 
353814692aab3012f5d5ccdecc514d69357826ea7abe64a7581c562f333d868f9766f11516721cf0b116b4c1c8b01daee306d98ef7be356af6e8d16e22fc9fac
 SHA512 
9d34c044ded09424a6d80047e88bb21130a9c2414c9ea4f52c7299d9db08b1391543b50cd97c0c8763e6943591fc325d01932b31966a1374dbfe5e977bbf4356
-DIST ppp-2.4.7.tar.gz 688117 BLAKE2B 
e1c94ce31d98674536929d19e956e4013eb2b02c20c34e6184c0b99b50262ad1cd7fb6f4a1ed302872527a0c164af340e15ad1e2eaf191392c3f6ae2de21f5dd
 SHA512 
e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2
 DIST ppp-2.4.8-patches-02.tar.xz 39700 BLAKE2B 
8e03ecf306ff415370a96ba2eca4ecdb9daed2eaa569cabbd49b94ff279dc04081cbf6749463556ba42832f4baf6f8f4cbdc0c79d6419f57080b14f3214ca992
 SHA512 
4f2c08a8c1d659d79c18471b41aac2d18383f86ac22231993609b548f899ee32d1ea3cc25952f00b85d1357e53bad6cf93842c49a59ecf29ed20be3020378e78
 DIST ppp-2.4.8.tar.gz 697530 BLAKE2B 
235114288699db45501bc7d9ce8f36c0b5684ab0dab09da93d7f2b4f7c3eca030ae26e34dfff25efa971374fbd7fde62f121ea6aa69872658f44c5ac8c7850a2
 SHA512 
a99b3b6c7bd80cd133bda4e29d33c793a76f3b67e1f8db774547e88932ce29564fad390a4f51d3fe30a75e006499b95000b042ae0f64cd360548426f8091a478
 DIST ppp-dhcpc.tgz 33497 BLAKE2B 
ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da
 SHA512 
aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738

diff --git a/net-dialup/ppp/ppp-2.4.7-r7.ebuild 
b/net-dialup/ppp/ppp-2.4.7-r7.ebuild
deleted file mode 100644
index 9d5af0507ed..000
--- a/net-dialup/ppp/ppp-2.4.7-r7.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info multilib pam toolchain-funcs
-
-PATCH_VER="7"
-DESCRIPTION="Point-to-Point Protocol (PPP)"
-HOMEPAGE="https://ppp.samba.org/;
-SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
-   https://dev.gentoo.org/~polynomial-c/${P}-patches-${PATCH_VER}.tar.xz
-   http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz;
-
-LICENSE="BSD GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 sparc 
x86"
-IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
-
-DEPEND="
-   activefilter? ( net-libs/libpcap )
-   atm? ( net-dialup/linux-atm )
-   pam? ( sys-libs/pam )
-   gtk? ( x11-libs/gtk+:2 )
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="net-dialup/ppp-scripts"
-
-src_prepare() {
-   mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
-
-   if ! use eap-tls ; then
-   rm "${WORKDIR}"/patch/8?_all_eaptls-* || die
-   fi
-   eapply "${WORKDIR}"/patch
-
-   if use atm ; then
-   einfo "Enabling PPPoATM support"
-   sed -i '/^#HAVE_LIBATM=yes/s:#::' \
-   pppd/plugins/pppoatm/Makefile.linux || die
-   fi
-
-   if ! use activefilter ; then
-   einfo "Disabling active filter"
-   sed -i '/^FILTER=y/s:^:#:' pppd/Makefile.linux || die
-   fi
-
-   if use pam ; then
-   einfo "Enabling PAM"
-   sed -i '/^#USE_PAM=y/s:^#::' pppd/Makefile.linux || die
-   fi
-
-   if use ipv6 ; then
-   einfo "Enabling IPv6"
-   sed -i '/#HAVE_INET6/s:#::' pppd/Makefile.linux || die
-   echo "+ipv6" >> etc.ppp/options || die
-   fi
-
-   einfo "Enabling CBCP"
-   sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die
-
-   if use dhcp ; then
-   einfo "Adding ppp-dhcp plugin files"
-   sed \
-   -e '/^SUBDIRS :=/s:$: dhcp:' \
-   -i pppd/plugins/Makefile.linux || die
-   fi
-
-   # Set correct libdir
-   sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
-   pppd/{pathnames.h,pppd.8} || die
-
-   if use radius ; then
-   #set the right paths in radiusclient.conf
- 

[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2020-04-01 Thread Mart Raudsepp
commit: bd97e93f7d27ac07b339fe5e7308894461fc65df
Author: Sam James (sam_c)  cmpct  info>
AuthorDate: Wed Apr  1 18:09:56 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Apr  1 20:59:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd97e93f

net-dialup/ppp: arm64 stable (bug #710308)

Signed-off-by: Sam James (sam_c)  cmpct.info>
Signed-off-by: Mart Raudsepp  gentoo.org>

 net-dialup/ppp/ppp-2.4.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.8.ebuild b/net-dialup/ppp/ppp-2.4.8.ebuild
index f0e050ae426..4e9a52e1328 100644
--- a/net-dialup/ppp/ppp-2.4.8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 sparc 
x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 sparc 
x86"
 IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2020-03-23 Thread Sergei Trofimovich
commit: a256aff03b9887abc8b16eb981977161e4c56935
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Mar 23 17:07:56 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 23 18:07:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a256aff0

net-dialup/ppp: stable 2.4.8 for hppa, bug #710308

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-dialup/ppp/ppp-2.4.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.8.ebuild b/net-dialup/ppp/ppp-2.4.8.ebuild
index fd5dff22d30..00368a869f4 100644
--- a/net-dialup/ppp/ppp-2.4.8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh 
sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh 
sparc x86"
 IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2020-03-14 Thread Sergei Trofimovich
commit: 979325b6f71cb9f635cfd4c99c35f9534e59e50e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Mar 14 19:24:08 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Mar 14 19:24:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=979325b6

net-dialup/ppp: stable 2.4.8 for ia64, bug #710308

Package-Manager: Portage-2.3.93, Repoman-2.3.20
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-dialup/ppp/ppp-2.4.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.8.ebuild b/net-dialup/ppp/ppp-2.4.8.ebuild
index 1f3260bbe9f..fd5dff22d30 100644
--- a/net-dialup/ppp/ppp-2.4.8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh 
sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh 
sparc x86"
 IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2020-03-12 Thread Agostino Sarubbo
commit: 4a69c5b21033192542a587aa9101d54c26201742
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Mar 12 16:24:18 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Mar 12 16:24:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a69c5b2

net-dialup/ppp: ppc64 stable wrt bug #710308

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-dialup/ppp/ppp-2.4.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.8.ebuild b/net-dialup/ppp/ppp-2.4.8.ebuild
index 0d3ca364300..1f3260bbe9f 100644
--- a/net-dialup/ppp/ppp-2.4.8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh 
sparc x86"
 IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2020-03-12 Thread Agostino Sarubbo
commit: fb18a7e6e2e674747a361644787820d2c8e36aec
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Mar 12 16:23:32 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Mar 12 16:23:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb18a7e6

net-dialup/ppp: ppc stable wrt bug #710308

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-dialup/ppp/ppp-2.4.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.8.ebuild b/net-dialup/ppp/ppp-2.4.8.ebuild
index b848ed4d7df..0d3ca364300 100644
--- a/net-dialup/ppp/ppp-2.4.8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
~sh sparc x86"
 IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2020-03-12 Thread Agostino Sarubbo
commit: 5fc13c5b3224549d0110b899fe87cb18cb4918a3
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Mar 12 16:22:23 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Mar 12 16:22:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc13c5b

net-dialup/ppp: arm stable wrt bug #710308

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-dialup/ppp/ppp-2.4.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.8.ebuild b/net-dialup/ppp/ppp-2.4.8.ebuild
index f6bc6a8f125..b848ed4d7df 100644
--- a/net-dialup/ppp/ppp-2.4.8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sh sparc x86"
 IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/

2020-03-11 Thread Sergei Trofimovich
commit: 3c995068a4486cda1b339b45ddf7b65147695f86
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Mar 11 06:35:26 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Mar 11 07:21:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c995068

net-dialup/ppp: stable 2.4.8 for sparc, bug #710308

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-dialup/ppp/ppp-2.4.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/ppp/ppp-2.4.8.ebuild b/net-dialup/ppp/ppp-2.4.8.ebuild
index 1ddbc6d2ea7..f6bc6a8f125 100644
--- a/net-dialup/ppp/ppp-2.4.8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sh sparc x86"
 IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
 
 DEPEND="



  1   2   >