changed port 6017 to 29617 in the xmailwizard

4 files changed, 13 insertions, 10 deletions

diff --git a/net-mail/xmail/ChangeLog b/net-mail/xmail/ChangeLog
index fd6d8a1a8549..655834defcc4 100644
--- a/net-mail/xmail/ChangeLog
+++ b/net-mail/xmail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-mail/xmail
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/xmail/ChangeLog,v 1.6 2003/07/24 03:06:51 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/xmail/ChangeLog,v 1.7 2003/07/25 21:15:43 raker Exp $
+
+  25 Jul 2003; Nick Hadaway <raker@gentoo.org> files/xmailwizard:
+  Changed port 6017 to 29617 in the wizard to match the confd defaults.
 
   23 Jul 2003; Nick Hadaway <raker@gentoo.org> files/xmail.initd,
   files/xmail.confd:
diff --git a/net-mail/xmail/Manifest b/net-mail/xmail/Manifest
index 9bdfac606ad3..dbfcc0fd565c 100644
--- a/net-mail/xmail/Manifest
+++ b/net-mail/xmail/Manifest
@@ -1,10 +1,10 @@
 MD5 21fd83c1770526f32ebbfe2bdb091eb3 xmail-1.16.ebuild 3416
-MD5 c35ab48eed7201b5a455e032e4a0c268 ChangeLog 2632
+MD5 2554d42a19288a58c9ef139e0500a800 ChangeLog 2771
 MD5 0d2327aa59ca7ab57a3a3671ea7b6d18 xmail-1.15.ebuild 3329
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 e00a488aecb141a34c5ec43eac58b9a9 files/15xmail 24
 MD5 4618d48569507ce58990ba97fee24692 files/digest-xmail-1.15 62
 MD5 5bbd572781bd63319f432d3a74a399cf files/digest-xmail-1.16 62
-MD5 e94dcf5bdc4a53c922066e0b2351fed8 files/xmailwizard 2301
-MD5 8f93bde743cf3f7a77f27bcf602aa4dc files/xmail.confd 409
+MD5 7b836bc7c37b3251bb6342bdb59b66f0 files/xmailwizard 2305
+MD5 f172466d6833f8498183e78651e7fb8a files/xmail.confd 408
 MD5 27bcf21eb75c2b1007a4c88bc6f44a6b files/xmail.initd 2812
diff --git a/net-mail/xmail/files/xmail.confd b/net-mail/xmail/files/xmail.confd
index 8092feee3caa..e68a42964079 100644
--- a/net-mail/xmail/files/xmail.confd
+++ b/net-mail/xmail/files/xmail.confd
@@ -14,6 +14,6 @@ MAIL_PID=/var/run/$MAIL_NAME.pid
 MY_SMTP=29025
 MY_POP3=29110
 MY_FING=29079
-MY_CTRL=29617
+MY_CTRL=6017
 
 MAIL_CMD_LINE=" -Pl -Pp $MY_POP3 -Sl -Sp $MY_SMTP -Ql -Fl -Fp $MY_FING -Cl -Cp $MY_CTRL -Ll"
diff --git a/net-mail/xmail/files/xmailwizard b/net-mail/xmail/files/xmailwizard
index 8313242bee23..61fe4f947e58 100644
--- a/net-mail/xmail/files/xmailwizard
+++ b/net-mail/xmail/files/xmailwizard
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/xmail/files/xmailwizard,v 1.2 2003/07/21 07:17:04 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/xmail/files/xmailwizard,v 1.3 2003/07/25 21:15:43 raker Exp $
 
 MAIL_ROOT=/chroot/xmail/var/MailRoot
 MAIL_CONF=/etc/xmail
@@ -28,11 +28,11 @@ sed -e "s:xmailserver.test:$MYDN:" <$MAIL_CONF/server.tab.orig >$MAIL_CONF/serve
 cp /etc/mail/aliases $MAIL_CONF/aliases.tab
 perl -n -i'.orig' -e "if (!/^\$/ and ! /^#/) {s/: */\t/;s/^/${MYDN}\t/;print}" $MAIL_CONF/aliases.tab
 /etc/init.d/xmail start
-NETSTAT=`netstat -an | grep -c ":6017"`
+NETSTAT=`netstat -an | grep -c ":29617"`
 while [ $NETSTAT -eq 0 ]; do 
 	echo "XMail Ctrl server not yet running ... sleeping 10 seconds."
 	sleep 10
-	NETSTAT=`netstat -an | grep -c ":6017"` 
+	NETSTAT=`netstat -an | grep -c ":29617"` 
 done
 $MAIL_ROOT/bin/CtrlClnt -n 29617 -s localhost -u $LOGIN -p $PASSWD domainadd $MYDN
 read -n 1 -p "Do you want to add mailusers to $MYDN domain? (y/n): " YESNO
@@ -56,10 +56,10 @@ do
 	echo ""
 done
 /etc/init.d/xmail stop
-NETSTAT=`netstat -an | grep -c ":6017"`
+NETSTAT=`netstat -an | grep -c ":29617"`
 while [ $NETSTAT -ne 0 ]; do 
 	echo "There is(are) still $NETSTAT open connection(s) ... sleeping 10 seconds."
 	sleep 10
-	NETSTAT=`netstat -an | grep -c ":6017"` 
+	NETSTAT=`netstat -an | grep -c ":29617"` 
 done
 echo "Edit the MAIL_CMD_LINE property in /etc/conf.d/xmail to configure logging, TCP/IP bindings, threads, etc."