lets help the user

7 files changed, 44 insertions, 28 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 947171cc63ea..3d4ac66dc5f2 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.66 2004/09/24 00:23:07 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.67 2004/09/25 07:02:56 vapier Exp $
+
+  25 Sep 2004; Mike Frysinger <vapier@gentoo.org> ppp-2.4.1-r14.ebuild,
+  ppp-2.4.2-r1.ebuild, ppp-2.4.2-r2.ebuild, ppp-2.4.2-r3.ebuild,
+  ppp-2.4.2.ebuild:
+  Do not install the pap/chap secrets files because if a user makes a binary
+  package, they could include their passwords without realizing it.
 
 *ppp-2.4.2-r3 (24 Sep 2004)
 
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index b8094e4df727..b37a9f9e6604 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 5e9506a2c88d3d67061e91ce8c0fb24b ChangeLog 11609
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 ace98f79a0a8de27f24e060ac9911eed ppp-2.4.1-r14.ebuild 4622
-MD5 ad97f35e904013462fc1cd8786b6ab84 ppp-2.4.2-r3.ebuild 4492
-MD5 4dd73d480e16526a252336fbca21d952 ChangeLog 11311
-MD5 4c1b00dc50a972cc3b309cb3ed3f861e ppp-2.4.2-r1.ebuild 4220
-MD5 9a0e85dac54424069aa89dc058e7d06d ppp-2.4.2.ebuild 3902
-MD5 5a42c26147c27627ddb5b432ecaf38fa ppp-2.4.2-r2.ebuild 4403
+MD5 00227f2226bd87def56dadb73495539e ppp-2.4.1-r14.ebuild 4676
+MD5 20502c85d128ae0dd4545dc3ae3eec6b ppp-2.4.2-r1.ebuild 4276
+MD5 210b3f9616a92005171f3f25c33c1638 ppp-2.4.2-r2.ebuild 4462
+MD5 8b7ce0b3f7d57a152ffc9b210e57fc84 ppp-2.4.2-r3.ebuild 4546
+MD5 24f264eef320520caee8597fb071405b ppp-2.4.2.ebuild 3957
 MD5 140bc2a08334d3546f43259934da603e files/chat-default 347
 MD5 1a60baf88a301c6eed8472a01b3691eb files/confd.ppp0 3312
+MD5 8d2dfaf7418945cb19864167542b14c0 files/digest-ppp-2.4.2 61
 MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r14 65
-MD5 8d2dfaf7418945cb19864167542b14c0 files/digest-ppp-2.4.2-r3 61
 MD5 8368eb79ad4618c3c6753801b5c4c689 files/gcc3.3-multiline.patch 1673
 MD5 47bae70427ec4cb3ea1cc87ae799d0e3 files/gcc33-amd64.patch 1207
 MD5 0713ffc9ae6e3ee4ef0f5c3cb752b3ea files/ip-down 285
@@ -25,31 +25,31 @@ MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607
 MD5 eb5dfeb9b6a2c8b4b2f23df4980952e0 files/ppp-2.4.1-MSCHAPv2-fix.patch 507
 MD5 f82a3ae0dba4ce6031bbf1405071e827 files/ppp-2.4.1-r10.patch 311
 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
-MD5 8d2dfaf7418945cb19864167542b14c0 files/digest-ppp-2.4.2 61
 MD5 8d2dfaf7418945cb19864167542b14c0 files/digest-ppp-2.4.2-r1 61
 MD5 8d2dfaf7418945cb19864167542b14c0 files/digest-ppp-2.4.2-r2 61
-MD5 f7a8c95af55d9cca703c15cdf9386ad4 files/2.4.2/control_c.patch 402
+MD5 8d2dfaf7418945cb19864167542b14c0 files/digest-ppp-2.4.2-r3 61
 MD5 1fd88dda7f4996799c69a9501d42cc23 files/2.4.2/README.mpls 530
 MD5 bc88eaf56862e5ebf8f45ec5ada4bb90 files/2.4.2/cflags.patch 1857
 MD5 a2eaeceee980ff6e183abfa370fc685c files/2.4.2/chat-default 353
 MD5 ef28c96687409a340c6cd66e21dc58db files/2.4.2/confd.ppp0 2786
 MD5 09fcad33830cb2af02446902cf6883c6 files/2.4.2/ip-down 801
 MD5 aade0f158628e38b74a080bd40222bc3 files/2.4.2/ip-up 1055
-MD5 8eaba18dd4e6f49c9fd2d35ab8572458 files/2.4.2/killaddr-smarter.patch.gz 2257
-MD5 b67931e2cb7c2b250e181bc5b25c4ac5 files/2.4.2/modules.ppp 304
 MD5 927fc5dafad76c9c1ee7f0259e9244b7 files/2.4.2/mpls.patch.gz 3151
+MD5 b67931e2cb7c2b250e181bc5b25c4ac5 files/2.4.2/modules.ppp 304
 MD5 c439849808581196549ef0fb2bc6e289 files/2.4.2/net.ppp0 4334
 MD5 fa2a5b8df496922fa2fb592115953b6b files/2.4.2/options-pppoe 53
 MD5 2890b47660f967a07ac5b211850e46c5 files/2.4.2/options-pptp 238
+MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/2.4.2/pppoe.html 7605
 MD5 99aa8428a441ff748dc88892a8e98266 files/2.4.2/pcap.patch 728
+MD5 8eaba18dd4e6f49c9fd2d35ab8572458 files/2.4.2/killaddr-smarter.patch.gz 2257
 MD5 971013ca1ccc5a25acffdb3ff9edff4e files/2.4.2/pppoatm.diff.gz 3567
-MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/2.4.2/pppoe.html 7605
 MD5 9d798912edc0a47727afcd7aac100957 files/2.4.2/stdopt-mppe-mppc-0.82.patch.gz 10108
 MD5 bd6bee3df13537a8550d2f39131eab0d files/2.4.2/pppoatm-2.diff.gz 3489
+MD5 f7a8c95af55d9cca703c15cdf9386ad4 files/2.4.2/control_c.patch 402
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
+Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBU2lWmdTrptrqvGERAmtNAJ4rvObC2N4ISymwrY2ScOKJ7GATMQCeOtnT
-ayYTTCNIQ2VhfOSYdYKZ7xM=
-=cslT
+iD8DBQFBVRgwHTu7gpaalycRAnO6AKDvc+8nrpSsBqD9ZXkdSjfgih+5nACfVkSE
+7wbDPp6xqHkJ0GJS7ykRWLY=
+=kUL/
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/ppp/ppp-2.4.1-r14.ebuild b/net-dialup/ppp/ppp-2.4.1-r14.ebuild
index 31b1a3c1ad8f..d87c0f976d40 100644
--- a/net-dialup/ppp/ppp-2.4.1-r14.ebuild
+++ b/net-dialup/ppp/ppp-2.4.1-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.1-r14.ebuild,v 1.21 2004/09/24 00:23:07 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.1-r14.ebuild,v 1.22 2004/09/25 07:02:56 vapier Exp $
 
 inherit eutils
 
@@ -87,6 +87,7 @@ src_compile() {
 }
 
 src_install() {
+	local y
 	for y in chat pppd pppdump pppstats
 	do
 		doman ${y}/${y}.8
@@ -97,7 +98,8 @@ src_install() {
 	dodir /etc/ppp/peers
 	insinto /etc/ppp
 	insopts -m0600
-	doins etc.ppp/pap-secrets etc.ppp/chap-secrets
+	newins etc.ppp/pap-secrets pap-secrets.example
+	newins etc.ppp/chap-secrets chap-secrets.example
 	insopts -m0644
 	doins etc.ppp/options
 	doins ${FILESDIR}/chat-default
diff --git a/net-dialup/ppp/ppp-2.4.2-r1.ebuild b/net-dialup/ppp/ppp-2.4.2-r1.ebuild
index 7de0318f956a..0825aeb20cbd 100644
--- a/net-dialup/ppp/ppp-2.4.2-r1.ebuild
+++ b/net-dialup/ppp/ppp-2.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r1.ebuild,v 1.9 2004/07/01 22:09:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r1.ebuild,v 1.10 2004/09/25 07:02:56 vapier Exp $
 
 inherit eutils
 
@@ -65,6 +65,7 @@ src_compile() {
 }
 
 src_install() {
+	local y
 	for y in chat pppd pppdump pppstats
 	do
 		doman ${y}/${y}.8
@@ -75,7 +76,8 @@ src_install() {
 	dodir /etc/ppp/peers
 	insinto /etc/ppp
 	insopts -m0600
-	doins etc.ppp/pap-secrets etc.ppp/chap-secrets
+	newins etc.ppp/pap-secrets pap-secrets.example
+	newins etc.ppp/chap-secrets chap-secrets.example
 
 	insopts -m0644
 	doins etc.ppp/options
diff --git a/net-dialup/ppp/ppp-2.4.2-r2.ebuild b/net-dialup/ppp/ppp-2.4.2-r2.ebuild
index 9d1294f1443b..0aba9c797778 100644
--- a/net-dialup/ppp/ppp-2.4.2-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r2.ebuild,v 1.12 2004/08/28 03:57:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r2.ebuild,v 1.13 2004/09/25 07:02:56 vapier Exp $
 
 inherit eutils gnuconfig
 
@@ -68,6 +68,7 @@ src_compile() {
 }
 
 src_install() {
+	local y
 	for y in chat pppd pppdump pppstats
 	do
 		doman ${y}/${y}.8
@@ -78,7 +79,8 @@ src_install() {
 	dodir /etc/ppp/peers
 	insinto /etc/ppp
 	insopts -m0600
-	doins etc.ppp/pap-secrets etc.ppp/chap-secrets
+	newins etc.ppp/pap-secrets pap-secrets.example
+	newins etc.ppp/chap-secrets chap-secrets.example
 
 	insopts -m0644
 	doins etc.ppp/options
diff --git a/net-dialup/ppp/ppp-2.4.2-r3.ebuild b/net-dialup/ppp/ppp-2.4.2-r3.ebuild
index 7e328867f79d..09acb2f8b1c8 100644
--- a/net-dialup/ppp/ppp-2.4.2-r3.ebuild
+++ b/net-dialup/ppp/ppp-2.4.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r3.ebuild,v 1.1 2004/09/24 00:23:07 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r3.ebuild,v 1.2 2004/09/25 07:02:56 vapier Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~arm ~hppa ~amd64 ~ia64"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE="ipv6 activefilter pam atm"
 
 RDEPEND="virtual/libc
@@ -70,6 +70,7 @@ src_compile() {
 }
 
 src_install() {
+	local y
 	for y in chat pppd pppdump pppstats
 	do
 		doman ${y}/${y}.8
@@ -80,7 +81,8 @@ src_install() {
 	dodir /etc/ppp/peers
 	insinto /etc/ppp
 	insopts -m0600
-	doins etc.ppp/pap-secrets etc.ppp/chap-secrets
+	newins etc.ppp/pap-secrets pap-secrets.example
+	newins etc.ppp/chap-secrets chap-secrets.example
 
 	insopts -m0644
 	doins etc.ppp/options
diff --git a/net-dialup/ppp/ppp-2.4.2.ebuild b/net-dialup/ppp/ppp-2.4.2.ebuild
index e745b37e8713..29fac3e6967c 100644
--- a/net-dialup/ppp/ppp-2.4.2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.ebuild,v 1.8 2004/07/01 22:09:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2.ebuild,v 1.9 2004/09/25 07:02:56 vapier Exp $
 
 inherit eutils
 
@@ -58,6 +58,7 @@ src_compile() {
 }
 
 src_install() {
+	local y
 	for y in chat pppd pppdump pppstats
 	do
 		doman ${y}/${y}.8
@@ -68,7 +69,8 @@ src_install() {
 	dodir /etc/ppp/peers
 	insinto /etc/ppp
 	insopts -m0600
-	doins etc.ppp/pap-secrets etc.ppp/chap-secrets
+	newins etc.ppp/pap-secrets pap-secrets.example
+	newins etc.ppp/chap-secrets chap-secrets.example
 
 	insopts -m0644
 	doins etc.ppp/options