* [gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/, net-dialup/ppp/
@ 2022-05-18 3:05 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-05-18 3:05 UTC (permalink / raw
To: gentoo-commits
commit: 868a874d9e6cb7f604cf6400f75da559a971a339
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 03:04:25 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 18 03:04:25 2022 +0000
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 <leonardo <AT> neumann.dev.br>
Signed-off-by: Sam James <sam <AT> 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 000000000000..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?= <eivnaes@yahoo.com>
+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 <eivnaes@yahoo.com>
+--- a/pppd/eap-tls.c
++++ b/pppd/eap-tls.c
+@@ -285,6 +285,23 @@ ENGINE *eaptls_ssl_load_engine( char *engine_name )
+ #endif
+
+
++#ifndef OPENSSL_NO_ENGINE
++static int eaptls_UI_writer(UI *ui, UI_STRING *uis)
++{
++ PW_CB_DATA* cb_data = (PW_CB_DATA*)UI_get0_user_data(ui);
++ UI_set_result(ui, uis, cb_data->password);
++ return 1;
++}
++
++static int eaptls_UI_stub(UI* ui) {
++ return 1;
++}
++
++static int eaptls_UI_reader(UI *ui, UI_STRING *uis) {
++ return 1;
++}
++#endif
++
+ /*
+ * Initialize the SSL stacks and tests if certificates, key and crl
+ * for client or server use can be loaded.
+@@ -578,20 +595,11 @@ SSL_CTX *eaptls_init_ssl(int init_server, char *cacertfile, char *capath,
+ {
+ UI_METHOD* transfer_pin = UI_create_method("transfer_pin");
+
+- int writer (UI *ui, UI_STRING *uis)
+- {
+- PW_CB_DATA* cb_data = (PW_CB_DATA*)UI_get0_user_data(ui);
+- UI_set_result(ui, uis, cb_data->password);
+- return 1;
+- };
+- int stub (UI* ui) {return 1;};
+- int stub_reader (UI *ui, UI_STRING *uis) {return 1;};
+-
+- UI_method_set_writer(transfer_pin, writer);
+- UI_method_set_opener(transfer_pin, stub);
+- UI_method_set_closer(transfer_pin, stub);
+- UI_method_set_flusher(transfer_pin, stub);
+- UI_method_set_reader(transfer_pin, stub_reader);
++ UI_method_set_writer(transfer_pin, eaptls_UI_writer);
++ UI_method_set_opener(transfer_pin, eaptls_UI_stub);
++ UI_method_set_closer(transfer_pin, eaptls_UI_stub);
++ UI_method_set_flusher(transfer_pin, eaptls_UI_stub);
++ UI_method_set_reader(transfer_pin, eaptls_UI_reader);
+
+ dbglog( "Using our private key URI: '%s' in engine", privkeyfile );
+ pkey = ENGINE_load_private_key(pkey_engine, privkeyfile, transfer_pin, &cb_data);
diff --git a/net-dialup/ppp/files/ppp-2.4.9-fix-openssl-sysroot-clang.patch b/net-dialup/ppp/files/ppp-2.4.9-fix-openssl-sysroot-clang.patch
new file mode 100644
index 000000000000..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 000000000000..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 ~ia64 ~loong ~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}
+ !<net-misc/netifrc-0.7.1-r2"
+BDEPEND="virtual/pkgconfig"
+PDEPEND="net-dialup/ppp-scripts"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+ mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
+
+ eapply "${WORKDIR}"/patches
+ eapply "${FILESDIR}"/${P}-fix-MPPE-sstpc.patch
+ eapply "${FILESDIR}"/${P}-fix-clang-nested-functions.patch
+ eapply "${FILESDIR}"/${P}-fix-openssl-sysroot-clang.patch
+
+ #IPX Support is removed in kernel >= 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
+ 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
+ doins pppd/plugins/dhcp/dhcpc.so
+ fi
+ if use radius ; then
+ doins pppd/plugins/radius/rad{ius,attr,realms}.so
+
+ #Copy radiusclient configuration files (#92878)
+ insinto /etc/ppp/radius
+ insopts -m0644
+ doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
+
+ doman pppd/plugins/radius/pppd-rad{ius,attr}.8
+ fi
+
+ insinto /etc/modprobe.d
+ insopts -m0644
+ newins "${FILESDIR}/modules.ppp" ppp.conf
+
+ dodoc PLUGINS README* SETUP Changes-2.3 FAQ
+ dodoc "${FILESDIR}/README.mpls"
+
+ dosbin scripts/p{on,off,log}
+ doman scripts/pon.1
+
+ # Adding misc. specialized scripts to doc dir
+ dodoc -r scripts
+ docinto scripts
+ dodoc -r scripts/chatchat
+
+ if use gtk ; then
+ dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
+ newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
+ else
+ newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
+ fi
+ doman contrib/pppgetpass/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)"
+ 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 and dhcpc plugins)"
+ 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
+ fi
+
+ # create *-secrets files if not exists
+ [[ -f "${EROOT}/etc/ppp/pap-secrets" ]] || \
+ cp -pP "${EROOT}/etc/ppp/pap-secrets.example" "${EROOT}/etc/ppp/pap-secrets"
+ [[ -f "${EROOT}/etc/ppp/chap-secrets" ]] || \
+ cp -pP "${EROOT}/etc/ppp/chap-secrets.example" "${EROOT}/etc/ppp/chap-secrets"
+
+ # lib name has changed
+ sed -i -e "s:^rp-\(pppoe.so\):\1:" "${EROOT}/etc/ppp/options" || die
+
+ 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."
+
+ if [[ -n ${REPLACING_VERSIONS} ]] ; then
+ ewarn '"rp-pppoe.so" plugin has been renamed to "pppoe.so"'
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/, net-dialup/ppp/
@ 2023-04-13 20:46 Mike Gilbert
0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert @ 2023-04-13 20:46 UTC (permalink / raw
To: gentoo-commits
commit: 47e87dea4c5942ba6f4866b770d4b490303b4e03
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 20:45:06 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 20:46:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47e87dea
net-dialup/ppp: restore dhcp plugin
Signed-off-by: Mike Gilbert <floppym <AT> 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 000000000000..d5ad7a76138c
--- /dev/null
+++ b/net-dialup/ppp/files/ppp-2.5.0-add-dhcp-plugin.patch
@@ -0,0 +1,36 @@
+From de05f72948317b40c19b1c113e18713816010dd9 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 13 Apr 2023 16:26:56 -0400
+Subject: [PATCH] Add dhcp plugin
+
+---
+ configure.ac | 1 +
+ pppd/plugins/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1180f64..5db4197 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -329,6 +329,7 @@ AC_CONFIG_FILES([
+ pppd/Makefile
+ pppd/pppd.pc
+ pppd/plugins/Makefile
++ pppd/plugins/dhcp/Makefile
+ pppd/plugins/pppoe/Makefile
+ pppd/plugins/pppoatm/Makefile
+ pppd/plugins/pppol2tp/Makefile
+diff --git a/pppd/plugins/Makefile.am b/pppd/plugins/Makefile.am
+index 2826148..9708ab1 100644
+--- a/pppd/plugins/Makefile.am
++++ b/pppd/plugins/Makefile.am
+@@ -21,5 +21,5 @@ winbind_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ winbind_la_SOURCES = winbind.c
+
+ if !SUNOS
+-SUBDIRS = pppoe pppoatm pppol2tp radius
++SUBDIRS = dhcp pppoe pppoatm pppol2tp radius
+ endif
+--
+2.40.0
+
diff --git a/net-dialup/ppp/ppp-2.5.0.ebuild b/net-dialup/ppp/ppp-2.5.0.ebuild
index 7213230de0e6..58672da24450 100644
--- a/net-dialup/ppp/ppp-2.5.0.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0.ebuild
@@ -2,20 +2,25 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+AUTOTOOLS_AUTO_DEPEND=no
-inherit linux-info pam
+inherit autotools linux-info pam
PATCH_TARBALL_NAME="${PN}-2.4.9-patches-03"
DESCRIPTION="Point-to-Point Protocol (PPP)"
HOMEPAGE="https://ppp.samba.org/"
SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
- https://github.com/ppp-project/ppp/blob/${P}/contrib/pppgetpass/pppgetpass.8"
+ https://github.com/ppp-project/ppp/blob/${P}/contrib/pppgetpass/pppgetpass.8
+ dhcp? (
+ http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
+ https://dev.gentoo.org/~floppym/dist/${P}-dhcp-patches.tar.gz
+ )"
#https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz
LICENSE="BSD GPL-2"
SLOT="0/${PV}"
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="activefilter atm gtk pam systemd"
+IUSE="activefilter atm dhcp gtk pam systemd"
DEPEND="
dev-libs/openssl:0=
@@ -28,9 +33,24 @@ DEPEND="
"
RDEPEND="${DEPEND}
!<net-misc/netifrc-0.7.1-r2"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig
+ dhcp? ( ${AUTOTOOLS_DEPEND} )"
PDEPEND="net-dialup/ppp-scripts"
+src_prepare() {
+ if use dhcp; then
+ eapply "${FILESDIR}/ppp-2.5.0-add-dhcp-plugin.patch"
+ cd "${WORKDIR}/dhcp" || die
+ eapply "${WORKDIR}/ppp-2.5.0-dhcp-patches"
+ cd "${S}" || die
+ mv "${WORKDIR}/dhcp" "${S}/pppd/plugins/dhcp" || die
+ fi
+ default
+ if use dhcp; then
+ eautoreconf
+ fi
+}
+
src_configure() {
local args=(
--localstatedir="${EPREFIX}"/var
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/, net-dialup/ppp/
@ 2023-05-28 21:25 Mike Gilbert
0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert @ 2023-05-28 21:25 UTC (permalink / raw
To: gentoo-commits
commit: fdeaefbbdb36dfdf8bd040fb3f11fd99bea5136e
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun May 28 21:16:18 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May 28 21:25:54 2023 +0000
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 <floppym <AT> 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 000000000000..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 <floppym@gentoo.org>
+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 <floppym@gentoo.org>
+---
+ 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 000000000000..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}
+ !<net-misc/netifrc-0.7.1-r2"
+BDEPEND="virtual/pkgconfig"
+PDEPEND="net-dialup/ppp-scripts"
+
+PATCHES=(
+ "${FILESDIR}"/ppp-2.5.0-passwordfd-read-early.patch
+ "${FILESDIR}"/ppp-2.5.0-pidfile.patch
+)
+
+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() {
+ local args=(
+ --localstatedir="${EPREFIX}"/var
+ --runstatedir="${EPREFIX}"/run
+ $(use_enable systemd)
+ $(use_with atm)
+ $(use_with pam)
+ $(use_with activefilter pcap)
+ $(use_with gtk)
+ --enable-cbcp
+ )
+ econf "${args[@]}"
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -type f -delete || die
+
+ if use pam; then
+ pamd_mimic_system ppp auth account session
+ fi
+
+ insinto /etc/modprobe.d
+ newins "${FILESDIR}/modules.ppp" ppp.conf
+
+ dosbin scripts/p{on,off,log}
+ doman scripts/pon.1
+ dosym pon.1 /usr/share/man/man1/poff.1
+ dosym pon.1 /usr/share/man/man1/plog.1
+
+ # Adding misc. specialized scripts to doc dir
+ dodoc -r scripts
+
+ if use gtk ; then
+ dosbin contrib/pppgetpass/pppgetpass.{gtk,vt}
+ newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
+ else
+ newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
+ fi
+
+ newtmpfiles "${FILESDIR}/pppd.tmpfiles" pppd.conf
+
+ # Missing from upstream tarball
+ # https://github.com/ppp-project/ppp/pull/412
+ #doman contrib/pppgetpass/pppgetpass.8
+ doman "${DISTDIR}/pppgetpass.8"
+}
+
+pkg_postinst() {
+ tmpfiles_process pppd.conf
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/, net-dialup/ppp/
@ 2024-03-27 0:10 Mike Gilbert
0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert @ 2024-03-27 0:10 UTC (permalink / raw
To: gentoo-commits
commit: fb8a1f91bb2425e9a871ac5bad40bb925a53732a
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 23:01:45 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 00:10:11 2024 +0000
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 <floppym <AT> 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 000000000000..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 <jaco@uls.co.za>
+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 <jaco@uls.co.za>
+---
+ pppd/plugins/radius/radius.c | 115 +++++++++++++++++------------------
+ 1 file changed, 55 insertions(+), 60 deletions(-)
+
+diff --git a/pppd/plugins/radius/radius.c b/pppd/plugins/radius/radius.c
+index c73ca0b53..e99bc7511 100644
+--- a/pppd/plugins/radius/radius.c
++++ b/pppd/plugins/radius/radius.c
+@@ -897,80 +897,75 @@ radius_setmppekeys2(VALUE_PAIR *vp, REQUEST_INFO *req_info)
+ memcpy(plain, crypt, 32);
+
+ ctx = PPP_MD_CTX_new();
+- if (ctx) {
+-
+- if (PPP_DigestInit(ctx, PPP_md5())) {
+-
+- if (PPP_DigestUpdate(ctx, req_info->secret, strlen(req_info->secret))) {
+-
+- if (PPP_DigestUpdate(ctx, req_info->request_vector, AUTH_VECTOR_LEN)) {
+-
+- if (PPP_DigestUpdate(ctx, salt, 2)) {
+-
+- buflen = sizeof(buf);
+- if (PPP_DigestFinal(ctx, buf, &buflen)) {
+-
+- status = 1;
+- }
+- }
+- }
+- }
+- }
+-
+- PPP_MD_CTX_free(ctx);
++ if (!ctx) {
++ error("RADIUS: Error creating PPP_MD_CTX for MS-MPPE-%s-Key attribute", type);
++ return -1;
+ }
+
+- if (status) {
+-
+- for (i = 0; i < 16; i++) {
+- plain[i] ^= buf[i];
+- }
++ buflen = sizeof(buf);
++ if (!PPP_DigestInit(ctx, PPP_md5())) {
++ error("RADIUS: Error setting hash algorithm to MD5 for MS-MPPE-%s-Key attribute", type);
++ } else if (!PPP_DigestUpdate(ctx, req_info->secret, strlen(req_info->secret))) {
++ error("RADIUS: Error mixing in radius secret for MS-MPPE-%s-Key attribute", type);
++ } else if (!PPP_DigestUpdate(ctx, req_info->request_vector, AUTH_VECTOR_LEN)) {
++ error("RADIUS: Error mixing in request vector for MS-MPPE-%s-Key attribute", type);
++ } else if (!PPP_DigestUpdate(ctx, salt, 2)) {
++ error("RADIUS: Error mixing in salt for MS-MPPE-%s-Key attribute", type);
++ } else if (!PPP_DigestFinal(ctx, buf, &buflen)) {
++ error("RADIUS: Error finalizing key buffer for MS-MPPE-%s-Key attribute", type);
++ } else {
++ status = 1;
++ }
+
+- if (plain[0] != 16) {
+- error("RADIUS: Incorrect key length (%d) for MS-MPPE-%s-Key attribute",
+- (int) plain[0], type);
+- return -1;
+- }
++ PPP_MD_CTX_free(ctx);
+
+- status = 0;
+- ctx = PPP_MD_CTX_new();
+- if (ctx) {
+-
+- if (PPP_DigestInit(ctx, PPP_md5())) {
++ if (!status)
++ return -1;
+
+- if (PPP_DigestUpdate(ctx, req_info->secret, strlen(req_info->secret))) {
++ for (i = 0; i < 16; i++) {
++ plain[i] ^= buf[i];
++ }
+
+- if (PPP_DigestUpdate(ctx, crypt, 16)) {
++ if (plain[0] != 16) {
++ error("RADIUS: Incorrect key length (%d) for MS-MPPE-%s-Key attribute",
++ (int) plain[0], type);
++ return -1;
++ }
+
+- if (PPP_DigestUpdate(ctx, salt, 2)) {
++ status = 0;
++ ctx = PPP_MD_CTX_new();
++ if (!ctx) {
++ error("RADIUS: Error creating PPP_MD_CTX for MS-MPPE-%s-Key(2) attribute", type);
++ return -1;
++ }
+
+- buflen = sizeof(buf);
+- if (PPP_DigestFinal(ctx, buf, &buflen)) {
++ buflen = sizeof(buf);
+
+- status = 1;
+- }
+- }
+- }
+- }
+- }
++ if (!PPP_DigestInit(ctx, PPP_md5())) {
++ error("RADIUS: Error setting hash algorithm to MD5 for MS-MPPE-%s-Key(2) 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(2) attribute", type);
++ } else if (!PPP_DigestUpdate(ctx, crypt, 16)) {
++ error("RADIUS: Error mixing in crypt vector for MS-MPPE-%s-Key(2) attribute", type);
++ } else if (!PPP_DigestFinal(ctx, buf, &buflen)) {
++ error("RADIUS: Error finalizing key buffer for MS-MPPE-%s-Key(2) attribute", type);
++ } else {
++ status = 1;
++ }
+
+- PPP_MD_CTX_free(ctx);
+- }
++ PPP_MD_CTX_free(ctx);
+
+- if (status) {
++ if (!status)
++ return -1;
+
+- plain[16] ^= buf[0]; /* only need the first byte */
++ plain[16] ^= buf[0]; /* only need the first byte */
+
+- if (vp->attribute == PW_MS_MPPE_SEND_KEY) {
+- mppe_set_keys(plain + 1, NULL, 16);
+- } else {
+- mppe_set_keys(NULL, plain + 1, 16);
+- }
+- return 0;
+- }
++ if (vp->attribute == PW_MS_MPPE_SEND_KEY) {
++ mppe_set_keys(plain + 1, NULL, 16);
++ } else {
++ mppe_set_keys(NULL, plain + 1, 16);
+ }
+-
+- return -1;
++ return 0;
+ }
+ #endif /* PPP_WITH_MPPE */
+
diff --git a/net-dialup/ppp/ppp-2.5.0-r6.ebuild b/net-dialup/ppp/ppp-2.5.0-r7.ebuild
similarity index 97%
rename from net-dialup/ppp/ppp-2.5.0-r6.ebuild
rename to net-dialup/ppp/ppp-2.5.0-r7.ebuild
index 12bcb53cc006..bbe9e3fca683 100644
--- a/net-dialup/ppp/ppp-2.5.0-r6.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r7.ebuild
@@ -37,9 +37,10 @@ PDEPEND="net-dialup/ppp-scripts"
PATCHES=(
"${FILESDIR}"/ppp-2.5.0-passwordfd-read-early.patch
"${FILESDIR}"/ppp-2.5.0-pidfile.patch
- "${FILESDIR}"/${P}-radiusclient.conf-parsing.patch
+ "${FILESDIR}"/ppp-2.5.0-radiusclient.conf-parsing.patch
"${FILESDIR}"/ppp-2.5.0-openssl-pkgconfig.patch
"${FILESDIR}"/ppp-2.5.0-pam-pkgconfig.patch
+ "${FILESDIR}"/ppp-2.5.0-radius-mppe.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-03-27 0:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-18 3:05 [gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/files/, net-dialup/ppp/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-04-13 20:46 Mike Gilbert
2023-05-28 21:25 Mike Gilbert
2024-03-27 0:10 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox