add fixes from upstream CVS - hopefully it solves persistent connection problem (#74093)

Package-Manager: portage-2.0.51.19

4 files changed, 220 insertions, 5 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 86c4bfa27560..26da408d6b45 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.104 2005/04/16 10:10:42 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.105 2005/05/05 20:01:23 mrness Exp $
+
+*ppp-2.4.3-r2 (05 May 2005)
+
+  05 May 2005; Alin Nastac <mrness@gentoo.org> +ppp-2.4.3-r2.ebuild:
+  Import fixes from upstream CVS (#74093).
 
   16 Apr 2005; Alin Nastac <mrness@gentoo.org> files/net.ppp0:
   Fix net.ppp0 script regarding default route removal (#89017).
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index b2122e156e32..efaccb961c0d 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,10 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 7fabd0811dbf88750b8a7cd65f1b7cb2 ppp-2.4.3-r2.ebuild 5673
 MD5 f498fcc5704e842bdd3a13e71626f676 ppp-2.4.3.ebuild 5712
 MD5 c4e90e104aa550d26d90ee354e7a2136 ppp-2.4.1-r14.ebuild 4702
 MD5 558237b810ac812265ad87bb956270de ppp-2.4.3-r1.ebuild 5799
-MD5 326398064e16853ec98f5c39e2df540f ChangeLog 17851
+MD5 c85c44da12f935460b715d9a45746851 ChangeLog 17993
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 4dce8b15c7a47d9a225b1047fda9870e ppp-2.4.2-r10.ebuild 5899
 MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
@@ -22,6 +23,7 @@ MD5 c032ff6a0c137f4996b7a5bf60e19a0a files/ppp-sys_error_to_strerror.patch 4920
 MD5 8368eb79ad4618c3c6753801b5c4c689 files/gcc3.3-multiline.patch 1673
 MD5 01ed8667e00028ff1c6a8ac4a0d7e1dc files/digest-ppp-2.4.3 194
 MD5 01ed8667e00028ff1c6a8ac4a0d7e1dc files/digest-ppp-2.4.3-r1 194
+MD5 3e67d7c036e1e23ae4aa96ad043cb3e8 files/digest-ppp-2.4.3-r2 195
 MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
 MD5 5a554e2a04b9e11bb5bea839213bf97c files/ip-down 931
 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
@@ -53,7 +55,7 @@ MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/2.4.3/pppoe.html 7605
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCYOTnjiC39V7gKu0RAlefAKCM18q8ZlRc+HEdUM4v2Vgd21UZIACfSgV0
-u5MgoV2gC0bYsMgACz7BS70=
-=j6CA
+iD8DBQFCenuujiC39V7gKu0RAjr6AKDHnHa/FRL6PpLnV5eIB+dW9T3VJgCgj0I2
+7yEogJwahT4v46/OCZGH5fo=
+=sRjQ
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.3-r2 b/net-dialup/ppp/files/digest-ppp-2.4.3-r2
new file mode 100644
index 000000000000..e7d9836f4ec4
--- /dev/null
+++ b/net-dialup/ppp/files/digest-ppp-2.4.3-r2
@@ -0,0 +1,3 @@
+MD5 848f6c3cafeb6074ffeb293c3af79b7c ppp-2.4.3.tar.gz 688092
+MD5 bb955eb708731473a0e609b14932ea09 ppp-2.4.3-patches-20050505.tar.gz 26751
+MD5 9d2f3febf510c5b0cbb4dacba713a217 ppp-dhcpc.tgz 33497
diff --git a/net-dialup/ppp/ppp-2.4.3-r2.ebuild b/net-dialup/ppp/ppp-2.4.3-r2.ebuild
new file mode 100644
index 000000000000..563d2922270a
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.3-r2.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r2.ebuild,v 1.1 2005/05/05 20:01:23 mrness Exp $
+
+inherit eutils gnuconfig flag-o-matic
+
+DESCRIPTION="Point-to-point protocol"
+HOMEPAGE="http://www.samba.org/ppp"
+SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
+	mirror://gentoo/${P}-patches-20050505.tar.gz
+	dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc64"
+IUSE="gtk ipv6 activefilter pam atm mppe-mppc dhcp"
+
+RDEPEND="virtual/libc
+	activefilter? ( virtual/libpcap )
+	atm? ( net-dialup/linux-atm )
+	pam? ( sys-libs/pam )
+	gtk? ( =x11-libs/gtk+-1* )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${WORKDIR}/patch/ppp_flags.patch
+	epatch ${WORKDIR}/patch/mpls.patch
+	epatch ${WORKDIR}/patch/killaddr-smarter.patch
+
+	epatch ${WORKDIR}/patch/upstream-fixes.patch
+	epatch ${WORKDIR}/patch/fix_activefilter.patch
+
+	use mppe-mppc && {
+		einfo "Enabling mppe-mppc support"
+		epatch ${WORKDIR}/patch/mppe-mppc-1.1.patch
+	}
+
+	use atm && {
+		einfo "Enabling PPPoATM support"
+		sed -i "s/^#HAVE_LIBATM=yes/HAVE_LIBATM=yes/" ${S}/pppd/plugins/pppoatm/Makefile.linux
+	}
+
+	use activefilter || {
+		einfo "Disabling active filter"
+		sed -i "s/^FILTER=y/#FILTER=y/" pppd/Makefile.linux
+	}
+
+	use pam && {
+		einfo "Enabling PAM"
+		sed -i "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux
+	}
+
+	use ipv6 && {
+		einfo "Enabling IPv6"
+		sed -i "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux
+	}
+
+	einfo "Enabling CBCP"
+	sed -i "s/^#CBCP=y/CBCP=y/" ${S}/pppd/Makefile.linux
+
+	use dhcp && {
+		# copy the ppp-dhcp plugin files
+		einfo "Copying ppp-dhcp plugin files..."
+		tar -xzf ${DISTDIR}/ppp-dhcpc.tgz -C ${S}/pppd/plugins/
+		sed -i 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe dhcp/' ${S}/pppd/plugins/Makefile.linux
+		sed -i "s/-O2/${CFLAGS} -fPIC/" ${S}/pppd/plugins/dhcp/Makefile.linux
+		epatch ${FILESDIR}/ppp-sys_error_to_strerror.patch || die
+	}
+}
+
+src_compile() {
+	#export WANT_AUTOCONF=2.1
+	#gnuconfig_update
+	# compile radius better than their makefile does
+	append-ldflags -Wl,-z,now
+	econf || die "configuration failed"
+	emake COPTS="${CFLAGS}" || die "compile failed"
+
+	#build pppgetpass
+	cd contrib/pppgetpass
+	if use gtk; then
+		emake -f Makefile.linux || die "failed to build pppgetpass"
+	else
+		emake pppgetpass.vt || die "failed to build pppgetpass"
+	fi
+}
+
+src_install() {
+	local y
+	for y in chat pppd pppdump pppstats
+	do
+		doman ${y}/${y}.8
+		dosbin ${y}/${y}
+	done
+	chmod u+s-w ${D}/usr/sbin/pppd
+
+	dosbin pppd/plugins/rp-pppoe/pppoe-discovery
+
+	insinto /etc/ppp
+	insopts -m0600
+	newins etc.ppp/pap-secrets pap-secrets.example
+	newins etc.ppp/chap-secrets chap-secrets.example
+
+	insopts -m0644
+	doins etc.ppp/options
+	doins ${FILESDIR}/${PV}/options-pptp
+	doins ${FILESDIR}/${PV}/options-pppoe
+	doins ${FILESDIR}/${PV}/chat-default
+
+	insopts -m0755
+	doins ${FILESDIR}/ip-up
+	doins ${FILESDIR}/ip-down
+
+	exeinto /etc/init.d/
+	doexe ${FILESDIR}/net.ppp0
+
+	if use pam; then
+		insinto /etc/pam.d
+		insopts -m0644
+		newins pppd/ppp.pam ppp || die "not found ppp.pam"
+	fi
+
+	insinto /etc/conf.d
+	insopts -m0600
+	newins ${FILESDIR}/confd.ppp0 net.ppp0
+
+	dolib.so pppd/plugins/minconn.so
+	dolib.so pppd/plugins/passprompt.so
+	dolib.so pppd/plugins/passwordfd.so
+	dolib.so pppd/plugins/winbind.so
+	dolib.so pppd/plugins/rp-pppoe/rp-pppoe.so
+	dolib.so pppd/plugins/radius/radius.so
+	dolib.so pppd/plugins/radius/radattr.so
+	dolib.so pppd/plugins/radius/radrealms.so
+	if use atm; then
+		dolib.so pppd/plugins/pppoatm/pppoatm.so || die "pppoatm.so not build"
+	fi
+	if use dhcp; then
+		dolib.so pppd/plugins/dhcp/dhcpc.so || die "dhcpc.so not build"
+	fi
+
+	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}/${PV}/modules.ppp ppp
+	if use mppe-mppc; then
+		echo 'alias ppp-compress-18 ppp_mppe_mppc' >> ${D}/etc/modules.d/ppp
+	fi
+
+	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
+	dodoc ${FILESDIR}/${PV}/README.mpls
+	dohtml ${FILESDIR}/${PV}/pppoe.html
+
+	doman pppd/plugins/radius/pppd-radius.8
+	doman pppd/plugins/radius/pppd-radattr.8
+
+	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/*
+
+	if use gtk; then
+		dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
+		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
+	else
+		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
+	fi
+	doman contrib/pppgetpass/pppgetpass.8
+}
+
+pkg_postinst() {
+	if [ ! -e ${ROOT}dev/.devfsd ] && [ ! -e ${ROOT}dev/.udev ]
+	then
+		if [ ! -e ${ROOT}dev/ppp ]; then
+			mknod ${ROOT}dev/ppp c 108 0
+		fi
+	fi
+	if [ "$ROOT" = "/" ]
+	then
+		/sbin/update-modules
+	fi
+	ewarn "To enable kernel-pppoe read html/pppoe.html in the doc-directory."
+	ewarn "Note: the library name has changed from pppoe.so to rp-pppoe.so."
+	ewarn "Pon, poff and plog scripts have been supplied for experienced users."
+	ewarn "New users or those requiring something more should have a look at"
+	ewarn "the /etc/init.d/net.ppp0 script."
+	ewarn "Users needing particular scripts (ssh,rsh,etc.)should check out the"
+	ewarn "/usr/share/doc/ppp*/scripts directory."
+
+	# lib name has changed
+	sed -i -e "s:^pppoe.so:rp-pppoe.so:" ${ROOT}etc/ppp/options
+}