diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2009-05-08 00:58:59 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2009-05-08 00:58:59 +0000 |
| commit | 9526c9e5b4af8ab507409b4126ed161505496775 (patch) | |
| tree | 38fd3636b6b8d7fc285d7310b0eb1f63b3399c56 /dev-libs/cyrus-sasl | |
| parent | Fix bug 268788, Function 'g_volume_monitor_adopt_orphan_mount' implicitly con... (diff) | |
| download | gentoo-2-9526c9e5b4af8ab507409b4126ed161505496775.tar.gz gentoo-2-9526c9e5b4af8ab507409b4126ed161505496775.tar.bz2 gentoo-2-9526c9e5b4af8ab507409b4126ed161505496775.zip | |
Fix gcc-4.4 compatibility, bug 248738. Thanks to dirtyepic for the patch.
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/cyrus-sasl')
| -rw-r--r-- | dev-libs/cyrus-sasl/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r2.ebuild | 7 | ||||
| -rw-r--r-- | dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch | 23 |
3 files changed, 34 insertions, 4 deletions
diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog index d03de11b9ec6..a3c92e05b5c5 100644 --- a/dev-libs/cyrus-sasl/ChangeLog +++ b/dev-libs/cyrus-sasl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/cyrus-sasl -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.194 2008/08/06 06:49:16 ulm Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.195 2009/05/08 00:58:58 loki_val Exp $ + + 08 May 2009; Peter Alfredsen <loki_val@gentoo.org> + cyrus-sasl-2.1.22-r2.ebuild, +files/cyrus-sasl-2.1.22-gcc44.patch: + Fix gcc-4.4 compatibility, bug 248738. Thanks to dirtyepic for the patch. 06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml: Add USE flag description to metadata wrt GLEP 56. diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r2.ebuild index 6fda8e6a7b06..aa9b7c43669a 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r2.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r2.ebuild,v 1.15 2008/05/19 19:38:42 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.22-r2.ebuild,v 1.16 2009/05/08 00:58:58 loki_val Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="1.7" @@ -83,6 +83,9 @@ src_unpack() { # support new db versions #192753 epatch "${FILESDIR}/${P}-db4.patch" + # Support gcc-4.4 #248738 + epatch "${FILESDIR}/${P}-gcc44.patch" + # Recreate configure. rm -f "${S}/config/libtool.m4" || die "rm libtool.m4 failed" AT_M4DIR="${S}/cmulocal ${S}/config" eautoreconf diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch new file mode 100644 index 000000000000..0d4d2d2eac48 --- /dev/null +++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch @@ -0,0 +1,23 @@ +Bug #248738 + +diff -Naurp cyrus-sasl-2.1.22-orig/plugins/digestmd5.c cyrus-sasl-2.1.22/plugins/digestmd5.c +--- cyrus-sasl-2.1.22-orig/plugins/digestmd5.c 2006-05-17 10:46:17.000000000 -0600 ++++ cyrus-sasl-2.1.22/plugins/digestmd5.c 2008-11-24 23:39:11.000000000 -0600 +@@ -2715,7 +2715,7 @@ static sasl_server_plug_t digestmd5_serv + "DIGEST-MD5", /* mech_name */ + #ifdef WITH_RC4 + 128, /* max_ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, +@@ -4034,7 +4034,7 @@ static sasl_client_plug_t digestmd5_clie + "DIGEST-MD5", + #ifdef WITH_RC4 /* mech_name */ + 128, /* max ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, |