diff options
| author |   Michael Hanselmann <hansmi@gentoo.org> | 2005-01-07 22:14:07 +0000 |
|---|---|---|
| committer | Michael Hanselmann <hansmi@gentoo.org> | 2005-01-07 22:14:07 +0000 |
| commit | e1ce64211502eb8b42140676e31263283ac9a960 (patch) | |
| tree | 0b91d1e9e49b5d1003531e22a04bf30274740055 /mail-mta | |
| parent | Apache herd refresh: added mod_dav (diff) | |
| download | gentoo-2-e1ce64211502eb8b42140676e31263283ac9a960.tar.gz gentoo-2-e1ce64211502eb8b42140676e31263283ac9a960.tar.bz2 gentoo-2-e1ce64211502eb8b42140676e31263283ac9a960.zip | |
Fixed bug 49971
Diffstat (limited to 'mail-mta')
| -rw-r--r-- | mail-mta/qmail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-mta/qmail/files/1.03-r16/famd-dnotify.patch | 14 | ||||
| -rw-r--r-- | mail-mta/qmail/qmail-1.03-r16.ebuild | 6 |
3 files changed, 24 insertions, 2 deletions
diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog index 05bd85195ecf..1fec3222b461 100644 --- a/mail-mta/qmail/ChangeLog +++ b/mail-mta/qmail/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-mta/qmail # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.23 2005/01/06 20:28:27 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.24 2005/01/07 22:14:07 hansmi Exp $ + + 07 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> + +files/1.03-r16/famd-dnotify.patch, qmail-1.03-r16.ebuild: + Fixed bug 49971. 06 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> files/1.03-r16/Makefile-relaymxlookup.patch, diff --git a/mail-mta/qmail/files/1.03-r16/famd-dnotify.patch b/mail-mta/qmail/files/1.03-r16/famd-dnotify.patch new file mode 100644 index 000000000000..e967c68a61eb --- /dev/null +++ b/mail-mta/qmail/files/1.03-r16/famd-dnotify.patch @@ -0,0 +1,14 @@ +--- qmail-1.03.orig/qmail-local.c 2005-01-07 23:04:13.890397800 +0100 ++++ qmail-1.03/qmail-local.c 2005-01-07 23:05:59.023415152 +0100 +@@ -139,8 +139,9 @@ + if (close(fd) == -1) goto fail; /* NFS dorks */ + + if (link(fntmptph,fnnewtph) == -1) goto fail; +- if ((fd = open(fnnewtph, O_RDONLY)) < 0 || +- fsync(fd) < 0 || close(fd) < 0) goto fail; ++ if ((fd = open(fnnewtph, O_RDONLY)) >= 0) { ++ if (fsync(fd) < 0 || close(fd) < 0) goto fail; ++ } + + /* if it was error_exist, almost certainly successful; i hate NFS */ + tryunlinktmp(); _exit(0); diff --git a/mail-mta/qmail/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild index b41cfd1038ad..012c5fdbd0c8 100644 --- a/mail-mta/qmail/qmail-1.03-r16.ebuild +++ b/mail-mta/qmail/qmail-1.03-r16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.7 2005/01/06 20:28:27 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.8 2005/01/07 22:14:07 hansmi Exp $ inherit toolchain-funcs eutils fixheadtails @@ -265,6 +265,10 @@ src_unpack() { #EPATCH_SINGLE_MSG="Fixing broken #ifdef's to #if (TLS && TLS_BEFORE_AUTH)" \ #epatch ${FILESDIR}/${PV}-r15/tlsbeforeauth-fix.patch + # Fix bug 49971 + EPATCH_SINGLE_MSG="Applying fix for a special case with courier-imapd" \ + epatch ${FILESDIR}/${PVR}/famd-dnotify.patch + echo -n "$(tc-getCC) ${CFLAGS}" >${S}/conf-cc if use ssl; then einfo "Enabling SSL/TLS functionality" |