commit: d8cd9e109f8a80cede2bafc34d12744230b31072 Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com> AuthorDate: Sat Mar 13 15:18:04 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 13 21:30:56 2021 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=d8cd9e10
net-dialup/ppp: remove from overlay Package-Manager: Portage-3.0.17, Repoman-3.0.2 RepoMan-Options: --force Manifest-Sign-Key: 0xA1919C830E9498E0 Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com> Closes: https://github.com/gentoo/musl/pull/420 Signed-off-by: Sam James <sam <AT> gentoo.org> net-dialup/ppp/Manifest | 24 --- net-dialup/ppp/files/README.mpls | 15 -- net-dialup/ppp/files/modules.ppp | 10 -- net-dialup/ppp/files/ppp-2.4.7-dhcp-musl.patch | 44 ----- net-dialup/ppp/files/ppp-2.4.7-musl.patch | 203 ---------------------- net-dialup/ppp/metadata.xml | 34 ---- net-dialup/ppp/ppp-2.4.7-r3.ebuild | 231 ------------------------- 7 files changed, 561 deletions(-) diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest deleted file mode 100644 index ae5c032..0000000 --- a/net-dialup/ppp/Manifest +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -DIST ppp-2.4.7-patches-4.tar.xz 37308 BLAKE2B a53ab7c230fac7fea38910c5d9bb89b8ecb8728e899ed938292040e788b43ab8566797256329c9326ab1e6d7a02bf231df035a6e7b427f187eab554d600a7822 SHA512 f217f7272a791605101e0f1885350db8ff8b580a647e670461b81fe0026ee9050ce68b9b9635edee89ec1ada7adf000c7e6b3aa5a5dafec875ce715a9dfb84d2 -DIST ppp-2.4.7.tar.gz 688117 BLAKE2B e1c94ce31d98674536929d19e956e4013eb2b02c20c34e6184c0b99b50262ad1cd7fb6f4a1ed302872527a0c164af340e15ad1e2eaf191392c3f6ae2de21f5dd SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2 -DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738 ------BEGIN PGP SIGNATURE----- - -iQKTBAEBCAB9FiEEZdLCSnfk9z83VSkfsaMsEcx8U7oFAmBMWBpfFIAAAAAALgAo -aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY1 -RDJDMjRBNzdFNEY3M0YzNzU1MjkxRkIxQTMyQzExQ0M3QzUzQkEACgkQsaMsEcx8 -U7oN6g//Wa0k9+VNyXZmd18F24BKJNVzQjjwSGBpVbb190PJz30vGtgPFg6C0s5z -O/MykXqkhpbUnBmC1xiwbufz/wLdBsxmiSnPe5b8ICZZRpPQaRNGt1ikvHcI8+P7 -JY1pHGQiLrNVjSI5CGjy4aCVQ9ESxzX2eOw6A/LJ8On7Ajgr2LHsFieSAvO6qZLQ -UePT1Qeocewd4jeMcsMhyqovnjEBF6fzM5URyCT87JLffuwTQfRS51+kHWU+Hx7o -HkvhLiYLFhyqdYoVLwTeikaZnbjjVHd0k01Q3bSoaj2/JOwjnfEdN4n/gvcKumkz -zMrJc0NWSThON1gIeN0JAOB9ivekw6LCXIxCqH6+kDb/yzJ5TkUYaRSyxYKXn7dl -6OHTDzr1kf+3wzFSCCnjRRBQwPdPkfF6T+jkZRv6gM3yUVtLeDbepaX5wSG0MDKP -R5RO9RtQVYGia9XEurVwNBsBfjGTsVS/aB48CIz2QjeeDX6ixr0OxW6/qAShA9ZD -Lm5jeRSSWSx7kRDhCuYDvk2bElrMiH7IZwzkQpVV4wz6TfBoQEbXK9168QnJhw2r -xEN2GMjRcbA/qBNwIuNfQ4mMk6VtcHFOuMzpdIE3QUbe+CIw9HY+gFjONY+Wxhv/ -nbEiXSBGjWdRI6wUPam2uXpgO8LTkIp4wHVQo8GaH//OZgNqLJs= -=kOqi ------END PGP SIGNATURE----- diff --git a/net-dialup/ppp/files/README.mpls b/net-dialup/ppp/files/README.mpls deleted file mode 100644 index 1ae7ae4..0000000 --- a/net-dialup/ppp/files/README.mpls +++ /dev/null @@ -1,15 +0,0 @@ -MPLS consists of 3 components: -1. MPLS forwarding -2. MPLS signalling -3. Mapping layer 3 traffic onto MPLS LSPs - -The document mpls-forwarding basics explains item 1. - -Examples of MPLS signalling protocols are: RSVP-TE LDP and CR-LDP. -The package ldp-portable is an implementation of LDP and contains more -information about LDP based MPLS signalling. - -Mapping of layer 3 traffic to MPLS LSPs is accomplised in a couple of -different ways. --Per FEC where FEC is an entry in the routing table --Virtual interface that represents an LSP diff --git a/net-dialup/ppp/files/modules.ppp b/net-dialup/ppp/files/modules.ppp deleted file mode 100644 index e936041..0000000 --- a/net-dialup/ppp/files/modules.ppp +++ /dev/null @@ -1,10 +0,0 @@ -alias char-major-108 ppp_generic -alias /dev/ppp ppp_generic -alias tty-ldisc-3 ppp_async -alias tty-ldisc-13 n_hdlc -alias tty-ldisc-14 ppp_synctty -alias ppp-compress-18 ppp_mppe -alias ppp-compress-21 bsd_comp -alias ppp-compress-24 ppp_deflate -alias ppp-compress-26 ppp_deflate -alias net-pf-24 pppoe diff --git a/net-dialup/ppp/files/ppp-2.4.7-dhcp-musl.patch b/net-dialup/ppp/files/ppp-2.4.7-dhcp-musl.patch deleted file mode 100644 index 4830bfe..0000000 --- a/net-dialup/ppp/files/ppp-2.4.7-dhcp-musl.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -ur ppp-2.4.7.orig/pppd/plugins/dhcp/clientpacket.c ppp-2.4.7/pppd/plugins/dhcp/clientpacket.c ---- ppp-2.4.7.orig/pppd/plugins/dhcp/clientpacket.c 2002-08-31 12:19:20.000000000 +0000 -+++ ppp-2.4.7/pppd/plugins/dhcp/clientpacket.c 2015-05-20 13:24:41.299978928 +0000 -@@ -205,9 +205,9 @@ - - /* Make sure its the right packet for us, and that it passes sanity checks */ - if (packet.ip.protocol != IPPROTO_UDP || packet.ip.version != IPVERSION || -- packet.ip.ihl != sizeof(packet.ip) >> 2 || packet.udp.dest != htons(CLIENT_PORT) || -+ packet.ip.ihl != sizeof(packet.ip) >> 2 || packet.udp.uh_dport != htons(CLIENT_PORT) || - bytes > (int) sizeof(struct udp_dhcp_packet) || -- ntohs(packet.udp.len) != (short) (bytes - sizeof(packet.ip))) { -+ ntohs(packet.udp.uh_ulen) != (short) (bytes - sizeof(packet.ip))) { - DEBUG(LOG_INFO, "unrelated/bogus packet"); - return -1; - } -@@ -223,14 +223,14 @@ - /* verify the UDP checksum by replacing the header with a psuedo header */ - source = packet.ip.saddr; - dest = packet.ip.daddr; -- check = packet.udp.check; -- packet.udp.check = 0; -+ check = packet.udp.uh_sum; -+ packet.udp.uh_sum = 0; - memset(&packet.ip, 0, sizeof(packet.ip)); - - packet.ip.protocol = IPPROTO_UDP; - packet.ip.saddr = source; - packet.ip.daddr = dest; -- packet.ip.tot_len = packet.udp.len; /* cheat on the psuedo-header */ -+ packet.ip.tot_len = packet.udp.uh_ulen; /* cheat on the psuedo-header */ - if (check && check != checksum(&packet, bytes)) { - DEBUG(LOG_ERR, "packet with bad UDP checksum received, ignoring"); - return -1; -diff -ur ppp-2.4.7.orig/pppd/plugins/dhcp/dhcpd.h ppp-2.4.7/pppd/plugins/dhcp/dhcpd.h ---- ppp-2.4.7.orig/pppd/plugins/dhcp/dhcpd.h 2002-08-31 11:52:31.000000000 +0000 -+++ ppp-2.4.7/pppd/plugins/dhcp/dhcpd.h 2015-05-20 13:24:10.999978974 +0000 -@@ -4,6 +4,7 @@ - - #include <netinet/ip.h> - #include <netinet/udp.h> -+#include <sys/types.h> - - #include "leases.h" - diff --git a/net-dialup/ppp/files/ppp-2.4.7-musl.patch b/net-dialup/ppp/files/ppp-2.4.7-musl.patch deleted file mode 100644 index 9f060e0..0000000 --- a/net-dialup/ppp/files/ppp-2.4.7-musl.patch +++ /dev/null @@ -1,203 +0,0 @@ -diff -ur ppp-2.4.7.orig/include/linux/ppp_defs.h ppp-2.4.7/include/linux/ppp_defs.h ---- ppp-2.4.7.orig/include/linux/ppp_defs.h 2014-08-09 12:31:39.000000000 +0000 -+++ ppp-2.4.7/include/linux/ppp_defs.h 2015-05-20 12:38:46.739983089 +0000 -@@ -50,6 +50,10 @@ - #ifndef _PPP_DEFS_H_ - #define _PPP_DEFS_H_ - -+#ifndef __P -+# define __P(x) x -+#endif -+ - /* - * The basic PPP frame. - */ -diff -ur ppp-2.4.7.orig/include/net/ppp_defs.h ppp-2.4.7/include/net/ppp_defs.h ---- ppp-2.4.7.orig/include/net/ppp_defs.h 2014-08-09 12:31:39.000000000 +0000 -+++ ppp-2.4.7/include/net/ppp_defs.h 2015-05-20 12:38:46.739983089 +0000 -@@ -38,6 +38,8 @@ - #ifndef _PPP_DEFS_H_ - #define _PPP_DEFS_H_ - -+#include <sys/time.h> -+ - /* - * The basic PPP frame. - */ -diff -ur ppp-2.4.7.orig/pppd/Makefile.linux ppp-2.4.7/pppd/Makefile.linux ---- ppp-2.4.7.orig/pppd/Makefile.linux 2014-08-09 12:31:39.000000000 +0000 -+++ ppp-2.4.7/pppd/Makefile.linux 2015-05-20 12:38:46.739983089 +0000 -@@ -126,7 +126,7 @@ - endif - - ifdef USE_LIBUTIL --CFLAGS += -DHAVE_LOGWTMP=1 -+#CFLAGS += -DHAVE_LOGWTMP=1 - LIBS += -lutil - endif - -diff -ur ppp-2.4.7.orig/pppd/magic.h ppp-2.4.7/pppd/magic.h ---- ppp-2.4.7.orig/pppd/magic.h 2014-08-09 12:31:39.000000000 +0000 -+++ ppp-2.4.7/pppd/magic.h 2015-05-20 12:38:46.739983089 +0000 -@@ -42,6 +42,10 @@ - * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $ - */ - -+#ifndef __P -+# define __P(x) x -+#endif -+ - void magic_init __P((void)); /* Initialize the magic number generator */ - u_int32_t magic __P((void)); /* Returns the next magic number */ - -diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/config.h ppp-2.4.7/pppd/plugins/rp-pppoe/config.h ---- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/config.h 2014-08-09 12:31:39.000000000 +0000 -+++ ppp-2.4.7/pppd/plugins/rp-pppoe/config.h 2015-05-20 12:38:46.739983089 +0000 -@@ -101,9 +101,6 @@ - /* Define if you have the <netpacket/packet.h> header file. */ - #define HAVE_NETPACKET_PACKET_H 1 - --/* Define if you have the <sys/cdefs.h> header file. */ --#define HAVE_SYS_CDEFS_H 1 -- - /* Define if you have the <sys/dlpi.h> header file. */ - /* #undef HAVE_SYS_DLPI_H */ - -diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.7/pppd/plugins/rp-pppoe/if.c ---- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/if.c 2014-08-09 12:31:39.000000000 +0000 -+++ ppp-2.4.7/pppd/plugins/rp-pppoe/if.c 2015-05-20 12:38:46.739983089 +0000 -@@ -30,10 +30,6 @@ - #include <linux/if_packet.h> - #endif - --#ifdef HAVE_NET_ETHERNET_H --#include <net/ethernet.h> --#endif -- - #ifdef HAVE_ASM_TYPES_H - #include <asm/types.h> - #endif -diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.7/pppd/plugins/rp-pppoe/plugin.c ---- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/plugin.c 2014-08-09 12:31:39.000000000 +0000 -+++ ppp-2.4.7/pppd/plugins/rp-pppoe/plugin.c 2015-05-20 12:38:46.739983089 +0000 -@@ -46,7 +46,6 @@ - #include <unistd.h> - #include <fcntl.h> - #include <signal.h> --#include <net/ethernet.h> - #include <net/if_arp.h> - #include <linux/ppp_defs.h> - #include <linux/if_pppox.h> -diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c ppp-2.4.7/pppd/plugins/rp-pppoe/pppoe-discovery.c ---- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c 2014-08-09 12:31:39.000000000 +0000 -+++ ppp-2.4.7/pppd/plugins/rp-pppoe/pppoe-discovery.c 2015-05-20 12:38:46.739983089 +0000 -@@ -27,10 +27,6 @@ - #include <linux/if_packet.h> - #endif - --#ifdef HAVE_NET_ETHERNET_H --#include <net/ethernet.h> --#endif -- - #ifdef HAVE_ASM_TYPES_H - #include <asm/types.h> - #endif -@@ -55,6 +51,8 @@ - exit(status); - } - -+#define error(x...) fprintf(stderr, x) -+ - /* Initialize frame types to RFC 2516 values. Some broken peers apparently - use different frame types... sigh... */ - -diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/pppoe.h ppp-2.4.7/pppd/plugins/rp-pppoe/pppoe.h ---- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/pppoe.h 2014-08-09 12:31:39.000000000 +0000 -+++ ppp-2.4.7/pppd/plugins/rp-pppoe/pppoe.h 2015-05-20 12:38:46.739983089 +0000 -@@ -39,10 +39,6 @@ - #error Unknown method for accessing raw Ethernet frames - #endif - --#ifdef HAVE_SYS_CDEFS_H --#include <sys/cdefs.h> --#endif -- - #ifdef HAVE_SYS_SOCKET_H - #include <sys/socket.h> - #endif -@@ -86,19 +82,6 @@ - - #include <netinet/in.h> - --#ifdef HAVE_NETINET_IF_ETHER_H --#include <sys/types.h> -- --#ifdef HAVE_SYS_SOCKET_H --#include <sys/socket.h> --#endif --#ifndef HAVE_SYS_DLPI_H --#include <netinet/if_ether.h> --#endif --#endif -- -- -- - /* Ethernet frame types according to RFC 2516 */ - #define ETH_PPPOE_DISCOVERY 0x8863 - #define ETH_PPPOE_SESSION 0x8864 -diff -ur ppp-2.4.7.orig/pppd/sys-linux.c ppp-2.4.7/pppd/sys-linux.c ---- ppp-2.4.7.orig/pppd/sys-linux.c 2014-08-09 12:31:39.000000000 +0000 -+++ ppp-2.4.7/pppd/sys-linux.c 2015-05-20 12:39:38.269983011 +0000 -@@ -73,7 +73,7 @@ - #include <sys/types.h> - #include <sys/socket.h> - #include <sys/time.h> --#include <sys/errno.h> -+#include <errno.h> - #include <sys/file.h> - #include <sys/stat.h> - #include <sys/utsname.h> -@@ -102,19 +102,11 @@ - #define MAX_ADDR_LEN 7 - #endif - --#if __GLIBC__ >= 2 - #include <asm/types.h> /* glibc 2 conflicts with linux/types.h */ - #include <net/if.h> - #include <net/if_arp.h> - #include <net/route.h> - #include <netinet/if_ether.h> --#else --#include <linux/types.h> --#include <linux/if.h> --#include <linux/if_arp.h> --#include <linux/route.h> --#include <linux/if_ether.h> --#endif - #include <netinet/in.h> - #include <arpa/inet.h> - -diff --git a/pppd/plugins/pppol2tp/openl2tp.c b/pppd/plugins/pppol2tp/openl2tp.c -index 9643b96..458316b 100644 ---- a/pppd/plugins/pppol2tp/openl2tp.c -+++ b/pppd/plugins/pppol2tp/openl2tp.c -@@ -47,7 +47,6 @@ - #include <linux/if_ether.h> - #include <linux/ppp_defs.h> - #include <linux/if_ppp.h> --#include <linux/if_pppox.h> - #include <linux/if_pppol2tp.h> - - #include "l2tp_event.h" -diff --git a/pppd/plugins/pppol2tp/pppol2tp.c b/pppd/plugins/pppol2tp/pppol2tp.c -index 0e28606..4f6d98c 100644 ---- a/pppd/plugins/pppol2tp/pppol2tp.c -+++ b/pppd/plugins/pppol2tp/pppol2tp.c -@@ -46,7 +46,6 @@ - #include <linux/if_ether.h> - #include <linux/ppp_defs.h> - #include <linux/if_ppp.h> --#include <linux/if_pppox.h> - #include <linux/if_pppol2tp.h> - - /* should be added to system's socket.h... */ diff --git a/net-dialup/ppp/metadata.xml b/net-dialup/ppp/metadata.xml deleted file mode 100644 index 291e09f..0000000 --- a/net-dialup/ppp/metadata.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>polynomia...@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> - <maintainer type="project"> - <email>base-sys...@gentoo.org</email> - <name>Gentoo Base System</name> - </maintainer> - <longdescription>ppp (Paul's PPP Package) is an open source package which - implements the Point-to-Point Protocol</longdescription> - <use> - <flag name="activefilter">Enables active filter support</flag> - <flag name="atm">Enables ATM (Asynchronous Transfer Mode) protocol - 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="ipv6">Enables support for IP version 6</flag> - <flag name="pam">Enables PAM (Pluggable Authentication Modules) - support</flag> - <flag name="radius">Enables RADIUS support</flag> - </use> - <upstream> - <remote-id type="cpe">cpe:/a:samba:ppp</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-dialup/ppp/ppp-2.4.7-r3.ebuild b/net-dialup/ppp/ppp-2.4.7-r3.ebuild deleted file mode 100644 index e4996ac..0000000 --- a/net-dialup/ppp/ppp-2.4.7-r3.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils linux-info multilib pam toolchain-funcs - -PATCH_VER="4" -DESCRIPTION="Point-to-Point Protocol (PPP)" -HOMEPAGE="http://www.samba.org/ppp"; -SRC_URI="ftp://ftp.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="amd64 arm arm64 ~mips ppc 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 ) - eap-tls? ( - net-misc/curl - !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 - - use eap-tls || EPATCH_EXCLUDE+=" 8?_all_eaptls-*" - EPATCH_SUFFIX="patch" \ - epatch "${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 - fi - - einfo "Enabling CBCP" - sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die - - if use dhcp ; then - einfo "Adding ppp-dhcp plugin files" - sed -i \ - -e '/^SUBDIRS :=/s:$: dhcp:' \ - 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 -i -e "s:/usr/local/etc:/etc:" \ - -e "s:/usr/local/sbin:/usr/sbin:" \ - 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 elibc_musl ; then - einfo "Conditionally patching for musl" - epatch "${FILESDIR}"/${P}-musl.patch - - if use dhcp ; then - einfo "Conditionally patching dhcp support for musl" - epatch "${FILESDIR}"/${P}-dhcp-musl.patch - fi - fi - - epatch_user # 549588 -} - -src_compile() { - tc-export AR CC - emake 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/rp-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 - - pamd_mimic_system ppp auth account session - - local PLUGINS_DIR="/usr/$(get_libdir)/pppd/${PV}" - # closing " for syntax coloring - 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/rp-pppoe/rp-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 - insinto /usr/share/doc/${PF}/scripts/chatchat - doins scripts/chatchat/* - insinto /usr/share/doc/${PF}/scripts - doins scripts/* - - 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 rp-pppoe plugin)" - local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-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 "${ROOT}/etc/ppp/pap-secrets" ] || \ - cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets" - [ -f "${ROOT}/etc/ppp/chap-secrets" ] || \ - cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets" - - # lib name has changed - sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/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." -}
