From d9547aa43c5d7e69405e23d375daddc87de13217 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Mon, 19 Apr 2010 18:39:00 +0000 Subject: Forgot one extension to remove svn path=/testing/; revision=247 --- net-misc/x2gosessionadministration/Manifest | 3 - .../files/x2gosessionadministration-ldap.patch | 66 ---------------------- .../x2gosessionadministration-2.0.1.10.ebuild | 43 -------------- 3 files changed, 112 deletions(-) delete mode 100644 net-misc/x2gosessionadministration/Manifest delete mode 100644 net-misc/x2gosessionadministration/files/x2gosessionadministration-ldap.patch delete mode 100644 net-misc/x2gosessionadministration/x2gosessionadministration-2.0.1.10.ebuild diff --git a/net-misc/x2gosessionadministration/Manifest b/net-misc/x2gosessionadministration/Manifest deleted file mode 100644 index 64cc2da..0000000 --- a/net-misc/x2gosessionadministration/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index c0adb02..0000000 --- a/net-misc/x2gosessionadministration/files/x2gosessionadministration-ldap.patch +++ /dev/null @@ -1,66 +0,0 @@ -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 deleted file mode 100644 index 800eefd..0000000 --- a/net-misc/x2gosessionadministration/x2gosessionadministration-2.0.1.10.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# 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!" - -} -- cgit v1.2.3-65-gdbad