diff options
| author |   Tobias Scherbaum <dertobi123@gentoo.org> | 2009-09-03 20:19:18 +0000 |
|---|---|---|
| committer | Tobias Scherbaum <dertobi123@gentoo.org> | 2009-09-03 20:19:18 +0000 |
| commit | 0eecfe28cc37dc0e2dbe1d1e9f16d6c9ab1b32b5 (patch) | |
| tree | 2ac6359dc74dc009f381225e113c7f5616597e2e /net-mail | |
| parent | Force disable selinux when USE=-selinux #283597 by Jeremy Olexa. (diff) | |
| download | gentoo-2-0eecfe28cc37dc0e2dbe1d1e9f16d6c9ab1b32b5.tar.gz gentoo-2-0eecfe28cc37dc0e2dbe1d1e9f16d6c9ab1b32b5.tar.bz2 gentoo-2-0eecfe28cc37dc0e2dbe1d1e9f16d6c9ab1b32b5.zip | |
Fix patch
(Portage version: 2.2_rc40/cvs/Linux i686)
Diffstat (limited to 'net-mail')
| -rw-r--r-- | net-mail/cyrus-imapd/ChangeLog | 7 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild | 4 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-bug283596-2.patch (renamed from net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-bug283596.patch) | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog index 1ba6ef2536d8..e88f2b9689df 100644 --- a/net-mail/cyrus-imapd/ChangeLog +++ b/net-mail/cyrus-imapd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-mail/cyrus-imapd # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.142 2009/09/03 17:53:46 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.143 2009/09/03 20:19:18 dertobi123 Exp $ + + 03 Sep 2009; Tobias Scherbaum <dertobi123@gentoo.org> + cyrus-imapd-2.3.14-r3.ebuild, +files/cyrus-imapd-2.3.14-bug283596-2.patch, + -files/cyrus-imapd-2.3.14-bug283596.patch: + Fix patch *cyrus-imapd-2.3.14-r3 (03 Sep 2009) diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild index 67ed343f20e4..fcbf852048b9 100644 --- a/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild +++ b/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild,v 1.1 2009/09/03 17:53:46 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.14-r3.ebuild,v 1.2 2009/09/03 20:19:18 dertobi123 Exp $ EAPI=1 @@ -107,7 +107,7 @@ src_unpack() { # Fix prestripped binaries epatch "${FILESDIR}/${PN}-strip.patch" - epatch "${FILESDIR}/${P}-bug283596.patch" + epatch "${FILESDIR}/${P}-bug283596-2.patch" if use kolab ; then EPATCH_SOURCE="${FILESDIR}/kolab/${PV}" EPATCH_SUFFIX="patch" \ diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-bug283596.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-bug283596-2.patch index 12beb841cf01..a223fe41dace 100644 --- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-bug283596.patch +++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-bug283596-2.patch @@ -4,8 +4,8 @@ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * -- * $Id: cyrus-imapd-2.3.14-bug283596.patch,v 1.1 2009/09/03 17:53:46 dertobi123 Exp $ -+ * $Id: cyrus-imapd-2.3.14-bug283596.patch,v 1.1 2009/09/03 17:53:46 dertobi123 Exp $ +- * $Id: script.c,v 1.67 2008/03/24 20:08:46 murch Exp $ ++ * $Id: script.c,v 1.68 2009/09/02 13:56:18 brong Exp $ */ #ifdef HAVE_CONFIG_H |