diff options
| -rw-r--r-- | mail-mta/qmail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail-mta/qmail/Manifest | 8 | ||||
| -rw-r--r-- | mail-mta/qmail/files/1.03-r15/Makefile-relaymxlookup.patch | 43 | ||||
| -rw-r--r-- | mail-mta/qmail/files/digest-qmail-1.03-r15 | 1 | ||||
| -rw-r--r-- | mail-mta/qmail/qmail-1.03-r15.ebuild | 8 |
5 files changed, 62 insertions, 5 deletions
diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog index bcc803f951a0..06b26fd535ef 100644 --- a/mail-mta/qmail/ChangeLog +++ b/mail-mta/qmail/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-mta/qmail # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.13 2004/12/15 11:27:18 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.14 2004/12/15 22:15:45 hansmi Exp $ + + 15 Dec 2004; Michael Hanselmann <hansmi@gentoo.org> + +files/1.03-r15/Makefile-relaymxlookup.patch, qmail-1.03-r15.ebuild: + Added my relaymxlookup-patch. See http://hansmi.ch/software/qmail and + README.relaymxlookup after unpacking. 15 Dec 2004; Michael Hanselmann <hansmi@gentoo.org> qmail-1.03-r15.ebuild: Rediffed and integrated the moreipme-patch from Scott Gifford. diff --git a/mail-mta/qmail/Manifest b/mail-mta/qmail/Manifest index 08576f32a0e2..24d410a17ec2 100644 --- a/mail-mta/qmail/Manifest +++ b/mail-mta/qmail/Manifest @@ -2,15 +2,16 @@ MD5 035e489d1b15d18e0a9c5edfbc780e10 qmail-1.03-r11.ebuild 11387 MD5 99e11a3d000c4a33843a65fadc605c3f qmail-1.03-r8.ebuild 8062 MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280 MD5 56c3888ff57050f81ff0b4747e29e0ab qmail-1.03-r10.ebuild 11111 -MD5 9b9115c11fc41d98dfae17c4f0c45624 ChangeLog 19008 +MD5 bcd1e1feb8d7b80c92963d4d8ef1deea ChangeLog 19246 MD5 1326fc29d4004be71ba6ea2898d23edc qmail-1.03-r9.ebuild 9889 MD5 0339ddd1c43028c8a8c6ad53ac7008b3 qmail-1.03-r12.ebuild 13685 MD5 414fc72e81c6331156dc186159478995 qmail-1.03-r14.ebuild 15791 -MD5 b9bfb7f4564ba1061480234d48587171 qmail-1.03-r15.ebuild 17212 +MD5 29023b4224b259e645b2474d433a606c qmail-1.03-r15.ebuild 17465 MD5 fee2da8e07fe53237fd81f4fd3e44039 qmail-1.03-r13.ebuild 14072 +MD5 ad3c6acfe984fb1837cc20bac5bdd975 .qmail-1.03-r15.ebuild.swp 32768 MD5 180a513f34e3f00abc609672a190072c files/99qmail 137 MD5 cab514962524125fd83969a3751d2c6e files/servercert.cnf 1098 -MD5 f78805c8cc5af05c668df8c2380b9be6 files/digest-qmail-1.03-r15 1648 +MD5 55e71180b55e809b7bc8ccbd86c92dc4 files/digest-qmail-1.03-r15 1719 MD5 1fa33b460954492678129c60520e9cba files/digest-qmail-1.03-r10 442 MD5 c47d861aeef098d12d022d44c27386b5 files/errno.patch 850 MD5 041e9e9ee360bc691a642048b54c1d5b files/run-qmailsmtpdlog 319 @@ -156,6 +157,7 @@ MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r12/smtp-auth-close3.patch 728 MD5 b643468b77484854e9f293f9b1c2f111 files/1.03-r12/run-qmailqmqpd 1169 MD5 c369664bce0646b3d323d08f9ba5b8ce files/1.03-r12/dot_qmail 82 MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r12/qmail-smtpd-relay-reject.gentoo.patch 1433 +MD5 d0aef5e4c492dbdc768bc1e0f7558870 files/1.03-r15/Makefile-relaymxlookup.patch 1947 MD5 fe69ece20420ed8c2400dc423cdd5c22 files/1.03-r15/qmail-macos-dns-fix.patch 336 MD5 82945c7eee4a2bd8be0b9b9718114a7d files/1.03-r15/qmail-pop3d-top-outputfix.patch 574 MD5 5cb0c8c4c9feeee55362d77a99076c2f files/1.03-r10/99qmail 44 diff --git a/mail-mta/qmail/files/1.03-r15/Makefile-relaymxlookup.patch b/mail-mta/qmail/files/1.03-r15/Makefile-relaymxlookup.patch new file mode 100644 index 000000000000..abc71dd47663 --- /dev/null +++ b/mail-mta/qmail/files/1.03-r15/Makefile-relaymxlookup.patch @@ -0,0 +1,43 @@ +--- qmail-1.03.orig/Makefile 2004-12-15 22:35:11.000000000 +0100 ++++ qmail-1.03/Makefile 2004-12-15 22:44:26.008337731 +0100 +@@ -1450,11 +1450,12 @@ + load qmail-qmtpd.o rcpthosts.o control.o constmap.o received.o \ + date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a open.a \ + getln.a sig.a case.a env.a stralloc.a alloc.a substdio.a error.a \ +-str.a fs.a auto_qmail.o ++str.a fs.a auto_qmail.o dns.o ip.h ipalloc.h ipme.h byte_diff.o + ./load qmail-qmtpd rcpthosts.o control.o constmap.o \ + received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \ + datetime.a open.a getln.a sig.a case.a env.a stralloc.a \ +- alloc.a substdio.a error.a str.a fs.a auto_qmail.o ++ alloc.a substdio.a error.a fs.a auto_qmail.o dns.o \ ++ `cat dns.lib` ip.o ipalloc.o ipme.o byte_diff.o str.a + + qmail-qmtpd.0: \ + qmail-qmtpd.8 +@@ -1617,13 +1618,13 @@ + timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o received.o \ + date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a getln.a \ + open.a sig.a case.a env.a stralloc.a alloc.a strerr.a substdio.a error.a str.a \ +-fs.a auto_qmail.o base64.o socket.lib ++fs.a auto_qmail.o base64.o socket.lib dns.o ip.h ipalloc.h + ./load qmail-smtpd qregex.o rcpthosts.o commands.o timeoutread.o \ + timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o \ + received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \ + datetime.a getln.a open.a sig.a case.a env.a stralloc.a \ +- alloc.a strerr.a substdio.a error.a str.a fs.a auto_qmail.o base64.o `cat \ +- socket.lib` -lssl -lcrypto ++ alloc.a strerr.a substdio.a error.a fs.a auto_qmail.o base64.o `cat \ ++ socket.lib` -lssl -lcrypto dns.o str.a `cat dns.lib` + + qmail-smtpd.0: \ + qmail-smtpd.8 +@@ -1760,7 +1761,7 @@ + + rcpthosts.o: \ + compile rcpthosts.c cdb.h uint32.h byte.h open.h error.h control.h \ +-constmap.h stralloc.h gen_alloc.h rcpthosts.h ++constmap.h stralloc.h gen_alloc.h rcpthosts.h dns.h ipalloc.h ipme.h + ./compile rcpthosts.c + + qregex.o: \ diff --git a/mail-mta/qmail/files/digest-qmail-1.03-r15 b/mail-mta/qmail/files/digest-qmail-1.03-r15 index 8643ac785604..061e8d4d0608 100644 --- a/mail-mta/qmail/files/digest-qmail-1.03-r15 +++ b/mail-mta/qmail/files/digest-qmail-1.03-r15 @@ -22,3 +22,4 @@ MD5 00084ddd52a3665b65f2db20a773b382 qmail-hold-1.03.pat.gz 1596 MD5 68e7697fd61d7cd9a5a7dc88ce2ecd47 netscape-progress.patch 1457 MD5 598aca7a3a99426d1f49079172986b31 sendmail-ignore-N.patch 636 MD5 2bd191cca4e640e87cca79bc0405f97a qmail-1.03-moreipme-0.6pre1-gentoo.patch 13942 +MD5 d96455aaed208e9cd450d8874564781b qmail-relaymxlookup-0.3.diff 3856 diff --git a/mail-mta/qmail/qmail-1.03-r15.ebuild b/mail-mta/qmail/qmail-1.03-r15.ebuild index 2d7a5e09e5ff..426d8925ac0c 100644 --- a/mail-mta/qmail/qmail-1.03-r15.ebuild +++ b/mail-mta/qmail/qmail-1.03-r15.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r15.ebuild,v 1.11 2004/12/15 11:27:18 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r15.ebuild,v 1.12 2004/12/15 22:15:45 hansmi Exp $ inherit toolchain-funcs eutils fixheadtails @@ -33,6 +33,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz mirror://qmail/netscape-progress.patch http://www-dt.e-technik.uni-dortmund.de/~ma/djb/qmail/sendmail-ignore-N.patch mirror://gentoo/qmail-1.03-moreipme-0.6pre1-gentoo.patch + http://hansmi.ch/download/qmail/qmail-relaymxlookup-0.3.diff " # broken stuffs #http://www.qcc.ca/~charlesc/software/misc/nullenvsender-recipcount.patch @@ -207,6 +208,11 @@ src_unpack() { # See http://www.suspectclass.com/~sgifford/qmail/qmail-moreipme-0.6.README epatch ${DISTDIR}/qmail-1.03-moreipme-0.6pre1-gentoo.patch + # Patch to look up the mx before relaying + # Look at http://hansmi.ch/software/qmail + epatch ${DISTDIR}/qmail-relaymxlookup-0.3.diff + epatch ${FILESDIR}/${PVR}/Makefile-relaymxlookup.patch + echo -n "$(tc-getCC) ${CFLAGS}" >${S}/conf-cc if use ssl; then einfo "Enabling SSL/TLS functionality" |