From 7728c8679d6bbcd00205c7bdde8d78c82d69d88d Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Tue, 24 Jul 2007 13:36:20 +0200 Subject: [PATCH] Imported Debian patch 0.1~rc1-1 --- debian/README.Debian-sources | 9 ------- debian/changelog | 7 ++++++ debian/patches/series | 1 - debian/patches/use_mcrypt.patch | 44 --------------------------------- 4 files changed, 7 insertions(+), 54 deletions(-) delete mode 100644 debian/README.Debian-sources delete mode 100644 debian/patches/use_mcrypt.patch diff --git a/debian/README.Debian-sources b/debian/README.Debian-sources deleted file mode 100644 index 9d4be26..0000000 --- a/debian/README.Debian-sources +++ /dev/null @@ -1,9 +0,0 @@ -Debian roundcube package. -========================= - -This package uses a DES encryption using mcrypt instead of the -original des.inc file. Indeed, the licence of this file was not DFSG -and mcrypt is a very good DFSG drop down alternative.. - -File removed from upstream tarball: programs/lib/des.inc - diff --git a/debian/changelog b/debian/changelog index ccc5f63..dfb0edf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +roundcube (0.1~rc1-1) unstable; urgency=low + + * New upstream release + * Removed non gpl file des.inc + + -- Romain Beauxis Tue, 24 Jul 2007 13:36:20 +0200 + roundcube (0.1~rc1~dfsg-3) unstable; urgency=low * Add php5-mcrypt dependency (Closes: #431177) diff --git a/debian/patches/series b/debian/patches/series index d9c2b5e..70787a4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ dbconfig-common_support.patch correct_install_path.patch -use_mcrypt.patch diff --git a/debian/patches/use_mcrypt.patch b/debian/patches/use_mcrypt.patch deleted file mode 100644 index b4bb262..0000000 --- a/debian/patches/use_mcrypt.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- roundcube_0.1~beta2.2/program/include/main.inc 2006-12-22 23:26:24.000000000 +0100 -+++ roundcube_0.1~beta2.2/program/include/main.inc 2007-03-18 10:24:11.000000000 +0100 -@@ -19,7 +19,6 @@ - - */ - --require_once('lib/des.inc'); - require_once('lib/utf7.inc'); - require_once('lib/utf8.class.php'); - -@@ -758,7 +758,13 @@ - // encrypt IMAP password using DES encryption - function encrypt_passwd($pass) - { -- $cypher = des(get_des_key(), $pass, 1, 0, NULL); -+ $td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_ECB, ""); -+ $iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND); -+ mcrypt_generic_init($td, get_des_key(), $iv); -+ $cypher = mcrypt_generic($td, $pass); -+ mcrypt_generic_end($td); -+ mcrypt_module_close($td); -+ - return base64_encode($cypher); - } - -@@ -766,8 +772,14 @@ - // decrypt IMAP password using DES encryption - function decrypt_passwd($cypher) - { -- $pass = des(get_des_key(), base64_decode($cypher), 0, 0, NULL); -- return preg_replace('/\x00/', '', $pass); -+ $td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_ECB, ""); -+ $iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND); -+ mcrypt_generic_init($td, get_des_key(), $iv); -+ $pass = mdecrypt_generic($td, base64_decode($cypher)); -+ mcrypt_generic_end($td); -+ mcrypt_module_close($td); -+ -+ return $pass; - } - - ---- include/main.inc~ 2007-03-25 12:09:19.000000000 +0200 -+++ include/main.inc 2007-03-25 12:15:45.000000000 +0200 -- 2.39.2