Added an ldap patch so that the ldap modules for kcontrol now can handle binddn's and bindpasswords.

Added an ldap patch to x2goclient, so that an binddn and bindpw can be set at the config page.


svn path=/testing/; revision=229

20 files changed, 663 insertions, 11 deletions

diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 5b4386a..f7806ba 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -1,5 +1,6 @@
 AUX x2goclient-2.0.1-noldap.patch 1318 RMD160 92b102ffda472c618a923ca9d1c70ac8102b68a8 SHA1 5cf7c3b8ff20bf99b1f8953a2806b188556e6f69 SHA256 5a1aff6bc674a32d96fc72b9a6f0d2282e7ff1e42e6a4b1649a544ccc6c2b437
+AUX x2goclient-3.00.1-ldap.patch 5046 RMD160 90aa4e09c391fed6d7770ba73d2733c3cac3cdcf SHA1 0dc0e98d9d6d4af723799e6049d5afacedbacfbe SHA256 f381a333083d400d838515d6444322497c843039e852b96315bad7f56e8b02e7
 DIST x2goclient_3.00-1.tar.gz 664378 RMD160 89e4fd4838cd14299032bbee4d6fb0878c4ae513 SHA1 8cdb5fcc9d8c8384189dd6ed82eb0207c80d366b SHA256 95e8625e5b613082220d98c0b406b029f8420da92f83303b0040ed2f43498b45
-EBUILD x2goclient-3.00.1.ebuild 1485 RMD160 e1c7a57497b0e1b3cdc64059ff72e0a19ed17f10 SHA1 d8e8ee23eccb54587888f7da493890c89384a2b1 SHA256 076c698012ba5ac46ac5610c1f92d87f02e8d68c01df91e717115271434950bc
+EBUILD x2goclient-3.00.1.ebuild 1886 RMD160 c2232edd96e960abab09bbcfbbd6dcf565735f16 SHA1 7dd7ada7ea41c564a59c3f845f305481a83c98fc SHA256 07e0308bbdf0181641f45023b417641d7ebe1b3f6dbd549dd8919a4b56539dba
 MISC ChangeLog 611 RMD160 71e03804a047a5d4b10d0c3537f00f1c1517a755 SHA1 83462cdff8652547ee01f8398d16705a5ced517e SHA256 c25b6652f6e3bedf7772d124b2615b3d2b118abfb60688bab8d131e4425530b6
 MISC metadata.xml 211 RMD160 7569a339443bfffd41ebdb1db3683d6bbcd2fe5b SHA1 84050eff2270b3218cf8eb00363fe12ecdadfe2e SHA256 a6b5a5387c7e7f441d794c61edf1718caa3c58ffbf9b595ec536ff9617a7471f
diff --git a/net-misc/x2goclient/files/x2goclient-3.00.1-ldap.patch b/net-misc/x2goclient/files/x2goclient-3.00.1-ldap.patch
new file mode 100644
index 0000000..a5a0374
--- /dev/null
+++ b/net-misc/x2goclient/files/x2goclient-3.00.1-ldap.patch
@@ -0,0 +1,117 @@
+diff -u -x '*.kde*' -r x2goclient-3.00/configdialog.cpp x2goclient-3.00-mod/configdialog.cpp
+--- x2goclient-3.00/configdialog.cpp	2009-03-04 10:44:09.000000000 +0100
++++ x2goclient-3.00-mod/configdialog.cpp	2009-05-12 16:32:10.000000000 +0200
+@@ -61,7 +61,10 @@
+ 	ldapServer=new QLineEdit ( gb );
+ 	port=new QSpinBox ( gb );
+ 	ldapBase=new QLineEdit ( gb );
++        ldapBindDN=new QLineEdit ( gb );
++        ldapBindDNPw=new QLineEdit ( gb );
+ 	port->setMaximum ( 1000000 );
++        ldapBindDNPw->setEchoMode (QLineEdit::Password);
+ 
+ 	QHBoxLayout *grLay=new QHBoxLayout ( gb );
+ 
+@@ -77,6 +80,8 @@
+ 
+ 	laiLay->addWidget ( new QLabel ( tr ( "Server URL:" ),gb ) );
+ 	laiLay->addWidget ( new QLabel ( tr ( "BaseDN:" ),gb ) );
++        laiLay->addWidget ( new QLabel ( tr ("BindDN:" ),gb ) );
++        laiLay->addWidget ( new QLabel ( tr ("BindDN Password:" ),gb ) );
+ 	laiLay->addWidget ( new QLabel ( tr ( "Failover server 1 URL:" ),gb ) );
+ 	laiLay->addWidget ( new QLabel ( tr ( "Failover server 2 URL:" ),gb ) );
+ 
+@@ -112,6 +117,8 @@
+ 
+ 	setLay->addLayout ( aLay );
+ 	setLay->addWidget ( ldapBase );
++        setLay->addWidget ( ldapBindDN );
++        setLay->addWidget ( ldapBindDNPw );
+ 	setLay->addLayout ( aLay1 );
+ 	setLay->addLayout ( aLay2 );
+ 
+@@ -140,6 +147,12 @@
+ 	ldapBase->setText ( st.value ( "LDAP/basedn",
+ 	                               ( QVariant ) par->retLdapDn()
+ 	                             ).toString() );
++        ldapBindDN->setText ( st.value ( "LDAP/BindDN",
++                                         ( QVariant ) par->retLdapBindDN()
++                                       ).toString() );
++        ldapBindDNPw->setText ( st.value ( "LDAP/BindDNPw",
++                                         ( QVariant ) par->retLdapBindDNPw()
++                                       ).toString() );
+ 	gb->setEnabled ( useldap->isChecked() );
+ 	frLay->addWidget ( gb );
+ 	connect ( useldap,SIGNAL ( toggled ( bool ) ),gb,
+@@ -412,7 +425,14 @@
+ 		st.setValue ( "LDAP/server2", ( QVariant )
+ 		              ldapServer2->text() );
+ 	if ( ldapBase->text().length() )
+-		st.setValue ( "LDAP/basedn", ( QVariant ) ldapBase->text() );
++		st.setValue ( "LDAP/basedn", ( QVariant )
++                              ldapBase->text() );
++        if ( ldapBindDN->text().length() )
++                st.setValue ( "LDAP/BindDN", ( QVariant )
++                              ldapBindDN->text() );
++        if ( ldapBindDNPw->text().length() )
++                st.setValue ( "LDAP/BindDNPw",
++                              ldapBindDNPw->text() );
+ #endif //USELDAP
+ #ifdef WINDOWS
+ 
+diff -u -x '*.kde*' -r x2goclient-3.00/configdialog.h x2goclient-3.00-mod/configdialog.h
+--- x2goclient-3.00/configdialog.h	2009-03-04 10:34:51.000000000 +0100
++++ x2goclient-3.00-mod/configdialog.h	2009-05-12 15:11:36.000000000 +0200
+@@ -56,6 +56,8 @@
+ 		QLineEdit* ldapBase;
+ 		QLineEdit* ldapServer;
+ 		QSpinBox*  port;
++                QLineEdit* ldapBindDN;
++                QLineEdit* ldapBindDNPw;
+ 		QLineEdit* ldapServer1;
+ 		QSpinBox*  port1;
+ 		PrintWidget* pwid;
+diff -u -x '*.kde*' -r x2goclient-3.00/onmainwindow.cpp x2goclient-3.00-mod/onmainwindow.cpp
+--- x2goclient-3.00/onmainwindow.cpp	2009-03-10 16:07:50.000000000 +0100
++++ x2goclient-3.00-mod/onmainwindow.cpp	2009-05-12 15:59:22.000000000 +0200
+@@ -715,6 +715,10 @@
+ 		ldapPort=st1.value ( "LDAP/port", ( QVariant ) 389 ).toInt();
+ 		ldapDn=st1.value ( "LDAP/basedn",
+ 		                   ( QVariant ) QString::null ).toString();
++                ldapBindDN=st1.value ( "LDAP/BindDN",
++                                       ( QVariant ) QString::null ).toString();
++                ldapBindDNPw=st1.value ( "LDAP/BindDNPw",
++                                         ( QVariant ) QString::null ).toString();
+ 		ldapServer1=st1.value ( "LDAP/server1",
+ 		                        ( QVariant ) QString::null ).toString();
+ 		ldapPort1=st1.value ( "LDAP/port1",
+@@ -1489,7 +1493,7 @@
+ 	try
+ 	{
+ 		ld=new LDAPSession ( ldapServer.toStdString(),
+-		                     ldapPort,"","",true,false );
++		                     ldapPort,ldapBindDN.toStdString(),ldapBindDNPw.toStdString(),true,false );
+ 	}
+ 	catch ( LDAPExeption e )
+ 	{
+diff -u -x '*.kde*' -r x2goclient-3.00/onmainwindow.h x2goclient-3.00-mod/onmainwindow.h
+--- x2goclient-3.00/onmainwindow.h	2009-03-04 12:08:50.000000000 +0100
++++ x2goclient-3.00-mod/onmainwindow.h	2009-05-12 15:56:07.000000000 +0200
+@@ -151,6 +151,8 @@
+ 		QString retLdapServer() {return ldapServer;}
+ 		int retLdapPort() {return ldapPort;}
+ 		QString retLdapDn() {return ldapDn;}
++                QString retLdapBindDN() {return ldapBindDN; }
++                QString retLdapBindDNPw() {return ldapBindDNPw; }
+ 		QString retLdapServer1() {return ldapServer1;}
+ 		int retLdapPort1() {return ldapPort1;}
+ 		QString retLdapServer2() {return ldapServer2;}
+@@ -350,6 +352,8 @@
+ 
+ 		QString ldapServer;
+ 		int ldapPort;
++                QString ldapBindDN;
++                QString ldapBindDNPw;
+ 		QString ldapServer1;
+ 		int ldapPort1;
+ 		QString ldapServer2;
\ No newline at end of file
diff --git a/net-misc/x2goclient/x2goclient-3.00.1.ebuild b/net-misc/x2goclient/x2goclient-3.00.1.ebuild
index f2bc658..6d594ae 100644
--- a/net-misc/x2goclient/x2goclient-3.00.1.ebuild
+++ b/net-misc/x2goclient/x2goclient-3.00.1.ebuild
@@ -19,13 +19,19 @@ IUSE="ldap"
 DEPEND="net-misc/nx
 	|| ( ( x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-svg:4 )
 		>=x11-libs/qt-4.3:4 )
-	ldap? ( net-nds/openldap )"
+	ldap? ( net-nds/openldap )
+	net-print/cups"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PN}-${MAJOR_PV}
 
 src_prepare() {
-	use ldap ||	epatch "${FILESDIR}"/${PN}-2.0.1-noldap.patch
+	if use ldap ; then
+		epatch "${FILESDIR}"/${PN}-3.00.1-ldap.patch
+	else
+		epatch "${FILESDIR}"/${PN}-2.0.1-noldap.patch
+	fi
+#	use ldap || epatch "${FILESDIR}"/${PN}-2.0.1-noldap.patch
 }
 
 src_compile() {
@@ -53,3 +59,13 @@ src_install() {
 
 	make_desktop_entry /usr/bin/${PN} ${PN} x2goclient/128x128/${PN}.png "Network"
 }
+
+pkg_postinst(){
+	if use ldap; then
+		elog "You can now specify an binddn and a"
+		elog "password which is used to login at the ldap server."
+		elog "But the password is stored in plaintext at the config file"
+		elog "at your homedirectory!!"
+		elog ""
+	fi
+}
diff --git a/net-misc/x2gogroupadministration/Manifest b/net-misc/x2gogroupadministration/Manifest
index ec306c4..99852f5 100644
--- a/net-misc/x2gogroupadministration/Manifest
+++ b/net-misc/x2gogroupadministration/Manifest
@@ -1,3 +1,6 @@
+AUX x2gogroupadministration-2.0.1.4-ldap.patch 2561 RMD160 542028ba72535c014257ca83e58d9f1fa9c69b33 SHA1 45112caaa9c950ea49232ecc8245a928ce555c52 SHA256 ebed6b9ee5e54f7b4c040a32cf95d5ec9389e9b8a73c7a381bae5d6f46dea6b4
 DIST x2gogroupadministration_2.0.1-3.diff.gz 37168 RMD160 2e00aa614743d4a0ce8d0a3a0decb99d69f1f566 SHA1 062b5aa0cedb33fb371a9a574c3d88c315aff042 SHA256 8e000da0264422e0c8eddf55db627988e8475d266d5a614581eb62652fa44448
+DIST x2gogroupadministration_2.0.1-4.tar.gz 910465 RMD160 c7d3f957e4d0d7f97d31e16fc88e8564282238ef SHA1 5848b73c9573babf8e63cd537151b9d19c1e8df3 SHA256 4f5680ca9ffe12d253937ad9b92c261184c93fd482544d3c30b3ee331e469580
 DIST x2gogroupadministration_2.0.1.orig.tar.gz 1351462 RMD160 74b9bb68829db33bdf6a8e9ac03ed15b1d5a8067 SHA1 189b5226636395db6e2769acaba492f922b63dbc SHA256 657f0eb0fd391f35b8b4449b62f9f65a5d21396422c0827c0f8ce2a306a2ecdd
 EBUILD x2gogroupadministration-2.0.1.3.ebuild 678 RMD160 c3f0cb7940703644a8c76e6ad2cae90a005e9809 SHA1 e90360afc8ae906ad4d1ef9d71bb23c8337ab3b0 SHA256 fea973384bfb53b0147dd52c27990aca596b19a5a021039723653da6eca03be9
+EBUILD x2gogroupadministration-2.0.1.4.ebuild 1274 RMD160 a37cdc390e550aeab83192ced875426cc714e4fb SHA1 ea78f7e2c05a3dcf7b11e8d161ab88c9ef1c9647 SHA256 ebc27467c95316c541d51fc1a3b6b612c87c1937ef1e60589d3283d17ce108bb
diff --git a/net-misc/x2gogroupadministration/files/x2gogroupadministration-2.0.1.4-ldap.patch b/net-misc/x2gogroupadministration/files/x2gogroupadministration-2.0.1.4-ldap.patch
new file mode 100644
index 0000000..3aff271
--- /dev/null
+++ b/net-misc/x2gogroupadministration/files/x2gogroupadministration-2.0.1.4-ldap.patch
@@ -0,0 +1,65 @@
+diff -u -x '*.kde*' -r x2gogroupadministration-2.0.1/src/x2gogroupadministration.cpp x2gogroupadministration-2.0.1-mod/src/x2gogroupadministration.cpp
+--- x2gogroupadministration-2.0.1/src/x2gogroupadministration.cpp	2009-02-09 14:39:30.000000000 +0100
++++ x2gogroupadministration-2.0.1-mod/src/x2gogroupadministration.cpp	2009-05-12 19:10:45.000000000 +0200
+@@ -88,6 +88,8 @@
+         QTextStream stream( &file );
+         uri = stream.readLine();
+         base = stream.readLine();
++        bindDN = stream.readLine();
++        bindDNPw = stream.readLine();
+         file.close();
+     }
+     else
+@@ -101,6 +103,10 @@
+     base=lst[1];
+     lst=lst.split("//",uri);    
+     uri=lst[1];
++    lst=lst.split("\"",bindDN);
++    bindDN=lst[1];
++    lst=lst.split("\"",bindDNPw);
++    bindDNPw=lst[1];
+     kdDebug()<<"base: "<<base<<" uri: "<<uri<<endl;
+     QVBoxLayout* lay=new QVBoxLayout(this);
+     QFrame* mainFrame=new QFrame(this);
+@@ -243,17 +249,17 @@
+     mainLay->addWidget(gbGroupInfo);
+     mainLay->setSpacing(10);
+     mainLay->setMargin(7);
+-    QString passfile="/etc/libnss-ldap.secret";
+-    QFile file1(passfile);
+-    QCString tpass;
+-    if (file1.open(IO_ReadOnly))
+-    {
+-        QTextStream in(&file1);
+-        in>>tpass;
+-        file1.close();
+-    }
++//     QString passfile="/etc/libnss-ldap.secret";
++//     QFile file1(passfile);
++//     QCString tpass;
++//     if (file1.open(IO_ReadOnly))
++//     {
++//         QTextStream in(&file1);
++//         in>>tpass;
++//         file1.close();
++//     }
+     kdDebug()<<"Init ldap"<<endl;
+-    ld=new LDAPSession(uri,389,"cn=ldapadmin,"+base,tpass.data(),false,true);
++    ld=new LDAPSession(uri,389,(const char*)bindDN,(const char*)bindDNPw,true,false);
+     kdDebug()<<"ok"<<endl;
+     gbGroupInfo->setEnabled(false);
+     connect(lvUsers,SIGNAL(expanded(QListViewItem*)),
+Nur in x2gogroupadministration-2.0.1-mod/src: x2gogroupadministration.cpp~.
+diff -u -x '*.kde*' -r x2gogroupadministration-2.0.1/src/x2gogroupadministration.h x2gogroupadministration-2.0.1-mod/src/x2gogroupadministration.h
+--- x2gogroupadministration-2.0.1/src/x2gogroupadministration.h	2009-02-09 14:39:30.000000000 +0100
++++ x2gogroupadministration-2.0.1-mod/src/x2gogroupadministration.h	2009-05-12 19:09:08.000000000 +0200
+@@ -59,6 +59,8 @@
+     KListView* lvUsers;
+     QString base;
+     QString uri;
++    QString bindDN;
++    QString bindDNPw;
+     KLineEdit* leName;
+     KLineEdit* leDescription;
+     KListBox* lbNativeUsers;
+Nur in x2gogroupadministration-2.0.1-mod/src: x2gogroupadministration.h~.
diff --git a/net-misc/x2gogroupadministration/x2gogroupadministration-2.0.1.4.ebuild b/net-misc/x2gogroupadministration/x2gogroupadministration-2.0.1.4.ebuild
new file mode 100644
index 0000000..2af9e2a
--- /dev/null
+++ b/net-misc/x2gogroupadministration/x2gogroupadministration-2.0.1.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit kde versionator
+
+MAJOR_PV="$(get_version_component_range 1-3)"
+FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
+DESCRIPTION="The X2Go KControl group administration module"
+HOMEPAGE="http://x2go.berlios.de"
+#SRC_URI="http://x2go.obviously-nice.de/deb/pool/${PN}/${PN}_${MAJOR_PV}.orig.tar.gz http://x2go.obviously-nice.de/deb/pool/${PN}/${PN}_${FULL_PV}.diff.gz"
+SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+need-kde 3
+
+S=${WORKDIR}/${PN}-${MAJOR_PV}
+
+src_unpack(){
+	unpack ${A}
+        epatch "${FILESDIR}"/${PN}-2.0.1.4-ldap.patch
+#	epatch "${DISTDIR}/${PN}_${FULL_PV}.diff.gz"
+}
+
+pkg_postinst(){
+        elog "The gentoo x2go ebuilds now need a different"
+        elog "  /etc/x2go/x2goldaptools.conf from the original one."
+        elog "You must add:"
+        elog "    bindn=\"cn=yourldap,ou=bind,c=dn\""
+        elog "    binddnpw=\"yourbindpassword\""
+        elog "The quotes must be normal quotes and the lines must be added at the end!"
+        elog "Make sure you secure the file by good permissions like 0600 and owner root!"
+
+}
diff --git a/net-misc/x2gohostadministration/Manifest b/net-misc/x2gohostadministration/Manifest
index 3fa16f1..a8601af 100644
--- a/net-misc/x2gohostadministration/Manifest
+++ b/net-misc/x2gohostadministration/Manifest
@@ -1,3 +1,3 @@
-DIST x2gohostadministration_2.0.1-4.diff.gz 35134 RMD160 9fc20515a0ed29e529a78c8b8087c7e7d5fc7885 SHA1 1ef85230cda9a048e299dae9927c1eb92cf2d565 SHA256 5f6db3a28d499f03c8383cb4193907a2e40b85d042ff64c3720c8f75c792c789
-DIST x2gohostadministration_2.0.1.orig.tar.gz 1037075 RMD160 b27f31cc51defcca4769de0e245c053bc0bf725b SHA1 dda2c4712dcb557dd2e520154be0bd0f32306ed8 SHA256 e30305563181690b731011412fffa9ef44bd2e68be9ccc7c92be954fcc19b2ab
-EBUILD x2gohostadministration-2.0.1.4.ebuild 689 RMD160 2dced04cbef36db19aec472b15d1842cd95ad237 SHA1 30e0ec1234f0b33d85e5b3f8ad2f7a8bac03d0d0 SHA256 d4aaaa62c90d294f6652a2379c0d1e31a56b136432bcd193bf4b1aba06bf8e96
+AUX x2gohostadministration-2.0.1.4-ldap.patch 2688 RMD160 77342b4092333907f104d7352bad7bfd3693b2fb SHA1 0eafb6e8c86b608316e81d9e50dc55bdb972c5a9 SHA256 91d91f77a911e8a1923506b6ae17f2e7f5d07f8944c6391421c53426d4374aef
+DIST x2gohostadministration_2.0.1-4.tar.gz 1263844 RMD160 d0341669e48f7a7ebdf94858b88473ca3c12a2db SHA1 125b7571d64abff12c266d936ee85f7bfaf58023 SHA256 2ea4aee7163ec7d9e244cc94b5878a163954ee6c4d40c09627a54579be752891
+EBUILD x2gohostadministration-2.0.1.4.ebuild 1233 RMD160 f3becd913b9dafc23fb72f47a10ccde0558541b5 SHA1 ea09f3e2218d2c069acd7c661b92d4f0e0a47670 SHA256 877b62823eb855d60d5d5bd11f4cf0e1ebee4a080a4008d3684782c93249f9ef
diff --git a/net-misc/x2gohostadministration/files/x2gohostadministration-2.0.1.4-ldap.patch b/net-misc/x2gohostadministration/files/x2gohostadministration-2.0.1.4-ldap.patch
new file mode 100644
index 0000000..a388c5c
--- /dev/null
+++ b/net-misc/x2gohostadministration/files/x2gohostadministration-2.0.1.4-ldap.patch
@@ -0,0 +1,74 @@
+diff -u -x '*.kde*' -r x2gohostadministration-2.0.1/src/x2gohostadministration.cpp x2gohostadministration-2.0.1-mod/src/x2gohostadministration.cpp
+--- x2gohostadministration-2.0.1/src/x2gohostadministration.cpp	2009-02-09 14:39:18.000000000 +0100
++++ x2gohostadministration-2.0.1-mod/src/x2gohostadministration.cpp	2009-05-12 18:47:16.000000000 +0200
+@@ -86,6 +86,8 @@
+         QTextStream stream( &file );
+         uri = stream.readLine();
+         base = stream.readLine();
++        bindDN = stream.readLine();
++        bindDNPw = stream.readLine();
+         file.close();
+     }
+     else
+@@ -99,6 +101,10 @@
+     base=lst[1];
+     lst=lst.split("//",uri);    
+     uri=lst[1];
++    lst=lst.split("\"", bindDN);
++    bindDN=lst[1];
++    lst=lst.split("\"", bindDNPw);
++    bindDNPw=lst[1];
+     kdDebug()<<base<<" --- "<<uri<<endl;
+     QVBoxLayout* lay=new QVBoxLayout(this);
+     QFrame* mainFrame=new QFrame(this);
+@@ -241,21 +247,21 @@
+     }
+     else
+     {
+-        QString passfile="/etc/libnss-ldap.secret";
+-        QFile file1(passfile);
+-        QCString tpass;
+-        if (file1.open(IO_ReadOnly))
+-        {
+-            QTextStream in(&file1);
+-            in>>tpass;
+-            file1.close();
+-            ld=new LDAPSession(uri,389,"cn=ldapadmin,"+base,tpass.data(),false,true);
+-        }
+-        else
+-        {
+-            KMessageBox::error( 0, i18n("Can't open file ")+"/etc/libnss-ldap.secret");
+-            exit (-1);
+-        }
++//         QString passfile="/etc/libnss-ldap.secret";
++//         QFile file1(passfile);
++//         QCString tpass;
++//         if (file1.open(IO_ReadOnly))
++//         {
++//             QTextStream in(&file1);
++//             in>>tpass;
++//             file1.close();
++       ld=new LDAPSession(uri,389,(const char*)bindDN,(const char*)bindDNPw,true,false);
++//         }
++//         else
++//         {
++//             KMessageBox::error( 0, i18n("Can't open file ")+"/etc/libnss-ldap.secret");
++//             exit (-1);
++//         }
+     }
+ 
+ 
+Nur in x2gohostadministration-2.0.1-mod/src: x2gohostadministration.cpp~.
+diff -u -x '*.kde*' -r x2gohostadministration-2.0.1/src/x2gohostadministration.h x2gohostadministration-2.0.1-mod/src/x2gohostadministration.h
+--- x2gohostadministration-2.0.1/src/x2gohostadministration.h	2009-02-09 14:39:18.000000000 +0100
++++ x2gohostadministration-2.0.1-mod/src/x2gohostadministration.h	2009-05-12 18:44:12.000000000 +0200
+@@ -71,6 +71,8 @@
+     bool isChanged;
+     QString base;
+     QString uri;
++    QString bindDN;
++    QString bindDNPw;
+ private:
+     void loadList();
+     void loadHost(QString name);
+Nur in x2gohostadministration-2.0.1-mod/src: x2gohostadministration.h~.
diff --git a/net-misc/x2gohostadministration/x2gohostadministration-2.0.1.4.ebuild b/net-misc/x2gohostadministration/x2gohostadministration-2.0.1.4.ebuild
index cd9b46b..61e5d86 100644
--- a/net-misc/x2gohostadministration/x2gohostadministration-2.0.1.4.ebuild
+++ b/net-misc/x2gohostadministration/x2gohostadministration-2.0.1.4.ebuild
@@ -6,9 +6,10 @@ inherit kde versionator
 
 MAJOR_PV="$(get_version_component_range 1-3)"
 FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
-DESCRIPTION="The X2Go KControl host administration module"
+DESCRIPTION="The X2Go KControl group administration module"
 HOMEPAGE="http://x2go.berlios.de"
-SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${MAJOR_PV}.orig.tar.gz http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}.diff.gz"
+#SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${MAJOR_PV}.orig.tar.gz http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}.diff.gz"
+SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,9 +18,20 @@ IUSE=""
 
 need-kde 3
 
-S=${WORKDIR}/${PN}-${MAJOR_PV}.orig
+S=${WORKDIR}/${PN}-${MAJOR_PV}
 
 src_unpack(){
 	unpack ${A}
-	epatch "${DISTDIR}/${PN}_${FULL_PV}.diff.gz"
+	epatch "${FILESDIR}"/${PN}-2.0.1.4-ldap.patch	
+}
+
+pkg_postinst(){
+        elog "The gentoo x2go ebuilds now need a different"
+        elog "  /etc/x2go/x2goldaptools.conf from the original one."
+        elog "You must add:"
+        elog "    bindn=\"cn=yourldap,ou=bind,c=dn\""
+        elog "    binddnpw=\"yourbindpassword\""
+        elog "The quotes must be normal quotes and the lines must be added at the end!"
+        elog "Make sure you secure the file by good permissions like 0600 and owner root!"
+
 }
diff --git a/net-misc/x2goldaptools/Manifest b/net-misc/x2goldaptools/Manifest
index 2767978..5ba24f4 100644
--- a/net-misc/x2goldaptools/Manifest
+++ b/net-misc/x2goldaptools/Manifest
@@ -1,2 +1,2 @@
 DIST x2goldaptools_2.0.1-8_all.deb 17658 RMD160 79d1b7cd0925ec55ab9e6e5734a3dc8bf0fcb26e SHA1 1612f09c8ebcb71263c5b9f0ee344d971ef02401 SHA256 d4b2c11779e761692dd040f641d57edcc15be60f40b73507f684f138f86f8240
-EBUILD x2goldaptools-2.0.1.8.ebuild 1392 RMD160 4461e7aaec4f77ff85567cc7515b884a589d249e SHA1 dc5c6ad942d6667c982fdd3cebb71a94d51c4282 SHA256 937d392cd7bdb34b73fd753eda6ece11c66008d1b555e34445b0418cd82f7037
+EBUILD x2goldaptools-2.0.1.8.ebuild 1666 RMD160 4240b6f4a272440e37c96595831ade98b602d2ab SHA1 bd2a598ef99828dcff562a468c069ab58d186e13 SHA256 8e83b42baec505266c3aa2dfcb6045286b9d418d7e86fc9a7660b47016037fd3
diff --git a/net-misc/x2goldaptools/x2goldaptools-2.0.1.8.ebuild b/net-misc/x2goldaptools/x2goldaptools-2.0.1.8.ebuild
index 8cb6226..2c71b0d 100644
--- a/net-misc/x2goldaptools/x2goldaptools-2.0.1.8.ebuild
+++ b/net-misc/x2goldaptools/x2goldaptools-2.0.1.8.ebuild
@@ -55,4 +55,11 @@ pkg_postinst() {
 	elog ""
 	elog "Use initsystem to create database"
 	elog "  /usr/share/x2goldaptools/script/initsystem"
+	elog ""
+	elog "To use the X2Go-Kcontrolmodules, append to"
+	elog "  /etc/x2go/x2goldaptools.conf"
+	elog "the lines (order and quotes are important!)"
+	elog "  binddn=\"cn=your,o=bind,c=dn\""
+	elog "  binddnpw=\"yourbindpassword\""
+	elog "and make sure you secure the file"
 }
diff --git a/net-misc/x2gosessionadministration/Manifest b/net-misc/x2gosessionadministration/Manifest
new file mode 100644
index 0000000..64cc2da
--- /dev/null
+++ b/net-misc/x2gosessionadministration/Manifest
@@ -0,0 +1,3 @@
+AUX x2gosessionadministration-ldap.patch 2589 RMD160 b2c1b23ff11c4064025fd77bb452eefb273d6964 SHA1 109ad9efc12777b0d8d3d0029660794a20db2be5 SHA256 c641bcbed5a65f09e1ee8892cc8822ad80b049f7f9c596656f52af412a046b63
+DIST x2gosessionadministration_2.0.1-10.tar.gz 620356 RMD160 4263443f2e8ba5c5bb06a1b03622bb0ed55880cf SHA1 c59c038a139d529fdd136d7548ec6ebcbcd41d68 SHA256 89acd914592a3e3203b30cbdefae52f718df91acf6e1fcd57572731b565bde4b
+EBUILD x2gosessionadministration-2.0.1.10.ebuild 1324 RMD160 3915abdad02e26d438f6202122936697b2c386c0 SHA1 a09aaf6172b3b43cb724baa1cee58c1e6854adec SHA256 828fa639d96cb0a5be12dc68677d1a216a5a337e3a6528de95f9b022a6f440bb
diff --git a/net-misc/x2gosessionadministration/files/x2gosessionadministration-ldap.patch b/net-misc/x2gosessionadministration/files/x2gosessionadministration-ldap.patch
new file mode 100644
index 0000000..c0adb02
--- /dev/null
+++ b/net-misc/x2gosessionadministration/files/x2gosessionadministration-ldap.patch
@@ -0,0 +1,66 @@
+diff -u -x '*.kde*' -r x2gosessionadministration-2.0.1/src/x2gosessionadministration.cpp x2gosessionadministration-2.0.1-mod/src/x2gosessionadministration.cpp
+--- x2gosessionadministration-2.0.1/src/x2gosessionadministration.cpp	2009-02-09 14:39:18.000000000 +0100
++++ x2gosessionadministration-2.0.1-mod/src/x2gosessionadministration.cpp	2009-05-12 18:23:57.000000000 +0200
+@@ -118,12 +118,18 @@
+          QTextStream stream(&file);
+          uri = stream.readLine();
+          base = stream.readLine();
++         bindDN = stream.readLine();
++         bindDNPw = stream.readLine();
+ 
+          file.close();
+          useLDAP=true;
+          QStringList lst;
+          lst=lst.split("\"",base);
+          base=lst[1];
++         lst=lst.split("\"",bindDN);
++         bindDN=lst[1];
++         lst=lst.split("\"",bindDNPw);
++         bindDNPw=lst[1];
+          lst=lst.split("//",uri);
+          uri=lst[1];
+       }
+@@ -314,18 +320,18 @@
+       {
+          if (useLDAP)
+             {
+-               QString passfile="/etc/libnss-ldap.secret";
+-               QFile file(passfile);
+-               QCString tpass;
++//                QString passfile="/etc/x2go/x2goldaptools.conf";
++//                QFile file(passfile);
++//                QCString tpass;
++
++//                if (file.open(IO_ReadOnly))
++//                   {
++//                      QTextStream in(&file);
++//                      in>>tpass;
++//                      file.close();
++//                   }
+ 
+-               if (file.open(IO_ReadOnly))
+-                  {
+-                     QTextStream in(&file);
+-                     in>>tpass;
+-                     file.close();
+-                  }
+-
+-               ld=new LDAPSession(uri,389,"cn=ldapadmin,"+base,tpass.data(),false,true);
++               ld=new LDAPSession(uri,389,(const char*)bindDN,(const char*)bindDNPw,true,false);
+             }
+       }
+ 
+Nur in x2gosessionadministration-2.0.1-mod/src: x2gosessionadministration.cpp~.
+diff -u -x '*.kde*' -r x2gosessionadministration-2.0.1/src/x2gosessionadministration.h x2gosessionadministration-2.0.1-mod/src/x2gosessionadministration.h
+--- x2gosessionadministration-2.0.1/src/x2gosessionadministration.h	2009-02-09 14:39:18.000000000 +0100
++++ x2gosessionadministration-2.0.1-mod/src/x2gosessionadministration.h	2009-05-12 18:00:58.000000000 +0200
+@@ -114,6 +114,8 @@
+ 
+     QString base;
+     QString uri;
++    QString bindDN;
++    QString bindDNPw;
+     QString sServer;
+     QString sClient;
+     QString sUname;
+Nur in x2gosessionadministration-2.0.1-mod/src: x2gosessionadministration.h~.
diff --git a/net-misc/x2gosessionadministration/x2gosessionadministration-2.0.1.10.ebuild b/net-misc/x2gosessionadministration/x2gosessionadministration-2.0.1.10.ebuild
new file mode 100644
index 0000000..800eefd
--- /dev/null
+++ b/net-misc/x2gosessionadministration/x2gosessionadministration-2.0.1.10.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2gosessionadministration/x2gosessionadministration-2.0.1.10.ebuild,v 1.1 2009/03/13 12:36:19 voyageur Exp $
+
+EAPI="2"
+inherit kde versionator
+
+MAJOR_PV="$(get_version_component_range 1-3)"
+FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
+DESCRIPTION="The X2Go session administration (kcontrol module)"
+HOMEPAGE="http://x2go.berlios.de"
+SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-nds/openldap
+	arts? ( kde-base/arts )"
+RDEPEND=${DEPEND}
+need-kde 3
+
+S=${WORKDIR}/${PN}-${MAJOR_PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-ldap.patch
+}
+
+src_configure(){
+	myconf="${myconf} $(use_with arts)"
+}
+
+pkg_postinst(){
+        elog "The gentoo x2go ebuilds now need a different"
+        elog "  /etc/x2go/x2goldaptools.conf from the original one."
+        elog "You must add:"
+        elog "    bindn=\"cn=yourldap,ou=bind,c=dn\""
+        elog "    binddnpw=\"yourbindpassword\""
+        elog "The quotes must be normal quotes and the lines must be added at the end!"
+        elog "Make sure you secure the file by good permissions like 0600 and owner root!"
+
+}
diff --git a/net-misc/x2gosystemadministration/Manifest b/net-misc/x2gosystemadministration/Manifest
index 5e63ec2..61d132c 100644
--- a/net-misc/x2gosystemadministration/Manifest
+++ b/net-misc/x2gosystemadministration/Manifest
@@ -1,2 +1,5 @@
+AUX x2gosystemadministration-2.0.1.5-ldap.patch 2286 RMD160 7e1d13e86733133f1379ef86db9b600947216368 SHA1 089425cbb907d30570d3aac27e4da1b28ad07f7c SHA256 32040aea596be25d75d7e1b7a9b47a9d6f20efa2c75dd037117ca848fea51b94
 DIST x2gosystemadministration_2.0.1-4.tar.gz 605653 RMD160 23c00a91e91dac1f19db8026f2b204a6fa9857b9 SHA1 5065beaca96ca9f5ab7cd1005c3318f7b6af2ccd SHA256 39367cfe0a8b74d5416a368c432a006ee384a526b94944cac7190be2d800ce94
+DIST x2gosystemadministration_2.0.1-5.tar.gz 606734 RMD160 61f2696bda8dc9c0e21a03e9e1e2d5700470c4f7 SHA1 4098ec468ec82b7fa042b2d6926e37176d6ec8d0 SHA256 e927107513483413110118f8230f4f54107fa3e8535dd89b7f5e03961d810413
 EBUILD x2gosystemadministration-2.0.1.4.ebuild 528 RMD160 49a205bffafdc53d24c631432ae56e09c4d721e3 SHA1 d189c4b86717f80af72570b387f622245838f269 SHA256 68c6ebd2a7db83b60b0eb14bf78818a9c545edaeb9dc64b27ea56a8773121b96
+EBUILD x2gosystemadministration-2.0.1.5.ebuild 1078 RMD160 29a7239b04d194b0e078cd8fe7428083ea79c131 SHA1 eb617478c97a58fdaa61e4ce540791a4c68ac494 SHA256 5e1c0c504a028627a18bde80cad180fd903bb40194d4507e5cfa0616d395866e
diff --git a/net-misc/x2gosystemadministration/files/x2gosystemadministration-2.0.1.5-ldap.patch b/net-misc/x2gosystemadministration/files/x2gosystemadministration-2.0.1.5-ldap.patch
new file mode 100644
index 0000000..9c1f645
--- /dev/null
+++ b/net-misc/x2gosystemadministration/files/x2gosystemadministration-2.0.1.5-ldap.patch
@@ -0,0 +1,64 @@
+diff -u -x '*.kde*' -r x2gosystemadministration-2.0.1/src/x2gosystemadministration.cpp x2gosystemadministration-2.0.1-mod/src/x2gosystemadministration.cpp
+--- x2gosystemadministration-2.0.1/src/x2gosystemadministration.cpp	2009-02-09 14:39:39.000000000 +0100
++++ x2gosystemadministration-2.0.1-mod/src/x2gosystemadministration.cpp	2009-05-12 19:01:36.000000000 +0200
+@@ -108,6 +108,8 @@
+ 		QTextStream stream ( &file );
+ 		uri = stream.readLine();
+ 		base = stream.readLine();
++                bindDN = stream.readLine();
++                bindDNPw = stream.readLine();
+ 		file.close();
+ 	}
+ 	else
+@@ -120,6 +122,10 @@
+ 	base=lst[1];
+ 	lst=lst.split ( "//",uri );
+ 	uri=lst[1];
++        lst=lst.split("\"", bindDN);
++        bindDN=lst[1];
++        lst=lst.split("\"",bindDNPw);
++        bindDNPw=lst[1];
+ 
+ 	QVBoxLayout* lay=new QVBoxLayout ( this );
+ 	QFrame* mainFrame=new QFrame ( this );
+@@ -300,16 +306,16 @@
+ 	}
+ 	else
+ 	{
+-		QString passfile="/etc/libnss-ldap.secret";
+-		QFile file ( passfile );
+-		QCString tpass;
+-		if ( file.open ( IO_ReadOnly ) )
+-		{
+-			QTextStream in ( &file );
+-			in>>tpass;
+-			file.close();
+-		}
+-		ld=new LDAPSession ( uri,389,"cn=ldapadmin,"+base,tpass.data(),false,true );
++// 		QString passfile="/etc/libnss-ldap.secret";
++// 		QFile file ( passfile );
++// 		QCString tpass;
++// 		if ( file.open ( IO_ReadOnly ) )
++// 		{
++// 			QTextStream in ( &file );
++// 			in>>tpass;
++// 			file.close();
++// 		}
++		ld=new LDAPSession ( uri,389,(const char*)bindDN,(const char*)bindDNPw,true,false);
+ 	}
+ 	load();
+ };
+Nur in x2gosystemadministration-2.0.1-mod/src: x2gosystemadministration.cpp~.
+diff -u -x '*.kde*' -r x2gosystemadministration-2.0.1/src/x2gosystemadministration.h x2gosystemadministration-2.0.1-mod/src/x2gosystemadministration.h
+--- x2gosystemadministration-2.0.1/src/x2gosystemadministration.h	2009-02-09 14:39:39.000000000 +0100
++++ x2gosystemadministration-2.0.1-mod/src/x2gosystemadministration.h	2009-05-12 18:59:54.000000000 +0200
+@@ -73,6 +73,8 @@
+ 		QCheckBox* chbNotStartSndSys;
+ 		QString base;
+ 		QString uri;
++                QString bindDN;
++                QString bindDNPw;
+ 		QStringList allGroups;
+ 		QStringList otherGroups;
+ 		LDAPSession* ld;
+Nur in x2gosystemadministration-2.0.1-mod/src: x2gosystemadministration.h~.
diff --git a/net-misc/x2gosystemadministration/x2gosystemadministration-2.0.1.5.ebuild b/net-misc/x2gosystemadministration/x2gosystemadministration-2.0.1.5.ebuild
new file mode 100644
index 0000000..62afdeb
--- /dev/null
+++ b/net-misc/x2gosystemadministration/x2gosystemadministration-2.0.1.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit kde versionator
+
+MAJOR_PV="$(get_version_component_range 1-3)"
+FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
+DESCRIPTION="The X2Go KControl group administration module"
+HOMEPAGE="http://x2go.berlios.de"
+SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+need-kde 3
+
+S=${WORKDIR}/${PN}-${MAJOR_PV}
+
+src_unpack(){
+        unpack ${A}
+        epatch "${FILESDIR}"/${PN}-2.0.1.5-ldap.patch
+}
+
+pkg_postinst(){
+        elog "The gentoo x2go ebuilds now need a different"
+        elog "  /etc/x2go/x2goldaptools.conf from the original one."
+        elog "You must add:"
+        elog "    bindn=\"cn=yourldap,ou=bind,c=dn\""
+        elog "    binddnpw=\"yourbindpassword\""
+        elog "The quotes must be normal quotes and the lines must be added at the end!"
+        elog "Make sure you secure the file by good permissions like 0600 and owner root!"
+
+}
diff --git a/net-misc/x2gouseradministration/Manifest b/net-misc/x2gouseradministration/Manifest
index dd97870..bab0d0b 100644
--- a/net-misc/x2gouseradministration/Manifest
+++ b/net-misc/x2gouseradministration/Manifest
@@ -1,2 +1,5 @@
+AUX x2gouseradministration-2.0.1.8-ldap.patch 2289 RMD160 de531ba630de79a23703be410b209fc2e20e50ff SHA1 88a2f837b40cf7160d37a628d778450ef8949cc1 SHA256 9c9c66031f3b1081e48e64f225cb922380c627574b7761942b049e99cc33fe09
 DIST x2gouseradministration_2.0.1-7.tar.gz 768453 RMD160 f91b68b40f0615dce234d68a9f1b019725dd474e SHA1 8f01b991f8ffc6de0492dfa694e4c74b296c4535 SHA256 ae02b36b328a3ab69080ddc6a1242ca050b67717f5c8bf4f6d882ad9b8f69cb0
+DIST x2gouseradministration_2.0.1-8.tar.gz 951832 RMD160 33da6003d28aa9c4eb655ae2662fb9721d973562 SHA1 ecb8bff5e904291428f94204864c805b1552df92 SHA256 bfa44f90a084da3eadc6f65ba9ade45c1f15c9003a0b717e0679c50c0ebeb95b
 EBUILD x2gouseradministration-2.0.1.7.ebuild 526 RMD160 27b3226acdcd6a4f5ac4bcf21e74920294cb7042 SHA1 20feef12a821b71fa81fb7a60048374324cde291 SHA256 5e3e7ea23c396e186533ae0c12915d7089d9f876fd720b9426ce0324bd36b3df
+EBUILD x2gouseradministration-2.0.1.8.ebuild 1083 RMD160 12b48be7d491edd592b715714aa08160bd12b03c SHA1 2ea96ac757ad733e01a10838142a6bae8baac304 SHA256 0bd9e34790057697b96b8053bd6c03c16c24ff89a4ca7450a35c595edd622373
diff --git a/net-misc/x2gouseradministration/files/x2gouseradministration-2.0.1.8-ldap.patch b/net-misc/x2gouseradministration/files/x2gouseradministration-2.0.1.8-ldap.patch
new file mode 100644
index 0000000..6647dbd
--- /dev/null
+++ b/net-misc/x2gouseradministration/files/x2gouseradministration-2.0.1.8-ldap.patch
@@ -0,0 +1,64 @@
+diff -u -x '*.kde*' -r x2gouseradministration-2.0.1/src/x2gouseradministration.cpp x2gouseradministration-2.0.1-mod/src/x2gouseradministration.cpp
+--- x2gouseradministration-2.0.1/src/x2gouseradministration.cpp	2009-02-09 14:39:19.000000000 +0100
++++ x2gouseradministration-2.0.1-mod/src/x2gouseradministration.cpp	2009-05-12 19:22:55.000000000 +0200
+@@ -133,6 +133,8 @@
+ 		QTextStream stream ( &file );
+ 		uri = stream.readLine();
+ 		base = stream.readLine();
++                bindDN = stream.readLine();
++                bindDNPw = stream.readLine();
+ 		file.close();
+ 	}
+ 	else
+@@ -145,6 +147,10 @@
+ 	base=lst[1];
+ 	lst=lst.split ( "//",uri );
+ 	uri=lst[1];
++        lst=lst.split("\"",bindDN);
++        bindDN=lst[1];
++        lst=lst.split("\"",bindDNPw);
++        bindDNPw=lst[1];
+ 	kdDebug() <<"base: "<<base<<" uri: "<<uri<<endl;
+ 	QVBoxLayout* lay=new QVBoxLayout ( this );
+ 	QFrame* mainFrame=new QFrame ( this );
+@@ -491,16 +497,16 @@
+ 	}
+ 	else
+ 	{
+-		QString passfile="/etc/libnss-ldap.secret";
+-		QFile file ( passfile );
+-		QCString tpass;
+-		if ( file.open ( IO_ReadOnly ) )
+-		{
+-			QTextStream in ( &file );
+-			in>>tpass;
+-			file.close();
+-		}
+-		ld=new LDAPSession ( uri,389,"cn=ldapadmin,"+base,tpass.data(),false,true );
++// 		QString passfile="/etc/libnss-ldap.secret";
++// 		QFile file ( passfile );
++// 		QCString tpass;
++// 		if ( file.open ( IO_ReadOnly ) )
++// 		{
++// 			QTextStream in ( &file );
++// 			in>>tpass;
++// 			file.close();
++// 		}
++		ld=new LDAPSession ( uri,389,(const char*)bindDN,(const char*)bindDNPw,true,false);
+ 		leSearchUin->setFocus();
+ 	}
+ 	load();
+Nur in x2gouseradministration-2.0.1-mod/src: x2gouseradministration.cpp~.
+diff -u -x '*.kde*' -r x2gouseradministration-2.0.1/src/x2gouseradministration.h x2gouseradministration-2.0.1-mod/src/x2gouseradministration.h
+--- x2gouseradministration-2.0.1/src/x2gouseradministration.h	2009-02-09 14:39:19.000000000 +0100
++++ x2gouseradministration-2.0.1-mod/src/x2gouseradministration.h	2009-05-12 19:28:00.000000000 +0200
+@@ -143,6 +143,8 @@
+     QGroupBox* gbUsers;
+     QString base;
+     QString uri;
++    QString bindDN;
++    QString bindDNPw;
+     QString prevUText;
+     QCString upass;
+     QString currentUser;
+Nur in x2gouseradministration-2.0.1-mod/src: x2gouseradministration.h~.
diff --git a/net-misc/x2gouseradministration/x2gouseradministration-2.0.1.8.ebuild b/net-misc/x2gouseradministration/x2gouseradministration-2.0.1.8.ebuild
new file mode 100644
index 0000000..4d85266
--- /dev/null
+++ b/net-misc/x2gouseradministration/x2gouseradministration-2.0.1.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit kde versionator
+
+MAJOR_PV="$(get_version_component_range 1-3)"
+FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
+DESCRIPTION="The X2Go KControl group administration module"
+HOMEPAGE="http://x2go.berlios.de"
+SRC_URI="http://x2go.obviously-nice.de/deb/pool-lenny/${PN}/${PN}_${FULL_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+need-kde 3
+
+S=${WORKDIR}/${PN}-${MAJOR_PV}
+
+src_unpack(){
+        unpack ${A}
+        epatch "${FILESDIR}"/${PN}-2.0.1.8-ldap.patch
+#       epatch "${DISTDIR}/${PN}_${FULL_PV}.diff.gz"
+}
+
+pkg_postinst(){
+	elog "The gentoo x2go ebuilds now need a different"
+	elog "  /etc/x2go/x2goldaptools.conf from the original one."
+	elog "You must add:"
+	elog "    bindn=\"cn=yourldap,ou=bind,c=dn\""
+	elog "    binddnpw=\"yourbindpassword\""
+	elog "The quotes must be normal quotes and the lines must be added at the end!"	
+	elog "Make sure you secure the file by good permissions like 0600 and owner root!"
+
+}