Fix bug #80298, see changelog for more information

Package-Manager: portage-2.0.51-r15

3 files changed, 20 insertions, 15 deletions

diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index 0b527a49ec3c..b4ee40b4569b 100644
--- a/net-misc/zaptel/ChangeLog
+++ b/net-misc/zaptel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/zaptel
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.28 2005/02/02 16:26:00 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.29 2005/02/03 22:40:04 stkn Exp $
+
+  03 Feb 2005; Stefan Knoblich <stkn@gentoo.org> files/zaptel.rc6:
+  Fixed zaptel init script (checkconfig returned wrong values, bug #80298),
+  changed config  error messages to use eerror. Using return instead of exit
+  if there's no config file, service won't be in state "started" this way.
 
   02 Feb 2005; Chris Bainbridge <chrb@gentoo.org> zaptel-1.0.4.ebuild:
   Removed failure when PPP isn't found. The ebuild now gives a warning but
diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
index fb1e36810651..72b29c374878 100644
--- a/net-misc/zaptel/Manifest
+++ b/net-misc/zaptel/Manifest
@@ -1,27 +1,27 @@
-MD5 b74d2faa3ce150ec55da11d92a104fa4 ChangeLog 4643
+MD5 962242bf3dd3c9c42f478879757255a7 ChangeLog 4939
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 7245a92de844119cd4351807007616f0 zaptel-1.0.3.ebuild 3532
 MD5 8d66c378ea6b3b3f7bb2ee1fd2b6e51c zaptel-0.9.1.ebuild 3526
 MD5 57a33550baf4bda34695fa3cb84a8012 zaptel-1.0.0.ebuild 3059
 MD5 cfce09091affa8e8668e7a22801ac097 zaptel-1.0.1.ebuild 3186
 MD5 eaa764a27a800be752aba85a7df8d342 zaptel-1.0.2.ebuild 3127
+MD5 7245a92de844119cd4351807007616f0 zaptel-1.0.3.ebuild 3532
 MD5 aa67c0b3012e9213bd43c48c2f919f46 zaptel-1.0.4.ebuild 4124
-MD5 66c86744220e6716f15393caf0ee408d files/digest-zaptel-1.0.3 64
-MD5 051e2ff3f1222e2b551a70e9cd1b31f0 files/digest-zaptel-1.0.4 64
 MD5 3921a7fd4a60c8785d510e857ff2eabe files/digest-zaptel-0.9.1 64
 MD5 9cf4f1d646d216441b7f4508ac7c0e8b files/digest-zaptel-1.0.0 64
 MD5 dbd81e086a8331bea5752bf92e288f43 files/digest-zaptel-1.0.1 64
+MD5 c05b7e3e46911ab74b865d91e7b85d42 files/digest-zaptel-1.0.2 64
+MD5 66c86744220e6716f15393caf0ee408d files/digest-zaptel-1.0.3 64
+MD5 051e2ff3f1222e2b551a70e9cd1b31f0 files/digest-zaptel-1.0.4 64
 MD5 1dcd4bcf154cf1140d716eeeb8892ef3 files/zaptel-0.9.1-experimental-devfs26.diff 6432
 MD5 c80f1e0e4038771d3e3bc08284ecf917 files/zaptel-0.9.1-modulesd.diff 1941
 MD5 60910db3ceada75031a91d419832871d files/zaptel-1.0.0-experimental-devfs26.diff 5474
 MD5 c80f1e0e4038771d3e3bc08284ecf917 files/zaptel-1.0.0-modulesd.diff 1941
 MD5 648b9f0335741cf4aea7542ffe4705c6 files/zaptel-1.0.1-modulesd.diff 1837
 MD5 0edad95ac20c6e43ea6ee933e25ac23a files/zaptel-1.0.1-skbuff.diff 564
+MD5 9abebf47ce7e7122a184a62e5baed146 files/zaptel-1.0.3-gcc34.patch 1540
+MD5 e5a799243335f31a494bb4f90edbb9e4 files/zaptel-1.0.3-gentoo.diff 3456
 MD5 fea918445512e51f2019ff20d78a7926 files/zaptel-install_prefix-typo.patch 486
 MD5 e6a38926132312059bd3a8a712d8d88e files/zaptel-mkdir-usrincludelinux.patch 469
-MD5 090668aabb8e77cfd0d83835f52bd105 files/zaptel-1.0.4-gcc34.patch 821
 MD5 fae1145da422b8838c2a6ac3405dc4c4 files/zaptel.confd 371
-MD5 b72142a9b09e32506b88b96706abaeb4 files/zaptel.rc6 903
-MD5 c05b7e3e46911ab74b865d91e7b85d42 files/digest-zaptel-1.0.2 64
-MD5 9abebf47ce7e7122a184a62e5baed146 files/zaptel-1.0.3-gcc34.patch 1540
-MD5 e5a799243335f31a494bb4f90edbb9e4 files/zaptel-1.0.3-gentoo.diff 3456
+MD5 f8cae0c00456dbf7b7ece1959dbbd779 files/zaptel.rc6 903
+MD5 090668aabb8e77cfd0d83835f52bd105 files/zaptel-1.0.4-gcc34.patch 821
diff --git a/net-misc/zaptel/files/zaptel.rc6 b/net-misc/zaptel/files/zaptel.rc6
index f7e91e11222a..6c5b4f48e547 100644
--- a/net-misc/zaptel/files/zaptel.rc6
+++ b/net-misc/zaptel/files/zaptel.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/files/zaptel.rc6,v 1.2 2004/07/15 00:16:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/files/zaptel.rc6,v 1.3 2005/02/03 22:40:04 stkn Exp $
 
 depend() {
 	need net
@@ -9,11 +9,11 @@ depend() {
 
 checkconfig() {
 	if [ ! -f /etc/zaptel.conf ]; then
-		echo "Please create /etc/zaptel.conf!"
-		return 0
+		eerror "Please create /etc/zaptel.conf!"
+		return 1
 	fi
 
-	return 1
+	return 0
 }
 
 create_devices() {
@@ -29,7 +29,7 @@ create_devices() {
 
 
 start() {
-	checkconfig || exit 1
+	checkconfig || return 1
 
 	if [ ! -d /dev/zap ] && [ "$ZAP_FORCE_CREATE" != "no" ]; then
 		einfo "Creating zaptel device nodes"