add radius flag; partially solve conflicts with net-dialup/radiusclient (#92878); fix #92977

Package-Manager: portage-2.0.51.19

7 files changed, 465 insertions, 8 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 7ccb668e8b2c..eada60b9ca39 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,16 @@
 # 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.109 2005/05/14 09:27:56 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.110 2005/05/23 18:16:42 mrness Exp $
+
+*ppp-2.4.3-r4 (23 May 2005)
+*ppp-2.4.2-r11 (23 May 2005)
+
+  23 May 2005; Alin Nastac <mrness@gentoo.org> +ppp-2.4.2-r11.ebuild,
+  ppp-2.4.3-r3.ebuild, +ppp-2.4.3-r4.ebuild:
+  Add radius USE flag which controls installation of RADIUS plugins. Partially
+  solve conflicts with net-dialup/radiusclient by not installing radiusclient
+  library - ppp is statically linked with it (#92878). Install radiusclient
+  configuration files in ppp-2.4.3-r4 (#92977).
 
   14 May 2005; Alin Nastac <mrness@gentoo.org> -files/2.4.2/README.mpls,
   -files/2.4.2/cbcp-dosfix.patch, -files/2.4.2/cflags.patch,
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index bb81b05111ff..1b6375511c85 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,8 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8b68119b8f7144c250b789bf9aef9db5 ppp-2.4.3-r3.ebuild 6046
-MD5 45c62d291da317bfb11c235495f1e706 ChangeLog 19654
+MD5 215f648fa31e547edb11b4835a759163 ppp-2.4.3-r4.ebuild 6441
+MD5 882e85fabc75a4917d0b774452a5356d ppp-2.4.2-r11.ebuild 6472
+MD5 8ac8019ba04fc2340ef5b7f32461bd60 ppp-2.4.3-r3.ebuild 6046
+MD5 3eef860d3e11309f0dd41ebd5e381494 ChangeLog 20109
 MD5 e6fdfdc4317d7fe324c50bd0477ca3f8 metadata.xml 295
 MD5 fc56767c28bef6332decb0a5c48cad83 ppp-2.4.2-r10.ebuild 6209
 MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
@@ -14,9 +16,11 @@ MD5 054b3958fe0cfda4ac1420846fcc7a4b files/ip-up 1081
 MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607
 MD5 c9117abf5fed623d5290779446e9855e files/confd.ppp0 2775
 MD5 d90deeaef8dbdfcd18d1567681d03559 files/digest-ppp-2.4.2-r10 271
+MD5 d90deeaef8dbdfcd18d1567681d03559 files/digest-ppp-2.4.2-r11 271
 MD5 fa2a5b8df496922fa2fb592115953b6b files/options-pppoe 53
 MD5 2f3f8eb46b9d97a435a8694683f84651 files/net.ppp0 4408
 MD5 4afa8dd77ad811492789477df07e47da files/digest-ppp-2.4.3-r3 195
+MD5 4afa8dd77ad811492789477df07e47da files/digest-ppp-2.4.3-r4 195
 MD5 1fd88dda7f4996799c69a9501d42cc23 files/README.mpls 530
 MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
 MD5 5a554e2a04b9e11bb5bea839213bf97c files/ip-down 931
@@ -24,7 +28,7 @@ MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFChcSvjiC39V7gKu0RAmhCAJ0RI3zpyzFMPmTe16sZ4VukX0wzJwCfUrVH
-9HbZvJVuzGDKBTEcLYp/Gwk=
-=cQc0
+iD8DBQFCkh4ljiC39V7gKu0RAhjqAJ9oJwD1p7rOrsvVr/IeqhTTFcpPbgCgx1+R
+HTMYI/IXB1l/pBp0NssWGC4=
+=sZHk
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.2-r11 b/net-dialup/ppp/files/digest-ppp-2.4.2-r11
new file mode 100644
index 000000000000..1f2afa2ee484
--- /dev/null
+++ b/net-dialup/ppp/files/digest-ppp-2.4.2-r11
@@ -0,0 +1,4 @@
+MD5 362bcf218fba8afbb9afbee7471e5dac ppp-2.4.2.tar.gz 774441
+MD5 760e970cad38d42766c72341f175604d ppp-2.4.2-patches-20050514.tar.gz 11707
+MD5 0d2679907627f68dd6a2c32d1c7dda90 ppp-2.4.2-mppe-mppc-1.1.patch.gz 12532
+MD5 9d2f3febf510c5b0cbb4dacba713a217 ppp-dhcpc.tgz 33497
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.3-r4 b/net-dialup/ppp/files/digest-ppp-2.4.3-r4
new file mode 100644
index 000000000000..7e13042c0ec3
--- /dev/null
+++ b/net-dialup/ppp/files/digest-ppp-2.4.3-r4
@@ -0,0 +1,3 @@
+MD5 848f6c3cafeb6074ffeb293c3af79b7c ppp-2.4.3.tar.gz 688092
+MD5 2d414249802b9791117666a8a7b01370 ppp-2.4.3-patches-20050514.tar.gz 28072
+MD5 9d2f3febf510c5b0cbb4dacba713a217 ppp-dhcpc.tgz 33497
diff --git a/net-dialup/ppp/ppp-2.4.2-r11.ebuild b/net-dialup/ppp/ppp-2.4.2-r11.ebuild
new file mode 100644
index 000000000000..b7805ff1489f
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.2-r11.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r11.ebuild,v 1.1 2005/05/23 18:16:42 mrness Exp $
+
+inherit eutils gnuconfig flag-o-matic
+
+DESCRIPTION="Point-to-point protocol (PPP)"
+HOMEPAGE="http://www.samba.org/ppp"
+SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
+	mirror://gentoo/${P}-patches-20050514.tar.gz
+	mppe-mppc? ( http://www.polbox.com/h/hs001/ppp-2.4.2-mppe-mppc-1.1.patch.gz )
+	dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~mips"
+IUSE="activefilter atm dhcp ipv6 mppe-mppc pam radius"
+
+RDEPEND="virtual/libc
+	activefilter? ( virtual/libpcap )
+	atm? ( net-dialup/linux-atm )
+	pam? ( sys-libs/pam )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${WORKDIR}/patch/cbcp-dosfix.patch || die "patch failed"
+	epatch ${WORKDIR}/patch/mpls.patch || die "patch failed"
+	epatch ${WORKDIR}/patch/killaddr-smarter.patch || die "patch failed"
+	epatch ${WORKDIR}/patch/cflags.patch || die "patch failed"
+	epatch ${WORKDIR}/patch/control_c.patch || die "patch failed"
+
+	use mppe-mppc && {
+		einfo "Enabling mppe-mppc support"
+		epatch ${WORKDIR}/ppp-2.4.2-mppe-mppc-1.1.patch || die "patch failed"
+	}
+
+	if use atm; then
+		einfo "Enabling PPPoATM support"
+		epatch ${WORKDIR}/patch/pppoatm-2.patch || die "patch failed"
+		sed -i -e "s/^LIBS =/LIBS = -latm/" pppd/Makefile.linux || die
+	fi
+
+	use activefilter || {
+		einfo "Disabling active-filter"
+		sed -i -e "s/^FILTER=y/#FILTER=y/" pppd/Makefile.linux || die
+	}
+
+	use pam && {
+		einfo "Enabling PAM"
+		sed -i -e "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux || die
+	}
+
+	use ipv6 && {
+		einfo "Enabling IPv6"
+		sed -i -e "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux || die
+	}
+
+	einfo "Enabling CBCP"
+	sed -i 's/^#CBCP=y/CBCP=y/' pppd/Makefile.linux || die
+
+	use radius && {
+		einfo "Enabling RADIUS"
+		sed -i -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe radius/' pppd/plugins/Makefile.linux || die
+		sed -i -e '/^CFLAGS/s:$: -fPIC:' pppd/plugins/radius/radiusclient/lib/Makefile.in || die
+	}
+
+	use dhcp && {
+		# copy the ppp-dhcp plugin files
+		einfo "Copying ppp-dhcp plugin files..."
+		tar -xzf ${DISTDIR}/ppp-dhcpc.tgz -C ${S}/pppd/plugins/
+		sed -i -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe dhcp/' pppd/plugins/Makefile.linux || die
+		sed -i -e "s/-O2/${CFLAGS} -fPIC/" ${S}/pppd/plugins/dhcp/Makefile.linux
+		epatch ${WORKDIR}/patch/dhcp-sys_error_to_strerror.patch || die
+	}
+
+	#epatch ${FILESDIR}/${PV}/pcap.patch
+	sed -i -e "s:net/bpf.h:pcap-bpf.h:" pppd/sys-linux.c pppd/demand.c pppd/plugins/rp-pppoe/if.c
+
+	# Set correct libdir
+	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
+		${S}/pppd/{pathnames.h,pppd.8} || die
+}
+
+src_compile() {
+	export WANT_AUTOCONF=2.1
+	gnuconfig_update
+	use radius && {
+		# compile radius better than their makefile does
+		append-ldflags -Wl,-z,now
+		(cd pppd/plugins/radius/radiusclient && econf && emake -j1) || die "radiusclient build has failed"
+	}
+	./configure --prefix=/usr || die "configure failed"
+	emake COPTS="${CFLAGS}" || die "build has failed"
+}
+
+src_install() {
+	local y
+	for y in chat pppd pppdump pppstats
+	do
+		doman ${y}/${y}.8
+		dosbin ${y}/${y}
+	done
+	chmod u+s-w ${D}/usr/sbin/pppd
+
+	dodir /etc/ppp/peers
+	insinto /etc/ppp
+	insopts -m0600
+	newins etc.ppp/pap-secrets pap-secrets.example
+	newins etc.ppp/chap-secrets chap-secrets.example
+
+	insopts -m0644
+	doins etc.ppp/options
+	doins ${FILESDIR}/options-pptp
+	doins ${FILESDIR}/options-pppoe
+	doins ${FILESDIR}/chat-default
+
+	insopts -m0755
+	doins ${FILESDIR}/ip-up
+	doins ${FILESDIR}/ip-down
+
+	exeinto /etc/init.d/
+	doexe ${FILESDIR}/net.ppp0
+
+	if use pam; then
+		insinto /etc/pam.d
+		insopts -m0644
+		newins pppd/ppp.pam ppp || die "not found ppp.pam"
+	fi
+
+	insinto /etc/conf.d
+	insopts -m0600
+	newins ${FILESDIR}/confd.ppp0 net.ppp0
+
+	local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
+	#closing " for syntax coloring
+	dodir ${PLUGINS_DIR}
+	insinto ${PLUGINS_DIR}
+	insopts -m0755
+	doins pppd/plugins/minconn.so || die "minconn.so not build"
+	doins pppd/plugins/passprompt.so || die "passprompt.so not build"
+	doins pppd/plugins/rp-pppoe/rp-pppoe.so || die "rp-pppoe.so not build"
+	if use atm; then
+		doins pppd/plugins/pppoatm.so || die "pppoatm.so not build"
+	fi
+	if use dhcp; then
+		doins pppd/plugins/dhcp/dhcpc.so || die "dhcpc.so not build"
+	fi
+	if use radius; then
+		doins pppd/plugins/radius/radius.so || die "radius.so not build"
+		doins pppd/plugins/radius/radattr.so || die "radattr.so not build"
+		doins pppd/plugins/radius/radrealms.so || die "radrealms.so not build"
+
+		doman pppd/plugins/radius/pppd-radius.8
+		doman pppd/plugins/radius/pppd-radattr.8
+
+		#Copy radiusclient configuration files
+		#DO NOT INSTALL libradiusclient.so files!!! see #92878 for more info
+		insinto /etc/radiusclient
+		insopts -m0644
+		doins pppd/plugins/radius/radiusclient/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
+	fi
+
+	insinto /etc/modules.d
+	insopts -m0644
+	newins ${FILESDIR}/modules.ppp ppp
+	if use mppe-mppc; then
+		echo 'alias ppp-compress-18 ppp_mppe_mppc' >> ${D}/etc/modules.d/ppp
+	fi
+
+	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
+	dodoc ${FILESDIR}/README.mpls
+	dohtml ${FILESDIR}/pppoe.html
+
+	dosbin scripts/pon
+	dosbin scripts/poff
+	dosbin scripts/plog
+	doman scripts/pon.1
+
+	# Adding misc. specialized scripts to doc dir
+	dodir /usr/share/doc/${PF}/scripts/chatchat
+	insinto	/usr/share/doc/${PF}/scripts/chatchat
+	doins scripts/chatchat/*
+	insinto /usr/share/doc/${PF}/scripts
+	doins scripts/*
+}
+
+pkg_postinst() {
+	if ! [ -e ${ROOT}dev/.devfsd ] || [ -e ${ROOT}dev/.udev ]
+	then
+		if [ ! -e ${ROOT}dev/ppp ]; then
+			mknod ${ROOT}dev/ppp c 108 0
+		fi
+	fi
+	if [ "$ROOT" = "/" ]
+	then
+		/sbin/update-modules
+	fi
+	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
+}
diff --git a/net-dialup/ppp/ppp-2.4.3-r3.ebuild b/net-dialup/ppp/ppp-2.4.3-r3.ebuild
index 80fe830ee606..3f6cb5fdea42 100644
--- a/net-dialup/ppp/ppp-2.4.3-r3.ebuild
+++ b/net-dialup/ppp/ppp-2.4.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r3.ebuild,v 1.4 2005/05/14 09:27:56 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r3.ebuild,v 1.5 2005/05/23 18:16:42 mrness Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
 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"
+IUSE="activefilter atm dhcp gtk ipv6 mppe-mppc pam"
 
 RDEPEND="virtual/libc
 	activefilter? ( virtual/libpcap )
diff --git a/net-dialup/ppp/ppp-2.4.3-r4.ebuild b/net-dialup/ppp/ppp-2.4.3-r4.ebuild
new file mode 100644
index 000000000000..af44a26b2ee8
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.3-r4.ebuild
@@ -0,0 +1,224 @@
+# 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-r4.ebuild,v 1.1 2005/05/23 18:16:42 mrness Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Point-to-Point Protocol (PPP)"
+HOMEPAGE="http://www.samba.org/ppp"
+SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
+	mirror://gentoo/${P}-patches-20050514.tar.gz
+	dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc64"
+IUSE="activefilter atm dhcp gtk ipv6 mppe-mppc pam radius"
+
+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 -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe dhcp/' ${S}/pppd/plugins/Makefile.linux
+		sed -i -e "s/-O2/${CFLAGS} -fPIC/" ${S}/pppd/plugins/dhcp/Makefile.linux
+		epatch ${WORKDIR}/patch/dhcp-sys_error_to_strerror.patch
+	}
+
+	# Set correct libdir
+	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
+		${S}/pppd/{pathnames.h,pppd.8} || die
+
+	find ${S} -type f -name Makefile.linux \
+		-exec sed -i -e '/^CC[[:space:]]*=/d' {} \;
+
+	#set the right paths in radiusclient.conf
+	sed -i -e "s:/usr/local/etc:/etc:" \
+		-e "s:/usr/local/sbin:/usr/sbin:" ${S}/pppd/plugins/radius/etc/radiusclient.conf
+}
+
+src_compile() {
+	export CC="$(tc-getCC)"
+	export AR="$(tc-getAR)"
+	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}/options-pptp
+	doins ${FILESDIR}/options-pppoe
+	doins ${FILESDIR}/chat-default
+
+	insopts -m0755
+	doins ${FILESDIR}/ip-up
+	doins ${FILESDIR}/ip-down
+
+	exeinto /etc/init.d/
+	doexe ${FILESDIR}/net.ppp0
+
+	if use pam; then
+		insinto /etc/pam.d
+		insopts -m0644
+		newins pppd/ppp.pam ppp || die "not found ppp.pam"
+	fi
+
+	insinto /etc/conf.d
+	insopts -m0600
+	newins ${FILESDIR}/confd.ppp0 net.ppp0
+
+	local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
+	#closing " for syntax coloring
+	dodir ${PLUGINS_DIR}
+	insinto ${PLUGINS_DIR}
+	insopts -m0755
+	doins pppd/plugins/minconn.so || die "minconn.so not build"
+	doins pppd/plugins/passprompt.so || die "passprompt.so not build"
+	doins pppd/plugins/passwordfd.so || die "passwordfd.so not build"
+	doins pppd/plugins/winbind.so || die "winbind.so not build"
+	doins pppd/plugins/rp-pppoe/rp-pppoe.so || die "rp-pppoe.so not build"
+	if use atm; then
+		doins pppd/plugins/pppoatm/pppoatm.so || die "pppoatm.so not build"
+	fi
+	if use dhcp; then
+		doins pppd/plugins/dhcp/dhcpc.so || die "dhcpc.so not build"
+	fi
+	if use radius; then
+		doins pppd/plugins/radius/radius.so || die "radius.so not build"
+		doins pppd/plugins/radius/radattr.so || die "radattr.so not build"
+		doins pppd/plugins/radius/radrealms.so || die "radrealms.so not build"
+
+		#Copy radiusclient configuration files (#92878)
+		insinto /etc/radiusclient
+		insopts -m0644
+		doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
+
+		doman pppd/plugins/radius/pppd-radius.8
+		doman pppd/plugins/radius/pppd-radattr.8
+	fi
+
+	insinto /etc/modules.d
+	insopts -m0644
+	newins ${FILESDIR}/modules.ppp ppp
+	if use mppe-mppc; then
+		echo 'alias ppp-compress-18 ppp_mppe_mppc' >> ${D}/etc/modules.d/ppp
+	fi
+
+	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
+	dodoc ${FILESDIR}/README.mpls
+	dohtml ${FILESDIR}/pppoe.html
+
+	dosbin scripts/pon
+	dosbin scripts/poff
+	dosbin scripts/plog
+	doman scripts/pon.1
+
+	# Adding misc. specialized scripts to doc dir
+	dodir /usr/share/doc/${PF}/scripts/chatchat
+	insinto /usr/share/doc/${PF}/scripts/chatchat
+	doins scripts/chatchat/*
+	insinto /usr/share/doc/${PF}/scripts
+	doins scripts/*
+
+	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
+}