lots of bugfixes, see #10444 for details

3 files changed, 58 insertions, 42 deletions

diff --git a/net-dialup/kpnadsl4linux/ChangeLog b/net-dialup/kpnadsl4linux/ChangeLog
index 0a17b2aa6f8f..e0b7a9261209 100644
--- a/net-dialup/kpnadsl4linux/ChangeLog
+++ b/net-dialup/kpnadsl4linux/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for net-dialup/kpnadsl4linux
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/kpnadsl4linux/ChangeLog,v 1.1 2002/11/24 22:00:32 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/kpnadsl4linux/ChangeLog,v 1.2 2002/12/03 00:02:31 hannes Exp $
 
+*kpnadsl4linux-1.10-r1 (02 Dec 2002)
+
+  02 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kpnadsl4linux-1.10-r1.ebuild,
+  ChangeLog: Thanks to sambesselink@planet.nl (sam) for submission (10444#).
+  
 *kpnadsl4linux-1.10 (24 Nov 2002)
 
   24 Nov 2002; Hannes Mehnert <hannes@gentoo.org> kpnadsl4linux-1.10.ebuild,
diff --git a/net-dialup/kpnadsl4linux/files/digest-kpnadsl4linux-1.10 b/net-dialup/kpnadsl4linux/files/digest-kpnadsl4linux-1.10-r1
index 841486213b15..841486213b15 100644
--- a/net-dialup/kpnadsl4linux/files/digest-kpnadsl4linux-1.10
+++ b/net-dialup/kpnadsl4linux/files/digest-kpnadsl4linux-1.10-r1
diff --git a/net-dialup/kpnadsl4linux/kpnadsl4linux-1.10.ebuild b/net-dialup/kpnadsl4linux/kpnadsl4linux-1.10-r1.ebuild
index 51c1b4026f00..cfb8d4e7b28b 100644
--- a/net-dialup/kpnadsl4linux/kpnadsl4linux-1.10.ebuild
+++ b/net-dialup/kpnadsl4linux/kpnadsl4linux-1.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/kpnadsl4linux/kpnadsl4linux-1.10.ebuild,v 1.1 2002/11/24 22:00:40 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/kpnadsl4linux/kpnadsl4linux-1.10-r1.ebuild,v 1.1 2002/12/03 00:02:31 hannes Exp $
 
 IUSE=""
 DESCRIPTION="ADSL4Linux, a PPTP start/stop/etc. program especially for Dutch users, for gentoo."
@@ -27,13 +27,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "\e[32;01m * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\033[0m"
-	einfo "\e[31;31;01m Please do _NOT_ forget to run the following: \e[32;01m				        *\033[0m"
-	einfo "\e[33;01m 'ebuild /var/db/pkg/${CATEGORY}/${P}/${P}.ebuild config' \e[32;01m* \033[0m"
-	einfo "											\e[32;01m*\033[0m"
-	einfo "\e[31;31;01m To start ${P} at boot type: 					        \e[32;01m*\033[0m"
-	einfo "\e[33;01m 'rc-update add adsl default'							\e[32;01m*\033[0m"
-	einfo "\e[32;01m * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\033[0m"
+	einfo "Do _NOT_ forget to run the following if this is your _FIRST_ install:"
+	einfo "ebuild /var/db/pkg/${CATEGORY}/${P}-${PR}/${P}-${PR}.ebuild config"
+	einfo "To start ${P} at boot type:"
+	einfo "rc-update add adsl default"
 }
 
 pkg_config() {
@@ -44,7 +41,8 @@ a4lvarconfig() {
 	echo ""
 	echo "What's your password?"; read PAWD;
 	echo ""
-	echo "If you have a subscription with multiple ip addresses, please specify your 'pc-number'? (ie. pc3) Press ENTER if you have no idea what I'm talking about."; read PCNUMBER;
+	echo "If you have a subscription with multiple ip addresses, please specify your 'pc-number'? (ie. pc3) Press"\
+	"ENTER if you have no idea what I'm talking about."; read PCNUMBER;
 	echo ""
 	if [ -z ${PCNUMBER} ]; then PCNUMBER=pc1; else :; fi;
 	echo "Are these, in order, your username, password and pc-number?";
@@ -64,47 +62,47 @@ a4lvarconfig() {
 }
 
 adslconfigins() {
-	# We want all users to be able to start the adsl connection.
-	insopts 655
-	insinto /etc/ppp/peers
-	# Save your settings in a file that can be called to start the connection in the future.
-	echo "idle 0" >> options.adsl
-	echo "noauth" >> options.adsl
-	echo "user ${USERNAME}" >> options.adsl
-	echo "usepeerdns" >> options.adsl
-	echo "defaultroute" >> options.adsl
-	echo "linkname mxstream" >> options.adsl
-	echo pty "/usr/sbin/pptp 10.0.0.138 --nolaunchpppd --phone" "${PCNUMBER}" >> options.adsl
-	newins options.adsl adsl
+	if [ -d /etc/ppp/peers ]; then :; else mkdir /etc/ppp/peers; fi
+	cd /etc/ppp/peers
+
+	# Save your settings to a file.
+	echo "idle 0" > .adsl
+	echo "noauth" >> .adsl
+	echo "user ${USERNAME}" >> .adsl
+	echo "usepeerdns" >> .adsl
+	echo "defaultroute" >> .adsl
+	echo "linkname mxstream" >> .adsl
+	echo 'pty "/usr/sbin/pptp 10.0.0.138 --nolaunchpppd --phone '"${PCNUMBER}"'"' >> .adsl
+	if [ -e adsl ]; then mv .adsl ._cfg0000_adsl; else mv .adsl adsl; fi
+	chmod 644 adsl
 	pap-secretsins;
 }
 
 pap-secretsins() {
-	insinto /etc/ppp
+	if [ -d /etc/ppp/peers ]; then :; else mkdir /etc/ppp/peers; fi
+	cd /etc/ppp
 	# Save the 'secret' (password) in the secrets file.
-	echo "# Secrets for authentication using PAP" >> pap-secrets
-	echo "# client        server        secret        ip-addresses" >> pap-secrets
-	echo "${USERNAME}      *     "'"'"${PAWD}"'"'"      *" >> pap-secrets
-	doins pap-secrets
-	einfo "Configuration is done!"
-	einfo "If you want you can check/tweak your settings by editting /etc/ppp/pap-secrets"
-	einfo "and /etc/ppp/peers/adsl. Enjoy!"
-	exit;
+	echo "# Secrets for authentication using PAP" > .pap-secrets
+	echo "# client        server        secret        ip-addresses" >> .pap-secrets
+	echo "${USERNAME}      *     "'"'"${PAWD}"'"'"      *" >> .pap-secrets
+	if [ -e pap-secrets ]; then mv .pap-secrets ._cfg0000_pap-secrets; else mv .pap-secrets pap-secrets; fi
+	loggingadsl;
 }
 
-# Start the configuring
-a4lvarconfig;
-
+loggingadsl() {
 	# Crontab Logging
-	einfo "Trying to install logging..."
+	echo "Trying to install logging..."
 	local TESTER="root test -x /usr/sbin/adsl && /usr/sbin/adsl update"
-	local TEST1="^/5 \* \* \* \* ${TESTER}"
-	local STRING1="^/5 * * * * ${TESTER}"
+	local STRING1="/5 * * * * ${TESTER}"
+	# Check if /etc/crontab exists
+	if [ -e /etc/crontab ]; then \
 	# If cron works install, else don't.
-	if [ "grep -c ${TEST1} /etc/crontab" != "0" ]; then einfo "Not adding string for crontab";
+	if [ `grep -c "/5 \* \* \* \* ${TESTER}" /etc/crontab` != "0" ]; then echo "Not adding string for crontab";
 	else echo -e '\n# 5-minute ADSL log update' >> /etc/crontab;
 	echo -e "${STRING1}" >> /etc/crontab;
-	einfo "Added to crontab: a 5 minute log update";
+	echo "Added to crontab: a 5 minute log update";
+	fi;
+	else echo "/etc/crontab doesn't exist!"
 	fi;
 
 	# ip-down.local logging
@@ -112,11 +110,24 @@ a4lvarconfig;
 	local TEST2="^/usr/sbin/adsl stoplog$"
 	local STRING2="/usr/sbin/adsl stoplog"
 	if [ -e /etc/ppp/ip-down.local ]; then :; else touch /etc/ppp/ip-down.local; fi
-	local test=`grep -c ${TEST2} /etc/ppp/ip-down.local`
+	local test=`grep -c "${TEST2}" /etc/ppp/ip-down.local`
 	# If there already is such a string, don't do anything, else add it.
-	if [ ${TEST} != "0" ]; then einfo "Not adding string for log in /etc/ppp/ip-down.local";
+	if [ "${TEST}" != "0" ]; then echo "Not adding string for log in /etc/ppp/ip-down.local";
 	else echo -e '\n# ADSL log save' >> /etc/ppp/ip-down.local;
 	echo -e "${STRING2}" >> /etc/ppp/ip-down.local;
-	einfo "Added to ip-down.local: log save";
+	echo "Added to ip-down.local: log save";
 	fi;
+
+	echo "Configuration is done!"
+	echo "If you want you can check/tweak your settings by editting /etc/ppp/pap-secrets"
+	echo "and /etc/ppp/peers/adsl. Enjoy!"
+	echo -e "\e[33;01m* IMPORTANT:\e[00;00m files in /etc _MAY_ need updating.";
+	echo -e "\e[33;01m*\e[00;00m Type \e[32;01memerge --help config \e[00;00mto learn how to update config files.";
+
+	exit;
+}
+
+# Start the configuring
+a4lvarconfig;
+
 }