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 | 37e3d103731fefe9106d472a74ee1c9cd89f2c88 (patch) | |
| tree | e88b76b9ce75412045ba18b64f829d7cbe34ea5e /mail-mta/qmail | |
| parent | Apache herd refresh: added mod_dav (diff) | |
| download | historical-37e3d103731fefe9106d472a74ee1c9cd89f2c88.tar.gz historical-37e3d103731fefe9106d472a74ee1c9cd89f2c88.tar.bz2 historical-37e3d103731fefe9106d472a74ee1c9cd89f2c88.zip | |
Fixed bug 49971
Diffstat (limited to 'mail-mta/qmail')
| -rw-r--r-- | mail-mta/qmail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-mta/qmail/Manifest | 5 | ||||
| -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 |
4 files changed, 27 insertions, 4 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/Manifest b/mail-mta/qmail/Manifest index a88679ee3cbf..9d6dee88799e 100644 --- a/mail-mta/qmail/Manifest +++ b/mail-mta/qmail/Manifest @@ -2,8 +2,8 @@ MD5 326c3d12fa42f7d77ec25d0034c6386c qmail-1.03-r11.ebuild 11387 MD5 b29fd46e11237b9ee8c69b705a91b1bf qmail-1.03-r8.ebuild 8060 MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280 MD5 d18a1222087e80a39b2588e0f12e6e13 qmail-1.03-r10.ebuild 11111 -MD5 93dbb206db72d7929bc3798556de27e9 ChangeLog 21855 -MD5 5e8d5ae301f48a1a9f73c412e777a160 qmail-1.03-r16.ebuild 20342 +MD5 ead6f0c9c9f813a941bf1917d632af3d ChangeLog 21990 +MD5 2a6af36a5b1d62f9a7693772a0928f9a qmail-1.03-r16.ebuild 20480 MD5 48561c5b6846d4b381dfdd498b1955f4 qmail-1.03-r9.ebuild 9887 MD5 a0cae8f720499509864d8c17c7aac5a3 qmail-1.03-r12.ebuild 13710 MD5 f322d995494a3c1b6198916537b6b907 qmail-1.03-r14.ebuild 15817 @@ -75,6 +75,7 @@ MD5 a963429b55bc3713ff3a22674101dfdb files/1.03-r16/auth-after-tls-only.patch 22 MD5 7a73d3a9a0a19536f2bb673f34b4f2fa files/1.03-r16/Makefile-relaymxlookup.patch 1988 MD5 dbfe7d95b274567088123575d5da00ba files/1.03-r16/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch 571 MD5 a1e8f454e96a2b23e9daae34fa6b6b5e files/1.03-r16/qmail-1.03-accept-5xx.tls.patch 930 +MD5 8f196c7649132af2c0c3745c1a5f1e9c files/1.03-r16/famd-dnotify.patch 555 MD5 fe189f1c8c28ae8b15bde3f8bb169997 files/1.03-r16/gentoo-qmail-1.03-r16-logrelay.patch 454 MD5 d48eeee899c7999925dd64afd4109269 files/1.03-r16/nullenvsender-recipcount.tls.patch 1479 MD5 72c4027c99c19158d4bbe3ed77efcae6 files/1.03-r16/double-bounce-trim.patch 1662 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" |