# ChangeLog for net-dialup/ppp
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.131 2005/11/14 14:38:49 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.132 2005/11/29 17:27:01 mrness Exp $
+
+*ppp-2.4.3-r10 (29 Nov 2005)
+
+ 29 Nov 2005; Alin Nastac <mrness@gentoo.org> +files/ip-down.baselayout,
+ +files/ip-up.baselayout, -ppp-2.4.2-r12.ebuild, -ppp-2.4.3-r8.ebuild,
+ +ppp-2.4.3-r10.ebuild:
+ Remove old versions. Add support for the new pppd net module introduced by
+ sys-apps/baselayout-1.12.0_pre11.
14 Nov 2005; Luis Medinas <metalgod@gentoo.org> ppp-2.4.2-r15.ebuild:
Marked Stable on amd64.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 665135401aa735f0ef1df749940c93db ChangeLog 23227
-MD5 1fd88dda7f4996799c69a9501d42cc23 files/README.mpls 530
+MD5 e956f0c135a2f40293fc45dd41d0836f ppp-2.4.3-r10.ebuild 9702
+MD5 beb9521050c6c8e9e21ec6f9143a3601 ppp-2.4.3-r9.ebuild 8323
+MD5 2d242d3afa45c7513d9169f39a90c83f ChangeLog 23540
+MD5 22533d9fd22c43aa281a10b2c9a8f9ec ppp-2.4.2-r15.ebuild 7411
+MD5 e6fdfdc4317d7fe324c50bd0477ca3f8 metadata.xml 295
+MD5 fc56767c28bef6332decb0a5c48cad83 ppp-2.4.2-r10.ebuild 6209
+MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
+MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146
+MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723
+MD5 2890b47660f967a07ac5b211850e46c5 files/options-pptp 238
MD5 140bc2a08334d3546f43259934da603e files/chat-default 347
+MD5 341c2661a11f00fdd1043a4d4e82977e files/ip-up 1083
+MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607
MD5 c9117abf5fed623d5290779446e9855e files/confd.ppp0 2775
+MD5 6b7aff8114e83512b42ff1be3b1c2462 files/ip-down.baselayout 990
MD5 d90deeaef8dbdfcd18d1567681d03559 files/digest-ppp-2.4.2-r10 271
-MD5 d90deeaef8dbdfcd18d1567681d03559 files/digest-ppp-2.4.2-r12 271
MD5 23a7e77ad13ddd12f281fe134508e52f files/digest-ppp-2.4.2-r15 271
-MD5 b7ba474b501edf4a1179142b306bdcd0 files/digest-ppp-2.4.3-r8 195
+MD5 cc3f6844a351a424392e0d5ad6deec0d files/digest-ppp-2.4.3-r10 195
+MD5 fa2a5b8df496922fa2fb592115953b6b files/options-pppoe 53
+MD5 2f3f8eb46b9d97a435a8694683f84651 files/net.ppp0 4408
+MD5 684e28baf379cadb97500a1a2d0db06d files/ip-up.baselayout 1337
MD5 cc3f6844a351a424392e0d5ad6deec0d files/digest-ppp-2.4.3-r9 195
-MD5 5a554e2a04b9e11bb5bea839213bf97c files/ip-down 931
-MD5 341c2661a11f00fdd1043a4d4e82977e files/ip-up 1083
+MD5 1fd88dda7f4996799c69a9501d42cc23 files/README.mpls 530
MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
-MD5 2f3f8eb46b9d97a435a8694683f84651 files/net.ppp0 4408
-MD5 fa2a5b8df496922fa2fb592115953b6b files/options-pppoe 53
-MD5 2890b47660f967a07ac5b211850e46c5 files/options-pptp 238
-MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146
-MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723
-MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
-MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607
+MD5 5a554e2a04b9e11bb5bea839213bf97c files/ip-down 931
MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
-MD5 e6fdfdc4317d7fe324c50bd0477ca3f8 metadata.xml 295
-MD5 fc56767c28bef6332decb0a5c48cad83 ppp-2.4.2-r10.ebuild 6209
-MD5 06756b9843bf54824792153605bcac28 ppp-2.4.2-r12.ebuild 6935
-MD5 22533d9fd22c43aa281a10b2c9a8f9ec ppp-2.4.2-r15.ebuild 7411
-MD5 2b7d702806660278ad8fc0f38b3cb842 ppp-2.4.3-r8.ebuild 8082
-MD5 beb9521050c6c8e9e21ec6f9143a3601 ppp-2.4.3-r9.ebuild 8323
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFDeKGywUpWvClEHQoRAtK+AJ0RYAbd1zY8Uyk/Bgh/AHOsf/nUzACePcft
-mCqEp+AEPEsAYauq/a70GvA=
-=WLpx
+iD8DBQFDjI93NSP4Vda7IdsRAlq+AJ9+LFIq1a42BUD3vdUQGMT8263rEQCgiCXE
+eIM3WAQOrdWZbJcePsAgdoE=
+=wpH6
-----END PGP SIGNATURE-----
+++ /dev/null
-MD5 362bcf218fba8afbb9afbee7471e5dac ppp-2.4.2.tar.gz 774441
-MD5 760e970cad38d42766c72341f175604d ppp-2.4.2-patches-20050514.tar.gz 11707
-MD5 0d2679907627f68dd6a2c32d1c7dda90 ppp-2.4.2-mppe-mppc-1.1.patch.gz 12532
-MD5 9d2f3febf510c5b0cbb4dacba713a217 ppp-dhcpc.tgz 33497
MD5 848f6c3cafeb6074ffeb293c3af79b7c ppp-2.4.3.tar.gz 688092
-MD5 0e4ebd831eb7e2a8fb1c057078b3e30a ppp-2.4.3-patches-20050729.tar.gz 33442
+MD5 409bf412f967694e64363af4f020a07b ppp-2.4.3-patches-20051105.tar.gz 54784
MD5 9d2f3febf510c5b0cbb4dacba713a217 ppp-dhcpc.tgz 33497
--- /dev/null
+#!/bin/bash
+
+# this is a script which is executed after disconnecting the ppp interface.
+# look at man pppd for details
+
+# the followings parameters are available:
+# $1 = interface-name
+# $2 = tty-device
+# $3 = speed
+# $4 = local-IP-address
+# $5 = remote-IP-address
+# $6 = ipparam
+
+#Support for the new Gentoo baselayout
+[ -f /sbin/functions.sh ] && source /sbin/functions.sh
+if [ -x "${svclib}/net.modules.d/helpers.d/pppd-wrapper" ] &&
+ [ -x "/etc/init.d/net.$1" ] ; then
+
+ ${svclib}/net.modules.d/helpers.d/pppd-wrapper down $1
+
+elif [ "$USEPEERDNS" ]; then
+
+ # taken from debian's 0000usepeerdns
+ # follow any symlink to find the real file
+ REALRESOLVCONF=$(readlink --canonicalize /etc/resolv.conf)
+
+ if [ "$REALRESOLVCONF" != "/etc/ppp/resolv.conf" ]; then
+
+ # if an old resolv.conf file exists, restore it
+ if [ -e $REALRESOLVCONF.pppd-backup ]; then
+ mv $REALRESOLVCONF.pppd-backup $REALRESOLVCONF
+ fi
+
+ fi
+
+fi
+
+[ -f /etc/ppp/ip-down.local ] && . /etc/ppp/ip-down.local "$@"
--- /dev/null
+#!/bin/bash
+
+# this is a script which is executed after connecting the ppp interface.
+# look at man pppd for details
+
+# the followings parameters are available:
+# $1 = interface-name
+# $2 = tty-device
+# $3 = speed
+# $4 = local-IP-address
+# $5 = remote-IP-address
+# $6 = ipparam
+
+#Support for the new Gentoo baselayout
+[ -f /sbin/functions.sh ] && source /sbin/functions.sh
+if [ -x "${svclib}/net.modules.d/helpers.d/pppd-wrapper" ] &&
+ [ -x "/etc/init.d/net.$1" ] ; then
+
+ ${svclib}/net.modules.d/helpers.d/pppd-wrapper up $1
+
+elif [ "$USEPEERDNS" ]; then
+
+ # add the server supplied DNS entries to /etc/resolv.conf
+ # (taken from debian's 0000usepeerdns)
+
+ # follow any symlink to find the real file
+ REALRESOLVCONF=$(readlink --canonicalize /etc/resolv.conf)
+
+ if [ "$REALRESOLVCONF" != "/etc/ppp/resolv.conf" ]; then
+
+ # merge the new nameservers with the other options from the old configuration
+ {
+ grep --invert-match '^nameserver[[:space:]]' $REALRESOLVCONF
+ cat /etc/ppp/resolv.conf
+ } > $REALRESOLVCONF.tmp
+
+ # backup the old configuration and install the new one
+ cp -dpP $REALRESOLVCONF $REALRESOLVCONF.pppd-backup
+ mv $REALRESOLVCONF.tmp $REALRESOLVCONF
+
+ # correct permissions
+ chmod 0644 /etc/resolv.conf
+ chown root:root /etc/resolv.conf
+
+ fi
+
+fi
+
+[ -f /etc/ppp/ip-up.local ] && . /etc/ppp/ip-up.local "$@"
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r12.ebuild,v 1.9 2005/09/10 03:32:52 tgall Exp $
-
-inherit eutils gnuconfig flag-o-matic
-
-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}-patches-20050514.tar.gz
- mppe-mppc? ( http://www.polbox.com/h/hs001/ppp-2.4.2-mppe-mppc-1.1.patch.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 sparc x86 ppc64"
-IUSE="activefilter atm dhcp ipv6 mppe-mppc pam radius"
-
-RDEPEND="virtual/libc
- activefilter? ( virtual/libpcap )
- atm? ( net-dialup/linux-atm )
- pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
- >=sys-apps/sed-4"
-
-pkg_setup() {
- if ! use radius; then
- echo
- ewarn "RADIUS plugins installation is now controled by radius useflag!"
- ewarn "If you need them, hit Ctrl-C now!"
- ebeep
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd ${S}
-
- epatch ${WORKDIR}/patch/cbcp-dosfix.patch || die "patch failed"
- epatch ${WORKDIR}/patch/mpls.patch || die "patch failed"
- epatch ${WORKDIR}/patch/killaddr-smarter.patch || die "patch failed"
- epatch ${WORKDIR}/patch/cflags.patch || die "patch failed"
- epatch ${WORKDIR}/patch/control_c.patch || die "patch failed"
-
- use mppe-mppc && {
- einfo "Enabling mppe-mppc support"
- epatch ${WORKDIR}/ppp-2.4.2-mppe-mppc-1.1.patch || die "patch failed"
- }
-
- if use atm; then
- einfo "Enabling PPPoATM support"
- epatch ${WORKDIR}/patch/pppoatm-2.patch || die "patch failed"
- sed -i -e "s/^LIBS =/LIBS = -latm/" pppd/Makefile.linux || die
- fi
-
- use activefilter || {
- einfo "Disabling active-filter"
- sed -i -e "s/^FILTER=y/#FILTER=y/" pppd/Makefile.linux || die
- }
-
- use pam && {
- einfo "Enabling PAM"
- sed -i -e "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux || die
- }
-
- use ipv6 && {
- einfo "Enabling IPv6"
- sed -i -e "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux || die
- }
-
- einfo "Enabling CBCP"
- sed -i 's/^#CBCP=y/CBCP=y/' pppd/Makefile.linux || die
-
- use radius && {
- einfo "Enabling RADIUS"
- sed -i -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe radius/' pppd/plugins/Makefile.linux || die
- sed -i -e '/^CFLAGS/s:$: -fPIC:' pppd/plugins/radius/radiusclient/lib/Makefile.in || die
- }
-
- use dhcp && {
- # copy the ppp-dhcp plugin files
- einfo "Copying ppp-dhcp plugin files..."
- tar -xzf ${DISTDIR}/ppp-dhcpc.tgz -C ${S}/pppd/plugins/
- sed -i -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe dhcp/' pppd/plugins/Makefile.linux || die
- sed -i -e "s/-O2/${CFLAGS} -fPIC/" ${S}/pppd/plugins/dhcp/Makefile.linux
- epatch ${WORKDIR}/patch/dhcp-sys_error_to_strerror.patch || die
- }
-
- #epatch ${FILESDIR}/${PV}/pcap.patch
- sed -i -e "s:net/bpf.h:pcap-bpf.h:" pppd/sys-linux.c pppd/demand.c pppd/plugins/rp-pppoe/if.c
-
- # Set correct libdir
- sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
- ${S}/pppd/{pathnames.h,pppd.8} || die
-}
-
-src_compile() {
- export WANT_AUTOCONF=2.1
- gnuconfig_update
- use radius && {
- # compile radius better than their makefile does
- append-ldflags -Wl,-z,now
- (cd pppd/plugins/radius/radiusclient && econf && emake -j1) || die "radiusclient build has failed"
- }
- ./configure --prefix=/usr || die "configure failed"
- emake COPTS="${CFLAGS}" || die "build has failed"
-}
-
-src_install() {
- local y
- for y in chat pppd pppdump pppstats
- do
- doman ${y}/${y}.8
- dosbin ${y}/${y}
- done
- chmod u+s-w ${D}/usr/sbin/pppd
-
- 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
- doins ${FILESDIR}/options-pptp
- doins ${FILESDIR}/options-pppoe
- doins ${FILESDIR}/chat-default
-
- insopts -m0755
- doins ${FILESDIR}/ip-up
- doins ${FILESDIR}/ip-down
-
- exeinto /etc/init.d/
- doexe ${FILESDIR}/net.ppp0
-
- if use pam; then
- insinto /etc/pam.d
- insopts -m0644
- newins pppd/ppp.pam ppp || die "not found ppp.pam"
- fi
-
- insinto /etc/conf.d
- insopts -m0600
- newins ${FILESDIR}/confd.ppp0 net.ppp0
-
- local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
- #closing " for syntax coloring
- dodir ${PLUGINS_DIR}
- 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/rp-pppoe/rp-pppoe.so || die "rp-pppoe.so not build"
- if use atm; then
- doins pppd/plugins/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"
-
- doman pppd/plugins/radius/pppd-radius.8
- doman pppd/plugins/radius/pppd-radattr.8
-
- #Copy radiusclient configuration files
- #DO NOT INSTALL libradiusclient.so files!!! see #92878 for more info
- insinto /etc/radiusclient
- insopts -m0644
- doins pppd/plugins/radius/radiusclient/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
- fi
-
- insinto /etc/modules.d
- insopts -m0644
- newins ${FILESDIR}/modules.ppp ppp
- if use mppe-mppc; then
- echo 'alias ppp-compress-18 ppp_mppe_mppc' >> ${D}/etc/modules.d/ppp
- fi
-
- dodoc PLUGINS README* SETUP Changes-2.3 FAQ
- dodoc ${FILESDIR}/README.mpls
- dohtml ${FILESDIR}/pppoe.html
-
- dosbin scripts/pon
- dosbin scripts/poff
- dosbin scripts/plog
- doman scripts/pon.1
-
- # Adding misc. specialized scripts to doc dir
- dodir /usr/share/doc/${PF}/scripts/chatchat
- insinto /usr/share/doc/${PF}/scripts/chatchat
- doins scripts/chatchat/*
- insinto /usr/share/doc/${PF}/scripts
- doins scripts/*
-}
-
-pkg_postinst() {
- if ! [ -e ${ROOT}/dev/.devfsd ] || [ -e ${ROOT}/dev/.udev ]; then
- if [ ! -e ${ROOT}/dev/ppp ]; then
- mknod ${ROOT}/dev/ppp c 108 0
- fi
- fi
- if [ "$ROOT" = "/" ]; then
- /sbin/update-modules
- 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"
-
- ewarn "To enable kernel-pppoe read html/pppoe.html in the doc-directory."
- ewarn "Note: the library name has changed from pppoe.so to rp-pppoe.so."
- ewarn "Pon, poff and plog scripts have been supplied for experienced users."
- ewarn "New users or those requiring something more should have a look at"
- ewarn "the /etc/init.d/net.ppp0 script."
- ewarn "Users needing particular scripts (ssh,rsh,etc.)should check out the"
- ewarn "/usr/share/doc/ppp*/scripts directory."
-
- # lib name has changed
- sed -i -e "s:^pppoe.so:rp-pppoe.so:" ${ROOT}etc/ppp/options
-}
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r8.ebuild,v 1.3 2005/09/22 23:00:36 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r10.ebuild,v 1.1 2005/11/29 17:27:01 mrness Exp $
inherit eutils flag-o-matic toolchain-funcs linux-info
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}-patches-20050729.tar.gz
+ mirror://gentoo/${P}-patches-20051105.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 ~sparc ~x86"
-IUSE="activefilter atm dhcp gtk ipv6 mppe-mppc pam radius"
+IUSE="activefilter atm dhcp eap-tls gtk ipv6 mppe-mppc pam radius"
RDEPEND="virtual/libc
activefilter? ( >=virtual/libpcap-0.9.3 )
atm? ( net-dialup/linux-atm )
pam? ( sys-libs/pam )
- gtk? ( =x11-libs/gtk+-1* )"
+ gtk? ( =x11-libs/gtk+-1* )
+ eap-tls? ( net-misc/curl >=dev-libs/openssl-0.9.7 )"
DEPEND="${RDEPEND}
>=sys-apps/sed-4"
ewarn "If you need them, hit Ctrl-C now!"
ebeep
fi
+
+ if has_version "<${CATEGORY}/${PF}"; then
+ local files=""
+ [ -f "${ROOT}/etc/conf.d/net.ppp0" ] && files=( "${ROOT}/etc/conf.d/net.ppp0" )
+ if [ -f "${ROOT}/etc/init.d/net.ppp0" ]; then
+ local x y
+ x=$(<"${ROOT}/etc/init.d/net.ppp0")
+ y=$(<"${ROOT}/etc/init.d/net.lo")
+ #It should be symlink to net.lo or at least have the same content
+ if [ "$x" != "$y" ] ; then
+ files=( ${files[@]} "${ROOT}/etc/init.d/net.ppp0" )
+ fi
+ fi
+
+ if [[ -n "${files[@]}" ]]; then
+ local f
+ einfo "Gentoo is moving toward common configuration file for all network"
+ einfo "interfaces. Thus starting from >=ppp-2.4.3-r10 the following files"
+ einfo "are obsoleted and should be removed to avoid future confusion:"
+ for f in ${files[@]} ; do
+ eerror " ${f//\/\///} - conflict with baselayout"
+ done
+ for f in chat-default options-pppoe options-pptp ; do
+ f="${ROOT}/etc/ppp/${f}"
+ if [ -f "${f}" ] ; then
+ ewarn " ${f//\/\///} - unused by this version"
+ files=( ${files[@]} "${f}" )
+ fi
+ done
+ echo
+ einfo "If you use the old net.ppp0 script, you need to:"
+ einfo " - upgrade to >=sys-apps/baselayout-1.12.0_pre11"
+ einfo " - set ppp0 parameters in /etc/conf.d/net (see example file)"
+ einfo " - remove conflicting files"
+ einfo " - upgrade net-dialup/ppp"
+ echo
+ einfo "If you never used net.ppp0 script, just run the following commands:"
+ einfo " rm ${files[@]}"
+ einfo " emerge --resume"
+ die "Conflicts with baselayout support detected"
+ fi
+ fi
}
src_unpack() {
epatch ${WORKDIR}/patch/killaddr-smarter.patch
epatch ${WORKDIR}/patch/upstream-fixes.patch
epatch ${WORKDIR}/patch/rp-pppoe-any-interface.patch
- epatch ${WORKDIR}/patch/demand-pcap-outbound.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 && {
- einfo "Enabling mppe-mppc support"
+ einfo "Enabling MPPE-MPPC support"
epatch ${WORKDIR}/patch/mppe-mppc-1.1.patch
+ use eap-tls && epatch ${WORKDIR}/patch/eaptls-mppe-0.7-gentoo.patch
}
use atm && {
insopts -m0644
doins etc.ppp/options
- doins ${FILESDIR}/options-pptp
- doins ${FILESDIR}/options-pppoe
- doins ${FILESDIR}/chat-default
insopts -m0755
- doins ${FILESDIR}/ip-up
- doins ${FILESDIR}/ip-down
-
- exeinto /etc/init.d/
- doexe ${FILESDIR}/net.ppp0
+ newins ${FILESDIR}/ip-up.baselayout ip-up
+ newins ${FILESDIR}/ip-down.baselayout ip-down
if use pam; then
insinto /etc/pam.d
newins pppd/ppp.pam ppp || die "not found ppp.pam"
fi
- insinto /etc/conf.d
- insopts -m0600
- newins ${FILESDIR}/confd.ppp0 net.ppp0
-
local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
#closing " for syntax coloring
dodir ${PLUGINS_DIR}
dodoc PLUGINS README* SETUP Changes-2.3 FAQ
dodoc ${FILESDIR}/README.mpls
- dohtml ${FILESDIR}/pppoe.html
dosbin scripts/pon
dosbin scripts/poff
[ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
- ewarn "To enable kernel-pppoe read html/pppoe.html in the doc-directory."
- ewarn "Note: the library name has changed from pppoe.so to rp-pppoe.so."
- ewarn "Pon, poff and plog scripts have been supplied for experienced users."
- ewarn "New users or those requiring something more should have a look at"
- ewarn "the /etc/init.d/net.ppp0 script."
- ewarn "Users needing particular scripts (ssh,rsh,etc.)should check out the"
- ewarn "/usr/share/doc/ppp*/scripts directory."
-
# lib name has changed
sed -i -e "s:^pppoe.so:rp-pppoe.so:" ${ROOT}etc/ppp/options
ewarn " /etc/radiusclient to /etc/ppp/radius."
einfo "For your convenience, radiusclient directory was copied to the new location."
fi
+
+ echo
+ einfo "Pon, poff and plog scripts have been supplied for experienced users."
+ einfo "Users needing particular scripts (ssh,rsh,etc.) should check out the"
+ einfo "/usr/share/doc/ppp*/scripts directory."
+
+ echo
+ ewarn "The old /etc/init.d/net.ppp0 script has gone!"
+ einfo "The new way of handling PPP connections of any kind (PPPoE, PPPoA, etc)"
+ einfo "is through the baselayout's pppd net module."
+ einfo "Make sure you have a supported version of baselayout by running:"
+ einfo " emerge -u '>=sys-apps/baselayout-1.12.0_pre11'"
}
projects / gentoo.git / commitdiff