summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2010-04-19 18:36:12 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2010-04-19 18:36:12 +0000
commit2257662ee886a0c848808cc15c74db601d667ecc (patch)
treeace1856c287c3de5d9292afad863da825818968e /net-misc
parentUpdate no-ldap patch, bug #315533. Also fix desktop entry and drop old versions (diff)
downloadnx-2257662ee886a0c848808cc15c74db601d667ecc.tar.gz
nx-2257662ee886a0c848808cc15c74db601d667ecc.tar.bz2
nx-2257662ee886a0c848808cc15c74db601d667ecc.zip
Drop old KDE-3 based x2go extensions
svn path=/testing/; revision=246
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/x2gogroupadministration/Manifest6
-rw-r--r--net-misc/x2gogroupadministration/files/x2gogroupadministration-2.0.1.4-ldap.patch65
-rw-r--r--net-misc/x2gogroupadministration/x2gogroupadministration-2.0.1.3.ebuild25
-rw-r--r--net-misc/x2gogroupadministration/x2gogroupadministration-2.0.1.4.ebuild38
-rw-r--r--net-misc/x2gohostadministration/Manifest3
-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.ebuild37
-rw-r--r--net-misc/x2gosystemadministration/Manifest5
-rw-r--r--net-misc/x2gosystemadministration/files/x2gosystemadministration-2.0.1.5-ldap.patch64
-rw-r--r--net-misc/x2gosystemadministration/x2gosystemadministration-2.0.1.4.ebuild20
-rw-r--r--net-misc/x2gosystemadministration/x2gosystemadministration-2.0.1.5.ebuild36
-rw-r--r--net-misc/x2gouseradministration/Manifest5
-rw-r--r--net-misc/x2gouseradministration/files/x2gouseradministration-2.0.1.8-ldap.patch64
-rw-r--r--net-misc/x2gouseradministration/x2gouseradministration-2.0.1.7.ebuild20
-rw-r--r--net-misc/x2gouseradministration/x2gouseradministration-2.0.1.8.ebuild37
15 files changed, 0 insertions, 499 deletions
diff --git a/net-misc/x2gogroupadministration/Manifest b/net-misc/x2gogroupadministration/Manifest
deleted file mode 100644
index 99852f5..0000000
--- a/net-misc/x2gogroupadministration/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 3aff271..0000000
--- a/net-misc/x2gogroupadministration/files/x2gogroupadministration-2.0.1.4-ldap.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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.3.ebuild b/net-misc/x2gogroupadministration/x2gogroupadministration-2.0.1.3.ebuild
deleted file mode 100644
index 2e48686..0000000
--- a/net-misc/x2gogroupadministration/x2gogroupadministration-2.0.1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-need-kde 3
-
-S=${WORKDIR}/${PN}-${MAJOR_PV}.orig
-
-src_unpack(){
- unpack ${A}
- epatch "${DISTDIR}/${PN}_${FULL_PV}.diff.gz"
-}
diff --git a/net-misc/x2gogroupadministration/x2gogroupadministration-2.0.1.4.ebuild b/net-misc/x2gogroupadministration/x2gogroupadministration-2.0.1.4.ebuild
deleted file mode 100644
index 2af9e2a..0000000
--- a/net-misc/x2gogroupadministration/x2gogroupadministration-2.0.1.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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
deleted file mode 100644
index a8601af..0000000
--- a/net-misc/x2gohostadministration/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index a388c5c..0000000
--- a/net-misc/x2gohostadministration/files/x2gohostadministration-2.0.1.4-ldap.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-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
deleted file mode 100644
index 61e5d86..0000000
--- a/net-misc/x2gohostadministration/x2gohostadministration-2.0.1.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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}_${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"
-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
-}
-
-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
deleted file mode 100644
index 61d132c..0000000
--- a/net-misc/x2gosystemadministration/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 9c1f645..0000000
--- a/net-misc/x2gosystemadministration/files/x2gosystemadministration-2.0.1.5-ldap.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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.4.ebuild b/net-misc/x2gosystemadministration/x2gosystemadministration-2.0.1.4.ebuild
deleted file mode 100644
index d297c85..0000000
--- a/net-misc/x2gosystemadministration/x2gosystemadministration-2.0.1.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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 system 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}
diff --git a/net-misc/x2gosystemadministration/x2gosystemadministration-2.0.1.5.ebuild b/net-misc/x2gosystemadministration/x2gosystemadministration-2.0.1.5.ebuild
deleted file mode 100644
index 62afdeb..0000000
--- a/net-misc/x2gosystemadministration/x2gosystemadministration-2.0.1.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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
deleted file mode 100644
index bab0d0b..0000000
--- a/net-misc/x2gouseradministration/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 6647dbd..0000000
--- a/net-misc/x2gouseradministration/files/x2gouseradministration-2.0.1.8-ldap.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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.7.ebuild b/net-misc/x2gouseradministration/x2gouseradministration-2.0.1.7.ebuild
deleted file mode 100644
index 2c28b74..0000000
--- a/net-misc/x2gouseradministration/x2gouseradministration-2.0.1.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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 user 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}
diff --git a/net-misc/x2gouseradministration/x2gouseradministration-2.0.1.8.ebuild b/net-misc/x2gouseradministration/x2gouseradministration-2.0.1.8.ebuild
deleted file mode 100644
index 4d85266..0000000
--- a/net-misc/x2gouseradministration/x2gouseradministration-2.0.1.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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!"
-
-}