| 1 |
commit: 5493d58f7193edba37a56af5f1afdd631554c115 |
| 2 |
Author: Adrian Ratiu <adrian.ratiu <AT> collabora <DOT> com> |
| 3 |
AuthorDate: Fri Feb 19 16:46:27 2021 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 26 16:53:06 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5493d58f |
| 7 |
|
| 8 |
net-dialup/ppp: add back option to disable eap-tls |
| 9 |
|
| 10 |
The eap-tls use flag went away between ppp-2.4.8 and ppp-2.4.9 |
| 11 |
maybe due to the fact that upstream now supports eap-tls and has |
| 12 |
it enabled by default (no more ebuild patches for it). |
| 13 |
|
| 14 |
Regardless, having an option to disable it is still useful for |
| 15 |
those who want to minimize attack vector surface so add it back. |
| 16 |
|
| 17 |
Signed-off-by: Adrian Ratiu <adrian.ratiu <AT> collabora.com> |
| 18 |
Closes: https://github.com/gentoo/gentoo/pull/19546 |
| 19 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 20 |
|
| 21 |
net-dialup/ppp/ppp-2.4.9-r2.ebuild | 10 +++++++++- |
| 22 |
1 file changed, 9 insertions(+), 1 deletion(-) |
| 23 |
|
| 24 |
diff --git a/net-dialup/ppp/ppp-2.4.9-r2.ebuild b/net-dialup/ppp/ppp-2.4.9-r2.ebuild |
| 25 |
index ac481c696fb..6a3902fbd72 100644 |
| 26 |
--- a/net-dialup/ppp/ppp-2.4.9-r2.ebuild |
| 27 |
+++ b/net-dialup/ppp/ppp-2.4.9-r2.ebuild |
| 28 |
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz |
| 29 |
LICENSE="BSD GPL-2" |
| 30 |
SLOT="0/${PV}" |
| 31 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
| 32 |
-IUSE="activefilter atm dhcp gtk ipv6 libressl pam radius" |
| 33 |
+IUSE="activefilter atm dhcp +eap-tls gtk ipv6 libressl pam radius" |
| 34 |
|
| 35 |
DEPEND=" |
| 36 |
activefilter? ( net-libs/libpcap ) |
| 37 |
@@ -69,6 +69,14 @@ src_prepare() { |
| 38 |
-i pppd/plugins/Makefile.linux || die |
| 39 |
fi |
| 40 |
|
| 41 |
+ if ! use eap-tls ; then |
| 42 |
+ einfo "Disabling EAP-TLS pppd auth support" |
| 43 |
+ sed -i '/^USE_EAPTLS=y/s:^:#:' pppd/Makefile.linux || die |
| 44 |
+ einfo "Disabling EAP-TLS plugin support" |
| 45 |
+ sed -i '/^CFLAGS += -DUSE_EAPTLS=1/s:^:#:' \ |
| 46 |
+ pppd/plugins/Makefile.linux || die |
| 47 |
+ fi |
| 48 |
+ |
| 49 |
# Set correct libdir |
| 50 |
sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \ |
| 51 |
pppd/{pathnames.h,pppd.8} || die |
Archives