summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/x2gohostadministration')
-rw-r--r--net-misc/x2gohostadministration/Manifest6
-rw-r--r--net-misc/x2gohostadministration/files/x2gohostadministration-2.0.1.4-ldap.patch74
-rw-r--r--net-misc/x2gohostadministration/x2gohostadministration-2.0.1.4.ebuild20
3 files changed, 93 insertions, 7 deletions
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!"
+
}