Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net-dialup/ppp/ChangeLog12
-rw-r--r--net-dialup/ppp/files/2.4.2/confd.ppp049
-rw-r--r--net-dialup/ppp/files/2.4.2/ip-down31
-rw-r--r--net-dialup/ppp/files/2.4.2/ip-up42
-rw-r--r--net-dialup/ppp/files/2.4.2/net.ppp0221
-rw-r--r--net-dialup/ppp/files/2.4.3/confd.ppp049
-rw-r--r--net-dialup/ppp/files/2.4.3/ip-down31
-rw-r--r--net-dialup/ppp/files/2.4.3/ip-up42
-rw-r--r--net-dialup/ppp/files/2.4.3/net.ppp0221
-rw-r--r--net-dialup/ppp/files/confd.ppp028
-rw-r--r--net-dialup/ppp/files/ip-down26
-rw-r--r--net-dialup/ppp/files/ip-up31
-rw-r--r--net-dialup/ppp/files/net.ppp0140
-rw-r--r--net-dialup/ppp/ppp-2.4.2-r10.ebuild10
-rw-r--r--net-dialup/ppp/ppp-2.4.3-r1.ebuild10
-rw-r--r--net-dialup/ppp/ppp-2.4.3.ebuild10
16 files changed, 160 insertions, 793 deletions
diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index af85ec9430b5..805f45f956b3 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,14 @@
# 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.99 2005/01/29 21:18:02 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.100 2005/02/06 09:22:13 mrness Exp $
+
+ 06 Feb 2005; Alin Nastac <mrness@gentoo.org> files/confd.ppp0,
+ files/ip-down, files/ip-up, files/net.ppp0, -files/2.4.2/confd.ppp0,
+ -files/2.4.2/ip-down, -files/2.4.2/ip-up, -files/2.4.2/net.ppp0,
+ -files/2.4.3/confd.ppp0, -files/2.4.3/ip-down, -files/2.4.3/ip-up,
+ -files/2.4.3/net.ppp0, ppp-2.4.2-r10.ebuild, ppp-2.4.3-r1.ebuild,
+ ppp-2.4.3.ebuild:
+ Use same scripts in all versions.
30 Jan 2005; Daniel Black <dragonheart@gentoo.org> ppp-2.4.1-r14.ebuild,
ppp-2.4.2-r10.ebuild, ppp-2.4.3-r1.ebuild, ppp-2.4.3.ebuild:
@@ -15,7 +23,7 @@
09 Jan 2005; Alin Nastac <mrness@gentoo.org>
+files/2.4.3/fixes-from-upstream-cvs.patch, +ppp-2.4.3-r1.ebuild:
- Add fixes from upstream CVS for bug IDs 1103-1106. See bug #58275 and #74093..
+ Add fixes from upstream CVS for bug IDs 1103-1106. See bug #58275 and #74093.
08 Jan 2005; Alin Nastac <mrness@gentoo.org> -files/ppp-2.4.1-r10.patch,
-ppp-2.4.2-r9.ebuild:
diff --git a/net-dialup/ppp/files/2.4.2/confd.ppp0 b/net-dialup/ppp/files/2.4.2/confd.ppp0
deleted file mode 100644
index cbf3c4a14061..000000000000
--- a/net-dialup/ppp/files/2.4.2/confd.ppp0
+++ /dev/null
@@ -1,49 +0,0 @@
-# /etc/conf.d/net.ppp0:
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/files/2.4.2/confd.ppp0,v 1.2 2004/07/18 03:50:48 dragonheart Exp $
-
-# Config file for /etc/init.d/net.ppp0
-
-PEER="MyPeer" # Define peer (aka ISP)
-DEBUG="no" # Turn on debugging
-PERSIST="no" # Redial after being dropped
-ONDEMAND="no" # Only bring the interface up on demand?
-MODEMPORT="/dev/ttyS1" # TTY device modem is connected to
-LINESPEED="115200" # Speed pppd should try to connect at
-INITSTRING="" # Extra init string for the modem
-DEFROUTE="yes" # Must pppd set the default route?
-HARDFLOWCTL="yes" # Use hardware flow control?
-ESCAPECHARS="yes" # Use escape caracters ?
-PPPOPTIONS="" # Extra options for pppd
-USERNAME="user" # The PAP/CHAP username
-PASSWORD="passwd" # Your password/secret. Ugly I know, but i
- # will work on something more secure later
- # on. 700 permission on /etc/init.d/net.ppp0
- # should be enouth for now.
-NUMBER="9180000" # The telephone number of your ISP
- # leave blank for leased-line operation.
-REMIP="" # The ip of the remote box if it should be set
-NETMASK="" # Netmask
-IPADDR="" # Our IP if we have a static one
-MRU="768" # Sets the MRU
-MTU="768" # Sets the MTU
-RETRYTIMEOUT="60" # Retry timeout for when ONDEMAND="yes" or
- # PERSIST="yes"
-IDLETIMEOUT="600" # Idle timeout for when ONDEMAND="yes"
-PEERDNS="no" # Should pppd set the peer dns?
-
-AUTOCFGFILES="yes" # By default this scripts will generate
- # /etc/ppp/chat-isp, /etc/ppp/chap-secrets,
- # /etc/ppp/pap-secrets and /etc/ppp/peers/isp
- # automatically. Set to "no" if you experience
- # problems, or need specialized scripts. You
- # will have to create these files by hand then.
-
-AUTOCHATSCRIPT="yes" # By default this script iwll generate
- # /etc/ppp/chat-${PEER} automatically. Set to "no"
- # if you experience problems, or need specialized
- # scripts. You will have to create these files by
- # hand then.
-
-
-# Directory where the templates is stored
-TEMPLATEDIR=/etc/ppp
diff --git a/net-dialup/ppp/files/2.4.2/ip-down b/net-dialup/ppp/files/2.4.2/ip-down
deleted file mode 100644
index 2a522fd3e7b6..000000000000
--- a/net-dialup/ppp/files/2.4.2/ip-down
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# 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
-
-if [ "$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 "$@"
diff --git a/net-dialup/ppp/files/2.4.2/ip-up b/net-dialup/ppp/files/2.4.2/ip-up
deleted file mode 100644
index 29719562096f..000000000000
--- a/net-dialup/ppp/files/2.4.2/ip-up
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# 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
-
-if [ "$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 -a $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 "$@"
diff --git a/net-dialup/ppp/files/2.4.2/net.ppp0 b/net-dialup/ppp/files/2.4.2/net.ppp0
deleted file mode 100644
index e6daa809286c..000000000000
--- a/net-dialup/ppp/files/2.4.2/net.ppp0
+++ /dev/null
@@ -1,221 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/files/2.4.2/net.ppp0,v 1.4 2004/09/27 11:37:33 lanius Exp $
-
-# Misc internal variables
-CMD_LINE=""
-FUNCT="$2"
-TEMPLATEDIR="/etc/ppp"
-
-checkconfig() {
-
- if [ -e "/var/run/ppp-${IFACE}.pid" -o -e "/var/run/${IFACE}.pid" ] && \
- [ "${FUNCT}" = "start" ]
- then
- eerror "${IFACE} is already up"
- return 1
- fi
-}
-
-start() {
-
- checkconfig || return 1
-
- setup_modules
- setup_cmd_line
- setup_cfg_files
-
- ebegin "Bringing ${IFACE} up"
- if [ -x "$(which pppd)" ]
- then
-
- if [ "${DEFROUTE}" = "yes" ]
- then
- [ -n "$(/sbin/route -n | egrep '0.0.0.0')" ] && route del default
- fi
- # Added hide-password here, can't be too sure...
- /usr/sbin/pppd ${CMD_LINE} ${MODEMPORT} ${LINESPEED} \
- ipparam ${IFACE} linkname ${IFACE} call ${PEER} \
- noauth ${PPPOPTIONS} hide-password
- fi
- eend
-}
-
-stop() {
-
- checkconfig || return 1
-
- ebegin "Bringing ${IFACE} down"
- if [ -x "$(which ifconfig)" ]
- then
-
- # Obtain interface name from pid file (IFACE is actually linkname)
- if [ -e /var/run/ppp-${IFACE}.pid ]
- then
- IFNAME=$(egrep "ppp" /var/run/ppp-${IFACE}.pid)
- fi
- if [ -z "${IFNAME}" ]
- then
- IFNAME=${IFACE}
- fi
-
- if [ -z "$(/sbin/ifconfig | egrep "${IFNAME}")" ]
- then
- # Link is not up but pppd may be running
- ewarn "Interface seems to be down already"
- fi
-
- if [ -e /var/run/ppp-${IFACE}.pid ]
- then
- PID=$(egrep -v "${IFNAME}" /var/run/ppp-${IFACE}.pid)
- elif [ -e /var/run/${IFACE}.pid ]
- then
- PID=$(egrep -v "${IFNAME}" /var/run/${IFACE}.pid)
- fi
-
- if [ -n "${PID}" ]
- then
- kill ${PID}
- sleep 1
-
- # Try to kill pppd repeatedly (sometimes, (e.g. if connection
- # is not established) pppd ignores SIGTERM for a while)
- PID_TMP=`pstree -p ${PID}`
- PID_TMP=`echo ${PID_TMP} | sed -e 's:^.*pppd(\|).*::g'`
- COUNT=0
- while [ -n "${PID_TMP}" ] && [ ${COUNT} -lt 10 ]
- do
- kill ${PID}
- sleep 1
- PID_TMP=`pstree -p ${PID}`
- PID_TMP=`echo ${PID_TMP} | sed -e 's:^.*pppd(\|).*::g'`
- let COUNT++
- done
- fi
-
- if [ -n "${PID_TMP}" ]
- then
- eend 1 "Error stopping pppd"
- fi
-
- fi
- eend
-}
-
-setup_cmd_line() {
-
- CMD_LINE="lock"
-
- if [ "${DEBUG}" = "yes" ]
- then
- CMD_LINE="${CMD_LINE} debug"
- fi
-
- if [ "${PERSIST}" = "yes" ]
- then
- CMD_LINE="${CMD_LINE} persist holdoff ${RETRYTIMEOUT}"
- fi
-
- if [ "${DEFROUTE}" = "yes" ]
- then
- CMD_LINE="${CMD_LINE} defaultroute"
- fi
-
- if [ "${HARDFLOWCTL}" = "yes" ]
- then
- CMD_LINE="${CMD_LINE} modem crtscts"
- fi
-
- if [ "${ESCAPECHARS}" = "yes" ]
- then
- CMD_LINE="${CMD_LINE} asyncmap 00000000"
- fi
-
- if [ "${PEERDNS}" = "yes" ]
- then
- CMD_LINE="${CMD_LINE} usepeerdns"
- fi
-
- if [ -n "${IPADDR}${REMIP}" ]
- then
- CMD_LINE="${CMD_LINE} ${IPADDR}:${REMIP}"
- fi
-
- if [ -n "${NETMASK}" ]
- then
- CMD_LINE="${CMD_LINE} netmask ${NETMASK}"
- fi
-
- if [ -n "${MRU}" ]
- then
- CMD_LINE="${CMD_LINE} mru ${MRU}"
- fi
-
- if [ -n "${MTU}" ]
- then
- CMD_LINE="${CMD_LINE} mtu ${MTU}"
- fi
-
- if [ -n "${USERNAME}" ]
- then
- CMD_LINE="${CMD_LINE} user ${USERNAME} remotename ${PEER}"
- fi
-
- if [ "${ONDEMAND}" = "yes" ]
- then
- CMD_LINE="${CMD_LINE} demand ktune idle ${IDLETIMEOUT}"
- CMD_LINE="${CMD_LINE} holdoff ${RETRYTIMEOUT}"
- fi
-}
-
-setup_cfg_files() {
-
- if [ "${AUTOCFGFILES}" = "yes" ]
- then
- if [ -n "${NUMBER}" ]
- then
- # Setup the peers file
- echo "connect '/usr/sbin/chat -f /etc/ppp/chat-${PEER}'" \
- >/etc/ppp/peers/${PEER}
- fi
-
- # Setup the secrets files
- echo "\"${USERNAME}\" * \"${PASSWORD}\"" >/etc/ppp/chap-secrets
- chmod 600 /etc/ppp/chap-secrets
- echo "\"${USERNAME}\" ${PEER} \"${PASSWORD}\"" >/etc/ppp/pap-secrets
- chmod 600 /etc/ppp/pap-secrets
-
- # Setup the chat file
- if [ "${AUTOCHATSCRIPT}" = "yes" ]
- then
- if [ -n "${INITSTRING}" ]
- then
- if [ -n "${NUMBER}" ]; then
- sed -e "12i\\'OK\' \'${INITSTRING}\'" \
- -e "s:\$NUMBER:${NUMBER}:" \
- ${TEMPLATEDIR}/chat-default \
- >/etc/ppp/chat-${PEER}
- else
- sed -e "12i\\'OK\' \'${INITSTRING}\'" \
- ${TEMPLATEDIR}/chat-default \
- >/etc/ppp/chat-${PEER}
- fi
- else
- if [ -n "${NUMBER}" ]; then
- sed -e "s:\$NUMBER:${NUMBER}:" \
- ${TEMPLATEDIR}/chat-default \
- >/etc/ppp/chat-${PEER}
- fi
- fi
- fi
- fi
-}
-
-setup_modules() {
- if [ ! -c /dev/ppp ]; then
- modprobe /dev/ppp
- fi
-}
-
-# vim:ts=4
diff --git a/net-dialup/ppp/files/2.4.3/confd.ppp0 b/net-dialup/ppp/files/2.4.3/confd.ppp0
deleted file mode 100644
index 7f2ef20d6f6c..000000000000
--- a/net-dialup/ppp/files/2.4.3/confd.ppp0
+++ /dev/null
@@ -1,49 +0,0 @@
-# /etc/conf.d/net.ppp0:
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/files/2.4.3/confd.ppp0,v 1.1 2004/11/27 10:48:15 mrness Exp $
-
-# Config file for /etc/init.d/net.ppp0
-
-PEER="MyPeer" # Define peer (aka ISP)
-DEBUG="no" # Turn on debugging
-PERSIST="no" # Redial after being dropped
-ONDEMAND="no" # Only bring the interface up on demand?
-MODEMPORT="/dev/ttyS1" # TTY device modem is connected to
-LINESPEED="115200" # Speed pppd should try to connect at
-INITSTRING="" # Extra init string for the modem
-DEFROUTE="yes" # Must pppd set the default route?
-HARDFLOWCTL="yes" # Use hardware flow control?
-ESCAPECHARS="yes" # Use escape caracters ?
-PPPOPTIONS="" # Extra options for pppd
-USERNAME="user" # The PAP/CHAP username
-PASSWORD="passwd" # Your password/secret. Ugly I know, but i
- # will work on something more secure later
- # on. 700 permission on /etc/init.d/net.ppp0
- # should be enouth for now.
-NUMBER="9180000" # The telephone number of your ISP
- # leave blank for leased-line operation.
-REMIP="" # The ip of the remote box if it should be set
-NETMASK="" # Netmask
-IPADDR="" # Our IP if we have a static one
-MRU="768" # Sets the MRU
-MTU="768" # Sets the MTU
-RETRYTIMEOUT="60" # Retry timeout for when ONDEMAND="yes" or
- # PERSIST="yes"
-IDLETIMEOUT="600" # Idle timeout for when ONDEMAND="yes"
-PEERDNS="no" # Should pppd set the peer dns?
-
-AUTOCFGFILES="yes" # By default this scripts will generate
- # /etc/ppp/chat-isp, /etc/ppp/chap-secrets,
- # /etc/ppp/pap-secrets and /etc/ppp/peers/isp
- # automatically. Set to "no" if you experience
- # problems, or need specialized scripts. You
- # will have to create these files by hand then.
-
-AUTOCHATSCRIPT="yes" # By default this script iwll generate
- # /etc/ppp/chat-${PEER} automatically. Set to "no"
- # if you experience problems, or need specialized
- # scripts. You will have to create these files by
- # hand then.
-
-
-# Directory where the templates is stored
-TEMPLATEDIR=/etc/ppp
diff --git a/net-dialup/ppp/files/2.4.3/ip-down b/net-dialup/ppp/files/2.4.3/ip-down
deleted file mode 100644
index 2a522fd3e7b6..000000000000
--- a/net-dialup/ppp/files/2.4.3/ip-down
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# 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
-
-if [ "$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 "$@"
diff --git a/net-dialup/ppp/files/2.4.3/ip-up b/net-dialup/ppp/files/2.4.3/ip-up
deleted file mode 100644
index 29719562096f..000000000000
--- a/net-dialup/ppp/files/2.4.3/ip-up
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# 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
-
-if [ "$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 -a $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 "$@"
diff --git a/net-dialup/ppp/files/2.4.3/net.ppp0 b/net-dialup/ppp/files/2.4.3/net.ppp0
deleted file mode 100644
index 7f33e0f4fdf3..000000000000
--- a/net-dialup/ppp/files/2.4.3/net.ppp0
+++ /dev/null
@@ -1,221 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/files/2.4.3/net.ppp0,v 1.1 2004/11/27 10:48:15 mrness Exp $
-
-# Misc internal variables
-CMD_LINE=""
-FUNCT="$2"
-TEMPLATEDIR="/etc/ppp"
-
-checkconfig() {
-
- if [ -e "/var/run/ppp-${IFACE}.pid" -o -e "/var/run/${IFACE}.pid" ] && \
- [ "${FUNCT}" = "start" ]
- then
- eerror "${IFACE} is already up"
- return 1
- fi
-}
-
-start() {
-
- checkconfig || return 1
-
- setup_modules
- setup_cmd_line
- setup_cfg_files
-
- ebegin "Bringing ${IFACE} up"
- if [ -x "$(which pppd)" ]
- then
-
- if [ "${DEFROUTE}" = "yes" ]
- then
- [ -n "$(/sbin/route -n | egrep '0.0.0.0')" ] && route del default
- fi
- # Added hide-password here, can't be too sure...
- /usr/sbin/pppd ${CMD_LINE} ${MODEMPORT} ${LINESPEED} \
- ipparam ${IFACE} linkname ${IFACE} call ${PEER} \
- noauth ${PPPOPTIONS} hide-password
- fi
- eend
-}
-
-stop() {
-
- checkconfig || return 1
-
- ebegin "Bringing ${IFACE} down"
- if [ -x "$(which ifconfig)" ]
- then
-
- # Obtain interface name from pid file (IFACE is actually linkname)
- if [ -e /var/run/ppp-${IFACE}.pid ]
- then
- IFNAME=$(egrep "ppp" /var/run/ppp-${IFACE}.pid)
- fi
- if [ -z "${IFNAME}" ]
- then
- IFNAME=${IFACE}
- fi
-
- if [ -z "$(/sbin/ifconfig | egrep "${IFNAME}")" ]
- then
- # Link is not up but pppd may be running
- ewarn "Interface seems to be down already"
- fi
-
- if [ -e /var/run/ppp-${IFACE}.pid ]
- then
- PID=$(egrep -v "${IFNAME}" /var/run/ppp-${IFACE}.pid)
- elif [ -e /var/run/${IFACE}.pid ]
- then
- PID=$(egrep -v "${IFNAME}" /var/run/${IFACE}.pid)
- fi
-
- if [ -n "${PID}" ]
- then
- kill ${PID}
- sleep 1
-
- # Try to kill pppd repeatedly (sometimes, (e.g. if connection
- # is not established) pppd ignores SIGTERM for a while)
- PID_TMP=`pstree -p ${PID}`
- PID_TMP=`echo ${PID_TMP} | sed -e 's:^.*pppd(\|).*::g'`
- COUNT=0
- while [ -n "${PID_TMP}" ] && [ ${COUNT} -lt 10 ]
- do
- kill ${PID}
- sleep 1
- PID_TMP=`pstree -p ${PID}`
- PID_TMP=`echo ${PID_TMP} | sed -e 's:^.*pppd(\|).*::g'`
- let COUNT++
- done
- fi
-
- if [ -n "${PID_TMP}" ]
- then
- eend 1 "Error stopping pppd"
- fi
-
- fi
- eend
-}
-
-setup_cmd_line() {
-
- CMD_LINE="lock"
-
- if [ "${DEBUG}" = "yes" ]
- then
- CMD_LINE="${CMD_LINE} debug"
- fi
-
- if [ "${PERSIST}" = "yes" ]
- then
- CMD_LINE="${CMD_LINE} persist holdoff ${RETRYTIMEOUT}"
- fi
-
- if [ "${DEFROUTE}" = "yes" ]
- then
- CMD_LINE="${CMD_LINE} defaultroute"
- fi
-
- if [ "${HARDFLOWCTL}" = "yes" ]
- then
- CMD_LINE="${CMD_LINE} modem crtscts"
- fi
-
- if [ "${ESCAPECHARS}" = "yes" ]
- then
- CMD_LINE="${CMD_LINE} asyncmap 00000000"
- fi
-
- if [ "${PEERDNS}" = "yes" ]
- then
- CMD_LINE="${CMD_LINE} usepeerdns"
- fi
-
- if [ -n "${IPADDR}${REMIP}" ]
- then
- CMD_LINE="${CMD_LINE} ${IPADDR}:${REMIP}"
- fi
-
- if [ -n "${NETMASK}" ]
- then
- CMD_LINE="${CMD_LINE} netmask ${NETMASK}"
- fi
-
- if [ -n "${MRU}" ]
- then
- CMD_LINE="${CMD_LINE} mru ${MRU}"
- fi
-
- if [ -n "${MTU}" ]
- then
- CMD_LINE="${CMD_LINE} mtu ${MTU}"
- fi
-
- if [ -n "${USERNAME}" ]
- then
- CMD_LINE="${CMD_LINE} user ${USERNAME} remotename ${PEER}"
- fi
-
- if [ "${ONDEMAND}" = "yes" ]
- then
- CMD_LINE="${CMD_LINE} demand ktune idle ${IDLETIMEOUT}"
- CMD_LINE="${CMD_LINE} holdoff ${RETRYTIMEOUT}"
- fi
-}
-
-setup_cfg_files() {
-
- if [ "${AUTOCFGFILES}" = "yes" ]
- then
- if [ -n "${NUMBER}" ]
- then
- # Setup the peers file
- echo "connect '/usr/sbin/chat -f /etc/ppp/chat-${PEER}'" \
- >/etc/ppp/peers/${PEER}
- fi
-
- # Setup the secrets files
- echo "\"${USERNAME}\" * \"${PASSWORD}\"" >/etc/ppp/chap-secrets
- chmod 600 /etc/ppp/chap-secrets
- echo "\"${USERNAME}\" ${PEER} \"${PASSWORD}\"" >/etc/ppp/pap-secrets
- chmod 600 /etc/ppp/pap-secrets
-
- # Setup the chat file
- if [ "${AUTOCHATSCRIPT}" = "yes" ]
- then
- if [ -n "${INITSTRING}" ]
- then
- if [ -n "${NUMBER}" ]; then
- sed -e "12i\\'OK\' \'${INITSTRING}\'" \
- -e "s:\$NUMBER:${NUMBER}:" \
- ${TEMPLATEDIR}/chat-default \
- >/etc/ppp/chat-${PEER}
- else
- sed -e "12i\\'OK\' \'${INITSTRING}\'" \
- ${TEMPLATEDIR}/chat-default \
- >/etc/ppp/chat-${PEER}
- fi
- else
- if [ -n "${NUMBER}" ]; then
- sed -e "s:\$NUMBER:${NUMBER}:" \
- ${TEMPLATEDIR}/chat-default \
- >/etc/ppp/chat-${PEER}
- fi
- fi
- fi
- fi
-}
-
-setup_modules() {
- if [ ! -c /dev/ppp ]; then
- modprobe /dev/ppp
- fi
-}
-
-# vim:ts=4
diff --git a/net-dialup/ppp/files/confd.ppp0 b/net-dialup/ppp/files/confd.ppp0
index 61e8589c9330..96329294ae30 100644
--- a/net-dialup/ppp/files/confd.ppp0
+++ b/net-dialup/ppp/files/confd.ppp0
@@ -1,9 +1,8 @@
# /etc/conf.d/net.ppp0:
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/files/confd.ppp0,v 1.2 2004/07/18 03:50:48 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/files/confd.ppp0,v 1.3 2005/02/06 09:22:13 mrness Exp $
# Config file for /etc/init.d/net.ppp0
-
PEER="MyPeer" # Define peer (aka ISP)
DEBUG="no" # Turn on debugging
PERSIST="no" # Redial after being dropped
@@ -21,6 +20,7 @@ PASSWORD="passwd" # Your password/secret. Ugly I know, but i
# on. 700 permission on /etc/init.d/net.ppp0
# should be enouth for now.
NUMBER="9180000" # The telephone number of your ISP
+ # leave blank for leased-line operation.
REMIP="" # The ip of the remote box if it should be set
NETMASK="" # Netmask
IPADDR="" # Our IP if we have a static one
@@ -31,29 +31,19 @@ RETRYTIMEOUT="60" # Retry timeout for when ONDEMAND="yes" or
IDLETIMEOUT="600" # Idle timeout for when ONDEMAND="yes"
PEERDNS="no" # Should pppd set the peer dns?
-# This does not currently work due to a bug in pppd (I think)
-FWSCRIPT="/etc/init.d/firewall" # Optional FW script that pppd should start
- # and stop when the link comes up or drop.
- # It should be a script that takes one
- # argument, namely the action that should
- # be taken (start|stop). The name of the
- # external interface on which the firewall
- # should be activated, should be hardcoded
- # into the script (you will tipically have
- # fw.ppp0, fw.ppp1, etc if you have more than
- # one ppp interface).
- #
- # called: ${FWSCRIPT} [start|stop]
-
AUTOCFGFILES="yes" # By default this scripts will generate
# /etc/ppp/chat-isp, /etc/ppp/chap-secrets,
# /etc/ppp/pap-secrets and /etc/ppp/peers/isp
- # automagically. Set to "no" if you experience
+ # automatically. Set to "no" if you experience
# problems, or need specialized scripts. You
# will have to create these files by hand then.
- # Also, the FWSCRIPT feature will not work.
+
+AUTOCHATSCRIPT="yes" # By default this script iwll generate
+ # /etc/ppp/chat-${PEER} automatically. Set to "no"
+ # if you experience problems, or need specialized
+ # scripts. You will have to create these files by
+ # hand then.
# Directory where the templates is stored
TEMPLATEDIR=/etc/ppp
-
diff --git a/net-dialup/ppp/files/ip-down b/net-dialup/ppp/files/ip-down
index 4ac64e483133..77e05655a585 100644
--- a/net-dialup/ppp/files/ip-down
+++ b/net-dialup/ppp/files/ip-down
@@ -10,4 +10,28 @@
# $4 = local-IP-address
# $5 = remote-IP-address
# $6 = ipparam
-
+
+if [ "$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
+
+# Recreate the default route so autodial works
+[ -s /etc/conf.d/net ] && . /etc/conf.d/net
+if [ -n "${gateway}" ] && [ "${gateway%/*}" = "$1" ]; then
+ /sbin/route add default dev ${gateway%/*}
+fi
+
+[ -f /etc/ppp/ip-down.local ] && . /etc/ppp/ip-down.local "$@"
diff --git a/net-dialup/ppp/files/ip-up b/net-dialup/ppp/files/ip-up
index 8f950b4b8238..29719562096f 100644
--- a/net-dialup/ppp/files/ip-up
+++ b/net-dialup/ppp/files/ip-up
@@ -10,4 +10,33 @@
# $4 = local-IP-address
# $5 = remote-IP-address
# $6 = ipparam
-
+
+if [ "$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 -a $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 "$@"
diff --git a/net-dialup/ppp/files/net.ppp0 b/net-dialup/ppp/files/net.ppp0
index 5869c9272b93..a107e9b50c67 100644
--- a/net-dialup/ppp/files/net.ppp0
+++ b/net-dialup/ppp/files/net.ppp0
@@ -1,13 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# Author: Martin Schlemmer <azarah@gentoo.org>
-# Credits: To all those I got ideas from :)
-#
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/files/net.ppp0,v 1.6 2004/11/01 11:54:10 dragonheart Exp $
-
-# NB: Config is in /etc/conf.d/net.$IFACE
-
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/files/net.ppp0,v 1.7 2005/02/06 09:22:13 mrness Exp $
# Misc internal variables
CMD_LINE=""
@@ -16,16 +10,10 @@ TEMPLATEDIR="/etc/ppp"
checkconfig() {
- if [ ! -x "$(which pppd)" -o ! -x "$(which chat)" ]
- then
- eerror "pppd and chat needs to be installed"
- return 1
- fi
-
if [ -e "/var/run/ppp-${IFACE}.pid" -o -e "/var/run/${IFACE}.pid" ] && \
[ "${FUNCT}" = "start" ]
then
- eerror "ppp0 is already up"
+ eerror "${IFACE} is already up"
return 1
fi
}
@@ -34,6 +22,7 @@ start() {
checkconfig || return 1
+ setup_modules
setup_cmd_line
setup_cfg_files
@@ -43,7 +32,7 @@ start() {
if [ "${DEFROUTE}" = "yes" ]
then
- [ -n "$(/sbin/route | egrep 'default')" ] && route del default
+ [ -n "$(/sbin/route -n | egrep '0.0.0.0')" ] && route del default
fi
# Added hide-password here, can't be too sure...
/usr/sbin/pppd ${CMD_LINE} ${MODEMPORT} ${LINESPEED} \
@@ -61,23 +50,55 @@ stop() {
if [ -x "$(which ifconfig)" ]
then
- if [ -z "$(/sbin/ifconfig | egrep "${IFACE}")" ]
+ # Obtain interface name from pid file (IFACE is actually linkname)
+ if [ -e /var/run/ppp-${IFACE}.pid ]
then
+ IFNAME=$(egrep "ppp" /var/run/ppp-${IFACE}.pid)
+ fi
+ if [ -z "${IFNAME}" ]
+ then
+ IFNAME=${IFACE}
+ fi
+
+ if [ -z "$(/sbin/ifconfig | egrep "${IFNAME}")" ]
+ then
+ # Link is not up but pppd may be running
ewarn "Interface seems to be down already"
- # We should return 0 here, else svc_stop() will not remove
- # the 'started' symlink ...
- return 0
fi
-# /sbin/ifconfig ${IFACE} down
if [ -e /var/run/ppp-${IFACE}.pid ]
then
- kill $(egrep -v "${IFACE}" /var/run/ppp-${IFACE}.pid)
-
+ PID=$(egrep -v "${IFNAME}" /var/run/ppp-${IFACE}.pid)
elif [ -e /var/run/${IFACE}.pid ]
then
- kill $(egrep -v "${IFACE}" /var/run/${IFACE}.pid)
+ PID=$(egrep -v "${IFNAME}" /var/run/${IFACE}.pid)
+ fi
+
+ if [ -n "${PID}" ]
+ then
+ kill ${PID}
+ sleep 1
+
+ # Try to kill pppd repeatedly (sometimes, (e.g. if connection
+ # is not established) pppd ignores SIGTERM for a while)
+ PID_TMP=`pstree -p ${PID}`
+ PID_TMP=`echo ${PID_TMP} | sed -e 's:^.*pppd(\|).*::g'`
+ COUNT=0
+ while [ -n "${PID_TMP}" ] && [ ${COUNT} -lt 10 ]
+ do
+ kill ${PID}
+ sleep 1
+ PID_TMP=`pstree -p ${PID}`
+ PID_TMP=`echo ${PID_TMP} | sed -e 's:^.*pppd(\|).*::g'`
+ let COUNT++
+ done
+ fi
+
+ if [ -n "${PID_TMP}" ]
+ then
+ eend 1 "Error stopping pppd"
fi
+
fi
eend
}
@@ -155,65 +176,46 @@ setup_cfg_files() {
if [ -n "${NUMBER}" ]
then
# Setup the peers file
- echo "connect '/usr/sbin/chat -v -f /etc/ppp/chat-${PEER}'" \
+ echo "connect '/usr/sbin/chat -f /etc/ppp/chat-${PEER}'" \
>/etc/ppp/peers/${PEER}
fi
# Setup the secrets files
- echo "\"${USERNAME}\" ${PEER} \"${PASSWORD}\"" >/etc/ppp/chap-secrets
+ echo "\"${USERNAME}\" * \"${PASSWORD}\"" >/etc/ppp/chap-secrets
chmod 600 /etc/ppp/chap-secrets
echo "\"${USERNAME}\" ${PEER} \"${PASSWORD}\"" >/etc/ppp/pap-secrets
chmod 600 /etc/ppp/pap-secrets
# Setup the chat file
- if [ -n "${INITSTRING}" ]
+ if [ "${AUTOCHATSCRIPT}" = "yes" ]
then
- sed -e "/\$NUMBER/i\'OK\' \'${INITSTRING}\'"
- -e "s:\$NUMBER:${NUMBER}:" \
- ${TEMPLATEDIR}/chat-default \
- >/etc/ppp/chat-${PEER}
- else
- sed -e "s:\$NUMBER:${NUMBER}:" \
- ${TEMPLATEDIR}/chat-default \
- >/etc/ppp/chat-${PEER}
+ if [ -n "${INITSTRING}" ]
+ then
+ if [ -n "${NUMBER}" ]; then
+ sed -e "12i\\'OK\' \'${INITSTRING}\'" \
+ -e "s:\$NUMBER:${NUMBER}:" \
+ ${TEMPLATEDIR}/chat-default \
+ >/etc/ppp/chat-${PEER}
+ else
+ sed -e "12i\\'OK\' \'${INITSTRING}\'" \
+ ${TEMPLATEDIR}/chat-default \
+ >/etc/ppp/chat-${PEER}
+ fi
+ else
+ if [ -n "${NUMBER}" ]; then
+ sed -e "s:\$NUMBER:${NUMBER}:" \
+ ${TEMPLATEDIR}/chat-default \
+ >/etc/ppp/chat-${PEER}
+ fi
+ fi
fi
-
- # Setup the ip-scripts so long
- echo '#!/bin/sh' >/etc/ppp/ip-up
- chmod 700 /etc/ppp/ip-up
- echo '#!/bin/sh' >/etc/ppp/ip-down
- chmod 700 /etc/ppp/ip-down
-
- # Setup if-up and if-down
- if [ -x ${FWSCRIPT} ]
- then
- echo "${FWSCRIPT} start" >>/etc/ppp/ip-up
- echo "${FWSCRIPT} stop" >>/etc/ppp/ip-down
- fi
-
- if [ "${PEERDNS}" = "yes" ]
- then
- # ip-up: add the server supplied DNS entries to
- # /etc/resolv.conf
- echo "/bin/cp -f /etc/resolv.conf /etc/resolv.conf.old" \
- >>/etc/ppp/ip-up
- echo "/bin/cat /etc/ppp/resolv.conf >> /etc/resolv.conf" \
- >>/etc/ppp/ip-up
- # Change perms because it b0rked kppp
- echo "chmod 644 /etc/resolv.conf" >>/etc/ppp/ip-up
-
- # ip-down: restore original /etc/resolv.conf
- echo "/bin/mv -f /etc/resolv.conf.old /etc/resolv.conf" \
- >>/etc/ppp/ip-down
- echo "chmod 644 /etc/resolv.conf" >>/etc/ppp/ip-down
- fi
-
- echo "[ -f /etc/ppp/ip-up.local ] && . /etc/ppp/ip-up.local" \
- >>/etc/ppp/ip-up
- echo "[ -f /etc/ppp/ip-down.local ] && . /etc/ppp/ip-down.local" \
- >>/etc/ppp/ip-down
fi
}
+setup_modules() {
+ if [ ! -c /dev/ppp ]; then
+ modprobe /dev/ppp
+ fi
+}
# vim:ts=4
diff --git a/net-dialup/ppp/ppp-2.4.2-r10.ebuild b/net-dialup/ppp/ppp-2.4.2-r10.ebuild
index 04b089a5d19d..f20d8ae61f36 100644
--- a/net-dialup/ppp/ppp-2.4.2-r10.ebuild
+++ b/net-dialup/ppp/ppp-2.4.2-r10.ebuild
@@ -1,6 +1,6 @@
# 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-r10.ebuild,v 1.6 2005/01/29 21:18:02 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r10.ebuild,v 1.7 2005/02/06 09:22:13 mrness Exp $
inherit eutils gnuconfig flag-o-matic
@@ -110,11 +110,11 @@ src_install() {
doins ${FILESDIR}/${PV}/chat-default
insopts -m0755
- doins ${FILESDIR}/${PV}/ip-up
- doins ${FILESDIR}/${PV}/ip-down
+ doins ${FILESDIR}/ip-up
+ doins ${FILESDIR}/ip-down
exeinto /etc/init.d/
- doexe ${FILESDIR}/${PV}/net.ppp0
+ doexe ${FILESDIR}/net.ppp0
if useq pam; then
insinto /etc/pam.d
@@ -124,7 +124,7 @@ src_install() {
insinto /etc/conf.d
insopts -m0600
- newins ${FILESDIR}/${PV}/confd.ppp0 net.ppp0
+ newins ${FILESDIR}/confd.ppp0 net.ppp0
dolib.so pppd/plugins/minconn.so
dolib.so pppd/plugins/passprompt.so
diff --git a/net-dialup/ppp/ppp-2.4.3-r1.ebuild b/net-dialup/ppp/ppp-2.4.3-r1.ebuild
index ca0bad4c4c59..c005813ad07f 100644
--- a/net-dialup/ppp/ppp-2.4.3-r1.ebuild
+++ b/net-dialup/ppp/ppp-2.4.3-r1.ebuild
@@ -1,6 +1,6 @@
# 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-r1.ebuild,v 1.3 2005/01/29 21:18:02 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r1.ebuild,v 1.4 2005/02/06 09:22:13 mrness Exp $
inherit eutils gnuconfig flag-o-matic
@@ -111,11 +111,11 @@ src_install() {
doins ${FILESDIR}/${PV}/chat-default
insopts -m0755
- doins ${FILESDIR}/${PV}/ip-up
- doins ${FILESDIR}/${PV}/ip-down
+ doins ${FILESDIR}/ip-up
+ doins ${FILESDIR}/ip-down
exeinto /etc/init.d/
- doexe ${FILESDIR}/${PV}/net.ppp0
+ doexe ${FILESDIR}/net.ppp0
if useq pam; then
insinto /etc/pam.d
@@ -125,7 +125,7 @@ src_install() {
insinto /etc/conf.d
insopts -m0600
- newins ${FILESDIR}/${PV}/confd.ppp0 net.ppp0
+ newins ${FILESDIR}/confd.ppp0 net.ppp0
dolib.so pppd/plugins/minconn.so
dolib.so pppd/plugins/passprompt.so
diff --git a/net-dialup/ppp/ppp-2.4.3.ebuild b/net-dialup/ppp/ppp-2.4.3.ebuild
index a7864b2b24ae..42d2da9e1584 100644
--- a/net-dialup/ppp/ppp-2.4.3.ebuild
+++ b/net-dialup/ppp/ppp-2.4.3.ebuild
@@ -1,6 +1,6 @@
# 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.ebuild,v 1.5 2005/01/29 21:18:02 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3.ebuild,v 1.6 2005/02/06 09:22:13 mrness Exp $
inherit eutils gnuconfig flag-o-matic
@@ -110,11 +110,11 @@ src_install() {
doins ${FILESDIR}/${PV}/chat-default
insopts -m0755
- doins ${FILESDIR}/${PV}/ip-up
- doins ${FILESDIR}/${PV}/ip-down
+ doins ${FILESDIR}/ip-up
+ doins ${FILESDIR}/ip-down
exeinto /etc/init.d/
- doexe ${FILESDIR}/${PV}/net.ppp0
+ doexe ${FILESDIR}/net.ppp0
if useq pam; then
insinto /etc/pam.d
@@ -124,7 +124,7 @@ src_install() {
insinto /etc/conf.d
insopts -m0600
- newins ${FILESDIR}/${PV}/confd.ppp0 net.ppp0
+ newins ${FILESDIR}/confd.ppp0 net.ppp0
dolib.so pppd/plugins/minconn.so
dolib.so pppd/plugins/passprompt.so