diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2004-10-28 00:54:40 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2004-10-28 00:54:40 +0000 |
| commit | 07bee6bc417aea0afb8db21746aed6a79b4810aa (patch) | |
| tree | ae0ff05f0bef5e5ce62c437e6416a9c5b73a674c /dev-libs/cyrus-sasl | |
| parent | Stable on ia64, hppa and arm - thanks to SpanKY for testing that (Manifest re... (diff) | |
| download | gentoo-2-07bee6bc417aea0afb8db21746aed6a79b4810aa.tar.gz gentoo-2-07bee6bc417aea0afb8db21746aed6a79b4810aa.tar.bz2 gentoo-2-07bee6bc417aea0afb8db21746aed6a79b4810aa.zip | |
gcc-4.0 fix
Diffstat (limited to 'dev-libs/cyrus-sasl')
| -rw-r--r-- | dev-libs/cyrus-sasl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild | 13 | ||||
| -rw-r--r-- | dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.20-gcc4.patch | 12 |
3 files changed, 25 insertions, 6 deletions
diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog index 85429e5db883..0ff670ce3ffa 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-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.100 2004/10/26 22:34:12 langthang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.101 2004/10/28 00:54:40 eradicator Exp $ + + 27 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> + +files/cyrus-sasl-2.1.20-gcc4.patch, cyrus-sasl-2.1.20.ebuild: + gcc-4.0 fix *cyrus-sasl-2.1.20 (26 Oct 2004) diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild index 456acc578d50..1b2646a08312 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.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/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild,v 1.1 2004/10/26 22:34:12 langthang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild,v 1.2 2004/10/28 00:54:40 eradicator Exp $ inherit eutils gnuconfig flag-o-matic java-pkg @@ -73,17 +73,20 @@ src_unpack() { # DB4 detection and versioned symbols. # Fixed upstream. - # epatch "${FILESDIR}/cyrus-sasl-2.1.18-db4.patch" || die "patch failed" + # epatch "${FILESDIR}/cyrus-sasl-2.1.18-db4.patch" # Add configdir support. - epatch "${FILESDIR}/${P}-configdir.patch" || die "patch failed" + epatch "${FILESDIR}/${P}-configdir.patch" # Fix include path for newer PostgreSQL versions. - epatch "${FILESDIR}/cyrus-sasl-2.1.17-pgsql-include.patch" || die "patch failed" + epatch "${FILESDIR}/cyrus-sasl-2.1.17-pgsql-include.patch" # Add setuid/setgid check for SASL_PATH # Fixed upstream. - # epatch "${FILESDIR}/${P}-sasl-path-fix.patch" || die "patch failed" + # epatch "${FILESDIR}/${P}-sasl-path-fix.patch" + + # Fix for gcc-4.0 + epatch "${FILESDIR}/${P}-gcc4.patch" # Recreate configure. export WANT_AUTOCONF="2.5" diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.20-gcc4.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.20-gcc4.patch new file mode 100644 index 000000000000..7311d86dc792 --- /dev/null +++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.20-gcc4.patch @@ -0,0 +1,12 @@ +diff -Naur cyrus-sasl-2.1.20.orig/lib/client.c cyrus-sasl-2.1.20.gcc4/lib/client.c +--- cyrus-sasl-2.1.20.orig/lib/client.c 2004-10-27 16:43:35.259949000 -0700 ++++ cyrus-sasl-2.1.20.gcc4/lib/client.c 2004-10-27 16:43:58.139183000 -0700 +@@ -61,7 +61,7 @@ + + static cmech_list_t *cmechlist; /* global var which holds the list */ + +-static sasl_global_callbacks_t global_callbacks; ++sasl_global_callbacks_t global_callbacks; + + static int _sasl_client_active = 0; + |