summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/x2goclient')
-rw-r--r--net-misc/x2goclient/Manifest3
-rw-r--r--net-misc/x2goclient/files/x2goclient-3.00.1-ldap.patch117
-rw-r--r--net-misc/x2goclient/x2goclient-3.00.1.ebuild20
3 files changed, 137 insertions, 3 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
+}