diff options
| author |   Carsten Lohrke <carlo@gentoo.org> | 2004-09-07 14:19:14 +0000 |
|---|---|---|
| committer | Carsten Lohrke <carlo@gentoo.org> | 2004-09-07 14:19:14 +0000 |
| commit | 8a491999e959b61a0b9e9561b46a6c3201fb9bf5 (patch) | |
| tree | d251a33edc16d85013b37bd194c21189ba643144 /kde-base/kdebase | |
| parent | Initial import. Ebuild submitted by Jason Athey <damaged@charter.net>, closin... (diff) | |
| download | gentoo-2-8a491999e959b61a0b9e9561b46a6c3201fb9bf5.tar.gz gentoo-2-8a491999e959b61a0b9e9561b46a6c3201fb9bf5.tar.bz2 gentoo-2-8a491999e959b61a0b9e9561b46a6c3201fb9bf5.zip | |
proper sasl fix
Diffstat (limited to 'kde-base/kdebase')
| -rw-r--r-- | kde-base/kdebase/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdebase/files/3.3.0-sasl-fix.diff | 66 | ||||
| -rw-r--r-- | kde-base/kdebase/kdebase-3.3.0.ebuild | 4 |
3 files changed, 73 insertions, 3 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/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() { |