proper sasl fix

4 files changed, 110 insertions, 39 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index fa12fcf6dd59..7700107297c3 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.147 2004/08/30 15:45:01 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.148 2004/09/07 14:19:14 carlo Exp $
+
+  07 Sep 2004; Carsten Lohrke <carlo@gentoo.org> +files/3.3.0-sasl-fix.diff,
+  kdebase-3.3.0.ebuild:
+  proper sasl fix
 
   30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   kdebase-3.1.5.ebuild, kdebase-3.2.1.ebuild, kdebase-3.2.3.ebuild,
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 999a66d4c452..b4407efc7730 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,61 +1,62 @@
-MD5 943cff3f27f3fd884b92c4bfb4f57fe5 ChangeLog 26788
-MD5 76529aebe0f8884acc70558112902b72 kdebase-3.1.5.ebuild 3622
-MD5 212bf2c2a704a5229147c98aa5fa49eb kdebase-3.2.0.ebuild 3344
-MD5 a657208cf60c9c0c67eb71ca26ba93f4 kdebase-3.2.1.ebuild 3652
-MD5 1346582446d8d61097aaed2115b05adf kdebase-3.2.2.ebuild 3346
-MD5 aaabcfdcc4e3968d7cfa579b84cfb928 kdebase-3.2.3-r1.ebuild 3373
 MD5 63ab819291751f1f00af286aa8dcba4b kdebase-3.2.3.ebuild 3286
-MD5 01252f3085279be0e3dd434de73a619d kdebase-3.3.0.ebuild 3436
+MD5 aaabcfdcc4e3968d7cfa579b84cfb928 kdebase-3.2.3-r1.ebuild 3373
 MD5 46513a5bdd0b3a04b9d1016246abe95d kdebase-3.3.0_rc2.ebuild 3282
+MD5 212bf2c2a704a5229147c98aa5fa49eb kdebase-3.2.0.ebuild 3344
+MD5 1346582446d8d61097aaed2115b05adf kdebase-3.2.2.ebuild 3346
+MD5 af1c2ee4a2faa08043a71c9eb9bfb87e kdebase-3.3.0.ebuild 3425
+MD5 a657208cf60c9c0c67eb71ca26ba93f4 kdebase-3.2.1.ebuild 3652
+MD5 48329dca5840ec6e7830682f8d8ed78c ChangeLog 26905
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 e9930c666b8cf91e75350fdf4a5d6c58 files/3.3.0-kwinrules-Makefile.am.diff 839
+MD5 76529aebe0f8884acc70558112902b72 kdebase-3.1.5.ebuild 3622
+MD5 ffad4f0170b80acc01e931ea21d3d4d4 files/utils.h.diff 343
+MD5 9b4df4afee8c5f857c91799f415a4ab2 files/kdebase-3.1.5-amd64-accessviol.patch 836
+MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
+MD5 160f44a51f4308c9c21052fd21c7d04d files/kdebase-3.2.0-kcontrol.patch 699
+MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79
+MD5 daa284d6a1f62c5c73deb8aeda9df57d files/digest-kdebase-3.2.3-r1 68
 MD5 ca0fc4bf60b72dd1b8d42cb7e2be5a75 files/agent-shutdown.sh 204
-MD5 510d05672fcad238e92db44fbfa65f89 files/agent-startup.sh 209
+MD5 80c60219f104a6931f11f693c707c724 files/digest-kdebase-3.3.0_rc2 72
 MD5 17b088965016d9c796e570741837a2b3 files/detectwidget.cpp.diff 422
+MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379
+MD5 510d05672fcad238e92db44fbfa65f89 files/agent-startup.sh 209
 MD5 78ebd13a55a30a97f9a65da56b015a34 files/digest-kdebase-3.1.5 68
 MD5 c0cb6e59bf4bbd19caa7b9435f253ff3 files/digest-kdebase-3.2.0 68
 MD5 7b4a3c4a318e02c24c0ebacb4264bcdd files/digest-kdebase-3.2.1 68
 MD5 7a15aed698aee6f910a32b6fb7a1e8dd files/digest-kdebase-3.2.2 68
 MD5 daa284d6a1f62c5c73deb8aeda9df57d files/digest-kdebase-3.2.3 68
-MD5 daa284d6a1f62c5c73deb8aeda9df57d files/digest-kdebase-3.2.3-r1 68
 MD5 2c1b42d8cf9bd8799c241c21d0ab93ef files/digest-kdebase-3.3.0 68
-MD5 80c60219f104a6931f11f693c707c724 files/digest-kdebase-3.3.0_rc2 72
-MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379
-MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
-MD5 9b4df4afee8c5f857c91799f415a4ab2 files/kdebase-3.1.5-amd64-accessviol.patch 836
-MD5 160f44a51f4308c9c21052fd21c7d04d files/kdebase-3.2.0-kcontrol.patch 699
+MD5 7b19cedba543f3d94c0884ff3d921081 files/3.3.0-sasl-fix.diff 2419
 MD5 2eb15d4b93c483b634ea34475d91e79b files/kdebase-3.2.2-genkdmconf.c.diff 1082
-MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79
 MD5 a60fd1628607d4abdeb930662d126171 files/post-3.2.3-kdebase-htmlframes.patch 6728
-MD5 ffad4f0170b80acc01e931ea21d3d4d4 files/utils.h.diff 343
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.5/backgroundrc 342
+MD5 e9930c666b8cf91e75350fdf4a5d6c58 files/3.3.0-kwinrules-Makefile.am.diff 839
+MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.3.0_rc2/kdmrc 18202
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.0_rc2/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.0_rc2/Xsetup 758
+MD5 e0c938e08649001554fc8354fcd0e4e6 files/3.3.0_rc2/startkde-3.3.0_rc2-gentoo.diff 1504
 MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.5/kdmrc 17661
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.5/backgroundrc 342
 MD5 5074351f4d8a0b3870a60751f58aaa06 files/3.1.5/startkde-3.1.5-gentoo.diff 1878
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.0/Xsetup 758
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.0/backgroundrc 342
 MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.0/kdmrc 18202
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.0/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.0/Xsetup 758
 MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.0/startkde-3.2.0-gentoo.diff 1923
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.1/Xsetup 758
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.1/backgroundrc 342
 MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.1/kdmrc 18202
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.1/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.1/Xsetup 758
 MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.1/startkde-3.2.1-gentoo.diff 1923
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.2/Xsetup 758
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.2/backgroundrc 342
 MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.2/kdmrc 18202
 MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.2/startkde-3.2.2-gentoo.diff 1923
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.3/Xsetup 758
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.3/backgroundrc 342
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.2/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.2/Xsetup 758
 MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.3/kdmrc 18202
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.3/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.3/Xsetup 758
 MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.3/startkde-3.2.3-gentoo.diff 1923
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.3-r1/Xsetup 758
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.3-r1/backgroundrc 342
-MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.3-r1/kdmrc 18202
-MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.3-r1/startkde-3.2.3-r1-gentoo.diff 1923
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.0/Xsetup 758
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.0/backgroundrc 342
 MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.3.0/kdmrc 18202
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.0/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.0/Xsetup 758
 MD5 e0c938e08649001554fc8354fcd0e4e6 files/3.3.0/startkde-3.3.0-gentoo.diff 1504
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.0_rc2/Xsetup 758
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.0_rc2/backgroundrc 342
-MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.3.0_rc2/kdmrc 18202
-MD5 e0c938e08649001554fc8354fcd0e4e6 files/3.3.0_rc2/startkde-3.3.0_rc2-gentoo.diff 1504
+MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.3-r1/startkde-3.2.3-r1-gentoo.diff 1923
+MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.3-r1/kdmrc 18202
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.3-r1/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.3-r1/Xsetup 758
diff --git a/kde-base/kdebase/files/3.3.0-sasl-fix.diff b/kde-base/kdebase/files/3.3.0-sasl-fix.diff
new file mode 100644
index 000000000000..a52e6d7ae128
--- /dev/null
+++ b/kde-base/kdebase/files/3.3.0-sasl-fix.diff
@@ -0,0 +1,66 @@
+Use of tainted arguments in exec is deprecated at /var/www/cgi-bin/cvsweb.cgi line 2043.
+===================================================================
+RCS file: /home2/webcvs/mirror/kdebase/kioslave/ldap/configure.in.in,v
+retrieving revision 1.18
+retrieving revision 1.19
+diff -u -p -r1.18 -r1.19
+--- kioslave/ldap/configure.in.in	2004/02/12 20:14:04	1.18
++++ kioslave/ldap/configure.in.in	2004/08/29 14:50:59	1.19
+@@ -95,7 +95,7 @@ NOTFOUND) AC_MSG_RESULT(searched but not
+   ;;
+ esac
+ 
+-AC_CHECK_HEADERS(sasl.h)
++AC_CHECK_HEADERS(sasl/sasl.h sasl.h)
+ 
+ AC_SUBST(LDAP_INCS)
+ AC_SUBST(LDAP_LIBS)
+Use of tainted arguments in exec is deprecated at /var/www/cgi-bin/cvsweb.cgi line 2043.
+===================================================================
+RCS file: /home2/webcvs/mirror/kdebase/kioslave/ldap/kio_ldap.cpp,v
+retrieving revision 1.41
+retrieving revision 1.41.2.1
+diff -u -p -r1.41 -r1.41.2.1
+--- kioslave/ldap/kio_ldap.cpp	2004/07/03 21:48:18	1.41
++++ kioslave/ldap/kio_ldap.cpp	2004/08/29 14:55:42	1.41.2.1
+@@ -21,9 +21,13 @@
+ #include <kinstance.h>
+ #include <klocale.h>
+ 
++#ifdef HAVE_SASL_SASL_H //prefer libsasl2
++#include <sasl/sasl.h>
++#else
+ #ifdef HAVE_SASL_H
+ #include <sasl.h>
+ #endif
++#endif
+ #include <kabc/ldif.h>
+ 
+ #include "kio_ldap.h"
+@@ -506,7 +510,7 @@ typedef struct kldap_sasl_defaults_t {
+   QString authzid;
+ } kldap_sasl_defaults;
+ 
+-#ifdef HAVE_SASL_H
++#if defined HAVE_SASL_H || defined HAVE_SASL_SASL_H
+ static int kldap_sasl_interact( LDAP *, unsigned, void *defaults, void *in )
+ {
+   sasl_interact_t *interact = ( sasl_interact_t * ) in;
+@@ -644,7 +648,7 @@ void LDAPProtocol::openConnection()
+   while (!auth) {
+     if ( mAuthSASL ) {
+       kdDebug(7125) << "sasl_authentication mechanism:" << mechanism << endl;
+-#ifdef HAVE_SASL_H      
++#if defined HAVE_SASL_H || defined HAVE_SASL_SASL_H
+       defaults.realm = mRealm;
+       defaults.authcid = mUser;
+       defaults.passwd = mPassword;
+@@ -658,7 +662,7 @@ void LDAPProtocol::openConnection()
+     }
+     kdDebug(7125) << "user: " << mUser << " bindname: " << mBindName << endl;
+     if ( ( !mAuthSASL && mPassword.isEmpty() && !mBindName.isEmpty() ) || ( ret = ( 
+-#ifdef HAVE_SASL_H      
++#if defined HAVE_SASL_H || defined HAVE_SASL_SASL_H
+       mAuthSASL ? 
+         ldap_sasl_interactive_bind_s( mLDAP, NULL, mechanism.utf8(), 
+           NULL, NULL, LDAP_SASL_QUIET, &kldap_sasl_interact, &defaults ) :
diff --git a/kde-base/kdebase/kdebase-3.3.0.ebuild b/kde-base/kdebase/kdebase-3.3.0.ebuild
index 961be4ea6ab3..dd3463e4d7c7 100644
--- a/kde-base/kdebase/kdebase-3.3.0.ebuild
+++ b/kde-base/kdebase/kdebase-3.3.0.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/kde-base/kdebase/kdebase-3.3.0.ebuild,v 1.7 2004/08/30 15:45:01 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.0.ebuild,v 1.8 2004/09/07 14:19:14 carlo Exp $
 
 inherit kde-dist eutils
 
@@ -24,8 +24,8 @@ src_unpack() {
 	kde_src_unpack
 	epatch ${FILESDIR}/${PVR}/startkde-${PVR}-gentoo.diff
 	epatch ${FILESDIR}/3.3.0-kwinrules-Makefile.am.diff
+	epatch ${FILESDIR}/3.3.0-sasl-fix.diff
 	make -f admin/Makefile.common
-	sed -ie "s:sasl.h:sasl/sasl.h:" ${S}/configure
 }
 
 src_compile() {