diff options
author | taca <taca> | 2006-05-05 02:46:54 +0000 |
---|---|---|
committer | taca <taca> | 2006-05-05 02:46:54 +0000 |
commit | 6b251464885a506bfebbdc495c88b87eb8d709ba (patch) | |
tree | 7e8c92ab3c66ccb511e3a185375fd4b125adacb2 /mail/ja-squirrelmail | |
parent | 20639b5070016771d6dc5c4eb81e69e0327a62eb (diff) | |
download | pkgsrc-6b251464885a506bfebbdc495c88b87eb8d709ba.tar.gz |
Update ja-squirrelmail package to 1.4.6 after talking with martti@.
Prior to this release, there are security vulnerability the same as
squirrelmail 1.4.5.
This update made with temporary Japanese patch based on the patch
for 1.4.5.
Diffstat (limited to 'mail/ja-squirrelmail')
-rw-r--r-- | mail/ja-squirrelmail/MESSAGE | 8 | ||||
-rw-r--r-- | mail/ja-squirrelmail/Makefile | 11 | ||||
-rw-r--r-- | mail/ja-squirrelmail/distinfo | 21 | ||||
-rw-r--r-- | mail/ja-squirrelmail/patches/patch-ab | 16 | ||||
-rw-r--r-- | mail/ja-squirrelmail/patches/patch-ac | 23 | ||||
-rw-r--r-- | mail/ja-squirrelmail/patches/patch-ad | 16 | ||||
-rw-r--r-- | mail/ja-squirrelmail/patches/patch-ae | 32 | ||||
-rw-r--r-- | mail/ja-squirrelmail/patches/patch-af | 17 | ||||
-rw-r--r-- | mail/ja-squirrelmail/patches/patch-ag | 13 | ||||
-rw-r--r-- | mail/ja-squirrelmail/patches/patch-ah | 13 |
10 files changed, 19 insertions, 151 deletions
diff --git a/mail/ja-squirrelmail/MESSAGE b/mail/ja-squirrelmail/MESSAGE index 5af767c7c11..42b2437a0d4 100644 --- a/mail/ja-squirrelmail/MESSAGE +++ b/mail/ja-squirrelmail/MESSAGE @@ -1,5 +1,11 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.2 2005/07/20 15:43:39 taca Exp $ +$NetBSD: MESSAGE,v 1.3 2006/05/05 02:46:54 taca Exp $ + +In order to use ja-squirrelmail package, you need to install these +packages, too: + + mail/squirrelmail-decode + mail/squirrelmail-locales Please run the SquirrelMail configuration script: diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile index 08f9fa9766e..a7fadf1e373 100644 --- a/mail/ja-squirrelmail/Makefile +++ b/mail/ja-squirrelmail/Makefile @@ -1,15 +1,14 @@ -# $NetBSD: Makefile,v 1.26 2006/02/17 07:04:25 martti Exp $ +# $NetBSD: Makefile,v 1.27 2006/05/05 02:46:54 taca Exp $ -DISTNAME= squirrelmail-1.4.5 +DISTNAME= squirrelmail-1.4.6 PKGNAME= ja-${DISTNAME} -PKGREVISION= 5 CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/} EXTRACT_SUFX= .tar.bz2 -PATCH_SITES= http://www.yamaai-tech.com/~masato/Download/ -PATCHFILES= squirrelmail-1.4.5-ja-20050714-patch.gz -PATCH_DIST_STRIP= -p1 +#PATCH_SITES= http://www.yamaai-tech.com/~masato/Download/ +PATCH_SITES= ftp://ftp.back-street.net/pub/squirrelmail/ +PATCHFILES= squirrelmail-1.4.6-ja-20060504-patch MAINTAINER= martti@NetBSD.org HOMEPAGE= http://www.squirrelmail.jp/ diff --git a/mail/ja-squirrelmail/distinfo b/mail/ja-squirrelmail/distinfo index a4d1c67e869..2abc84feef8 100644 --- a/mail/ja-squirrelmail/distinfo +++ b/mail/ja-squirrelmail/distinfo @@ -1,16 +1,9 @@ -$NetBSD: distinfo,v 1.8 2005/12/05 20:14:35 martti Exp $ +$NetBSD: distinfo,v 1.9 2006/05/05 02:46:54 taca Exp $ -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 (squirrelmail-1.4.5-ja-20050714-patch.gz) = 6773c2c8122025ea1470393a53d4e8ba6e22038c -RMD160 (squirrelmail-1.4.5-ja-20050714-patch.gz) = 5b855c3c8031d11d5ef32360790b2c2c6c4147fe -Size (squirrelmail-1.4.5-ja-20050714-patch.gz) = 7542 bytes +SHA1 (squirrelmail-1.4.6.tar.bz2) = b813aa9f736b4b6c41d1afd35bcbd01604e85cf7 +RMD160 (squirrelmail-1.4.6.tar.bz2) = 3cee894b392620af3e35ef1d00e35775559dd4f7 +Size (squirrelmail-1.4.6.tar.bz2) = 484099 bytes +SHA1 (squirrelmail-1.4.6-ja-20060504-patch) = 15b17d2f1b8d9c19b01cc23bf6148ac7ee0e77ce +RMD160 (squirrelmail-1.4.6-ja-20060504-patch) = 7cb0a584afaffe73176edd75886fe7536363aefe +Size (squirrelmail-1.4.6-ja-20060504-patch) = 29808 bytes SHA1 (patch-aa) = c96e85a28464c414bef744f9d1398fc9dd49549a -SHA1 (patch-ab) = c101e77938a3c2c6cf62b62a79a63125d44dda32 -SHA1 (patch-ac) = 7d3c742e8694fb051ada1d11d1624b199d61cf5b -SHA1 (patch-ad) = 1db2f3d91e059a26ba41e638b7fba134fb7fa1ca -SHA1 (patch-ae) = 45578c696d9e0ff48928e81228982e5d40c86919 -SHA1 (patch-af) = 96bb58143a83b6bbeb5477fdcd470895ccae202b -SHA1 (patch-ag) = a9cd5b779468ca7f1361c72207bbb550cd9748e3 -SHA1 (patch-ah) = 073dfa9544b8dd9ec91c4a8cba5e5b6c710e284f diff --git a/mail/ja-squirrelmail/patches/patch-ab b/mail/ja-squirrelmail/patches/patch-ab deleted file mode 100644 index 8dd097dc2ca..00000000000 --- a/mail/ja-squirrelmail/patches/patch-ab +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2005/12/05 09:28:44 martti Exp $ - ---- class/mime/Rfc822Header.class.php.orig 2005-02-06 19:33:29.000000000 -0500 -+++ class/mime/Rfc822Header.class.php -@@ -505,8 +505,9 @@ class Rfc822Header { - * functions/imap_messages. I'm not sure if it's ok here to call - * that function? - */ -- function parsePriority($value) { -- $value = strtolower(array_shift(split('/\w/',trim($value)))); -+ function parsePriority($sValue) { -+ $aValue = split('/\w/',trim($sValue)); -+ $value = strtolower(array_shift($aValue)); - if ( is_numeric($value) ) { - return $value; - } diff --git a/mail/ja-squirrelmail/patches/patch-ac b/mail/ja-squirrelmail/patches/patch-ac deleted file mode 100644 index c96473dca76..00000000000 --- a/mail/ja-squirrelmail/patches/patch-ac +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2005/12/05 09:28:44 martti Exp $ - ---- functions/imap_messages.php.orig 2005-04-16 13:45:38.000000000 -0400 -+++ functions/imap_messages.php -@@ -476,8 +476,9 @@ function parseArray($read,&$i) { - * NOTE: this is actually a duplicate from the function in - * class/mime/Rfc822Header.php. - */ --function parsePriority($value) { -- $value = strtolower(array_shift(split('/\w/',trim($value)))); -+function parsePriority($sValue) { -+ $aValue=split('/\w/',trim($sValue)); -+ $value = strtolower(array_shift($aValue)); - if ( is_numeric($value) ) { - return $value; - } -@@ -915,4 +916,4 @@ function sqimap_get_small_header($imap_s - return $res[0]; - } - --?> -\ No newline at end of file -+?> diff --git a/mail/ja-squirrelmail/patches/patch-ad b/mail/ja-squirrelmail/patches/patch-ad deleted file mode 100644 index 146320792fd..00000000000 --- a/mail/ja-squirrelmail/patches/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2005/12/05 09:28:44 martti Exp $ - ---- plugins/listcommands/setup.php.orig 2005-02-28 05:20:12.000000000 -0500 -+++ plugins/listcommands/setup.php -@@ -51,8 +51,9 @@ function plugin_listcommands_menu() { - } - - /* proto = {mailto,href} */ -- $proto = array_shift(array_keys($actions)); -- $act = array_shift($actions); -+ $aActionKeys = array_keys($actions); -+ $proto = array_shift($aActionKeys); -+ $act = array_shift($aActionKeys); - - if ($proto == 'mailto') { - diff --git a/mail/ja-squirrelmail/patches/patch-ae b/mail/ja-squirrelmail/patches/patch-ae deleted file mode 100644 index 4d649818f37..00000000000 --- a/mail/ja-squirrelmail/patches/patch-ae +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2005/12/05 09:28:44 martti Exp $ - ---- src/configtest.php.orig 2005-05-20 14:43:39.000000000 -0400 -+++ src/configtest.php -@@ -314,7 +314,7 @@ if (function_exists('recode')) { - echo "$IND iconv - "; - if (function_exists('iconv')) { - echo "Iconv functions are available.<br />\n"; --} elseif ($use_php_iconv) { -+} elseif (isset($use_php_iconv) && $use_php_iconv) { - echo "Iconv functions are unavailable.<br />\n"; - do_err('Your configuration requires iconv support, but iconv support is missing.'); - } else { -@@ -365,7 +365,8 @@ if(!empty($addrbook_dsn) || !empty($pref - } - - foreach($dsns as $type => $dsn) { -- $dbtype = array_shift(explode(':', $dsn)); -+ $aDsn = explode(':', $dsn); -+ $dbtype = array_shift($aDsn); - if(isset($db_functions[$dbtype]) && function_exists($db_functions[$dbtype])) { - echo "$IND$dbtype database support present.<br />\n"; - -@@ -380,7 +381,7 @@ if(!empty($addrbook_dsn) || !empty($pref - echo "$IND$type database connect successful.<br />\n"; - - } else { -- do_err($db.' database support not present!'); -+ do_err($dbtype.' database support not present!'); - } - } - } else { diff --git a/mail/ja-squirrelmail/patches/patch-af b/mail/ja-squirrelmail/patches/patch-af deleted file mode 100644 index 91e0a2aa0fc..00000000000 --- a/mail/ja-squirrelmail/patches/patch-af +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-af,v 1.1 2005/12/05 09:28:44 martti Exp $ - ---- src/search.php.orig 2005-06-22 03:05:59.000000000 -0400 -+++ src/search.php -@@ -297,7 +297,11 @@ echo html_tag( 'table', - /* update the recent and saved searches from the pref files */ - $attributes = get_recent($username, $data_dir); - $saved_attributes = get_saved($username, $data_dir); --$saved_count = count($saved_attributes['saved_what']); -+if (isset($saved_attributes['saved_what'])) { -+ $saved_count = count($saved_attributes['saved_what']); -+} else { -+ $saved_count = 0; -+} - $count_all = 0; - - /* Saved Search Table */ diff --git a/mail/ja-squirrelmail/patches/patch-ag b/mail/ja-squirrelmail/patches/patch-ag deleted file mode 100644 index b03b352f9f9..00000000000 --- a/mail/ja-squirrelmail/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2005/12/05 09:28:44 martti Exp $ - ---- src/download.php.orig 2004-12-27 17:03:59.000000000 +0200 -+++ src/download.php 2005-12-05 11:08:51.000000000 +0200 -@@ -55,7 +55,7 @@ - } - $subject = $message->rfc822_header->subject; - if ($ent_id) { -- $message = &$message->getEntity($ent_id); -+ $message = $message->getEntity($ent_id); - $header = $message->header; - - if ($message->rfc822_header) { diff --git a/mail/ja-squirrelmail/patches/patch-ah b/mail/ja-squirrelmail/patches/patch-ah deleted file mode 100644 index c86f299404a..00000000000 --- a/mail/ja-squirrelmail/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2005/12/05 20:14:35 martti Exp $ - ---- functions/imap_general.php.orig 2005-05-20 13:37:34.000000000 +0300 -+++ functions/imap_general.php 2005-12-05 22:08:12.000000000 +0200 -@@ -888,7 +888,7 @@ - * Saves a message to a given folder -- used for saving sent messages - */ - function sqimap_append ($imap_stream, $sent_folder, $length) { -- fputs ($imap_stream, sqimap_session_id() . " APPEND \"$sent_folder\" (\\Seen) \{$length}\r\n"); -+ fputs ($imap_stream, sqimap_session_id() . " APPEND \"$sent_folder\" (\\Seen) {".$length."}\r\n"); - $tmp = fgets ($imap_stream, 1024); - sqimap_append_checkresponse($tmp, $sent_folder); - } |