Revision bump: add missing 'die' to sed calls. Call OpenRC scripts only when OpenRC is active init-system, wrt bug #490820. Fix issue with logwtmp not working properly

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

3 files changed, 241 insertions, 15 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 5765f4e9fe83..8371bc4f6f56 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.290 2014/02/19 09:56:32 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.291 2014/06/16 14:18:56 pinkbyte Exp $
+
+*ppp-2.4.6-r1 (16 Jun 2014)
+
+  16 Jun 2014; Sergey Popov <pinkbyte@gentoo.org> +ppp-2.4.6-r1.ebuild:
+  Revision bump: add missing 'die' to sed calls. Call OpenRC scripts only when
+  OpenRC is active init-system, wrt bug #490820. Fix issue with logwtmp not
+  working properly
 
 *ppp-2.4.6 (19 Feb 2014)
 
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 99edd4140e91..a5841e7f3a66 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -8,27 +8,23 @@ DIST ppp-2.4.4.tar.gz 688763 SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7
 DIST ppp-2.4.5-patches-3.tar.xz 37000 SHA256 9e251b0339f665054c24692396115b1f9afb7fdb8593242b1a5bc369dce642bf SHA512 e0d0d077050e97ea88d08fd15a7597393ff7842a1bf3129e2fd7eb182d4fc49a625635cf24fc1798efde2250d4c2ae013b3ae143ef245fe87f764fcf752e5c27 WHIRLPOOL 11e2d4529dd0ddfca11574bbc64459f553674b3b78f63e265dcb1247b611732ee1d6e2dc43e33d0e8371e1fcb7f9282930be1a05c147e2f141f7806dd32e4269
 DIST ppp-2.4.5.tar.gz 684342 SHA256 43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505 SHA512 3688720a0f9ee47802e72dc6aa3d47c7312c195007f37a6ceb087fdb6f1f77ad75e922a568cffed6d1a857f06d79460d6d38b56e179310e493a0380a0c5a4f6e WHIRLPOOL 210dbcfc754256e5317cffa0b6f51e7ae9e45d88815e4952e893ab85d024daef8131747624e355b97225f0b365e677fa4bd82ee2a7890810bc25c5521324b83f
 DIST ppp-2.4.6-patches-1.tar.xz 36284 SHA256 0536971bbdef0c65cde1ccad85a454bf2ad491d851c7b09d639e8fec8bf1c97d SHA512 7bc2188486749fceb9dac7c1e4dc339946ab3acc9a388ae3158f723bf3a5e61e2dcd315235e68692a0cbd3ad5b08c2d7167f179660c9491d835c3439d46f4a71 WHIRLPOOL 48f1dfe2103351bbf63982efe59cdd5b2382e359c822c92c83ad1cc467cbf2f7283ee1c2887660245bd36a0e45833dc9c737953b82b9582bb8070c97b4ded382
+DIST ppp-2.4.6-patches-2.tar.xz 36648 SHA256 8fbf2e272f45c532089918770fa532b98328b4f175bd143e5d0d7aa82b6cfc04 SHA512 2f9009f5c52483699c05e9e9665cefd4e015d4c212737f2c90e7d4b556527a781ec30d883b8a010516167d5624553b3014f12d9a9e89acb764fc1d3e21d95ae1 WHIRLPOOL 4c1a78ef34729877b13e5d0f73471fe837df08f9b6a81381edcd83326690882f897e4bd7487c7e66ff7acb644deac7e8994250b61285f497243e50e81fca999b
 DIST ppp-2.4.6.tar.gz 687744 SHA256 1b33181a03962c8a092c055fb9980e9722728a8d98a4bb7ec7acda17c1b1b49d SHA512 65d6967ba43cd8b4d3f63f52ff69f6fed964f748fc780dff982629668213c2cd1891671f6f4a0c1c22118a382e282fabdd2328e60a120d9b984d3c17f9355cc6 WHIRLPOOL 1f83ca8383486d76779c28ba0b107887584b2991c7d6fd4e86d6fecb7988e0422ec1f7e35d092f410b462a97f006cc11121c1a7cc00f7e35d856dd3861cdd828
 DIST ppp-dhcpc.tgz 33497 SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644 SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738 WHIRLPOOL 74e5e0d7f9bc52d1b9cfeff83fe74c2b38cc10c60636cd9c0f5d67d61dc7da56dbf2bcc84afa29444546792876cb36afbc853a6515ce9b3d83d6de98eacedd1e
 EBUILD ppp-2.4.4-r25.ebuild 10959 SHA256 1d06adc4cf4ac0b6d857e03186c8d3ec45e77965a8f382f295e1cfbaca245373 SHA512 884f0fef8fca451b18746ad04639788a3fb6bcae4211f36ffa695b9ce7eb9d590a7d394bc390c406f81eddbc2a8f55fdff1376ba14495ee9906e3c1f9ab2ee37 WHIRLPOOL 7f9f60e0cf5743e8d3759268253338009f3069b283eeefeca95ad50b5b11458824ae07c5afe69983bd398b157bab0dcc67fdd9c080d617dd9b8959f04cf6ea27
 EBUILD ppp-2.4.5-r3.ebuild 7045 SHA256 9680200ffc73f68571a5ee3cfa2ec0703853679f1ad0c3b16c768786880fb19e SHA512 9913d1ce1690dda37c3991cd94c50116bc8f55cbc76ed5f422d3b2aebcf9c30f55c10eb6eb909884436fefeb97926d9f6888fd978bf1e251c22b829edc6090c1 WHIRLPOOL 0beeee3601f24e914067ca80733373cc601549d05bb9fb469cc6f85420b78e0cc4c26cbe55e2c99c74beb21e88f64b5e814cbb3ed35e2fa337f7ab91c8716635
+EBUILD ppp-2.4.6-r1.ebuild 7001 SHA256 60660b6c4c59b9ac0837347ae8fbdd056c1bd4f4f098c39f62f79137d84614f5 SHA512 9bffce2286a7f2a98b9e4a550f8b28a901450461c50d697b120b7f1bc7dd972aed607d31c5b202db3b77184067b41f284d603ba9486b7d1db7697b626fb71088 WHIRLPOOL 18beb1977c162944eee21e27772f98b2f80c5b65277141724cc9ac86def879302d83a40713aa0219bbdac8d10ab121c6bab0b52788ba62e1a90f24da62d09391
 EBUILD ppp-2.4.6.ebuild 7000 SHA256 a0912678e8d331d940ed88918f60b35e9e73b0c03ba6dd23e700ed20f19fd135 SHA512 635f4ecf0193a2f3ec0d4fe5dfc73fbd8c2e96959a1594692c85264a0738e6992a8a223e4675d807c3eb181a7c624f73c592d02e4ae28b9f6058eb7c625f1881 WHIRLPOOL fbb9638e2ea7d7e20a39cd1009f0438327b627e5f300f0382f91ca800911fe3a8d7beaa6d5a3dad44202a08a3a5c6de87dd892f183bcc3e29157bb70f85dfb53
-MISC ChangeLog 46152 SHA256 ae40136544171c9a8fbeb554635046eb9e2fe89a1c746c0e3af066d7e92313c1 SHA512 a5a4bb9bcdf045f7cea76eeac721439652cf01a6370b10da0204a8bef7a628bb50c23159523051b534a2a2583b7f66d033a3a0f5563f438d2c328dbd16cab101 WHIRLPOOL 5d00a11366c124e1b17353c2443f2ac70faf4289f29fc73c32ed0c2e0739096908844b22a8e615a1d78f8d2c5737704abf062a37282e9f662026dac807ea29ff
+MISC ChangeLog 46424 SHA256 d3d1e4f7c794ca221a33e6b8433f4e7931fb2821e3d83b8aefb7ad2cbb17e3e2 SHA512 cb18178286b08338a11270268c0f7b684f50739bba7cca6f33dc6fffca25b1488196aa91da97591239fd5056f38f93c7f065a4b41de587ac16a5d7c4b8a6dc85 WHIRLPOOL fccb9fe1d8f5824610bf8d73c04a5d463e4f6a3edc77c1c8c1755e5a6ec4391593e410a5ea45873a06eb637d64f333f5219941948eefa9df7db110f56ab09373
 MISC metadata.xml 1437 SHA256 ead1d034656325de6aebce34890880e837b002baebcc9064218913b0b1796216 SHA512 1113d280079f4ba1ae4d12106ffeb6bda6c4fa72a8514df2522b7f3db556b4931f4960d4567ac093558cd266de0eb3cdfd1c955047b7ab12bd9a8b7588f2f143 WHIRLPOOL 02f4409c8e891ada907f775a6c68f65ab5a0d5eaae6bf20d4323cf592cd91cadcb5124f08c030327f77df079f9e57e5a695f59d19b8226f7453553de6db9c9fd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTBH/RAAoJEPiazRVxLXTFnqMP/21bfyC3FaE/WQd1zsIXuoVO
-dWvbzgKM0WRbcgA/mSfYdIMrrKheP7q1D2s7liIBrUd+8tTMMkqsyNcilj1nD3Y+
-x3QWIczEYrmDGVdOl1+gPi0JF9+XDxJhbkRztUcgy7K7K8ppZ3w/RQqWl5ZqH3UM
-ioEROHn//HNlGm788bfRYTo1TyspeqmvlbzU9H/qhSqwswjC6JJbNT1eRzk6YWlZ
-Gg6aSOqaP7YbNQ4D594DSVBx3higLcuaJVqpX3wJCot2yWkrH9gVJ32GIPN5IBgt
-CdKNKzjEVos4raf/TbgtA9IF5Ytnjtf+qdDJvuE5LnWpoY3KDyBCDA8CTxfjTfn0
-3OidoCggM2o42IX7sjPa1JTwM7kjc7bQafmVRKNDi4uI8ZX9N9gsmSdEZw3DDfXU
-XtMfdeUsiVuGOFM++9wTyrUJyyzAyG5JRaK3z5HezQRFxsvPZl6Zv392ORTNP3OL
-gKWTJkC1b4rBgZxQ0XAfktR9mtae+K+FdD13mG29qvGZ6OfgQXyx71FYCjMVvixg
-eWpk60Ubnd22Zx2VWxQJVFbDMxm4eaSeNON95lrHivHBa56B4vvdPwfNVxt/gZmO
-ypZ92jhrL3/yMvUEv4I3FmZ2ryyaSIJuiGnOnslqa+b0jpmQ+FbVA623iiSg203c
-Bs6Sou8nWmIpDapqJsfp
-=38Ny
+iQEcBAEBCAAGBQJTnvx8AAoJECo/aRed9267cpIH/0nlOiQVgS4GZwhhLU6f8HYq
+ZRANMicDGOpi5w+wrVmlEe58lKIxnNTAFFyJyHoeVmhyNjHyReCwmoF/GVbDt3Ll
+qHcebZ7imTMup9C8wqNmQUtzNqXOqBn5PGTJvMOfGtuxTgZdIlzlQJVJ/qpxvpmY
+1iu0Z8PIwIWpMqvOJpAsYJM2lNb52Joi8cLIX146UkEDJ0ukMNbVVN2yw5RgZkZs
+WGEEGJu02/XDbpOH0HA/WsjNurzVCp/b7cuaNBwcb9tJCGjKrYYtko3Lotem6k5a
+VUmY7M/6m3IXbWBbvnO3GUDwCh5UqsYaZ8jsyDGCh9BJ2SIxwqdWZ0ThQWn5kxU=
+=QGBN
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/ppp/ppp-2.4.6-r1.ebuild b/net-dialup/ppp/ppp-2.4.6-r1.ebuild
new file mode 100644
index 000000000000..41157a461c72
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.6-r1.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.6-r1.ebuild,v 1.1 2014/06/16 14:18:56 pinkbyte Exp $
+
+EAPI=5
+
+inherit eutils linux-info multilib pam toolchain-funcs
+
+PATCH_VER="2"
+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/~pinkbyte/distfiles/patches/${P}-patches-${PATCH_VER}.tar.xz
+	http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="activefilter atm dhcp eap-tls gtk ipv6 pam radius"
+
+DEPEND="activefilter? ( net-libs/libpcap )
+	atm? ( net-dialup/linux-atm )
+	pam? ( virtual/pam )
+	gtk? ( x11-libs/gtk+:2 )
+	eap-tls? ( net-misc/curl dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
+
+	use eap-tls || EPATCH_EXCLUDE+=" 8?_all_eaptls-*"
+	EPATCH_SUFFIX="patch" \
+	epatch "${WORKDIR}"/patch
+
+	if use atm ; then
+		einfo "Enabling PPPoATM support"
+		sed -i '/^#HAVE_LIBATM=yes/s:#::' \
+			pppd/plugins/pppoatm/Makefile.linux || die
+	fi
+
+	if ! use activefilter ; then
+		einfo "Disabling active filter"
+		sed -i '/^FILTER=y/s:^:#:' pppd/Makefile.linux || die
+	fi
+
+	if use pam ; then
+		einfo "Enabling PAM"
+		sed -i '/^#USE_PAM=y/s:^#::' pppd/Makefile.linux || die
+	fi
+
+	if use ipv6 ; then
+		einfo "Enabling IPv6"
+		sed -i '/#HAVE_INET6/s:#::' pppd/Makefile.linux || die
+	fi
+
+	einfo "Enabling CBCP"
+	sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die
+
+	if use dhcp ; then
+		einfo "Adding ppp-dhcp plugin files"
+		sed -i \
+			-e '/^SUBDIRS :=/s:$: dhcp:' \
+				pppd/plugins/Makefile.linux || die
+	fi
+
+	# Set correct libdir
+	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
+		pppd/{pathnames.h,pppd.8} || die
+
+	if use radius ; then
+		#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 || die
+		#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/* || die
+	else
+		einfo "Disabling radius"
+		sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die
+	fi
+}
+
+src_compile() {
+	tc-export AR CC
+	emake COPTS="${CFLAGS} -D_GNU_SOURCE"
+
+	# build pppgetpass
+	cd contrib/pppgetpass || die
+	if use gtk ; then
+		emake -f Makefile.linux
+	else
+		emake pppgetpass.vt
+	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
+	emake -C pppd INSTROOT="${D}" install-devel
+
+	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/${PV}"
+	# closing " for syntax coloring
+	insinto "${PLUGINS_DIR}"
+	insopts -m0755
+	doins pppd/plugins/minconn.so
+	doins pppd/plugins/passprompt.so
+	doins pppd/plugins/passwordfd.so
+	doins pppd/plugins/winbind.so
+	doins pppd/plugins/rp-pppoe/rp-pppoe.so
+	doins pppd/plugins/pppol2tp/openl2tp.so
+	doins pppd/plugins/pppol2tp/pppol2tp.so
+	if use atm ; then
+		doins pppd/plugins/pppoatm/pppoatm.so
+	fi
+	if use dhcp ; then
+		doins pppd/plugins/dhcp/dhcpc.so
+	fi
+	if use radius ; then
+		doins pppd/plugins/radius/rad{ius,attr,realms}.so
+
+		#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-rad{ius,attr}.8
+	fi
+
+	insinto /etc/modprobe.d
+	insopts -m0644
+	newins "${FILESDIR}/modules.ppp" ppp.conf
+
+	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
+	dodoc "${FILESDIR}/README.mpls"
+
+	dosbin scripts/p{on,off,log}
+	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 linux-info_get_any_version && linux_config_src_exists ; 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 ~PPP_MPPE"
+		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)"
+		local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
+		CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
+		local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by rp-pppoe plugin)"
+		local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-pppoe and dhcpc plugins)"
+		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
+
+	# 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" || die
+
+	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."
+}