gcc-4.0 fix

4 files changed, 63 insertions, 43 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/Manifest b/dev-libs/cyrus-sasl/Manifest
index dfd18708fd93..34ea7674a765 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,56 +1,57 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0c36a223623cafbd54654c586cc4792e cyrus-sasl-1.5.27-r6.ebuild 2745
-MD5 04ab88578310e66a55032b38819541a1 cyrus-sasl-2.1.18-r2.ebuild 5427
-MD5 8914d9b1401d4f9d61c1d206f08a9957 cyrus-sasl-2.1.19-r1.ebuild 7160
-MD5 b61513de5e687711b55cba7fb5f33b7b cyrus-sasl-2.1.18.ebuild 4222
+MD5 9bb8e865ec9daca3bb753aab38ecc638 ChangeLog 18347
 MD5 fca787b36b2303a6d2e8b93aa4dfe018 cyrus-sasl-1.5.27-r5.ebuild 2672
-MD5 118563c3516cf8075300c454145fe383 cyrus-sasl-2.1.17.ebuild 4234
+MD5 0c36a223623cafbd54654c586cc4792e cyrus-sasl-1.5.27-r6.ebuild 2745
 MD5 7249a88df4e8bf01818b639cd5eddf5e cyrus-sasl-2.1.14.ebuild 3899
-MD5 3c9c7e794696a05423eee86cf0c833ef ChangeLog 18209
+MD5 7db01e4010eada66fa127b5d10731a0f cyrus-sasl-2.1.20.ebuild 7255
+MD5 118563c3516cf8075300c454145fe383 cyrus-sasl-2.1.17.ebuild 4234
+MD5 b61513de5e687711b55cba7fb5f33b7b cyrus-sasl-2.1.18.ebuild 4222
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 c74314b1f01dd31196a0ca19d9854e09 cyrus-sasl-2.1.20.ebuild 7284
+MD5 04ab88578310e66a55032b38819541a1 cyrus-sasl-2.1.18-r2.ebuild 5427
+MD5 8914d9b1401d4f9d61c1d206f08a9957 cyrus-sasl-2.1.19-r1.ebuild 7160
+MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
+MD5 a445d25ebbdf18b372340d4643736941 files/2.1.14-kerberos.patch 1148
+MD5 72c9252fd0ccb3fc369c60ec233f4218 files/2.1.14-mysql.patch 730
+MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242
 MD5 5d8f83e453b4f7dff5eeee74335de870 files/cyrus-sasl-1.5.24-rpath.patch 448
-MD5 4144a6962acfd7983cc292259375149d files/cyrus-sasl-2.1.20-configdir.patch 8231
-MD5 13c15e58d2fa734adeb718e4e3dea757 files/cyrus-sasl-2.1.18-db4.patch 1604
-MD5 fcf540108971d5aaa0bbfba381971ca7 files/digest-cyrus-sasl-2.1.18-r2 70
-MD5 d6d8b3c7c3a2aacf656f970a043d3158 files/digest-cyrus-sasl-2.1.19-r1 70
-MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.18-sasl-path-fix.patch 529
-MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r5 69
-MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r6 69
-MD5 fc0d11e115e65597419803dad9727aa8 files/saslauthd2.conf 752
-MD5 d6cb936d23646d9e5312d63d08f6f563 files/cyrus-sasl-2.1.18-pam_mysql.patch 1388
 MD5 5f96ab675ae2ff1da8e0ee4503340df5 files/cyrus-sasl-1.5.27-scram.patch 480
-MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242
-MD5 72c9252fd0ccb3fc369c60ec233f4218 files/2.1.14-mysql.patch 730
-MD5 a445d25ebbdf18b372340d4643736941 files/2.1.14-kerberos.patch 1148
+MD5 397ec1b24d4efe6efafa4782ba0f3493 files/cyrus-sasl-2.1.17-configdir.patch 8095
 MD5 b9ab0670db5b9b5a74de379c18e5370d files/cyrus-sasl-2.1.17-pgsql-include.patch 617
-MD5 52645b3330ddad9ce06f2a0eebb8d345 files/saslauthd-2.1.19.conf 906
-MD5 cb4a5c5160219818e04196847ba9f7a1 files/cyrus-sasl-2.1.17-db4.patch 1451
-MD5 7b24e99c21a5924543fe82cd82a1d741 files/saslauthd.pam 223
-MD5 c38995773eff23cf7f05b23fe7fba6d3 files/saslauthd.rc6 525
-MD5 4144a6962acfd7983cc292259375149d files/cyrus-sasl-2.1.19-configdir.patch 8231
-MD5 bc046561db59ed3f4d0cc417b099c2f9 files/java.README.gentoo 934
-MD5 228579b200f0a570f9c02d222f400672 files/cyrus-sasl-gcc32.patch 426
-MD5 ba1fb0a42418f5a5bcf2577fb27a136e files/pwcheck.rc6 540
-MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.19-sasl-path-fix.patch 529
-MD5 5d79108b7b67bd3af315e3142023fef5 files/saslauthd2.rc6 527
-MD5 a46ddb41677b9b08046d193d9db8a4bb files/saslauthd.conf 890
-MD5 9a317f7aa562936a829574f63aefce15 files/cyrus-sasl-saslauthd.patch 4938
-MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
+MD5 13c15e58d2fa734adeb718e4e3dea757 files/cyrus-sasl-2.1.18-db4.patch 1604
 MD5 75aaabf38cf470bae9a928a334c3cb59 files/cyrus-sasl-configdir.patch 8510
+MD5 228579b200f0a570f9c02d222f400672 files/cyrus-sasl-gcc32.patch 426
 MD5 692a355142b7cfb937cd8a3a655c0310 files/cyrus-sasl-heimdal-deps.patch 624
-MD5 397ec1b24d4efe6efafa4782ba0f3493 files/cyrus-sasl-2.1.17-configdir.patch 8095
-MD5 e8b9357dba2bde4dac0b1cf38d5942eb files/cyrus-sasl-2.1.18-cvs-1.172.patch 5056
+MD5 9a317f7aa562936a829574f63aefce15 files/cyrus-sasl-saslauthd.patch 4938
+MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r5 69
+MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r6 69
 MD5 6ba386a4eb5f9addf367d41093ba369e files/digest-cyrus-sasl-2.1.14 70
+MD5 bc046561db59ed3f4d0cc417b099c2f9 files/java.README.gentoo 934
 MD5 960ffd4d83e165ccaa68cf43937ff63d files/digest-cyrus-sasl-2.1.17 70
 MD5 fcf540108971d5aaa0bbfba381971ca7 files/digest-cyrus-sasl-2.1.18 70
+MD5 ba1fb0a42418f5a5bcf2577fb27a136e files/pwcheck.rc6 540
+MD5 a46ddb41677b9b08046d193d9db8a4bb files/saslauthd.conf 890
+MD5 7b24e99c21a5924543fe82cd82a1d741 files/saslauthd.pam 223
+MD5 c38995773eff23cf7f05b23fe7fba6d3 files/saslauthd.rc6 525
+MD5 fc0d11e115e65597419803dad9727aa8 files/saslauthd2.conf 752
+MD5 5d79108b7b67bd3af315e3142023fef5 files/saslauthd2.rc6 527
+MD5 cb4a5c5160219818e04196847ba9f7a1 files/cyrus-sasl-2.1.17-db4.patch 1451
+MD5 e8b9357dba2bde4dac0b1cf38d5942eb files/cyrus-sasl-2.1.18-cvs-1.172.patch 5056
+MD5 d6cb936d23646d9e5312d63d08f6f563 files/cyrus-sasl-2.1.18-pam_mysql.patch 1388
+MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.18-sasl-path-fix.patch 529
+MD5 fcf540108971d5aaa0bbfba381971ca7 files/digest-cyrus-sasl-2.1.18-r2 70
+MD5 4144a6962acfd7983cc292259375149d files/cyrus-sasl-2.1.19-configdir.patch 8231
+MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.19-sasl-path-fix.patch 529
 MD5 c355c365d74408c00cdaa25beea6d4f7 files/digest-cyrus-sasl-2.1.20 70
+MD5 52645b3330ddad9ce06f2a0eebb8d345 files/saslauthd-2.1.19.conf 906
+MD5 d6d8b3c7c3a2aacf656f970a043d3158 files/digest-cyrus-sasl-2.1.19-r1 70
+MD5 4144a6962acfd7983cc292259375149d files/cyrus-sasl-2.1.20-configdir.patch 8231
+MD5 f8ad054201be2531b337375299c4c39b files/cyrus-sasl-2.1.20-gcc4.patch 462
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBftcK5FrxP71izLARAj+LAJoDiF/+Rei1XvydUXzb4uO8/vR4QgCfT8bN
-aneEpBz9tMWkR1BP9WvO8/Y=
-=mExA
+iD8DBQFBgERwArHZZzCEUG0RAuGvAJ4g2LKGXukxl5w93Z7R6qZXk/G75QCeOBKM
+xn6gr6Kwd9wYARgaJhoXiyI=
+=HHPQ
 -----END PGP SIGNATURE-----
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;
+