added support for leased-line pppd setups (bug #33290)

6 files changed, 195 insertions, 18 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 7e46a3f936b1..2b9733aa9ba7 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.35 2003/12/08 14:14:33 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.36 2003/12/22 15:16:18 lanius Exp $
+
+*ppp-2.4.2_beta3-r1 (22 Dec 2003)
+
+  22 Dec 2003; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2_beta3-r1.ebuild,
+  files/2.4.2b3/confd.ppp0, files/2.4.2b3/net.ppp0:
+  added support for leased-line pppd setups (bug #33290)
+
+*ppp-2.4.2_beta3-r1 (22 Dec 2003)
+
+  22 Dec 2003; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2_beta3-r1.ebuild,
+  files/2.4.2b3/README.mpls, files/2.4.2b3/cflags.patch,
+  files/2.4.2b3/chat-default, files/2.4.2b3/confd.ppp0, files/2.4.2b3/ip-down,
+  files/2.4.2b3/ip-up, files/2.4.2b3/killaddr-smarter.patch,
+  files/2.4.2b3/modules.ppp, files/2.4.2b3/mpls.patch, files/2.4.2b3/net.ppp0,
+  files/2.4.2b3/options-pppoe, files/2.4.2b3/options-pptp,
+  files/2.4.2b3/pppoe.html:
+
+  major cleanups:
+  - moved all cflags fixed to one patch
+  - added mpls support
+  - use pon, poff, plog scripts from ppp distribution
+  - added killaddr-smarter patch (http://seclists.org/lists/linux-kernel/2001/Jan/ 5745.html)
+  - added options files for pppoe and pptp
+  - fixed resolv.conf issues
+  - fixed stopping of net.ppp0
+  - some minor things i forgot
+
+  many thx to:
+  - Robert Cernansky <openhs@users.sourceforge.net> (bug#26920)
+  - Cory Visi <cory@visi.name> (bug #35381)
+  - Francesco Pretto <ceztko@libero.it> (bug #36081)
+  - Steve Hudson <shudson2@uwo.ca> (bug #26311)
+  - BlueRaven <blueraven@libero.it> (bug #31418)
 
   08 Dec 2003; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.1-r14.ebuild:
   added alpha to keywords, stable on sparc
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index a4b930531e3d..fb53c2b47b79 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,8 +1,8 @@
-MD5 1c18e3612c7d8aed3aba21df4365548e ppp-2.4.2_beta3-r1.ebuild 3412
-MD5 9a5995346b210134e7f35ec2670dae0f ppp-2.4.1-r14.ebuild 4622
+MD5 648b6db3701175b44066900c0b4a64eb ppp-2.4.2_beta3-r1.ebuild 3415
+MD5 82e881305bcfc09888896071fb0219fa ppp-2.4.1-r14.ebuild 4613
 MD5 8c76dfcef79983fe7b2b7063f4750c97 ppp-2.4.1-r11.ebuild 3078
 MD5 f40c064374bb77f9069e73b9932bcd1b ppp-2.4.1-r13.ebuild 4563
-MD5 1e23ab54632bbe8f24597957108b0261 ChangeLog 6636
+MD5 7912745283d4f6cad60f50805f7093c3 ChangeLog 6859
 MD5 158a1bb8f34a4d2b1ed62513de95e47d ppp-2.4.2_beta3.ebuild 4342
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 9e3a4dcb54e60375e054b4154d94e0f9 ppp-2.4.1-r12.ebuild 3816
@@ -30,13 +30,13 @@ MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
 MD5 0713ffc9ae6e3ee4ef0f5c3cb752b3ea files/ip-down 285
 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
 MD5 2890b47660f967a07ac5b211850e46c5 files/2.4.2b3/options-pptp 238
-MD5 03eb44456283c43760269a92083946d3 files/2.4.2b3/chat-default 345
+MD5 7004513b8b14aad3e2f598535e672af4 files/2.4.2b3/chat-default 351
 MD5 3b530cf8c43cf1e13648b28848ae752f files/2.4.2b3/ip-up 686
 MD5 1c6a75aa9390438f483e2885ea40ca72 files/2.4.2b3/killaddr-smarter.patch 6225
-MD5 b3e1339d6728be4c58bef7f44ffccf92 files/2.4.2b3/confd.ppp0 2600
+MD5 12500a756925e9d8f4b2b655e95a2541 files/2.4.2b3/confd.ppp0 2784
 MD5 fa2a5b8df496922fa2fb592115953b6b files/2.4.2b3/options-pppoe 53
 MD5 bf0ee7e6765e3b18dbe3964be6cd4500 files/2.4.2b3/mpls.patch 10506
-MD5 e9fce5e24802265b8aa6c7d382a41fe2 files/2.4.2b3/net.ppp0 4144
+MD5 346b3167786218efdc517e11c33760fc files/2.4.2b3/net.ppp0 4344
 MD5 1fd88dda7f4996799c69a9501d42cc23 files/2.4.2b3/README.mpls 530
 MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/2.4.2b3/modules.ppp 268
 MD5 911e8bfe62182274d6b2fbf49aae0d87 files/2.4.2b3/ip-down 624
diff --git a/net-dialup/ppp/files/2.4.2b3/confd.ppp0 b/net-dialup/ppp/files/2.4.2b3/confd.ppp0
index acd6c4a1a96a..4851ae8f3ad3 100644
--- a/net-dialup/ppp/files/2.4.2b3/confd.ppp0
+++ b/net-dialup/ppp/files/2.4.2b3/confd.ppp0
@@ -1,5 +1,5 @@
 # /etc/conf.d/net.ppp0:
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/files/2.4.2b3/confd.ppp0,v 1.1 2003/12/22 15:05:26 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/files/2.4.2b3/confd.ppp0,v 1.2 2003/12/22 15:16:18 lanius Exp $
 
 # Config file for /etc/init.d/net.ppp0
 
@@ -20,6 +20,7 @@ PASSWORD="passwd"               # Your password/secret.  Ugly I know, but i
                                 # on.  700 permission on /etc/init.d/net.ppp0
                                 # should be enouth for now.
 NUMBER="9180000"                # The telephone number of your ISP
+                                # leave blank for leased-line operation.
 REMIP=""                        # The ip of the remote box if it should be set
 NETMASK=""                      # Netmask
 IPADDR=""                       # Our IP if we have a static one
diff --git a/net-dialup/ppp/files/2.4.2b3/net.ppp0 b/net-dialup/ppp/files/2.4.2b3/net.ppp0
index 6d6ec2923963..5c1f89422ac3 100644
--- a/net-dialup/ppp/files/2.4.2b3/net.ppp0
+++ b/net-dialup/ppp/files/2.4.2b3/net.ppp0
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/files/2.4.2b3/net.ppp0,v 1.1 2003/12/22 15:05:26 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/files/2.4.2b3/net.ppp0,v 1.2 2003/12/22 15:16:18 lanius Exp $
 
 # Misc internal variables
 CMD_LINE=""
@@ -190,14 +190,22 @@ setup_cfg_files() {
 		then
 			if [ -n "${INITSTRING}" ]
 			then
-				sed -e "12i\\'OK\' \'${INITSTRING}\'" \
-					-e "s:\$NUMBER:${NUMBER}:" \
-					${TEMPLATEDIR}/chat-default \
-					>/etc/ppp/chat-${PEER}
+				if [ -n "${NUMBER}" ]; then
+					sed -e "12i\\'OK\' \'${INITSTRING}\'" \
+						-e "s:\$NUMBER:${NUMBER}:" \
+						${TEMPLATEDIR}/chat-default \
+						>/etc/ppp/chat-${PEER}
+				else
+					sed -e "12i\\'OK\' \'${INITSTRING}\'" \
+						${TEMPLATEDIR}/chat-default \
+						>/etc/ppp/chat-${PEER}
+				fi
 			else
-				sed -e "s:\$NUMBER:${NUMBER}:" \
-					${TEMPLATEDIR}/chat-default \
-					>/etc/ppp/chat-${PEER}
+				if [ -n "${NUMBER}" ]; then
+					sed -e "s:\$NUMBER:${NUMBER}:" \
+						${TEMPLATEDIR}/chat-default \
+						>/etc/ppp/chat-${PEER}
+				fi
 			fi
 		fi
 	fi
diff --git a/net-dialup/ppp/ppp-2.4.1-r14.ebuild b/net-dialup/ppp/ppp-2.4.1-r14.ebuild
index e6924d3e3b47..2191fcf439d4 100644
--- a/net-dialup/ppp/ppp-2.4.1-r14.ebuild
+++ b/net-dialup/ppp/ppp-2.4.1-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.1-r14.ebuild,v 1.14 2003/12/17 04:24:01 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.1-r14.ebuild,v 1.15 2003/12/22 15:16:18 lanius Exp $
 
 S=${WORKDIR}/${P}.pppoe4
 DESCRIPTION="Point-to-point protocol - patched for pppoe"
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}-pppoe4.tgz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc hppa amd64 ia64 alpha ppc64"
+KEYWORDS="x86 ppc sparc hppa amd64 ia64 alpha"
 IUSE="crypt ipv6 activefilter"
 
 DEPEND="virtual/glibc
diff --git a/net-dialup/ppp/ppp-2.4.2_beta3-r1.ebuild b/net-dialup/ppp/ppp-2.4.2_beta3-r1.ebuild
new file mode 100644
index 000000000000..bd5ac4864020
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.2_beta3-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2_beta3-r1.ebuild,v 1.1 2003/12/22 15:16:18 lanius Exp $
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Point-to-point protocol - patched for pppoe"
+HOMEPAGE="http://www.samba.org/ppp"
+SRC_URI="ftp://ftp.samba.org/pub/ppp/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64 ~ia64"
+IUSE="ipv6 activefilter pam"
+
+DEPEND="virtual/glibc
+	activefilter? ( net-libs/libpcap )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${MY_PV}/mpls.patch
+	epatch ${FILESDIR}/${MY_PV}/killaddr-smarter.patch
+	epatch ${FILESDIR}/${MY_PV}/cflags.patch
+
+	use activefilter && {
+		einfo "Enabling active-filter"
+		sed -i -e "s/^#FILTER=y/FILTER=y/" pppd/Makefile.linux
+	}
+
+	use pam && {
+		einfo "Enabling PAM"
+		sed -i -e "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux
+	}
+
+	use ipv6 && {
+		einfo "Enabling IPv6"
+		sed -i -e "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux
+	}
+
+	einfo "Enabling CBCP"
+	sed -i 's/^#CBCP=y/CBCP=y/' pppd/Makefile.linux
+}
+
+src_compile() {
+	cd ${S}
+
+	# compile radiusclient better than their makefile does
+	cd pppd/plugins/radius/radiusclient
+	econf
+	emake
+
+	cd ${S}
+	./configure --prefix=/usr || die
+	emake COPTS="${CFLAGS}" || die
+}
+
+src_install() {
+	for y in chat pppd pppdump pppstats
+	do
+		doman ${y}/${y}.8
+		dosbin ${y}/${y}
+	done
+	chmod u+s-w ${D}/usr/sbin/pppd
+
+	dodir /etc/ppp/peers
+	insinto /etc/ppp
+	insopts -m0600
+	doins etc.ppp/pap-secrets etc.ppp/chap-secrets
+
+	insopts -m0644
+	doins etc.ppp/options
+	doins ${FILESDIR}/${MY_PV}/options-pptp
+	doins ${FILESDIR}/${MY_PV}/options-pppoe
+	doins ${FILESDIR}/${MY_PV}/chat-default
+
+	insopts -m0755
+	doins ${FILESDIR}/${MY_PV}/ip-up
+	doins ${FILESDIR}/${MY_PV}/ip-down
+
+	exeinto /etc/init.d/
+	doexe ${FILESDIR}/${MY_PV}/net.ppp0
+
+	insinto /etc/conf.d
+	insopts -m0600
+	newins ${FILESDIR}/${MY_PV}/confd.ppp0 net.ppp0
+
+	dolib.so pppd/plugins/minconn.so
+	dolib.so pppd/plugins/passprompt.so
+	dolib.so pppd/plugins/rp-pppoe/rp-pppoe.so
+	dodir /usr/lib/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
+	mv ${D}/usr/lib/*.so ${D}/usr/lib/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
+
+	insinto /etc/modules.d
+	insopts -m0644
+	newins ${FILESDIR}/${MY_PV}/modules.ppp ppp
+
+	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
+	dodoc ${FILESDIR}/${MY_PV}/README.mpls
+	dohtml ${FILESDIR}/${MY_PV}/pppoe.html
+
+	dosbin scripts/pon
+	dosbin scripts/poff
+	dosbin scripts/plog
+	doman scripts/pon.1
+
+	# Adding misc. specialized scripts to doc dir
+	dodir /usr/share/doc/${PF}/scripts/chatchat
+	insinto	/usr/share/doc/${PF}/scripts/chatchat
+	doins scripts/chatchat/*
+	insinto /usr/share/doc/${PF}/scripts
+	doins scripts/*
+}
+
+pkg_postinst() {
+	if [ ! -e ${ROOT}dev/.devfsd ]
+	then
+		if [ ! -e ${ROOT}dev/ppp ]; then
+			mknod ${ROOT}dev/ppp c 108 0
+		fi
+	fi
+	if [ "$ROOT" = "/" ]
+	then
+		/sbin/update-modules
+	fi
+	ewarn "To enable kernel-pppoe read html/pppoe.html in the doc-directory."
+	ewarn "Pon, poff and plog scripts have been supplied for experienced users."
+	ewarn "New users or those requiring something more should have a look at"
+	ewarn "the /etc/init.d/net.ppp0 script."
+	ewarn "Users needing particular scripts (ssh,rsh,etc.)should check out the"
+	ewarn "/usr/share/doc/ppp*/scripts directory."
+}