Fix QA issues in pppdump.c.

Update EAP-TLS patch.
Remove reference to undefined symbol in passwordfd plugin (#389565).

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 22 insertions, 15 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 17977bc87373..1986756f5fb5 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.273 2011/07/17 11:54:21 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.274 2011/11/11 01:02:03 mrness Exp $
+
+*ppp-2.4.5-r2 (11 Nov 2011)
+
+  11 Nov 2011; Alin Năstac <mrness@gentoo.org> -ppp-2.4.5.ebuild,
+  +ppp-2.4.5-r2.ebuild, metadata.xml:
+  Fix QA issues in pppdump.c. Update EAP-TLS patch. Remove reference to
+  undefined symbol in passwordfd plugin (#389565).
 
   17 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> ppp-2.4.5-r1.ebuild:
   ppc/ppc64 stable wrt #366719
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index b6a69e13e5e9..b8425b3607a0 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -5,21 +5,19 @@ AUX README.mpls 530 RMD160 4814f25fa3d788311f37045188cf285fb588da67 SHA1 fdf4abf
 AUX modules.ppp 299 RMD160 ef5ee6fcf66dce67e5bd25220699c3df3ae6ee28 SHA1 d5d8646685dd7d4c0811812e2cb85fee71806d2b SHA256 8947dd48d3d0c128166edc9bb0917b9af88502296fad791d6d90bf165ca50db3
 DIST ppp-2.4.4-gentoo-20091116.tar.gz 54932 RMD160 5f37dbae97a4e55ae25ed54d8ae521cb51064c50 SHA1 b35cbec42b3a0794281921e7879eab322f27da70 SHA256 52f174b3df36110d14c522869c507f64aef4d2d01db2dec2936cc9917c9fa716
 DIST ppp-2.4.4.tar.gz 688763 RMD160 ed289a4506c3af41a72f88103d5e0be44dec3da7 SHA1 9b91b0117e0a8bfaf8c4e894af79e0960dd36259 SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea
-DIST ppp-2.4.5-gentoo-20100903.tar.gz 38811 RMD160 5e64ea4ddd5f7823376709f6076f117acbdd6c17 SHA1 da55d88d3ea5557f3f92b949a6827a4701b32c91 SHA256 fab65eaae9116af6debee4fa35c412b8221e91e5cbc81115448fb4f81a27bf0f
 DIST ppp-2.4.5-gentoo-20101127.tar.gz 41562 RMD160 b9aa87b7f185eda2d022580ccbb9b23d2c2a4f42 SHA1 b63aa5c0c91458fe82a2be2cca2fbe264db2b301 SHA256 d49f51dd10dfc97f25bb5dbc4acc61c708d890da231295467ac3710751d2bcdd
+DIST ppp-2.4.5-gentoo-20111111.tar.gz 41883 RMD160 e94c89a8404182ae0b2b9757c23ae69db012918d SHA1 98748395fbbd85509ba0059745ae708e57cc9f91 SHA256 950e06cb9e9c844e88cb99c3fc1dbb7515814d75f7f6e87a81fbb245e48ba4ed
 DIST ppp-2.4.5.tar.gz 684342 RMD160 231682ab2314d182c893c64523fd89f571a258de SHA1 cb977b31584e3488e08a643aaa672fdb229d2e78 SHA256 43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505
 DIST ppp-dhcpc.tgz 33497 RMD160 63bf0d1cc52e91ea536fc593fb7a40502baecd90 SHA1 1a0b02788d522f2137d0b66c749ffe6c96cceb94 SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644
 EBUILD ppp-2.4.4-r25.ebuild 10952 RMD160 09a97986d11ee1bb784c3ee27c14343c5deef78c SHA1 0f5caa620cd4704dae6a07e924080683f918480b SHA256 613cb846cd9b5cb6c6502ca581b41c11765408d7d84a36d56d624cf21a99c7a7
 EBUILD ppp-2.4.5-r1.ebuild 10041 RMD160 dc591f665976abf12100d13eb51567357cd3cce0 SHA1 7a7018740da1f1476fe01bade05fe4356344e020 SHA256 9b268da18d0d4f548484f628cda9d797c5a0d23c736f2ae9ccc5067a21a53145
-EBUILD ppp-2.4.5.ebuild 9951 RMD160 8beebdd67f608701b55cf5884095544c57276607 SHA1 a22598f748b4d05a7723a43b6407fda72cd9e72e SHA256 3f0dd583ae32c5ea4bf1fdee8a642f624c1d772bfa21729fdbb62a0cf6076f67
-MISC ChangeLog 43692 RMD160 b410415081cd0b0f43e0fd94c97e6871eb7c7d79 SHA1 142fa6a04640907c5f8bbf76f6071a9c88f45dfd SHA256 03e81d1537df298222e5b3ea6dd2092f574d64ca36cd6e46b88e18bd08f1bb49
-MISC metadata.xml 1440 RMD160 4ef716500746f41ceb71abbbd68f0411bc24697b SHA1 065c4a01606a00985340f038ed22b8229d37774f SHA256 111e9045c4c9533769cb65da6a2fc657b60ecd81ddfc0d68655872401e4653d5
+EBUILD ppp-2.4.5-r2.ebuild 10049 RMD160 4fbdccf9883c112441955c4a58f957ddd18d5d69 SHA1 29affaf967fb3cb9c581421874fc8bfbe3da2691 SHA256 21cd1d1dda18bf67cb568f516e8253a8f7e6e66bfe91d5e36663acc4a0ca0c23
+MISC ChangeLog 43946 RMD160 92396f464d9bf3b24f32a998bd6ca2e33a252163 SHA1 a6a390965b7cbaf97158f6d8cfc2f8f479ab3cc4 SHA256 5bf9c2d113b73a86f9fdcd791ce7a66b4af0c8756dee2422c99fe65fe3428958
+MISC metadata.xml 1452 RMD160 c85c2e81ed96511774b8b38ee2d2e42d3e2a2032 SHA1 8e1a0709f8a9ea2d1a556e695adbed96a5dd6a4e SHA256 7317c0ea4820544191e05c356e6594465869ff8093c78092b4fcfefac9a085dc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk4izXMACgkQIiMqcbOVdxTKQQP/dJ/7xMUUfe+walofhgJoAhQv
-UKo1UAtY8lK2iEv67LcNXLCAikqPfyjg6DYX1a81+1mSY4SMGfDOxozildAu3kaw
-dA2RNpXKRFLj0kAff6nVCAZVXVjmXNjPLhWTQPVlq1Cl37KBEOMfkHFVU3QBtZng
-Y+Yc0+o2vmJOR7bG93o=
-=JUqe
+iEYEARECAAYFAk68dBkACgkQ1564UogppBKgXQCg0FJbl6XJnYMcJNc3ZXN5DDSq
+6YwAni6COPt9nfSjwiH0bo9xXm08F9wG
+=fdnN
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/ppp/metadata.xml b/net-dialup/ppp/metadata.xml
index 714b92a83d32..748645b1596d 100644
--- a/net-dialup/ppp/metadata.xml
+++ b/net-dialup/ppp/metadata.xml
@@ -16,7 +16,7 @@
     by a DHCP server (see http://www.netservers.co.uk/gpl/)</flag>
     <flag name="eap-tls">Enables support for Extensible Authentication
     Protocol and Transport Level Security (see
-    http://eaptls.spe.net/index.html)</flag>
+    http://www.nikhef.nl/~janjust/ppp/index.html)</flag>
     <flag name="gtk">Installs GTK+ password prompting program that can be used
     by passprompt.so PPP plugin for reading the password from a X11 input
     terminal</flag>
diff --git a/net-dialup/ppp/ppp-2.4.5.ebuild b/net-dialup/ppp/ppp-2.4.5-r2.ebuild
index 6871adb4a1d8..62932b852172 100644
--- a/net-dialup/ppp/ppp-2.4.5.ebuild
+++ b/net-dialup/ppp/ppp-2.4.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.5.ebuild,v 1.3 2011/04/02 12:51:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.5-r2.ebuild,v 1.1 2011/11/11 01:02:03 mrness Exp $
 
 EAPI="2"
 
@@ -9,7 +9,7 @@ inherit eutils 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
-	mirror://gentoo/${P}-gentoo-20100903.tar.gz
+	mirror://gentoo/${P}-gentoo-20111111.tar.gz
 	dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )"
 
 LICENSE="BSD GPL-2"
@@ -41,11 +41,13 @@ src_prepare() {
 	epatch "${WORKDIR}/patch/connect-errors.patch"
 	epatch "${WORKDIR}/patch/Makefile.patch"
 	epatch "${WORKDIR}/patch/pppol2tpv3-2.6.35.patch"
+	epatch "${WORKDIR}/patch/pado-timeout.patch"
+	epatch "${WORKDIR}/patch/lcp-echo-adaptive.patch"
 
 	use eap-tls && {
 		# see http://www.nikhef.nl/~janjust/ppp for more info
 		einfo "Enabling EAP-TLS support"
-		epatch "${WORKDIR}/patch/eaptls-mppe-0.98-gentoo.patch"
+		epatch "${WORKDIR}/patch/eaptls-mppe-0.991-gentoo.patch"
 	}
 
 	use atm && {