bug #51869, make relaying behave properly.

5 files changed, 106 insertions, 6 deletions

diff --git a/net-mail/relay-ctrl/ChangeLog b/net-mail/relay-ctrl/ChangeLog
index a68a8d38e2bf..2308dc14ae67 100644
--- a/net-mail/relay-ctrl/ChangeLog
+++ b/net-mail/relay-ctrl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/relay-ctrl
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/relay-ctrl/ChangeLog,v 1.9 2003/11/29 19:07:13 robbat2 Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/relay-ctrl/ChangeLog,v 1.10 2004/05/24 09:40:01 robbat2 Exp $
+
+*relay-ctrl-3.1.1-r2 (24 May 2004)
+
+  24 May 2004; Robin H. Johnson <robbat2@gentoo.org>
+  relay-ctrl-3.1.1-r2.ebuild, files/authenticated.c-relayfixup.diff:
+  bug #51869, make relaying behave properly.
 
   29 Nov 2003; Robin Johnson,,604-339-5621,604-298-8414 <robbat2@gentoo.org>
   relay-ctrl-3.1.1-r1.ebuild:
diff --git a/net-mail/relay-ctrl/Manifest b/net-mail/relay-ctrl/Manifest
index 8a69380e362e..5f4448c598d5 100644
--- a/net-mail/relay-ctrl/Manifest
+++ b/net-mail/relay-ctrl/Manifest
@@ -1,6 +1,8 @@
-MD5 85a4bf566943e0608a1e288912b50bef ChangeLog 1016
-MD5 bd4d3ff22ed88a6b0d0c9870c0264433 relay-ctrl-3.1.1.ebuild 948
+MD5 9f74a67afe0b092edf3c9809ca44d5c9 relay-ctrl-3.1.1-r2.ebuild 2055
+MD5 44924432e7d664a62ddee39acfade534 relay-ctrl-3.1.1.ebuild 947
+MD5 9f74a67afe0b092edf3c9809ca44d5c9 relay-ctrl-3.1.1-r1.ebuild 2055
+MD5 f76a6c5e2dd4c6f5376d536388eb586b ChangeLog 1015
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 63a0028c8a952bde9ce0d501efc57519 relay-ctrl-3.1.1-r1.ebuild 2056
-MD5 f8baeb98e3343a1651c17082460b4bf3 files/digest-relay-ctrl-3.1.1 67
 MD5 f8baeb98e3343a1651c17082460b4bf3 files/digest-relay-ctrl-3.1.1-r1 67
+MD5 f8baeb98e3343a1651c17082460b4bf3 files/digest-relay-ctrl-3.1.1-r2 67
+MD5 f8baeb98e3343a1651c17082460b4bf3 files/digest-relay-ctrl-3.1.1 67
diff --git a/net-mail/relay-ctrl/files/authenticated.c-relayfixup.diff b/net-mail/relay-ctrl/files/authenticated.c-relayfixup.diff
new file mode 100644
index 000000000000..72bb5a27aa47
--- /dev/null
+++ b/net-mail/relay-ctrl/files/authenticated.c-relayfixup.diff
@@ -0,0 +1,28 @@
+diff -ur relay-ctrl-3.1.1/authenticated.c relay-ctrl-3.1.1-r2/authenticated.c
+--- relay-ctrl-3.1.1/authenticated.c	2002-04-26 09:07:38.000000000 -0700
++++ relay-ctrl-3.1.1-r2/authenticated.c	2004-05-24 02:31:47.000000000 -0700
+@@ -1,14 +1,20 @@
+ #include <stdlib.h>
++#include <string.h>
+ #include "relay-ctrl.h"
+ 
+ int is_authenticated(void)
+ {
+   if (getenv("AUTHUSER") && getenv("AUTHARGV0")) {
+     /* Courier IMAP or POP3 */
+-    if (getenv("AUTHENTICATED"))
+-      return 1;
+-  }
+-  else
++	char *authenticated = getenv("AUTHENTICATED");
++	if (authenticated && strlen(authenticated)) {
++		return 1;
++	} else {
++		return 0;
++	}
++  } else {
+     return 1;
++  }
++  // unreachable code
+   return 0;
+ }
diff --git a/net-mail/relay-ctrl/files/digest-relay-ctrl-3.1.1-r2 b/net-mail/relay-ctrl/files/digest-relay-ctrl-3.1.1-r2
new file mode 100644
index 000000000000..8aa0ada56dae
--- /dev/null
+++ b/net-mail/relay-ctrl/files/digest-relay-ctrl-3.1.1-r2
@@ -0,0 +1 @@
+MD5 b35133e21bf52b532b4b839e11cb883c relay-ctrl-3.1.1.tar.gz 35046
diff --git a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
new file mode 100644
index 000000000000..89f1a107552d
--- /dev/null
+++ b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild,v 1.1 2004/05/24 09:40:01 robbat2 Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="SMTP Relaying Control designed for qmail & tcpserver."
+SRC_URI="http://untroubled.org/relay-ctrl/${P}.tar.gz"
+HOMEPAGE="http://untroubled.org/relay-ctrl/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc"
+
+DEPEND="sys-devel/gcc-config"
+RDEPEND="sys-apps/ucspi-tcp sys-apps/daemontools"
+
+RELAYCTRL_BASE="/var/spool/relay-ctrl"
+# this is relative to RELAYCTRL_BASE
+RELAYCTRL_STORAGE="allow"
+RELAYCTRL_CONFDIR="/etc/relay-ctrl"
+RELAYCTRL_BINDIR="/usr/bin"
+
+inherit fixheadtails
+
+src_unpack() {
+	unpack ${A}
+	ht_fix_file ${S}/Makefile
+	epatch ${FILESDIR}/authenticated.c-relayfixup.diff
+}
+
+src_compile() {
+	echo "${CC} ${CFLAGS}" > conf-cc
+	echo "${CC} ${LDFLAGS}" > conf-ld
+	emake || die
+}
+
+src_install () {
+	exeinto ${RELAYCTRL_BINDIR}
+	doexe relay-ctrl-age relay-ctrl-allow relay-ctrl-check relay-ctrl-send relay-ctrl-udp relay-ctrl-chdir
+
+	#NB: at some point the man page for relay-ctrl-chdir will be added!
+	doman relay-ctrl-age.8 relay-ctrl-allow.8 relay-ctrl-check.8 relay-ctrl-send.8 relay-ctrl-udp.8
+	dodoc README ANNOUNCEMENT NEWS
+
+	keepdir ${RELAYCTRL_BASE} ${RELAYCTRL_BASE}/${RELAYCTRL_STORAGE}
+	fperms 700 ${RELAYCTRL_BASE}
+	fperms 1777 ${RELAYCTRL_BASE}/${RELAYCTRL_STORAGE}
+
+	dodir ${RELAYCTRL_CONFDIR}
+
+	# tell it our storage dir
+	echo "${RELAYCTRL_BASE}/${RELAYCTRL_STORAGE}" > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_DIR
+	# default to 30 minutes
+	echo "1800" > ${D}${RELAYCTRL_CONFDIR}/RELAY_CTRL_EXPIRY
+
+	echo "/usr/bin/envdir ${RELAYCTRL_CONFDIR} ${RELAYCTRL_BINDIR}/relay-ctrl-age" >${D}/etc/cron.hourly/relay-ctrl-age
+	chmod +x ${D}/etc/cron.hourly/relay-ctrl-age
+}
+
+pkg_postinst() {
+	[ -d /usr/lib/courier-imap/authlib ] && ln -sf /usr/bin/relay-ctrl-allow /usr/lib/courier-imap/authlib/relay-ctrl-allow
+	einfo "Please see the instructions in /usr/share/doc/${PF}/README for setup instructions with Courier-IMAP and Qmail"
+}