From 75006d98871ebe17195584aca195fd336a078792 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Fri, 25 Jun 2010 15:07:44 +0000
Subject: [PATCH] removed ssh2

---
 lam-packaging/debian/control      |  2 +-
 lam/docs/manual-sources/howto.xml | 53 +++----------------------------
 2 files changed, 5 insertions(+), 50 deletions(-)

diff --git a/lam-packaging/debian/control b/lam-packaging/debian/control
index e83d7b57..fd749b9b 100644
--- a/lam-packaging/debian/control
+++ b/lam-packaging/debian/control
@@ -9,7 +9,7 @@ Homepage: http://www.ldap-account-manager.org/
 Package: ldap-account-manager
 Architecture: all
 Depends: php5 (>= 5.1), php5-ldap, php5-gd, apache2 | httpd, php-fpdf, libjs-jquery (>= 1.4.2), libjs-jquery-ui (>= 1.8), debconf (>= 0.2.26) | debconf-2.0, ${misc:Depends}
-Suggests: ldap-server, php5-mcrypt, ldap-account-manager-lamdaemon, perl, libssh2-php
+Suggests: ldap-server, php5-mcrypt, ldap-account-manager-lamdaemon, perl
 Description: webfrontend for managing accounts in an LDAP directory
  LDAP Account Manager (LAM) runs on an existing webserver.
  It manages user, group and host accounts. Currently LAM
diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index ebaf7f64..acc80448 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -612,6 +612,9 @@ Have fun!
           <para>LAM supported to set a list of valid workstations on the
           "Personal" page. This required to change the LDAP schema. Since
           3.1.0 this is replaced by the new "Hosts" module for users.</para>
+
+          <para>Lamdaemon: The sudo entry needs to be changed to
+          ".../lamdaemon.pl *".</para>
         </section>
 
         <section>
@@ -1536,7 +1539,7 @@ Have fun!
 
       <para>The Asterisk support for users can be added by selecting the
       Asterisk and Asterisk voicemail modules for users in your LAM server
-      profile. This will add the following tabs to your user accounts. </para>
+      profile. This will add the following tabs to your user accounts.</para>
 
       <screenshot>
         <mediaobject>
@@ -3209,42 +3212,6 @@ Have fun!
       Perl.</para>
     </section>
 
-    <section>
-      <title>Install libssh2</title>
-
-      <para>The libssh2 library is needed to connect to the homedir/quota
-      server via SSH.</para>
-
-      <section>
-        <title>Install libssh2</title>
-
-        <para>You can get libssh2 here: <ulink
-        url="http://www.libssh2.org">http://www.libssh2.org</ulink> Unpack the
-        package and install it by executing the commands "./configure", "make"
-        and "make install" in the extracted directory. Several Linux
-        distributions already include a package for libssh2.</para>
-      </section>
-
-      <section>
-        <title>Install SSH2 for PHP</title>
-
-        <para>Several Linux distributions already include a package (e.g.
-        libssh2-php).</para>
-
-        <para>Otherwise, run "pecl install ssh2-beta". If you have no pecl
-        command then install the PHP Pear package (e.g. php-pear or php5-pear)
-        for your distribution.</para>
-
-        <para>If you want to compile it yourself, get the sources here: <ulink
-        url="http://pecl.php.net/package/ssh2">http://pecl.php.net/package/ssh2</ulink></para>
-
-        <para>After installing the PHP module please add this line to your
-        php.ini:</para>
-
-        <para>extension=ssh2.so</para>
-      </section>
-    </section>
-
     <section>
       <title>Set up SSH</title>
 
@@ -3267,18 +3234,6 @@ Have fun!
           Tools -&gt; Tests -&gt; Lamdaemon test</para>
         </listitem>
 
-        <listitem>
-          <para>If you get garbage characters at the test page then PHP and
-          your php5-ssh2 library may not fit together. Try recompiling the
-          library and libssh2.</para>
-
-          <para>This combination was tested successfully: libssh2 0.13 with
-          php5-ssh2 0.10</para>
-
-          <para>php5-ssh2 0.11 should have no problems with recent libssh2
-          releases.</para>
-        </listitem>
-
         <listitem>
           <para>Check /var/log/auth.log or its equivalent on your system. This
           file contains messages about all logins. If the ssh login failed