pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/squirrelmail Updated mail/squirrelmail to 1.4.5
details: https://anonhg.NetBSD.org/pkgsrc/rev/c9d7136abbd0
branches: trunk
changeset: 496982:c9d7136abbd0
user: martti <martti%pkgsrc.org@localhost>
date: Mon Jul 18 07:04:27 2005 +0000
description:
Updated mail/squirrelmail to 1.4.5
* lots of bug fixes
* translation updates
diffstat:
mail/squirrelmail/Makefile | 6 +-
mail/squirrelmail/PLIST | 28 +-
mail/squirrelmail/buildlink3.mk | 4 +-
mail/squirrelmail/distinfo | 11 +-
mail/squirrelmail/patches/patch-aa | 12 +-
mail/squirrelmail/patches/patch-ab | 651 -------------------------------------
6 files changed, 36 insertions(+), 676 deletions(-)
diffs (truncated from 830 to 300 lines):
diff -r 54309c6e4ecd -r c9d7136abbd0 mail/squirrelmail/Makefile
--- a/mail/squirrelmail/Makefile Mon Jul 18 07:04:24 2005 +0000
+++ b/mail/squirrelmail/Makefile Mon Jul 18 07:04:27 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2005/07/16 19:10:39 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2005/07/18 07:04:27 martti Exp $
-DISTNAME= squirrelmail-1.4.4
-PKGREVISION= 1
+DISTNAME= squirrelmail-1.4.5
+#PKGREVISION= 1
CATEGORIES= mail www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
EXTRACT_SUFX= .tar.bz2
diff -r 54309c6e4ecd -r c9d7136abbd0 mail/squirrelmail/PLIST
--- a/mail/squirrelmail/PLIST Mon Jul 18 07:04:24 2005 +0000
+++ b/mail/squirrelmail/PLIST Mon Jul 18 07:04:27 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2005/01/23 07:02:03 martti Exp $
+@comment $NetBSD: PLIST,v 1.16 2005/07/18 07:04:27 martti Exp $
share/examples/squirrelmail/squirrelmail.conf
share/squirrelmail/AUTHORS
share/squirrelmail/COPYING
@@ -34,16 +34,25 @@
share/squirrelmail/contrib/RPM/squirrelmail.conf
share/squirrelmail/contrib/RPM/squirrelmail.cron
share/squirrelmail/contrib/RPM/squirrelmail.spec
+share/squirrelmail/contrib/decrypt_headers.php
+share/squirrelmail/contrib/squirrelmail.mailto.NT2KXP.reg
+share/squirrelmail/contrib/squirrelmail.mailto.Win9x.reg
+share/squirrelmail/contrib/squirrelmail.mailto.reg
share/squirrelmail/data/.htaccess
share/squirrelmail/data/default_pref
share/squirrelmail/data/index.php
-share/squirrelmail/doc/README.russian_apache
+share/squirrelmail/doc/Development/addressbook.txt
+share/squirrelmail/doc/Development/index.html
+share/squirrelmail/doc/Development/mime.txt
+share/squirrelmail/doc/Development/plugin.txt
+share/squirrelmail/doc/Development/rfc_documents.txt
+share/squirrelmail/doc/Development/tree.txt
share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.0.txt
share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.1.txt
share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.2.txt
share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.3.txt
share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.4.txt
-share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.5
+share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.5.txt
share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.6.txt
share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.0.txt
share/squirrelmail/doc/ReleaseNotes/1.3/Notes-1.3.1.txt
@@ -53,19 +62,16 @@
share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.2.txt
share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3.txt
share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3a.txt
-share/squirrelmail/doc/addressbook.txt
+share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.4.txt
share/squirrelmail/doc/authentication.txt
share/squirrelmail/doc/db-backend.txt
share/squirrelmail/doc/ie_ssl.txt
share/squirrelmail/doc/index.html
-share/squirrelmail/doc/mime.txt
-share/squirrelmail/doc/plugin.txt
share/squirrelmail/doc/presets.txt
-share/squirrelmail/doc/rfc_documents.txt
+share/squirrelmail/doc/russian_apache.txt
share/squirrelmail/doc/themes.txt
share/squirrelmail/doc/translating.txt
share/squirrelmail/doc/translating_help.txt
-share/squirrelmail/doc/tree.txt
share/squirrelmail/functions/abook_database.php
share/squirrelmail/functions/abook_ldap_server.php
share/squirrelmail/functions/abook_local_file.php
@@ -155,6 +161,7 @@
share/squirrelmail/help/en_US/read_mail.hlp
share/squirrelmail/help/en_US/search.hlp
share/squirrelmail/help/index.php
+share/squirrelmail/images/blank.png
share/squirrelmail/images/delitem.png
share/squirrelmail/images/down_pointer.png
share/squirrelmail/images/draft.png
@@ -327,6 +334,7 @@
share/squirrelmail/src/index.php
share/squirrelmail/src/left_main.php
share/squirrelmail/src/login.php
+share/squirrelmail/src/mailto.php
share/squirrelmail/src/move_messages.php
share/squirrelmail/src/options.php
share/squirrelmail/src/options_highlight.php
@@ -359,6 +367,9 @@
share/squirrelmail/themes/css/sans-12.css
share/squirrelmail/themes/css/serif-10.css
share/squirrelmail/themes/css/serif-12.css
+share/squirrelmail/themes/css/tahoma-08.css
+share/squirrelmail/themes/css/tahoma-10.css
+share/squirrelmail/themes/css/tahoma-12.css
share/squirrelmail/themes/css/verdana-08.css
share/squirrelmail/themes/css/verdana-10.css
share/squirrelmail/themes/css/verdana-12.css
@@ -434,6 +445,7 @@
@dirrm share/squirrelmail/doc/ReleaseNotes/1.3
@dirrm share/squirrelmail/doc/ReleaseNotes/1.2
@dirrm share/squirrelmail/doc/ReleaseNotes
+@dirrm share/squirrelmail/doc/Development
@dirrm share/squirrelmail/doc
@dirrm share/squirrelmail/data
@dirrm share/squirrelmail/contrib/RPM
diff -r 54309c6e4ecd -r c9d7136abbd0 mail/squirrelmail/buildlink3.mk
--- a/mail/squirrelmail/buildlink3.mk Mon Jul 18 07:04:24 2005 +0000
+++ b/mail/squirrelmail/buildlink3.mk Mon Jul 18 07:04:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/06/16 07:30:40 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/07/18 07:04:27 martti Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SQUIRRELMAIL_BUILDLINK3_MK:= ${SQUIRRELMAIL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@
BUILDLINK_PACKAGES+= squirrelmail
.if !empty(SQUIRRELMAIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.squirrelmail+= squirrelmail>=1.4.4nb1
+BUILDLINK_DEPENDS.squirrelmail+= squirrelmail>=1.4.5
BUILDLINK_PKGSRCDIR.squirrelmail?= ../../mail/squirrelmail
.endif # SQUIRRELMAIL_BUILDLINK3_MK
diff -r 54309c6e4ecd -r c9d7136abbd0 mail/squirrelmail/distinfo
--- a/mail/squirrelmail/distinfo Mon Jul 18 07:04:24 2005 +0000
+++ b/mail/squirrelmail/distinfo Mon Jul 18 07:04:27 2005 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.25 2005/06/16 07:30:40 martti Exp $
+$NetBSD: distinfo,v 1.26 2005/07/18 07:04:27 martti Exp $
-SHA1 (squirrelmail-1.4.4.tar.bz2) = 52bdb31e826e845464d7d53e0745c50ead9ba6fe
-RMD160 (squirrelmail-1.4.4.tar.bz2) = d1e3f46b665a1bdf9d074eb805682f66f068221c
-Size (squirrelmail-1.4.4.tar.bz2) = 468790 bytes
-SHA1 (patch-aa) = 9e66fdf7697379cc66266b7aa0c599db68750284
-SHA1 (patch-ab) = 3ae096450e7397475e043abc6c3ec993bb6f80f8
+SHA1 (squirrelmail-1.4.5.tar.bz2) = 48c93dd99b72b73a3ea48311152bcbc40af5cabb
+RMD160 (squirrelmail-1.4.5.tar.bz2) = 6f748e483ea1c3c94eeb849ce11a3afd90c499a0
+Size (squirrelmail-1.4.5.tar.bz2) = 480226 bytes
+SHA1 (patch-aa) = cafc171ab1de5e2e1e83caff39f3bfb810fe2ab5
diff -r 54309c6e4ecd -r c9d7136abbd0 mail/squirrelmail/patches/patch-aa
--- a/mail/squirrelmail/patches/patch-aa Mon Jul 18 07:04:24 2005 +0000
+++ b/mail/squirrelmail/patches/patch-aa Mon Jul 18 07:04:27 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2005/02/20 01:52:36 minskim Exp $
+$NetBSD: patch-aa,v 1.10 2005/07/18 07:04:27 martti Exp $
---- config/config_default.php.orig 2004-12-24 09:55:39.000000000 -0600
-+++ config/config_default.php
-@@ -373,7 +373,7 @@ $default_sub_of_inbox = true;
+--- config/config_default.php.orig 2005-05-22 11:30:34.000000000 +0300
++++ config/config_default.php 2005-07-18 06:23:02.000000000 +0300
+@@ -392,7 +392,7 @@
* false. (Cyrus works fine whether it's true OR false).
* @global bool $show_contain_subfolders_option
*/
@@ -11,7 +11,7 @@
/**
* These next two options set the defaults for the way that the
-@@ -418,7 +418,7 @@ $noselect_fix_enable = false;
+@@ -437,7 +437,7 @@
* $data_dir = SM_PATH . 'data/';
* @global string $data_dir
*/
@@ -20,7 +20,7 @@
/**
* Attachments directory
-@@ -436,7 +436,7 @@ $data_dir = SM_PATH . 'data/';
+@@ -455,7 +455,7 @@
* + It should probably be another directory than data_dir.
* @global string $attachment_dir
*/
diff -r 54309c6e4ecd -r c9d7136abbd0 mail/squirrelmail/patches/patch-ab
--- a/mail/squirrelmail/patches/patch-ab Mon Jul 18 07:04:24 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,651 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2005/06/16 07:30:40 martti Exp $
-
---- functions/addressbook.php Mon Dec 27 16:03:42 2004
-+++ functions/addressbook.php Wed Jun 15 23:50:03 2005
-@@ -108,7 +108,7 @@
- if (!$r && $showerr) {
- printf( ' ' . _("Error initializing LDAP server %s:") .
- "<br />\n", $param['host']);
-- echo ' ' . $abook->error;
-+ echo ' ' . htmlspecialchars($abook->error);
- exit;
- }
- }
-@@ -239,7 +239,7 @@
- if (is_array($res)) {
- $ret = array_merge($ret, $res);
- } else {
-- $this->error .= "<br />\n" . $backend->error;
-+ $this->error .= "\n" . $backend->error;
- $failed++;
- }
- }
-@@ -255,7 +255,7 @@
-
- $ret = $this->backends[$bnum]->search($expression);
- if (!is_array($ret)) {
-- $this->error .= "<br />\n" . $this->backends[$bnum]->error;
-+ $this->error .= "\n" . $this->backends[$bnum]->error;
- $ret = FALSE;
- }
- }
-diff -urw squirrelmail-1.4.4.orig/functions/mime.php squirrelmail-1.4.4/functions/mime.php
---- functions/mime.php Mon Jan 10 19:52:48 2005
-+++ functions/mime.php Wed Jun 15 23:50:03 2005
-@@ -1388,12 +1388,33 @@
- }
- }
- }
-+
-+ /**
-+ * Replace empty src tags with the blank image. src is only used
-+ * for frames, images, and image inputs. Doing a replace should
-+ * not affect them working as should be, however it will stop
-+ * IE from being kicked off when src for img tags are not set
-+ */
-+ if (($attname == 'src') && ($attvalue == '""')) {
-+ $attary{$attname} = '"' . SM_PATH . 'images/blank.png"';
-+ }
-+
- /**
- * Turn cid: urls into http-friendly ones.
- */
- if (preg_match("/^[\'\"]\s*cid:/si", $attvalue)){
- $attary{$attname} = sq_cid2http($message, $id, $attvalue, $mailbox);
- }
-+
-+ /**
-+ * "Hack" fix for Outlook using propriatary outbind:// protocol in img tags.
-+ * One day MS might actually make it match something useful, for now, falling
-+ * back to using cid2http, so we can grab the blank.png.
-+ */
-+ if (preg_match("/^[\'\"]\s*outbind:\/\//si", $attvalue)) {
-+ $attary{$attname} = sq_cid2http($message, $id, $attvalue, $mailbox);
-+ }
-+
- }
- /**
- * See if we need to append any attributes to this tag.
-@@ -1408,7 +1429,7 @@
-
- /**
- * This function edits the style definition to make them friendly and
-- * usable in squirrelmail.
-+ * usable in SquirrelMail.
- *
- * @param $message the message object
- * @param $id the message id
-@@ -1436,27 +1457,54 @@
- /**
- * Fix url('blah') declarations.
- */
-- $content = preg_replace("|url\s*\(\s*([\'\"])\s*\S+script\s*:.*?([\'\"])\s*\)|si",
-- "url(\\1$secremoveimg\\2)", $content);
-+ // $content = preg_replace("|url\s*\(\s*([\'\"])\s*\S+script\s*:.*?([\'\"])\s*\)|si",
-+ // "url(\\1$secremoveimg\\2)", $content);
-+ // remove NUL
-+ $content = str_replace("\0", "", $content);
-+ // NB I insert NUL characters to keep to avoid an infinite loop. They are removed after the loop.
-+ while (preg_match("/url\s*\(\s*[\'\"]?([^:]+):(.*)?[\'\"]?\s*\)/si", $content, $matches)) {
-+ $sProto = strtolower($matches[1]);
-+ switch ($sProto) {
- /**
- * Fix url('https*://.*) declarations but only if $view_unsafe_images
- * is false.
- */
-+ case 'https':
-+ case 'http':
- if (!$view_unsafe_images){
-- $content = preg_replace("|url\s*\(\s*([\'\"])\s*https*:.*?([\'\"])\s*\)|si",
-- "url(\\1$secremoveimg\\2)", $content);
-+ $sExpr = "/url\s*\(\s*([\'\"])\s*$sProto*:.*?([\'\"])\s*\)/si";
-+ $content = preg_replace($sExpr, "u\0r\0l(\\1$secremoveimg\\2)", $content);
- }
--
-+ break;
- /**
- * Fix urls that refer to cid:
- */
-- while (preg_match("|url\s*\(\s*([\'\"]\s*cid:.*?[\'\"])\s*\)|si",
-- $content, $matches)){
-- $cidurl = $matches{1};
-+ case 'cid':
-+ $cidurl = 'cid:'. $matches[2];
- $httpurl = sq_cid2http($message, $id, $cidurl, $mailbox);
- $content = preg_replace("|url\s*\(\s*$cidurl\s*\)|si",
-- "url($httpurl)", $content);
-+ "u\0r\0l($httpurl)", $content);
-+ break;
-+ default:
-+ /**
-+ * replace url with protocol other then the white list
Home |
Main Index |
Thread Index |
Old Index