From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-924291-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 062FD139086
for <garchives@archives.gentoo.org>; Wed, 18 Jan 2017 16:05:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8B0B5E0DCD;
Wed, 18 Jan 2017 16:05:01 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 59EDBE0DCD
for <gentoo-commits@lists.gentoo.org>; Wed, 18 Jan 2017 16:05:01 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 05C14341117
for <gentoo-commits@lists.gentoo.org>; Wed, 18 Jan 2017 16:05:00 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 706892776
for <gentoo-commits@lists.gentoo.org>; Wed, 18 Jan 2017 16:04:58 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" <polynomial-c@gentoo.org>
Message-ID: <1484755185.03fd847c2c05a0e7eaf361d0061358b0a0ce41bd.polynomial-c@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-dialup/ppp/Manifest net-dialup/ppp/ppp-2.4.4-r25.ebuild net-dialup/ppp/ppp-2.4.5-r3.ebuild net-dialup/ppp/ppp-2.4.6-r3.ebuild net-dialup/ppp/ppp-2.4.7-r2.ebuild net-dialup/ppp/ppp-2.4.7.ebuild
X-VCS-Directories: net-dialup/ppp/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: 03fd847c2c05a0e7eaf361d0061358b0a0ce41bd
X-VCS-Branch: master
Date: Wed, 18 Jan 2017 16:04:58 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 9b99a2fe-1b84-43eb-bb6e-fe17d979d389
X-Archives-Hash: 5503ca4840a156bada18f07c09cc0e7e
commit: 03fd847c2c05a0e7eaf361d0061358b0a0ce41bd
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 15:59:45 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 15:59:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03fd847c
net-dialup/ppp: Security cleanup (bug #546554).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-dialup/ppp/Manifest | 8 -
net-dialup/ppp/ppp-2.4.4-r25.ebuild | 311 ------------------------------------
net-dialup/ppp/ppp-2.4.5-r3.ebuild | 223 --------------------------
net-dialup/ppp/ppp-2.4.6-r3.ebuild | 223 --------------------------
net-dialup/ppp/ppp-2.4.7-r2.ebuild | 222 -------------------------
net-dialup/ppp/ppp-2.4.7.ebuild | 224 --------------------------
6 files changed, 1211 deletions(-)
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 307ad8c..3f684ec 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,11 +1,3 @@
-DIST ppp-2.4.4-gentoo-20091116.tar.gz 54932 SHA256 52f174b3df36110d14c522869c507f64aef4d2d01db2dec2936cc9917c9fa716 SHA512 6669294cac124f78f197558f28872adaf08cb6ba3344093946c02d3581e70efea6992b30b0be726637a4122d8354bb1e25e73af71f1e7da8bdbf63db5aa0eeb6 WHIRLPOOL ff633a5e740f38bc665bec435613eb423de0f8370d119fc3cf36dee100cb02e5ec78eb88f2b530498bd49c76a792d97c76dd188b7ce02c8eb4efe85d9af67938
-DIST ppp-2.4.4.tar.gz 688763 SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea SHA512 70bde7121a0a2e150a7eec85731ca1055a2741da7886a8b8734c075637703d223bb579c3d14ad32a009488e07deaa62e7948e2d3e73077e6fb3db076841f7270 WHIRLPOOL 12aa49200253afd3958c7fc078ac7333080c6d0ca96c541e39e70b05d6b8c8e90fe98553d4cbef7804cf66c74b2798e1839b44db9e0cc0e6093d87b53bf24b6f
-DIST ppp-2.4.5-patches-3.tar.xz 37000 SHA256 9e251b0339f665054c24692396115b1f9afb7fdb8593242b1a5bc369dce642bf SHA512 e0d0d077050e97ea88d08fd15a7597393ff7842a1bf3129e2fd7eb182d4fc49a625635cf24fc1798efde2250d4c2ae013b3ae143ef245fe87f764fcf752e5c27 WHIRLPOOL 11e2d4529dd0ddfca11574bbc64459f553674b3b78f63e265dcb1247b611732ee1d6e2dc43e33d0e8371e1fcb7f9282930be1a05c147e2f141f7806dd32e4269
-DIST ppp-2.4.5.tar.gz 684342 SHA256 43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505 SHA512 3688720a0f9ee47802e72dc6aa3d47c7312c195007f37a6ceb087fdb6f1f77ad75e922a568cffed6d1a857f06d79460d6d38b56e179310e493a0380a0c5a4f6e WHIRLPOOL 210dbcfc754256e5317cffa0b6f51e7ae9e45d88815e4952e893ab85d024daef8131747624e355b97225f0b365e677fa4bd82ee2a7890810bc25c5521324b83f
-DIST ppp-2.4.6-patches-4.tar.xz 36692 SHA256 63caf7687a6345d880eaf915e2ad814ff73d46b3fecfd56c75807e34c6d28cc4 SHA512 b3d0e7c296074a0317d818a46898116c927d504b8500567e7f8667ed209bfe63e59d260d2154fe18503abe1595ef23ddbf69f6f0b46910da4816b8aff11fb440 WHIRLPOOL 1ff47be7ebf76e1131adf90f294670307d90aea05902d2bef8d6f009ec4815b7f44cd904442725638bb7d54bc3c1054a1e21b262cd0d82fa0f2a0815cca7282b
-DIST ppp-2.4.6.tar.gz 687744 SHA256 1b33181a03962c8a092c055fb9980e9722728a8d98a4bb7ec7acda17c1b1b49d SHA512 65d6967ba43cd8b4d3f63f52ff69f6fed964f748fc780dff982629668213c2cd1891671f6f4a0c1c22118a382e282fabdd2328e60a120d9b984d3c17f9355cc6 WHIRLPOOL 1f83ca8383486d76779c28ba0b107887584b2991c7d6fd4e86d6fecb7988e0422ec1f7e35d092f410b462a97f006cc11121c1a7cc00f7e35d856dd3861cdd828
-DIST ppp-2.4.7-patches-1.tar.xz 38852 SHA256 442e619ab33afe4c8d9999295a221699917604dbc55171cdef6fb2094bf0aaf6 SHA512 105c68cbabcc860498bdb583598fc5838de5f523875ef3e7c35ce3c367d89072b0a52d97c2d500cd225407e2b6d806b45054c19ff1203dd1fad10515980d56da WHIRLPOOL d57aef8666b5189d4d9a69de3097eda41233dfdc07d87ac7a91d5e03bb070f372665d7c39912fc7196504ca079220efd5103cfecc3e5f97136d089e7c4f4e44d
-DIST ppp-2.4.7-patches-3.tar.xz 37752 SHA256 ef210be7b8272451770d4f27bfa577220e5f7fc990edb9d74080337faa0dccbc SHA512 22c563843596058dd94b7bc80a2066473314bfd5c5beb7e48bf282d691ad580d58d54a9ba3af3e8696f1f60240e35278036d2c11074b3929be47e93cde1ab67d WHIRLPOOL e46bac31253bb5af573fd85a07dde944603a71c9e32a5ba24077b924625797f993d875429044590d21f855b1127581aa6e306ca0f463488af30392705462baac
DIST ppp-2.4.7-patches-4.tar.xz 37308 SHA256 afd96003fb50b462852d81f10af344ff23dcf26f626e65301b45dbaaa89f03c4 SHA512 f217f7272a791605101e0f1885350db8ff8b580a647e670461b81fe0026ee9050ce68b9b9635edee89ec1ada7adf000c7e6b3aa5a5dafec875ce715a9dfb84d2 WHIRLPOOL ec8ef47938eac296e1573c8281afbfc0914e4cd2461a082f670a2367f4a77359f09b4986c10c498bf39b6a1441bbf9700529991a82a01854d8e2289a14636e9d
DIST ppp-2.4.7.tar.gz 688117 SHA256 02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30 SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2 WHIRLPOOL 48f3251e6b955ecfdaf9260b9ea5220d9e355fff836e2f5217ee0b15bf2c93e43f8207005f58bf1f97fb8ff0c76c56df8ecd8536f63c4d84d5940458ba0ba5c3
DIST ppp-dhcpc.tgz 33497 SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644 SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738 WHIRLPOOL 74e5e0d7f9bc52d1b9cfeff83fe74c2b38cc10c60636cd9c0f5d67d61dc7da56dbf2bcc84afa29444546792876cb36afbc853a6515ce9b3d83d6de98eacedd1e
diff --git a/net-dialup/ppp/ppp-2.4.4-r25.ebuild b/net-dialup/ppp/ppp-2.4.4-r25.ebuild
deleted file mode 100644
index 2fbef13..00000000
--- a/net-dialup/ppp/ppp-2.4.4-r25.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs linux-info pam
-
-DESCRIPTION="Point-to-Point Protocol (PPP)"
-HOMEPAGE="http://www.samba.org/ppp"
-SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
- mirror://gentoo/${P}-gentoo-20091116.tar.gz
- dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="activefilter atm dhcp eap-tls gtk ipv6 mppe-mppc pam radius"
-
-DEPEND="activefilter? ( >=net-libs/libpcap-0.9.4 )
- atm? ( net-dialup/linux-atm )
- pam? ( virtual/pam )
- gtk? ( >=x11-libs/gtk+-2.8:2 )
- eap-tls? ( net-misc/curl >=dev-libs/openssl-0.9.7 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- if use mppe-mppc; then
- echo
- ewarn "The mppe-mppc flag overwrites the pppd native MPPE support with MPPE-MPPC"
- ewarn "patch developed by Jan Dubiec."
- ewarn "The resulted pppd will work only with patched kernels with version <= 2.6.14."
- ewarn "You could obtain the kernel patch from MPPE-MPPC homepage:"
- ewarn " http://mppe-mppc.alphacron.de/"
- ewarn "CAUTION: MPPC is a U.S. patented algorithm!"
- ewarn "Ask yourself if you really need it and, if you do, consult your lawyer first."
- ebeep
- fi
-}
-
-src_prepare() {
- epatch "${WORKDIR}/patch/make-vars.patch"
- epatch "${WORKDIR}/patch/mpls.patch"
- epatch "${WORKDIR}/patch/killaddr-smarter.patch"
- epatch "${WORKDIR}/patch/wait-children.patch"
- epatch "${WORKDIR}/patch/maxoctets-2Glimit.patch"
- epatch "${WORKDIR}/patch/defaultgateway.patch"
- epatch "${WORKDIR}/patch/mschapv2-initialize-response.patch"
- epatch "${WORKDIR}/patch/linkpidfile.patch"
- epatch "${WORKDIR}/patch/qa-fixes.patch"
- epatch "${WORKDIR}/patch/kill-pg.patch"
- epatch "${WORKDIR}/patch/auth-fail.patch"
- epatch "${WORKDIR}/patch/defaultmetric.patch"
- epatch "${WORKDIR}/patch/dev-ppp.patch"
- epatch "${WORKDIR}/patch/gtk2.patch"
- epatch "${WORKDIR}/patch/pppoe-lcp-timeout.patch"
- epatch "${WORKDIR}/patch/passwordfd-read-early.patch"
- epatch "${WORKDIR}/patch/pppd-usepeerwins.patch"
- epatch "${WORKDIR}/patch/connect-errors.patch"
- epatch "${WORKDIR}/patch/ppp-pppoe-mac.patch"
-
- use eap-tls && {
- # see http://eaptls.spe.net/index.html for more info
- einfo "Enabling EAP-TLS support"
- epatch "${WORKDIR}/patch/eaptls-0.7-gentoo.patch"
- use mppe-mppc || epatch "${WORKDIR}/patch/eaptls-mppe-0.7.patch"
- }
-
- use mppe-mppc && {
- einfo "Enabling MPPE-MPPC support"
- epatch "${WORKDIR}/patch/mppe-mppc-1.1.patch"
- use eap-tls && epatch "${WORKDIR}/patch/eaptls-mppe-0.7-with-mppc.patch"
- }
-
- use atm && {
- einfo "Enabling PPPoATM support"
- sed -i "s/^#HAVE_LIBATM=yes/HAVE_LIBATM=yes/" pppd/plugins/pppoatm/Makefile.linux
- }
-
- use activefilter || {
- einfo "Disabling active filter"
- sed -i "s/^FILTER=y/#FILTER=y/" pppd/Makefile.linux
- }
-
- use pam && {
- einfo "Enabling PAM"
- sed -i "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux
- }
-
- use ipv6 && {
- einfo "Enabling IPv6"
- sed -i "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux
- }
-
- einfo "Enabling CBCP"
- sed -i "s/^#CBCP=y/CBCP=y/" pppd/Makefile.linux
-
- use dhcp && {
- # copy the ppp-dhcp plugin files
- einfo "Copying ppp-dhcp plugin files..."
- tar -xzf "${DISTDIR}/ppp-dhcpc.tgz" -C pppd/plugins/ \
- && sed -i -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe dhcp/' pppd/plugins/Makefile.linux \
- || die "ppp-dhcp plugin addition failed"
- epatch "${WORKDIR}/patch/dhcp-make-vars.patch"
- epatch "${WORKDIR}/patch/dhcp-sys_error_to_strerror.patch"
- }
-
- # Set correct libdir
- sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
- pppd/{pathnames.h,pppd.8}
-
- 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
- #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/*
- else
- einfo "Disabling radius"
- sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux
- fi
-}
-
-src_configure() {
- export CC="$(tc-getCC)"
- export AR="$(tc-getAR)"
- econf || die "econf failed"
-}
-
-src_compile() {
- emake COPTS="${CFLAGS} -D_GNU_SOURCE" || die "compile failed"
-
- #build pppgetpass
- cd contrib/pppgetpass
- if use gtk; then
- emake -f Makefile.linux || die "failed to build pppgetpass"
- else
- emake pppgetpass.vt || die "failed to build pppgetpass"
- fi
-}
-
-src_install() {
- local i
- for i in chat pppd pppdump pppstats ; do
- doman ${i}/${i}.8
- dosbin ${i}/${i} || die
- done
- fperms u+s-w /usr/sbin/pppd
-
- # Install pppd header files
- pushd pppd >/dev/null
- emake INSTROOT="${D}" install-devel || die
- popd >/dev/null
-
- dosbin pppd/plugins/rp-pppoe/pppoe-discovery || die
-
- 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
-
- exeinto /etc/ppp
- for i in ip-up ip-down ; do
- doexe "${WORKDIR}/scripts/${i}" || die "failed to install ${i} script"
- insinto /etc/ppp/${i}.d
- use ipv6 && dosym ${i} /etc/ppp/${i/ip/ipv6}
- doins "${WORKDIR}/scripts/${i}.d"/* || die "failed to install ${i}.d scripts"
- done
-
- pamd_mimic_system ppp auth account session
-
- local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
- #closing " for syntax coloring
- insinto "${PLUGINS_DIR}"
- insopts -m0755
- doins pppd/plugins/minconn.so || die "minconn.so not build"
- doins pppd/plugins/passprompt.so || die "passprompt.so not build"
- doins pppd/plugins/passwordfd.so || die "passwordfd.so not build"
- doins pppd/plugins/winbind.so || die "winbind.so not build"
- doins pppd/plugins/rp-pppoe/rp-pppoe.so || die "rp-pppoe.so not build"
- if use atm; then
- doins pppd/plugins/pppoatm/pppoatm.so || die "pppoatm.so not build"
- fi
- if use dhcp; then
- doins pppd/plugins/dhcp/dhcpc.so || die "dhcpc.so not build"
- fi
- if use radius; then
- doins pppd/plugins/radius/radius.so || die "radius.so not build"
- doins pppd/plugins/radius/radattr.so || die "radattr.so not build"
- doins pppd/plugins/radius/radrealms.so || die "radrealms.so not build"
-
- #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-radius.8
- doman pppd/plugins/radius/pppd-radattr.8
- fi
-
- insinto /etc/modprobe.d
- insopts -m0644
- newins "${FILESDIR}/modules.ppp" ppp.conf
- if use mppe-mppc; then
- sed -i -e 's/ppp_mppe/ppp_mppe_mppc/' "${D}/etc/modprobe.d/ppp.conf"
- fi
-
- dodoc PLUGINS README* SETUP Changes-2.3 FAQ
- dodoc "${FILESDIR}/README.mpls"
-
- dosbin scripts/pon && \
- dosbin scripts/poff && \
- dosbin scripts/plog && \
- doman scripts/pon.1 || die "failed to install pon&poff scripts"
-
- # Adding misc. specialized scripts to doc dir
- insinto /usr/share/doc/${PF}/scripts/chatchat
- doins scripts/chatchat/* || die "failed to install chat scripts in doc dir"
- insinto /usr/share/doc/${PF}/scripts
- doins scripts/* || die "failed to install scripts in doc dir"
-
- 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"
- 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)"
- if use mppe-mppc ; then
- CONFIG_CHECK="${CONFIG_CHECK} ~PPP_MPPE_MPPC"
- local WARNING_PPP_MPPE_MPPC="CONFIG_PPP_MPPE_MPPC:\t missing MPPE/MPPC encryption/compression (optional, mostly used by PPTP links)"
- else
- CONFIG_CHECK="${CONFIG_CHECK} ~PPP_MPPE"
- local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
- fi
- 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
-
- if [ ! -e "${ROOT}/dev/.devfsd" ] && [ ! -e "${ROOT}/dev/.udev" ] && [ ! -e "${ROOT}/dev/ppp" ]; then
- mknod "${ROOT}/dev/ppp" c 108 0
- fi
- if [ "$ROOT" = "/" ]; then
- if [ -x /sbin/update-modules ]; then
- /sbin/update-modules
- else
- /sbin/modules-update
- fi
- 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"
-
- if use radius && [[ $previous_less_than_2_4_3_r5 = 0 ]] ; then
- echo
- ewarn "As of ${PN}-2.4.3-r5, the RADIUS configuration files have moved from"
- ewarn " /etc/radiusclient to /etc/ppp/radius."
- einfo "For your convenience, radiusclient directory was copied to the new location."
- fi
-
- 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."
-
- # move the old user-defined files into ip-{up,down}.d directories
- # TO BE REMOVED AFTER SEPT 2008
- local i
- for i in ip-up ip-down; do
- if [ -f "${ROOT}"/etc/ppp/${i}.local ]; then
- mv /etc/ppp/${i}.local /etc/ppp/${i}.d/90-local.sh && \
- ewarn "/etc/ppp/${i}.local has been moved to /etc/ppp/${i}.d/90-local.sh"
- fi
- done
-}
diff --git a/net-dialup/ppp/ppp-2.4.5-r3.ebuild b/net-dialup/ppp/ppp-2.4.5-r3.ebuild
deleted file mode 100644
index cacb5a3..00000000
--- a/net-dialup/ppp/ppp-2.4.5-r3.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils multilib toolchain-funcs linux-info pam
-
-PATCH_VER="3"
-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/~floppym/dist/${P}-patches-${PATCH_VER}.tar.xz
- http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="activefilter atm dhcp eap-tls gtk ipv6 pam radius"
-
-DEPEND="activefilter? ( net-libs/libpcap )
- atm? ( net-dialup/linux-atm )
- pam? ( virtual/pam )
- gtk? ( x11-libs/gtk+:2 )
- eap-tls? ( net-misc/curl dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # Use the headers from the kernel #427684
- rm include/linux/if_pppol2tp.h || die
-
- 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}
-
- 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
- #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/*
- else
- einfo "Disabling radius"
- sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux
- fi
-}
-
-src_compile() {
- tc-export AR CC
- emake COPTS="${CFLAGS} -D_GNU_SOURCE"
-
- # build pppgetpass
- cd contrib/pppgetpass
- 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
-
- exeinto /etc/ppp
- for i in ip-up ip-down ; do
- doexe "${WORKDIR}/scripts/${i}"
- insinto /etc/ppp/${i}.d
- use ipv6 && dosym ${i} /etc/ppp/${i/ip/ipv6}
- doins "${WORKDIR}/scripts/${i}.d"/*
- done
-
- pamd_mimic_system ppp auth account session
-
- local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
- # 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"
-
- 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."
-}
diff --git a/net-dialup/ppp/ppp-2.4.6-r3.ebuild b/net-dialup/ppp/ppp-2.4.6-r3.ebuild
deleted file mode 100644
index d1175b5..00000000
--- a/net-dialup/ppp/ppp-2.4.6-r3.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/~pinkbyte/distfiles/patches/${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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="activefilter atm dhcp eap-tls gtk ipv6 pam radius"
-
-DEPEND="activefilter? ( net-libs/libpcap )
- atm? ( net-dialup/linux-atm )
- pam? ( virtual/pam )
- gtk? ( x11-libs/gtk+:2 )
- eap-tls? ( net-misc/curl dev-libs/openssl:0 )"
-RDEPEND="${DEPEND}"
-
-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
-}
-
-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
-
- exeinto /etc/ppp
- for i in ip-up ip-down ; do
- doexe "${WORKDIR}/scripts/${i}"
- insinto /etc/ppp/${i}.d
- use ipv6 && dosym ${i} /etc/ppp/${i/ip/ipv6}
- doins "${WORKDIR}/scripts/${i}.d"/*
- done
-
- 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."
-}
diff --git a/net-dialup/ppp/ppp-2.4.7-r2.ebuild b/net-dialup/ppp/ppp-2.4.7-r2.ebuild
deleted file mode 100644
index 9b7dd4f..00000000
--- a/net-dialup/ppp/ppp-2.4.7-r2.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils linux-info multilib pam toolchain-funcs
-
-PATCH_VER="3"
-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/~vapier/distfiles/${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 ~s390 ~sh ~sparc ~x86"
-IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
-
-DEPEND="activefilter? ( net-libs/libpcap )
- atm? ( net-dialup/linux-atm )
- pam? ( virtual/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
-
- 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."
-}
diff --git a/net-dialup/ppp/ppp-2.4.7.ebuild b/net-dialup/ppp/ppp-2.4.7.ebuild
deleted file mode 100644
index 9843486..00000000
--- a/net-dialup/ppp/ppp-2.4.7.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils linux-info multilib pam toolchain-funcs
-
-PATCH_VER="1"
-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="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="activefilter atm dhcp eap-tls gtk ipv6 pam radius"
-
-DEPEND="!net-dialup/ppp-scripts
- activefilter? ( net-libs/libpcap )
- atm? ( net-dialup/linux-atm )
- pam? ( virtual/pam )
- gtk? ( x11-libs/gtk+:2 )
- eap-tls? ( net-misc/curl dev-libs/openssl:0 )"
-RDEPEND="${DEPEND}"
-
-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
-}
-
-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
-
- exeinto /etc/ppp
- for i in ip-up ip-down ; do
- doexe "${WORKDIR}/scripts/${i}"
- insinto /etc/ppp/${i}.d
- use ipv6 && dosym ${i} /etc/ppp/${i/ip/ipv6}
- doins "${WORKDIR}/scripts/${i}.d"/*
- done
-
- 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."
-}