ver bump #56010

8 files changed, 204 insertions, 4 deletions

diff --git a/net-www/horde-passwd/ChangeLog b/net-www/horde-passwd/ChangeLog
index cb031e4a6af7..0aeefff6df3e 100644
--- a/net-www/horde-passwd/ChangeLog
+++ b/net-www/horde-passwd/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for net-www/horde-passwd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/horde-passwd/ChangeLog,v 1.3 2004/06/25 00:54:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-passwd/ChangeLog,v 1.4 2004/08/11 03:17:34 vapier Exp $
 
-  01 Apr 2004; Chris Aniszczyk <zx@gentoo.org> horde-passwd-2.2.ebuild:
-  Marking ~hppa
+*horde-passwd-2.2.1 (10 Aug 2004)
+
+  10 Aug 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/2.2.1-crypt-support.patch, +files/2.2.1-example-backend-setup.patch,
+  +files/2.2.1-main.php-typo.patch, +files/2.2.1-no-clear-password.patch,
+  +horde-passwd-2.2.1.ebuild:
+  Version bump with a bunch of cvs fixes #56010 by Mario Vazquez.
 
 *horde-passwd-2.2 (26 Jan 2004)
 
diff --git a/net-www/horde-passwd/Manifest b/net-www/horde-passwd/Manifest
index e2bb451701ed..1849e96997fb 100644
--- a/net-www/horde-passwd/Manifest
+++ b/net-www/horde-passwd/Manifest
@@ -1,4 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 82242b22737e554961d4e5033ede0a05 ChangeLog 661
 MD5 075dd9cd7a01fc419c1871899d0b5b2f horde-passwd-2.2.ebuild 400
-MD5 7d41828a18c1fd069670bd3573ab0319 ChangeLog 418
 MD5 536fc68713fc6d618f6ac8c02145bddb metadata.xml 687
+MD5 bd63b9fce4e434f960e2caff5189a4a5 horde-passwd-2.2.1.ebuild 686
 MD5 7bcd285ae78e88952238b0935d4387f7 files/digest-horde-passwd-2.2 62
+MD5 e73821bef4d5298d35f771b3d496b8b3 files/digest-horde-passwd-2.2.1 64
+MD5 57778ef05cbb06b1e142a98592d3f18c files/2.2.1-crypt-support.patch 3959
+MD5 41137756c734ffcc398b429aacb06634 files/2.2.1-example-backend-setup.patch 1047
+MD5 b47a9e2b4ef864a7b9a4937c7bd24ae6 files/2.2.1-main.php-typo.patch 840
+MD5 90a30b8eff0510043a20370d85462e3d files/2.2.1-no-clear-password.patch 496
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFBGZABHTu7gpaalycRAtq7AJ0VtS43SOp7s2LMwZPvHXkJymEtRwCgq5Pc
+ClsA9VTwra7d3P4et+6vI84=
+=5gOA
+-----END PGP SIGNATURE-----
diff --git a/net-www/horde-passwd/files/2.2.1-crypt-support.patch b/net-www/horde-passwd/files/2.2.1-crypt-support.patch
new file mode 100644
index 000000000000..4161c257c552
--- /dev/null
+++ b/net-www/horde-passwd/files/2.2.1-crypt-support.patch
@@ -0,0 +1,100 @@
+diff -ur passwd-2.2.1/config/backends.php.dist passwd/config/backends.php.dist
+--- passwd-2.2.1/config/backends.php.dist	2004-06-30 00:41:27.000000000 -0400
++++ passwd/config/backends.php.dist	2004-06-30 01:02:27.000000000 -0400
+@@ -40,12 +40,14 @@
+  *            supported by passwd
+  *
+  *            1) plain
+- *            2) crypt
+- *            3) md5-hex
+- *            4) md5-base64
+- *            5) smd5
+- *            6) sha
+- *            7) ssha
++ *            2) crypt or crypt-des
++ *            3) crypt-md5
++ *            4) crypt-blowfish
++ *            5) md5-hex
++ *            6) md5-base64
++ *            7) smd5
++ *            8) sha
++ *            9) ssha
+  *
+  *            Currently, md5-base64, smd5, sha, and ssha require the mhash php
+  *            library in order to work properly.  See the INSTALL file for
+@@ -190,7 +192,7 @@
+         // 'socket'     => '/tmp/mysql.sock',
+         'username'   => '',
+         'password'   => '',
+-        'encryption' => 'crypt',
++        'encryption' => 'crypt-md5',
+         'database'   => 'vpopmail',
+         'table'      => 'vpopmail',
+         'name'    => 'pw_name',
+diff -ur passwd-2.2.1/lib/Driver.php passwd/lib/Driver.php
+--- passwd-2.2.1/lib/Driver.php	2003-02-15 16:16:26.000000000 -0400
++++ passwd/lib/Driver.php	2004-06-30 00:59:32.000000000 -0400
+@@ -104,8 +104,22 @@
+                 }
+                break;
+             case 'crypt':
+-                $encrypted = substr($encrypted, 7);
+-                $salt = substr($encrypted , 0, 2);
++            case 'crypt-des':
++                $encrypted = preg_replace('|^{crypt}|', '', $encrypted);
++                $salt = substr($encrypted, 0, 2);
++                if ($encrypted == crypt($plaintext, $salt)) {
++                    return true;
++                }
++                break;
++            case 'crypt-md5':
++                $encrypted = preg_replace('|^{crypt}|', '', $encrypted);
++                $salt = substr($encrypted, 0, 12);
++                if ($encrypted == crypt($plaintext, $salt)) {
++                    return true;
++                }
++            case 'crypt-blowfish':
++                $encrypted = preg_replace('|^{crypt}|', '', $encrypted);
++                $salt = substr($encrypted, 0, 16);
+                 if ($encrypted == crypt($plaintext, $salt)) {
+                     return true;
+                 }
+@@ -113,14 +127,14 @@
+             case 'sha':
+                 $encrypted = substr($encrypted, 5);
+                 if ($encrypted == base64_encode(mHash(MHASH_SHA1, $plaintext)))
+-{
++                {
+                     return true;
+                 }
+                 break;
+             case 'ssha':
+                 $encrypted = substr($encrypted, 6);
+                 $hash = base64_decode($encrypted);
+-               $salt = substr($hash, 20);
++                $salt = substr($hash, 20);
+                 if ($hash == mHash(MHASH_SHA1, $plaintext . $salt)) {
+                     return true;
+                 }
+@@ -156,9 +170,18 @@
+             case "sha":
+                 $newPassword = "{SHA}" . base64_encode(mHash(MHASH_SHA1, $newPassword));
+                 break;
+-            case "crypt":
+-                // The salt is left out, generated by php
+-                $newPassword = "{crypt}" . crypt($newPassword);
++            case 'crypt':
++            case 'crypt-des':
++                $salt = substr(md5(mt_rand()), 0, 2);
++                $newPassword = crypt($newPassword, $salt);
++                break;
++            case 'crypt-md5':
++                $salt = '$1$' . substr(md5(mt_rand()), 0, 8) . '$';
++                $newPassword = crypt($newPassword, $salt);
++                break;
++            case 'crypt-blowfish':
++                $salt = '$2$' . substr(md5(mt_rand()), 0, 12) . '$';
++                $newPassword = crypt($newPassword, $salt);
+                 break;
+             case "md5-hex":
+                 $newPassword = md5($newPassword);
diff --git a/net-www/horde-passwd/files/2.2.1-example-backend-setup.patch b/net-www/horde-passwd/files/2.2.1-example-backend-setup.patch
new file mode 100644
index 000000000000..57874671a5ce
--- /dev/null
+++ b/net-www/horde-passwd/files/2.2.1-example-backend-setup.patch
@@ -0,0 +1,27 @@
+===================================================================
+RCS file: /horde/cvs/passwd/config/backends.php.dist,v
+retrieving revision 1.14.2.3
+retrieving revision 1.14.2.4
+diff -p --unified=3 -r1.14.2.3 -r1.14.2.4
+--- config/backends.php.dist	2003/02/05 15:48:13	1.14.2.3
++++ config/backends.php.dist	2004/06/24 08:02:36	1.14.2.4
+@@ -147,6 +147,9 @@ $backends['sql'] = array (
+     'params' => array(
+         'phptype'    => 'mysql',
+         'hostspec'   => 'localhost',
++        'protocol'   => 'tcp',
++        // 'port'       => 3306,
++        // 'socket'     => '/tmp/mysql.sock',
+         'username'   => 'horde',
+         'password'   => '',
+         'encryption' => 'md5-hex',
+@@ -182,6 +185,9 @@ $backends['vpopmail'] = array (
+     'params' => array(
+         'phptype'    => 'mysql',
+         'hostspec'   => 'localhost',
++        'protocol'   => 'tcp',
++        // 'port'       => 3306,
++        // 'socket'     => '/tmp/mysql.sock',
+         'username'   => '',
+         'password'   => '',
+         'encryption' => 'crypt',
diff --git a/net-www/horde-passwd/files/2.2.1-main.php-typo.patch b/net-www/horde-passwd/files/2.2.1-main.php-typo.patch
new file mode 100644
index 000000000000..af79148c44a5
--- /dev/null
+++ b/net-www/horde-passwd/files/2.2.1-main.php-typo.patch
@@ -0,0 +1,16 @@
+===================================================================
+RCS file: /horde/cvs/passwd/main.php,v
+retrieving revision 1.1.1.1.2.11
+retrieving revision 1.1.1.1.2.12
+diff -p --unified=3 -r1.1.1.1.2.11 -r1.1.1.1.2.12
+--- main.php	2004/03/26 22:43:28	1.1.1.1.2.11
++++ main.php	2004/06/05 21:40:52	1.1.1.1.2.12
+@@ -137,7 +137,7 @@ do {
+     }
+     if (array_key_exists('maxSpace', $passwordPolicy) &&
+         $passwordPolicy['maxSpace'] < $space) {
+-        if ($paswordPolicy['maxSpace'] > 0) {
++        if ($passwordPolicy['maxSpace'] > 0) {
+             Horde::raiseMessage(sprintf(_("Your new password must contain less than %d whitespace characters."), $passwordPolicy['maxSpace']), HORDE_WARNING);
+         } else {
+             Horde::raiseMessage(_("Your new password must not contain whitespace characters."), HORDE_WARNING);
diff --git a/net-www/horde-passwd/files/2.2.1-no-clear-password.patch b/net-www/horde-passwd/files/2.2.1-no-clear-password.patch
new file mode 100644
index 000000000000..9785fa399070
--- /dev/null
+++ b/net-www/horde-passwd/files/2.2.1-no-clear-password.patch
@@ -0,0 +1,13 @@
+diff -ur passwd-2.2.1/config/backends.php.dist passwd/config/backends.php.dist
+--- passwd-2.2.1/config/backends.php.dist	2004-06-30 01:06:28.000000000 -0400
++++ passwd/config/backends.php.dist	2004-06-30 01:07:37.000000000 -0400
+@@ -198,7 +198,7 @@
+         'name'    => 'pw_name',
+         'domain'  => 'pw_domain',
+ 	'passwd' =>  'pw_passwd',
+-	'clear_passwd' => 'pw_clear_passwd',
+-	'use_clear_passwd' => true
++	// 'clear_passwd' => 'pw_clear_passwd',
++	'use_clear_passwd' => false
+     )
+ );
diff --git a/net-www/horde-passwd/files/digest-horde-passwd-2.2.1 b/net-www/horde-passwd/files/digest-horde-passwd-2.2.1
new file mode 100644
index 000000000000..c547b52c50fc
--- /dev/null
+++ b/net-www/horde-passwd/files/digest-horde-passwd-2.2.1
@@ -0,0 +1 @@
+MD5 8b17c4d1a9c75ebd0200075fd32f76bf passwd-2.2.1.tar.gz 226874
diff --git a/net-www/horde-passwd/horde-passwd-2.2.1.ebuild b/net-www/horde-passwd/horde-passwd-2.2.1.ebuild
new file mode 100644
index 000000000000..2511274c637f
--- /dev/null
+++ b/net-www/horde-passwd/horde-passwd-2.2.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-passwd/horde-passwd-2.2.1.ebuild,v 1.1 2004/08/11 03:17:34 vapier Exp $
+
+inherit horde eutils
+
+DESCRIPTION="Horde Passwd is the Horde password changing application"
+
+KEYWORDS="x86 ppc sparc alpha hppa amd64"
+IUSE="clearpasswd"
+
+DEPEND=""
+RDEPEND=">=net-www/horde-2.2.4"
+
+src_unpack() {
+	horde_src_unpack
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-main.php-typo.patch
+	epatch ${FILESDIR}/${PV}-example-backend-setup.patch
+	epatch ${FILESDIR}/${PV}-crypt-support.patch
+	use clearpasswd || epatch ${FILESDIR}/${PV}-no-clear-password.patch
+}