--- ppp-2.4.5.orig/debian/ppp-udeb.templates +++ ppp-2.4.5/debian/ppp-udeb.templates @@ -0,0 +1,81 @@ +# These templates have been reviewed by the debian-l10n-english +# team +# +# If modifications/additions/rewording are needed, please ask +# debian-l10n-english@lists.debian.org for advice. +# +# Even minor modifications require translation updates and such +# changes should be coordinated with translators and reviewers. + +Template: debian-installer/ppp-udeb/title +Type: text +# Main menu item +_Description: Configure and start a PPPoE connection + +Template: ppp/no_concentrators +Type: error +_Description: No PPPoE concentrator + All network interfaces have been probed, but a PPPoE concentrator was + not detected. + . + The configuration of PPPoE has been aborted. It can be attempted again by + selecting the relevant menu entry. + +Template: ppp/interface +Type: string +Default: _ +Description: Interface name: + Please enter the name of the network interface connected to the PPPoE + modem. + +Template: ppp/username +Type: string +_Description: ISP account username: + Please enter the username for the PPP connection. + . + This information should have been provided by your Internet Service + Provider. + +Template: ppp/password +Type: password +_Description: ISP account password: + Please enter the password for the PPP connection. + . + This information should have been provided by your Internet Service + Provider. + +Template: ppp/detect_failed +Type: error +_Description: No Ethernet interface + PPPoE networking cannot be configured because no Ethernet interface was + detected. + . + The configuration of PPPoE has been aborted. It can be attempted again by + selecting the relevant menu entry. + +Template: ppp/detect_progress +Type: text +_Description: Searching for concentrators on ${IFACE}... + +Template: ppp/wrong_login +Type: error +_Description: Failed authentication + A PPPoE connection was attempted, but the provided login information was + probably incorrect. + . + Please check the username and password you provided. + . + The configuration of PPPoE has been aborted. It can be attempted again by + selecting the relevant menu entry. + +Template: ppp/unhandled +Type: error +_Description: Unhandled error + An unidentified error happened while attempting to create a connection. + . + The configuration of PPPoE has been aborted. It can be attempted again by + selecting the relevant menu entry. + +Template: ppp/please_wait +Type: text +_Description: Please wait... --- ppp-2.4.5.orig/debian/ppp-udeb.postinst +++ ppp-2.4.5/debian/ppp-udeb.postinst @@ -0,0 +1,345 @@ +#!/bin/sh -e + +. /usr/share/debconf/confmodule + +INTERFACES=$(grep : /proc/net/dev | cut -d':' -f1 | sort | sed -e 's/ *//' | grep -E '^(eth|nas|tap|nic-)') +db_get ppp/interface +PPPOE="$RET" +db_capb backup + +log() { + logger -t DEBUG:ppp-udeb $* +} + +fail() { + logger -t FAIL:ppp-udeb $* +} + +ppp_concentrator_on() { + db_subst ppp/detect_progress IFACE "${1}" || true + if [ -z "$(ip link show $1 up)" ]; then + log "$1 was not configured. ppp-udeb will bring it up" + PPPUP=yes + ip link set $1 up + else + log "$1 was already up" + PPPUP=no + fi + MAXWAIT=20; IW=5; TOTWAIT=$(($MAXWAIT + $MAXWAIT + $IW)) + R=0 + db_progress START 0 $TOTWAIT ppp/detect_progress + for P in "" "-U" ; do + rm -f /tmp/probe-finished /tmp/ppp-errors + ( R=$(/usr/sbin/pppoe-discovery -A $P -I $1 2>/tmp/ppp-errors | \ + grep AC | wc -l) + echo $R > /tmp/probe-finished ) & + WAIT=0 + TO=0 + + while [ ! -f /tmp/probe-finished ]; do + log "Timeout detected $TO" + sleep 1 + db_progress STEP 1 + WAIT=$(($WAIT + 1)) + if [ $WAIT -ge $MAXWAIT ]; then + touch /tmp/probe-finished + fi + TO=$(grep Timeout /tmp/ppp-errors 2>/dev/null | wc -l || true) + if [ $TO -eq 1 ]; then + touch /tmp/probe-finished + break + fi + log "pppoe probe output size: $(cat /tmp/probe-finished 2> /dev/null)" + done + R=$(cat /tmp/probe-finished 2>/dev/null || true) + if [ -n "$R" -a 1$R -ne 10 ]; then + break + fi + if [ -z "$P" ]; then + sleep $IW + db_progress STEP $IW + fi + done + + PROCESS=$(ps -A | grep pppoe-discovery | sed s:^[[:space:]]::g | \ + cut -f1 -d' ' || true) + if [ $TO -ne 1 -a "$PROCESS" ]; then + kill $PROCESS + fi + rm -f /tmp/probe-finished /tmp/ppp-errors + db_progress STOP + + if [ -n "$R" -a 1$R -ne 10 ]; then + return 0 + else + return 1 + fi +} + +reset_if_needed() { + # Bring down an earlier pppoe connection, if there is one + if [ -e $PIDF ] + then + PID=$(cat $PIDF) + log "found PID file $PIDF which refers to process $PID; searching for the pppd process" + if [ -z "$(ps | grep "^\s*$PID" | sed "s/^\s*$PID\s.*$/$PID/")" ] + then + log "$PID not found; removing pid file" + else + log "$PID found; killing it and removing pid file" + kill $PID || true + fi + rm -f $PIDF + fi + + # Bring down previously raised interface + if [ "$PPPOE" != "_" ]; then + ip link set "$PPPOE" down + db_set ppp/interface "_" + fi +} + +valid_hostname() { + if [ $(echo -n "$1" | wc -c) -lt 2 ] || + [ $(echo -n "$1" | wc -c) -gt 63 ] || + [ "$(echo -n "$1" | sed 's/[^-\.[:alnum:]]//g')" != "$1" ] || + [ "$(echo -n "$1" | grep "\(^-\|-$\)")" ]; then + return 1 + fi + return 0 +} + +# Sanity check: we rely on some netcfg functionality but cannot depend on it; +# netcfg should always be present, but bail out if it is not +if [ ! -e /bin/netcfg ]; then + fail "required package netcfg is not installed" + exit 1 +fi + +# Bring up the loopback interface +if [ -z "$(ip link show lo up)" ]; then + ip link set lo up + ip addr flush dev lo + ip addr add 127.0.0.1/8 dev lo +fi + +if [ -z "$INTERFACES" ]; then + fail "no Ethernet interfaces detected" + db_input critical ppp/detect_failed || true + db_go || true + exit 1 +fi + +PIDF=/var/run/ppp-udeb.pid +reset_if_needed + +# Test each of the interfaces for a concentrator; stop when one is found +for IFACE in $INTERFACES; do + if ppp_concentrator_on $IFACE; then + log "setting pppoe connection on $IFACE" + db_set ppp/interface $IFACE + break + else + if [ "$PPPUP" = yes ]; then + log "no concentrator found on $IFACE; will bring the interface back down" + ip link set $IFACE down + else + log "ppp-udeb no concentrator found on $IFACE" + fi + IFACE='' + fi +done + +if [ -z "$IFACE" ]; then + fail "no concentrators detected" + db_input critical ppp/no_concentrators || true + db_go || true + exit 1 +fi + +db_input high ppp/username || true +db_go || exit 10 +db_get ppp/username +USERNAME="$RET" + +db_input high ppp/password || true +db_go || exit 10 +db_get ppp/password +PASSWORD="$RET" + +# Clear answers in case the script is run a second time +db_unregister ppp/password +db_unregister ppp/username + + +# Ask for the hostname and domainname to use for the system +# (using the netcfg templates!) +while true; do + db_input high netcfg/get_hostname || [ $? -eq 30 ] + db_input high netcfg/get_domain || [ $? -eq 30 ] + db_go || exit 10 + db_get netcfg/get_hostname + HOSTNAME="$RET" + if valid_hostname "$HOSTNAME"; then + db_get netcfg/get_domain + DOMAINNAME="$RET" + break + else + db_input high netcfg/invalid_hostname || true + db_fset netcfg/get_hostname seen false + fi +done + + +# FIXME: lo snippet should not be ppp-udeb's job +cat > /etc/network/interfaces < /etc/hosts + +if [ "$HOSTNAME" ]; then + echo "$HOSTNAME" >/etc/hostname + + if [ "$DOMAINNAME" ]; then + echo -e "127.0.1.1\t$HOSTNAME.$DOMAINNAME\t$HOSTNAME" >> /etc/hosts + else + echo -e "127.0.1.1\t$HOSTNAME" >> /etc/hosts + fi +fi + +cat >> /etc/hosts < /etc/ppp/peers/provider +# kernel space PPPoE driver configuration +# +# See the manual page pppd(8) for information on all the options. + +# MUST CHANGE: Uncomment the following line, replacing the user@provider.net +# by the DSL user name given to your by your DSL provider. +# There should be a matching entry with the password in /etc/ppp/pap-secrets +# and/or /etc/ppp/chap-secrets. +#user "myusername@myprovider.net" +user "$USERNAME" + +#linkname provider +#debug + +# Load the pppoe plugin. Change the ethernet interface name if needed. +plugin rp-pppoe.so +$IFACE + +# Assumes that your IP address is allocated dynamically by the ISP. +noipdefault +# Try to get the name server addresses from the ISP. +usepeerdns +# Use this connection as the default route. +# Comment out if you already have the correct default route installed. +defaultroute + +# Make sure that sensitive data does not get into the logs +hide-password + +# Peer should be alive +lcp-echo-interval 20 +lcp-echo-failure 3 + +# Makes pppd "dial again" when the connection is lost. +persist + +# Do not ask the remote to authenticate. +noauth + +# RFC 2516, paragraph 7 mandates that the following options MUST NOT be +# requested and MUST be rejected if requested by the peer: +# Address-and-Control-Field-Compression (ACFC) +noaccomp +# Asynchronous-Control-Character-Map (ACCM) +default-asyncmap + +# Do not try to negotiate other kinds of compression. +nopcomp +noccp +novj +EOF + +: > /etc/ppp/pap-secrets +chmod 600 /etc/ppp/pap-secrets +cat < /etc/ppp/pap-secrets +#GENERATED-BY-DEBIAN-INSTALLER# +"$USERNAME" * "$PASSWORD" +EOF +cp /etc/ppp/pap-secrets /etc/ppp/chap-secrets + +log-output -t depmod +log-output -t ppp-udeb modprobe pppoe + +log-output -t ppp-udeb pppd call provider +sleep 1 # allow forking +PID=`ps | grep 'call provider' | grep pppd | sed 's:\s*\([0-9]*\).*$:\1:g'` +echo $PID > $PIDF + +STEP=0 +db_progress START 0 31 ppp/please_wait +log "Waiting for message from pppd[$PID]" +while [ "$STEP" -lt 30 ] +do + ANSWER=$(grep -E "pppd\[$PID\]:.(PAP|CHAP)\ authentication\ (failed|succeeded)" /var/log/syslog | tail -n 1 | sed -e 's:^.*\(failed\).*$:\1:g' -e 's:^.*\(succeeded\).*$:\1:g') + if [ "$ANSWER" = "succeeded" ] || [ "$ANSWER" = "failed" ] + then + STEP=30 + log "got result: authentication $ANSWER" + else + log "Answer unknown" + fi + sleep 1 + STEP=$(expr $STEP + 1) + db_progress STEP 1 +done +db_progress STOP + +if [ "$ANSWER" = "failed" ]; then + fail "authentication failed" + (rm -f $PIDF && kill $PID) || true 2> /dev/null + db_input critical ppp/wrong_login || true + db_go || true + exit 1 +elif [ -z "$ANSWER" ] && [ "$STEP" -ge 30 ]; then + fail "unhandled error detected" + (rm -f $PIDF && kill $PID) || true 2>/dev/null + db_input critical ppp/unhandled || true + db_go || true + exit 1 +else + # Handle a fallback DNS + if ! [ -s /etc/resolv.conf ] && db_get netcfg/get_nameservers; then + for nameserver in $RET; do + echo "nameserver $nameserver" >>/etc/resolv.conf + done + fi +fi + +#DEBHELPER# + +exit 0 --- ppp-2.4.5.orig/debian/rules +++ ppp-2.4.5/debian/rules @@ -0,0 +1,172 @@ +#!/usr/bin/make -f +SHELL+= -e + +BUILD_UDEB := 1 + + + +QUILT_STAMPFN := .stamp-patched +include /usr/share/quilt/quilt.make + +D := $(CURDIR)/debian/ppp + +# plugin ABI version, part of the directory name +PPPDDIR := 2.4.5 + + +ifdef BUILD_UDEB +BUILD_UDEB_TARGET := .stamp-build-udeb +else +NO_PACKAGE := --no-package=ppp-udeb +endif + +############################################################################## +clean: unpatch + rm -rf .stamp-* pppd-udeb changelog-from-README + [ ! -f Makefile ] || $(MAKE) dist-clean + dh_clean + +configure: .stamp-configure +.stamp-configure: $(QUILT_STAMPFN) + dh_testdir + ./configure --prefix=/usr + touch $@ + +udebdir: .stamp-udebdir +.stamp-udebdir: .stamp-configure + if [ ! -d pppd-udeb/ ]; then \ + mkdir pppd-udeb/ && \ + cp -ldpR pppd/* pppd-udeb/; \ + fi + cd pppd-udeb/ && make clean + cd pppd-udeb/plugins/ && make clean + perl -i -pe 's/ -DIPX_CHANGE\b//' pppd-udeb/Makefile + touch $@ + +build: .stamp-build +.stamp-build: .stamp-configure + dh_testdir + $(MAKE) + touch $@ + +build-udeb: .stamp-build-udeb +.stamp-build-udeb: .stamp-udebdir + dh_testdir + cd pppd-udeb/ && \ + $(MAKE) CFLAGS="$(CFLAGS) -Os -fomit-frame-pointer" \ + CHAPMS= USE_CRYPT= NO_CRYPT_HACK=1 MPPE= \ + FILTER= HAVE_MULTILINK= USE_TDB= \ + HAS_SHADOW= USE_PAM= HAVE_INET6= \ + CBCP= USE_SRP= MAXOCTETS= USE_BUILTIN_CRYPTO=1 \ + && \ + cd plugins/ && \ + $(MAKE) CFLAGS="$(CFLAGS) -Os -fomit-frame-pointer" \ + SUBDIRS='rp-pppoe pppoatm' PLUGINS= + touch $@ + +install: .stamp-build $(BUILD_UDEB_TARGET) checkroot + dh_testdir + dh_clean -k + dh_installdirs + $(MAKE) install DESTDIR=$D/usr/ + + { \ + sed -e "/^What's new in ppp-/,/^. New hooks have been added./!d" README ; \ + echo ; \ + echo ; \ + cat Changes-2.3 ; \ + } > changelog-from-README + +binary-arch: install + rm -rf $D/etc/ppp/*-secrets + mv $D/usr/include/ $D-dev/usr/ + + install -m 750 -o root -g dip extra/pppoe_on_boot $D/etc/ppp/ + + install -m755 extra/pon extra/plog extra/poff $D/usr/bin/ + cp extra/pon.completion $D/etc/bash_completion.d/pon + + cp extra/options $D/etc/ppp/ + install -m755 extra/ip-up extra/ip-down extra/ipv6-up extra/ipv6-down \ + $D/etc/ppp/ + install -m755 extra/0000usepeerdns-up $D/etc/ppp/ip-up.d/0000usepeerdns + install -m755 extra/0000usepeerdns-down \ + $D/etc/ppp/ip-down.d/0000usepeerdns + + install -m644 extra/pap-secrets extra/chap-secrets \ + extra/provider.peer extra/provider.chatscript \ + $D/usr/share/ppp/ + install -m644 extra/chatscript.pap $D/etc/chatscripts/pap + install -m644 extra/chatscript.gprs $D/etc/chatscripts/gprs + + dh_installchangelogs -a changelog-from-README + dh_installdocs + dh_installexamples scripts/ extra/autopppd extra/userscripts-* \ + extra/popp extra/filters extra/options.ttyXX \ + extra/peers-* extra/interfaces extra/per-linkname + # use our own version, not the upstream one + mv $D/usr/share/doc/ppp/examples/autopppd \ + $D/usr/share/doc/ppp/examples/scripts/ + dh_installman extra/pon.1 extra/pppoe-discovery.8 + dh_link + dh_installlogrotate + dh_installinit --init-script=pppd-dns --no-start \ + --update-rcd-params='start 70 1 2 3 4 5 .' + dh_installpam + +ifdef BUILD_UDEB + grep '^[a-zA-Z0-9]' extra/options | grep -v '^noipx' \ + > $D-udeb/etc/ppp/options +# cp chat/chat $D-udeb/usr/sbin/ + cp pppd-udeb/pppd $D-udeb/usr/sbin/ + cp pppd-udeb/pppd pppd-udeb/plugins/rp-pppoe/pppoe-discovery \ + $D-udeb/usr/sbin/ + mkdir -p $D-udeb/usr/lib/pppd/$(PPPDDIR)/ + cp pppd-udeb/plugins/rp-pppoe/rp-pppoe.so \ + pppd-udeb/plugins/pppoatm/pppoatm.so \ + $D-udeb/usr/lib/pppd/$(PPPDDIR)/ + install -m755 extra/ppp-udeb.ip-up $D-udeb/etc/ppp/ip-up + install -m755 extra/ppp-udeb-postbaseinst \ + $D-udeb/usr/lib/post-base-installer.d/30ppp + dh_installdebconf +endif + + dh_strip -a + dh_compress -a + dh_fixperms -a + + chown root:dip $D/usr/sbin/pppd \ + $D/etc/ppp/ $D/etc/ppp/peers/ $D/etc/chatscripts/ + chmod 4754 $D/usr/sbin/pppd + chmod 2750 $D/etc/ppp/peers/ $D/etc/chatscripts/ + + dh_md5sums -a + dh_shlibdeps -a + dh_installdeb -a + + dh_gencontrol -a $(NO_PACKAGE) + dh_builddeb -a $(NO_PACKAGE) + +binary-indep: install + dh_installchangelogs -i changelog-from-README + dh_installdocs -i + + dh_compress -i + dh_fixperms -i + + dh_md5sums -i + dh_installdeb -i + dh_gencontrol -i + dh_builddeb -i + + +binary: binary-arch binary-indep + +checkroot: + test root = "`whoami`" + +get-orig-source: + cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \ + uscan --rename --force-download --watchfile debian/watch --destdir $(CURDIR) + +.PHONY: binary binary-arch binary-indep unpack configure build clean checkroot --- ppp-2.4.5.orig/debian/ppp-dev.dirs +++ ppp-2.4.5/debian/ppp-dev.dirs @@ -0,0 +1 @@ +/usr/ --- ppp-2.4.5.orig/debian/ppp.pam +++ ppp-2.4.5/debian/ppp.pam @@ -0,0 +1,6 @@ +#%PAM-1.0 +# Information for the PPPD process with the 'login' option. +auth required pam_nologin.so +@include common-auth +@include common-account +@include common-session --- ppp-2.4.5.orig/debian/ppp.dirs +++ ppp-2.4.5/debian/ppp.dirs @@ -0,0 +1,9 @@ +etc/bash_completion.d/ +etc/ppp/peers/ +etc/chatscripts/ +etc/ppp/ip-up.d/ +etc/ppp/ip-down.d/ +etc/ppp/ipv6-up.d/ +etc/ppp/ipv6-down.d/ +usr/share/ppp/ +usr/bin/ --- ppp-2.4.5.orig/debian/ppp.pppd-dns +++ ppp-2.4.5/debian/ppp.pppd-dns @@ -0,0 +1,22 @@ +#!/bin/sh -e +### BEGIN INIT INFO +# Provides: pppd-dns +# Required-Start: $local_fs gdm +# Required-Stop: +# Default-Start: 1 2 3 4 5 +# Default-Stop: +# Short-Description: Restore resolv.conf if the system crashed. +### END INIT INFO +# +# Restore /etc/resolv.conf if the system crashed before the ppp link +# was shut down. + +case "$1" in + start) ;; + stop|restart|force-reload) exit 0 ;; + *) echo "Usage: $0 {start|stop|restart|force-reload}" >&2; exit 1 ;; +esac + +[ -x /etc/ppp/ip-down.d/0000usepeerdns ] \ + && exec /etc/ppp/ip-down.d/0000usepeerdns + --- ppp-2.4.5.orig/debian/ppp.prerm +++ ppp-2.4.5/debian/ppp.prerm @@ -0,0 +1,11 @@ +#!/bin/sh -e + +# If we are removing ppp we have to stop all ppp's + +if [ "$1" = remove ]; then + echo -n "Stopping all PPP connections..." + start-stop-daemon --stop --oknodo --quiet --exec /usr/sbin/pppd || true + echo "done." +fi + +#DEBHELPER# --- ppp-2.4.5.orig/debian/changelog +++ ppp-2.4.5/debian/changelog @@ -0,0 +1,1123 @@ +ppp (2.4.5-5ubuntu1) natty; urgency=low + + * Merge from debian unstable. (LP: #712419) Remaining changes: + - /etc/ppp/options: default is noauth instead of auth. + - extra/pon: Perform ppp_on_boot migration from pppoe package. + - debian/ppp.postinst: init script migration for version before + 2.4.5~git20081126t100229-0ubuntu2. + - debian/ppp.pppd-dns: Update LSB header. + - Provide pppoe_on_boot file. + - Move pppd-dns script to S45. + - debian/patches/load_ppp_generic_if_needed: load ppp_generic kernel + module if needed. + + -- Angel Abad Thu, 03 Feb 2011 13:16:46 +0100 + +ppp (2.4.5-5) unstable; urgency=medium + + * Updated debconf translation: da. (Closes: #601791) + + -- Marco d'Itri Wed, 19 Jan 2011 23:24:16 +0100 + +ppp (2.4.5-4ubuntu1) natty; urgency=low + + * Merge with Debian; remaining changes: + - /etc/ppp/options: default is noauth instead of auth. + - extra/pon: Perform ppp_on_boot migration from pppoe package. + - debian/ppp.postinst: init script migration for version before + 2.4.5~git20081126t100229-0ubuntu2. + - debian/ppp.pppd-dns: Update LSB header. + - Provide pppoe_on_boot file. + - Move pppd-dns script to S45. + - debian/patches/load_ppp_generic_if_needed: load ppp_generic kernel + module if needed. + + -- Matthias Klose Wed, 24 Nov 2010 18:12:47 +0100 + +ppp (2.4.5-4) unstable; urgency=low + + * Make sure to actually rebuild pppd for the udeb instead of using the + just-built normal binary. (Closes: #591703) + * Removed support for IPX from the udeb. + * Added patch adaptive_echos: support sending LCP echo requests only if + the link is idle. (Closes: #14331) + * Updated debconf translation: pt_BR. (Closes: #592155) + * Removed the suspend/resume script for the obsolete apmd. + + -- Marco d'Itri Mon, 09 Aug 2010 02:41:04 +0200 + +ppp (2.4.5-3) unstable; urgency=low + + * Added a Breaks directive to force upgrading the older versions of + network-manager, network-manager-pptp and pppdcapiplugin. + (Closes: #590087) + * Removed patch use_244_plugins because it does not work (pppd also + checks the internal plugin version number). + * Added patch pppoatm_no_modprobe: nowadays the pppoatm driver can be + autoloaded on demand. + + -- Marco d'Itri Sun, 25 Jul 2010 01:50:16 +0200 + +ppp (2.4.5-2) unstable; urgency=low + + * Refactored again the makefiles to allow overriding CFLAGS/LDFLAGS + in the environment. (Closes: #589664) + * Added patch use_244_plugins: check for the plugins in + /usr/lib/pppd/2.4.4/ too. + + -- Marco d'Itri Tue, 20 Jul 2010 01:40:37 +0200 + +ppp (2.4.5-1) unstable; urgency=low + + * New upstream release. (Closes: #515590) + + Fix authentication on second time around with multilink and persist. + (Closes: #377670) + + Increase default IPCP Conf-Nak limit. (Closes: #445711, #445951) + * Added patch git-20100307 with the upstream changes since the release. + * Removed the following patches which have been merged upstream: + pppoe_cleanup, pppoe_fixinclude, fix_close_fd0, fix_mschapv2_ppp. + * Removed patch pppoatm_fix_mtu since the affected code has been removed. + * Added patch radius_enanchements. + * Added patch always_setsid: always create a new process group. + * Added patch ipv6-accept-remote from Fedora. + * Added patch dont-exit-pado-timeout to prevent pppd persist from + exiting in the event of a PPPoE PADO timeout. (Closes: #377987) + * Added patch update_if_pppol2tp: update include/linux/if_pppol2tp.h to + match current kernel definitions, from Ubuntu. (LP: #600947) + * Added a simple example configuration for mobile connectsions. + * proxyarp is now disabled by default in /etc/ppp/options. (Closes: #388712) + * Use $@ instead of $* in the link scripts. (Closes: #437339) + * Correctly restart pppoe-discovery in the udeb. (Patch by alexander + barakin.) (Closes: #582035) + * Backup resolv.conf with interface-specific file names to better support + multilink. (Patch by alex samad). (Closes: #584318) + * Allow the nostrip option to work. (Closes: #437789) + * Updated debconf translation: pt_BR, tr. (Closes: #577799, #509200) + * Packaging converted to quilt. (Closes: #482699) + + -- Marco d'Itri Mon, 19 Jul 2010 01:00:53 +0200 + +ppp (2.4.4rel-10.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix pending l10n issues. Debconf translations: + - Traditional Chinese. Closes: #505952 + - Catalan. Closes: #506336 + - Swedish. Closes: #491421 + - Japanese. Closes: #489333 + - Polish. Closes: #506852 + - Belarusian. Closes: #506927 + + -- Christian Perrier Fri, 28 Nov 2008 18:36:26 +0100 + +ppp (2.4.5~git20081126t100229-0ubuntu4) maverick; urgency=low + + * debian/patches/update_if_pppol2tp: Update include/linux/if_pppol2tp.h to + match current kernel definitions (LP: #600947). + + -- Colin Watson Fri, 09 Jul 2010 17:27:36 +0100 + +ppp (2.4.5~git20081126t100229-0ubuntu3) lucid; urgency=low + + * rebuild rest of main for armel armv7/thumb2 optimization; + UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2 + + -- Alexander Sack Sun, 07 Mar 2010 01:01:51 +0100 + +ppp (2.4.5~git20081126t100229-0ubuntu2) jaunty; urgency=low + + * debian/rules: Start the init script in runlevels 1-5, it does not need to + start before gdm. + * debian/ppp.postinst: Remove old init script symlinks. + * debian/ppp.pppd-dns: Update LSB header. + + -- Scott James Remnant Fri, 20 Feb 2009 15:15:49 +0000 + +ppp (2.4.5~git20081126t100229-0ubuntu1) jaunty; urgency=low + + * new upstream snapshot 2.4.5pre gitXXXX + * debian/rules,debian/scripts/vars bump upstream version and + and tarball dir + * rebase debian patches that still apply + - debian/patches/008_pathnames.h.diff, + debian/patches/010_scripts_README.diff, + debian/patches/011_scripts_redialer.diff, + debian/patches/018_ip-up_option.diff, + debian/patches/atm_resolver_light, + debian/patches/chat_man, + debian/patches/cifdefroute.dif, + debian/patches/close_dev_ppp, + debian/patches/fix_linkpidfile, + debian/patches/fix_null_pppdb, + debian/patches/load_ppp_generic_if_needed, + debian/patches/no_crypt_hack, + debian/patches/no_crypt_hack_2.4.5, + debian/patches/ppp-2.3.11-oedod.dif, + debian/patches/ppp-2.4.2-stripMSdomain, + debian/patches/pppdump_use_zlib, + debian/patches/pppdump_z_no_deflate, + debian/patches/pppoatm_cleanup, + debian/patches/pppoe_readme, + debian/patches/readable_connerrs, + debian/patches/resolv.conf_no_log, + debian/patches/setevn_call_file, + debian/patches/syslog_local2, + debian/patches/zzz_config, + debian/patches/zzz_man_typos + * drop patches superseeded upstream + - debian/patches/fix_close_fd0 + - debian/patches/fix_mschapv2_ppp + - debian/patches/pppoatm_fix_mtu + - debian/patches/pppoe_cleanup + - debian/patches/zzzz_lp258801_fix_ppp_dns_1.patch + - debian/patches/zzzz_lp258801_fix_ppp_dns_2.patch + - debian/patches/zzzz_lp258801_fix_ppp_dns.patch + * add patches required for new codebase: + - no_crypt_hack_2.4.5: crypt is now also getting used in session.c + apply NO_CRYPT_HACK for -udeb support here too + + -- Alexander Sack Mon, 16 Feb 2009 11:57:28 +0100 + +ppp (2.4.4rel-10ubuntu2.8.10.1) intrepid-proposed; urgency=low + + * fix LP: #258801; Gets bogus DNS servers during PPP negotiation; we + apply two more patches from git (details in patch) + - add debian/patches/zzzz_lp258801_fix_ppp_dns_1.patch + - add debian/patches/zzzz_lp258801_fix_ppp_dns_2.patch + + -- Alexander Sack Wed, 19 Nov 2008 14:05:43 +0100 + +ppp (2.4.4rel-10ubuntu2) intrepid; urgency=low + + * fix LP: #258801; Gets bogus DNS servers during PPP negotiation; we apply + the patch from http://marc.info/?l=linux-ppp&m=119559914711075&w=2 + - add debian/patches/zzzz_lp258801_fix_ppp_dns.patch + + -- Alexander Sack Thu, 16 Oct 2008 03:17:37 +0200 + +ppp (2.4.4rel-10ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - "Perform ppp_on_boot migration from pppoe package." + - provide pppoe_on_boot file + - debian/patches/load_ppp_generic_if_needed: load ppp_generic kernel + module if needed + - /etc/ppp/options: default is noauth instead of auth. + + -- Michael Vogt Mon, 23 Jun 2008 14:04:47 +0200 + +ppp (2.4.4rel-10) unstable; urgency=low + + * ppp-udeb: allow for preseeding of the netcfg/get_hostname template. + Closes: #455366. + * ppp-udeb: also ask for a domain name to be used in /etc/hosts. + Closes: #475032. + * ppp-udeb: switch from using 'ifconfig' to 'ip' because the former is no + longer included in busybox-udeb. Closes: #451446. + * Handle the setting of fallback DNS in ppp-udeb. Those are set by + preseeding netcfg/get_nameservers. Thanks to Jérémy Bobbio for the patch. + Closes: #473782. + * Add new translation for Belarussian. Closes: #447116. + * Fix LSB header in init.d script. Closes: #466273. + * Add myself as uploader with Marco's blessing. + + [ Christian Perrier ] + * Debconf templates and debian/control reviewed by the debian-l10n-english + team as part of the Smith review project. Closes: #447329 + + [Debconf translation updates] + * Vietnamese. Closes: #447847, #426870 + * German. Closes: #447902 + * Galician. Closes: #447917 + * Romanian. Closes: #447918 + * Basque. Closes: #447994 + * Finnish. Closes: #448301 + * Spanish. Closes: #448542 + * Dutch. Closes: #449022 + * Czech. Closes: #449261 + * Russian. Closes: #450517 + * Portuguese. Closes: #450544 + * French. Closes: #450702 + * Norwegian Bokmål; Bokmål, Norwegian. Closes: #450724 + + -- Frans Pop Tue, 08 Apr 2008 16:53:04 +0200 + +ppp (2.4.4rel-9ubuntu2) gutsy; urgency=low + + * Trigger rebuild for hppa + + -- LaMont Jones Thu, 04 Oct 2007 12:21:29 -0600 + +ppp (2.4.4rel-9ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - "Perform ppp_on_boot migration from pppoe package." + - provide pppoe_on_boot file + - debian/patches/load_ppp_generic_if_needed: load ppp_generic kernel + module if needed + - /etc/ppp/options: default is noauth instead of auth. + - maintainer field set to ubuntu + + -- Michael Vogt Tue, 15 May 2007 11:09:49 +0200 + +ppp (2.4.4rel-9) unstable; urgency=low + + * ppp-udeb: quote username and password in pap/chap secrets since they + might contain special characters. (Closes: #418284) + * ppp-udeb: multiply by 100 the XB-Installer-Menu-Item due to renumbering in + Debian Installer + + -- Eddy Petrișor Tue, 10 Apr 2007 23:11:10 +0300 + +ppp (2.4.4rel-8) unstable; urgency=high + + * urgency high since fixes an RC bug + * make sure the /etc/resolv.conf file is world readable (Closes: #415077) + + -- Eddy Petrișor Sat, 17 Mar 2007 22:31:45 +0200 + +ppp (2.4.4rel-7) unstable; urgency=high + + * urgency set to high to catch the RC2 release + * Updated translations: pt_BR (Closes: #411544) + + -- Eddy Petrișor Sun, 4 Mar 2007 17:59:00 +0200 + +ppp (2.4.4rel-6) unstable; urgency=low + + * Updated translations: da, it, es + (Closes: #409479, #410326) + * New translations: + - Basque, thanks to Piarres Beobide + - Catalan, thanks to Jordà Polo (closes: 410215) + + -- Eddy Petrișor Mon, 12 Feb 2007 17:36:46 +0200 + +ppp (2.4.4rel-5) unstable; urgency=low + + [ Eddy Petrișor ] + * added ${misc:Depends} to ppp-udeb + * removed debconf as a dependency of ppp-udeb since such a package does not + exist in d-i environment + * ppp-udeb: the interface is now brought up in the installed system + (Closes: #402450, #406231) + * ppp-udeb: loopback interface snippet is added too, to make sure we have it + in the installed system + * ppp-udeb: added error handling if the wrong login info is sent or other + error is returned while calling the provider + * ppp-udeb: after triggering the connection wait to see if the connection is + actually done, don't assume everything went fine + * make a PID file in /var/run/ppp-udeb.pid to be able to kill the right + process later (pppd creates one only after a succesful installation) + * Added myself to Uploaders with maintainer's consent. + * Updated po-debconf translations: sv, ru, cs, de, ro, fr, nl, ja, pt + (Closes: #406993, #408004, #407684) + * Added po-debconf translations: + - Tamil (ta), thanks to Tirumurti Vasudevan + - Norwegian Bokmål (nb), thanks to Hans F. Nordhaug + - Galician (gl), thanks to Jacobo Tarrio (Closes: #407893) + * ppp-udeb: use "|| exit 10" for password and username as suggested by Frans + * ppp-udeb: add the possibility to go back to menu (thanks to Frans for the + hint) + * added a new template for the progress bar while waiting to connect; + imported entirely (including translations) from partman + * updated ppp-udeb.todo (only integration with netcfg remains) + * s/Type: progress/Type: text/ in ppp-udeb.templates, it seems I was on some + kind of crack when I said the type is progress + + [ Frans Pop ] + * ppp-udeb: general review resulting in some corrections and restructuring + * ppp-udeb: set up loopback interface in installer environment + * ppp-udeb: ask for hostname and check validity (using netcfg template) + * ppp-udeb: create /etc/hostname and basic /etc/hosts files + + -- Eddy Petrișor Mon, 29 Jan 2007 16:58:03 +0200 + +ppp (2.4.4rel-4.1ubuntu2) feisty; urgency=low + + * /etc/ppp/options: default is noauth instead of auth. + + -- Ian Jackson Wed, 4 Apr 2007 16:46:49 +0100 + +ppp (2.4.4rel-4.1ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - "Perform ppp_on_boot migration from pppoe package." + - provide pppoe_on_boot file + - debian/patches/load_ppp_generic_if_needed: load ppp_generic kernel + module if needed + + -- Michael Vogt Wed, 20 Dec 2006 12:23:42 +0100 + +ppp (2.4.4rel-4.1) unstable; urgency=low + + * Non-maintainer upload with maintainer's consent. + * New patch fix_mschapv2_ppp which makes ppp works with mschapv2. Thanks + to Guillaume Knispel . Closes: #381420. + * Add hints section to README.pppoe (pppoe_readme patch) and iptables to + Suggests. Thanks to Joerg Dorchain . Closes: #251918. + * Improve the chat manpage concerning timeout (chap_man patch). + Closes: #320494. + + -- Arnaud Fontaine Thu, 14 Dec 2006 21:31:55 +0100 + +ppp (2.4.4rel-4ubuntu1) feisty; urgency=low + + * Merge from debian unstable. Remaining changes: + - "Perform ppp_on_boot migration from pppoe package." + - provide pppoe_on_boot file + - debian/patches/load_ppp_generic_if_needed: load ppp_generic kernel + module if needed + + -- Michael Vogt Fri, 24 Nov 2006 08:39:13 +0100 + +ppp (2.4.4rel-4) unstable; urgency=low + + [ Eddy Petrișor ] + * Using provider as the pppoe profile name in ppp-udeb so that the + connection starts after reboot and to integrate better with ppp helpers. + * Implemented idempotency in ppp-udeb by following the pid file generated + by pppd and bringing down interfaces which were rised by ppp-udeb. + * Improved some conditions which were problematic in concentrator detection. + * Deal elegantly with resolv.conf when using peer dns in ppp-udeb. + * Really detect if the interfaces were raised before ppp-udeb probed. + * Added a ppp-udeb.dirs file. + * Revert the gratuitous type change to "note" for ppp/detect_progress. + (Closes: #395197) + * Fix some mistakes in ppp-udeb.postinst which could have caused some of the + strange issues seen during early tests. (Closes: #395187) + * Updated debconf translation: ro. + + [ Marco d'Itri ] + * Pass the command line arguments to the ip*-{up,down} scripts. + (Closes: #378810) + * Updated debconf translations: de, ru. (Closes: #396035, #397169) + * Improved bash completion. (Closes: #397037) + + -- Marco d'Itri Tue, 14 Nov 2006 12:52:29 +0100 + +ppp (2.4.4rel-3) unstable; urgency=medium + + [ Luk Claes ] + * Add a Provides entry in the LSB type header (Closes: #386387). + * Updated debconf translations: ro, fr, es, cs, nl, sv, ja. + (Closes: #377672, #384191, #378636, #380529, #384875, #386769) + (Closes: #387028, #390489). + * Fix PPPDIR (Closes: #384121, #392858). + + [ Eddy Petrişor ] + * Sanitise debconf output for udeb (Closes: #385150). + - don't use db_stop in ppp-udeb.postinst. + - give ppp-udeb priority 17 in the menu so it runs before netcfg. + - don't fail when ppp is queued for installation (by apt-install). + + [ Marco d'Itri ] + * Stop linking pppdump with zlib since it's not used. + + -- Marco d'Itri Sun, 22 Oct 2006 23:16:56 +0200 + +ppp (2.4.4rel-2) unstable; urgency=high + + * Make postinst not fail if /dev/MAKEDEV does not exist yet. + (Closes: #325650) + * Update debconf translation: da. (Closes: #377672) + + -- Marco d'Itri Wed, 12 Jul 2006 18:26:01 +0200 + +ppp (2.4.4rel-1ubuntu1) edgy; urgency=low + + * Merge to Debian unstable. + + -- Martin Pitt Mon, 10 Jul 2006 18:34:10 +0200 + +ppp (2.4.4rel-1) unstable; urgency=high + + * New upstream release. Fixes: + + privilege escalation in the winbind plugin (CVE-2006-2194). + + SHA-1 on some architectures. (Closes: #368419) + * Merged many ppp-udeb improvements and fixes by Eddy Petrişor. + * Updated patch pppoatm_cleanup: added T2A_WILDCARD. (Closes: #376990) + * Added the pppoe-discovery(8) man page, contributed by Ben Hutchings. + (Closes: #333144) + * Added new debconf translations: it, ro. (Closes: #358162) + * Conflict on old makedev versions instead of depending on recent ones. + * Finally remove the deprecated /etc/init.d/ppp script. + + -- Marco d'Itri Sun, 9 Jul 2006 18:38:54 +0200 + +ppp (2.4.4b1-1ubuntu4) edgy; urgency=low + + * SECURITY UPDATE: Potential privilege escalation. + * debian/patches/winbind-setuid-failure-check: + - Check for a failing setuid() call (which can happen if the user hits PAM + limits). Before, a failing setuid() call would execute the NTLM + authentication helper as root. + - CVE-2006-2194 + + -- Martin Pitt Wed, 5 Jul 2006 11:48:13 +0200 + +ppp (2.4.4b1-1ubuntu3) dapper; urgency=low + + * Move script to S55. + + -- Scott James Remnant Thu, 23 Feb 2006 15:30:22 +0000 + +ppp (2.4.4b1-1ubuntu2) dapper; urgency=low + + * Move pppd-dns script to S45. + + -- Scott James Remnant Mon, 30 Jan 2006 14:23:23 +0000 + +ppp (2.4.4b1-1ubuntu1) dapper; urgency=low + + * Synchronise with Debian unstable. + * Still keep the pppoe_on_boot stuff. + + -- Matthias Klose Thu, 15 Dec 2005 14:46:57 +0000 + +ppp (2.4.4b1-1) unstable; urgency=low + + * New upstream release. Fixes: + + pass-filter configuration option. (Closes: #309214) + + LCP FSM bugs causing reconnection problems. + (Closes: #298657, #312118, #313205) + + pty fd leaks. (Closes: #276550, #310292, #310293, #325705, #330444) + * Removed the following patches which have been merged upstream: + 060_mppe-negotiation-fix, fix_winbind_base64, man_clarify_call, + multicast_pado, pcap, pcap_fixactive, proc_net_ipx. + * Updated cifdefroute.dif for the new code, hopefully it still works. + * Document that pon -q is only available to root. (Closes: #337431) + * Removed the patch pppdump-no-deflate to enable again deflate support + in pppdump. (See #144368 for details.) + * Added patch pppoe_all_if (SuSE patch ppp-2.4.3-all-ethernet.diff) to + accept any interface name in the PPPoE plugin. (Closes: #310672) + * Added new debconf translations: vi, sv, pt_PT. + (Closes: #317127, #331580, #336934) + * Added patch fix_null_pppdb to prevent a segfault when the call option + is used more than once, by Martin Lottermoser. (Closes: #308136) + * Added patch fix_close_fd0 to prevent closing fd 0, by Alan Curry. + (Closes: #298582) + * Added patch readable_connerrs to make ppp-connect-errors world + readable. (Closes: #341853) + * Fixes typos in pap-secrets and options.ttyXX. (Closes: #332659) + * Copy all the headers in ppp-dev. (Closes: #325815) + + -- Marco d'Itri Sun, 4 Dec 2005 15:22:23 +0100 + +ppp (2.4.3-20050321+2ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + + -- Adam Conrad Fri, 27 May 2005 15:47:55 +0000 + +ppp (2.4.3-20050321+2) unstable; urgency=high + + * Added patch close_dev_ppp to fix pppd spinning on select() and using + all file descriptors. By Simon Peter. (Closes: #306261) + * Added patch pppoatm_fix_mtu to fix the mtu option when used with the + pppoatm plugin. From the Red Hat package. + * Added patch fix_winbind_base64 to fix login names incorrectly encoded + by the winbind plugin. + * Added patch zzz_man_typos to fix some typos in man pages. By A. Costa. + (Closes: #301928, #302674) + * Removed patch pppoatm-no-modprobe to not diverge from other distributions. + * Log the arguments to ip-up and ip-down. (Closes: #305473) + + -- Marco d'Itri Wed, 4 May 2005 02:00:04 +0200 + +ppp (2.4.3-20050321+1ubuntu2) breezy; urgency=low + + * Drop debian/patches/libpcap0.8, which has since been applied to + the upstream sources, and debian/patches/pcap, which is the + Debian patch to revert to libpcap0.7 (Closes Ubuntu bug #10033) + + -- Adam Conrad Fri, 22 Apr 2005 00:16:08 +0000 + +ppp (2.4.3-20050321+1ubuntu1) breezy; urgency=low + + * Resynchronise with Debian, resolving merge conflicts. + + -- Adam Conrad Thu, 21 Apr 2005 08:53:53 +0000 + +ppp (2.4.3-20050321+1) unstable; urgency=high + + * New upstream snapshot, with a fix for the persist configuration option. + (Closes: #298657, #301018) + * Removed redundant options from the example peers files. + + -- Marco d'Itri Thu, 24 Mar 2005 12:37:55 +0100 + +ppp (2.4.3-20041231+3) unstable; urgency=medium + + * Added patch pppoatm_cleanup: removes some debug messages. + * Added patch pppoe_cleanup: big error handling cleanup for the pppoe + plugin. (Closes: #297515) + * Added patch pcap_fixactive to fix the active-filter option, by + Michael Guntsche. (Closes: #299668) + * Fixed the #287861 fix of the bash completion script. (Closes: #297209) + * Updated the peers-pppoa example file. (Closes: #278823) + * Added an example interfaces(5) file. + * Updated README.Debian and changed the default peers file to use PAP. + + -- Marco d'Itri Sat, 19 Mar 2005 17:34:50 +0100 + +ppp (2.4.3-20041231+2) unstable; urgency=low + + * Build-Depend on zlib1g-dev. + + -- Marco d'Itri Sat, 26 Feb 2005 21:14:07 +0100 + +ppp (2.4.3-20041231+1) unstable; urgency=low + + * New upstream release and fixes from CVS. (Closes: #282737, #294232) + * Removed patch 057_pppoe-interface-change which was refused by the + upstream maintainer. Now users must arrange for the ethernet + interface used for PPPoE to be up. (Closes: #279135) + * Removed the following patches which have been merged upstream: + 040_pppoatm.diff fail_on_ipcp_addr_confnak mppe_unaligned + 041_pppoatm-disconnection fix_closed_fds pppoe_discovery + 042_pppoatm-libatm-workaround fix_holdoff zz_fix_nroff_hypens + close_devfd fix_man_email. + * Do not print an error message on package removal if no pppd process + running. (Closes: #295561) + * Improved the bash completions script. (Closes: #287861) + * New patch multicast_pado makes the pppoe plugin accept PADO packets + sent from multicast addresses. (See #293811.) + * New patch mppe-negotiation-fix fixes unencrypted MPPE connections. + (Closes: #294232) + * New patch pppdump_use_zlib properly compiles pppdump and makes it + use the system zlib. + * Removed patch use_openssl because it's not needed anymore. + * New patch atm_resolver_light disables some code not commonly used + in the built-in ATM names resolver library of the pppoatm plugin. + Linking with libatm has been disabled and the plugin has been added + to ppp-udeb. + * Build the RADIUS plugins. (Closes: #214053) + * Updated the copyright file. + * Added an example PPPoA peers file. + + -- Marco d'Itri Thu, 24 Feb 2005 23:51:54 +0100 + +ppp (2.4.2+20040428-6ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- Michael Vogt Wed, 12 Jan 2005 10:00:49 +0100 + +ppp (2.4.2+20040428-6) unstable; urgency=medium + + * Removed references to nscd from the 0000usepeerdns scripts. + If you use it for DNS caching (don't!) you will have to manually + arrange for it to be restarted or use resolvconf. (Closes: #281359) + * Updated patch proc_net_ipx: fixed IPX support for 2.4 kernels. + (Spotted by Steve Langasek, Closes: #278082) + * New patch fix_linkpidfile fixes the option linkpidfile, by Herbert Xu. + (Closes: #284382) + * New patch fix_man_email fixes paulus' email address in pppd(8). + (Closes: #285380) + * Made the init script print a big warning about being deprecated. + * New patch resolv.conf_no_log: do not log an error if resolv.conf is + not writeable, because the usepeerdns option is needed anyway to + request the DNS addresses. (Closes: #281438) + + -- Marco d'Itri Thu, 30 Dec 2004 17:21:22 +0100 + +ppp (2.4.2+20040428-5ubuntu3) hoary; urgency=low + + * Migrate to libpcap0.8 + - debian/patches/libpcap0.8 + - Build-Depend on libpcap0.8-dev rather than libpcap0.7-dev + + -- Matt Zimmerman Tue, 28 Dec 2004 13:44:43 -0800 + +ppp (2.4.2+20040428-5ubuntu2) hoary; urgency=low + + * Merge debian/ppp.init file. + * Remove patch applied in unstable (cbcp-check-packetlengths.diff). + + -- Matthias Klose Mon, 15 Nov 2004 15:22:11 +0000 + +ppp (2.4.2+20040428-5ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- Scott James Remnant Tue, 09 Nov 2004 23:37:30 +0000 + +ppp (2.4.2+20040428-5) unstable; urgency=medium + + * Removed patch pty_command_timeout. (Closes: #279929) + * New patch man_clarify_call clarifies pppd.8. (Closes: #279947) + * New patch fix_nroff_hypens correctly escapes or unescapes hyphens in + man pages. + + -- Marco d'Itri Mon, 8 Nov 2004 12:47:01 +0100 + +ppp (2.4.2+20040428-4) unstable; urgency=medium + + * Updated patch pty_command_timeout, which broke the pty command. + [A reminder for people still using the pppoe package: you should + switch to the kernel driver and use the rp-pppoe.so pppd plugin.] + (Closes: #279125) + + -- Marco d'Itri Tue, 2 Nov 2004 16:20:17 +0100 + +ppp (2.4.2+20040428-3) unstable; urgency=low + + * New patch partial-20041018.diff merges some bug fixes from CVS. + Fixes possible overflows in the CBCP code. (Closes: #278649) + * Removed patch auth_hook_segfault, merged upstream. + * New patch proc_net_ipx fixes the path of /proc/net/ipx/interface, + by Christian Homagk. (Closes: #278082) + * New patch mppe_unaligned fixes unaligned accesses in the MPPE code, + by Holger Hans Peter Freyther. (Closes: #273828) + * New patch fix_holdoff lets holdoff work when the pty option is + present, by Herbert Xu. (Closes: #265166) + * New patch fail_on_ipcp_addr_confnak makes pppd shut down the session + if the peers cannot agree on the IP addresses to be used, by Herbert Xu. + (Closes: #167691, #264959) + * Added to README.Debian a reminder about /etc/ppp/ppp_on_boot for the + benefit of lusers who configure pppd to start two times. (Closes: #269824) + * Added to README.Debian notes about MSS clamping and PPPoE interface names. + (Closes: #278014) + * Set the $PPP_* variables in ipv6-{up,down} too. (Closes: #274040) + * New patch pty_command_timeout kills the pty command when the session + is closed, by Pedro Zorzenon Neto. (Closes: #227899) + + -- Marco d'Itri Sun, 31 Oct 2004 16:02:19 +0100 + +ppp (2.4.2+20040428-2ubuntu7) hoary; urgency=low + + * Security upload for hoary (see previous changelog for details). + + -- Martin Pitt Fri, 29 Oct 2004 09:02:37 +0200 + +ppp (2.4.2+20040428-2ubuntu6.1) warty-security; urgency=low + + * SECURITY UPDATE: fix potential buffer overflow and DOS (Warty bug #2808) + * added debian/patches/cbcp-check-packetlengths.diff to add proper packet + length and bounds checking to pppd/cbcp.c (taken from upstream CVS) + * References: + http://www.securityfocus.com/archive/1/379450 + + -- Martin Pitt Thu, 28 Oct 2004 14:48:17 +0200 + +ppp (2.4.2+20040428-2ubuntu6) warty; urgency=low + + * Small fix for ppp_on_boot migration; also fixes pointless warning in pon + (closes: Ubuntu#1977). + * Make really, really sure we get a /dev/ppp device by only loading + ppp_generic if /dev/ppp doesn't exist, and sleep for five seconds to work + around the udev race; move this to pppd, instead of pon, which also + guarantees that it's run as root (closes: Ubuntu#1980, #1981). + + -- Daniel Stone Sat, 2 Oct 2004 17:27:53 +1000 + +ppp (2.4.2+20040428-2ubuntu5) warty; urgency=low + + * If /etc/ppp_on_boot exists and is a symlink to /etc/ppp/ppp_on_boot.dsl, + which doesn't exist, then transition the symlink to pppoe_on_boot (closes: + Ubuntu#1153). + + -- Daniel Stone Sun, 26 Sep 2004 14:13:45 +1000 + +ppp (2.4.2+20040428-2ubuntu4) warty; urgency=low + + * Made pon load ppp_deflate (quietly), so /dev/ppp gets created (closes: + Ubuntu#1644). + + -- Daniel Stone Fri, 24 Sep 2004 14:12:06 +1000 + +ppp (2.4.2+20040428-2ubuntu3) warty; urgency=low + + * Add pppoe_on_boot, from pppoe's ppp_on_boot.dsl. + + -- Daniel Stone Thu, 23 Sep 2004 13:02:42 +1000 + +ppp (2.4.2+20040428-2ubuntu2) warty; urgency=low + + * Added versioned depend on lsb-base + + -- Nathaniel McCallum Fri, 3 Sep 2004 15:14:36 -0400 + +ppp (2.4.2+20040428-2ubuntu1) warty; urgency=low + + * debian/ppp.init: pretty initscript + + -- Nathaniel McCallum Fri, 3 Sep 2004 11:52:53 -0400 + +ppp (2.4.2+20040428-2) unstable; urgency=medium + + * Temporarily removed patch ppp-2.4.2-libpcap.diff: switch back to + libpcap0.7-dev, because 0.8 is not in base and will not be before + the release. (Closes: #259643) + * New patch pppoe_discovery adds the pppoe-discovery program. + + -- Marco d'Itri Fri, 16 Jul 2004 19:28:09 +0200 + +ppp (2.4.2+20040428-1) unstable; urgency=medium + + * Updated patch use_openssl to fix MD4. (Closes: #259192) + * New debconf translation: da.po (Closes: #259397) + * New source upload to have a correct diff. + + -- Marco d'Itri Wed, 14 Jul 2004 16:47:37 +0200 + +ppp (2.4.2+20040427-1) unstable; urgency=medium + + * Updated patch 018_ip-up_option.diff to fix the default ip-down path. + (Closes: #258199) + * New patch use_openssl: use OpenSSL instead of the built-in SHA1/MD4/MD5 + implementations, because SHA1 is broken on 64 bit systems. + * New patch ppp-2.4.2-libpcap.diff: API changes needed by libpcap 0.8, + from the SuSE package. + * New patch auth_hook_segfault, by Michael Tokarev. + * New patch close_devfd: do not pass the connection fd to childs. + * New debconf translations: cs, de, pt_BR, es. + (Closes: #244365, #252573, #254111, #254562) + * Removed pam cleanups from preinst, upgrading from versions < 2.3.11-1.1 + is not supported anymore. + + -- Marco d'Itri Mon, 12 Jul 2004 15:48:20 +0200 + +ppp (2.4.2+20040202-3) unstable; urgency=medium + + * Fixed the dependencies of ppp-udeb/ppp-dev. (Closes: #243774) + * New debconf translation: tr. (Closes: #243684) + * Added ipv6-{up,down} scripts. (Closes: #243330) + + -- Marco d'Itri Thu, 15 Apr 2004 19:53:16 +0200 + +ppp (2.4.2+20040202-2) unstable; urgency=medium + + * Enabled the postinst script in ppp-udeb, now it should be almost + useful. + * Add a workaround to the 0000usepeerdns scripts to not fail if + /etc/resolv.conf does not exist. (Closes: #235583) + * Added new debconf translations: fr, nl, ja. + (Closes: #236726, #239458, #237176) + * Fixed *again* the $PID regexp in poff, to be compatible with mawk. + (Closes: #238667, #239766) + + -- Marco d'Itri Sun, 11 Apr 2004 16:22:24 +0200 + +ppp (2.4.2+20040202-1) unstable; urgency=medium + + * New upstream release, with updates from CVS. (Closes: #102876) + * Patches removed because they have been merged upstream: + 009_SETUP.diff 012_secure-card.diff 053_pppoe-fix-persist + 054_pppoe-no-dead-code 055_pppoe-update-3.5 056_pppoe-nas-tap + devnam_path disable_evil_slprintf_r makefiles_use_copts + parisc_eagain_fix peerdns-env-always ppp-2.4.0-ttyperms.dif + pppd.8-filters warning_ipv6cp. + * Removed patch 005_fsm.c.diff, the upstream author thinks it violates + RFC1661. + * Removed patch 006_ipcp.c.diff, it appears to be useless. + * Fixed the $PID regexp in poff. (Closes: #219442, #225443) + * Use mv -f in 0000usepeerdns. (Closes: #225792) + * Added debian/po/. (Closes: #233758) + * New patch fix_closed_fds: make sure that fd numbers 0, 1 and 2 are not + used for a socket. (Closes: #235192) + + -- Marco d'Itri Sun, 29 Feb 2004 18:54:34 +0100 + +ppp (2.4.2+20031127-2) unstable; urgency=medium + + * New upstream snapshot, only documentation changes. + * New patch pppoe-nas-tap: make the pppoe plugin accept nas and tap + devices too, from Carlos Fonseca. (Closes: #221759) + * New patch pppoe-interface-up: make the pppoe plugin set the interface up. + (Closes: #222558) + * Do not make 0000usepeerdns-up fail if resolv.conf is empty. + (Closes: #221121) + * Removed patch use_system_logwtmp: it breaks utmp updates. + (Closes: #222261) + * Resurrected ppp.udeb. + * Removed patch: ppp-2.4.1-MSCHAPv2-fix.patch (was applied to dead code). + * New patch: ppp-2.4.2-stripMSdomain (I ported the old patch to the new + CHAP code). + * New patch: no_crypt_hack, because the d-i libc does not have crypt(3). + * Clean up the APM script. (Closes: #222008, #222436) + * New patch: parisc_eagain_fix to fix the EAGAIN != EWOULDBLOCK bug on + parisc, by James Bottomley. (Closes: #224982) + + -- Marco d'Itri Thu, 4 Dec 2003 11:54:35 +0100 + +ppp (2.4.2+20031002-4) unstable; urgency=medium + + * Deprecate /etc/ppp/ppp_on_boot in favour of ifupdown. + * Added /etc/apm/event.d/ppp to support APM. (Closes: #217821) + * Remove the logrotate entry for ppp.log, as syslog daemons manage + logging by themselves. (Closes: #216786, #217190) + * Add documentation about setting the default route. (Closes: #85426) + + -- Marco d'Itri Thu, 30 Oct 2003 21:04:15 +0100 + +ppp (2.4.2+20031002-3) unstable; urgency=medium + + * New patch 043_pppoatm-no-modprobe: do not run modprobe inside pppd. + * Removed the run-parts --report option from ip-{up,down} because it + caused it to wait for childs. (Closes: #214473) + * Suggests: libatm1. (Closes: #215874) + * Allow / in the poff parameter. (Closes: #215972) + * New example file per-linkname, from Eyal Rozenberg. + + -- Marco d'Itri Sat, 18 Oct 2003 12:34:26 +0200 + +ppp (2.4.2+20031002-2) unstable; urgency=medium + + * Fixed poff regexp. (Closes: #214051) + + -- Marco d'Itri Mon, 6 Oct 2003 20:21:10 +0200 + +ppp (2.4.2+20031002-1) unstable; urgency=low + + * Fresh CVS checkout. + * Removed the part of 040_pppoatm.diff which added a remove_option + member to struct protent in pppd.h. This has no apparent meaning + and breaks many other users of protent, like IPCP. + Debugged by Benjamin Heuer. (Closes: #213352) + * Conflict with incompatible versions of pppdcapiplugin. (Closes: #213217) + + -- Marco d'Itri Tue, 30 Sep 2003 23:06:12 +0200 + +ppp (2.4.2+20030811-6) unstable; urgency=low + + * Fix run-parts call in ip-{up,down}. (Closes: #213059) + * Removed ppp.udeb because it's apparently useless. + * New patch 042_pppoatm-libatm-workaround: work around a bug in + libatm1-dev which caused libatm.a to be statically linked (see #213146). + Now libatm1 needs to be installed if this plugin is used. + * Some obsolete information has been removed from README.Debian. + + -- Marco d'Itri Sun, 28 Sep 2003 19:48:32 +0200 + +ppp (2.4.2+20030811-5) unstable; urgency=low + + * Fix usage of ps in poff. (Closes: #58896) + * Add an example configuration file for the pppoe plugin. + * New patch pppoe-no-dead-code: disable some dead code in the pppoe plugin. + * Close the bugs fixed in the releases uploaded to experimental. + (Closes: #101616, #157214, #173546, #183221, #197489, #61717, #155668) + (Closes: #148156, #133809, #137964, #52913, #81511, #100665, #171137) + (Closes: #75797, #211485, #162163, #209146) + + -- Marco d'Itri Sat, 27 Sep 2003 16:05:49 +0200 + +ppp (2.4.2+20030811-4) experimental; urgency=low + + * New patch peerdns-env-always: always set $DNS1 and $DNS2 if name + server addresses are received with IPCP. (Closes: #209146) + * New patch pppoe-fix-persist: fixes the persist option, but watch + for side effects. + * Improved the parsing of the device name when / is a ramdisk. + (Closes: #162163) + * Build-Depend on a newer debhelper. (Closes: #211485) + * Renamed the pppoatm* patches because DBS is sensible to $LC_COLLATE. + * Updated the pppoe plugin with a fix from rp-pppoe 3.5. + + -- Marco d'Itri Sat, 20 Sep 2003 18:00:44 +0200 + +ppp (2.4.2+20030811-3) experimental; urgency=low + + * Add --report and $@ to the run-parts command line in ip-{up,down}. + (Suggestions from Dan Jacobson, Closes: #209133) + * Move /etc/ppp/options.ttyXX to /usr/share/doc/ppp/, it's documentation. + (Closes: #209275) + * Remove from postinst some compatibility code introduced in 2.3b3-2, + 2.3.5-2 and 2.3.6-1. + * Change the serial device permissions only when really needed. + Patch ppp-2.4.0-ttyperms.dif from the SuSE package. + (Closes: #22284, #36789, #51974, #62567, #74789) + * Use the system logwtmp() function. From the Red Hat and SuSE packages. + * Add the pppoatm-disconnection patch. From the Mandrake package. + * Add an example active-filter from the SuSE package. + * Add ppp-2.4.1-stripMSdomain.patch and ppp-2.4.1-MSCHAPv2-fix.patch + from the SuSE package. They say that these patches are described at + http://www.heise.de/ct/Redaktion/ps/pptp.html, but I don't know german. + I also don't use MSCHAP or MPPE, so I do not know if they will work. + Please report any success or insuccess of MPPE and related features. + * Add ppp-2.3.11-oedod.dif from the SuSE package to fix dial on demand + with sync PPP. (Closes: #75797) + + -- Marco d'Itri Sun, 14 Sep 2003 12:48:02 +0200 + +ppp (2.4.2+20030811-2) experimental; urgency=low + + * I'm the new maintainer. + * Fix FTBFS bug on S/390. + * Add a copy of chap-secrets to install. (#207417) + * Fix a little pon bug. (#207442) + * Clarify the active-filter description in pppd(8). (#207023) + * Make some files readable again by group dip. (#207407) + * Link pppoatm.so with libresolv. PPP over ATM has been reported to work. + + -- Marco d'Itri Wed, 27 Aug 2003 15:30:16 +0200 + +ppp (2.4.2+20030811-1) experimental; urgency=low + + * New CVS snapshot. (Closes: #171137) + New features: + - MPPE (Closes: #52913, #81511, #100665) + - kernel space PPPoE (Closes: #133809, #137964) + - CBCP (Closes: #148156) + - CHAP hooks for plugins (Closes: #155668) + - misc fixes (Closes: #61717) + * The following patches have been merged upstream: + 002_chat.c.diff 003_cbcp.diff 004_auth.c.diff 016_chat_manpage.diff + 017_memory_management.diff 020_IPPROTO_TCP_undefine.diff + 021_setipaddr.diff 022_lockfile-fix.diff 023_lcp-max-termintate.diff + 024_pppd.8-persist-maxfail.diff 025_packet_count.diff + 026_pppd.8-active-filter.diff 027_child_debugging.diff + 028_options_segv.diff 029_chap_plugin.diff 030_more_minor_warnings.diff + 031_ipv6cp-use-persistent.diff 032_flush_fd.diff etc_networks pppd.8 + pppiocdetach (?) reset-sigpipe (?) + * Added the PPP over ATM patch from + http://linux-usb.sourceforge.net/SpeedTouch/. Untested! + (Closes: #101616, #157214, #173546, #183221, #197489) + + -- Marco d'Itri Sun, 24 Aug 2003 13:40:16 +0200 + +ppp (2.4.1.uus2-3) unstable; urgency=low + + * Fix error in postinst. (Closes: #206978) + + -- Marco d'Itri Sun, 24 Aug 2003 13:23:01 +0200 + +ppp (2.4.1.uus2-2) unstable; urgency=low + + * New co-maintainer. (Closes: #180720) + * Switch to DBS. + * PAM configuration updated to the new style. + * Stop deleting /etc/ppp/* on purge, this is evil. (Closes: #202680) + * Kill pppd at K86 instead of K14. (Closes: #200639) + * Add a generic chatscript for PAP/CHAP sites. (Closes: #182107) + * Add a newline at the end of /etc/pam.d/ppp. (Closes: #182103) + * Add two ip-{up,down} scripts to support usepeerdns and the resolvconf + package. (Closes: #187756, #203243) + * Add a patch from Herbert Xu to fix the PPPIOCDETACH bug. This is + not the same bug of "Inappropriate ioctl for device(25)". + (Closes: #172317, #175480) + * 2.0 kernels are not supported by debian, remove kernel.fix-2.0.30-2. + (Closes: #171200) + * Add bash completion script. (Closes: #170771) + * Restore SIGPIPE for childs (Herbert Xu). (Closes: #169697) + * Fix the holdoff option (Herbert Xu). (Closes: #128875, #169694) + * Add a logrotate file. (Closes: #162895) + * Make pon print an error message if the user is not in the dip group. + (Closes: #156672) + * Improve the ability of poff of finding the right process. + (Closes: #160169) + * Remove deflate support from pppdump, just to be sure. (Closes: #144368) + * Use poff -a at shutdown time. (Closes: #140587) + * Add the popp example script from Tomas Pospisek. (Closes: #130716) + * Clarify pon(1). (Closes: #126656) + * Fix the code which reads /etc/networks/ (Closes: #125697) + * Add support for /var/log/ppp-ipupdown.log. (Closes: #152398) + * Add support for /etc/ppp/ip-{up,down}.local. (Closes: #85173, #119878) + * Create a new ppp-dev package for headers. (Closes: #101618) + * Add an example script from Brian May which implements exponential + redialing retries. (Closes: #56963, #140587, #205046) + * Add example scripts to support per-user ip-{up,down}.d directories. + (Closes: #46896, #60250) + * Export the call options as an environment variable. (Closes: #51880) + * Restore support for the 'quick' argument to pon. + * Add the cifdefroute.dif patch (from the SuSE ppp package). + (Closes: #93936) + + -- Marco d'Itri Thu, 21 Aug 2003 17:33:21 +0200 + +ppp (2.4.1.uus-5) unstable; urgency=low + + * Officially taking over the package. + + * Applied patch to stop pppd hanging on exit. + Closes: #33997 + + * Made the appropriate copyright notice change regarding the new BSD license. + Closes: #123831 + + * Fixed the download location in the copyright file. + Closes: #144348, #160116 + + * Added documentation for unit parameter for pppd.8. + Closes: #169385 + + * Change permissions on /etc/ppp to 0755. + Closes: #169258, #169259 + + * Check for /dev/.devfsd before checking for /dev/ppp + + -- Russell Coker Sun, 24 Nov 2002 12:58:00 +0100 + +ppp (2.4.1.uus-4.3) unstable; urgency=low + + * NMU with permission. + * Fix for numeric out of bounds giving a SEGV. + Closes: #34180 + * Back-port some plugin interfaces from ppp 2.4.2 for Portslave. + + -- Russell Coker Sat, 14 Sep 2002 08:46:00 +0200 + +ppp (2.4.1.uus-4.2) unstable; urgency=low + + * NMU + * Simple rebuild to deal with libpcap0->libpcap0.7 transition. + Closes: #156183 + + -- LaMont Jones Wed, 14 Aug 2002 21:45:43 -0600 + +ppp (2.4.1.uus-4.1) unstable; urgency=low + + * Non maintainer upload + * Rebuilt with new libpcap to remove dependency on libpcap0, which I + got removed from unstable by accident. Sorry about this... + + -- Torsten Landschoff Sat, 10 Aug 2002 11:37:27 +0200 + +ppp (2.4.1.uus-4) unstable; urgency=low + + * Use MAKEDEV in postinst, not mknod. (Closes: #122574) + + -- Michael Beattie Tue, 11 Dec 2001 00:24:05 +1300 + +ppp (2.4.1.uus-3) unstable; urgency=low + + * Enhanced init script for restarting connection. + * removed debconf note, the specifics are in README.Debian, + which should be read by users anyway. (Closes: #118871) + * Removed postinst question about very very old and obsolete + /etc/ppp/ppp-connect + * Removed debian/suid + * Updated README.Debian with info about ppp packet filtering, + and ipv6 support + * Added "active-filter" with a description to /etc/ppp/options + + -- Michael Beattie Mon, 12 Nov 2001 19:15:08 +1300 + +ppp (2.4.1.uus-2) unstable; urgency=low + + * Added versioned build dependency on debhelper (Closes: #117497) + * Enabled IPV6 support (Closes: #117727) + * Changed /etc/init.d/ppp to fully stop and restart pppd. + Not just signal a redial. (Closes: #117220) + * Corrected pppd(8) with respects to the active-filter option. + (Closes: #116809) + * Applied patch from Russell Coker to add extra debugging info for + child processes + + -- Michael Beattie Wed, 7 Nov 2001 20:53:26 +1300 + +ppp (2.4.1.uus-1) unstable; urgency=low + + * The Lets-get-rid-of-dbs release. Now using perl's patching method. + "uus" in upstream version to allow replacement of current 2.4.1 source + package. (unadulterated upstream source) + * Fixes to memory management patch (Closes: #113323, #106913, #111052) + * Removed kernel mode pppoe patch. Breaks demand dialling. Upstream + is planning on native pppoe support for 2.4.2 (Closes: #103843) + * Enabled PPP packet filtering. (Closes: #111522) + * Added Russian debconf template. (Closes: #112654) + * Completely remove /etc/ppp and /etc/chatscripts on purge, instead of + just removing selected files within. (Closes: #107910) + + -- Michael Beattie Sat, 29 Sep 2001 23:15:44 +1200 --- ppp-2.4.5.orig/debian/README.Debian +++ ppp-2.4.5/debian/README.Debian @@ -0,0 +1,143 @@ +Debian PPP package notes +======================== + +Table of contents: + + + Provided user space scripts + + Permissions + + Outbound dialing setup + + Inbound setup combined with mgetty + + Syslog facility level + + Logging of ip-up and ip-down + + DSL connections + + MSS clamping + + Naming of PPPoE interfaces + + -- Christoph Lameter , 22 July 1997 + Phil Hands + Josip Rodin , 27 November 1999. + Marco d'Itri + + +Provided user space scripts +~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Since release 2.3.1, the ppp package provides scripts to conveniently +control PPP from user space. Note that the scripts only work with the +proper setup in /etc/ppp. Edit the configuration files and test the +operation of your link in superuser mode first. + +pon Bring link up. Executes pppd (you may specify the ISP name + on the command line), and will immediately return the + command prompt while still dialing. + +plog Shows the last lines of the pppd log. Basically, does + tail ppp.log. + +poff Bring link down. Terminates connection by killing pppd. + +Please read the manual page pon(1) for specific descriptions of these +commands. + + +Permissions +~~~~~~~~~~~ +Access to pppd is controlled via the membership in the "dip" group. + + +Outbound dialing setup +~~~~~~~~~~~~~~~~~~~~~~ +Edit the file /etc/ppp/peers/provider and put all options in it that you need +to connect to your server. The most common options are already provided for +you, and you should only need to set the login name and telephone number. + +Edit the file /etc/ppp/pap-secrets and put your password into the designated +location. + +You should then be able to start the PPP connection with pon. + +You should never need to modify /etc/ppp/options. + +If you want to have PPP started at boot time then add something like this +to /etc/network/interfaces: + +auto myisp +iface myisp inet ppp + provider dsl-provider + + +Inbound setup combined with mgetty +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Note: for this to work you need to have mgetty version >= 0.99 with its +AutoPPP feature turned on. + +Edit the /etc/ppp/options file and uncomment the nameserver lines. Provide +the IP addresses that you want the users to use for their name services. + +To have one options file for each serial port you run mgetty on, use +the files /etc/ppp/options.ttyXX. Give each serial port an IP address +in those files. That way that port is locked into using that IP number. +Think what consequences that assignment might have for outbound use... + +That should be enough for dial-up from a Win9x or NT Server. The +username/password on those system is used for a PAP authentication. +The /etc/ppp/pap-secrets is already set up for such a situation. Mgetty is +preconfigured to call pppd with parameters so that the PAP verification will +be done through the /etc/passwd file. + +All your users should now be able to establish PPP connections by just +specifying phone number, username, and password from Win9x. + +Inbound dial-up using dial-up scripts: +A PPP session can be established from the regular Linux prompt by executing +/usr/sbin/pppd. The user is limited to use the assigned IP adddress in +/etc/ppp/options.ttyname and will not be able to override it. + +Note: there is support for callback, it can be done through scripts +(see /usr/share/doc/ppp/examples/scripts/*callback), and with mgetty's +`callback' program (see callback(8) manual page). + + +Syslog facility level +~~~~~~~~~~~~~~~~~~~~~ +The default level of LOG_DAEMON has been overridden (as described in the +pppd(8) man page), to be LOG_LOCAL2. The intent being that local2 be sent +to /var/log/ppp.log for use by plog, if you add the following line to your +/etc/syslog.conf file: + +local2.* -/var/log/ppp.log + + +Logging of ip-up and ip-down +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +If you want to enable logging of the ip-up and ip-down scripts output, +then create the file /var/log/ppp-ipupdown.log . + + +DSL connections +~~~~~~~~~~~~~~~ +The files peers-pppoa, peers-pppoe and interfaces from +/usr/share/doc/ppp/examples/ contain complete configuration examples +for the protocols commonly used for DSL connections. +Beware: the pppoatm kernel driver currently is not autoloaded, so PPPoA +users probably want to add it to /proc/modules. +The same applies to PPPoE users who need the br2684 module. + + +MSS clamping +~~~~~~~~~~~~ +If the computer running pppd acts as a router for other machines, you +probably want to make it reduce the MSS field of outgoing packets, to +avoid fragmentation and problems caused by path MTU blackholing. +You may add something like this to /etc/ppp/ip-up.d/local: + +iptables --insert FORWARD 1 --proto tcp --tcp-flags SYN,RST SYN \ + --out-interface $PPP_IFACE --match tcpmss --mss 1400:1536 \ + --jump TCPMSS --clamp-mss-to-pmtu + + +Naming of PPPoE interfaces +~~~~~~~~~~~~~~~~~~~~~~~~~~ +The rp-pppoe plugin usually accepts only eth*, nas* or tap* as interface +names. Different names can be specified by adding the "nic-" prefix, +which will be removed by the program. + --- ppp-2.4.5.orig/debian/ppp.preinst +++ ppp-2.4.5/debian/ppp.preinst @@ -0,0 +1,17 @@ +#!/bin/sh -e + +case "$1" in + install|upgrade) + if dpkg --compare-versions "$2" le "2.4.5-4"; then + + if dpkg --compare-versions "$2" le "2.4.4b1-1"; then + rm -f /etc/init.d/ppp + update-rc.d ppp remove + fi + + rm -f /etc/apm/event.d/ppp + fi + ;; +esac + +#DEBHELPER# --- ppp-2.4.5.orig/debian/ppp.docs +++ ppp-2.4.5/debian/ppp.docs @@ -0,0 +1,14 @@ +FAQ +README +SETUP +PLUGINS +README.cbcp +README.MPPE +README.MSCHAP80 +README.MSCHAP81 +README.pppoe +README.pppol2tp +README.pwfd +extra/README.STATIC-IP +extra/README.win9x +extra/defaultroute --- ppp-2.4.5.orig/debian/watch +++ ppp-2.4.5/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://ftp.samba.org/pub/ppp/ppp-([0-9\.]+)\.tar\.gz --- ppp-2.4.5.orig/debian/ppp.logrotate +++ ppp-2.4.5/debian/ppp.logrotate @@ -0,0 +1,9 @@ +/var/log/ppp-connect-errors { + weekly + rotate 4 + missingok + notifempty + compress + nocreate +} + --- ppp-2.4.5.orig/debian/ppp-udeb.dirs +++ ppp-2.4.5/debian/ppp-udeb.dirs @@ -0,0 +1,5 @@ +etc/network/ +etc/ppp/peers/ +usr/lib/post-base-installer.d/ +usr/lib/pppd/ +usr/sbin/ --- ppp-2.4.5.orig/debian/README.source +++ ppp-2.4.5/debian/README.source @@ -0,0 +1,9 @@ +# How to create a snapshot from git: +# +# mkdir GIT +# git clone git://ozlabs.org/~paulus/ppp.git +# cd .. +# +# rsync --delete --archive --verbose GIT/ppp/ ppp-2.4.5~$(date +%Y%m%d).orig/ --exclude=.git +# cp -a ppp-2.4.5~$(date +%Y%m%d).orig/ ppp-2.4.5~$(date +%Y%m%d)/ +# --- ppp-2.4.5.orig/debian/ppp-udeb.todo +++ ppp-2.4.5/debian/ppp-udeb.todo @@ -0,0 +1,5 @@ +- how to blend well with netcfg? + - the new patch proposes assigning menu order 17 to ppp-udeb, so + is ran before netcfg + +# vim:tw=72:sw=4:ts=4:nowrap --- ppp-2.4.5.orig/debian/ppp.links +++ ppp-2.4.5/debian/ppp.links @@ -0,0 +1,2 @@ +usr/share/man/man1/pon.1 usr/share/man/man1/poff.1 +usr/share/man/man1/pon.1 usr/share/man/man1/plog.1 --- ppp-2.4.5.orig/debian/copyright +++ ppp-2.4.5/debian/copyright @@ -0,0 +1,365 @@ +This is the Debian GNU/Linux prepackaged version of ppp. + +This package was previously maintained by Ian Murdock , +Alvar Bray , Christoph Lameter , +Philip Hands , Michael Beattie and +Russell Coker . + +It is currently maintained by Marco d'Itri . + +Original sources were obtained from: + git://ozlabs.org/~paulus/ppp.git + +The options file was originally obtained from: + ftp://sunsite.unc.edu/pub/Linux/system/Network/serial/pppopt.tgz +It was later heavily modified by various people, with additions from +different sources. + +All of the code can be freely used and redistributed. The individual +source files each have their own copyright and permission notice; some +have a BSD-style notice and some are under the GPL. + + +Follows the BSD-like licenses. Not all of them apply to all parts of pppd. + + * Copyright (c) 2003 Paul Mackerras. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. The name(s) of the authors of this software must not be used to + * endorse or promote products derived from this software without + * prior written permission. + * + * 3. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by Paul Mackerras + * ". + * + * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + * Copyright (c) 1995 Pedro Roque Marques. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The names of the authors of this software must not be used to + * endorse or promote products derived from this software without + * prior written permission. + * + * 4. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by Pedro Roque Marques + * " + * + * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + * Copyright (c) 1995 Eric Rosenquist. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The name(s) of the authors of this software must not be used to + * endorse or promote products derived from this software without + * prior written permission. + * + * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + * Copyright (c) 2002 Google, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The name(s) of the authors of this software must not be used to + * endorse or promote products derived from this software without + * prior written permission. + * + * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + * Copyright (c) 2001 by Sun Microsystems, Inc. + * All rights reserved. + * + * Non-exclusive rights to redistribute, modify, translate, and use + * this software in source and binary forms, in whole or in part, is + * hereby granted, provided that the above copyright notice is + * duplicated in any source form, and that neither the name of the + * copyright holder nor the author is used to endorse or promote + * products derived from this software. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + + * Copyright (c) 1999 Tommi Komulainen. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The name(s) of the authors of this software must not be used to + * endorse or promote products derived from this software without + * prior written permission. + * + * 4. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by Tommi Komulainen + * ". + * + * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The name "Carnegie Mellon University" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For permission or any legal + * details, please contact + * Office of Technology Transfer + * Carnegie Mellon University + * 5000 Forbes Avenue + * Pittsburgh, PA 15213-3890 + * (412) 268-4387, fax: (412) 268-7395 + * tech-transfer@andrew.cmu.edu + * + * 4. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by Computing Services + * at Carnegie Mellon University (http://www.cmu.edu/computing/)." + * + * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE + * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + *********************************************************************** + ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. ** + ** ** + ** License to copy and use this software is granted provided that ** + ** it is identified as the "RSA Data Security, Inc. MD5 Message- ** + ** Digest Algorithm" in all material mentioning or referencing this ** + ** software or this function. ** + ** ** + ** License is also granted to make and use derivative works ** + ** provided that such works are identified as "derived from the RSA ** + ** Data Security, Inc. MD5 Message-Digest Algorithm" in all ** + ** material mentioning or referencing the derived work. ** + ** ** + ** RSA Data Security, Inc. makes no representations concerning ** + ** either the merchantability of this software or the suitability ** + ** of this software for any particular purpose. It is provided "as ** + ** is" without express or implied warranty of any kind. ** + ** ** + ** These notices must be retained in any copies of any part of this ** + ** documentation and/or software. ** + *********************************************************************** + +The `chat' program is in the public domain. + +spinlock.c and tdb.c are licensed under the GNU LGPL version 2 or later +and they are: + Copyright (C) Anton Blanchard 2001 + Copyright (C) Andrew Tridgell 1999-2004 + Copyright (C) Paul `Rusty' Russell 2000 + Copyright (C) Jeremy Allison 2000-2003 + +On Debian systems, the complete text of the GNU General Public License +can be found in `/usr/share/common-licenses/GPL'. + +pppd/plugins/rp-pppoe/* is: + +* Copyright (C) 2000 by Roaring Penguin Software Inc. +* +* This program may be distributed according to the terms of the GNU +* General Public License, version 2 or (at your option) any later version. + +The rp-pppoe author stated in a private email to Marco d'Itri that, +as an exception to the license, linking with OpenSSL is allowed. + +pppd/plugins/winbind.c is licensed under the GNU GPL version 2 or later +and is: +* Copyright (C) 2003 Andrew Bartlet +* Copyright 1999 Paul Mackerras, Alan Curry. +* Copyright (C) 2002 Roaring Penguin Software Inc. + +pppd/plugins/pppoatm.c is licensed under the GNU GPL version 2 or later +and is: + * Copyright 2000 Mitchell Blank Jr. + + +The following copyright notices apply to plugins/radius/*: + +Copyright (C) 2002 Roaring Penguin Software Inc. + +Permission to use, copy, modify, and distribute this software for any +purpose and without fee is hereby granted, provided that this +copyright and permission notice appear on all copies and supporting +documentation, the name of Roaring Penguin Software Inc. not be used +in advertising or publicity pertaining to distribution of the program +without specific prior permission, and notice be given in supporting +documentation that copying and distribution is by permission of +Roaring Penguin Software Inc.. + +Roaring Penguin Software Inc. makes no representations about the +suitability of this software for any purpose. It is provided "as is" +without express or implied warranty. + +Copyright (C) 1995,1996,1997,1998 Lars Fenneberg + +Permission to use, copy, modify, and distribute this software for any +purpose and without fee is hereby granted, provided that this copyright and +permission notice appear on all copies and supporting documentation, the +name of Lars Fenneberg not be used in advertising or publicity pertaining to +distribution of the program without specific prior permission, and notice be +given in supporting documentation that copying and distribution is by +permission of Lars Fenneberg. + +Lars Fenneberg makes no representations about the suitability of this +software for any purpose. It is provided "as is" without express or implied +warranty. + +Copyright 1992 Livingston Enterprises, Inc. +Livingston Enterprises, Inc. 6920 Koll Center Parkway Pleasanton, CA 94566 + +Permission to use, copy, modify, and distribute this software for any +purpose and without fee is hereby granted, provided that this copyright +and permission notice appear on all copies and supporting documentation, +the name of Livingston Enterprises, Inc. not be used in advertising or +publicity pertaining to distribution of the program without specific +prior permission, and notice be given in supporting documentation that +copying and distribution is by permission of Livingston Enterprises, Inc. + +Livingston Enterprises, Inc. makes no representations about the suitability +of this software for any purpose. It is provided "as is" without express +or implied warranty. + +[C] The Regents of the University of Michigan and Merit Network, Inc. 1992, +1993, 1994, 1995 All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided +that the above copyright notice and this permission notice appear in all +copies of the software and derivative works or modified versions thereof, +and that both the copyright notice and this permission and disclaimer +notice appear in supporting documentation. + +THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER +EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE REGENTS OF THE +UNIVERSITY OF MICHIGAN AND MERIT NETWORK, INC. DO NOT WARRANT THAT THE +FUNCTIONS CONTAINED IN THE SOFTWARE WILL MEET LICENSEE'S REQUIREMENTS OR +THAT OPERATION WILL BE UNINTERRUPTED OR ERROR FREE. The Regents of the +University of Michigan and Merit Network, Inc. shall not be liable for any +special, indirect, incidental or consequential damages with respect to any +claim by Licensee or any third party arising from use of the software. + +Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. +All rights reserved. + +License to copy and use this software is granted provided that it +is identified as the "RSA Data Security, Inc. MD5 Message-Digest +Algorithm" in all material mentioning or referencing this software +or this function. + +License is also granted to make and use derivative works provided +that such works are identified as "derived from the RSA Data +Security, Inc. MD5 Message-Digest Algorithm" in all material +mentioning or referencing the derived work. + +RSA Data Security, Inc. makes no representations concerning either +the merchantability of this software or the suitability of this +software for any particular purpose. It is provided "as is" +without express or implied warranty of any kind. + +These notices must be retained in any copies of any part of this +documentation and/or software. + +* radius.c +* +* Copyright (C) 2002 Roaring Penguin Software Inc. +* +* This plugin may be distributed according to the terms of the GNU +* General Public License, version 2 or (at your option) any later version. + --- ppp-2.4.5.orig/debian/ppp.postrm +++ ppp-2.4.5/debian/ppp.postrm @@ -0,0 +1,37 @@ +#!/bin/sh -e + +delete_etc_files() { + rm -f /etc/ppp/pap-secrets /etc/ppp/chap-secrets /etc/ppp/resolv.conf \ + /etc/ppp/peers/provider /etc/chatscripts/provider + rmdir --ignore-fail-on-non-empty /etc/ppp/peers/ /etc/ppp/ \ + /etc/ppp/ip-up.d/ /etc/ppp/ip-down.d/ \ + /etc/chatscripts/ +} + +delete_var_files() { + rm -f /var/log/ppp.log /var/log/ppp-connect-errors \ + /var/log/ppp-ipupdown.log +} + +case "$1" in + remove) + ;; + + purge) + delete_etc_files + delete_var_files + ;; + + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument '$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 + --- ppp-2.4.5.orig/debian/compat +++ ppp-2.4.5/debian/compat @@ -0,0 +1 @@ +5 --- ppp-2.4.5.orig/debian/control +++ ppp-2.4.5/debian/control @@ -0,0 +1,49 @@ +Source: ppp +Section: admin +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Marco d'Itri +Build-Depends: debhelper (>= 5), quilt (>= 0.40), libpcap0.8-dev, libpam0g-dev, zlib1g-dev +Standards-Version: 3.9.1 + +Package: ppp +Section: admin +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-modules, libpam-runtime, procps +Breaks: network-manager (<= 0.8.0.999-1), network-manager-pptp (<= 0.8.0.999-1), pppdcapiplugin (<= 1:3.9.20060704+dfsg.1-1) +Description: Point-to-Point Protocol (PPP) - daemon + The Point-to-Point Protocol provides a standard way to transmit + datagrams over a serial link, as well as a standard way for the machines + at either end of the link to negotiate various optional characteristics + of the link. + . + This package is most commonly used to manage a modem for dial-up or + certain kinds of broadband connections. + +Package: ppp-udeb +XC-Package-Type: udeb +Section: debian-installer +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ethernet-card-detection, ppp-modules, di-utils +Provides: configured-network +XB-Installer-Menu-Item: 1700 +Description: Point-to-Point Protocol (PPP) - package for Debian Installer + The Point-to-Point Protocol provides a standard way to transmit + datagrams over a serial link, as well as a standard way for the machines + at either end of the link to negotiate various optional characteristics + of the link. + . + This package is a minimal ppp package used by the Debian Installer. + +Package: ppp-dev +Section: devel +Architecture: all +Priority: extra +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Point-to-Point Protocol (PPP) - development files + The Point-to-Point Protocol provides a standard way to transmit + datagrams over a serial link, as well as a standard way for the machines + at either end of the link to negotiate various optional characteristics + of the link. + . + This package provides files needed to build pppd-related software. --- ppp-2.4.5.orig/debian/ppp.postinst +++ ppp-2.4.5/debian/ppp.postinst @@ -0,0 +1,63 @@ +#!/bin/sh -e + +everything() { + +# install /etc/ppp/pap-secrets and /etc/ppp/chap-secrets from templates, +# if necessary +for file in pap-secrets chap-secrets; do + if [ -f /etc/ppp/$file ]; then + TAG=$(head --lines=1 /etc/ppp/$file) + if [ "$TAG" = "#GENERATED-BY-DEBIAN-INSTALLER#" ]; then + (sed -e "s/-HOSTNAME-/$HOST/g" /usr/share/ppp/$file; \ + cat /etc/ppp/$file) > /etc/ppp/$file.tmp + mv /etc/ppp/$file.tmp /etc/ppp/$file + fi + else + sed -e "s/-HOSTNAME-/$HOST/g" < /usr/share/ppp/$file > /etc/ppp/$file + fi + chmod 600 /etc/ppp/$file +done + +# install template provider files +if [ ! -f /etc/ppp/peers/provider ]; then + install -g dip -m 640 /usr/share/ppp/provider.peer \ + /etc/ppp/peers/provider +fi +if [ ! -f /etc/chatscripts/provider ]; then + install -g dip -m 640 /usr/share/ppp/provider.chatscript \ + /etc/chatscripts/provider +fi + +# fix the log files permissions +LOG_FILES="/var/log/ppp.log /var/log/ppp-connect-errors" +for file in $LOG_FILES; do + [ -e $file ] || continue + chown root:adm $file + chmod 640 $file +done + +} + +# Migrate init script +if dpkg --compare-versions "$2" lt "2.4.5~git20081126t100229-0ubuntu2"; then + update-rc.d -f pppd-dns remove >/dev/null +fi + +case "$1" in + configure) + everything + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument '$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 + --- ppp-2.4.5.orig/debian/patches/pppoe_noads +++ ppp-2.4.5/debian/patches/pppoe_noads @@ -0,0 +1,12 @@ +--- a/pppd/plugins/rp-pppoe/plugin.c ++++ b/pppd/plugins/rp-pppoe/plugin.c +@@ -345,9 +345,6 @@ plugin_init(void) + } + + add_options(Options); +- +- info("RP-PPPoE plugin version %s compiled against pppd %s", +- RP_VERSION, VERSION); + } + + void pppoe_check_options(void) --- ppp-2.4.5.orig/debian/patches/git-20100307 +++ ppp-2.4.5/debian/patches/git-20100307 @@ -0,0 +1,123 @@ +diff --git a/pppd/lcp.c b/pppd/lcp.c +index 5c77490..8ed2778 100644 +--- a/pppd/lcp.c ++++ b/pppd/lcp.c +@@ -397,21 +397,29 @@ lcp_close(unit, reason) + char *reason; + { + fsm *f = &lcp_fsm[unit]; ++ int oldstate; + + if (phase != PHASE_DEAD && phase != PHASE_MASTER) + new_phase(PHASE_TERMINATE); +- if (f->state == STOPPED && f->flags & (OPT_PASSIVE|OPT_SILENT)) { ++ ++ if (f->flags & DELAYED_UP) { ++ untimeout(lcp_delayed_up, f); ++ f->state = STOPPED; ++ } ++ oldstate = f->state; ++ ++ fsm_close(f, reason); ++ if (oldstate == STOPPED && f->flags & (OPT_PASSIVE|OPT_SILENT|DELAYED_UP)) { + /* + * This action is not strictly according to the FSM in RFC1548, + * but it does mean that the program terminates if you do a +- * lcp_close() in passive/silent mode when a connection hasn't +- * been established. ++ * lcp_close() when a connection hasn't been established ++ * because we are in passive/silent mode or because we have ++ * delayed the fsm_lowerup() call and it hasn't happened yet. + */ +- f->state = CLOSED; ++ f->flags &= ~DELAYED_UP; + lcp_finished(f); +- +- } else +- fsm_close(f, reason); ++ } + } + + +@@ -453,9 +461,10 @@ lcp_lowerdown(unit) + { + fsm *f = &lcp_fsm[unit]; + +- if (f->flags & DELAYED_UP) ++ if (f->flags & DELAYED_UP) { + f->flags &= ~DELAYED_UP; +- else ++ untimeout(lcp_delayed_up, f); ++ } else + fsm_lowerdown(&lcp_fsm[unit]); + } + +@@ -489,6 +498,7 @@ lcp_input(unit, p, len) + + if (f->flags & DELAYED_UP) { + f->flags &= ~DELAYED_UP; ++ untimeout(lcp_delayed_up, f); + fsm_lowerup(f); + } + fsm_input(f, p, len); +diff --git a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux +index 19eff67..ea3538e 100644 +--- a/pppd/plugins/pppol2tp/Makefile.linux ++++ b/pppd/plugins/pppol2tp/Makefile.linux +@@ -20,7 +20,7 @@ all: $(PLUGINS) + + install: all + $(INSTALL) -d -m 755 $(LIBDIR) +- $(INSTALL) -c -m 4550 $(PLUGINS) $(LIBDIR) ++ $(INSTALL) -c -m 755 $(PLUGINS) $(LIBDIR) + + clean: + rm -f *.o *.so +diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c +index e94494b..9bd6643 100644 +--- a/pppd/plugins/rp-pppoe/plugin.c ++++ b/pppd/plugins/rp-pppoe/plugin.c +@@ -108,8 +108,6 @@ PPPOEInitDevice(void) + novm("PPPoE session data"); + } + memset(conn, 0, sizeof(PPPoEConnection)); +- conn->acName = acName; +- conn->serviceName = pppd_pppoe_service; + conn->ifName = devnam; + conn->discoverySocket = -1; + conn->sessionSocket = -1; +@@ -133,6 +131,8 @@ PPPOEConnectDevice(void) + { + struct sockaddr_pppox sp; + ++ conn->acName = acName; ++ conn->serviceName = pppd_pppoe_service; + strlcpy(ppp_devnam, devnam, sizeof(ppp_devnam)); + if (existingSession) { + unsigned int mac[ETH_ALEN]; +diff --git a/pppd/pppd.8 b/pppd/pppd.8 +index 8ea8200..b7adc77 100644 +--- a/pppd/pppd.8 ++++ b/pppd/pppd.8 +@@ -193,6 +193,9 @@ will not accept a different value from the peer in the IPCP + negotiation, unless the \fIipcp\-accept\-local\fR and/or + \fIipcp\-accept\-remote\fR options are given, respectively. + .TP ++.B +ipv6 ++Enable the IPv6CP and IPv6 protocols. ++.TP + .B ipv6 \fI\fR,\fI + Set the local and/or remote 64-bit interface identifier. Either one may be + omitted. The identifier must be specified in standard ascii notation of +@@ -449,6 +452,11 @@ scripts. If this + option is given, the \fIstring\fR supplied is given as the 6th + parameter to those scripts. + .TP ++.B ipv6cp\-accept\-local ++With this option, pppd will accept the peer's idea of our local IPv6 ++interface identifier, even if the local IPv6 interface identifier ++was specified in an option. ++.TP + .B ipv6cp\-max\-configure \fIn + Set the maximum number of IPv6CP configure-request transmissions to + \fIn\fR (default 10). --- ppp-2.4.5.orig/debian/patches/pppoatm_cleanup +++ ppp-2.4.5/debian/patches/pppoatm_cleanup @@ -0,0 +1,78 @@ +cosmetic cleanup of the pppoatm plugin + +Removed some debugging messages and generally cleaned up the source. + +--- a/pppd/plugins/pppoatm/pppoatm.c ++++ b/pppd/plugins/pppoatm/pppoatm.c +@@ -70,18 +70,20 @@ static int setdevname_pppoatm(const char + { + struct sockaddr_atmpvc addr; + extern struct stat devstat; ++ + if (device_got_set) + return 0; +- //info("PPPoATM setdevname_pppoatm: '%s'", cp); ++ + memset(&addr, 0, sizeof addr); + if (text2atm(cp, (struct sockaddr *) &addr, sizeof(addr), +- T2A_PVC | T2A_NAME) < 0) { +- if(doit) +- info("atm does not recognize: %s", cp); ++ T2A_PVC | T2A_NAME | T2A_WILDCARD) < 0) { ++ if (doit) ++ info("cannot parse the ATM address: %s", cp); + return 0; +- } +- if (!doit) return 1; +- //if (!dev_set_ok()) return -1; ++ } ++ if (!doit) ++ return 1; ++ + memcpy(&pvcaddr, &addr, sizeof pvcaddr); + strlcpy(devnam, cp, sizeof devnam); + devstat.st_mode = S_IFSOCK; +@@ -93,7 +95,6 @@ static int setdevname_pppoatm(const char + lcp_allowoptions[0].neg_asyncmap = 0; + lcp_wantoptions[0].neg_pcompression = 0; + } +- info("PPPoATM setdevname_pppoatm - SUCCESS:%s", cp); + device_got_set = 1; + return 1; + } +@@ -108,6 +109,7 @@ static void no_device_given_pppoatm(void + static void set_line_discipline_pppoatm(int fd) + { + struct atm_backend_ppp be; ++ + be.backend_num = ATM_BACKEND_PPP; + if (!llc_encaps) + be.encaps = PPPOATM_ENCAPS_VC; +@@ -115,6 +117,7 @@ static void set_line_discipline_pppoatm( + be.encaps = PPPOATM_ENCAPS_LLC; + else + be.encaps = PPPOATM_ENCAPS_AUTODETECT; ++ + if (ioctl(fd, ATM_SETBACKEND, &be) < 0) + fatal("ioctl(ATM_SETBACKEND): %m"); + } +@@ -174,7 +177,7 @@ static void disconnect_pppoatm(void) + + void plugin_init(void) + { +-#if defined(__linux__) ++#ifdef linux + extern int new_style_driver; /* From sys-linux.c */ + if (!ppp_available() && !new_style_driver) + fatal("Kernel doesn't support ppp_generic - " +@@ -182,9 +185,9 @@ void plugin_init(void) + #else + fatal("No PPPoATM support on this OS"); + #endif +- info("PPPoATM plugin_init"); + add_options(pppoa_options); + } ++ + struct channel pppoa_channel = { + options: pppoa_options, + process_extra_options: NULL, --- ppp-2.4.5.orig/debian/patches/pppoatm_no_modprobe +++ ppp-2.4.5/debian/patches/pppoatm_no_modprobe @@ -0,0 +1,11 @@ +--- a/pppd/plugins/pppoatm/pppoatm.c ++++ b/pppd/plugins/pppoatm/pppoatm.c +@@ -133,8 +133,6 @@ static int connect_pppoatm(void) + int fd; + struct atm_qos qos; + +- system ("/sbin/modprobe -q pppoatm"); +- + if (!device_got_set) + no_device_given_pppoatm(); + fd = socket(AF_ATMPVC, SOCK_DGRAM, 0); --- ppp-2.4.5.orig/debian/patches/radius_enanchements +++ ppp-2.4.5/debian/patches/radius_enanchements @@ -0,0 +1,153 @@ +radius plugin enhancements + +http://ppp.samba.org/cgi-bin/ppp-bugs/incoming?id=1466 + +From: z0termann@mail.ru +To: ppp-bugs@ppp.samba.org +Subject: radius plugin enhancements +Date: Fri, 11 Aug 2006 08:06:24 +0000 (GMT) + +Full_Name: Vadim Zotov +Version: 2.4.3 +OS: centos4 +Submission from: (NULL) (194.186.83.193) + + +The patch below allows radius plugin to handle +additional radius attributes: + +- Filter-ID (sets RADIUS_FILTER_ID env. var.) +- Framed-Route (sets RADIUS_FRAMED_ROUTE env. var.) +- Idle-Timeout +- NAS-IP-Address +- MS-Primary-DNS-Server +- MS-Secondary-DNS-Server +- MS-Primary-NBNS-Server +- MS-Secondary-NBNS-Server + +-------------------------------------------- +--- a/pppd/plugins/radius/radius.c ++++ b/pppd/plugins/radius/radius.c +@@ -48,6 +48,8 @@ static char const RCSID[] = + + #define MD5_HASH_SIZE 16 + ++#define MSDNS 1 ++ + static char *config_file = NULL; + static int add_avp(char **); + static struct avpopt { +@@ -544,6 +546,15 @@ radius_setparams(VALUE_PAIR *vp, char *m + int mppe_enc_types = 0; + #endif + ++#ifdef MSDNS ++ ipcp_options *wo = &ipcp_wantoptions[0]; ++ ipcp_options *ao = &ipcp_allowoptions[0]; ++ int got_msdns_1 = 0; ++ int got_msdns_2 = 0; ++ int got_wins_1 = 0; ++ int got_wins_2 = 0; ++#endif ++ + /* Send RADIUS attributes to anyone else who might be interested */ + if (radius_attributes_hook) { + (*radius_attributes_hook)(vp); +@@ -581,6 +592,21 @@ radius_setparams(VALUE_PAIR *vp, char *m + /* Session timeout */ + maxconnect = vp->lvalue; + break; ++/* -- additional parameters */ ++ case PW_FILTER_ID: ++ /* packet filter, will be handled via ip-(up|down) script */ ++ script_setenv("RADIUS_FILTER_ID",vp->strvalue,1); ++ break; ++ case PW_FRAMED_ROUTE: ++ /* route, will be handled via ip-(up|down) script */ ++ script_setenv("RADIUS_FRAMED_ROUTE",vp->strvalue,1); ++ break; ++ case PW_IDLE_TIMEOUT: ++ /* idle parameter */ ++ idle_time_limit = vp->lvalue; ++ slprintf(msg, BUF_LEN, "setting idle tmo to %ld",vp->lvalue); ++ break; ++/* -- end of additional parameters */ + #ifdef MAXOCTETS + case PW_SESSION_OCTETS_LIMIT: + /* Session traffic limit */ +@@ -619,6 +645,11 @@ radius_setparams(VALUE_PAIR *vp, char *m + rstate.ip_addr = remote; + } + break; ++/* --- additional parameters ---*/ ++ case PW_NAS_IP_ADDRESS: ++ wo->ouraddr = htonl(vp->lvalue); ++ break; ++/* --- end additional parameters --- */ + case PW_CLASS: + /* Save Class attribute to pass it in accounting request */ + if (vp->lvalue <= MAXCLASSLEN) { +@@ -629,8 +660,8 @@ radius_setparams(VALUE_PAIR *vp, char *m + } + + +-#ifdef CHAPMS + } else if (vp->vendorcode == VENDOR_MICROSOFT) { ++#ifdef CHAPMS + switch (vp->attribute) { + case PW_MS_CHAP2_SUCCESS: + if ((vp->lvalue != 43) || strncmp(vp->strvalue + 1, "S=", 2)) { +@@ -673,19 +704,38 @@ radius_setparams(VALUE_PAIR *vp, char *m + break; + + #endif /* MPPE */ +-#if 0 ++#ifdef MSDNS + case PW_MS_PRIMARY_DNS_SERVER: ++ ao->dnsaddr[0] = htonl(vp->lvalue); ++ got_msdns_1 = 1; ++ break; + case PW_MS_SECONDARY_DNS_SERVER: ++ ao->dnsaddr[1] = htonl(vp->lvalue); ++ got_msdns_2 = 1; ++ break; + case PW_MS_PRIMARY_NBNS_SERVER: ++ ao->winsaddr[0] = htonl(vp->lvalue); ++ got_wins_1 = 1; ++ break; + case PW_MS_SECONDARY_NBNS_SERVER: ++ ao->winsaddr[1] = htonl(vp->lvalue); ++ got_wins_2 = 1; + break; +-#endif ++#endif /* MSDNS */ + } + #endif /* CHAPMS */ + } + vp = vp->next; + } + ++#ifdef MSDNS ++ /* override the ms-dns & ms-wins options */ ++ if (got_msdns_1 == 1 && got_msdns_2 == 0 ) ao->dnsaddr[1] = ao->dnsaddr[0]; ++ else if (got_msdns_1 == 0 && got_msdns_2 == 1 ) ao->dnsaddr[0] = ao->dnsaddr[1]; ++ if (got_wins_1 == 1 && got_wins_2 == 0 ) ao->winsaddr[1] = ao->winsaddr[0]; ++ else if (got_wins_1 == 0 && got_wins_2 == 1 ) ao->winsaddr[0] = ao->winsaddr[1]; ++#endif ++ + /* Require a valid MS-CHAP2-SUCCESS for MS-CHAPv2 auth */ + if (digest && (digest->code == CHAP_MICROSOFT_V2) && !ms_chap2_success) + return -1; +--- a/pppd/plugins/radius/radiusclient.h ++++ b/pppd/plugins/radius/radiusclient.h +@@ -152,6 +152,10 @@ typedef struct pw_auth_hdr + #define PW_MS_CHAP_MPPE_KEYS 12 /* string */ + #define PW_MS_MPPE_SEND_KEY 16 /* string */ + #define PW_MS_MPPE_RECV_KEY 17 /* string */ ++#define PW_MS_PRIMARY_DNS_SERVER 28 /* ipaddr */ ++#define PW_MS_SECONDARY_DNS_SERVER 29 /* ipaddr */ ++#define PW_MS_PRIMARY_NBNS_SERVER 30 /* ipaddr */ ++#define PW_MS_SECONDARY_NBNS_SERVER 31 /* ipaddr */ + + /* Accounting */ + --- ppp-2.4.5.orig/debian/patches/zzz_config +++ ppp-2.4.5/debian/patches/zzz_config @@ -0,0 +1,79 @@ +Debian-specific changes. + +--- a/pppd/Makefile.linux ++++ b/pppd/Makefile.linux +@@ -33,7 +33,7 @@ endif + # CC = gcc + # + CFLAGS = -O2 -g +-LIBS = ++LIBS = -lutil + + # Uncomment the next 2 lines to include support for Microsoft's + # MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux. +@@ -61,14 +61,14 @@ HAVE_MULTILINK=y + USE_TDB=y + + HAS_SHADOW=y +-#USE_PAM=y +-#HAVE_INET6=y ++USE_PAM=y ++HAVE_INET6=y + + # Enable plugins + PLUGIN=y + + # Enable Microsoft proprietary Callback Control Protocol +-#CBCP=y ++CBCP=y + + # Enable EAP SRP-SHA1 authentication (requires libsrp) + #USE_SRP=y +@@ -172,11 +172,9 @@ LIBS += -ldl + endif + + ifdef FILTER +-ifneq ($(wildcard /usr/include/pcap-bpf.h),) + LIBS += -lpcap + COMPILE_FLAGS += -DPPP_FILTER + endif +-endif + + ifdef HAVE_INET6 + PPPDSRCS += ipv6cp.c eui64.c +--- a/pppdump/Makefile.linux ++++ b/pppdump/Makefile.linux +@@ -2,9 +2,9 @@ DESTDIR = $(INSTROOT)@DESTDIR@ + BINDIR = $(DESTDIR)/sbin + MANDIR = $(DESTDIR)/share/man/man8 + +-DO_DEFLATE=y ++#DO_DEFLATE=y + DO_BSD_COMPRESS=y +-HAVE_ZLIB=n ++HAVE_ZLIB=y + + CFLAGS=-O2 -g + COPTS= -I../include/net +--- a/pppd/pathnames.h ++++ b/pppd/pathnames.h +@@ -28,7 +28,7 @@ + #define _PATH_AUTHUP _ROOT_PATH "/etc/ppp/auth-up" + #define _PATH_AUTHDOWN _ROOT_PATH "/etc/ppp/auth-down" + #define _PATH_TTYOPT _ROOT_PATH "/etc/ppp/options." +-#define _PATH_CONNERRS _ROOT_PATH "/etc/ppp/connect-errors" ++#define _PATH_CONNERRS _ROOT_PATH "/var/log/ppp-connect-errors" + #define _PATH_PEERFILES _ROOT_PATH "/etc/ppp/peers/" + #define _PATH_RESOLV _ROOT_PATH "/etc/ppp/resolv.conf" + +--- a/pppd/pppd.h ++++ b/pppd/pppd.h +@@ -833,7 +833,7 @@ extern void (*snoop_send_hook) __P((unsi + || defined(DEBUGCHAP) || defined(DEBUG) || defined(DEBUGIPV6CP) + #define LOG_PPP LOG_LOCAL2 + #else +-#define LOG_PPP LOG_DAEMON ++#define LOG_PPP LOG_LOCAL2 + #endif + #endif /* LOG_PPP */ + --- ppp-2.4.5.orig/debian/patches/pppoe_fixinclude +++ ppp-2.4.5/debian/patches/pppoe_fixinclude @@ -0,0 +1,11 @@ +--- a/pppd/plugins/rp-pppoe/Makefile.linux ++++ b/pppd/plugins/rp-pppoe/Makefile.linux +@@ -26,7 +26,7 @@ INSTALL = install + RP_VERSION=3.8p + + COPTS=-O2 -g +-CFLAGS=$(COPTS) -I../../../include/linux '-DRP_VERSION="$(RP_VERSION)"' ++CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"' + all: rp-pppoe.so pppoe-discovery + + pppoe-discovery: pppoe-discovery.o debug.o --- ppp-2.4.5.orig/debian/patches/man_syntax_errors +++ ppp-2.4.5/debian/patches/man_syntax_errors @@ -0,0 +1,51 @@ +Fix some syntax errors in the man pages. + +--- a/pppstats/pppstats.8 ++++ b/pppstats/pppstats.8 +@@ -172,7 +172,7 @@ option is specified. + When the + .B \-z + option is specified, +-.Nm pppstats ++.B pppstats + instead displays the following fields, relating to the packet + compression algorithm currently in use. If packet compression is not + in use, these fields will all display zeroes. The fields displayed on +--- a/chat/chat.8 ++++ b/chat/chat.8 +@@ -288,7 +288,7 @@ ABORT 'BUSY' + .br + ABORT 'NO CARRIER' + .br +-'' ATZ ++\&'' ATZ + .br + OK\\r\\n ATD1234567 + .br +@@ -318,7 +318,7 @@ signal behavior. Here is an (simple) ex + .IP + ABORT 'BUSY' + .br +-'' ATZ ++\&'' ATZ + .br + OK\\r\\n ATD1234567 + .br +@@ -365,7 +365,7 @@ The special reply string of \fIEOT\fR in + should send an EOT character to the remote. This is normally the + End-of-file character sequence. A return character is not sent + following the EOT. +-.PR ++.LP + The EOT sequence may be embedded into the send string using the + sequence \fI^D\fR. + .SH GENERATING BREAK +@@ -374,7 +374,7 @@ to be sent. The break is a special signa + normal processing on the receiver is to change the transmission rate. + It may be used to cycle through the available transmission rates on + the remote until you are able to receive a valid login prompt. +-.PR ++.LP + The break sequence may be embedded into the send string using the + \fI\\K\fR sequence. + .SH ESCAPE SEQUENCES --- ppp-2.4.5.orig/debian/patches/fix_warnings +++ ppp-2.4.5/debian/patches/fix_warnings @@ -0,0 +1,26 @@ +fix minor issues + +Fix warnings, missing prototypes, an incomplete clean target. + +--- a/pppd/ipv6cp.c ++++ b/pppd/ipv6cp.c +@@ -1120,7 +1120,7 @@ ipv6_check_options() + + if (demand && (eui64_iszero(wo->ourid) || eui64_iszero(wo->hisid))) { + option_error("local/remote LL address required for demand-dialling\n"); +- exit(1); ++ die(1); + } + } + +--- a/pppd/pppd.h ++++ b/pppd/pppd.h +@@ -642,6 +642,8 @@ int sif6addr __P((int, eui64_t, eui64_t + /* Configure IPv6 addresses for i/f */ + int cif6addr __P((int, eui64_t, eui64_t)); + /* Remove an IPv6 address from i/f */ ++int ether_to_eui64 __P((eui64_t *)); ++ /* Convert Ethernet address into 64-bit EUI */ + #endif + int sifdefaultroute __P((int, u_int32_t, u_int32_t)); + /* Create default route through i/f */ --- ppp-2.4.5.orig/debian/patches/pppoatm_resolver_light +++ ppp-2.4.5/debian/patches/pppoatm_resolver_light @@ -0,0 +1,79 @@ +disable unneeded code in the pppoatm plugin + +This patch halves the size of the PPPoA plugin by disabling features +which are never used with normal DSL connections (i.e. parsing of QoS +configuration directives and DNS resolution of VP/VC addresses). +It is especially useful for install images and embedded systems. + +A next step could be removing text2qos.c, text2atm.c, misc.c and ans.c +and encourage users interested in the complete features to link the +plugin with the real libatm. I really doubt anybody cares, anyway. + + +diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.3/pppd/plugins/pppoatm/Makefile.linux +--- ppp-2.4.3.orig/pppd/plugins/pppoatm/Makefile.linux 2004-11-14 02:12:10.000000000 +0100 ++++ ppp-2.4.3/pppd/plugins/pppoatm/Makefile.linux 2005-02-25 19:19:08.022622528 +0100 +@@ -25,9 +25,13 @@ ifdef HAVE_LIBATM + LIBS := -latm + else + COPTS += -I. ++PLUGIN_OBJS += text2atm.o ++ifdef USE_FULL_ATM_RESOLVER ++COPTS += -DUSE_FULL_ATM_RESOLVER + PLUGIN_OBJS += text2qos.o text2atm.o misc.o ans.o + LIBS := -lresolv + endif ++endif + + #********* + all: $(PLUGIN) +diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c +--- ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c 2005-02-25 19:19:13.859735152 +0100 ++++ ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c 2005-02-25 19:17:36.784492832 +0100 +@@ -144,8 +144,12 @@ static int connect_pppoatm(void) + qos.txtp.traffic_class = qos.rxtp.traffic_class = ATM_UBR; + /* TODO: support simplified QoS setting */ + if (qosstr != NULL) ++#ifdef USE_FULL_ATM_RESOLVER + if (text2qos(qosstr, &qos, 0)) + fatal("Can't parse QoS: \"%s\""); ++#else ++ fatal("qos support has not been compiled in"); ++#endif + qos.txtp.max_sdu = lcp_allowoptions[0].mru + pppoatm_overhead(); + qos.rxtp.max_sdu = lcp_wantoptions[0].mru + pppoatm_overhead(); + qos.aal = ATM_AAL5; +diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/text2atm.c ppp-2.4.3/pppd/plugins/pppoatm/text2atm.c +--- ppp-2.4.3.orig/pppd/plugins/pppoatm/text2atm.c 2004-11-06 07:55:28.000000000 +0100 ++++ ppp-2.4.3/pppd/plugins/pppoatm/text2atm.c 2005-02-25 19:17:36.552528096 +0100 +@@ -72,6 +72,7 @@ static int try_pvc(const char *text,stru + } + + ++#ifdef USE_FULL_ATM_RESOLVER + static int do_try_nsap(const char *text,struct sockaddr_atmsvc *addr,int flags) + { + const char *walk; +@@ -221,6 +222,7 @@ static int try_name(const char *text,str + (void) fclose(file); + return result; + } ++#endif + + + int text2atm(const char *text,struct sockaddr *addr,int length,int flags) +@@ -234,6 +236,7 @@ int text2atm(const char *text,struct soc + result = try_pvc(text,(struct sockaddr_atmpvc *) addr,flags); + if (result != TRY_OTHER) return result; + } ++#ifdef USE_FULL_ATM_RESOLVER + if ((flags & T2A_SVC) && length >= sizeof(struct sockaddr_atmsvc)) { + result = try_nsap(text,(struct sockaddr_atmsvc *) addr,flags); + if (result != TRY_OTHER) return result; +@@ -245,5 +248,6 @@ int text2atm(const char *text,struct soc + if (result == TRY_OTHER && !(flags & T2A_LOCAL)) + result = ans_byname(text,(struct sockaddr_atmsvc *) addr,length,flags); + if (result != TRY_OTHER) return result; ++#endif + return -1; + } --- ppp-2.4.5.orig/debian/patches/always_setsid +++ ppp-2.4.5/debian/patches/always_setsid @@ -0,0 +1,36 @@ +always create a new process group + +pppd sends signals to the whole process group, so it must always create +a new one or it may kill the parent process and its siblings. +Currently setsid() is not called when the updetach option is used. +We want to make the detached and non-detached code paths as similar as +possible. + +http://ppp.samba.org/cgi-bin/ppp-bugs/incoming?id=1411 +http://ppp.samba.org/cgi-bin/ppp-bugs/incoming?id=1589 + +--- a/pppd/main.c ++++ b/pppd/main.c +@@ -431,6 +431,13 @@ main(argc, argv) + } + + /* ++ * pppd sends signals to the whole process group, so it must always ++ * create a new one or it may kill the parent process and its siblings. ++ */ ++ setsid(); ++ chdir("/"); ++ ++ /* + * Initialize system-dependent stuff. + */ + sys_init(); +@@ -774,8 +781,6 @@ detach() + create_linkpidfile(pid); + exit(0); /* parent dies */ + } +- setsid(); +- chdir("/"); + dup2(fd_devnull, 0); + dup2(fd_devnull, 1); + dup2(fd_devnull, 2); --- ppp-2.4.5.orig/debian/patches/use_system_logwtmp +++ ppp-2.4.5/debian/patches/use_system_logwtmp @@ -0,0 +1,18 @@ +--- a/pppd/sys-linux.c ++++ b/pppd/sys-linux.c +@@ -2153,6 +2153,7 @@ int ppp_available(void) + * Update the wtmp file with the appropriate user name and tty device. + */ + ++#ifndef linux + void logwtmp (const char *line, const char *name, const char *host) + { + struct utmp ut, *utp; +@@ -2221,6 +2222,7 @@ void logwtmp (const char *line, const ch + } + #endif + } ++#endif + + + /******************************************************************** --- ppp-2.4.5.orig/debian/patches/no_crypt_hack +++ ppp-2.4.5/debian/patches/no_crypt_hack @@ -0,0 +1,47 @@ +The udeb package does not have crypt(3). +This patch makes authentication always fail, since it is not needed anyway +for dialout. + +--- a/pppd/auth.c ++++ b/pppd/auth.c +@@ -1442,8 +1442,10 @@ check_passwd(unit, auser, userlen, apass + } + if (secret[0] != 0 && !login_secret) { + /* password given in pap-secrets - must match */ ++#ifndef NO_CRYPT_HACK + if ((cryptpap || strcmp(passwd, secret) != 0) + && strcmp(crypt(passwd, secret), secret) != 0) ++#endif + ret = UPAP_AUTHNAK; + } + } +--- a/pppd/Makefile.linux ++++ b/pppd/Makefile.linux +@@ -116,10 +116,14 @@ COMPILE_FLAGS += -DHAS_SHADOW + #LIBS += -lshadow $(LIBS) + endif + ++ifdef NO_CRYPT_HACK ++COMPILE_FLAGS += -DNO_CRYPT_HACK ++else + ifneq ($(wildcard /usr/include/crypt.h),) + COMPILE_FLAGS += -DHAVE_CRYPT_H=1 + LIBS += -lcrypt + endif ++endif + + ifdef NEEDDES + ifndef USE_CRYPT +--- a/pppd/session.c ++++ b/pppd/session.c +@@ -348,8 +348,10 @@ session_start(flags, user, passwd, ttyNa + /* + * If no passwd, don't let them login if we're authenticating. + */ ++#ifndef NO_CRYPT_HACK + if (pw->pw_passwd == NULL || strlen(pw->pw_passwd) < 2 + || strcmp(crypt(passwd, pw->pw_passwd), pw->pw_passwd) != 0) ++#endif + return SESSION_FAILED; + } + --- ppp-2.4.5.orig/debian/patches/close_dev_ppp +++ ppp-2.4.5/debian/patches/close_dev_ppp @@ -0,0 +1,35 @@ +be sure to close /dev/ppp when reconnecting + +From: Simon Peter +Subject: Bug#306261: pppd does not properly close /dev/ppp on persist + +When using the kernel PPPoE driver, pppd never +closes /dev/ppp when the link has come down. + +It opens superfluous fds to the device each time it re-opens the +connection, with the unclosed ones falsely reported always ready for +data by select(). + +This makes pppd eat up 100% CPU time after the first persist because of +the always instantly returning select() on the unclosed fds. + +The problem also occurs with the upstream version, but does not occur +when a pty/tty device is used for the ppp connection. + + +--- a/pppd/sys-linux.c ++++ b/pppd/sys-linux.c +@@ -453,6 +453,13 @@ int generic_establish_ppp (int fd) + if (new_style_driver) { + int flags; + ++ /* if a ppp_fd is already open, close it first */ ++ if(ppp_fd > 0) { ++ close(ppp_fd); ++ remove_fd(ppp_fd); ++ ppp_fd = -1; ++ } ++ + /* Open an instance of /dev/ppp and connect the channel to it */ + if (ioctl(fd, PPPIOCGCHAN, &chindex) == -1) { + error("Couldn't get channel number: %m"); --- ppp-2.4.5.orig/debian/patches/018_ip-up_option.diff +++ ppp-2.4.5/debian/patches/018_ip-up_option.diff @@ -0,0 +1,88 @@ +diff -ruNp ppp-2.4.4b1.orig/pppd/ipcp.c ppp-2.4.4b1/pppd/ipcp.c +--- ppp-2.4.4b1.orig/pppd/ipcp.c 2005-11-13 13:45:11.000000000 +0100 ++++ ppp-2.4.4b1/pppd/ipcp.c 2005-11-13 13:44:01.000000000 +0100 +@@ -1850,7 +1850,7 @@ ipcp_up(f) + */ + if (ipcp_script_state == s_down && ipcp_script_pid == 0) { + ipcp_script_state = s_up; +- ipcp_script(_PATH_IPUP, 0); ++ ipcp_script(path_ipup, 0); + } + } + +@@ -1900,7 +1900,7 @@ ipcp_down(f) + /* Execute the ip-down script */ + if (ipcp_script_state == s_up && ipcp_script_pid == 0) { + ipcp_script_state = s_down; +- ipcp_script(_PATH_IPDOWN, 0); ++ ipcp_script(path_ipdown, 0); + } + } + +@@ -1954,13 +1954,13 @@ ipcp_script_done(arg) + case s_up: + if (ipcp_fsm[0].state != OPENED) { + ipcp_script_state = s_down; +- ipcp_script(_PATH_IPDOWN, 0); ++ ipcp_script(path_ipdown, 0); + } + break; + case s_down: + if (ipcp_fsm[0].state == OPENED) { + ipcp_script_state = s_up; +- ipcp_script(_PATH_IPUP, 0); ++ ipcp_script(path_ipup, 0); + } + break; + } +diff -ruNp ppp-2.4.4b1.orig/pppd/main.c ppp-2.4.4b1/pppd/main.c +--- ppp-2.4.4b1.orig/pppd/main.c 2005-11-13 13:45:11.000000000 +0100 ++++ ppp-2.4.4b1/pppd/main.c 2005-11-13 13:44:01.000000000 +0100 +@@ -314,6 +314,9 @@ main(argc, argv) + struct protent *protp; + char numbuf[16]; + ++ strlcpy(path_ipup, _PATH_IPUP, sizeof(path_ipup)); ++ strlcpy(path_ipdown, _PATH_IPDOWN, sizeof(path_ipdown)); ++ + link_stats_valid = 0; + new_phase(PHASE_INITIALIZE); + +diff -ruNp ppp-2.4.4b1.orig/pppd/options.c ppp-2.4.4b1/pppd/options.c +--- ppp-2.4.4b1.orig/pppd/options.c 2005-11-13 13:45:11.000000000 +0100 ++++ ppp-2.4.4b1/pppd/options.c 2005-11-13 13:44:01.000000000 +0100 +@@ -113,6 +113,8 @@ char linkname[MAXPATHLEN]; /* logical na + bool tune_kernel; /* may alter kernel settings */ + int connect_delay = 1000; /* wait this many ms after connect script */ + int req_unit = -1; /* requested interface unit */ ++char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */ ++char path_ipdown[MAXPATHLEN];/* pathname of ip-down script */ + bool multilink = 0; /* Enable multilink operation */ + char *bundle_name = NULL; /* bundle name for multilink */ + bool dump_options; /* print out option values */ +@@ -281,6 +283,13 @@ option_t general_options[] = { + "Number of seconds to wait for child processes at exit", + OPT_PRIO }, + ++ { "ip-up-script", o_string, path_ipup, ++ "Set pathname of ip-up script", ++ OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN }, ++ { "ip-down-script", o_string, path_ipdown, ++ "Set pathname of ip-down script", ++ OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN }, ++ + #ifdef HAVE_MULTILINK + { "multilink", o_bool, &multilink, + "Enable multilink operation", OPT_PRIO | 1 }, +diff -ruNp ppp-2.4.4b1.orig/pppd/pppd.h ppp-2.4.4b1/pppd/pppd.h +--- ppp-2.4.4b1.orig/pppd/pppd.h 2005-11-13 13:45:11.000000000 +0100 ++++ ppp-2.4.4b1/pppd/pppd.h 2005-11-13 13:44:01.000000000 +0100 +@@ -312,6 +312,8 @@ extern bool tune_kernel; /* May alter ke + extern int connect_delay; /* Time to delay after connect script */ + extern int max_data_rate; /* max bytes/sec through charshunt */ + extern int req_unit; /* interface unit number to use */ ++extern char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */ ++extern char path_ipdown[MAXPATHLEN]; /* pathname of ip-down script */ + extern bool multilink; /* enable multilink operation */ + extern bool noendpoint; /* don't send or accept endpt. discrim. */ + extern char *bundle_name; /* bundle name for multilink */ --- ppp-2.4.5.orig/debian/patches/fix_null_pppdb +++ ppp-2.4.5/debian/patches/fix_null_pppdb @@ -0,0 +1,26 @@ +fix segfault in update_db_entry() + +From: Martin.Lottermoser@t-online.de +Subject: Bug#308136: Debian bug 308136 (SEGV in pppd) + +The function update_db_entry() may only be called if pppdb is not NULL; +unfortunately in this situation it is. Other calls to update_db_entry() +are protected against this, see, e.g., the end of script_setenv(). + +--- a/pppd/main.c ++++ b/pppd/main.c +@@ -1961,9 +1961,11 @@ script_setenv(var, value, iskey) + free(p-1); + script_env[i] = newstring; + #ifdef USE_TDB +- if (iskey && pppdb != NULL) +- add_db_key(newstring); +- update_db_entry(); ++ if (pppdb != NULL) { ++ if (iskey) ++ add_db_key(newstring); ++ update_db_entry(); ++ } + #endif + return; + } --- ppp-2.4.5.orig/debian/patches/adaptive_echos +++ ppp-2.4.5/debian/patches/adaptive_echos @@ -0,0 +1,56 @@ +--- a/pppd/lcp.c ++++ b/pppd/lcp.c +@@ -73,6 +73,7 @@ static void lcp_delayed_up __P((void *)) + */ + int lcp_echo_interval = 0; /* Interval between LCP echo-requests */ + int lcp_echo_fails = 0; /* Tolerance to unanswered echo-requests */ ++bool lcp_echo_adaptive = 0; /* request echo only if the link was idle */ + bool lax_recv = 0; /* accept control chars in asyncmap */ + bool noendpoint = 0; /* don't send/accept endpoint discriminator */ + +@@ -151,6 +152,8 @@ static option_t lcp_option_list[] = { + OPT_PRIO }, + { "lcp-echo-interval", o_int, &lcp_echo_interval, + "Set time in seconds between LCP echo requests", OPT_PRIO }, ++ { "lcp-echo-adaptive", o_bool, &lcp_echo_adaptive, ++ "Suppress LCP echo requests if traffic was received", 1 }, + { "lcp-restart", o_int, &lcp_fsm[0].timeouttime, + "Set time in seconds between LCP retransmissions", OPT_PRIO }, + { "lcp-max-terminate", o_int, &lcp_fsm[0].maxtermtransmits, +@@ -2331,6 +2334,22 @@ LcpSendEchoRequest (f) + } + } + ++ /* ++ * If adaptive echos have been enabled, only send the echo request if ++ * no traffic was received since the last one. ++ */ ++ if (lcp_echo_adaptive) { ++ static unsigned int last_pkts_in = 0; ++ ++ update_link_stats(f->unit); ++ link_stats_valid = 0; ++ ++ if (link_stats.pkts_in != last_pkts_in) { ++ last_pkts_in = link_stats.pkts_in; ++ return; ++ } ++ } ++ + /* + * Make and send the echo request frame. + */ +--- a/pppd/pppd.8 ++++ b/pppd/pppd.8 +@@ -557,6 +557,11 @@ to 1) if the \fIproxyarp\fR option is us + dynamic IP address option (i.e. set /proc/sys/net/ipv4/ip_dynaddr to + 1) in demand mode if the local address changes. + .TP ++.B lcp\-echo\-adaptive ++If this option is used with the \fIlcp\-echo\-failure\fR option then ++pppd will send LCP echo\-request frames only if no traffic was received ++from the peer since the last echo\-request was sent. ++.TP + .B lcp\-echo\-failure \fIn + If this option is given, pppd will presume the peer to be dead + if \fIn\fR LCP echo\-requests are sent without receiving a valid LCP --- ppp-2.4.5.orig/debian/patches/setenv_call_file +++ ppp-2.4.5/debian/patches/setenv_call_file @@ -0,0 +1,24 @@ +export $CALL_FILE to the link scripts + +--- a/pppd/options.c ++++ b/pppd/options.c +@@ -1447,6 +1447,7 @@ callfile(argv) + if ((fname = (char *) malloc(l)) == NULL) + novm("call file name"); + slprintf(fname, l, "%s%s", _PATH_PEERFILES, arg); ++ script_setenv("CALL_FILE", arg, 0); + + ok = options_from_file(fname, 1, 1, 1); + +--- a/pppd/pppd.8 ++++ b/pppd/pppd.8 +@@ -1609,6 +1609,9 @@ the connection. + .B LINKNAME + The logical name of the link, set with the \fIlinkname\fR option. + .TP ++.B CALL_FILE ++The value of the \fIcall\fR option. ++.TP + .B DNS1 + If the peer supplies DNS server addresses, this variable is set to the + first DNS server address supplied. --- ppp-2.4.5.orig/debian/patches/makefiles_cleanup +++ ppp-2.4.5/debian/patches/makefiles_cleanup @@ -0,0 +1,466 @@ +Makefiles cleanup + +Factor-out $CFLAGS and $LDFLAGS to allow distributions to easily override +them. Properly use $LDFLAGS when linking and $CFLAGS when compiling. + +--- a/chat/Makefile.linux ++++ b/chat/Makefile.linux +@@ -8,24 +8,23 @@ CDEF1= -DTERMIOS # Use the termios str + CDEF2= -DSIGTYPE=void # Standard definition + CDEF3= -UNO_SLEEP # Use the usleep function + CDEF4= -DFNDELAY=O_NDELAY # Old name value +-CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) ++COPTS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) + +-COPTS= -O2 -g -pipe +-CFLAGS= $(COPTS) $(CDEFS) ++CFLAGS= -O2 -g + + INSTALL= install + + all: chat + + chat: chat.o +- $(CC) -o chat chat.o ++ $(CC) $(LDFLAGS) -o chat chat.o + + chat.o: chat.c +- $(CC) -c $(CFLAGS) -o chat.o chat.c ++ $(CC) -c $(COPTS) $(CFLAGS) -o chat.o chat.c + + install: chat + mkdir -p $(BINDIR) $(MANDIR) +- $(INSTALL) -s -c chat $(BINDIR) ++ $(INSTALL) -c chat $(BINDIR) + $(INSTALL) -c -m 644 chat.8 $(MANDIR) + + clean: +--- a/pppd/plugins/Makefile.linux ++++ b/pppd/plugins/Makefile.linux +@@ -1,7 +1,7 @@ + #CC = gcc +-COPTS = -O2 -g +-CFLAGS = $(COPTS) -I.. -I../../include -fPIC +-LDFLAGS = -shared ++CFLAGS = -O2 -g ++COPTS = -I.. -I../../include -fPIC ++LDFLAGS = + INSTALL = install + + DESTDIR = $(INSTROOT)@DESTDIR@ +@@ -22,8 +22,11 @@ endif + all: $(PLUGINS) + for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done + ++%.o: %.c ++ $(CC) $(COPTS) $(CFLAGS) -c $< ++ + %.so: %.c +- $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ ++ $(CC) -o $@ $(LDFLAGS) -shared $(COPTS) $(CFLAGS) $^ + + VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h) + +--- a/pppd/plugins/pppoatm/Makefile.linux ++++ b/pppd/plugins/pppoatm/Makefile.linux +@@ -1,7 +1,7 @@ + #CC = gcc +-COPTS = -O2 -g +-CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC +-LDFLAGS = -shared ++CFLAGS = -O2 -g ++COPTS = -I../.. -I../../../include -fPIC ++LDFLAGS = + INSTALL = install + + #*********************************************************************** +@@ -24,7 +24,7 @@ PLUGIN_OBJS := pppoatm.o + ifdef HAVE_LIBATM + LIBS := -latm + else +-CFLAGS += -I. ++COPTS += -I. + PLUGIN_OBJS += text2qos.o text2atm.o misc.o ans.o + LIBS := -lresolv + endif +@@ -33,7 +33,7 @@ endif + all: $(PLUGIN) + + $(PLUGIN): $(PLUGIN_OBJS) +- $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ -shared $^ $(LIBS) + + install: all + $(INSTALL) -d -m 755 $(LIBDIR) +@@ -43,4 +43,4 @@ clean: + rm -f *.o *.so + + %.o: %.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(COPTS) $(CFLAGS) -c -o $@ $< +--- a/pppd/plugins/pppol2tp/Makefile.linux ++++ b/pppd/plugins/pppol2tp/Makefile.linux +@@ -1,7 +1,7 @@ + #CC = gcc +-COPTS = -O2 -g +-CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC +-LDFLAGS = -shared ++CFLAGS = -O2 -g ++COPTS = -I. -I../.. -I../../../include -fPIC ++LDFLAGS = + INSTALL = install + + #*********************************************************************** +@@ -16,7 +16,7 @@ PLUGINS := pppol2tp.so openl2tp.so + all: $(PLUGINS) + + %.so: %.o +- $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ -shared $^ $(LIBS) + + install: all + $(INSTALL) -d -m 755 $(LIBDIR) +@@ -26,4 +26,4 @@ clean: + rm -f *.o *.so + + %.o: %.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(COPTS) $(CFLAGS) -c -o $@ $< +--- a/pppd/plugins/radius/Makefile.linux ++++ b/pppd/plugins/radius/Makefile.linux +@@ -12,7 +12,8 @@ VERSION = $(shell awk -F '"' '/VERSION/ + INSTALL = install + + PLUGIN=radius.so radattr.so radrealms.so +-CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON ++CFLAGS=-g -O2 ++COPTS = -I. -I../.. -I../../../include -fPIC -DRC_LOG_FACILITY=LOG_DAEMON + + # Uncomment the next line to include support for Microsoft's + # MS-CHAP authentication protocol. +@@ -23,33 +24,36 @@ MPPE=y + MAXOCTETS=y + + ifdef CHAPMS +-CFLAGS += -DCHAPMS=1 ++COPTS += -DCHAPMS=1 + ifdef MPPE +-CFLAGS += -DMPPE=1 ++COPTS += -DMPPE=1 + endif + endif + ifdef MAXOCTETS +-CFLAGS += -DMAXOCTETS=1 ++COPTS += -DMAXOCTETS=1 + endif + + all: $(PLUGIN) + + install: all + $(INSTALL) -d -m 755 $(LIBDIR) +- $(INSTALL) -s -c -m 755 radius.so $(LIBDIR) +- $(INSTALL) -s -c -m 755 radattr.so $(LIBDIR) +- $(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR) ++ $(INSTALL) -c -m 755 radius.so $(LIBDIR) ++ $(INSTALL) -c -m 755 radattr.so $(LIBDIR) ++ $(INSTALL) -c -m 755 radrealms.so $(LIBDIR) + $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR) + $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR) + ++%.o: %.c ++ $(CC) $(COPTS) $(CFLAGS) -c $< ++ + radius.so: radius.o libradiusclient.a +- $(CC) -o radius.so -shared radius.o libradiusclient.a ++ $(CC) $(LDFLAGS) -o radius.so -shared radius.o libradiusclient.a + + radattr.so: radattr.o +- $(CC) -o radattr.so -shared radattr.o ++ $(CC) $(LDFLAGS) -o radattr.so -shared radattr.o + + radrealms.so: radrealms.o +- $(CC) -o radrealms.so -shared radrealms.o ++ $(CC) $(LDFLAGS) -o radrealms.so -shared radrealms.o + + CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \ + clientid.o sendserver.o lock.o util.o md5.o +--- a/pppd/plugins/rp-pppoe/Makefile.linux ++++ b/pppd/plugins/rp-pppoe/Makefile.linux +@@ -25,40 +25,40 @@ INSTALL = install + # Version is set ONLY IN THE MAKEFILE! Don't delete this! + RP_VERSION=3.8p + +-COPTS=-O2 -g +-CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"' ++CFLAGS=-O2 -g ++COPTS=-I../../../include '-DRP_VERSION="$(RP_VERSION)"' + all: rp-pppoe.so pppoe-discovery + + pppoe-discovery: pppoe-discovery.o debug.o + $(CC) -o pppoe-discovery pppoe-discovery.o debug.o + + pppoe-discovery.o: pppoe-discovery.c +- $(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c ++ $(CC) $(COPTS) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c + + debug.o: debug.c +- $(CC) $(CFLAGS) -c -o debug.o debug.c ++ $(CC) $(COPTS) $(CFLAGS) -c -o debug.o debug.c + + rp-pppoe.so: plugin.o discovery.o if.o common.o +- $(CC) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o ++ $(CC) $(LDFLAGS) -o rp-pppoe.so -shared $^ + + install: all + $(INSTALL) -d -m 755 $(LIBDIR) +- $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR) ++ $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR) + $(INSTALL) -d -m 755 $(BINDIR) +- $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR) ++ $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR) + + clean: + rm -f *.o *.so pppoe-discovery + + plugin.o: plugin.c +- $(CC) $(CFLAGS) -I../../.. -c -o plugin.o -fPIC plugin.c ++ $(CC) $(COPTS) $(CFLAGS) -I../../.. -c -o plugin.o -fPIC plugin.c + + discovery.o: discovery.c +- $(CC) $(CFLAGS) -I../../.. -c -o discovery.o -fPIC discovery.c ++ $(CC) $(COPTS) $(CFLAGS) -I../../.. -c -o discovery.o -fPIC discovery.c + + if.o: if.c +- $(CC) $(CFLAGS) -I../../.. -c -o if.o -fPIC if.c ++ $(CC) $(COPTS) $(CFLAGS) -I../../.. -c -o if.o -fPIC if.c + + common.o: common.c +- $(CC) $(CFLAGS) -I../../.. -c -o common.o -fPIC common.c ++ $(CC) $(COPTS) $(CFLAGS) -I../../.. -c -o common.o -fPIC common.c + +--- a/pppstats/Makefile.linux ++++ b/pppstats/Makefile.linux +@@ -10,27 +10,25 @@ PPPSTATSRCS = pppstats.c + PPPSTATOBJS = pppstats.o + + #CC = gcc +-COPTS = -O +-COMPILE_FLAGS = -I../include ++CFLAGS = -O2 -g ++COPTS = -I../include + LIBS = + + INSTALL= install + +-CFLAGS = $(COPTS) $(COMPILE_FLAGS) +- + all: pppstats + + install: pppstats + -mkdir -p $(MANDIR) +- $(INSTALL) -s -c pppstats $(BINDIR) ++ $(INSTALL) -c pppstats $(BINDIR) + $(INSTALL) -c -m 444 pppstats.8 $(MANDIR) + + pppstats: $(PPPSTATSRCS) +- $(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS) ++ $(CC) $(LDFLAGS) $(COPTS) $(CFLAGS) -o pppstats pppstats.c $(LIBS) + + clean: + rm -f pppstats *~ #* core + + depend: +- cpp -M $(CFLAGS) $(PPPSTATSRCS) >.depend +-# makedepend $(CFLAGS) $(PPPSTATSRCS) ++ cpp -M $(COPTS) $(CFLAGS) $(PPPSTATSRCS) >.depend ++# makedepend $(COPTS) $(CFLAGS) $(PPPSTATSRCS) +--- a/pppdump/Makefile.linux ++++ b/pppdump/Makefile.linux +@@ -2,20 +2,24 @@ DESTDIR = $(INSTROOT)@DESTDIR@ + BINDIR = $(DESTDIR)/sbin + MANDIR = $(DESTDIR)/share/man/man8 + +-CFLAGS= -O -I../include/net ++CFLAGS=-O2 -g ++COPTS= -I../include/net + OBJS = pppdump.o bsd-comp.o deflate.o zlib.o + + INSTALL= install + + all: pppdump + ++%.o: %.c ++ $(CC) $(COPTS) $(CFLAGS) -c $< ++ + pppdump: $(OBJS) +- $(CC) -o pppdump $(OBJS) ++ $(CC) $(LDFLAGS) -o pppdump $(OBJS) + + clean: + rm -f pppdump $(OBJS) *~ + + install: + mkdir -p $(BINDIR) $(MANDIR) +- $(INSTALL) -s -c pppdump $(BINDIR) ++ $(INSTALL) -c pppdump $(BINDIR) + $(INSTALL) -c -m 444 pppdump.8 $(MANDIR) +--- a/pppd/Makefile.linux ++++ b/pppd/Makefile.linux +@@ -32,7 +32,7 @@ endif + + # CC = gcc + # +-COPTS = -O2 -pipe -Wall -g ++CFLAGS = -O2 -g + LIBS = + + # Uncomment the next 2 lines to include support for Microsoft's +@@ -79,27 +79,26 @@ INCLUDE_DIRS= -I../include + + COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP + +-CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"' +- + ifdef CHAPMS +-CFLAGS += -DCHAPMS=1 ++COMPILE_FLAGS += -DCHAPMS=1 + NEEDDES=y + PPPDOBJS += md4.o chap_ms.o + HEADERS += md4.h chap_ms.h + ifdef MSLANMAN +-CFLAGS += -DMSLANMAN=1 ++COMPILE_FLAGS += -DMSLANMAN=1 + endif + ifdef MPPE +-CFLAGS += -DMPPE=1 ++COMPILE_FLAGS += -DMPPE=1 + endif + endif + + # EAP SRP-SHA1 + ifdef USE_SRP +-CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include ++COMPILE_FLAGS += -DUSE_SRP -DOPENSSL ++INCLUDE_DIRS += -I/usr/local/ssl/include + LIBS += -lsrp -L/usr/local/ssl/lib -lcrypto + TARGETS += srp-entry +-EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry ++EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry + MANPAGES += srp-entry.8 + EXTRACLEAN += srp-entry.o + NEEDDES=y +@@ -113,12 +112,12 @@ PPPDOBJS += sha1.o + endif + + ifdef HAS_SHADOW +-CFLAGS += -DHAS_SHADOW ++COMPILE_FLAGS += -DHAS_SHADOW + #LIBS += -lshadow $(LIBS) + endif + + ifneq ($(wildcard /usr/include/crypt.h),) +-CFLAGS += -DHAVE_CRYPT_H=1 ++COMPILE_FLAGS += -DHAVE_CRYPT_H=1 + LIBS += -lcrypt + endif + +@@ -126,7 +125,7 @@ ifdef NEEDDES + ifndef USE_CRYPT + LIBS += -ldes $(LIBS) + else +-CFLAGS += -DUSE_CRYPT=1 ++COMPILE_FLAGS += -DUSE_CRYPT=1 + endif + PPPDOBJS += pppcrypt.o + HEADERS += pppcrypt.h +@@ -134,7 +133,7 @@ endif + + # For "Pluggable Authentication Modules", see ftp.redhat.com:/pub/pam/. + ifdef USE_PAM +-CFLAGS += -DUSE_PAM ++COMPILE_FLAGS += -DUSE_PAM + LIBS += -lpam -ldl + endif + +@@ -143,14 +142,14 @@ ifdef HAVE_MULTILINK + # Multilink implies the use of TDB + USE_TDB=y + +- CFLAGS += -DHAVE_MULTILINK ++ COMPILE_FLAGS += -DHAVE_MULTILINK + PPPDSRCS += multilink.c + PPPDOBJS += multilink.o + endif + + # TDB + ifdef USE_TDB +- CFLAGS += -DUSE_TDB=1 ++ COMPILE_FLAGS += -DUSE_TDB=1 + PPPDSRCS += tdb.c spinlock.c + PPPDOBJS += tdb.o spinlock.o + HEADERS += tdb.h spinlock.h +@@ -159,11 +158,11 @@ endif + # Lock library binary for Linux is included in 'linux' subdirectory. + ifdef LOCKLIB + LIBS += -llock +-CFLAGS += -DLOCKLIB=1 ++COMPILE_FLAGS += -DLOCKLIB=1 + endif + + ifdef PLUGIN +-CFLAGS += -DPLUGIN ++COMPILE_FLAGS += -DPLUGIN + LDFLAGS += -Wl,-E + LIBS += -ldl + endif +@@ -171,7 +170,7 @@ endif + ifdef FILTER + ifneq ($(wildcard /usr/include/pcap-bpf.h),) + LIBS += -lpcap +-CFLAGS += -DPPP_FILTER ++COMPILE_FLAGS += -DPPP_FILTER + endif + endif + +@@ -179,20 +178,22 @@ ifdef HAVE_INET6 + PPPDSRCS += ipv6cp.c eui64.c + HEADERS += ipv6cp.h eui64.h + PPPDOBJS += ipv6cp.o eui64.o +- CFLAGS += -DINET6=1 ++ COMPILE_FLAGS += -DINET6=1 + endif + + ifdef CBCP + PPPDSRCS += cbcp.c + PPPDOBJS += cbcp.o +- CFLAGS += -DCBCP_SUPPORT ++ COMPILE_FLAGS += -DCBCP_SUPPORT + HEADERS += cbcp.h + endif + + ifdef MAXOCTETS +- CFLAGS += -DMAXOCTETS ++ COMPILE_FLAGS += -DMAXOCTETS + endif + ++COPTS = $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"' ++ + INSTALL= install + + all: $(TARGETS) +@@ -200,11 +201,14 @@ all: $(TARGETS) + install: pppd + mkdir -p $(BINDIR) $(MANDIR) + $(EXTRAINSTALL) +- $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd ++ $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd + if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \ + chmod o-rx,u+s $(BINDIR)/pppd; fi + $(INSTALL) -c -m 444 pppd.8 $(MANDIR) + ++%.o: %.c ++ $(CC) $(COPTS) $(CFLAGS) -c $< ++ + pppd: $(PPPDOBJS) + $(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS) + --- ppp-2.4.5.orig/debian/patches/ppp-2.3.11-oedod.dif +++ ppp-2.4.5/debian/patches/ppp-2.3.11-oedod.dif @@ -0,0 +1,172 @@ +--- a/pppd/demand.c ++++ b/pppd/demand.c +@@ -36,6 +36,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include +@@ -43,6 +45,8 @@ + #include + #include + #include ++#include ++#include + #ifdef PPP_FILTER + #include + #endif +@@ -221,6 +225,14 @@ loop_chars(p, n) + int c, rv; + + rv = 0; ++ ++/* check for synchronous connection... */ ++ ++ if ( (p[0] == 0xFF) && (p[1] == 0x03) ) { ++ rv = loop_frame(p,n); ++ return rv; ++ } ++ + for (; n > 0; --n) { + c = *p++; + if (c == PPP_FLAG) { +@@ -299,17 +311,102 @@ loop_frame(frame, len) + * loopback, now that the real serial link is up. + */ + void +-demand_rexmit(proto) ++demand_rexmit(proto, newip) + int proto; ++ u_int32_t newip; + { + struct packet *pkt, *prev, *nextpkt; ++ unsigned short checksum; ++ unsigned short pkt_checksum = 0; ++ unsigned iphdr; ++ struct timeval tv; ++ char cv = 0; ++ char ipstr[16]; + + prev = NULL; + pkt = pend_q; + pend_q = NULL; ++ tv.tv_sec = 1; ++ tv.tv_usec = 0; ++ select(0,NULL,NULL,NULL,&tv); /* Sleep for 1 Seconds */ + for (; pkt != NULL; pkt = nextpkt) { + nextpkt = pkt->next; + if (PPP_PROTOCOL(pkt->data) == proto) { ++ if ( (proto == PPP_IP) && newip ) { ++ /* Get old checksum */ ++ ++ iphdr = (pkt->data[4] & 15) << 2; ++ checksum = *((unsigned short *) (pkt->data+14)); ++ if (checksum == 0xFFFF) { ++ checksum = 0; ++ } ++ ++ ++ if (pkt->data[13] == 17) { ++ pkt_checksum = *((unsigned short *) (pkt->data+10+iphdr)); ++ if (pkt_checksum) { ++ cv = 1; ++ if (pkt_checksum == 0xFFFF) { ++ pkt_checksum = 0; ++ } ++ } ++ else { ++ cv = 0; ++ } ++ } ++ ++ if (pkt->data[13] == 6) { ++ pkt_checksum = *((unsigned short *) (pkt->data+20+iphdr)); ++ cv = 1; ++ if (pkt_checksum == 0xFFFF) { ++ pkt_checksum = 0; ++ } ++ } ++ ++ /* Delete old Source-IP-Address */ ++ checksum -= *((unsigned short *) (pkt->data+16)) ^ 0xFFFF; ++ checksum -= *((unsigned short *) (pkt->data+18)) ^ 0xFFFF; ++ ++ pkt_checksum -= *((unsigned short *) (pkt->data+16)) ^ 0xFFFF; ++ pkt_checksum -= *((unsigned short *) (pkt->data+18)) ^ 0xFFFF; ++ ++ /* Change Source-IP-Address */ ++ * ((u_int32_t *) (pkt->data + 16)) = newip; ++ ++ /* Add new Source-IP-Address */ ++ checksum += *((unsigned short *) (pkt->data+16)) ^ 0xFFFF; ++ checksum += *((unsigned short *) (pkt->data+18)) ^ 0xFFFF; ++ ++ pkt_checksum += *((unsigned short *) (pkt->data+16)) ^ 0xFFFF; ++ pkt_checksum += *((unsigned short *) (pkt->data+18)) ^ 0xFFFF; ++ ++ /* Write new checksum */ ++ if (!checksum) { ++ checksum = 0xFFFF; ++ } ++ *((unsigned short *) (pkt->data+14)) = checksum; ++ if (pkt->data[13] == 6) { ++ *((unsigned short *) (pkt->data+20+iphdr)) = pkt_checksum; ++ } ++ if (cv && (pkt->data[13] == 17) ) { ++ *((unsigned short *) (pkt->data+10+iphdr)) = pkt_checksum; ++ } ++ ++ /* Log Packet */ ++ strcpy(ipstr,inet_ntoa(*( (struct in_addr *) (pkt->data+16)))); ++ if (pkt->data[13] == 1) { ++ syslog(LOG_INFO,"Open ICMP %s -> %s\n", ++ ipstr, ++ inet_ntoa(*( (struct in_addr *) (pkt->data+20)))); ++ } else { ++ syslog(LOG_INFO,"Open %s %s:%d -> %s:%d\n", ++ pkt->data[13] == 6 ? "TCP" : "UDP", ++ ipstr, ++ ntohs(*( (short *) (pkt->data+iphdr+4))), ++ inet_ntoa(*( (struct in_addr *) (pkt->data+20))), ++ ntohs(*( (short *) (pkt->data+iphdr+6)))); ++ } ++ } + output(0, pkt->data, pkt->length); + free(pkt); + } else { +--- a/pppd/ipcp.c ++++ b/pppd/ipcp.c +@@ -1875,7 +1875,7 @@ ipcp_up(f) + proxy_arp_set[f->unit] = 1; + + } +- demand_rexmit(PPP_IP); ++ demand_rexmit(PPP_IP,go->ouraddr); + sifnpmode(f->unit, PPP_IP, NPMODE_PASS); + + } else { +--- a/pppd/ipv6cp.c ++++ b/pppd/ipv6cp.c +@@ -1232,7 +1232,7 @@ ipv6cp_up(f) + } + + } +- demand_rexmit(PPP_IPV6); ++ demand_rexmit(PPP_IPV6,0); + sifnpmode(f->unit, PPP_IPV6, NPMODE_PASS); + + } else { +--- a/pppd/pppd.h ++++ b/pppd/pppd.h +@@ -564,7 +564,7 @@ void demand_conf __P((void)); /* config + void demand_block __P((void)); /* set all NPs to queue up packets */ + void demand_unblock __P((void)); /* set all NPs to pass packets */ + void demand_discard __P((void)); /* set all NPs to discard packets */ +-void demand_rexmit __P((int)); /* retransmit saved frames for an NP */ ++void demand_rexmit __P((int, u_int32_t)); /* retransmit saved frames for an NP*/ + int loop_chars __P((unsigned char *, int)); /* process chars from loopback */ + int loop_frame __P((unsigned char *, int)); /* should we bring link up? */ + --- ppp-2.4.5.orig/debian/patches/readable_connerrs +++ ppp-2.4.5/debian/patches/readable_connerrs @@ -0,0 +1,15 @@ +make _PATH_CONNERRS world readable + +There is nothing security-sensitive there. + +--- a/pppd/main.c ++++ b/pppd/main.c +@@ -1637,7 +1637,7 @@ device_script(program, in, out, dont_wai + if (log_to_fd >= 0) + errfd = log_to_fd; + else +- errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0600); ++ errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0644); + + ++conn_running; + pid = safe_fork(in, out, errfd); --- ppp-2.4.5.orig/debian/patches/pppoatm_fix_mtu +++ ppp-2.4.5/debian/patches/pppoatm_fix_mtu @@ -0,0 +1,42 @@ +fix handling of the mtu option in the pppoatm plugin + +While debugging the PPPoATM issues of a Debian user, I determined that +when the error() function is called by a send_config function like +send_config_pppoa of the pppoatm.c plugin then lcp_lowerup() exits +earlier and does not raise the lower layer, and pppd just hangs without +sending any LCP request. +I do not understand who is wrong and should bail out, but I'm attaching +the patch used by Red Hat to work around this bug (I see that the PPPoE +plugin alrady uses warn() for this case). + +diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c +--- ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c 2005-05-04 02:00:28.000000000 +0200 ++++ ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c 2005-05-04 01:59:11.000000000 +0200 +@@ -183,8 +183,11 @@ static void send_config_pppoa(int mtu, + int sock; + struct ifreq ifr; + +- if (mtu > pppoatm_max_mtu) +- error("Couldn't increase MTU to %d", mtu); ++ if (pppoatm_max_mtu && mtu > pppoatm_max_mtu) { ++ warn("Couldn't increase MTU to %d. Using %d", ++ mtu, pppoatm_max_mtu); ++ mtu = pppoatm_max_mtu; ++ } + + sock = socket(AF_INET, SOCK_DGRAM, 0); + if (sock < 0) +@@ -202,8 +205,11 @@ static void recv_config_pppoa(int mru, + int pcomp, + int accomp) + { +- if (mru > pppoatm_max_mru) +- error("Couldn't increase MRU to %d", mru); ++ if (pppoatm_max_mru && mru > pppoatm_max_mru) { ++ warn("Couldn't increase MRU to %d. Using %d", ++ mru, pppoatm_max_mru); ++ mru = pppoatm_max_mru; ++ } + } + + void plugin_init(void) --- ppp-2.4.5.orig/debian/patches/ipv6-accept-remote +++ ppp-2.4.5/debian/patches/ipv6-accept-remote @@ -0,0 +1,54 @@ +--- a/pppd/ipv6cp.c ++++ b/pppd/ipv6cp.c +@@ -234,6 +234,8 @@ static option_t ipv6cp_option_list[] = { + + { "ipv6cp-accept-local", o_bool, &ipv6cp_allowoptions[0].accept_local, + "Accept peer's interface identifier for us", 1 }, ++ { "ipv6cp-accept-remote", o_bool, &ipv6cp_allowoptions[0].accept_remote, ++ "Accept peer's interface identifier for itself", 1 }, + + { "ipv6cp-use-ipaddr", o_bool, &ipv6cp_allowoptions[0].use_ip, + "Use (default) IPv4 address as interface identifier", 1 }, +@@ -426,6 +428,7 @@ ipv6cp_init(unit) + memset(ao, 0, sizeof(*ao)); + + wo->accept_local = 1; ++ wo->accept_remote = 1; + wo->neg_ifaceid = 1; + ao->neg_ifaceid = 1; + +@@ -951,7 +954,7 @@ ipv6cp_reqci(f, inp, len, reject_if_disa + orc = CONFREJ; /* Reject CI */ + break; + } +- if (!eui64_iszero(wo->hisid) && ++ if (!eui64_iszero(wo->hisid) && !wo->accept_remote && + !eui64_equals(ifaceid, wo->hisid) && + eui64_iszero(go->hisid)) { + +--- a/pppd/ipv6cp.h ++++ b/pppd/ipv6cp.h +@@ -150,7 +150,8 @@ + typedef struct ipv6cp_options { + int neg_ifaceid; /* Negotiate interface identifier? */ + int req_ifaceid; /* Ask peer to send interface identifier? */ +- int accept_local; /* accept peer's value for iface id? */ ++ int accept_local; /* accept peer's value for our iface id? */ ++ int accept_remote; /* accept peer's value for his iface id? */ + int opt_local; /* ourtoken set by option */ + int opt_remote; /* histoken set by option */ + int use_ip; /* use IP as interface identifier */ +--- a/pppd/pppd.8 ++++ b/pppd/pppd.8 +@@ -462,6 +462,11 @@ With this option, pppd will accept the p + interface identifier, even if the local IPv6 interface identifier + was specified in an option. + .TP ++.B ipv6cp\-accept\-remote ++With this option, pppd will accept the peer's idea of its (remote) ++IPv6 interface identifier, even if the remote IPv6 interface ++identifier was specified in an option. ++.TP + .B ipv6cp\-max\-configure \fIn + Set the maximum number of IPv6CP configure-request transmissions to + \fIn\fR (default 10). --- ppp-2.4.5.orig/debian/patches/dont-exit-pado-timeout +++ ppp-2.4.5/debian/patches/dont-exit-pado-timeout @@ -0,0 +1,48 @@ +http://ppp.samba.org/cgi-bin/ppp-bugs/incoming?id=2211 + +From: peter@endian.com +To: ppp-bugs@ppp.samba.org +Subject: using rp-pppoe pppd exits with EXIT_OK after receiving a timeout waiting for PADO due to no modem attached +Date: Mon, 17 Nov 2008 19:46:54 +0000 (GMT) + +Full_Name: Peter Warasin +Version: 2.4.4 +OS: linux 2.6.22.19 +Submission from: (NULL) (217.133.34.27) + + +Using rp-pppoe pppd exits with exitcode 0, whenever there is no modem connected +and pppd get's a timeout while waiting for a PADO. + +This happens because status is set to EXIT_OK in main.c at the beginning of the +procedures. Within start_link(), connect() will be called as one of the first +calls. +If that call fails (no pppoe discovery for example), jumps to "fail", which +returns without setting the status variable to failure. So at the end pppd exits +with EXIT_OK. + +I moved the status = EXIT_NEGOTIATION_FAILED which will be set later within +start_link, at the top of it. That seems to work out, patch is attached: + +--- + pppd/auth.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/pppd/auth.c ++++ b/pppd/auth.c +@@ -555,6 +555,7 @@ void start_link(unit) + { + char *msg; + ++ status = EXIT_NEGOTIATION_FAILED; + new_phase(PHASE_SERIALCONN); + + hungup = 0; +@@ -591,7 +592,6 @@ void start_link(unit) + notice("Starting negotiation on %s", ppp_devnam); + add_fd(fd_ppp); + +- status = EXIT_NEGOTIATION_FAILED; + new_phase(PHASE_ESTABLISH); + + lcp_lowerup(0); --- ppp-2.4.5.orig/debian/patches/ppp-2.4.2-stripMSdomain +++ ppp-2.4.5/debian/patches/ppp-2.4.2-stripMSdomain @@ -0,0 +1,35 @@ +diff -ruN ppp.orig/pppd/chap-new.c ppp/pppd/chap-new.c +--- ppp.orig/pppd/chap-new.c 2003-11-27 23:25:17.000000000 +0100 ++++ ppp/pppd/chap-new.c 2003-12-02 12:26:21.000000000 +0100 +@@ -57,6 +57,7 @@ + int chap_timeout_time = 3; + int chap_max_transmits = 10; + int chap_rechallenge_time = 0; ++int chapms_strip_domain = 0; + + /* + * Command-line options. +@@ -68,6 +69,8 @@ + "Set max #xmits for challenge", OPT_PRIO }, + { "chap-interval", o_int, &chap_rechallenge_time, + "Set interval for rechallenge", OPT_PRIO }, ++ { "chapms-strip-domain", o_bool, &chapms_strip_domain, ++ "Strip the domain prefix before the Username", 1 }, + { NULL } + }; + +@@ -338,6 +341,14 @@ + /* Null terminate and clean remote name. */ + slprintf(rname, sizeof(rname), "%.*v", len, name); + name = rname; ++ ++ /* strip the MS domain name */ ++ if (chapms_strip_domain && strrchr(rname, '\\')) { ++ char tmp[MAXNAMELEN+1]; ++ ++ strcpy(tmp, strrchr(rname, '\\') + 1); ++ strcpy(rname, tmp); ++ } + } + + if (chap_verify_hook) --- ppp-2.4.5.orig/debian/patches/chat_man +++ ppp-2.4.5/debian/patches/chat_man @@ -0,0 +1,23 @@ +chat(8): document the TIMEOUT directive + +--- ppp-2.4.4.orig/chat/chat.8 2006-12-16 12:56:11.000000000 +0100 ++++ ppp-2.4.4/chat/chat.8 2006-12-16 13:49:44.000000000 +0100 +@@ -35,7 +35,8 @@ + is not received within the time limit then the reply string is not + sent. An alternate reply may be sent or the script will fail if there + is no alternate reply string. A failed script will cause the +-\fIchat\fR program to terminate with a non-zero error code. ++\fIchat\fR program to terminate with a non-zero error code. You can ++also use the TIMEOUT string in order to specify the timeout. + .TP + .B \-r \fI + Set the file for output of the report strings. If you use the keyword +@@ -348,7 +349,7 @@ + .LP + .SH TIMEOUT + The initial timeout value is 45 seconds. This may be changed using the \fB\-t\fR +-parameter. ++parameter. You can also specify "TIMEOUT 0". + .LP + To change the timeout value for the next expect string, the following + example may be used: --- ppp-2.4.5.orig/debian/patches/update_if_pppol2tp +++ ppp-2.4.5/debian/patches/update_if_pppol2tp @@ -0,0 +1,53 @@ +diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h +index 4113d6a..7ee86b2 100644 +--- a/include/linux/if_pppol2tp.h ++++ b/include/linux/if_pppol2tp.h +@@ -2,7 +2,7 @@ + * Linux PPP over L2TP (PPPoL2TP) Socket Implementation (RFC 2661) + * + * This file supplies definitions required by the PPP over L2TP driver +- * (pppol2tp.c). All version information wrt this file is located in pppol2tp.c ++ * (l2tp_ppp.c). All version information wrt this file is located in l2tp_ppp.c + * + * License: + * This program is free software; you can redistribute it and/or +@@ -15,14 +15,14 @@ + #ifndef __LINUX_IF_PPPOL2TP_H + #define __LINUX_IF_PPPOL2TP_H + +-#include ++#include ++ + + /* Structure used to connect() the socket to a particular tunnel UDP + * socket. + */ +-struct pppol2tp_addr +-{ +- pid_t pid; /* pid that owns the fd. ++struct pppol2tp_addr { ++ __kernel_pid_t pid; /* pid that owns the fd. + * 0 => current */ + int fd; /* FD of UDP socket to use */ + +@@ -32,6 +32,20 @@ struct pppol2tp_addr + __u16 d_tunnel, d_session; /* For sending outgoing packets */ + }; + ++/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32 ++ * bits. So we need a different sockaddr structure. ++ */ ++struct pppol2tpv3_addr { ++ pid_t pid; /* pid that owns the fd. ++ * 0 => current */ ++ int fd; /* FD of UDP or IP socket to use */ ++ ++ struct sockaddr_in addr; /* IP address and port to send to */ ++ ++ __u32 s_tunnel, s_session; /* For matching incoming packets */ ++ __u32 d_tunnel, d_session; /* For sending outgoing packets */ ++}; ++ + /* Socket options: + * DEBUG - bitmask of debug message categories + * SENDSEQ - 0 => don't send packets with sequence numbers --- ppp-2.4.5.orig/debian/patches/fix_linkpidfile +++ ppp-2.4.5/debian/patches/fix_linkpidfile @@ -0,0 +1,39 @@ +make sure that the linkpidfile is always created + +Subject: Bug#284382: ppp: linkpidfile is not created upon detachment +From: + +Package: ppp +Version: 2.4.2+20040428-2 +Severity: wishlist + +When pppd detaches from the parent normally, that is, without nodetach +or updetach set, the linkpidfile is not created even when linkname is +set. + +This is because the create_linkpidfile call in detach() is only made +if the linkpidfile is filled in. However, linkpidfile is never filled +in until create_linkpidfile has been called. + +IMHO the call should be made uncondtionally in detach() since +create_linkpidfile does its own check on linkname anyway. + +Please note that the version of pppd in woody always wrote the +linkpidfile after detaching. It did so in main() however. That +call has now been removed which is why I'm seeing this problem. + +[...] + +-- +--- a/pppd/main.c ++++ b/pppd/main.c +@@ -777,8 +777,7 @@ detach() + /* update pid files if they have been written already */ + if (pidfilename[0]) + create_pidfile(pid); +- if (linkpidfile[0]) +- create_linkpidfile(pid); ++ create_linkpidfile(pid); + exit(0); /* parent dies */ + } + dup2(fd_devnull, 0); --- ppp-2.4.5.orig/debian/patches/resolv.conf_no_log +++ ppp-2.4.5/debian/patches/resolv.conf_no_log @@ -0,0 +1,11 @@ +--- a/pppd/ipcp.c ++++ b/pppd/ipcp.c +@@ -2063,7 +2063,7 @@ create_resolv(peerdns1, peerdns2) + + f = fopen(_PATH_RESOLV, "w"); + if (f == NULL) { +- error("Failed to create %s: %m", _PATH_RESOLV); ++ /* error("Failed to create %s: %m", _PATH_RESOLV); */ + return; + } + --- ppp-2.4.5.orig/debian/patches/pppdump_use_zlib +++ ppp-2.4.5/debian/patches/pppdump_use_zlib @@ -0,0 +1,48 @@ +support building pppdump with the system zlib + +--- a/pppdump/Makefile.linux ++++ b/pppdump/Makefile.linux +@@ -2,9 +2,33 @@ DESTDIR = $(INSTROOT)@DESTDIR@ + BINDIR = $(DESTDIR)/sbin + MANDIR = $(DESTDIR)/share/man/man8 + ++DO_DEFLATE=y ++DO_BSD_COMPRESS=y ++HAVE_ZLIB=n ++ + CFLAGS=-O2 -g + COPTS= -I../include/net +-OBJS = pppdump.o bsd-comp.o deflate.o zlib.o ++OBJS = pppdump.o ++LIBS = ++ ++ifdef DO_DEFLATE ++COPTS += -DDO_DEFLATE=1 ++OBJS += deflate.o ++ifdef HAVE_ZLIB ++LIBS += -lz ++else ++OBJS += zlib.o ++endif ++else ++COPTS += -DDO_DEFLATE=0 ++endif ++ ++ifdef DO_BSD_COMPRESS ++COPTS += -DDO_BSD_COMPRESS=1 ++OBJS += bsd-comp.o ++else ++COPTS += -DDO_BSD_COMPRESS=0 ++endif + + INSTALL= install + +@@ -14,7 +38,7 @@ all: pppdump + $(CC) $(COPTS) $(CFLAGS) -c $< + + pppdump: $(OBJS) +- $(CC) $(LDFLAGS) -o pppdump $(OBJS) ++ $(CC) $(LDFLAGS) -o pppdump $(OBJS) $(LIBS) + + clean: + rm -f pppdump $(OBJS) *~ --- ppp-2.4.5.orig/debian/patches/documentation_typos +++ ppp-2.4.5/debian/patches/documentation_typos @@ -0,0 +1,80 @@ +fix documentation typos + +--- a/chat/chat.8 ++++ b/chat/chat.8 +@@ -51,7 +51,7 @@ keyword. When echoing is enabled, all ou + to \fIstderr\fR. + .TP + .B \-E +-Enables environment variable substituion within chat scripts using the ++Enables environment variable substitution within chat scripts using the + standard \fI$xxx\fR syntax. + .TP + .B \-v +@@ -78,7 +78,7 @@ SYSLOG. The use of \-S will prevent bot + error messages from being sent to the SYSLOG. + .TP + .B \-T \fI +-Pass in an arbitary string, usually a phone number, that will be ++Pass in an arbitrary string, usually a phone number, that will be + substituted for the \\T substitution metacharacter in a send string. + .TP + .B \-U \fI +@@ -205,7 +205,7 @@ terminal), standard error will normally + .LP + \fBSAY\fR strings must be enclosed in single or double quotes. If + carriage return and line feed are needed in the string to be output, +-you must explicitely add them to your string. ++you must explicitly add them to your string. + .LP + The SAY strings could be used to give progress messages in sections of + the script where you want to have 'ECHO OFF' but still let the user +@@ -458,7 +458,7 @@ For example, the character DC1 (17) is s + Environment variables are available within chat scripts, if the \fI\-E\fR + option was specified in the command line. The metacharacter \fI$\fR is used + to introduce the name of the environment variable to substitute. If the +-substition fails, because the requested environment variable is not set, ++substitution fails, because the requested environment variable is not set, + \fInothing\fR is replaced for the variable. + .SH TERMINATION CODES + The \fIchat\fR program will terminate with the following completion +--- a/pppd/pppd.8 ++++ b/pppd/pppd.8 +@@ -328,7 +328,7 @@ When this is completed, pppd will commen + The \fIdemand\fR option implies the \fIpersist\fR option. If this + behaviour is not desired, use the \fInopersist\fR option after the + \fIdemand\fR option. The \fIidle\fR and \fIholdoff\fR +-options are also useful in conjuction with the \fIdemand\fR option. ++options are also useful in conjunction with the \fIdemand\fR option. + .TP + .B domain \fId + Append the domain name \fId\fR to the local host name for authentication +@@ -929,7 +929,7 @@ pseudo-tty master/slave pair and use the + device. The \fIscript\fR will be run in a child process with the + pseudo-tty master as its standard input and output. An explicit + device name may not be given if this option is used. (Note: if the +-\fIrecord\fR option is used in conjuction with the \fIpty\fR option, ++\fIrecord\fR option is used in conjunction with the \fIpty\fR option, + the child process will have pipes on its standard input and output.) + .TP + .B receive\-all +@@ -1037,7 +1037,7 @@ in the pseudonym. + .TP + .B srp\-use\-pseudonym + When operating as an EAP SRP\-SHA1 client, attempt to use the pseudonym +-stored in ~/.ppp_psuedonym first as the identity, and save in this ++stored in ~/.ppp_pseudonym first as the identity, and save in this + file any pseudonym offered by the peer during authentication. + .TP + .B sync +--- a/README.pppoe ++++ b/README.pppoe +@@ -32,7 +32,7 @@ received from the PPPoE layer just as if + + With this in mind, the goal of the implementation of PPPoE support in + Linux is to allow users to simply specify that the device they intend +-to use for the PPP connection is an ethernet device (i.e. "eth0") and ++to use for the PPP connection is an ethernet device (e.g. "eth0") and + the rest of the system should function as usual. + + 2. Using PPPoE --- ppp-2.4.5.orig/debian/patches/radius_mtu +++ ppp-2.4.5/debian/patches/radius_mtu @@ -0,0 +1,30 @@ +add support for the Framed-MTU Radius attribute + +http://ppp.samba.org/cgi-bin/ppp-bugs/incoming?id=1532 + +From: klepikov_a@up.ua +To: ppp-bugs@ppp.samba.org +Subject: Radius plugin does not set MTU on ppp interface +Date: Mon, 22 Jan 2007 12:36:59 +0000 (GMT) + +Full_Name: Alexander Klepikov +Version: 2.4.3 +OS: rhl 7.3 (2.4.20-28.7bigmem) +Submission from: (NULL) (213.130.21.73) + + +This patch allows radius plugin to deal with Framed-MTU Radius attribute and to +set MTU on interface. + +--- a/pppd/plugins/radius/radius.c ++++ b/pppd/plugins/radius/radius.c +@@ -657,6 +657,9 @@ radius_setparams(VALUE_PAIR *vp, char *m + memcpy(rstate.class, vp->strvalue, rstate.class_len); + } /* else too big for our buffer - ignore it */ + break; ++ case PW_FRAMED_MTU: ++ netif_set_mtu(rstate.client_port,MIN(netif_get_mtu(rstate.client_port),vp->lvalue)); ++ break; + } + + --- ppp-2.4.5.orig/debian/patches/010_scripts_README.diff +++ ppp-2.4.5/debian/patches/010_scripts_README.diff @@ -0,0 +1,20 @@ +--- ppp-2.4.0b4.orig/scripts/README ++++ ppp-2.4.0b4/scripts/README +@@ -141,3 +141,17 @@ + are escaped. This may need to be modified depending on the ssh (or + pseudo-tty) implementation which may differ across platforms, for further + optimizations. ++ ++------------------------------------------------------------------------ ++ ++12. pon, poff and ip-up ++ ++These are modified version of the pon/poff/ip-up scripts contributed by Yann ++Dirson . They allow you to call "pon quick" respectively ++"pon quick my-isp" to just call the provider for running you ip-up scripts in ++/etc/ppp/ip-up.d. This can be useful to check for incoming/flush outgoing ++mail, without the necessary delay before hangup introduced by diald or such. ++ ++These scripts break the possibility to connect to multiple ISPs at once, so ++they are included only here. ++ --- ppp-2.4.5.orig/debian/patches/load_ppp_generic_if_needed +++ ppp-2.4.5/debian/patches/load_ppp_generic_if_needed @@ -0,0 +1,66 @@ +From 053fa32a9ccd0ac1fbbda50db7aff7fdae18652a Mon Sep 17 00:00:00 2001 +From: Alexander Sack +Date: Thu, 18 Dec 2008 05:33:13 +0100 +Subject: [PATCH] port: ppp-2.4.4rel/debian/patches/load_ppp_generic_if_needed + +--- + pppd/sys-linux.c | 41 +++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 41 insertions(+), 0 deletions(-) + +--- a/pppd/sys-linux.c ++++ b/pppd/sys-linux.c +@@ -92,6 +92,7 @@ + #include + #include + #include ++#include + + /* This is in netdevice.h. However, this compile will fail miserably if + you attempt to include netdevice.h because it has so many references +@@ -2104,6 +2105,46 @@ + + if (kernel_version >= KVERSION(2,3,13)) { + error("Couldn't open the /dev/ppp device: %m"); ++ char modprobePath[PATH_MAX] = ""; ++ int status, p, count; ++ pid_t pid; ++ ++ fd = open("/proc/sys/kernel/modprobe", O_RDONLY); ++ if (fd >= 0) { ++ int count = read(fd, modprobePath, PATH_MAX - 1); ++ if (count < 1) ++ modprobePath[0] = 0; ++ else if (modprobePath[count - 1] == '\n') ++ modprobePath[count - 1] = 0; ++ close(fd); ++ } ++ ++ if (modprobePath[0] == 0) ++ strcpy(modprobePath, "/sbin/modprobe"); ++ ++ switch (pid = fork()) { ++ case 0: /* child */ ++ setenv("PATH", "/sbin", 1); ++ status = execl(modprobePath, "modprobe", "ppp_generic", NULL); ++ case -1: /* couldn't fork */ ++ errno = ENOENT; ++ default: /* parent */ ++ do ++ p = waitpid(pid, &status, 0); ++ while (p == -1 && count++ < 4); ++ ++ sleep (5); ++ ++ } ++ ++ if ((fd = open("/dev/ppp", O_RDWR)) >= 0) { ++ new_style_driver = 1; ++ driver_version = 2; ++ driver_modification = 4; ++ driver_patch = 0; ++ close(fd); ++ return 1; ++ } + if (errno == ENOENT) + no_ppp_msg = + "You need to create the /dev/ppp device node by\n" --- ppp-2.4.5.orig/debian/patches/cifdefroute.dif +++ ppp-2.4.5/debian/patches/cifdefroute.dif @@ -0,0 +1,301 @@ +--- a/pppd/ipcp.c ++++ b/pppd/ipcp.c +@@ -198,6 +198,14 @@ static option_t ipcp_option_list[] = { + "disable defaultroute option", OPT_ALIAS | OPT_A2CLR, + &ipcp_wantoptions[0].default_route }, + ++ { "replacedefaultroute", o_bool, ++ &ipcp_wantoptions[0].replace_default_route, ++ "Replace default route", 1 ++ }, ++ { "noreplacedefaultroute", o_bool, ++ &ipcp_allowoptions[0].replace_default_route, ++ "Never replace default route", OPT_A2COPY, ++ &ipcp_wantoptions[0].replace_default_route }, + { "proxyarp", o_bool, &ipcp_wantoptions[0].proxy_arp, + "Add proxy ARP entry", OPT_ENABLE|1, &ipcp_allowoptions[0].proxy_arp }, + { "noproxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp, +@@ -271,7 +279,7 @@ struct protent ipcp_protent = { + ip_active_pkt + }; + +-static void ipcp_clear_addrs __P((int, u_int32_t, u_int32_t)); ++static void ipcp_clear_addrs __P((int, u_int32_t, u_int32_t, bool)); + static void ipcp_script __P((char *, int)); /* Run an up/down script */ + static void ipcp_script_done __P((void *)); + +@@ -1742,7 +1750,8 @@ ip_demand_conf(u) + if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE)) + return 0; + if (wo->default_route) +- if (sifdefaultroute(u, wo->ouraddr, wo->hisaddr)) ++ if (sifdefaultroute(u, wo->ouraddr, wo->hisaddr, ++ wo->replace_default_route)) + default_route_set[u] = 1; + if (wo->proxy_arp) + if (sifproxyarp(u, wo->hisaddr)) +@@ -1830,7 +1839,8 @@ ipcp_up(f) + */ + if (demand) { + if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) { +- ipcp_clear_addrs(f->unit, wo->ouraddr, wo->hisaddr); ++ ipcp_clear_addrs(f->unit, wo->ouraddr, wo->hisaddr, ++ wo->replace_default_route); + if (go->ouraddr != wo->ouraddr) { + warn("Local IP address changed to %I", go->ouraddr); + script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr), 0); +@@ -1855,7 +1865,8 @@ ipcp_up(f) + + /* assign a default route through the interface if required */ + if (ipcp_wantoptions[f->unit].default_route) +- if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr)) ++ if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr, ++ wo->replace_default_route)) + default_route_set[f->unit] = 1; + + /* Make a proxy ARP entry if requested. */ +@@ -1905,7 +1916,8 @@ ipcp_up(f) + + /* assign a default route through the interface if required */ + if (ipcp_wantoptions[f->unit].default_route) +- if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr)) ++ if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr, ++ wo->replace_default_route)) + default_route_set[f->unit] = 1; + + /* Make a proxy ARP entry if requested. */ +@@ -1983,7 +1995,7 @@ ipcp_down(f) + sifnpmode(f->unit, PPP_IP, NPMODE_DROP); + sifdown(f->unit); + ipcp_clear_addrs(f->unit, ipcp_gotoptions[f->unit].ouraddr, +- ipcp_hisoptions[f->unit].hisaddr); ++ ipcp_hisoptions[f->unit].hisaddr, 0); + } + + /* Execute the ip-down script */ +@@ -1999,16 +2011,25 @@ ipcp_down(f) + * proxy arp entries, etc. + */ + static void +-ipcp_clear_addrs(unit, ouraddr, hisaddr) ++ipcp_clear_addrs(unit, ouraddr, hisaddr, replacedefaultroute) + int unit; + u_int32_t ouraddr; /* local address */ + u_int32_t hisaddr; /* remote address */ ++ bool replacedefaultroute; + { + if (proxy_arp_set[unit]) { + cifproxyarp(unit, hisaddr); + proxy_arp_set[unit] = 0; + } +- if (default_route_set[unit]) { ++ /* If replacedefaultroute, sifdefaultroute will be called soon ++ * with replacedefaultroute set and that will overwrite the current ++ * default route. This is the case only when doing demand, otherwise ++ * during demand, this cifdefaultroute would restore the old default ++ * route which is not what we want in this case. In the non-demand ++ * case, we'll delete the default route and restore the old if there ++ * is one saved by an sifdefaultroute with replacedefaultroute. ++ */ ++ if (!replacedefaultroute && default_route_set[unit]) { + cifdefaultroute(unit, ouraddr, hisaddr); + default_route_set[unit] = 0; + } +--- a/pppd/ipcp.h ++++ b/pppd/ipcp.h +@@ -70,6 +70,7 @@ typedef struct ipcp_options { + bool old_addrs; /* Use old (IP-Addresses) option? */ + bool req_addr; /* Ask peer to send IP address? */ + bool default_route; /* Assign default route through interface? */ ++ bool replace_default_route; /* Replace default route through interface? */ + bool proxy_arp; /* Make proxy ARP entry for peer? */ + bool neg_vj; /* Van Jacobson Compression? */ + bool old_vj; /* use old (short) form of VJ option? */ +--- a/pppd/pppd.8 ++++ b/pppd/pppd.8 +@@ -121,6 +121,11 @@ the gateway, when IPCP negotiation is su + This entry is removed when the PPP connection is broken. This option + is privileged if the \fInodefaultroute\fR option has been specified. + .TP ++.B replacedefaultroute ++This option is a flag to the defaultroute option. If defaultroute is ++set and this flag is also set, pppd replaces an existing default route ++with the new default route. ++.TP + .B disconnect \fIscript + Execute the command specified by \fIscript\fR, by passing it to a + shell, after +@@ -717,7 +722,12 @@ disable both forms of hardware flow cont + .TP + .B nodefaultroute + Disable the \fIdefaultroute\fR option. The system administrator who +-wishes to prevent users from creating default routes with pppd ++wishes to prevent users from adding a default route with pppd ++can do so by placing this option in the /etc/ppp/options file. ++.TP ++.B noreplacedefaultroute ++Disable the \fIreplacedefaultroute\fR option. The system administrator who ++wishes to prevent users from replacing a default route with pppd + can do so by placing this option in the /etc/ppp/options file. + .TP + .B nodeflate +--- a/pppd/pppd.h ++++ b/pppd/pppd.h +@@ -645,7 +645,7 @@ int cif6addr __P((int, eui64_t, eui64_t + int ether_to_eui64 __P((eui64_t *)); + /* Convert Ethernet address into 64-bit EUI */ + #endif +-int sifdefaultroute __P((int, u_int32_t, u_int32_t)); ++int sifdefaultroute __P((int, u_int32_t, u_int32_t, bool replace_default_rt)); + /* Create default route through i/f */ + int cifdefaultroute __P((int, u_int32_t, u_int32_t)); + /* Delete default route through i/f */ +--- a/pppd/sys-linux.c ++++ b/pppd/sys-linux.c +@@ -206,6 +206,8 @@ static unsigned char inbuf[512]; /* buff + + static int if_is_up; /* Interface has been marked up */ + static int have_default_route; /* Gateway for default route added */ ++static struct rtentry old_def_rt; /* Old default route */ ++static int default_rt_repl_rest; /* replace and restore old default rt */ + static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */ + static char proxy_arp_dev[16]; /* Device for proxy arp entry */ + static u_int32_t our_old_addr; /* for detecting address changes */ +@@ -1544,6 +1546,9 @@ static int read_route_table(struct rtent + p = NULL; + } + ++ SET_SA_FAMILY (rt->rt_dst, AF_INET); ++ SET_SA_FAMILY (rt->rt_gateway, AF_INET); ++ + SIN_ADDR(rt->rt_dst) = strtoul(cols[route_dest_col], NULL, 16); + SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16); + SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16); +@@ -1613,20 +1618,51 @@ int have_route_to(u_int32_t addr) + /******************************************************************** + * + * sifdefaultroute - assign a default route through the address given. +- */ +- +-int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway) +-{ +- struct rtentry rt; +- +- if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) { +- if (rt.rt_flags & RTF_GATEWAY) +- error("not replacing existing default route via %I", +- SIN_ADDR(rt.rt_gateway)); +- else ++ * ++ * If the global default_rt_repl_rest flag is set, then this function ++ * already replaced the original system defaultroute with some other ++ * route and it should just replace the current defaultroute with ++ * another one, without saving the current route. Use: demand mode, ++ * when pppd sets first a defaultroute it it's temporary ppp0 addresses ++ * and then changes the temporary addresses to the addresses for the real ++ * ppp connection when it has come up. ++ */ ++ ++int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway, bool replace) ++{ ++ struct rtentry rt, tmp_rt; ++ struct rtentry *del_rt = NULL; ++ ++ if (default_rt_repl_rest) { ++ /* We have already reclaced the original defaultroute, if we ++ are called again, we will delete the current default route ++ and set the new default route in this function. ++ - this is normally only the case the doing demand: */ ++ if (defaultroute_exists(&tmp_rt)) ++ del_rt = &tmp_rt; ++ } else if (defaultroute_exists(&old_def_rt) && ++ strcmp(old_def_rt.rt_dev, ifname) != 0) { ++ /* We did not yet replace an existing default route, let's ++ check if we should save and replace a default route: */ ++ if (old_def_rt.rt_flags & RTF_GATEWAY) { ++ if (!replace) { ++ error("not replacing existing default route via %I", ++ SIN_ADDR(old_def_rt.rt_gateway)); ++ return 0; ++ } else { ++ /* we need to copy rt_dev because we need it permanent too: */ ++ char *tmp_dev = malloc(strlen(old_def_rt.rt_dev) + 1); ++ strcpy(tmp_dev, old_def_rt.rt_dev); ++ old_def_rt.rt_dev = tmp_dev; ++ ++ notice("replacing old default route to %s [%I]", ++ old_def_rt.rt_dev, SIN_ADDR(old_def_rt.rt_gateway)); ++ default_rt_repl_rest = 1; ++ del_rt = &old_def_rt; ++ } ++ } else + error("not replacing existing default route through %s", +- rt.rt_dev); +- return 0; ++ old_def_rt.rt_dev); + } + + memset (&rt, 0, sizeof (rt)); +@@ -1641,10 +1677,16 @@ int sifdefaultroute (int unit, u_int32_t + + rt.rt_flags = RTF_UP; + if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) { +- if ( ! ok_error ( errno )) ++ if (!ok_error(errno)) + error("default route ioctl(SIOCADDRT): %m"); + return 0; + } ++ if (default_rt_repl_rest && del_rt) ++ if (ioctl(sock_fd, SIOCDELRT, del_rt) < 0) { ++ if (!ok_error(errno)) ++ error("del old default route ioctl(SIOCDELRT): %m"); ++ return 0; ++ } + + have_default_route = 1; + return 1; +@@ -1675,11 +1717,21 @@ int cifdefaultroute (int unit, u_int32_t + rt.rt_flags = RTF_UP; + if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) { + if (still_ppp()) { +- if ( ! ok_error ( errno )) ++ if (!ok_error(errno)) + error("default route ioctl(SIOCDELRT): %m"); + return 0; + } + } ++ if (default_rt_repl_rest) { ++ notice("restoring old default route to %s [%I]", ++ old_def_rt.rt_dev, SIN_ADDR(old_def_rt.rt_gateway)); ++ if (ioctl(sock_fd, SIOCADDRT, &old_def_rt) < 0) { ++ if (!ok_error(errno)) ++ error("restore default route ioctl(SIOCADDRT): %m"); ++ return 0; ++ } ++ default_rt_repl_rest = 0; ++ } + + return 1; + } +--- a/pppd/sys-solaris.c ++++ b/pppd/sys-solaris.c +@@ -2036,12 +2036,18 @@ cifaddr(u, o, h) + * sifdefaultroute - assign a default route through the address given. + */ + int +-sifdefaultroute(u, l, g) ++sifdefaultroute(u, l, g, replace) + int u; + u_int32_t l, g; ++ bool replace; + { + struct rtentry rt; + ++ if (replace) { ++ error("replacedefaultroute not supported on this platform"); ++ return 0; ++ } ++ + #if defined(__USLC__) + g = l; /* use the local address as gateway */ + #endif --- ppp-2.4.5.orig/debian/patches/011_scripts_redialer.diff +++ ppp-2.4.5/debian/patches/011_scripts_redialer.diff @@ -0,0 +1,152 @@ +--- ppp-2.4.0b4.orig/scripts/redialer ++++ ppp-2.4.0b4/scripts/redialer +@@ -1,96 +1,69 @@ + #!/bin/sh +-################################################################### + # +-# These parameters control the attack dialing sequence. ++# A chatscript that will attempt to dial multiple numbers in sequence, until ++# you get connected. + # +-# Maximum number of attempts to reach the telephone number(s) +-MAX_ATTEMPTS=10 +- +-# Delay between each of the attempts. This is a parameter to sleep +-# so use "15s" for 15 seconds, "1m" for 1 minute, etc. +-SLEEP_DELAY=15s +- +-################################################################### ++# To use: edit /etc/peers/provider, and change the connect line to read: ++# connect "/usr/local/bin/redialer" + # +-# This is a list of telephone numbers. Add new numbers if you wish +-# and see the function 'callall' below for the dial process. +-PHONE1=555-1212 +-PHONE2=411 ++# See below for configuration. + +-################################################################### ++# This is a list of chatscripts to use to get connected, and (optional) ++# telephone numbers to call for each of those chatscripts. + # +-# If you use the ppp-on script, then these are passed to this routine +-# automatically. There is no need to define them here. If not, then +-# you will need to set the values. +-# +-ACCOUNT=my_account_name +-PASSWORD=my_password ++# Note that in the chatscripts, you may use #NUMBER#, this will be replaced ++# with the number it is calling. You might want to use this to only have one ++# chatscript that is used for all numbers, or you might need multiple ++# chatscripts. + +-################################################################### +-# +-# Function to initialize the modem and ensure that it is in command +-# state. This may not be needed, but it doesn't hurt. +-# +-function initialize +-{ +- chat -v TIMEOUT 3 '' AT 'OK-+++\c-OK' +- return +-} ++PHONE1=123456789 ++CHAT1=/etc/chatscripts/provider + +-################################################################### +-# +-# Script to dial a telephone +-# +-function callnumber +-{ +-chat -v \ +- ABORT '\nBUSY\r' \ +- ABORT '\nNO ANSWER\r' \ +- ABORT '\nRINGING\r\n\r\nRINGING\r' \ +- '' ATDT$1 \ +- CONNECT '' \ +- ogin:--ogin: $ACCOUNT \ +- assword: $PASSWORD +-# +-# If the connection was successful then end the whole script with a +-# success. +-# +- if [ "$?" = "0" ]; then +- exit 0 +- fi ++PHONE2=912345678 ++CHAT2=/etc/chatscripts/provider + +- return +-} ++PHONE3=891234567 ++CHAT3=/etc/chatscripts/provider + +-################################################################### +-# +-# Script to dial any telephone number +-# +-function callall +-{ +-# echo "dialing attempt number: $1" >/dev/console +- callnumber $PHONE1 +-# callnumber $PHONE2 +-} ++PHONE4=789123456 ++CHAT4=/etc/chatscripts/provider + +-################################################################### +-# +-# Initialize the modem to ensure that it is in the command state +-# +-initialize +-if [ ! "$?" = "0" ]; then +- exit 1 +-fi ++PHONE5=001234567 ++CHAT5=/etc/chatscripts/provider + ++# How long to sleep between retries: + # +-# Dial telephone numbers until one answers +-# ++# Note that this is a parameter to sleep so use "15s" for 15 seconds, ++# "1m" for 1 minute, etc ++SLEEP_DELAY=1s ++ ++# The code below does the dialing. ++ + attempt=0 + while : ; do +- attempt=`expr $attempt + 1` +- callall $attempt +- if [ "$attempt" = "$MAX_ATTEMPTS" ]; then +- exit 1 +- fi +- sleep "$SLEEP_DELAY" ++ attempt=`expr $attempt + 1` ++ NUMBER=`eval echo '$PHONE'$attempt` ++ CHAT=`eval echo '$CHAT'$attempt` ++ if [ ! "$CHAT" ]; then ++ attempt=0 ++ else ++ logger "Dialing attempt number: $attempt" ++ sed s/#NUMBER#/$NUMBER/ $CHAT >/etc/chatscripts/tmpchat ++ /usr/sbin/chat -v -f /etc/chatscripts/tmpchat ++ rm -f /etc/chatscripts/tmpchat ++ case $? in ++ 0) logger Connection established ; exit 0;; ++ 1) logger chat: exit 1, see manpage for details. ; exit 1;; ++ 2) logger chat: exit 2, see manpage for details. ; exit 2;; ++ 3) logger chat: exit 3, see manpage for details. ;; ++ 4) logger Line busy. ;; ++ 5) logger No Carrier. ;; ++ 6) logger A call is coming. Exiting! ; exit 1;; ++ 7) logger No dialtone. ;; ++ 8) logger An error occured. Exiting! ; exit 1;; ++ *) logger chat: exit $?, see manpage for details. ;; ++ esac ++ logger "Waiting $SLEEP_DELAY seconds before next try." ++ sleep $SLEEP_DELAY ++ fi + done --- ppp-2.4.5.orig/debian/patches/series +++ ppp-2.4.5/debian/patches/series @@ -0,0 +1,44 @@ +# pulled from upstream +git-20100307 + +# to be merged upstream +pppoatm_no_modprobe +adaptive_echos +use_system_logwtmp +update_if_pppol2tp +dont-exit-pado-timeout +fix_warnings +man_syntax_errors +makefiles_cleanup +always_setsid +close_dev_ppp +chat_man +documentation_typos +fix_linkpidfile +fix_null_pppdb +pppdump_use_zlib +pppoatm_resolver_light +pppoatm_cleanup +pppoe_noads +readable_connerrs + +# not ready to be merged +011_scripts_redialer.diff +cifdefroute.dif +ppp-2.3.11-oedod.dif +radius_enanchements +radius_mtu + +# rejected by the upstream maintainer +018_ip-up_option.diff +ppp-2.4.2-stripMSdomain +setenv_call_file + +# debian-specific +010_scripts_README.diff +no_crypt_hack +resolv.conf_no_log +zzz_config + +# ubuntu +load_ppp_generic_if_needed --- ppp-2.4.5.orig/debian/po/POTFILES.in +++ ppp-2.4.5/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] ppp-udeb.templates --- ppp-2.4.5.orig/debian/po/ru.po +++ ppp-2.4.5/debian/po/ru.po @@ -0,0 +1,160 @@ +# Translation of ppp PO templates to Russian +# Copyright (C) 1984-2004 +# This file is distributed under the same license as the ppp package. +# +# Mikhail Gusarov , 2006. +msgid "" +msgstr "" +"Project-Id-Version: ppp_2.4.4rel-10_ru\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2007-10-24 22:19+0400\n" +"Last-Translator: Sergey Alyoshin \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Настройка и установка PPPoE-соединения" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "Нет PPPoE-концентратора." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"Была выполнена проверка всех сетевых интерфейсов, но PPPoE-концентратор не " +"был обнаружен." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"Настройка PPPoE была прервана. Она может быть повторена выбором " +"соответствующего пункта меню." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "Имя пользователя для учётной записи ISP:" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Введите имя пользователя для PPP-соединения." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "Эту информацию должен был предоставить ваш Интернет-провайдер (ISP)." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "Пароль учётной записи ISP:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Введите пароль для PPP-соединения." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "Нет Ethernet-интерфейса." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"Настройка соединения PPPoE невозможна, так как не был обнаружен ни один " +"Ethernet-интерфейс." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "Поиск PPPoE-концентраторов интерфейса ${IFACE}..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "Ошибка аутентификации." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"Была предпринята попытка PPPoE-соединения, но указанная регистрационная " +"информация, вероятно, ошибочна." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "Проверьте указанные имя пользователя и пароль." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Необработанная ошибка." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "При попытке соединения произошла неизвестная ошибка." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Пожалуйста подождите..." + +#~ msgid "PPP login:" +#~ msgstr "Логин для PPP-соединения:" + +#~ msgid "" +#~ "It seems that the attempt to create a connection resulted in an unhandled " +#~ "error. Probably there is some exceptional situation which prevents " +#~ "establishing the connection." +#~ msgstr "При установлении соединения произошла ошибка." --- ppp-2.4.5.orig/debian/po/cs.po +++ ppp-2.4.5/debian/po/cs.po @@ -0,0 +1,169 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: ppp\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2007-11-04 13:02+0100\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Nastavit a spustit PPPoE spojení" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "Žádný PPPoE koncentrátor" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"Byla prověřena všechna síťová rozhraní, ale nebyl rozpoznán žádný PPPoE " +"koncentrátor." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"Nastavení PPPoE bylo přerušeno. Můžete se pokusit o nové nastavení výběrem " +"příslušné položky v menu." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "Uživatelské jméno u poskytovatele připojení:" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Zadejte prosím uživatelské jméno pro toto PPP spojení." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "" +"Tuto informaci by vám měl sdělit váš poskytovatel připojení k Internetu." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "Heslo u poskytovatele připojení:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Zadejte prosím heslo pro toto PPP připojení." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "Žádné ethernetové rozhraní" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"Síťování pomocí PPPoE nemůže být nastaveno, protože nebylo rozpoznáno žádné " +"ethernetové rozhraní." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "Hledám koncentrátory na ${IFACE}..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "Autentizace se nezdařila" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"Pokus o PPPoE spojení selhal, nejspíše kvůli chybným přihlašovacím údajům." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "" +"Zkontrolujte prosím, zda jste zadali správné uživatelské jméno a heslo." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Neošetřená chyba" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "Při pokusu o navázání spojení se vyskytla neznámá chyba." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Prosím čekejte..." + +#~ msgid "" +#~ "It seems that the attempt to create a connection resulted in an unhandled " +#~ "error. Probably there is some exceptional situation which prevents " +#~ "establishing the connection." +#~ msgstr "" +#~ "Zdá se, že pokus o navázání spojení skončil neočekávanou chybou. " +#~ "Pravděpodobně jste narazili na výjimečnou situaci, která znemožňuje " +#~ "navázání spojení." --- ppp-2.4.5.orig/debian/po/nl.po +++ ppp-2.4.5/debian/po/nl.po @@ -0,0 +1,165 @@ +# translation of ppp_2.4.4rel-10_nl.po to Dutch +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# Frans Pop , 2004, 2006. +# Frans Pop , 2007. +msgid "" +msgstr "" +"Project-Id-Version: ppp_2.4.4rel-10_nl\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2007-10-29 13:26+0100\n" +"Last-Translator: Frans Pop \n" +"Language-Team: Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Een PPPoE-verbinding configureren en starten" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "Geen PPPoE concentrator" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"Alle netwerkinterfaces zijn afgetast, maar er is geen PPPoE concentrator " +"gevonden." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"De configuratie van PPPoE is afgebroken. Het kan opnieuw worden geprobeerd " +"door de relevante regel in het menu te selecteren." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "Gebruikersnaam voor uw Internet account:" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Geef de gebruikersnaam voor de PPP-verbinding." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "" +"Deze informatie zou aan u verstrekt moeten zijn door uw Internet provider " +"(ISP)." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "Wachtwoord voor uw Internet account:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Geef het wachtwoord voor de PPP-verbinding." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "Geen Ethernet-interface" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"Er is geen Ethernet-interface gevonden en daardoor is het niet mogelijk " +"PPPoE te configureren." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "Bezig met zoeken van concentrators op ${IFACE}..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "Authenticatie mislukt" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"Geprobeerd is een PPPoE-verbinding tot stand te brengen, maar waarschijnlijk " +"waren de opgegeven login-gegevens onjuist." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "Controleer de juistheid van uw gebruikersnaam en wachtwoord." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Onbekende fout" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "" +"Er heeft zich een onverwachte fout voorgedaan bij het tot stand brengen van " +"een verbinding." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Even geduld..." --- ppp-2.4.5.orig/debian/po/templates.pot +++ ppp-2.4.5/debian/po/templates.pot @@ -0,0 +1,144 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "" + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "" --- ppp-2.4.5.orig/debian/po/be.po +++ ppp-2.4.5/debian/po/be.po @@ -0,0 +1,153 @@ +# translation of be.po_[k9cdzb].po to Belarusian (Official spelling) +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Pavel Piatruk , 2007. +# Pavel Piatruk , 2008. +msgid "" +msgstr "" +"Project-Id-Version: be.po_[k9cdzb]\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2008-11-20 23:20+0200\n" +"Last-Translator: Pavel Piatruk \n" +"Language-Team: Belarusian (Official spelling) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Наладзіць і запусціць злучэнне PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "Без канцэтратара PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"Усе сеткавыя інтэрфейсы былі апрабаваныя, але не вызначана PPPoE " +"канцэнтратара." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"Наладжванне PPPoE перарвана. Спроба можа быць здзейснена зноў выбарам " +"адпаведнага пункта меню." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "Логін інтэрнэт-рахунка:" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Калі ласка, увядзіце імя карыстальніка для злучэння PPP." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "" +"Гэтая інфармацыя павінна быць прадастаўлена вам вашым Інтэрнэт-правайдэрам." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "Пароль інтэрнэт-рахунка:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Калі ласка, увядзіце пароль для злучэння PPP." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "Няма інтэрфейса Ethernet" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"Сеціва PPPoE не можа быць наладжана, бо не вызначана інтэрфейсаў Ethernet." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "Пошук канцэнтратараў на ${IFACE}..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "Спраўджванне не атрымалася" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"Спроба злучэння PPPoE была здзейснена, але прадастаўленыя звесткі ўвахода " +"некарэктныя." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "Калі ласка, праверце ўведзеныя логін ды пароль." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Неапрацавальная памылка" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "Невызначаная памылка адбылася падчас спробы злучэння." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Калі ласка, чакайце..." --- ppp-2.4.5.orig/debian/po/eu.po +++ ppp-2.4.5/debian/po/eu.po @@ -0,0 +1,154 @@ +# translation of eu.po to Euskara +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Piarres Beobide , 2007. +msgid "" +msgstr "" +"Project-Id-Version: eu\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2007-10-24 09:58+0200\n" +"Last-Translator: Piarres Beobide \n" +"Language-Team: Euskara \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "PPPoE konexioa konfiguratu eta abiarazi" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "Ez da PPPoE bilgunerik aurkitu" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"Sare interfaze guztiak probatu dira baina ez da PPPoE bilgunerik topatu." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"PPPoE konfigurazioa utzia izan da. Berriz abiarazi daiteke menutik dagokion " +"sarrera aukeratuaz." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "ISP kontu erabiltzaile izena:" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Mesedez idatzi PPP konexioaren erabiltzaile izena." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "Datu hauek zure Internet hornitzaileak eman behar izan dizkizu." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "ISP kontu pasahitza:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Mesedez idatzi zure PPP konexio pasahitza." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "Ez da Ethernet interfazerik aurkitu" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"PPPoE sarea ezin izan da konfiguratu ez bait da ethernet interfazerik " +"atzeman." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "${IFACE} interfazean bilgunearen bila7..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "Egiaztapenak huts egin du" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"PPPoE konexio saiekare egin da baina hornitzaile saio hasiera datuak " +"ziurrenik okerrak dira." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "" +"Mesedez ziurtatu zaitez erabiltzaile izen eta pasahitz zuzenak idatzi " +"dituzula." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Errore kudeaezina" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "Identifikazio errore bat gertatu da konexio bat sortzen saiatzean." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Itxoin mesedez..." --- ppp-2.4.5.orig/debian/po/fi.po +++ ppp-2.4.5/debian/po/fi.po @@ -0,0 +1,147 @@ +msgid "" +msgstr "" +"Project-Id-Version: ppp\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2007-10-28 00:37+0200\n" +"Last-Translator: Esko Arajärvi \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Finnish\n" +"X-Poedit-Country: FINLAND\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Aseta ja käynnistä PPPoE-yhteys" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "Ei PPPoE-keskitintä" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"Kaikki verkkoliitynnät on tutkittu, mutta PPPoE-keskitintä ei löydetty." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"PPPoE:n asetus on keskeytetty. Sitä voidaan yrittää uudelleen valitsemalla " +"asiaankuuluva valikon kohta." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "ISP-käyttäjätunnus: " + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Anna PPP-yhteyden käyttäjätunnus." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "Tämä tieto sinun olisi tullut saada Internet-palveluntarjoajaltasi." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "ISP-salasana:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Anna PPP-yhteyden salasana." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "Ei Ethernet-liityntää" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"PPPoE-verkkoyhteyttä ei voida asettaa, koska yhtään Ethernet-liityntää ei " +"havaittu." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "Etsitään keskittimiä liitynnästä ${IFACE}..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "Tunnistautuminen epäonnistui" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"PPPoE-yhteyttä yritettiin luoda, mutta annetut kirjautumistiedot olivat " +"luultavasti virheellisiä." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "Tarkista antamasi käyttäjätunnus ja salasana." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Käsittelemätön virhe" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "Luotaessa yhteyttä tapahtui tuntematon virhe." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Odota..." --- ppp-2.4.5.orig/debian/po/zh_TW.po +++ ppp-2.4.5/debian/po/zh_TW.po @@ -0,0 +1,144 @@ +# po-debconf translation for ppp +# Copyright (C) 2008 Marco d'Itri +# This file is distributed under the same license as the ppp package. +# Kanru Chen , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: 2.4.4rel-10\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2008-11-17 14:39+0800\n" +"Last-Translator: Kanru Chen \n" +"Language-Team: Debian-user in Chinese [Big5] \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "設定並啟用 PPPoE 連線" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "沒有可用的 PPPoE 連線" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "已搜尋過所有網路介面，但是沒有找到任何可用的 PPPoE 連線。" + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "這次 PPPoE 的設定已經取消，您可以透過選取相關選單再次設定。" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "ISP 使用者帳號：" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "請輸入 PPP 連線的使用者帳號。" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "這些資訊可以從您的網路服務提供商取得。" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "ISP 使用者密碼：" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "請輸入 PPP 連線的使用者密碼。" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "無任何網路介面" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "無法設定 PPPoE 網路，因為找不到任何網路介面卡。" + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "在 ${IFACE} 上搜尋可用的連線..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "認證失敗" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "嘗試 PPPoE 連線失敗，提供的登入資訊可能有誤。" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "請檢查使用者名稱與密碼是否正確。" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "無法處理的錯誤" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "嘗試建立連線時發生無法辨識的錯誤。" + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "請稍候..." --- ppp-2.4.5.orig/debian/po/pt_BR.po +++ ppp-2.4.5/debian/po/pt_BR.po @@ -0,0 +1,177 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# Flamarion Jorge , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: ppp\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2010-07-18 16:58-0300\n" +"Last-Translator: Flamarion Jorge \n" +"Language-Team: Brazilian Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"pt_BR utf-8\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Configurar e iniciar uma conexão PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +#| msgid "No concentrator was found" +msgid "No PPPoE concentrator" +msgstr "Nenhum concentrador PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"Todas as interfaces de rede foram testadas, mas nenhum concentrador PPPoE " +"foi encontrado." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +#| msgid "" +#| "The configuration of PPPoE is aborted. It can be attempted again by " +#| "selecting the relevant menu entry." +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"A configuração do PPPoE foi abortada. Ela pode ser tentada novamente através " +"da seleção da entrada de menu relevante." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "Nome de usuário da conta no ISP:" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Por favor, informe o nome de usuário para a conexão PPP." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +#| msgid "" +#| "This information should have been provided to you by your Internet " +#| "Service Provider." +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "" +"Esta informação deve lhe ter sido fornecida por seu Provedor de Serviços de " +"Internet." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +#| msgid "PPP password:" +msgid "ISP account password:" +msgstr "Senha da conta no ISP:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Por favor, informe a senha para a conexão PPP." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +#| msgid "No Ethernet interface found" +msgid "No Ethernet interface" +msgstr "Nenhuma interface Ethernet" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"Não foi possível configurar a rede PPPoE porque nenhuma interface Ethernet " +"foi detectada." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "Procurando por concentradores na ${IFACE}..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "Autenticação falhou" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +#| msgid "" +#| "A PPPoE connection was attempted, but the provided login information was " +#| "incorrect. Because of this the authentication failed." +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"Uma conexão PPPoE foi tentada, mas a informação de login fornecida " +"provavelmente estava incorreta." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +#| msgid "Please make sure you type the correct username and password." +msgid "Please check the username and password you provided." +msgstr "Por favor, verifique o nome de usuário e senha que você informou." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Erro desconhecido" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "Um erro não identificado aconteceu ao tentar criar uma conexão." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Por favor, aguarde..." --- ppp-2.4.5.orig/debian/po/es.po +++ ppp-2.4.5/debian/po/es.po @@ -0,0 +1,192 @@ +# ppp debconf translation to spanish +# Copyright (C) 2004-2007 Software in the Public Interest +# This file is distributed under the same license as the ppp package. +# +# Changes: +# - Initial translation +# Lucas Wall , 2004 +# - Updating templates for package version 2.4.4rel-2 +# Nacho Barrientos Arias , 2006 +# - Update for version 2.2.4rel +# Javier Fernández-Sanguino , 2007 +# +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/coordinacion +# especialmente las notas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +msgid "" +msgstr "" +"Project-Id-Version: ppp 2.4.4rel-2\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2007-10-29 23:34+0100\n" +"Last-Translator: Javier Fernandez-Sanguino \n" +"Language-Team: Debian l10n Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Configurar e iniciar una conexión PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "No se ha encontrado ningún concentrador PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"Se han analizado todas las interfaces de red pero no se ha encontrado ningún " +"concentrador PPPoE." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"Se ha abortado la configuración de PPPoE. Puede intentarlo de nuevo " +"seleccionando la opción pertinente en el menú." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "Nombre de usuario de la cuenta del ISP:" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Por favor, introduzca el usuario para la conexión PPP." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "" +"Esta información debería de habérsela suministrado su proveedor de servicios " +"de Internet (ISP)." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "Contraseña de la cuenta del ISP:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Por favor, introduzca la contraseña para la conexión PPP." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "No hay una interfaz Ethernet" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"La conexión PPPoE no se pudo configurar debido a que no se han detectado " +"interfaces Ethernet." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "Buscando servidores PPPoE en ${IFACE}..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "Falló la autenticación" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"Se intentó iniciar una conexión PPPoE pero la información de acceso " +"proporcionada es posiblemente incorrecta." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "Compruebe el nombre de usuario y contraseñas suministrados." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Error no manejado" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "" +"Se ha producido un error no identificado mientras se intentaba establecer la " +"conexión." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Espere por favor..." + +#~ msgid "PPP login:" +#~ msgstr "Usuario para la conexión PPP:" + +#~ msgid "" +#~ "It seems that the attempt to create a connection resulted in an unhandled " +#~ "error. Probably there is some exceptional situation which prevents " +#~ "establishing the connection." +#~ msgstr "" +#~ "Parece que el intento de crear una conexión dió lugar a un tipo de error " +#~ "no manejado por este programa. Posiblemente hay alguna situación fuera de " +#~ "lo normal que impide que la conexión se establezca." --- ppp-2.4.5.orig/debian/po/de.po +++ ppp-2.4.5/debian/po/de.po @@ -0,0 +1,180 @@ +# Translation of ppp debconf templates to German +# Copyright (C) Helge Kreutzmann , 2006, 2007. +# This file is distributed under the same license as the ppp package. +# +msgid "" +msgstr "" +"Project-Id-Version: ppp 2.4.4rel-10\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2007-10-24 19:01+0200\n" +"Last-Translator: Helge Kreutzmann \n" +"Language-Team: de \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Konfiguriere und Starte die PPPoE-Verbindung" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "Kein PPPoE-Konzentrator" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"Alle Netzschnittstellen wurden getestet, aber kein PPPoE-Konzentrator wurde " +"erkannt." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"Die Konfiguration von PPPoE wurde abgebrochen. Sie kann erneut versucht " +"werden, indem der relevante Men-Eintrag ausgewhlt wird." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "Benutzername beim Internet-Diensteanbieter:" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Bitte geben Sie den Benutzernamen fr die PPP-Verbindung ein." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "" +"Diese Informationen sollten Ihnen von Ihrem Internet-Diensteanbieter " +"bereitgestellt worden sein." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "Passwort beim Internet-Diensteanbieter::" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Bitte geben Sie das Passwort fr die PPP-Verbindung ein." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "Keine Ethernet-Schnittstellen" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"PPPoE-Vernetzung kann nicht konfiguriert werden, da keine Ethernet-" +"Schnittstelle erkannt wurde." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "Suche nach Konzentratoren auf ${IFACE}..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "Fehlgeschlagene Authentifikation" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"Es wurde ein PPPoE-Verbindungsaufbau versucht, aber die angegebenen " +"Anmeldeinformationen waren wahrscheinlich nicht korrekt." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "" +"Bitte berprfen Sie den angegebenen Benutzernamen und das angegebene " +"Passwort." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Nicht-behandelter Fehler" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "" +"Ein nicht-identifizierter Fehler trat beim Versuch des Verbindungsaufbaus " +"auf." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Bitte warten ..." + +#~ msgid "PPP login:" +#~ msgstr "PPP-Login:" + +#~ msgid "" +#~ "It seems that the attempt to create a connection resulted in an unhandled " +#~ "error. Probably there is some exceptional situation which prevents " +#~ "establishing the connection." +#~ msgstr "" +#~ "Es scheint, dass der Versuch, eine Verbindung aufzubauen, in einem nicht-" +#~ "behandelten Fehler geendet sind. Wahrscheinlich gibt es irgendeine " +#~ "auergewhnliche Situation, die den Aufbau der Verbindung verhindert." + +#~ msgid "Your PPPoE username" +#~ msgstr "Ihr PPPoE-Benutzername" + +#~ msgid "Interface name" +#~ msgstr "Name der Schnittstelle" + +#~ msgid "" +#~ "Choose the name of the network interface connected to your PPPoE modem." +#~ msgstr "" +#~ "Geben Sie den Namen der Netz-Schnittstelle, an der Ihr PPPoE-Modem " +#~ "angeschlossen ist, an." --- ppp-2.4.5.orig/debian/po/nb.po +++ ppp-2.4.5/debian/po/nb.po @@ -0,0 +1,166 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the ppp package. +# Hans Fredrik Nordhaug , 2006-2007. +# +msgid "" +msgstr "" +"Project-Id-Version: ppp\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2007-11-09 18:17+0100\n" +"Last-Translator: Hans Fredrik Nordhaug \n" +"Language-Team: Norwegian Bokmål \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Konfigurer og start en PPPoE-forbindelse" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "Ingen PPPoE-konsentrator" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"Alle nettverksgrensesnitt ble undersøkt, men en PPPoE-konsentrator ble ikke " +"funnet." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"Konfigurasjonen av PPPoE ble avbrutt. Man kan prøve igjen ved å velge " +"relevant menyoppføring." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "Brukernavn for ISP-konto:" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Skriv brukernavnet for PPP-forbindelsen." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "" +"Denne informasjonen skulle du ha fått fra din internettleverandør (ISP)." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "Passord for ISP-kontoen:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Skriv inn passordet for PPP-forbindelsen." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "Intet Ethernet-grensesnitt" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"PPPoE-nettverk kan ikke konfigureres fordi intet Ethernet-grensesnitt ble " +"funnet." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "Søk etter konsentratorer på ${IFACE} ..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "Autentisering feilet" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"En PPPoE-forbindelse ble forsøkt opprettet, men den oppgitte " +"innloggingsinformasjonen var sannsynligvis feil. " + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "Sjekk at du skriver riktig brukernavn og passord." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Ukjent feil" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "" +"En uidentifisert feil oppstod under forsøket på å opprette en forbindelse." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Vent litt ..." + +#~ msgid "PPP login:" +#~ msgstr "PPP-innlogging:" + +#~ msgid "" +#~ "It seems that the attempt to create a connection resulted in an unhandled " +#~ "error. Probably there is some exceptional situation which prevents " +#~ "establishing the connection." +#~ msgstr "" +#~ "Det ser ut til forsøket på å opprette en forbindelse resulterte i en " +#~ "ukjent feil. Sannsynligvis er det en uvanlig situasjon som forhindrer " +#~ "opprettelsen av forbindelsen." --- ppp-2.4.5.orig/debian/po/fr.po +++ ppp-2.4.5/debian/po/fr.po @@ -0,0 +1,157 @@ +# Translation of ppp debconf templates to French +# Copyright (C) 2006-2007 Cyril Brulebois +# This file is distributed under the same license as the ppp package. +# +# Olivier Gauwin +# Cyril Brulebois +msgid "" +msgstr "" +"Project-Id-Version: ppp 2.4.2\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2007-10-24 11:40+0100\n" +"Last-Translator: Cyril Brulebois \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Configurer et activer les connexions réseau PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "Aucun concentrateur trouvé" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"Toutes les interfaces réseau ont été testées mais aucun concentrateur PPPoE " +"n'a été détecté." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"La configuration de PPPoE a été interrompue. Vous pouvez la tenter à nouveau " +"en choisissant l'entrée de menu correspondante." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "Identifiant pour la connexion PPP :" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Veuillez indiquer l'identifiant à utiliser pour la connexion PPP." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "" +"Cette information est habituellement disponible auprès de votre fournisseur " +"d'accès Internet (« FAI »)." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "Mot de passe pour la connexion PPP :" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Veuillez indiquer le mot de passe pour la connexion PPP." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "Aucune interface Ethernet" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"La configuration PPPoE n'a pas pu être effectuée car aucune interface " +"Ethernet n'a été détectée." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "Recherche de concentrateurs sur ${IFACE}..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "Identification échouée" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"Une tentative de connexion PPPoE a eu lieu mais l'identification a échoué, " +"probablement à cause d'un mauvais identifiant ou d'un mauvais mot de passe." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "" +"Veuillez vérifier que vous avez indiqué les bons identifiant et mot de passe." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Erreur inconnue" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "" +"Une erreur inconnue s'est produite lors de la tentative de création de la " +"connexion." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Veuillez patienter..." --- ppp-2.4.5.orig/debian/po/pt.po +++ ppp-2.4.5/debian/po/pt.po @@ -0,0 +1,178 @@ +# Portuguese translation for ppp's debconf messages +# Copyright (C) 2007 Carlos Lisboa +# This file is distributed under the same license as the ppp package. +# Simão Pedro Cardoso , 2005 +# Carlos Lisboa , 2007 +# Miguel Figueiredo , 2007 +# +msgid "" +msgstr "" +"Project-Id-Version: ppp\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2007-11-07 23:41+0000\n" +"Last-Translator: Carlos Lisboa \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Configurar e iniciar uma ligação PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "Não foi encontrado nenhum concentrador PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"As interfaces de rede foram todas sondadas, mas não foi detectado " +"nenhumconcentrador PPPoE." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"A configuração do PPPoE foi abortada. Pode tentar novamente escolhendo a " +"entrada relevante do menu." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "Nome do utilizador da canta do ISP" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Introduza o utilizador para a ligação PPP." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "" +"Esta informação deve ter sido dada pelo seu Provedor de Serviços de Internet." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "Palavra-chave da conta do ISP:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Introduza a palavra-chave para a ligação PPP." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "Nenhuma interface Ethernet" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"A rede PPPoE não pode ser configurada porque não foi detectada nenhuma " +"interface Ethernet." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "A procurar por concentradores em ${IFACE}..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "A autenticação falhou" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"Foi tentada uma ligação PPPoE, mas a informação de login dada provavelemente " +"estava incorrecta." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "" +"Por favor verifique o nome de utilizador e a palavra-chave que introduziu." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Erro desconhecido" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "Ocorreu um erro não identificado ao tentar criar uma ligação." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Por favor aguarde..." + +#~ msgid "PPP login:" +#~ msgstr "Utilizador PPP:" + +#~ msgid "" +#~ "It seems that the attempt to create a connection resulted in an unhandled " +#~ "error. Probably there is some exceptional situation which prevents " +#~ "establishing the connection." +#~ msgstr "" +#~ "Parece que ao tentar criar a ligação resultou num erro desconhecido. " +#~ "Provavelmente existe alguma situação excepcional que impede que se " +#~ "estabeleça a ligação." + +#, fuzzy +#~ msgid "Your PPPoE username" +#~ msgstr "O seu nome de utilizador" + +#~ msgid "Interface name" +#~ msgstr "Nome do interface" + +#~ msgid "" +#~ "Choose the name of the network interface connected to your PPPoE modem." +#~ msgstr "Escolha o nome do dispositivo de rede ligado ao seu modem PPPoE." --- ppp-2.4.5.orig/debian/po/ca.po +++ ppp-2.4.5/debian/po/ca.po @@ -0,0 +1,168 @@ +# +# Catalan translation for ppp package. +# Copyright (C) 2008 Marco d'Itri. +# This file is distributed under the same license as the ppp package. +# +# Jordà Polo , 2007, 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: 2.4.4rel-10\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2008-11-20 19:04+0100\n" +"Last-Translator: Jordà Polo \n" +"Language-Team: Catalan \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Configura i inicia una connexió PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "No s'ha trobat el concentrador PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"S'han provat totes les interfícies de xarxa, però no s'ha detectat cap " +"concentrador PPPoE." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"S'ha avortat la configuració del PPPoE. Podeu tornar-ho a intentar " +"seleccionant l'entrada del menú corresponent." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "Nom d'usuari del compte de l'ISP:" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Si us plau, introduïu el nom d'usuari de la connexió PPP." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "" +"Aquesta informació us l'hauria de proporcionar el vostre proveïdor de " +"serveis d'Internet." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "Contrasenya del compte de l'ISP:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Si us plau, introduïu la contrasenya de la connexió PPP." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "No s'ha trobat la interfície Ethernet" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"No s'ha pogut configurar la xarxa PPPoE ja que no ha estat possible detectar " +"cap interfície Ethernet." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "S'està cercant un concentrador a ${IFACE}..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "L'autenticació ha fallat" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"S'ha intentat establir una connexió PPPoE, però el nom d'usuari indicat " +"segurament és incorrecte." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "Comproveu el nom d'usuari i la contrasenya que heu introduït." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Error inesperat" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "" +"S'ha trobat un error no identificat mentre s'intentava establir la connexió." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Si us plau, espereu..." + +#~ msgid "PPP login:" +#~ msgstr "Nom d'usuari PPP:" + +#~ msgid "" +#~ "It seems that the attempt to create a connection resulted in an unhandled " +#~ "error. Probably there is some exceptional situation which prevents " +#~ "establishing the connection." +#~ msgstr "" +#~ "Sembla que l'intent d'establir la connexió ha provocat un error " +#~ "inesperat. És probable que alguna situació excepcional impedeixi " +#~ "l'establiment de la connexió." --- ppp-2.4.5.orig/debian/po/tr.po +++ ppp-2.4.5/debian/po/tr.po @@ -0,0 +1,159 @@ +# Turkish translation of ppp. +# This file is distributed under the same license as the ppp package. +# Deniz Bahadır GÜR , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: ppp\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2008-12-02 12:56+0300\n" +"Last-Translator: Deniz Bahadır GÜR \n" +"Language-Team: Turkish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Bir PPPoE bağlantısı yapılandır ve başlat" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "PPPoE yoğunlaştırıcısı yok" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"Bütün ağ arayüzleri araştırıldı, fakat bir PPPoE yoğunlaştırıcısı bulunamadı." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"PPPoE yapılandırması durduruldu. İlgili menüyü kullanarak tekrar yapılandırılabilir." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "ISS kullanıcı adı:" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Lütfen PPP bağlantısı için kullanıcı adınızı giriniz." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "" +"Bu bilgi, Internet Servis Sağlayıcınız tarafından sağlanmış olmalı." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "ISS parolası:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Lütfen PPP bağlantısı için parolanızı giriniz." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "Ethernet arayüzü yok" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"PPPoE ağı yapılandırılamadı çünkü Ethernet arayüzü bulunamadı" + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "${IFACE} üzerinde yoğunlaştırıcı aranıyor..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "Doğrulama başarısız" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"Bir PPPoE bağlantısı kurulmaya çalışıldı, fakat verdiğiniz giriş bilgileri " +"muhtemelen yanlış." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "Lütfen girdiğiniz kullanıcı adı ve parolayı kontrol ediniz." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Yakalanamayan hata" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "Bağlantı kurulmaya çalışılırken, tanımlanamayan bir hata oluştu." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Lütfen bekleyin..." + +#~ msgid "Your PPPoE username" +#~ msgstr "PPPoE kullanıcı adınız" + +#~ msgid "Interface name" +#~ msgstr "Arayüz adı" + +#~ msgid "" +#~ "Choose the name of the network interface connected to your PPPoE modem." +#~ msgstr "PPPoE modeminize bağlı olan ağ arayüzü adını seçiniz." --- ppp-2.4.5.orig/debian/po/ta.po +++ ppp-2.4.5/debian/po/ta.po @@ -0,0 +1,184 @@ +# translation of templates.po to TAMIL +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Dr.T.Vasudevan , 2007. +msgid "" +msgstr "" +"Project-Id-Version: templates\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2007-01-17 17:27+0530\n" +"Last-Translator: Dr.T.Vasudevan \n" +"Language-Team: TAMIL \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "ஒரு பிபிபிஓஈ இணைப்பை வடிவமைத்து ஆரம்பிக்கவும்." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +#, fuzzy +#| msgid "No concentrator was found" +msgid "No PPPoE concentrator" +msgstr "குவிப்பி ஏதும் கண்டு பிடிக்க இயலவில்லை." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"எல்லா வலை இடை முகங்களும் சோதிக்கப்பட்டன. ஆனால் பிபிபிஓஈ குவிப்பி ஏதும் கண்டு பிடிக்க " +"இயலவில்லை." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +#, fuzzy +#| msgid "" +#| "The configuration of PPPoE is aborted. It can be attempted again by " +#| "selecting the relevant menu entry." +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"பிபிபிஓஈ வடிவமைப்பு கைவிடப்பட்டது.மீண்டும் அதை சரியான மெனு உள்ளீட்டின் மூலம் துவக்கலாம்." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "பிபிபி இணைப்புக்கு பயனர் பெயரை உள்ளிடுக" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +#, fuzzy +#| msgid "" +#| "This information should have been provided to you by your Internet " +#| "Service Provider." +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "உங்களுக்கு இந்த தகவல் உங்கள் சேவையாளரால் தரப் பட்டு இருக்க வேண்டும். " + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +#, fuzzy +#| msgid "PPP password:" +msgid "ISP account password:" +msgstr "பிபிபி கடவுச் சொல்:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "தயை செய்து பிபிபி இணைப்புக்கு கடவுச் சொல்லை உள்ளிடவும்." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +#, fuzzy +#| msgid "No Ethernet interface found" +msgid "No Ethernet interface" +msgstr "ஈதர்நெட் இடைமுகம் ஏதும் கண்டு பிடிக்கப் படவில்லை." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"ஈதர்நெட் இடைமுகம் ஏதும் கண்டு பிடிக்கப் படவில்லையாதலால் பிபிபிஓஈ வலையமைப்பை வடிவமைக்க " +"முடியவில்லை." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "${IFACE} இல் ...குவிப்பிகளுக்கு தேடுகிறது." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "உண்மைப் படுத்தல் தோல்வியுற்றது." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +#, fuzzy +#| msgid "" +#| "A PPPoE connection was attempted, but the provided login information was " +#| "incorrect. Because of this the authentication failed." +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"ஒரு பிபிபிஓஈ இணைப்பு முயற்சி செய்யப் பட்டது. ஆனால் கொடுக்கப் பட்ட உள்நுழைவு தகவல் " +"சரியில்லை. அதனால் உண்மைப் படுத்தல் தோல்வியுற்றது." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +#, fuzzy +#| msgid "Please make sure you type the correct username and password." +msgid "Please check the username and password you provided." +msgstr "" +"தயவு செய்து சரியான பயனர் பெயரும் கடவுச் சொல்லும் உள்ளிடுகிறீர்களா என உறுதி செய்து " +"கொள்ளவும்." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "கையாளாத பிழை " + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "" + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "பொறுத்திருக்கவும்..." + +#~ msgid "PPP login:" +#~ msgstr "பிபிபி உள் நுழைவு:" + +#~ msgid "" +#~ "It seems that the attempt to create a connection resulted in an unhandled " +#~ "error. Probably there is some exceptional situation which prevents " +#~ "establishing the connection." +#~ msgstr "" +#~ "இணைப்பை ஏற்படுத்தும் முயற்சி கையாளாத பிழையை ஏற்படுத்தியது போலுள்ளது. அனேகமாக ஏதோ " +#~ "ஒரு வித்தியாசமான நிலை இணப்பு ஏற்படுத்துவதை தடுக்கிறது." --- ppp-2.4.5.orig/debian/po/ja.po +++ ppp-2.4.5/debian/po/ja.po @@ -0,0 +1,160 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# +msgid "" +msgstr "" +"Project-Id-Version: ppp 2.4.4rel-10\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2008-07-05 09:52+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "PPPoE 接続の設定と開始" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "コンセントレータが見つかりません" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"すべてのネットワークインターフェイスを確認しましたが、PPPoE コンセントレータ" +"は検出されませんでした。" + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"PPPoE 設定を中断しました。適切なメニューを選べば再度設定を試みることが可能で" +"す。" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "プロバイダのユーザ名:" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "PPP 接続のユーザ名を入力してください。" + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "この情報は、あなたが利用しているプロバイダから提供されているはずです。" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "プロバイダのパスワード:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "PPP 接続のパスワードを入力してください。" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "イーサネットインターフェイスが見つかりません" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"イーサネットインターフェイスが検出されなかったので、PPPoE ネットワーク接続の" +"設定は行われません。" + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "${IFACE} に繋がっているコンセントレータを探しています…" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "認証に失敗しました" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"PPPoE 接続を行おうとしましたが、入力されたログイン情報におそらく間違いがあり" +"ます。" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "ユーザ名とパスワードを確認してください。" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "予期しないエラーが発生しました" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "接続を試みた際に不明なエラーが発生しました。" + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "しばらくお待ちください..." --- ppp-2.4.5.orig/debian/po/gl.po +++ ppp-2.4.5/debian/po/gl.po @@ -0,0 +1,162 @@ +# Galician translation of ppp's debconf templates +# This file is distributed under the same license as the ppp package. +# Jacobo Tarrio , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: ppp\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2007-10-24 20:44+0100\n" +"Last-Translator: Jacobo Tarrio \n" +"Language-Team: Galician \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Configurar e iniciar unha conexión de PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "Non hai un concentrador PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"Buscouse en tódalas interfaces de rede, pero non se detectou ningún " +"concentrador PPPoE." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"Cancelouse a configuración de PPPoE. Pódese volver tentar escollendo a " +"entrada de menú relevante." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "Nome de usuario da conta de acceso:" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Introduza o nome de usuario para a conexión PPP." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "Esta información debeulla proporcionar o fornecedor de Internet." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "Contrasinal da conta de acceso:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Introduza o contrasinal para a conexión PPP." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "Ningunha interface Ethernet" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"Non se pode configurar a rede PPPoE porque non se detectou ningunha " +"interface Ethernet." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "A buscar concentradores en ${IFACE}..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "A autenticación fallou" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"Tentouse establecer unha conexión PPPoE, pero a información de " +"identificación que se forneceu probablemente non era correcta." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "Comprobe o nome de usuario e contrasinal que forneceu." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Erro descoñecido" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "Houbo un erro non identificado mentres se tentaba crear a conexión." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Por favor, agarde..." + +#~ msgid "PPP login:" +#~ msgstr "Usuario de PPP:" + +#~ msgid "" +#~ "It seems that the attempt to create a connection resulted in an unhandled " +#~ "error. Probably there is some exceptional situation which prevents " +#~ "establishing the connection." +#~ msgstr "" +#~ "Semella que a tentativa de crear unha conexión resultou nun erro " +#~ "descoñecido. Probablemente haxa unha situación excepcional que impida " +#~ "establecer a conexión." --- ppp-2.4.5.orig/debian/po/da.po +++ ppp-2.4.5/debian/po/da.po @@ -0,0 +1,158 @@ +# Danish translation ppp. +# Copyright (C) 2010 ppp & nedenstående oversættere. +# This file is distributed under the same license as the ppp package. +# Claus Hindsgaul , 2004. +# Claus Hindsgaul , 2006, 2007. +# Joe Hansen (joedalton2@yahoo.dk), 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: ppp\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2010-10-29 12:42+0000\n" +"Last-Translator: Joe Hansen \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Sæt PPPoE-forbindelse op og start den" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "Ingen PPPoE-concentrator" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"Alle netkort er blevet forespurgt, men der blev ikke fundet nogen PPPoE-" +"concentator." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"Opsætningen af PPPoE blev afbrudt. Et nyt forsøg kan foretages ved at vælge " +"det relevante menupunkt." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "Brugernavn for ISP-konto:" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Angiv brugernavn for PPP-forbindelsen." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "" +"Denne information skal du have modtaget af din internetudbyder." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "Adgangskode for ISP-konto:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Angiv PPP-forbindelsens adgangskode." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "Intet Ethernet-netkort" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"PPPoE-netværk kan ikke sættes op, da der ikke blev fundet et Ethernet-" +"netkort." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "Søger efter concentratorer på ${IFACE}..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "Mislykket autentifikation" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"Det blev forsøgt at forbinde med PPPoE, men de givne logind-oplysninger var " +"ugyldige." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "Sørg for at skrive det korrekte brugernavn og adgangskode." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Ikke-håndteret fejl" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "Der opstod en uidentificeret fejl under forsøg på at oprette en forbindelse." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Vent venligst..." + + --- ppp-2.4.5.orig/debian/po/ro.po +++ ppp-2.4.5/debian/po/ro.po @@ -0,0 +1,219 @@ +# translation of ro.po to Romanian +# Romanian translation of ppp-udeb templates +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the ppp-udeb package. +# +# Eddy Petrișor , 2006, 2007. +msgid "" +msgstr "" +"Project-Id-Version: ro\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2007-10-24 22:43+0300\n" +"Last-Translator: Eddy Petrișor \n" +"Language-Team: Romanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " +"20)) ? 1 : 2;\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Configurează și pornește o conexiune PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "Nici un concentrator PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"Au fost examinate toate interfețele, dar nu a fost detectat nici un " +"concentrator PPPoE." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"Configurarea PPPoE a fost abandonată. Poate fi încercată din nou, prin " +"selectarea intrării relevante din meniu." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "Numele de utilizator pentru contul de servicii internet:" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Introduceți numele de utilizator pentru conexiunea PPP." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "" +"Această informație ar trebui să o fi primit de la furnizorul dumneavoastră " +"de servicii internet." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "Parola pentru contul de servicii internet:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Introduceți parola pentru conexiunea PPP." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "Nici o interfață Ethernet" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"Conectarea prin PPPoE nu poate fi configurată deoarece nu a fost detectată " +"nici o interfață Ethernet." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "Se caută concentratoare prin ${IFACE}..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "Autentificarea a eșuat" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"S-a încercat conectarea PPPoE, însă informațiile de autentificare furnizate " +"probabil că au fost incorecte." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "Verificați numele de utilizator și parola pe care ați introdus-o." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Eroare netratată" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "" +"A avut loc o eroare neidentificată în timp ce se încerca crearea conexiunii." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Vă rugăm să așteptați..." + +#~ msgid "PPP login:" +#~ msgstr "Autentificare PPP:" + +#~ msgid "" +#~ "It seems that the attempt to create a connection resulted in an unhandled " +#~ "error. Probably there is some exceptional situation which prevents " +#~ "establishing the connection." +#~ msgstr "" +#~ "Se pare că încercarea de conectare a dus la apariția unei erori " +#~ "netratate. Probabil că o situație excepțională împiedică realizarea " +#~ "conexiunii." + +#~ msgid "Concentrator detection failed" +#~ msgstr "Detecția concentratorului a eșuat" + +#~ msgid "" +#~ "No concentrator was found while trying to configure PPPoE. The PPPoE " +#~ "connections can be automatically detected by searching for a concentrator." +#~ msgstr "" +#~ "Nici un concetrator nu a fost găsit în timpul încercării de configurare a " +#~ "PPPoE. Conexiunile PPPoE pot fi detectate automat prin căutarea unui " +#~ "concentrator." + +#~ msgid "This was attempted on all known network interfaces in the system." +#~ msgstr "" +#~ "Acest lucru a fost încercat pe toate interfețele cunoscute din sistem." + +#~ msgid "You should check that connection cables are properly plugged in." +#~ msgstr "" +#~ "Ar trebui să verificați că mufele cablurilor de conectare sunt bine " +#~ "introduse în calculator." + +#~ msgid "Ethernet card detection failed" +#~ msgstr "Detecția interfeței Ethernet a eșuat" + +#~ msgid "" +#~ "No Ethernet card was detected. In order to configure PPPoE on the system, " +#~ "at least one Ethernet card is needed." +#~ msgstr "" +#~ "Nu a fost detectată nici o interfață Ethernet. Pentru a configura PPPoE " +#~ "pentru acest sistem, este nevoie de cel puțin o interfață de rețea." + +#~ msgid "" +#~ "Also, please note that currently the installer does not support automatic " +#~ "configuration of dial-up connections and this kind of configuration " +#~ "should be done manually." +#~ msgstr "" +#~ "De asemenea, a se reține că în prezent programul de instalare nu suportă " +#~ "configurarea automatică a conexiunilor dial-up, iar acest tip de " +#~ "conexiuni ar trebui să fie configurate manual." + +#~ msgid "Your PPPoE username" +#~ msgstr "Numele de utilizator PPPoE" + +#~ msgid "" +#~ "If the system does have an Ethernet card, then this could mean that it " +#~ "was not detected by the installer." +#~ msgstr "" +#~ "Dacă sistemul are o interfață Ethernet, atunci acest lucru ar putea " +#~ "însemna că nu a fost detectată de programul de instalare." --- ppp-2.4.5.orig/debian/po/sv.po +++ ppp-2.4.5/debian/po/sv.po @@ -0,0 +1,160 @@ +# translation of ppp_2.4.4rel-10_sv.po to Swedish +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# +# Martin gren , 2008. +msgid "" +msgstr "" +"Project-Id-Version: ppp_2.4.4rel-10_sv\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2008-07-19 12:21+0200\n" +"Last-Translator: Martin gren \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Konfigurera och starta en PPPoE-anslutning" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "Ingen PPPoE-koncentrator" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"Alla ntverksgrnssnitt har genomskts men ingen PPPoE-koncentrator hittades." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"Konfigurationen av PPPoE har avbrutits. Den kan startas om genom att vlja " +"den relevanta menyposten." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "Anvndarnamn hos internetleverantr:" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Ange anvndarnamnet fr PPP-anslutningen." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "Denna information ska din internetleverantr ha delgivit dig." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "Lsenord hos internetleverantr:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Ange lsenordet fr PPP-anslutningen." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "Inget Ethernet-grnssnitt" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"PPPoE-ntverket kan inte konfigureras p grund av att inget Ethernet-" +"grnssnitt hittades." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "Sker efter koncentratorer p ${IFACE}..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "Autentisering misslyckades" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"En PPPoE-anslutning frsktes men den tillhandahllna " +"inloggningsinformationen var troligen felaktig." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "Kontrollera det anvndarnamn och lsenord du angav." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Ohanterat fel" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "" +"Ett oidentifierat fel intrffade medan ett frsk till uppkoppling gjordes." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Var god vnta..." --- ppp-2.4.5.orig/debian/po/pl.po +++ ppp-2.4.5/debian/po/pl.po @@ -0,0 +1,155 @@ +# debconf templates for ppp package +# Polish translation +# Copyright (C) +# Łukasz Paździora, 2008 +# +# This file is distributed under the same license as the ppp package. +# +msgid "" +msgstr "" +"Project-Id-Version: ppp 2.4.4rel-10\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2008-11-20 16:30+0100\n" +"Last-Translator: Łukasz Paździora \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Konfiguracja i uruchomienie połączenia PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "Brak koncentratora PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"Sprawdzono wszystkie interfejsy sieciowe, ale koncentrator PPPoE nie " +"zostałznaleziony." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"Konfiguracja PPPoE została przerwana. Można ponowić jej próbę wybierając " +"odpowiednią pozycję z menu." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "Nazwa konta użytkownika u dostawcy Internetu:" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Proszę podać nazwę użytkownika do połączenia PPP." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "" +"Ta informacja powinna zostać dostarczona przez Twojego dostawcę Internetu." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "Hasło do konta użytkownika u dostawcy Internetu:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Proszę podać hasło do połączenia PPP." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "Brak interfejsu Ethernet" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"Połączenie PPPoE nie może zostać skonfigurowane ponieważ nie wykryto " +"interfejsu Ethernet." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "Szukanie koncentratorów w ${IFACE}..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "Błąd podczas uwierzytelniania" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"Próbowano nawiązać połączenie PPPoE, ale prawdopodobnie podano nieprawidłowe " +"dane." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "Proszę sprawdzić podaną nazwę użytkownika i hasło." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Nieobsługiwany błąd" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "" +"W trakcie próby utworzenia połączenia wystąpił niezidentyfikowany błąd." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Proszę czekać..." --- ppp-2.4.5.orig/debian/po/vi.po +++ ppp-2.4.5/debian/po/vi.po @@ -0,0 +1,165 @@ +# Vietnamese translation for PPP. +# Copyright © 2005 Free Software Foundation, Inc. +# Clytie Siddall , 2005-2007. +# +msgid "" +msgstr "" +"Project-Id-Version: ppp 2.4.4rel-10\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2007-10-24 18:27+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: LocFactoryEditor 1.7b1\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Cấu hình và khởi chạy kết nối PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "No PPPoE concentrator" +msgstr "Không có bộ tập trung PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"Mọi giao diện mạng đều đã được dò tìm, nhưng chưa phát hiện bộ tập trung " +"PPPoE." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"Tiến trình cấu hình PPPoE bị hủy bỏ. Vẫn còn có thể thử lại bằng cách chọn " +"mục trình đơn thích hợp." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "Tên người dùng của tài khoản ISP:" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Hãy gõ tên người dùng cho kết nối PPP." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "" +"Thông tin này nên được cung cấp bởi Nhà Cung cấp Dịch vụ Internet (ISP)," + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "ISP account password:" +msgstr "Mật khẩu của tài khoản ISP:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Hãy gõ mật khẩu cho kết nối PPP." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "No Ethernet interface" +msgstr "Không có giao diện Ethernet" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"Không thể cấu hình chức năng chạy mạng PPPoE vì chưa phát hiện giao diện " +"Ethernet." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "Đang tìm kiếm bộ tập trung trên ${IFACE}..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "Lỗi xác thực" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"Đã thử kết nối PPPoE, nhưng thông tin đăng nhập đã cung cấp rất có thể không " +"đúng." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Please check the username and password you provided." +msgstr "Hãy kiểm tra lại tên người dùng và mật khẩu bạn đã cung cấp." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Lỗi chưa xử lý" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "Gặp lỗi không rõ khi thử thiết lập kết nối." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Hãy đợi..." + +#~ msgid "Your PPPoE username" +#~ msgstr "Tên người dùng PPPoE của bạn" + +#~ msgid "Interface name" +#~ msgstr "Tên giao diện" + +#~ msgid "" +#~ "Choose the name of the network interface connected to your PPPoE modem." +#~ msgstr "" +#~ "Hãy chọn tên của giao diện mạng được kết nối đến bộ điều giải PPPoE của " +#~ "bạn." --- ppp-2.4.5.orig/debian/po/it.po +++ ppp-2.4.5/debian/po/it.po @@ -0,0 +1,181 @@ +# ppp - Italian Debconf messages +msgid "" +msgstr "" +"Project-Id-Version: ppp 2.4.4rel\n" +"Report-Msgid-Bugs-To: md@linux.it\n" +"POT-Creation-Date: 2007-10-24 07:31+0200\n" +"PO-Revision-Date: 2007-01-29 20:50+0200\n" +"Last-Translator: Marco d'Itri \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: text +#. Description +#. Main menu item +#: ../ppp-udeb.templates:2001 +msgid "Configure and start a PPPoE connection" +msgstr "Configura e attiva una connessione PPPoE" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +#, fuzzy +#| msgid "No concentrator was found" +msgid "No PPPoE concentrator" +msgstr "Non stato trovato un concentratore" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 +msgid "" +"All network interfaces have been probed, but a PPPoE concentrator was not " +"detected." +msgstr "" +"Si cercato su ogni interfaccia di rete, ma non stato trovato un " +"concentratore per PPPoE." + +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#. Type: error +#. Description +#: ../ppp-udeb.templates:3001 ../ppp-udeb.templates:7001 +#: ../ppp-udeb.templates:9001 ../ppp-udeb.templates:10001 +#, fuzzy +#| msgid "" +#| "The configuration of PPPoE is aborted. It can be attempted again by " +#| "selecting the relevant menu entry." +msgid "" +"The configuration of PPPoE has been aborted. It can be attempted again by " +"selecting the relevant menu entry." +msgstr "" +"La configurazione di PPPoE annullata. Pu essere tentata di nuovo " +"selezionando la voce dal men." + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "ISP account username:" +msgstr "" + +#. Type: string +#. Description +#: ../ppp-udeb.templates:5001 +msgid "Please enter the username for the PPP connection." +msgstr "Inserire l'username per la connessione PPP." + +#. Type: string +#. Description +#. Type: password +#. Description +#: ../ppp-udeb.templates:5001 ../ppp-udeb.templates:6001 +#, fuzzy +#| msgid "" +#| "This information should have been provided to you by your Internet " +#| "Service Provider." +msgid "" +"This information should have been provided by your Internet Service Provider." +msgstr "" +"Questa informazione dovrebbe essere stata fornita dal proprio Internet " +"Service Provider." + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +#, fuzzy +#| msgid "PPP password:" +msgid "ISP account password:" +msgstr "Password PPP:" + +#. Type: password +#. Description +#: ../ppp-udeb.templates:6001 +msgid "Please enter the password for the PPP connection." +msgstr "Inserire la password per la connessione PPP." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +#, fuzzy +#| msgid "No Ethernet interface found" +msgid "No Ethernet interface" +msgstr "Non stata trovata una interfaccia Ethernet" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:7001 +msgid "" +"PPPoE networking cannot be configured because no Ethernet interface was " +"detected." +msgstr "" +"La connessione PPPoE non pu essre configurata perch non stata trovata " +"alcuna interfaccia Ethernet." + +#. Type: text +#. Description +#: ../ppp-udeb.templates:8001 +msgid "Searching for concentrators on ${IFACE}..." +msgstr "Ricerca di concentratori su ${IFACE}..." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +msgid "Failed authentication" +msgstr "Autenticazione fallita" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +#, fuzzy +#| msgid "" +#| "A PPPoE connection was attempted, but the provided login information was " +#| "incorrect. Because of this the authentication failed." +msgid "" +"A PPPoE connection was attempted, but the provided login information was " +"probably incorrect." +msgstr "" +"Si tentato di connettersi con PPPoE ma l'autenticazione fallita perch " +"le informazioni di login fornite non sono valide." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:9001 +#, fuzzy +#| msgid "Please make sure you type the correct username and password." +msgid "Please check the username and password you provided." +msgstr "Assicurarsi di avere scritto username e password corretti." + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "Unhandled error" +msgstr "Errore non gestito" + +#. Type: error +#. Description +#: ../ppp-udeb.templates:10001 +msgid "An unidentified error happened while attempting to create a connection." +msgstr "" + +#. Type: text +#. Description +#: ../ppp-udeb.templates:11001 +msgid "Please wait..." +msgstr "Attendere..." + +#~ msgid "PPP login:" +#~ msgstr "Login PPP:" + +#~ msgid "" +#~ "It seems that the attempt to create a connection resulted in an unhandled " +#~ "error. Probably there is some exceptional situation which prevents " +#~ "establishing the connection." +#~ msgstr "" +#~ "Sembra che il tentativo di creare una connessione abbia causato un errore " +#~ "non gestito. Probabilmente una situazione eccezionale impedisce di " +#~ "stabilire la connessione." --- ppp-2.4.5.orig/extra/pon +++ ppp-2.4.5/extra/pon @@ -0,0 +1,65 @@ +#!/bin/sh + +while [ $# -ge 1 ]; do +case "$1" in + --quick|-q) + QUICK=true + shift + ;; + -*) + echo "\ +Usage: pon [OPTIONS] [provider] [arguments] + -q|--quick pppd hangs up after all ip-up scripts are run + +If pon is invoked without arguments, /etc/ppp/ppp_on_boot file will be +run, presuming it exists and is executable. Otherwise, a PPP connection +will be started using settings from /etc/ppp/peers/provider. +If you specify one argument, a PPP connection will be started using +settings from the appropriate file in the /etc/ppp/peers/ directory, and +any additional arguments supplied will be passed as extra arguments to +pppd. +" + exit 0 + ;; + *) + break + ;; +esac +done + +if [ ! -r /etc/ppp/peers/ ]; then + echo "Error: only members of the 'dip' group can use this command." + exit 1 +fi + +if [ "$1" ]; then + PROVIDER=$1 + shift +fi + +# Perform ppp_on_boot migration from pppoe package. +if [ -L /etc/ppp/ppp_on_boot -a "$(readlink /etc/ppp/ppp_on_boot)" = \ + "ppp_on_boot.dsl" -a ! -e /etc/ppp/ppp_on_boot.dsl ]; then + rm -f /etc/ppp/ppp_on_boot + ln -s pppoe_on_boot /etc/ppp/ppp_on_boot +fi + +if [ -z "$PROVIDER" ]; then + if [ -x /etc/ppp/ppp_on_boot ]; then + [ "$QUICK" ] && touch /var/run/ppp-quick + exec /etc/ppp/ppp_on_boot + fi + # try the default script + PROVIDER=provider +fi + +if [ ! -e "/etc/ppp/peers/$PROVIDER" ]; then + echo "\ +The file /etc/ppp/peers/$PROVIDER does not exist. Please create it or use +a command line argument to use another file in the /etc/ppp/peers/ directory." + exit 1 +fi + +[ "$QUICK" ] && touch /var/run/ppp-quick +exec /usr/sbin/pppd call $PROVIDER "$@" + --- ppp-2.4.5.orig/extra/provider.chatscript +++ ppp-2.4.5/extra/provider.chatscript @@ -0,0 +1,19 @@ +# This is the chat script used to dial out to your default service provider. +# Please customize the entries enclosed in parenthesis to match your setup. +# Only the "provider" file will be handled by poff and pon (unless with +# extra command line arguments). +# +# Remember to edit /etc/ppp/peers/provider accordingly. +# +# ATZW2 as a default init string +# - On all hayes compatible modems, W2 will correctly report the connect +# speed. +# +ABORT BUSY +ABORT "NO CARRIER" +ABORT VOICE +ABORT "NO DIALTONE" +"" ATZW2 +OK ATDT +ogin +word \q --- ppp-2.4.5.orig/extra/autopppd +++ ppp-2.4.5/extra/autopppd @@ -0,0 +1,181 @@ +#!/usr/bin/perl -w + +# From: Brian May +# To: Debian Bug Tracking System +# Subject: ppp: Increase redial time with each failed PPP connection attempt +# Date: Fri, 04 Oct 2002 10:02:50 +1000 +# Message-Id: <20021004000251.9396ECD17@scrooge.chocbit.org.au> +# +# Package: ppp +# Version: 2.4.1.uus-4 +# Severity: normal +# Tags: patch +# +# Suggested script to include. It means that each time to +# connect is made longer, so that you don't get a huge bill if +# for some reason the modem connects but a PPP connection cannot +# be established: +# +# This program depends on libproc-daemon-perl and libproc-waitstat-perl . + +use Proc::Daemon; +use strict; +use Sys::Syslog qw(:DEFAULT setlogsock); # default set, plus setlogsock +use Proc::WaitStat qw(:DEFAULT waitstat); + + +Proc::Daemon::Init; + +my $pidfile = '/var/run/autopppd.pid'; +open(PIDFILE, $pidfile); +print(PIDFILE "$$\n"); +close(PIDFILE); + +sub toseconds($) { + my ($hours,$minutes,$seconds) = split(/:/,shift); + return ($hours*60+$minutes)*60+$seconds; +} + +sub dseconds($) { + my ($total) = @_; + + my $seconds = $total % 60; $total = ($total - $seconds)/60; + my $minutes = $total % 60; $total = ($total - $minutes)/60; + my $hours = $total % 24; $total = ($total - $hours)/24; + my $days = $total; + if ($days > 0) { + return(sprintf("%d-%02d:%02d:%02d",$days,$hours,$minutes,$seconds)); + } else { + return(sprintf("%02d:%02d:%02d",$hours,$minutes,$seconds)); + } +} + +my $program="autopppd"; + +setlogsock('unix'); +openlog($program, 'cons,pid', 'daemon'); + +my $pppd_start_time; +my $pppd_end_time; +my $pppd_run_time; +my $pppd_fail; +my $delay=0; +my $idelay=0; + +my @delays = ( + toseconds("00:01:00"), # 1 minute + toseconds("00:07:00"), # 8 minutes + toseconds("00:07:00"), # 15 minutes + toseconds("00:15:00"), # 30 minutes + toseconds("00:30:00"), # 1 hour + toseconds("01:00:00"), # 2 hours + toseconds("01:00:00"), # 3 hours + toseconds("03:00:00"), # 6 hours + toseconds("06:00:00"), # 12 hours + toseconds("12:00:00"), # 24 hours + toseconds("24:00:00") # 48 hours + ); + +# action == 0 => immediate retry (!FIXME! needs to have some delay) +# action == 1 => delayed retry +# action == 2 => abort + +my $code = { + 0 => { message=>"pppd detached", action=> 2 }, + 1 => { message=>"fatal error", action=> 2 }, + 2 => { message=>"options error", action=> 2 }, + 3 => { message=>"not setuid-root error", action=> 2 }, + 4 => { message=>"no kernel support for PPP", action=> 2 }, + 5 => { message=>"SIGINT or SIGTERM or SIGHUP", action=> 1 }, + 6 => { message=>"Serial port locked", action=> 1 }, # should be 0 + 7 => { message=>"Serial port open error", action=> 1 }, + 8 => { message=>"Connect failed", action=> 1 }, + 9 => { message=>"Could not execute pty command", action=> 1 }, + 10 => { message=>"PPP negotiation failed", action=> 1 }, + 11 => { message=>"Peer failed to authenticate", action=> 1 }, + 12 => { message=>"Link was idle", action=> 1 }, + 13 => { message=>"Time limit exceeded", action=> 1 }, + 14 => { message=>"call back not implemented", action=> 2 }, + 15 => { message=>"peer not responding", action=> 1 }, + 16 => { message=>"modem hang up", action=> 1 }, + 17 => { message=>"Serial loopback detected", action=> 1 }, + 18 => { message=>"Init script failed", action=> 1 }, + 19 => { message=>"We failed to authenticate", action=> 1 }, +}; + +while (1) +{ + $pppd_start_time=time; + syslog('info', 'restarting pppd'); + + # logging sometimes stopped working after ppp was running for + # some time. lets see if closing and reopening the log file helps... + closelog(); + + # run ppp + my $rc=system("pppd","-detach",@ARGV); + + # reopon log file + openlog($program, 'cons,pid', 'daemon'); + + # calculate run time + $pppd_end_time=time; + $pppd_run_time=$pppd_end_time-$pppd_start_time; + + my $pppd_code = ($? >> 8); + my $pppd_signal = $? & 127; + my $pppd_coredump = $? & 128; + + $pppd_fail = 1; + if ($pppd_signal != 0) { + if ($pppd_coredump) + { syslog('err',"pppd died with signal $pppd_signal, coredump"); } + else + { syslog('err',"pppd died with signal $pppd_signal"); } + } + elsif ($pppd_coredump) { + syslog('err',"pppd died with coredump"); + } + elsif (defined($code->{$pppd_code}) && $code->{$pppd_code}{"action"} == 0) { + syslog('err', "pppd returned: ".$code->{$pppd_code}{"message"}." ($pppd_code), immediate retry"); + $pppd_fail = 0; + } + elsif (defined($code->{$pppd_code}) && $code->{$pppd_code}{"action"} == 1) { + syslog('err', "pppd returned: ".$code->{$pppd_code}{"message"}." ($pppd_code), delayed retry"); + $pppd_fail = 1; + } + elsif (defined($code->{$pppd_code}) && $code->{$pppd_code}{"action"} >= 2) { + syslog('err', "pppd returned: ".$code->{$pppd_code}{"message"}." ($pppd_code), aborting"); + exit(255); + unlink $pidfile; + } + elsif (defined($code->{$pppd_code}) && $code->{$pppd_code}{"action"} >= 2) { + syslog('err', "pppd returned: unknown error ($pppd_code), delayed retry"); + $pppd_fail = 1; + } + # if it hasn't ran for at least an hour, then somthing went wrong + elsif ($pppd_run_time < toseconds("01:00:00")) { + syslog('err',"pppd session didn't last 1 hour, delayed retry"); + $pppd_fail = 1; + } + else { $pppd_fail = 0; } + + # if not failed, then reset delay. + if (!$pppd_fail) { $idelay = 0; } + + # get next delay. + $delay = $delays[$idelay]; + + # log statistics. + syslog('info',"rc=".waitstat($rc)." runtime=".dseconds($pppd_run_time)." delay[$idelay]=".dseconds($delay).""); + + # delay for desired time. + sleep($delay); + + # increment delay for next time. + if (defined($delays[$idelay+1])) { $idelay++; } +} + +closelog(); +unlink $pidfile; + --- ppp-2.4.5.orig/extra/pon.completion +++ ppp-2.4.5/extra/pon.completion @@ -0,0 +1,51 @@ +# Debian GNU/Linux pon/poff(1) completion +# Copyright 2002 Baruch Even +# License: GNU GPL v2 or later + +have pon && +_pon() +{ + local cur conns + + [ -r /etc/ppp/peers/ ] || return 0 + + COMPREPLY=() + cur=${COMP_WORDS[COMP_CWORD]} + conns=$(\ls --color=none /etc/ppp/peers | egrep -v '(\.bak|~)$') + + if [ $COMP_CWORD -eq 1 ]; then + COMPREPLY=( $(compgen -o filenames -W "$conns" $cur) ) + fi + + return 0 +} +[ "$have" ] && complete -F _pon pon + +have poff && +_poff() +{ + local prev cur conns + + [ -r /etc/ppp/peers/ ] || return 0 + + COMPREPLY=() + prev=${COMP_WORDS[COMP_CWORD-1]} + cur=${COMP_WORDS[COMP_CWORD]} + conns=$(\ls --color=none /etc/ppp/peers | egrep -v '(\.bak|~)$') + + if [[ "$cur" == -* ]]; then + COMPREPLY=( $(compgen -W '-r -d -c -a -h -v' -- $cur) ) + return 0 + fi + + # first parameter on line or first since an option? + if [ $COMP_CWORD -eq 1 ] && [[ "$cur" != -* ]] || \ + [[ "$prev" == -* ]]; then + COMPREPLY=( $(compgen -o filenames -W "$conns" $cur) ) + fi + + return 0 +} +[ "$have" ] && complete -F _poff poff + +# vim:ft=sh: --- ppp-2.4.5.orig/extra/popp +++ ppp-2.4.5/extra/popp @@ -0,0 +1,33 @@ +#!/usr/bin/perl -w +# +# popp connects to your provider and returns. You are able to +# see pppd proceed dialing. Once the connection is +# established pppd returns. +# +# Exit Status: taken from pppd +# +# Example: popp && mailsync +# +# This will dial your default provider, you will see pppd +# progress and as soon as the connection's established, your +# mail will get synchronized +# +# Version: 0.1 28-Dec-2001 "Tomas Pospisek" + +use strict; + +my $ret; + +my $pid = fork(); + +unless ($pid) { + # child + exec "plog -f"; +} else { + # parent + my $provider = "provider" unless @ARGV; + $ret = system "pon $provider @ARGV updetach"; + kill "SIGTERM", $pid; +}; + +exit $ret / 256; # perlbizzare --- ppp-2.4.5.orig/extra/pon.1 +++ ppp-2.4.5/extra/pon.1 @@ -0,0 +1,126 @@ +.\" This manual is published under the GPL. +.\" All guidelines specified in the GPL apply here. +.\" To get an ascii file: +.\" groff -man -Tascii pon.1 > pon.txt +.\" +.TH PON 1 "July 2000" "Debian Project" "Debian PPPD" +.SH NAME +pon, poff, plog \- starts up, shuts down or lists the log of PPP connections +.SH SYNOPSIS +.B pon +[ isp\-name [ options ] ] +.br +.B poff +[ \-r ] [ \-d ] [ \-c ] [ \-a ] [ \-h ] [ isp\-name ] +.br +.B plog +[ arguments ] +.SH DESCRIPTION +This manual page describes the \fBpon\fP, \fBplog\fP and \fBpoff\fP +scripts, which allow users to control PPP connections. +.PP +.SS pon +\fBpon\fP, invoked without arguments, runs the \fI/etc/ppp/ppp_on_boot\fP +file, if it exists and is executable. Otherwise, a PPP connection will be +started using configuration from \fI/etc/ppp/peers/provider\fP. +This is the default behaviour unless an \fBisp\-name\fP argument is given. +.PP +For instance, to use ISP configuration "myisp" run: +.IP +pon myisp +.PP +\fBpon\fP will then use the options file \fI/etc/ppp/peers/myisp\fP. +You can pass additional \fBpppd options\fP after the ISP name, too. +\fBpon\fP can be used to run multiple, simultaneous PPP connections. +.PP +\fBpon\fP takes the following command line options: +.RS +.TP +.B "\-q" "\-\-quick" +disconnect when ip\-up finishes running. +This function is only available to the \fIroot\fP user. +.SS poff +\fBpoff\fP closes a PPP connection. If more than one PPP connection exists, +the one named in the argument to \fBpoff\fP will be killed, e.g. +.IP +poff myprovider2 +.PP +will terminate the connection to myprovider2, and leave the PPP connections +to e.g. "myprovider1" or "myprovider3" up and running. +.PP +\fBpoff\fP takes the following command line options: +.RS +.TP +.B "\-r" +causes the connection to be redialed after it is dropped. +.TP +.B "\-d" +toggles the state of pppd's debug option. +.TP +.B "\-c" +causes +.BR pppd (8) +to renegotiate compression. +.TP +.B "\-a" +stops all running ppp connections. If the argument \fBisp\-name\fP +is given it will be ignored. +.TP +.B "\-h" +displays help information. +.TP +.B "\-v" +prints the version and exits. +.PP +If no argument is given, \fBpoff\fP will stop or signal pppd if and only +if there is exactly one running. If more than one connection is active, +it will exit with an error code of 1. +.PP +.SS plog +\fBplog\fP shows you the last few lines of \fI/var/log/ppp.log\fP. If that +file doesn't exist, it shows you the last few lines of your +\fI/var/log/syslog\fP file, but excluding the lines not generated by pppd. +This script makes use of the +.BR tail (1) +command, so arguments that can be passed to +.BR tail (1) +can also be passed to \fBplog\fP. +.PP +Note: the \fBplog\fP script can only be used by root or another system +administrator in group "adm", due to security reasons. Also, to have all +pppd-generated information in one logfile, that plog can show, you need the +following line in your \fI/etc/syslog.conf\fP file: +.PP +local2.* \-/var/log/ppp.log +.RE +.SH FILES +.TP +.I /etc/ppp/options +PPPd system options file. +.TP +.I /etc/ppp/pap\-secrets +System PAP passwords file. +.TP +.I /etc/ppp/chap\-secrets +System CHAP passwords file. +.TP +.I /etc/ppp/peers/ +Directory holding the peer options files. The default file is called +\fIprovider\fP. +.TP +.I /etc/chatscripts/provider +The chat script invoked from the default \fI/etc/ppp/peers/provider\fP. +.TP +.I /var/log/ppp.log +The default PPP log file. +.SH AUTHORS +The p-commands were written by Christoph Lameter . +Updated and revised by Philip Hands . +.br +This manual was written by Othmar Pasteka . Modified +by Rob Levin , with some extensions taken from +the old p-commands manual written by John Hasler . +.SH "SEE ALSO" +.BR pppd (8), +.BR chat (8), +.BR tail (1). --- ppp-2.4.5.orig/extra/userscripts-up +++ ppp-2.4.5/extra/userscripts-up @@ -0,0 +1,7 @@ +#!/bin/sh -e + +getent passwd | awk -F: '{print $1 " " $6}' | \ +while read user home; do + [ -x $home/.ip-up.d/ ] && su $user run-parts $home/.ip-up.d/ +done + --- ppp-2.4.5.orig/extra/defaultroute +++ ppp-2.4.5/extra/defaultroute @@ -0,0 +1,51 @@ +From: Marek Michalkiewicz +To: Debian Bug Tracking System +Subject: Bug#85426: default route uses wrong interface with the same IP address + +Package: ppp +Version: 2.4.0f-1 +Severity: wishlist + +The pppd "defaultroute" option, when the ppp0 interface comes up, seems +to do the equivalent of "route add default gw $ip_address", and I think +it should do the equivalent of "route add default dev ppp0" instead. + +In most normal cases this shouldn't matter (because each interface has +its own unique IP address), but specifying the interface by name (not +by its IP address) may be preferable if there is more than one interface +with the same IP address. + +I have a dummy0 interface with the same IP address as that of ppp0. +This makes it possible to connect to the box from the internal LAN +using its normal hostname (even if ppp0 is down at the moment), and +to run named (possibly started before ppp0 comes up) as non-root. + +Using the "defaultroute" option causes pppd to set up the default route +via dummy0 (first device found with matching IP address), not ppp0. +I've worked around this by disabling the pppd defaultroute option and +creating a small shell script called /etc/ppp/ip-up.d/000defaultroute +(run before 00ipmasq) with the following contents: + +#! /bin/sh +set -e +/sbin/route add default dev $PPP_IFACE + +This gets the default route right (no corresponding ip-down script is +necessary - when ppp0 goes down, the route is removed automatically). +Please consider at least documenting this workaround, as I think it +may be useful to someone. + +Thanks, +Marek + +-- System Information +Debian Release: testing/unstable +Architecture: i386 +Kernel: Linux alf 2.2.19pre7 #1 Sat Jan 27 15:26:41 CET 2001 i586 + +Versions of packages ppp depends on: +ii libc6 2.2.1-1 GNU C Library: Shared libraries an +ii libpam-modules 0.72-12 Pluggable Authentication Modules f +ii libpam0g 0.72-12 Pluggable Authentication Modules l +ii netbase 4.05 Basic TCP/IP networking system +ii sysvinit 2.78-4 System-V like init. --- ppp-2.4.5.orig/extra/ppp-udeb-postbaseinst +++ ppp-2.4.5/extra/ppp-udeb-postbaseinst @@ -0,0 +1,16 @@ +#!/bin/sh -e +# Configure ppp for the target system +# Note: netcfg takes care of general networking configuration files + +# We can only do this after ppp has been installed to ensure correct permissions +apt-install ppp || true + +if [ ! -d /target/etc/ppp/peers ]; then + logger -t ppp-udeb "Error: directory /target/etc/ppp/peers does not exist" + logger -t ppp-udeb "There may have been an error installing ppp" + exit 1 +fi + +# We copy over already existing files, so permissions are preserved +cp /etc/ppp/*-secrets /target/etc/ppp/ +cp /etc/ppp/peers/provider /target/etc/ppp/peers/ --- ppp-2.4.5.orig/extra/per-linkname +++ ppp-2.4.5/extra/per-linkname @@ -0,0 +1,33 @@ +Date: Mon, 06 Oct 2003 16:00:25 +0200 +From: Eyal Rozenberg +Subject: ppp per-linkname script dir + +(I'm writing you as the maintainer of the Debian ppp package) + +On my system, I sometime find it necessary to run different commands for +different peers/providers after the ppp connection, like specific +complex routing configuration, etc. To do so I have added the files +/etc/ppp/ip-up.d/00peer-specific and /etc/ppp/ip-down.d/00peer-specific +whose contents is: +------------------------------------------------------------------ + +#!/bin/bash +# +# run peer-specific (or, rather, 'link-name' specific) scripts + +if [ -n "$LINKNAME" ] ; then + run-parts /etc/ppp/ip-up.d/$LINKNAME +fi + +exit 0 + +------------------------------------------------------------------ + +and the same thing for if-down.d (but with its respective directory +name). To use these, one must set the linkname pppd option in the files +under /etc/ppp/peers - but that's a good idea anyway. + +Perhaps you would consider adding such files to the ppp package. + +Eyal Rozenberg + --- ppp-2.4.5.orig/extra/options.ttyXX +++ ppp-2.4.5/extra/options.ttyXX @@ -0,0 +1,22 @@ +# If you need to set up multiple serial lines differently, then copy this +# file to options. for each with a modem on it. +# +# Example: +# options.ttyS1 for the second serial port (a.k.a. COM2) +# +# Edit the following line so that the first IP address mentioned is the +# IP address or name of your host, while the second is the IP address +# or name of the remote machine. + +hostname:remotepeername +# 192.168.0.1:192.168.0.2 + +# You may also put additional settings in each file, just like in the +# general options file. For example: +# +# noauth +# debug +# defaultroute +# mtu 296 +# +# Read pppd(8) for more information. --- ppp-2.4.5.orig/extra/chatscript.gprs +++ ppp-2.4.5/extra/chatscript.gprs @@ -0,0 +1,38 @@ +# You can use this script unmodified to connect to cellular networks. +# The APN is specified in the peers file as the argument of the -T command +# line option of chat(8). + +# For details about the AT commands involved please consult the relevant +# standard: 3GPP TS 27.007 - AT command set for User Equipment (UE). +# (http://www.3gpp.org/ftp/Specs/html-info/27007.htm) + +ABORT BUSY +ABORT VOICE +ABORT "NO CARRIER" +ABORT "NO DIALTONE" +ABORT "NO DIAL TONE" +ABORT "NO ANSWER" +ABORT "DELAYED" +ABORT "ERROR" + +# cease if the modem is not attached to the network yet +ABORT "+CGATT: 0" + +"" AT +TIMEOUT 12 +OK ATH +OK ATE1 + +# +CPIN provides the SIM card PIN +#OK "AT+CPIN=1234" + +# +CFUN may allow to configure the handset to limit operations to +# GPRS/EDGE/UMTS/etc to save power, but the arguments are not standard +# except for 1 which means "full functionality". +#OK AT+CFUN=1 + +OK AT+CGDCONT=1,"IP","\T","",0,0 +OK ATD*99# +TIMEOUT 22 +CONNECT "" + --- ppp-2.4.5.orig/extra/provider.peer +++ ppp-2.4.5/extra/provider.peer @@ -0,0 +1,35 @@ +# example configuration for a dialup connection authenticated with PAP or CHAP +# +# This is the default configuration used by pon(1) and poff(1). +# See the manual page pppd(8) for information on all the options. + +# MUST CHANGE: replace myusername@realm with the PPP login name given to +# your by your provider. +# There should be a matching entry with the password in /etc/ppp/pap-secrets +# and/or /etc/ppp/chap-secrets. +user "myusername@realm" + +# MUST CHANGE: replace ******** with the phone number of your provider. +# The /etc/chatscripts/pap chat script may be modified to change the +# modem initialization string. +connect "/usr/sbin/chat -v -f /etc/chatscripts/pap -T ********" + +# Serial device to which the modem is connected. +/dev/modem + +# Speed of the serial line. +115200 + +# Assumes that your IP address is allocated dynamically by the ISP. +noipdefault +# Try to get the name server addresses from the ISP. +usepeerdns +# Use this connection as the default route. +defaultroute + +# Makes pppd "dial again" when the connection is lost. +persist + +# Do not ask the remote to authenticate. +noauth + --- ppp-2.4.5.orig/extra/pppoe-discovery.8 +++ ppp-2.4.5/extra/pppoe-discovery.8 @@ -0,0 +1,86 @@ +.\" pppoe-discovery.8 written by +.\" Ben Hutchings , based on pppoe.8. +.\" Licenced under the GPL version 2 or later. +.TH PPPOE-DISCOVERY 8 "22 January 2006" +.SH NAME +pppoe\-discovery \- perform PPPoE discovery +.SH SYNOPSIS +.B pppoe\-discovery +[ +.I options +] +.br +.BR pppoe\-discovery " { " \-V " | " \-h " }" +.SH DESCRIPTION +.LP +\fBpppoe\-discovery\fR performs the same discovery process as +\fBpppoe\fR, but does not initiate a session. +It sends a PADI packet and then prints the names of access +concentrators in each PADO packet it receives. +.SH OPTIONS +.TP +.BI \-I " interface" +.RS +The \fB\-I\fR option specifies the Ethernet interface to use. +Under Linux, it is typically eth0 or eth1. +The interface should be \(lqup\(rq before you start +\fBpppoe\-discovery\fR, but should \fInot\fR be configured to have an +IP address. +The default interface is eth0. +.RE +.TP +.BI \-D " file_name" +.RS +The \fB\-D\fR option causes every packet to be dumped to the specified +\fIfile_name\fR. +This is intended for debugging only. +.RE +.TP +.B \-U +.RS +Causes \fBpppoe\-discovery\fR to use the Host-Uniq tag in its discovery +packets. +This lets you run multiple instances of \fBpppoe\-discovery\fR and/or +\fBpppoe\fR without having their discovery packets interfere with one +another. +You must supply this option to \fIall\fR instances that you intend to +run simultaneously. +.RE +.TP +.BI \-S " service_name" +.RS +Specifies the desired service name. +\fBpppoe\-discovery\fR will only accept access concentrators which can +provide the specified service. +In most cases, you should \fInot\fR specify this option. +Use it only if you know that there are multiple access concentrators +or know that you need a specific service name. +.RE +.TP +.BI \-C " ac_name" +.RS +Specifies the desired access concentrator name. +\fBpppoe\-discovery\fR will only accept the specified access +concentrator. +In most cases, you should \fInot\fR specify this option. +Use it only if you know that there are multiple access concentrators. +If both the \fB\-S\fR and \fB\-C\fR options are specified, they must +\fIboth\fR match. +.RE +.TP +.B \-A +.RS +This option is accepted for compatibility with \fBpppoe\fR, but has no +effect. +.RE +.TP +.BR \-V " | " \-h +.RS +Either of these options causes \fBpppoe\-discovery\fR to print its +version number and usage information, then exit. +.RE +.SH AUTHORS +\fBpppoe\-discovery\fR was written by Marco d'Itri , +based on \fBpppoe\fR by David F. Skoll . +.SH SEE ALSO +pppoe(8), pppoe-sniff(8) --- ppp-2.4.5.orig/extra/ppp-udeb.ip-up +++ ppp-2.4.5/extra/ppp-udeb.ip-up @@ -0,0 +1,13 @@ +#!/bin/sh +# adds the DNS servers got via ppp to the global resolv.conf +# License: GPL +# Copyright Eddy Petrișor 2006 + +umask 0022 # normally ran by pppd with 0077 +: >> /etc/resolv.conf +MARK='added by D-I (pppd)' +cp /etc/resolv.conf /tmp/resolv.conf.tmp +sed "/#$MARK/d" /tmp/resolv.conf.tmp > /etc/resolv.conf +rm -f /tmp/resolv.conf.tmp +[ "$DNS1" ] && echo "nameserver $DNS1 #$MARK" >> /etc/resolv.conf +[ "$DNS2" ] && echo "nameserver $DNS2 #$MARK" >> /etc/resolv.conf --- ppp-2.4.5.orig/extra/userscripts-down +++ ppp-2.4.5/extra/userscripts-down @@ -0,0 +1,7 @@ +#!/bin/sh -e + +getent passwd | awk -F: '{print $1 " " $6}' | \ +while read user home; do + [ -x $home/.ip-up.d/ ] && su $user run-parts $home/.ip-up.d/ +done + --- ppp-2.4.5.orig/extra/options +++ ppp-2.4.5/extra/options @@ -0,0 +1,353 @@ +# /etc/ppp/options +# +# Originally created by Jim Knoble +# Modified for Debian by alvar Bray +# Modified for PPP Server setup by Christoph Lameter +# +# To quickly see what options are active in this file, use this command: +# egrep -v '#|^ *$' /etc/ppp/options + +# Specify which DNS Servers the incoming Win95 or WinNT Connection should use +# Two Servers can be remotely configured +# ms-dns 192.168.1.1 +# ms-dns 192.168.1.2 + +# Specify which WINS Servers the incoming connection Win95 or WinNT should use +# ms-wins 192.168.1.50 +# ms-wins 192.168.1.51 + +# Run the executable or shell command specified after pppd has +# terminated the link. This script could, for example, issue commands +# to the modem to cause it to hang up if hardware modem control signals +# were not available. +#disconnect "chat -- \d+++\d\c OK ath0 OK" + +# async character map -- 32-bit hex; each bit is a character +# that needs to be escaped for pppd to receive it. 0x00000001 +# represents '\x01', and 0x80000000 represents '\x1f'. +asyncmap 0 + +# Require the peer to authenticate itself before allowing network +# packets to be sent or received. +# Please do not disable this setting. It is expected to be standard in +# future releases of pppd. Use the call option (see manpage) to disable +# authentication for specific peers. +#auth +noauth +# ... Unfortunately, fixing this properly in the peers file +# (/etc/ppp/peers/ppp0, typically) is apparently incompatible with the +# paradigm used by gnome-system-tools and system-tools-backend for +# managing the peers files. So in Ubuntu Feisty we change the default. + +# Use hardware flow control (i.e. RTS/CTS) to control the flow of data +# on the serial port. +crtscts + +# Use software flow control (i.e. XON/XOFF) to control the flow of data +# on the serial port. +#xonxoff + +# Specifies that certain characters should be escaped on transmission +# (regardless of whether the peer requests them to be escaped with its +# async control character map). The characters to be escaped are +# specified as a list of hex numbers separated by commas. Note that +# almost any character can be specified for the escape option, unlike +# the asyncmap option which only allows control characters to be +# specified. The characters which may not be escaped are those with hex +# values 0x20 - 0x3f or 0x5e. +#escape 11,13,ff + +# Don't use the modem control lines. +#local + +# Specifies that pppd should use a UUCP-style lock on the serial device +# to ensure exclusive access to the device. +lock + +# Don't show the passwords when logging the contents of PAP packets. +# This is the default. +hide-password + +# When logging the contents of PAP packets, this option causes pppd to +# show the password string in the log message. +#show-password + +# Use the modem control lines. On Ultrix, this option implies hardware +# flow control, as for the crtscts option. (This option is not fully +# implemented.) +modem + +# Set the MRU [Maximum Receive Unit] value to for negotiation. pppd +# will ask the peer to send packets of no more than bytes. The +# minimum MRU value is 128. The default MRU value is 1500. A value of +# 296 is recommended for slow links (40 bytes for TCP/IP header + 256 +# bytes of data). +#mru 542 + +# Set the interface netmask to , a 32 bit netmask in "decimal dot" +# notation (e.g. 255.255.255.0). +#netmask 255.255.255.0 + +# Disables the default behaviour when no local IP address is specified, +# which is to determine (if possible) the local IP address from the +# hostname. With this option, the peer will have to supply the local IP +# address during IPCP negotiation (unless it specified explicitly on the +# command line or in an options file). +#noipdefault + +# Enables the "passive" option in the LCP. With this option, pppd will +# attempt to initiate a connection; if no reply is received from the +# peer, pppd will then just wait passively for a valid LCP packet from +# the peer (instead of exiting, as it does without this option). +#passive + +# With this option, pppd will not transmit LCP packets to initiate a +# connection until a valid LCP packet is received from the peer (as for +# the "passive" option with old versions of pppd). +#silent + +# Don't request or allow negotiation of any options for LCP and IPCP +# (use default values). +#-all + +# Disable Address/Control compression negotiation (use default, i.e. +# address/control field disabled). +#-ac + +# Disable asyncmap negotiation (use the default asyncmap, i.e. escape +# all control characters). +#-am + +# Don't fork to become a background process (otherwise pppd will do so +# if a serial device is specified). +#-detach + +# Disable IP address negotiation (with this option, the remote IP +# address must be specified with an option on the command line or in +# an options file). +#-ip + +# Disable IPCP negotiation and IP communication. This option should +# only be required if the peer is buggy and gets confused by requests +# from pppd for IPCP negotiation. +#noip + +# Disable magic number negotiation. With this option, pppd cannot +# detect a looped-back line. +#-mn + +# Disable MRU [Maximum Receive Unit] negotiation (use default, i.e. +# 1500). +#-mru + +# Disable protocol field compression negotiation (use default, i.e. +# protocol field compression disabled). +#-pc + +# Require the peer to authenticate itself using PAP. +#+pap + +# Don't agree to authenticate using PAP. +#-pap + +# Require the peer to authenticate itself using CHAP [Cryptographic +# Handshake Authentication Protocol] authentication. +#+chap + +# Don't agree to authenticate using CHAP. +#-chap + +# Disable negotiation of Van Jacobson style IP header compression (use +# default, i.e. no compression). +#-vj + +# Increase debugging level (same as -d). If this option is given, pppd +# will log the contents of all control packets sent or received in a +# readable form. The packets are logged through syslog with facility +# daemon and level debug. This information can be directed to a file by +# setting up /etc/syslog.conf appropriately (see syslog.conf(5)). (If +# pppd is compiled with extra debugging enabled, it will log messages +# using facility local2 instead of daemon). +#debug + +# Append the domain name to the local host name for authentication +# purposes. For example, if gethostname() returns the name porsche, +# but the fully qualified domain name is porsche.Quotron.COM, you would +# use the domain option to set the domain name to Quotron.COM. +#domain + +# Enable debugging code in the kernel-level PPP driver. The argument n +# is a number which is the sum of the following values: 1 to enable +# general debug messages, 2 to request that the contents of received +# packets be printed, and 4 to request that the contents of transmitted +# packets be printed. +#kdebug n + +# Set the MTU [Maximum Transmit Unit] value to . Unless the peer +# requests a smaller value via MRU negotiation, pppd will request that +# the kernel networking code send data packets of no more than n bytes +# through the PPP network interface. +#mtu + +# Set the name of the local system for authentication purposes to . +# This is a privileged option. With this option, pppd will use lines in the +# secrets files which have as the second field when looking for a +# secret to use in authenticating the peer. In addition, unless overridden +# with the user option, will be used as the name to send to the peer +# when authenticating the local system to the peer. (Note that pppd does +# not append the domain name to .) +#name + +# Enforce the use of the hostname as the name of the local system for +# authentication purposes (overrides the name option). +#usehostname + +# Set the assumed name of the remote system for authentication purposes +# to . +#remotename + +# Add an entry to this system's ARP [Address Resolution Protocol] +# table with the IP address of the peer and the Ethernet address of this +# system. +#proxyarp + +# Use the system password database for authenticating the peer using +# PAP. Note: mgetty already provides this option. If this is specified +# then dialin from users using a script under Linux to fire up ppp wont work. +# login + +# If this option is given, pppd will send an LCP echo-request frame to the +# peer every n seconds. Normally the peer should respond to the echo-request +# by sending an echo-reply. This option can be used with the +# lcp-echo-failure option to detect that the peer is no longer connected. +lcp-echo-interval 30 + +# If this option is given, pppd will presume the peer to be dead if n +# LCP echo-requests are sent without receiving a valid LCP echo-reply. +# If this happens, pppd will terminate the connection. Use of this +# option requires a non-zero value for the lcp-echo-interval parameter. +# This option can be used to enable pppd to terminate after the physical +# connection has been broken (e.g., the modem has hung up) in +# situations where no hardware modem control lines are available. +lcp-echo-failure 4 + +# Set the LCP restart interval (retransmission timeout) to seconds +# (default 3). +#lcp-restart + +# Set the maximum number of LCP terminate-request transmissions to +# (default 3). +#lcp-max-terminate + +# Set the maximum number of LCP configure-request transmissions to +# (default 10). +#lcp-max-configure + +# Set the maximum number of LCP configure-NAKs returned before starting +# to send configure-Rejects instead to (default 10). +#lcp-max-failure + +# Set the IPCP restart interval (retransmission timeout) to +# seconds (default 3). +#ipcp-restart + +# Set the maximum number of IPCP terminate-request transmissions to +# (default 3). +#ipcp-max-terminate + +# Set the maximum number of IPCP configure-request transmissions to +# (default 10). +#ipcp-max-configure + +# Set the maximum number of IPCP configure-NAKs returned before starting +# to send configure-Rejects instead to (default 10). +#ipcp-max-failure + +# Set the PAP restart interval (retransmission timeout) to seconds +# (default 3). +#pap-restart + +# Set the maximum number of PAP authenticate-request transmissions to +# (default 10). +#pap-max-authreq + +# Set the maximum time that pppd will wait for the peer to authenticate +# itself with PAP to seconds (0 means no limit). +#pap-timeout + +# Set the CHAP restart interval (retransmission timeout for +# challenges) to seconds (default 3). +#chap-restart + +# Set the maximum number of CHAP challenge transmissions to +# (default 10). +#chap-max-challenge + +# If this option is given, pppd will rechallenge the peer every +# seconds. +#chap-interval + +# With this option, pppd will accept the peer's idea of our local IP +# address, even if the local IP address was specified in an option. +#ipcp-accept-local + +# With this option, pppd will accept the peer's idea of its (remote) IP +# address, even if the remote IP address was specified in an option. +#ipcp-accept-remote + +# Disable the IPXCP and IPX protocols. +# To let pppd pass IPX packets comment this out --- you'll probably also +# want to install ipxripd, and have the Internal IPX Network option enabled +# in your kernel. /usr/doc/HOWTO/IPX-HOWTO.gz contains more info. +noipx + +# Exit once a connection has been made and terminated. This is the default, +# unless the `persist' or `demand' option has been specified. +#nopersist + +# Do not exit after a connection is terminated; instead try to reopen +# the connection. +#persist + +# Terminate after n consecutive failed connection attempts. +# A value of 0 means no limit. The default value is 10. +#maxfail + +# Initiate the link only on demand, i.e. when data traffic is present. +# With this option, the remote IP address must be specified by the user on +# the command line or in an options file. Pppd will initially configure +# the interface and enable it for IP traffic without connecting to the peer. +# When traffic is available, pppd will connect to the peer and perform +# negotiation, authentication, etc. When this is completed, pppd will +# commence passing data packets (i.e., IP packets) across the link. +#demand + +# Specifies that pppd should disconnect if the link is idle for seconds. +# The link is idle when no data packets (i.e. IP packets) are being sent or +# received. Note: it is not advisable to use this option with the persist +# option without the demand option. If the active-filter option is given, +# data packets which are rejected by the specified activity filter also +# count as the link being idle. +#idle + +# Specifies how many seconds to wait before re-initiating the link after +# it terminates. This option only has any effect if the persist or demand +# option is used. The holdoff period is not applied if the link was +# terminated because it was idle. +#holdoff + +# Wait for up n milliseconds after the connect script finishes for a valid +# PPP packet from the peer. At the end of this time, or when a valid PPP +# packet is received from the peer, pppd will commence negotiation by +# sending its first LCP packet. The default value is 1000 (1 second). +# This wait period only applies if the connect or pty option is used. +#connect-delay + +# Packet filtering: for more information, see pppd(8) +# Any packets matching the filter expression will be interpreted as link +# activity, and will cause a "demand" connection to be activated, and reset +# the idle connection timer. (idle option) +# The filter expression is akin to that of tcpdump(1) +#active-filter + +# ------ --- ppp-2.4.5.orig/extra/peers-pppoe +++ ppp-2.4.5/extra/peers-pppoe @@ -0,0 +1,29 @@ +# example configuration for the kernel space PPP over Ethernet driver +# +# See the manual page pppd(8) for information on all the options. + +# MUST CHANGE: replace myusername@realm with the PPP login name given to +# your by your provider. +# There should be a matching entry with the password in /etc/ppp/pap-secrets +# and/or /etc/ppp/chap-secrets. +user "myusername@realm" + +# Load the PPPoE plugin. +plugin rp-pppoe.so + +# Ethernet interface to which the modem is connected. +eth0 + +# Assumes that your IP address is allocated dynamically by the ISP. +noipdefault +# Try to get the name server addresses from the ISP. +usepeerdns +# Use this connection as the default route. +defaultroute + +# Makes pppd "dial again" when the connection is lost. +persist + +# Do not ask the remote to authenticate. +noauth + --- ppp-2.4.5.orig/extra/poff +++ ppp-2.4.5/extra/poff @@ -0,0 +1,107 @@ +#!/bin/sh + +# $Id: poff,v 1.8 1999/08/28 16:34:51 phil Exp $ +# Written by John Hasler and based on work +# by Phil Hands . Distributed under the GNU GPL + +if [ -x /usr/bin/kill ]; then + KILL="/usr/bin/kill" +else + KILL="/bin/kill" +fi +SIG=TERM +DONE="stopped" +MODE="" + +usage () +{ + cat < /etc/resolv.conf +fi + +# follow any symlink to find the real file +REALRESOLVCONF=$(readlink --canonicalize /etc/resolv.conf) + +# merge the new nameservers with the other options from the old configuration +{ + cat /etc/ppp/resolv.conf + grep --invert-match '^nameserver[[:space:]]' "$REALRESOLVCONF" || true +} > "$REALRESOLVCONF.tmp" + +# backup the old configuration and install the new one +cp -a "$REALRESOLVCONF" "$REALRESOLVCONF.pppd-backup.$PPP_IFACE" +mv -f "$REALRESOLVCONF.tmp" "$REALRESOLVCONF" + +# restart nscd because resolv.conf has changed +if [ -e /var/run/nscd.pid ]; then + /etc/init.d/nscd restart || true +fi + +exit 0 + --- ppp-2.4.5.orig/extra/chatscript.pap +++ ppp-2.4.5/extra/chatscript.pap @@ -0,0 +1,22 @@ +# You can use this script unmodified to connect to sites which allow +# authentication via PAP, CHAP and similar protocols. +# This script can be shared among different pppd peer configurations. +# To use it, add something like this to your /etc/ppp/peers/ file: +# +# connect "/usr/sbin/chat -v -f /etc/chatscripts/pap -T PHONE-NUMBER" +# user YOUR-USERNAME-IN-PAP-SECRETS +# noauth + +# Uncomment the following line to see the connect speed. +# It will be logged to stderr or to the file specified with the -r chat option. +#REPORT CONNECT + +ABORT BUSY +ABORT VOICE +ABORT "NO CARRIER" +ABORT "NO DIALTONE" +ABORT "NO DIAL TONE" +"" ATZ +OK ATDT\T +CONNECT "" + --- ppp-2.4.5.orig/extra/interfaces +++ ppp-2.4.5/extra/interfaces @@ -0,0 +1,51 @@ +# copy one of these examples to /etc/network/interfaces + +# The VP, VC and encapsulation must match the ones used by your ISP, these +# examples use 8.35 with LLC encapsulation and assume that ATM interface +# 0 is the DSL modem. +# br2684ctl and atmarp are part of the br2684ctl and atm-tools packages, +# check the atmarp(8) and br2684ctl(8) man pages for details about the +# command line options. + + +# PPPoE +# You need to create an appropriate /etc/ppp/peers/pppoe file, look at +# /usr/share/doc/ppp/examples/peers-pppoe for an example and configure it +# to use the nas0 interface. +auto pppoe +iface pppoe inet ppp + provider pppoe + pre-up br2684ctl -b -c 0 -a 0.8.35 + pre-up ip link set up nas0 + post-down kill $(cat /var/run/nas0.pid) + + +# RFC 1483 bridged, with dynamically assigned address +auto nas0 +iface nas0 inet dhcp + pre-up br2684ctl -b -c ${IFACE#nas} -a 0.8.35 + post-down kill $(cat /var/run/$IFACE.pid) + + +# RFC 1483 bridged, with statically assigned address +auto nas0 +iface nas0 inet static + address 192.0.2.1 + netmask 255.255.255.0 + broadcast 192.0.2.255 + gateway 192.0.2.254 + pre-up br2684ctl -b -c ${IFACE#nas} -a 0.8.35 + post-down kill $(cat /var/run/$IFACE.pid) + + +# Classical IP over ATM (CLIP) +# This assumes that atmarpd is already running. +auto atm0 +iface atm0 inet static + address 192.0.2.1 + netmask 255.255.255.0 + broadcast 192.0.2.255 + gateway 192.0.2.254 + pre-up atmarp -c $IFACE + post-up atmarp -s 192.0.2.254 0.8.35 + --- ppp-2.4.5.orig/extra/README.STATIC-IP +++ ppp-2.4.5/extra/README.STATIC-IP @@ -0,0 +1,45 @@ +Static IP addresses support with mgetty/autoPPP +----------------------------------------------- + +Debian PPP package includes a variant of ppp-2.3.0-static.diff, a patch to +ppp-2.3.0 to support using static IP addresses with Mgetty and AutoPPP. It +does not affect normal dynamic assignments. There is no need to re-compile +the kernel. + +You should update the pap-secrets file to contain the entries of those users +you want to have static IP addresses. Typical entry might look like: + +#client server secret IP addresses + jdoe * realpswd 207.69.189.15 + * * "" * + +Also, inform your static IP users to include their IP when +connecting. E.g. run `pppd 207.69.189.15:` +Or for Windows folks, check the "Specify an IP address" option and +type in the IP. + +Note: The second line is what most folks will use to authenticate +users who will be dynamically assigned their addresses by +/dev/ttyXX. This along with the login option allows users to be PAP +authenticated against the /etc/passwd or /etc/shadow. If you enter each and +every user into your pap-secrets file and do not have the last line, +(wildcards line) you MUST place a "*" at the end of each users line. +Without it, the authentication will fail. For example: + +#client server secret IP addresses + jdoe * passwd 207.69.189.15 * + +This "*" at the end allows the patches to work properly without changing +the normal process. The IP address is normally assigned via the +/etc/ppp/options.ttyXX file. The patches do not interfere with this process +at all. The only thing different is when the user tells pppd he has his own +address, pppd will allow him to use it, if he and his address are +authenticated via the pap-secrets file. The only thing to remember, is tell +your static IP users to set the "correct" IP or they will be assigned the +normal dynamic address. (And of course that's not what we want :>) If you +have any questions.... + +While I tested this as many ways as our systems would allow, no warranty +is implied. They work well for us. + +Author: Jeff Myers --- ppp-2.4.5.orig/extra/pppoe_on_boot +++ ppp-2.4.5/extra/pppoe_on_boot @@ -0,0 +1,8 @@ +#!/bin/sh + +PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin +export PATH + +modprobe -q pppoe + +exec pppd call dsl-provider --- ppp-2.4.5.orig/extra/ip-down +++ ppp-2.4.5/extra/ip-down @@ -0,0 +1,52 @@ +#!/bin/sh +# +# This script is run by the pppd _after_ the link is brought down. +# It uses run-parts to run scripts in /etc/ppp/ip-down.d, so to delete +# routes, unset IP addresses etc. you should create script(s) there. +# +# Be aware that other packages may include /etc/ppp/ip-down.d scripts (named +# after that package), so choose local script names with that in mind. +# +# This script is called with the following arguments: +# Arg Name Example +# $1 Interface name ppp0 +# $2 The tty ttyS1 +# $3 The link speed 38400 +# $4 Local IP number 12.34.56.78 +# $5 Peer IP number 12.34.56.99 +# $6 Optional ``ipparam'' value foo + +# The environment is cleared before executing this script +# so the path must be reset +PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin +export PATH + +# These variables are for the use of the scripts run by run-parts +PPP_IFACE="$1" +PPP_TTY="$2" +PPP_SPEED="$3" +PPP_LOCAL="$4" +PPP_REMOTE="$5" +PPP_IPPARAM="$6" +export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM + +# as an additional convenience, $PPP_TTYNAME is set to the tty name, +# stripped of /dev/ (if present) for easier matching. +PPP_TTYNAME=`/usr/bin/basename "$2"` +export PPP_TTYNAME + +# If /var/log/ppp-ipupdown.log exists use it for logging. +if [ -e /var/log/ppp-ipupdown.log ]; then + exec >> /var/log/ppp-ipupdown.log 2>&1 + echo $0 $@ + echo +fi + +# This script can be used to override the .d files supplied by other packages. +if [ -x /etc/ppp/ip-down.local ]; then + exec /etc/ppp/ip-down.local "$@" +fi + +run-parts /etc/ppp/ip-down.d \ + --arg="$1" --arg="$2" --arg="$3" --arg="$4" --arg="$5" --arg="$6" + --- ppp-2.4.5.orig/extra/peers-gprs +++ ppp-2.4.5/extra/peers-gprs @@ -0,0 +1,39 @@ +# example configuration for a GPRS/UMTS/HDSPA connection +# +# See the manual page pppd(8) for information on all the options. + +# If your carrier requires authentication, uncomment this directive and +# replace myusername@realm with the login name provided by them. +# If authentication is used, there should be a matching entry with the +# password in /etc/ppp/pap-secrets and/or /etc/ppp/chap-secrets. +#user "myusername@realm" + +# MUST CHANGE: replace ******** with the APN name specific to your +# mobile carrier and data plan. +# The /etc/chatscripts/gprs chat script may be modified to change the +# modem initialization string. +connect "/usr/sbin/chat -v -f /etc/chatscripts/gprs -T ********" + +# Serial device to which the modem is connected. +/dev/modem + +# Assumes that your IP address is allocated dynamically by the ISP. +noipdefault +# Try to get the name server addresses from the ISP. +usepeerdns +# Use this connection as the default route. +defaultroute + +# Makes pppd "dial again" when the connection is lost. +persist + +# Do not ask the remote to authenticate. +noauth + +# Disable some PPP protocol features which are usually not supported by +# mobile carriers. +novj +novjccomp +noccp +nomagic + --- ppp-2.4.5.orig/extra/0000usepeerdns-down +++ ppp-2.4.5/extra/0000usepeerdns-down @@ -0,0 +1,24 @@ +#!/bin/sh -e + +# exit if the resolvconf package is installed +[ -x /sbin/resolvconf ] && exit 0 + +# follow any symlink to find the real file +if [ -e /etc/resolv.conf ]; then + REALRESOLVCONF=$(readlink --canonicalize /etc/resolv.conf) +else + REALRESOLVCONF=/etc/resolv.conf +fi + +# if an old resolv.conf file exists, restore it +if [ -e $REALRESOLVCONF.pppd-backup.$PPP_IFACE ]; then + mv -f $REALRESOLVCONF.pppd-backup.$PPP_IFACE $REALRESOLVCONF + + # restart nscd because resolv.conf has changed + if [ -e /var/run/nscd.pid ]; then + /etc/init.d/nscd restart || true + fi +fi + +exit 0 + --- ppp-2.4.5.orig/extra/chap-secrets +++ ppp-2.4.5/extra/chap-secrets @@ -0,0 +1,4 @@ +# Secrets for authentication using CHAP +# client server secret IP addresses + + --- ppp-2.4.5.orig/extra/ip-up +++ ppp-2.4.5/extra/ip-up @@ -0,0 +1,59 @@ +#!/bin/sh +# +# This script is run by the pppd after the link is established. +# It uses run-parts to run scripts in /etc/ppp/ip-up.d, so to add routes, +# set IP address, run the mailq etc. you should create script(s) there. +# +# Be aware that other packages may include /etc/ppp/ip-up.d scripts (named +# after that package), so choose local script names with that in mind. +# +# This script is called with the following arguments: +# Arg Name Example +# $1 Interface name ppp0 +# $2 The tty ttyS1 +# $3 The link speed 38400 +# $4 Local IP number 12.34.56.78 +# $5 Peer IP number 12.34.56.99 +# $6 Optional ``ipparam'' value foo + +# The environment is cleared before executing this script +# so the path must be reset +PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin +export PATH + +# These variables are for the use of the scripts run by run-parts +PPP_IFACE="$1" +PPP_TTY="$2" +PPP_SPEED="$3" +PPP_LOCAL="$4" +PPP_REMOTE="$5" +PPP_IPPARAM="$6" +export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM + +# as an additional convenience, $PPP_TTYNAME is set to the tty name, +# stripped of /dev/ (if present) for easier matching. +PPP_TTYNAME=`/usr/bin/basename "$2"` +export PPP_TTYNAME + +# If /var/log/ppp-ipupdown.log exists use it for logging. +if [ -e /var/log/ppp-ipupdown.log ]; then + exec > /var/log/ppp-ipupdown.log 2>&1 + echo $0 $@ + echo +fi + +# This script can be used to override the .d files supplied by other packages. +if [ -x /etc/ppp/ip-up.local ]; then + exec /etc/ppp/ip-up.local "$@" +fi + +run-parts /etc/ppp/ip-up.d \ + --arg="$1" --arg="$2" --arg="$3" --arg="$4" --arg="$5" --arg="$6" + +# if pon was called with the "quick" argument, stop pppd +if [ -e /var/run/ppp-quick ]; then + rm /var/run/ppp-quick + wait + kill $PPPD_PID +fi + --- ppp-2.4.5.orig/extra/ipv6-up +++ ppp-2.4.5/extra/ipv6-up @@ -0,0 +1,35 @@ +#!/bin/sh + +# These variables are for the use of the scripts run by run-parts. +PPP_IFACE="$1" +PPP_TTY="$2" +PPP_SPEED="$3" +PPP_LOCAL="$4" +PPP_REMOTE="$5" +PPP_IPPARAM="$6" +export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM + +# The environment is cleared before executing this script. +PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin +export PATH + +# If /var/log/ppp-ipupdown.log exists use it for logging. +if [ -e /var/log/ppp-ipupdown.log ]; then + exec >> /var/log/ppp-ipupdown.log 2>&1 +fi + +# This script can be used to override the .d files supplied by other packages. +if [ -x /etc/ppp/ipv6-up.local ]; then + exec /etc/ppp/ipv6-up.local "$@" +fi + +run-parts /etc/ppp/ipv6-up.d \ + --arg="$1" --arg="$2" --arg="$3" --arg="$4" --arg="$5" --arg="$6" + +# if pon was called with the "quick" argument, stop pppd +if [ -e /var/run/ppp-quick ]; then + rm /var/run/ppp-quick + wait + kill $PPPD_PID +fi + --- ppp-2.4.5.orig/extra/peers-pppoa +++ ppp-2.4.5/extra/peers-pppoa @@ -0,0 +1,32 @@ +# example configuration for the kernel space PPP over ATM driver +# +# See the manual page pppd(8) for information on all the options. + +# MUST CHANGE: replace myusername@realm with the PPP login name given to +# your by your provider. +# There should be a matching entry with the password in /etc/ppp/pap-secrets +# and/or /etc/ppp/chap-secrets. +user "myusername@realm" + +# Load the PPPoA plugin. +plugin pppoatm.so + +# VP.VC pair used by your ISP. +8.35 + +# Enable this option if your ISP uses PPPoA with LLC encapsulation. +#llc-encaps + +# Assumes that your IP address is allocated dynamically by the ISP. +noipdefault +# Try to get the name server addresses from the ISP. +usepeerdns +# Use this connection as the default route. +defaultroute + +# Makes pppd "dial again" when the connection is lost. +persist + +# Do not ask the remote to authenticate. +noauth + --- ppp-2.4.5.orig/extra/README.win9x +++ ppp-2.4.5/extra/README.win9x @@ -0,0 +1,35 @@ +Short guide on how to run a Win9x connection with PPPD to Debian Linux +---------------------------------------------------------------------- + +1. Do not mess around with the Win9x configuration. + Do not manually configure DNS, scripts etc. + Do not switch on the terminal windows. + Accept all defaults or better leave it as it was at installation. + +2. You need to have a getty program that supports automatic PPP protocol + detection, such as mgetty (versions >= 0.99). + + Note: the mgetty shipped with Debian has to be set up to enable this + behaviour - look for "AutoPPP" in the login.config configuration file. + +3. Change the "ms-dns" lines in /etc/ppp/options, and review the complete + file for things you need to do. + +4. Make sure that your /etc/ppp/pap-secrets file is set up to allow users + mentioned in system passwords database (/etc/passwd) to establish PPP + connections using their normal password. + + Note: the pap-secrets file shipped with Debian pppd is set up to enable + this by default. + +5. On the Win9x box, in Dial-Up Networking folder, create a new connection, + and enter the phone number. Prior to connecting, enter the username and + password. + +Win9x should connect to your Linux PPPD without problems and automatically +configure IP addresses, the netmask and the DNS servers. You can immediately +start Netscape, Internet Explorer or any other TCP/IP tools. + +-- Christoph Lameter , 27 September, 1996, + Josip Rodin , 27 November 1999, + Michael Beattie , 9 April 2001. --- ppp-2.4.5.orig/extra/plog +++ ppp-2.4.5/extra/plog @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ -s /var/log/ppp.log ]; then + exec tail "$@" /var/log/ppp.log +else + exec tail "$@" /var/log/syslog | grep ' \(pppd\|chat\)\[' +fi --- ppp-2.4.5.orig/extra/ipv6-down +++ ppp-2.4.5/extra/ipv6-down @@ -0,0 +1,28 @@ +#!/bin/sh + +# These variables are for the use of the scripts run by run-parts. +PPP_IFACE="$1" +PPP_TTY="$2" +PPP_SPEED="$3" +PPP_LOCAL="$4" +PPP_REMOTE="$5" +PPP_IPPARAM="$6" +export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM + +# The environment is cleared before executing this script. +PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin +export PATH + +# If /var/log/ppp-ipupdown.log exists use it for logging. +if [ -e /var/log/ppp-ipupdown.log ]; then + exec >> /var/log/ppp-ipupdown.log 2>&1 +fi + +# This script can be used to override the .d files supplied by other packages. +if [ -x /etc/ppp/ipv6-down.local ]; then + exec /etc/ppp/ipv6-down.local "$@" +fi + +run-parts /etc/ppp/ipv6-down.d \ + --arg="$1" --arg="$2" --arg="$3" --arg="$4" --arg="$5" --arg="$6" + --- ppp-2.4.5.orig/extra/PATCHES/057_pppoe-interface-change +++ ppp-2.4.5/extra/PATCHES/057_pppoe-interface-change @@ -0,0 +1,78 @@ +--- ppp/pppd/plugins/rp-pppoe/plugin.c.orig 2003-04-07 02:09:05.000000000 +0200 ++++ ppp/pppd/plugins/rp-pppoe/plugin.c 2003-12-03 22:15:07.000000000 +0100 +@@ -114,6 +114,57 @@ + return 1; + } + ++/* from */ ++#define IFF_UP 0x1 ++#define IFF_RUNNING 0x40 ++ ++static short ifrflags_old; ++ ++static int interface_change(const char* ifname, int up) ++{ ++ int fd; ++ struct ifreq ifr; ++ ++ if (!up && ifrflags_old != 0) { ++ return 0; ++ } ++ ++ fd = socket(AF_INET, SOCK_DGRAM, 0); ++ if (fd < 0) { ++ warn("socket(AF_INET, SOCK_DGRAM, 0): %s", strerror(errno)); ++ return -1; ++ } ++ ++ strncpy(ifr.ifr_name, ifname, IFNAMSIZ); ++ if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { ++ warn("%s: unknown interface: %s", ifname, strerror(errno)); ++ return -1; ++ } ++ strncpy(ifr.ifr_name, ifname, IFNAMSIZ); ++ if (up) { ++ ifrflags_old = ifr.ifr_flags & (IFF_UP | IFF_RUNNING); ++ ifr.ifr_flags |= (IFF_UP | IFF_RUNNING); ++ } else { ++ ifr.ifr_flags &= ~(IFF_UP | IFF_RUNNING); ++ } ++ if (ioctl(fd, SIOCSIFFLAGS, &ifr) < 0) { ++ warn("SIOCSIFFLAGS: %s", strerror(errno)); ++ return -1; ++ } ++ close(fd); ++ return 0; ++} ++ ++static int interface_up (const char *ifname) ++{ ++ return interface_change(ifname,1); ++} ++ ++static int interface_down (const char* ifname) ++{ ++ return interface_change(ifname,0); ++} ++ + /********************************************************************** + * %FUNCTION: PPPOEConnectDevice + * %ARGUMENTS: +@@ -142,6 +193,8 @@ + conn->peerEth[i] = (unsigned char) mac[i]; + } + } else { ++ if (interface_up(conn->ifName) < 0) ++ return -1; + discovery(conn); + if (conn->discoveryState != STATE_SESSION) { + fatal("Unable to complete PPPoE Discovery"); +@@ -243,6 +296,8 @@ + return; + } + close(conn->sessionSocket); ++ if (interface_down(conn->ifName) < 0) ++ warn("We brought %s up but failed to take it down",conn->ifName); + } + + static void --- ppp-2.4.5.orig/extra/PATCHES/pty_command_timeout +++ ppp-2.4.5/extra/PATCHES/pty_command_timeout @@ -0,0 +1,129 @@ +this patch is broken + +diff -ur ppp.orig/pppd/main.c ppp/pppd/main.c +--- ppp.orig/pppd/main.c Tue Sep 23 12:15:22 2003 ++++ ppp/pppd/main.c Thu Jan 15 12:04:28 2004 +@@ -624,7 +624,7 @@ + } + + /* Wait for scripts to finish */ +- /* XXX should have a timeout here */ ++ /* timeout is handled by "reap_kids(1)" */ + while (n_children > 0) { + if (debug) { + struct subprocess *chp; +@@ -1710,40 +1710,95 @@ + reap_kids(waitfor) + int waitfor; + { +- int pid, status; ++ int pid, status, signal_cnt, signal_num; + struct subprocess *chp, **prevp; + ++ signal_cnt = 0; ++ + if (n_children == 0) +- return 0; +- while ((pid = waitpid(-1, &status, (waitfor? 0: WNOHANG))) != -1 +- && pid != 0) { +- for (prevp = &children; (chp = *prevp) != NULL; prevp = &chp->next) { ++ return 0; /* there is no kid active */ ++ ++ while (1) { ++ ++ pid = waitpid(-1, &status, WNOHANG); ++ if (pid == -1) { ++ /* waitpid error */ ++ if (errno == ECHILD) ++ return -1; ++ if (errno != EINTR) ++ error("Error waiting for child process: %m"); ++ break; /* exit while loop */ ++ ++ } else { ++ /* waitpid success */ ++ ++ if (pid == 0) { ++ /* kids are running */ ++ if (waitfor == 0) ++ /* we do not want to wait for kids... */ ++ break; /* exit while loop */ ++ ++ /* send kids a signal */ ++ signal_num = 0; ++ signal_cnt++; ++ switch (signal_cnt) { ++ case 1: ++ signal_num = SIGTERM; ++ break; ++ case 2: ++ signal_num = SIGQUIT; ++ break; ++ default: ++ signal_num = SIGKILL; ++ signal_cnt--; ++ break; ++ } ++ for (prevp = &children; (chp = *prevp) != NULL; prevp = &chp->next) { ++ if (debug) { ++ dbglog(" Sending signal %d to pid %d", signal_num, chp->pid); ++ } ++ kill(chp->pid,signal_num); ++ } ++ if (signal_num != SIGKILL) { ++ if (debug) ++ dbglog(" Waiting 2 seconds for children to finish"); ++ sleep(2); ++ } ++ ++ } else { ++ ++ /* a kid has finished */ ++ ++ /* update number of active kids */ ++ for (prevp = &children; (chp = *prevp) != NULL; prevp = &chp->next) { + if (chp->pid == pid) { +- --n_children; +- *prevp = chp->next; +- break; ++ --n_children; ++ *prevp = chp->next; ++ break; + } +- } +- if (WIFSIGNALED(status)) { ++ } ++ ++ if (WIFSIGNALED(status)) { + warn("Child process %s (pid %d) terminated with signal %d", + (chp? chp->prog: "??"), pid, WTERMSIG(status)); +- } else if (debug) ++ } else if (debug) + dbglog("Script %s finished (pid %d), status = 0x%x", + (chp? chp->prog: "??"), pid, + WIFEXITED(status) ? WEXITSTATUS(status) : status); +- if (chp && chp->done) ++ if (chp && chp->done) + (*chp->done)(chp->arg); +- if (chp) ++ if (chp) + free(chp); ++ ++ break; /* exit while loop */ ++ } ++ ++ } + } +- if (pid == -1) { +- if (errno == ECHILD) +- return -1; +- if (errno != EINTR) +- error("Error waiting for child process: %m"); +- } ++ + return 0; + } ++ + + /* + * add_notifier - add a new function to be called when something happens. --- ppp-2.4.5.orig/extra/PATCHES/use_openssl +++ ppp-2.4.5/extra/PATCHES/use_openssl @@ -0,0 +1,150 @@ +The built-in SHA1 code is broken on 64 bit systems. +Using a system library may be considered a good idea anyway. + + +diff -ruNp ppp.orig/pppd/chap-md5.c ppp/pppd/chap-md5.c +--- ppp.orig/pppd/chap-md5.c 2003-11-27 23:25:17.000000000 +0100 ++++ ppp/pppd/chap-md5.c 2004-07-14 16:45:46.000000000 +0200 +@@ -41,7 +41,14 @@ + #include "chap-new.h" + #include "chap-md5.h" + #include "magic.h" ++#ifdef USE_OPENSSL ++#include ++#define MD5Init MD5_Init ++#define MD5Update MD5_Update ++#define MD5Final MD5_Final ++#else + #include "md5.h" ++#endif + + #define MD5_HASH_SIZE 16 + #define MD5_MIN_CHALLENGE 16 +diff -ruNp ppp.orig/pppd/chap_ms.c ppp/pppd/chap_ms.c +--- ppp.orig/pppd/chap_ms.c 2004-04-14 04:40:21.000000000 +0200 ++++ ppp/pppd/chap_ms.c 2004-07-14 16:46:03.000000000 +0200 +@@ -89,8 +89,21 @@ + #include "pppd.h" + #include "chap-new.h" + #include "chap_ms.h" ++#ifdef USE_OPENSSL ++#include ++#define MD4Init MD4_Init ++#define MD4Update MD4_Update ++#define MD4Final MD4_Final ++#else + #include "md4.h" ++#endif ++#ifdef USE_OPENSSL ++#include ++#define SHA1_SIGNATURE_SIZE SHA_DIGEST_LENGTH ++#define SHA1_CTX SHA_CTX ++#else + #include "sha1.h" ++#endif + #include "pppcrypt.h" + #include "magic.h" + +@@ -513,7 +526,7 @@ ascii2unicode(char ascii[], int ascii_le + static void + NTPasswordHash(char *secret, int secret_len, u_char hash[MD4_SIGNATURE_SIZE]) + { +-#ifdef __NetBSD__ ++#if defined __NetBSD__ || defined USE_OPENSSL + /* NetBSD uses the libc md4 routines which take bytes instead of bits */ + int mdlen = secret_len; + #else +diff -ruNp ppp.orig/pppd/eap.c ppp/pppd/eap.c +--- ppp.orig/pppd/eap.c 2003-06-12 02:01:21.000000000 +0200 ++++ ppp/pppd/eap.c 2004-07-14 16:45:46.000000000 +0200 +@@ -62,7 +62,14 @@ + + #include "pppd.h" + #include "pathnames.h" ++#ifdef USE_OPENSSL ++#include ++#define MD5Init MD5_Init ++#define MD5Update MD5_Update ++#define MD5Final MD5_Final ++#else + #include "md5.h" ++#endif + #include "eap.h" + + #ifdef USE_SRP +diff -ruNp ppp.orig/pppd/Makefile.linux ppp/pppd/Makefile.linux +--- ppp.orig/pppd/Makefile.linux 2004-07-14 16:46:44.000000000 +0200 ++++ ppp/pppd/Makefile.linux 2004-07-14 16:45:46.000000000 +0200 +@@ -10,7 +10,7 @@ INCDIR = $(DESTDIR)/usr/include + + TARGETS = pppd + +-PPPDSRCS = main.c magic.c fsm.c lcp.c ipcp.c upap.c chap-new.c md5.c ccp.c \ ++PPPDSRCS = main.c magic.c fsm.c lcp.c ipcp.c upap.c chap-new.c ccp.c \ + ecp.c ipxcp.c auth.c options.c sys-linux.c md4.c chap_ms.c \ + demand.c utils.c tty.c eap.c chap-md5.c + +@@ -19,7 +19,7 @@ HEADERS = ccp.h chap-new.h ecp.h fsm.h i + upap.h eap.h + + MANPAGES = pppd.8 +-PPPDOBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap-new.o md5.o ccp.o \ ++PPPDOBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap-new.o ccp.o \ + ecp.o auth.o options.o demand.o utils.o sys-linux.o ipxcp.o tty.o \ + eap.o chap-md5.o + +@@ -83,8 +83,14 @@ CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCL + ifdef CHAPMS + CFLAGS += -DCHAPMS=1 + NEEDDES=y ++ifdef USE_BUILTIN_CRYPTO + PPPDOBJS += md4.o chap_ms.o +-HEADERS += md4.h chap_ms.h ++HEADERS += md4.h chap_ms.h ++else ++PPPDOBJS += chap_ms.o ++HEADERS += chap_ms.h ++NEED_OPENSSL=y ++endif + ifdef MSLANMAN + CFLAGS += -DMSLANMAN=1 + endif +@@ -95,20 +101,36 @@ endif + + # EAP SRP-SHA1 + ifdef USE_SRP +-CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include +-LIBS += -lsrp -L/usr/local/ssl/lib -lcrypto ++CFLAGS += -DUSE_SRP + TARGETS += srp-entry + EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry + MANPAGES += srp-entry.8 + EXTRACLEAN += srp-entry.o + NEEDDES=y ++NEED_OPENSSL=y + else + # OpenSSL has an integrated version of SHA-1, and its implementation + # is incompatible with this local SHA-1 implementation. We must use + # one or the other, not both. ++ifdef USE_BUILTIN_CRYPTO + PPPDSRCS += sha1.c + HEADERS += sha1.h + PPPDOBJS += sha1.o ++else ++NEED_OPENSSL=y ++endif ++endif ++ ++ifdef USE_BUILTIN_CRYPTO ++PPPDSRCS += md5.c ++PPPDOBJS += md5.o ++else ++NEED_OPENSSL=y ++endif ++ ++ifdef NEED_OPENSSL ++CFLAGS += -DUSE_OPENSSL ++LIBS += -lcrypto + endif + + ifdef HAS_SHADOW