diff options
Diffstat (limited to 'www-apps/horde-passwd')
3 files changed, 0 insertions, 143 deletions
diff --git a/www-apps/horde-passwd/files/2.2.1-crypt-support.patch b/www-apps/horde-passwd/files/2.2.1-crypt-support.patch deleted file mode 100644 index 4161c257c552..000000000000 --- a/www-apps/horde-passwd/files/2.2.1-crypt-support.patch +++ /dev/null @@ -1,100 +0,0 @@ -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/www-apps/horde-passwd/files/2.2.1-example-backend-setup.patch b/www-apps/horde-passwd/files/2.2.1-example-backend-setup.patch deleted file mode 100644 index 57874671a5ce..000000000000 --- a/www-apps/horde-passwd/files/2.2.1-example-backend-setup.patch +++ /dev/null @@ -1,27 +0,0 @@ -=================================================================== -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/www-apps/horde-passwd/files/2.2.1-main.php-typo.patch b/www-apps/horde-passwd/files/2.2.1-main.php-typo.patch deleted file mode 100644 index af79148c44a5..000000000000 --- a/www-apps/horde-passwd/files/2.2.1-main.php-typo.patch +++ /dev/null @@ -1,16 +0,0 @@ -=================================================================== -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); |