Patch passwordfd plugin to read password as soon as it gets the fd number - openrc use stdin for that, fd that could be closed by pppd before plugin reads the password (#209294).

Package-Manager: portage-2.1.4.4

3 files changed, 331 insertions, 2 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index bd023d753a47..50c5f9534c9b 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.216 2008/06/21 19:58:27 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.217 2008/06/25 21:12:36 mrness Exp $
+
+*ppp-2.4.4-r16 (25 Jun 2008)
+
+  25 Jun 2008; Alin Năstac <mrness@gentoo.org> +ppp-2.4.4-r16.ebuild:
+  Patch passwordfd plugin to read password as soon as it gets the fd number -
+  openrc use stdin for that, fd that could be closed by pppd before plugin
+  reads the password (#209294).
 
   21 Jun 2008; Markus Rothe <corsair@gentoo.org> ppp-2.4.4-r15.ebuild:
   Stable on ppc64; bug #227183
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 6240e9f5780b..9161985abb5a 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX README.mpls 530 RMD160 4814f25fa3d788311f37045188cf285fb588da67 SHA1 fdf4abff10b2593ca9012429cf684243cc74fec6 SHA256 5ef99aba902533fe9d17b7dfaf91e72b638cc70b9f811d1e518822ee80b5ff57
 AUX modules.ppp 299 RMD160 ef5ee6fcf66dce67e5bd25220699c3df3ae6ee28 SHA1 d5d8646685dd7d4c0811812e2cb85fee71806d2b SHA256 8947dd48d3d0c128166edc9bb0917b9af88502296fad791d6d90bf165ca50db3
 DIST ppp-2.4.4-gentoo-20070903.tar.gz 49574 RMD160 05ac480547465ba4907ea2df95f910cfef378171 SHA1 71f3ebae77b281d1aff2edd9303eb6e14ef77176 SHA256 79cfb44fd3868a139f11fee6f2a59ef9f2448b060d4b5584696be3048606b40d
 DIST ppp-2.4.4-gentoo-20080412.tar.gz 47912 RMD160 19cb48bf5f283054bb9fb12b20d6456190d9f5eb SHA1 56ecb29bb910fb726ff3fbdf7425c27d63258e3b SHA256 4a4cd83b378c8d422a9c1ac135e8ffb4db46ab2ab819c9d9f65c4c8ebc2a8bba
+DIST ppp-2.4.4-gentoo-20080625.tar.gz 49080 RMD160 390e6af057c277ebc46d658b9a9ebe62925c2d3f SHA1 d978257eec5c4b8d9198ce062d9db0f7b72318c3 SHA256 23e1b20a201b262d3da71e640cb2883e88014a459638760afbd521587bf013c6
 DIST ppp-2.4.4.tar.gz 688763 RMD160 ed289a4506c3af41a72f88103d5e0be44dec3da7 SHA1 9b91b0117e0a8bfaf8c4e894af79e0960dd36259 SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea
 DIST ppp-dhcpc.tgz 33497 RMD160 63bf0d1cc52e91ea536fc593fb7a40502baecd90 SHA1 1a0b02788d522f2137d0b66c749ffe6c96cceb94 SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644
 EBUILD ppp-2.4.4-r14.ebuild 10476 RMD160 8b883a43b569d66421f82e6f912ac13498b6cd82 SHA1 4ca1bd229972fe9e726ed1f517e1cb4670696a6a SHA256 ea7f1162287fdd4a45f407d2950dca9c5ba30e134d163b2b6d80e666ee5823ff
 EBUILD ppp-2.4.4-r15.ebuild 10636 RMD160 15321c05aacbf6fee06644e23d95eb0d31b61b83 SHA1 1c5fc456a4dcae1dcc097877ec13fbf8646ea583 SHA256 ddacadeb849b1c1095797eeb758b9f1072f1e7ebd5a2a5c9158909977f7eab00
-MISC ChangeLog 35755 RMD160 73ab6721eeb75e3f17508ba7c02731c7525d71aa SHA1 54156c97d1df52dab764f25af19ace27a0dbefa2 SHA256 f3bed500373b3a889b0443f43e5c157813927ef4605b274a620b5177c518b0f7
+EBUILD ppp-2.4.4-r16.ebuild 10695 RMD160 68aee0ca76d493ddc4f85e2690a91ae47c5b383b SHA1 f6ba62d52826d1a25f75f189d4ac9acd092cb788 SHA256 c1cb432be0da868dbdecb5a7f4de1af78415b47df23dd9c028df20ba34ff20d6
+MISC ChangeLog 36041 RMD160 ae0faa1789b53fe775126f8027ea8cdc0549af37 SHA1 c8097f0a8c9eaa6210e4781028d2de15479333dc SHA256 f6c969d15d26dbfa139b1b93f2f4e7846ceaaf902f2cdb08b2fe8f755cdc1a47
 MISC metadata.xml 384 RMD160 98dac63bd0265c815e677f10fd2418231c01b19e SHA1 00f7ddc284f2338465ba8a1d1bc31da70dc6d7bc SHA256 a9f217d596c53c39f17c5e0675b4a9a484a1530b75c460ca7bf4896e6e732683
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhitM8ACgkQ+fWpoTWIA9EZtwCdEHP/kySemRjMMhke/Dxg5CMn
+xN0An1SXeCfAb6oxgwJDz9YjgUvZ6uYm
+=zIcH
+-----END PGP SIGNATURE-----
diff --git a/net-dialup/ppp/ppp-2.4.4-r16.ebuild b/net-dialup/ppp/ppp-2.4.4-r16.ebuild
new file mode 100644
index 000000000000..d77057347ce9
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.4-r16.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r16.ebuild,v 1.1 2008/06/25 21:12:36 mrness Exp $
+
+inherit eutils flag-o-matic toolchain-funcs linux-info pam
+
+DESCRIPTION="Point-to-Point Protocol (PPP)"
+HOMEPAGE="http://www.samba.org/ppp"
+SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
+	http://dev.gentoo.org/~mrness/distfiles/${P}-gentoo-20080625.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 ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="activefilter atm dhcp eap-tls gtk ipv6 mppe-mppc pam radius"
+
+DEPEND="activefilter? ( >=virtual/libpcap-0.9.4 )
+	atm? ( net-dialup/linux-atm )
+	pam? ( virtual/pam )
+	gtk? ( >=x11-libs/gtk+-2.8 )
+	eap-tls? ( net-misc/curl >=dev-libs/openssl-0.9.7 )"
+
+pkg_setup() {
+	if use mppe-mppc; then
+		echo
+		ewarn "The mppe-mppc flag overwrites the pppd native MPPE support with MPPE-MPPC"
+		ewarn "patch developed by Jan Dubiec."
+		ewarn "The resulted pppd will work only with patched kernels with version <= 2.6.14."
+		ewarn "You could obtain the kernel patch from MPPE-MPPC homepage:"
+		ewarn "   http://mppe-mppc.alphacron.de/"
+		ewarn "CAUTION: MPPC is a U.S. patented algorithm!"
+		ewarn "Ask yourself if you really need it and, if you do, consult your lawyer first."
+		ebeep
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${WORKDIR}/patch/make-vars.patch"
+	epatch "${WORKDIR}/patch/mpls.patch"
+	epatch "${WORKDIR}/patch/killaddr-smarter.patch"
+	epatch "${WORKDIR}/patch/wait-children.patch"
+	epatch "${WORKDIR}/patch/maxoctets-2Glimit.patch"
+	epatch "${WORKDIR}/patch/defaultgateway.patch"
+	epatch "${WORKDIR}/patch/mschapv2-initialize-response.patch"
+	epatch "${WORKDIR}/patch/linkpidfile.patch"
+	epatch "${WORKDIR}/patch/qa-fixes.patch"
+	epatch "${WORKDIR}/patch/kill-pg.patch"
+	epatch "${WORKDIR}/patch/auth-fail.patch"
+	epatch "${WORKDIR}/patch/defaultmetric.patch"
+	epatch "${WORKDIR}/patch/dev-ppp.patch"
+	epatch "${WORKDIR}/patch/gtk2.patch"
+	epatch "${WORKDIR}/patch/pppoe-lcp-timeout.patch"
+	epatch "${WORKDIR}/patch/passwordfd-read-early.patch"
+
+	use eap-tls && {
+		# see http://eaptls.spe.net/index.html for more info
+		einfo "Enabling EAP-TLS support"
+		epatch "${WORKDIR}/patch/eaptls-0.7-gentoo.patch"
+		use mppe-mppc || epatch "${WORKDIR}/patch/eaptls-mppe-0.7.patch"
+	}
+
+	use mppe-mppc && {
+		einfo "Enabling MPPE-MPPC support"
+		epatch "${WORKDIR}/patch/mppe-mppc-1.1.patch"
+		use eap-tls && epatch "${WORKDIR}/patch/eaptls-mppe-0.7-with-mppc.patch"
+	}
+
+	use atm && {
+		einfo "Enabling PPPoATM support"
+		sed -i "s/^#HAVE_LIBATM=yes/HAVE_LIBATM=yes/" 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/" pppd/Makefile.linux
+
+	use dhcp && {
+		# copy the ppp-dhcp plugin files
+		einfo "Copying ppp-dhcp plugin files..."
+		tar -xzf "${DISTDIR}/ppp-dhcpc.tgz" -C pppd/plugins/ \
+			&& sed -i -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe dhcp/' pppd/plugins/Makefile.linux \
+			|| die "ppp-dhcp plugin addition failed"
+		epatch "${WORKDIR}/patch/dhcp-make-vars.patch"
+		epatch "${WORKDIR}/patch/dhcp-sys_error_to_strerror.patch"
+	}
+
+	# Set correct libdir
+	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
+		pppd/{pathnames.h,pppd.8}
+
+	use radius && {
+		#set the right paths in radiusclient.conf
+		sed -i -e "s:/usr/local/etc:/etc:" \
+			-e "s:/usr/local/sbin:/usr/sbin:" pppd/plugins/radius/etc/radiusclient.conf
+		#set config dir to /etc/ppp/radius
+		sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
+			pppd/plugins/radius/{*.8,*.c,*.h} \
+			pppd/plugins/radius/etc/*
+	}
+}
+
+src_compile() {
+	export CC="$(tc-getCC)"
+	export AR="$(tc-getAR)"
+	append-ldflags -Wl,--allow-shlib-undefined # otherwise linking plugins might fail with undef errors (#210837)
+	econf || die "configuration failed"
+	emake COPTS="${CFLAGS} -D_GNU_SOURCE" || 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
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-2.4.3-r5"
+	previous_less_than_2_4_3_r5=$?
+
+	if use radius && [ -d "${ROOT}/etc/radiusclient" ] && \
+		[[ $previous_less_than_2_4_3_r5 = 0 ]] ; then
+		ebegin "Copy /etc/radiusclient to /etc/ppp/radius"
+		cp -pPR "${ROOT}/etc/radiusclient" "${ROOT}/etc/ppp/radius"
+		eend $?
+	fi
+}
+
+src_install() {
+	local i
+	for i in chat pppd pppdump pppstats
+	do
+		doman ${i}/${i}.8
+		dosbin ${i}/${i}
+	done
+	fperms u+s-w /usr/sbin/pppd
+
+	# Install pppd header files
+	pushd pppd && \
+		make INSTROOT="${D}" install-devel && \
+		popd || die "make install-devel failed"
+
+	dosbin pppd/plugins/rp-pppoe/pppoe-discovery
+
+	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
+
+	exeinto /etc/ppp
+	for i in ip-up ip-down ; do
+		doexe "${WORKDIR}/scripts/${i}"
+		insinto /etc/ppp/${i}.d
+		use ipv6 && dosym ${i} /etc/ppp/${i/ip/ipv6}
+		doins "${WORKDIR}/scripts/${i}.d"/*
+	done
+
+	pamd_mimic_system ppp auth account session
+
+	local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
+	#closing " for syntax coloring
+	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/ppp/radius
+		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/modprobe.d
+	insopts -m0644
+	newins "${FILESDIR}/modules.ppp" ppp
+	if use mppe-mppc; then
+		sed -i -e 's/ppp_mppe/ppp_mppe_mppc/' "${D}/etc/modprobe.d/ppp"
+	fi
+
+	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
+	dodoc "${FILESDIR}/README.mpls"
+
+	dosbin scripts/pon
+	dosbin scripts/poff
+	dosbin scripts/plog
+	doman scripts/pon.1
+
+	# Adding misc. specialized scripts to doc dir
+	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 get_version ; then
+		echo
+		ewarn "If the following test report contains a missing kernel configuration option that you need,"
+		ewarn "you should reconfigure and rebuild your kernel before running pppd."
+		CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
+		local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
+		local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
+		local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
+		if use activefilter ; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
+			local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
+		fi
+		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP"
+		local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
+		local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
+		if use mppe-mppc ; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_MPPE_MPPC"
+			local WARNING_PPP_MPPE_MPPC="CONFIG_PPP_MPPE_MPPC:\t missing MPPE/MPPC encryption/compression (optional, mostly used by PPTP links)"
+		else
+			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_MPPE"
+			local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
+		fi
+		CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE"
+		local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional needed by rp-pppoe plugin)"
+		if use atm ; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
+			local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
+		fi
+		check_extra_config
+	fi
+
+	if [ ! -e "${ROOT}/dev/.devfsd" ] && [ ! -e "${ROOT}/dev/.udev" ] && [ ! -e "${ROOT}/dev/ppp" ]; then
+		mknod "${ROOT}/dev/ppp" c 108 0
+	fi
+	if [ "$ROOT" = "/" ]; then
+		[ -x /sbin/update-modules ] && /sbin/update-modules || /sbin/modules-update
+	fi
+
+	# create *-secrets files if not exists
+	[ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
+		cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
+	[ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
+		cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
+
+	# lib name has changed
+	sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options"
+
+	if use radius && [[ $previous_less_than_2_4_3_r5 = 0 ]] ; then
+		echo
+		ewarn "As of ${PN}-2.4.3-r5, the RADIUS configuration files have moved from"
+		ewarn "   /etc/radiusclient to /etc/ppp/radius."
+		einfo "For your convenience, radiusclient directory was copied to the new location."
+	fi
+
+	echo
+	elog "Pon, poff and plog scripts have been supplied for experienced users."
+	elog "Users needing particular scripts (ssh,rsh,etc.) should check out the"
+	elog "/usr/share/doc/${PF}/scripts directory."
+
+	# move the old user-defined files into ip-{up,down}.d directories
+	local i
+	for i in ip-up ip-down; do
+		if [ -f "${ROOT}"/etc/ppp/${i}.local ]; then
+			mv /etc/ppp/${i}.local /etc/ppp/${i}.d/90-local.sh && \
+				einfo "/etc/ppp/${i}.local has been moved to /etc/ppp/${i}.d/90-local.sh"
+		fi
+	done
+}