commit: 850742f014e1e0e18387cb36ef868e5cd2604cbe Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Oct 18 15:09:22 2024 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Oct 19 01:23:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=850742f0
net-dialup/ppp: drop 2.4.9-r9 Bug: https://bugs.gentoo.org/941761 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> net-dialup/ppp/Manifest | 3 - .../ppp/files/ppp-2.4.9-fix-MPPE-sstpc.patch | 25 -- .../ppp-2.4.9-fix-clang-nested-functions.patch | 65 ------ .../ppp-2.4.9-fix-openssl-sysroot-clang.patch | 14 -- net-dialup/ppp/files/ppp-2.4.9-pppol2tp-ipv6.patch | 28 --- net-dialup/ppp/metadata.xml | 6 - net-dialup/ppp/ppp-2.4.9-r9.ebuild | 257 --------------------- 7 files changed, 398 deletions(-) diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest index 1ca41536ecd5..28ffd7376d3c 100644 --- a/net-dialup/ppp/Manifest +++ b/net-dialup/ppp/Manifest @@ -1,6 +1,3 @@ -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-2.5.1.tar.gz 991639 BLAKE2B e3ece873ea25bde5ddffd0da168ffe6ba890693f20fb9f1d6a48f365331abdb4cf517fd0b3004d26a0c778ad4d750e39e38486544e2771b23223469db13c239c SHA512 57b3bbf918c302dbc621f56b706efa1b35b2fc45b71c3a309c1cfee22c28fcf98d7f8965fbeba9260c124f2afb9e297885007256ee05469adca73fad032902b9 -DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738 DIST pppgetpass.8 450 BLAKE2B 4e9805cfecb4d07c302682c1ced42cc5d247d18fae904b909e126874af962cf48bb703cd75b0cefce4e19404f2e757602d3b57f187567fc23d4b93d9598d1486 SHA512 21f6dda908cf73ee27bfa39d2b50e7f76b371e50bd7d5a0586174b30129c119accbd260d7f9e0e6aa6aabfa5ba11a13ba560588a99672c9dd4e9f33254f88836 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 deleted file mode 100644 index 15a1298ce303..000000000000 --- a/net-dialup/ppp/files/ppp-2.4.9-fix-MPPE-sstpc.patch +++ /dev/null @@ -1,25 +0,0 @@ -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?= <[email protected]> -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 <[email protected]> ---- 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/files/ppp-2.4.9-fix-clang-nested-functions.patch b/net-dialup/ppp/files/ppp-2.4.9-fix-clang-nested-functions.patch deleted file mode 100644 index 0a089e95430d..000000000000 --- a/net-dialup/ppp/files/ppp-2.4.9-fix-clang-nested-functions.patch +++ /dev/null @@ -1,65 +0,0 @@ -https://github.com/ppp-project/ppp/commit/6e6a48fe628b76ec368277fd52685428e3dc8766 -https://bugs.gentoo.org/831305 - -From: =?UTF-8?q?Eivind=20N=C3=A6ss?= <[email protected]> -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 <[email protected]> ---- 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 deleted file mode 100644 index 2bf8c45e9027..000000000000 --- a/net-dialup/ppp/files/ppp-2.4.9-fix-openssl-sysroot-clang.patch +++ /dev/null @@ -1,14 +0,0 @@ -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/files/ppp-2.4.9-pppol2tp-ipv6.patch b/net-dialup/ppp/files/ppp-2.4.9-pppol2tp-ipv6.patch deleted file mode 100644 index 40773b2b0d54..000000000000 --- a/net-dialup/ppp/files/ppp-2.4.9-pppol2tp-ipv6.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://bugs.gentoo.org/904740 -https://github.com/ppp-project/ppp/pull/319 - -From 44a70d6f9eb6d1843868da1d45de382134a03630 Mon Sep 17 00:00:00 2001 -From: str8fast <[email protected]> -Date: Thu, 28 Oct 2021 14:55:56 +0000 -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(&ip_up_notifier, pppol2tp_ip_up, NULL); - add_notifier(&ip_down_notifier, pppol2tp_ip_down, NULL); -+#ifdef INET6 - add_notifier(&ipv6_up_notifier, pppol2tp_ip_up, NULL); - add_notifier(&ipv6_down_notifier, pppol2tp_ip_down, NULL); -+#endif - } - - struct channel pppol2tp_channel = { diff --git a/net-dialup/ppp/metadata.xml b/net-dialup/ppp/metadata.xml index 6ac3bc382e5c..f25ad33f97dc 100644 --- a/net-dialup/ppp/metadata.xml +++ b/net-dialup/ppp/metadata.xml @@ -7,15 +7,9 @@ </maintainer> <use> <flag name="activefilter">Enables active filter support</flag> - <flag name="dhcp">Installs PPP DHCP client plugin for IP address allocation - by a DHCP server (see http://www.netservers.co.uk/gpl/)</flag> - <flag name="eap-tls">Enables support for Extensible Authentication - Protocol and Transport Level Security (see - http://www.nikhef.nl/~janjust/ppp/index.html)</flag> <flag name="gtk">Installs GTK+ password prompting program that can be used by passprompt.so PPP plugin for reading the password from a X11 input terminal</flag> - <flag name="radius">Enables RADIUS support</flag> </use> <upstream> <remote-id type="cpe">cpe:/a:samba:ppp</remote-id> diff --git a/net-dialup/ppp/ppp-2.4.9-r9.ebuild b/net-dialup/ppp/ppp-2.4.9-r9.ebuild deleted file mode 100644 index c2c2bd0ccbee..000000000000 --- a/net-dialup/ppp/ppp-2.4.9-r9.ebuild +++ /dev/null @@ -1,257 +0,0 @@ -# Copyright 1999-2023 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 ~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 - eapply "${FILESDIR}"/${P}-pppol2tp-ipv6.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 -}
