4 files changed, 170 insertions, 18 deletions

diff --git a/mail-mta/xmail/ChangeLog b/mail-mta/xmail/ChangeLog
index 1b5e00f20930..7bc75dc924c2 100644
--- a/mail-mta/xmail/ChangeLog
+++ b/mail-mta/xmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/xmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/xmail/ChangeLog,v 1.15 2005/08/23 13:21:44 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/xmail/ChangeLog,v 1.16 2005/12/10 12:02:38 lcars Exp $
+
+*xmail-1.22 (10 Dec 2005)
+
+  10 Dec 2005; Andrea Barisani <lcars@gentoo.org> +xmail-1.22.ebuild:
+  New version, fixes security issue CAN-2005-2943. Bug #109381.
 
   23 Aug 2005; Andrej Kacian <ticho@gentoo.org> xmail-1.16-r1.ebuild,
   xmail-1.20.ebuild, xmail-1.21.ebuild:
@@ -10,7 +15,7 @@
   Stable on x86. Closes bug #97405, reported by Brian Dilks <bdilks at
   speakeasy.net>.
 
-  29 Jun 2005; Tuấn Văn <langthang@gentoo.org> xmail-1.21.ebuild:
+  29 Jun 2005; Tuấn Văn <langthang@gentoo.org> xmail-1.21.ebuild:
   Fix issues in bug #96632. Thanks to Jakub Moc <jakub@gentoo.org> for 
   the patch.
 
diff --git a/mail-mta/xmail/Manifest b/mail-mta/xmail/Manifest
index f1cd619be3eb..00091675678f 100644
--- a/mail-mta/xmail/Manifest
+++ b/mail-mta/xmail/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 551440ed3187349e9ef2f3368991954e xmail-1.21.ebuild 4407
-MD5 78cbe0bb146c693896dbdb2d113e89e4 xmail-1.20.ebuild 3494
-MD5 8173d8e19a88a77af422c51254e679a5 xmail-1.16-r1.ebuild 3576
-MD5 51abaac73b091c0f2c42897a2ca2a88e ChangeLog 5015
+MD5 f38b4fbc32fe0d0a6db002b639f4a3fe ChangeLog 5182
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 8173d8e19a88a77af422c51254e679a5 xmail-1.16-r1.ebuild 3576
+MD5 78cbe0bb146c693896dbdb2d113e89e4 xmail-1.20.ebuild 3494
+MD5 551440ed3187349e9ef2f3368991954e xmail-1.21.ebuild 4407
+MD5 56bf94f1fa6f894baa1faa103ce93a2d xmail-1.22.ebuild 4408
+MD5 8f93bde743cf3f7a77f27bcf602aa4dc files/xmail.confd 409
 MD5 e00a488aecb141a34c5ec43eac58b9a9 files/15xmail 24
 MD5 5bbd572781bd63319f432d3a74a399cf files/digest-xmail-1.16-r1 62
 MD5 6581875d1cebeca3b8fe46e7474622e1 files/digest-xmail-1.20 62
 MD5 6f4ea67473a8953af58100fb58d22b8f files/digest-xmail-1.21 62
-MD5 722274fd9ffd32da5477fb703d3f657c files/xmailwizard 2299
-MD5 8f93bde743cf3f7a77f27bcf602aa4dc files/xmail.confd 409
 MD5 e3d8c8b19f80d10a348f2d10f33e1cc6 files/xmail.initd 2802
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDCyMBQlM6RnzZP+IRApwnAKDBSTxEkeNOXKrTIObg2E8hAivQBwCcD4Yg
-AdLfLHPxTVGKf5SEMYQ3310=
-=4H7T
------END PGP SIGNATURE-----
+MD5 722274fd9ffd32da5477fb703d3f657c files/xmailwizard 2299
+MD5 65b34a39763f66b0eb85ab7ae2b85e5f files/digest-xmail-1.22 62
diff --git a/mail-mta/xmail/files/digest-xmail-1.22 b/mail-mta/xmail/files/digest-xmail-1.22
new file mode 100644
index 000000000000..1e91b5ec8fdc
--- /dev/null
+++ b/mail-mta/xmail/files/digest-xmail-1.22
@@ -0,0 +1 @@
+MD5 ed2acc291345320e9993941e6043b46c xmail-1.22.tar.gz 416738
diff --git a/mail-mta/xmail/xmail-1.22.ebuild b/mail-mta/xmail/xmail-1.22.ebuild
new file mode 100644
index 000000000000..0739281070e7
--- /dev/null
+++ b/mail-mta/xmail/xmail-1.22.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/xmail/xmail-1.22.ebuild,v 1.1 2005/12/10 12:02:38 lcars Exp $
+
+inherit eutils linux-info
+
+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 ~ppc ~sparc"
+IUSE=""
+
+DEPEND="virtual/libc
+	>=sys-apps/sed-4"
+RDEPEND="net-firewall/iptables"
+PROVIDE="virtual/mta"
+
+pkg_setup() {
+
+	linux-info_pkg_setup
+
+	if ! (linux_chkconfig_present NETFILTER); then
+		eerror "${P} requires netfilter/iptables support enabled in kernel!"
+		eerror
+		eerror "Recompile your kernel with CONFIG_NETFILTER and CONFIG_IP_NF_TARGET_REDIRECT"
+		eerror "support enabled and reboot. Then try to emerge ${P} again."
+		die "Kernel without CONFIG_NETFILTER detected!"
+	fi
+
+	if ! (linux_chkconfig_present IP_NF_TARGET_REDIRECT); then
+		eerror "${P} requires CONFIG_IP_NF_TARGET_REDIRECT support to be enabled in kernel!"
+		eerror "Recompile your kernel with netfilter REDIRECT target support enabled."
+		eerror
+		eerror "Reboot will be required if compiled directly into kernel."
+		eerror "If reboot is not desired you should choose a module instead and run"
+		eerror "make modules && make modules_install"
+		die "Kernel without CONFIG_IP_NF_TARGET_REDIRECT detected!"
+	fi
+
+	enewgroup xmail
+	enewuser xmail -1 -1 /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
+	emake -j1 -f Makefile.lnx || die
+
+	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}/bin
+	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
+}