updated the init.d file and added a warning to postinst to enable iptables in your kernel

4 files changed, 23 insertions, 16 deletions

diff --git a/net-mail/xmail/ChangeLog b/net-mail/xmail/ChangeLog
index 42560f362e79..fd6d8a1a8549 100644
--- a/net-mail/xmail/ChangeLog
+++ b/net-mail/xmail/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2003/07/21 07:17:04 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/xmail/ChangeLog,v 1.6 2003/07/24 03:06:51 raker Exp $
+
+  23 Jul 2003; Nick Hadaway <raker@gentoo.org> files/xmail.initd,
+  files/xmail.confd:
+  Made changes to the initd file as suggested on bug #24923.
+  Thanks to Sergey Ivanov for working out the quirks with this build.
+  Added a warn to postinst about needing iptables enabled in the kernel.
 
 *xmail-1.16 (21 Jul 2003)
 
diff --git a/net-mail/xmail/Manifest b/net-mail/xmail/Manifest
index 5f017c5a32db..9bdfac606ad3 100644
--- a/net-mail/xmail/Manifest
+++ b/net-mail/xmail/Manifest
@@ -1,5 +1,5 @@
-MD5 127f6a222f130a877cc9601c8345e3bb xmail-1.16.ebuild 3334
-MD5 d11af408ec9f1ed491224069b4e77189 ChangeLog 2559
+MD5 21fd83c1770526f32ebbfe2bdb091eb3 xmail-1.16.ebuild 3416
+MD5 c35ab48eed7201b5a455e032e4a0c268 ChangeLog 2632
 MD5 0d2327aa59ca7ab57a3a3671ea7b6d18 xmail-1.15.ebuild 3329
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 e00a488aecb141a34c5ec43eac58b9a9 files/15xmail 24
@@ -7,5 +7,4 @@ 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 0473a1b0b9d707408a38b718c891d947 files/xmail.initd 2812
-MD5 ed94a4f38aa89e7592e4742cf231815f files/initd.patch 886
+MD5 27bcf21eb75c2b1007a4c88bc6f44a6b files/xmail.initd 2812
diff --git a/net-mail/xmail/files/xmail.initd b/net-mail/xmail/files/xmail.initd
index 5e9f4becaa47..3aa87b299e3a 100644
--- a/net-mail/xmail/files/xmail.initd
+++ b/net-mail/xmail/files/xmail.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/xmail/files/xmail.initd,v 1.2 2003/07/21 07:17:04 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/xmail/files/xmail.initd,v 1.3 2003/07/24 03:06:52 raker Exp $
 
 depend() {
 	need net logger
@@ -50,7 +50,7 @@ start() {
 		mkdir -m 700 -p ${CHROOT}
 	fi
 
-	for subdir in dev lib var/run var/MailRoot
+	for subdir in dev lib var/run var/MailRoot tmp
 	do
 		if [ ! -d ${CHROOT}${subdir} ]
 		then
@@ -60,19 +60,17 @@ start() {
 	
 	if [ ! -c ${CHROOT}/dev/null ]
 	then
+		mknod ${CHROOT}/dev/null c `\
 		ls -Ll /dev/null |\
-		awk '{print sub(",","",$5) " " $6}' |\
-		xargs mknod ${CHROOT}/dev/null c
+		awk '{print sub(",","",$5) " " $6}'`
 	fi
 		
-	chown -R xmail.xmail ${CHROOT}
-
 	cp -R -u /etc/xmail/* ${CHROOT}${MAIL_ROOT}
 
-	cd ${CHROOT}
-	ldd var/MailRoot/bin/XMail |\
-		sed -n 's/[[:blank:]][^>]\+>[[:blank:]]\([[:graph:]]\+\).*/\1 lib\/ /p'\
-		|xargs -n 2 cp -u
+	chown -R xmail.xmail ${CHROOT}
+
+	cp `ldd ${CHROOT}${MAIL_ROOT}/bin/XMail |\
+	sed -n 's/[[:blank:]]*[^=]*=>\([^(]*\).*/\1/p'` ${CHROOT}/lib/
 	start-stop-daemon --start -c xmail -r ${CHROOT} \
 		--startas ${MAIL_EXEC} --pidfile=${MAIL_PID} -- \
 		${MAIL_CMD_LINE} 
diff --git a/net-mail/xmail/xmail-1.16.ebuild b/net-mail/xmail/xmail-1.16.ebuild
index b15fa29850f9..51a8f49caeb2 100644
--- a/net-mail/xmail/xmail-1.16.ebuild
+++ b/net-mail/xmail/xmail-1.16.ebuild
@@ -1,6 +1,6 @@
 # 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/xmail-1.16.ebuild,v 1.1 2003/07/21 07:17:04 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/xmail/xmail-1.16.ebuild,v 1.2 2003/07/24 03:06:52 raker Exp $
 
 IUSE=""
 
@@ -122,4 +122,8 @@ pkg_postinst() {
 	#fi
 
 	einfo "You can quickly configure XMail by running ${FILESDIR}/xmailwizard."
+
+	ewarn ""
+	ewarn "Make sure you have iptables enabled in your kernel!"
+	ewarn ""
 }