Addressing Bug 25530

4 files changed, 147 insertions, 4 deletions

diff --git a/mail-mta/xmail/ChangeLog b/mail-mta/xmail/ChangeLog
index da69f08e3387..22edf5419b83 100644
--- a/mail-mta/xmail/ChangeLog
+++ b/mail-mta/xmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/xmail
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/xmail/ChangeLog,v 1.3 2004/06/24 22:25:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/xmail/ChangeLog,v 1.4 2004/06/28 20:57:20 merlin Exp $
+
+*xmail-1.16-r1 (28 Jun 2004)
+
+  28 Jun 2004; Cory Visi <merlin@gentoo.org> xmail-1.16-r1.ebuild:
+  Fixes for Bug 25530, some contributions from Sergey Ivanov
+  <seriv@parkheights.dyndns.org>
 
   04 Jun 2004; David Holm <dholm@gentoo.org> xmail-1.16.ebuild:
   Added to ~ppc.
diff --git a/mail-mta/xmail/Manifest b/mail-mta/xmail/Manifest
index bdd7fdc9025f..4362fdf7b6e9 100644
--- a/mail-mta/xmail/Manifest
+++ b/mail-mta/xmail/Manifest
@@ -1,8 +1,10 @@
-MD5 161a15d2a99e86598b8c284a993603c9 xmail-1.16.ebuild 3246
-MD5 300f22a1a985f328298bd3b48cd02265 ChangeLog 3509
+MD5 9f1d54df86e9c9eeb3b3f1d7b8adefda ChangeLog 3701
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 1a426fa650c0d24abde7a6871a17164f xmail-1.16-r1.ebuild 3482
+MD5 161a15d2a99e86598b8c284a993603c9 xmail-1.16.ebuild 3246
 MD5 e00a488aecb141a34c5ec43eac58b9a9 files/15xmail 24
 MD5 5bbd572781bd63319f432d3a74a399cf files/digest-xmail-1.16 62
-MD5 83d5827b27ef269bc0cd20f87b1fd8c2 files/xmailwizard 2306
 MD5 8f93bde743cf3f7a77f27bcf602aa4dc files/xmail.confd 409
 MD5 6445512ce263f40aad7eabadeea2e3d7 files/xmail.initd 2803
+MD5 83d5827b27ef269bc0cd20f87b1fd8c2 files/xmailwizard 2306
+MD5 5bbd572781bd63319f432d3a74a399cf files/digest-xmail-1.16-r1 62
diff --git a/mail-mta/xmail/files/digest-xmail-1.16-r1 b/mail-mta/xmail/files/digest-xmail-1.16-r1
new file mode 100644
index 000000000000..aa6f3e6077a2
--- /dev/null
+++ b/mail-mta/xmail/files/digest-xmail-1.16-r1
@@ -0,0 +1 @@
+MD5 cc02e8aee49c48b9f4e592ba0b0cab71 xmail-1.16.tar.gz 409228
diff --git a/mail-mta/xmail/xmail-1.16-r1.ebuild b/mail-mta/xmail/xmail-1.16-r1.ebuild
new file mode 100644
index 000000000000..7d775f0da673
--- /dev/null
+++ b/mail-mta/xmail/xmail-1.16-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/xmail/xmail-1.16-r1.ebuild,v 1.1 2004/06/28 20:57:20 merlin Exp $
+
+inherit eutils
+
+DESCRIPTION="The world's fastest email server"
+HOMEPAGE="http://www.xmailserver.org/"
+SRC_URI="http://www.xmailserver.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc"
+
+DEPEND="virtual/glibc
+	>=sys-apps/sed-4"
+PROVIDE="virtual/mta"
+
+pkg_setup() {
+	enewgroup xmail
+	enewuser xmail -1 /bin/false /dev/null xmail
+}
+
+src_compile() {
+	sed -i -e "s:^CFLAGS = -O2:CFLAGS=$CFLAGS:g" Makefile.lnx
+
+	# Makefile does not setup dependencies properly to handle parallel build
+	if use x86 ; then
+		emake -j1 -f Makefile.lnx || die
+	elif use sparc ; then
+		emake -j1 -f Makefile.slx || die
+	fi
+	sed -e "s:/var/MailRoot:/chroot/xmail/var/MailRoot:g" sendmail.sh > sendmail.sh.new
+}
+
+src_install() {
+	# create some image directories with default diropts
+	dodir /etc/conf.d
+	dodir /etc/init.d
+	dodir /etc/env.d
+
+	einfo "Setting up directory hierarchy"
+	diropts -m 700 -o xmail -g xmail
+	dodir /etc/xmail
+	keepdir /chroot/xmail/var/MailRoot/bin
+	dodir /etc/xmail/tabindex
+	dodir /etc/xmail/dnscache/mx
+	dodir /etc/xmail/dnscache/ns
+	dodir /etc/xmail/spool/local
+	dodir /etc/xmail/spool/temp
+	dodir /etc/xmail/logs
+	dodir /etc/init.d
+	dodir /etc/conf.d
+
+	for i in cmdaliases custdomains domains filters pop3linklocks\
+		pop3links pop3locks userauth
+	do
+		keepdir /etc/xmail/${i}
+	done
+
+	for i in pop3 smtp
+	do
+		keepdir /etc/xmail/userauth/${i}
+	done
+	rm -f ${D}/etc/xmail/userauth/.keep
+
+	einfo "Installing the XMail initial configuration"
+	insopts -o xmail -g xmail -m 600
+	cd ${S}/MailRoot
+	insinto /etc/xmail
+	doins server.tab ctrl.ipmap.tab dnsroots finger.ipmap.tab\
+		message.id pop3.ipmap.tab smtp.ipmap.tab\
+		userdef.tab
+
+	for i in mailusers extaliases domains mailusers aliases \
+		aliasdomain extaliases pop3links smtpauth smtpextauth \
+		smtpfwd smtprelay smtpgw spam-address spammers ctrlaccounts \
+		filters.in filters.out
+	do
+		touch ${D}/etc/xmail/${i}.tab
+		fowners xmail:xmail /etc/xmail/${i}.tab
+		fperms 600 /etc/xmail/${i}.tab
+	done
+
+	einfo "Installing the XMail documentation"
+	dodoc ${S}/docs/*
+	dodoc ${S}/gpl.txt
+	dodoc ${S}/ToDo.txt
+
+
+	einfo "Installing the XMail software"
+	insinto /etc/env.d
+	doins ${FILESDIR}/15xmail
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/xmail.initd xmail
+	insinto /etc/conf.d
+	newins ${FILESDIR}/xmail.confd xmail
+	cd ${S}
+	exeopts -o xmail -g xmail -m 4700
+	exeinto /usr/sbin
+	newexe sendmail sendmail.xmail
+	exeopts -o root -g root -m 755
+	newexe sendmail.sh.new sendmail
+	exeopts -o xmail -g xmail -m 700
+	exeinto /chroot/xmail/var/MailRoot/bin
+	doexe CtrlClnt XMail XMCrypt MkUsers
+}
+
+pkg_postinst() {
+	rm -f /etc/xmail/cmdaliases/.keep
+	rm -f /etc/xmail/custdomains/.keep
+	rm -f /etc/xmail/domains/.keep
+	rm -f /etc/xmail/filters/.keep
+	rm -f /etc/xmail/pop3linklocks/.keep
+	rm -f /etc/xmail/pop3links/.keep
+	rm -f /etc/xmail/pop3locks/.keep
+	rm -f /etc/xmail/userauth/pop3/.keep
+	rm -f /etc/xmail/userauth/smtp/.keep
+
+	#read -n 1 -p "Do you want to configure XMail now (y/n)? " YESNO
+	#echo ""
+	#if [ $YESNO == 'Y' -o $YESNO == 'y' ] ; then
+	#	sh ${FILESDIR}/xmailwizard
+	#else
+	#	einfo "You can quickly configure XMail by running ${FILESDIR}/xmailwizard."
+	#fi
+
+	einfo "You can quickly configure XMail by running ${FILESDIR}/xmailwizard."
+
+	ewarn
+	ewarn "Make sure you have iptables/netfilter with connection tracking"
+	ewarn "and the REDIRECT target enabled in your kernel!"
+	ewarn
+}