Index: branches/2017Q3/mail/squirrelmail/Makefile =================================================================== --- branches/2017Q3/mail/squirrelmail/Makefile (revision 448571) +++ branches/2017Q3/mail/squirrelmail/Makefile (revision 448572) @@ -1,92 +1,93 @@ # Created by: Simon Dick # $FreeBSD$ PORTNAME= squirrelmail -PORTVERSION= 20161030 +PORTVERSION= 20170705 CATEGORIES= mail www -MASTER_SITES= LOCAL/adamw/squirrelmail +MASTER_SITES= http://snapshots.squirrelmail.org/ \ + http://freebsd.uzsolt.hu/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}_0200-SVN.stable DIST_SUBDIR= ${PORTNAME} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= uzsolt@uzsolt.hu COMMENT= Webmail system which accesses mail over IMAP LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/doc/COPYING USES= cpe gettext perl5 php:web tar:bzip2 USE_PHP= session hash gettext mbstring pcre openssl xml USE_PERL5= run NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME}.stable/${PORTNAME} OPTIONS_DEFINE= DATABASE LDAP DOCS DATABASE_DESC= PDO database support (must also install a driver) DATABASE_USE= PHP=pdo LDAP_USE= PHP=ldap # if you were using WITHOUT_WWWDIR, use SQUIRRELDIR=${PREFIX}/squirrelmail SQUIRRELDIR?= ${WWWDIR} SMUSER?= ${WWWOWN} SMGROUP?= ${WWWGRP} USERS= ${SMUSER} GROUPS= ${SMGROUP} PLIST_SUB= PORTVERSION=${PORTVERSION} \ SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}" \ SMUSER=${SMUSER} \ SMGROUP=${SMGROUP} SUB_FILES= pkg-message SUB_LIST= SQUIRRELDIR=${SQUIRRELDIR} SMUSER=${SMUSER} SMGROUP=${SMGROUP} CONFLICTS= squirreloutlook-[0-9]* post-patch: @${REINPLACE_CMD} -e 's|ispell|${LOCALBASE}/bin/aspell|g' \ ${WRKSRC}/plugins/squirrelspell/sqspell_config.php @${REINPLACE_CMD} -e 's|/usr/bin/fortune|/usr/games/fortune|g' \ ${WRKSRC}/plugins/fortune/fortune_functions.php @${REINPLACE_CMD} -e 's|/var/local/squirrelmail|${SQUIRRELDIR}|g' \ ${WRKSRC}/config/conf.pl ${WRKSRC}/config/config_default.php ${WRKSRC}/doc/INSTALL do-build: # Rearrange the documentation @${MV} ${WRKSRC}/themes/README.themes ${WRKSRC}/doc @(cd ${WRKSRC} && \ for f in `${FIND} -E plugins -regex \ '.*(README.*|INSTALL|HISTORY)'`; \ do \ ${MKDIR} doc/`dirname $$f`; \ ${MV} $$f doc/`dirname $$f`; \ done) @${MV} ${WRKSRC}/doc/plugins/squirrelspell/doc/README ${WRKSRC}/doc/plugins/squirrelspell @${RM} -r ${WRKSRC}/doc/plugins/squirrelspell/doc @${MV} ${WRKSRC}/plugins/squirrelspell/doc/* ${WRKSRC}/doc/plugins/squirrelspell @${RM} ${WRKSRC}/doc/plugins/squirrelspell/index.php @${RM} -r ${WRKSRC}/plugins/squirrelspell/doc @${ECHO} "left_refresh=300" >> ${WRKSRC}/data/default_pref @${MV} ${WRKSRC}/config/config_local.php ${WRKSRC}/config/config_local.php.sample @${MV} ${WRKSRC}/data/default_pref ${WRKSRC}/data/default_pref.sample @${MKDIR} ${WRKSRC}/attach @${CP} -p ${WRKSRC}/data/.htaccess ${WRKSRC}/attach/.htaccess do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ${INSTALL_SCRIPT} ${FILESDIR}/111.clean-squirrelmail ${STAGEDIR}${PREFIX}/etc/periodic/daily @${MKDIR} ${STAGEDIR}${SQUIRRELDIR} ${INSTALL_DATA} ${WRKSRC}/index.php ${STAGEDIR}${SQUIRRELDIR} ${INSTALL_SCRIPT} ${WRKSRC}/configure ${STAGEDIR}${SQUIRRELDIR} (cd ${WRKSRC} && \ ${COPYTREE_SHARE} "attach class config data functions help images include locale plugins po scripts src themes" \ ${STAGEDIR}${SQUIRRELDIR}) do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include Index: branches/2017Q3/mail/squirrelmail/distinfo =================================================================== --- branches/2017Q3/mail/squirrelmail/distinfo (revision 448571) +++ branches/2017Q3/mail/squirrelmail/distinfo (revision 448572) @@ -1,3 +1,3 @@ -TIMESTAMP = 1477843339 -SHA256 (squirrelmail/squirrelmail-20161030_0200-SVN.stable.tar.bz2) = 5a187955b048e557276b73c74bc38dfa78e2f63e4d3273163ef1e5283f2874e6 -SIZE (squirrelmail/squirrelmail-20161030_0200-SVN.stable.tar.bz2) = 560672 +TIMESTAMP = 1499253804 +SHA256 (squirrelmail/squirrelmail-20170705_0200-SVN.stable.tar.bz2) = 53ff6540eb46f737bb631f6d5e0fb80c19b42ab33b1e28a38b4bc469e26a63a8 +SIZE (squirrelmail/squirrelmail-20170705_0200-SVN.stable.tar.bz2) = 563043 Index: branches/2017Q3/mail/squirrelmail/files/patch-functions__i18n.php =================================================================== --- branches/2017Q3/mail/squirrelmail/files/patch-functions__i18n.php (revision 448571) +++ branches/2017Q3/mail/squirrelmail/files/patch-functions__i18n.php (revision 448572) @@ -1,12 +1,32 @@ ---- functions/i18n.php.orig 2015-01-03 03:56:32 UTC +--- functions/i18n.php.orig 2017-07-05 11:28:23 UTC +++ functions/i18n.php -@@ -683,7 +683,8 @@ function japanese_charset_xtra() { - $useragent = func_get_arg(2); - if (strstr($useragent, 'Windows') !== false || - strstr($useragent, 'Mac_') !== false) { -- $ret = mb_convert_encoding($ret, 'SJIS', 'AUTO'); -+ $ret = mb_convert_encoding($ret, 'UTF-8', 'AUTO'); -+ - } else { - $ret = mb_convert_encoding($ret, 'EUC-JP', 'AUTO'); +@@ -159,15 +159,17 @@ function sq_setlocale($category,$locale) } + + /** +- * Converts string from given charset to charset, that can be displayed by user translation. ++ * Converts a string from the given $charset to a character set that ++ * can be displayed by the current user interface language (translation) + * +- * Function by default returns html encoded strings, if translation uses different encoding. ++ * Function by default returns html encoded strings if translation uses ++ * different encoding. + * If Japanese translation is used - function returns string converted to euc-jp + * If $charset is not supported - function returns unconverted string. + * + * sanitizing of html tags is also done by this function. + * +- * @param string $charset ++ * @param string $charset The charset of the incoming string + * @param string $string Text to be decoded + * @param boolean $force_decode converts string to html without $charset!=$default_charset check. + * Argument is available since 1.4.5 and 1.5.1. +@@ -184,7 +186,7 @@ function charset_decode ($charset, $stri + } + + /* All HTML special characters are 7 bit and can be replaced first */ +- if (! $save_html) $string = sm_encode_html_special_chars ($string); ++ if (! $save_html) $string = sm_encode_html_special_chars($string, ENT_COMPAT, $charset); + $charset = strtolower($charset); + + set_my_charset(); Index: branches/2017Q3/mail/squirrelmail/files/patch-functions_strings.php =================================================================== --- branches/2017Q3/mail/squirrelmail/files/patch-functions_strings.php (nonexistent) +++ branches/2017Q3/mail/squirrelmail/files/patch-functions_strings.php (revision 448572) @@ -0,0 +1,71 @@ +--- functions/strings.php.orig 2017-01-27 20:31:33 UTC ++++ functions/strings.php +@@ -1489,7 +1489,13 @@ function sm_validate_security_token($tok + * (See http://php.net/manual/function.htmlspecialchars.php ) + * (OPTIONAL; default ENT_COMPAT, ENT_COMPAT | ENT_SUBSTITUTE for PHP >=5.4) + * @param string $encoding The character encoding to use in the conversion +- * (OPTIONAL; default automatic detection) ++ * (if not one of the character sets supported ++ * by PHP's htmlspecialchars(), then $encoding ++ * will be ignored and iso-8859-1 will be used, ++ * unless a default has been specified in ++ * $default_htmlspecialchars_encoding in ++ * config_local.php) (OPTIONAL; default automatic ++ * detection) + * @param boolean $double_encode Whether or not to convert entities that are + * already in the string (only supported in + * PHP 5.2.3+) (OPTIONAL; default TRUE) +@@ -1500,6 +1506,31 @@ function sm_validate_security_token($tok + function sm_encode_html_special_chars($string, $flags=ENT_COMPAT, + $encoding=NULL, $double_encode=TRUE) + { ++ ++ // charsets supported by PHP's htmlspecialchars ++ // (move this elsewhere if needed) ++ // ++ static $htmlspecialchars_charsets = array( ++ 'iso-8859-1', 'iso8859-1', ++ 'iso-8859-5', 'iso8859-5', ++ 'iso-8859-15', 'iso8859-15', ++ 'utf-8', ++ 'cp866', 'ibm866', '866', ++ 'cp1251', 'windows-1251', 'win-1251', '1251', ++ 'cp1252', 'windows-1252', '1252', ++ 'koi8-R', 'koi8-ru', 'koi8r', ++ 'big5', '950', ++ 'gb2312', '936', ++ 'big5-hkscs', ++ 'shift_jis', 'sjis', 'sjis-win', 'cp932', '932', ++ 'euc-jp', 'eucjp', 'eucjp-win', ++ 'macroman', ++ ); ++ ++ ++ // if not given, set encoding to the charset being ++ // used by the current user interface language ++ // + if (!$encoding) + { + global $default_charset; +@@ -1508,6 +1539,21 @@ function sm_encode_html_special_chars($s + $encoding = $default_charset; + } + ++ ++ // make sure htmlspecialchars() supports the needed encoding ++ // ++ if (!in_array(strtolower($encoding), $htmlspecialchars_charsets)) ++ { ++ // use default from configuration if provided or hard-coded fallback ++ // ++ global $default_htmlspecialchars_encoding; ++ if (!empty($default_htmlspecialchars_encoding)) ++ $encoding = $default_htmlspecialchars_encoding; ++ else ++ $encoding = 'iso-8859-1'; ++ } ++ ++ + if (check_php_version(5, 2, 3)) { + // Replace invalid characters with a symbol instead of returning + // empty string for the entire to be encoded string. Property changes on: branches/2017Q3/mail/squirrelmail/files/patch-functions_strings.php ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q3/mail/squirrelmail/pkg-plist =================================================================== --- branches/2017Q3/mail/squirrelmail/pkg-plist (revision 448571) +++ branches/2017Q3/mail/squirrelmail/pkg-plist (revision 448572) @@ -1,466 +1,467 @@ etc/periodic/daily/111.clean-squirrelmail %%SQUIRRELDIR%%/attach/.htaccess %%SQUIRRELDIR%%/class/.htaccess %%SQUIRRELDIR%%/class/deliver/Deliver.class.php %%SQUIRRELDIR%%/class/deliver/Deliver_IMAP.class.php %%SQUIRRELDIR%%/class/deliver/Deliver_SMTP.class.php %%SQUIRRELDIR%%/class/deliver/Deliver_SendMail.class.php %%SQUIRRELDIR%%/class/deliver/index.php %%SQUIRRELDIR%%/class/helper/VCard.class.php %%SQUIRRELDIR%%/class/helper/index.php %%SQUIRRELDIR%%/class/html.class.php %%SQUIRRELDIR%%/class/index.php %%SQUIRRELDIR%%/class/mime.class.php %%SQUIRRELDIR%%/class/mime/AddressStructure.class.php %%SQUIRRELDIR%%/class/mime/ContentType.class.php %%SQUIRRELDIR%%/class/mime/Disposition.class.php %%SQUIRRELDIR%%/class/mime/Language.class.php %%SQUIRRELDIR%%/class/mime/Message.class.php %%SQUIRRELDIR%%/class/mime/MessageHeader.class.php %%SQUIRRELDIR%%/class/mime/Rfc822Header.class.php %%SQUIRRELDIR%%/class/mime/SMimeMessage.class.php %%SQUIRRELDIR%%/class/mime/index.php %%SQUIRRELDIR%%/config/.htaccess @(,,755) %%SQUIRRELDIR%%/config/conf.pl %%SQUIRRELDIR%%/config/config_default.php @sample %%SQUIRRELDIR%%/config/config_local.php.sample %%SQUIRRELDIR%%/config/index.php %%SQUIRRELDIR%%/configure %%SQUIRRELDIR%%/data/.htaccess @sample %%SQUIRRELDIR%%/data/default_pref.sample %%SQUIRRELDIR%%/data/index.php %%SQUIRRELDIR%%/functions/.htaccess %%SQUIRRELDIR%%/functions/abook_database.php %%SQUIRRELDIR%%/functions/abook_ldap_server.php %%SQUIRRELDIR%%/functions/abook_local_file.php %%SQUIRRELDIR%%/functions/addressbook.php %%SQUIRRELDIR%%/functions/attachment_common.php %%SQUIRRELDIR%%/functions/auth.php %%SQUIRRELDIR%%/functions/constants.php %%SQUIRRELDIR%%/functions/date.php %%SQUIRRELDIR%%/functions/db_prefs.php %%SQUIRRELDIR%%/functions/decode/cp1250.php %%SQUIRRELDIR%%/functions/decode/cp1251.php %%SQUIRRELDIR%%/functions/decode/cp1252.php %%SQUIRRELDIR%%/functions/decode/cp1253.php %%SQUIRRELDIR%%/functions/decode/cp1254.php %%SQUIRRELDIR%%/functions/decode/cp1255.php %%SQUIRRELDIR%%/functions/decode/cp1256.php %%SQUIRRELDIR%%/functions/decode/cp1257.php %%SQUIRRELDIR%%/functions/decode/cp1258.php %%SQUIRRELDIR%%/functions/decode/cp855.php %%SQUIRRELDIR%%/functions/decode/cp866.php %%SQUIRRELDIR%%/functions/decode/index.php %%SQUIRRELDIR%%/functions/decode/iso_8859_1.php %%SQUIRRELDIR%%/functions/decode/iso_8859_10.php %%SQUIRRELDIR%%/functions/decode/iso_8859_11.php %%SQUIRRELDIR%%/functions/decode/iso_8859_13.php %%SQUIRRELDIR%%/functions/decode/iso_8859_14.php %%SQUIRRELDIR%%/functions/decode/iso_8859_15.php %%SQUIRRELDIR%%/functions/decode/iso_8859_16.php %%SQUIRRELDIR%%/functions/decode/iso_8859_2.php %%SQUIRRELDIR%%/functions/decode/iso_8859_3.php %%SQUIRRELDIR%%/functions/decode/iso_8859_4.php %%SQUIRRELDIR%%/functions/decode/iso_8859_5.php %%SQUIRRELDIR%%/functions/decode/iso_8859_6.php %%SQUIRRELDIR%%/functions/decode/iso_8859_7.php %%SQUIRRELDIR%%/functions/decode/iso_8859_8.php %%SQUIRRELDIR%%/functions/decode/iso_8859_9.php %%SQUIRRELDIR%%/functions/decode/iso_ir_111.php %%SQUIRRELDIR%%/functions/decode/koi8_r.php %%SQUIRRELDIR%%/functions/decode/koi8_u.php %%SQUIRRELDIR%%/functions/decode/ns_4551_1.php %%SQUIRRELDIR%%/functions/decode/tis_620.php %%SQUIRRELDIR%%/functions/decode/us_ascii.php %%SQUIRRELDIR%%/functions/decode/utf_8.php %%SQUIRRELDIR%%/functions/display_messages.php %%SQUIRRELDIR%%/functions/encode/cp1251.php %%SQUIRRELDIR%%/functions/encode/cp1255.php %%SQUIRRELDIR%%/functions/encode/cp1256.php %%SQUIRRELDIR%%/functions/encode/index.php %%SQUIRRELDIR%%/functions/encode/iso_8859_1.php %%SQUIRRELDIR%%/functions/encode/iso_8859_15.php %%SQUIRRELDIR%%/functions/encode/iso_8859_2.php %%SQUIRRELDIR%%/functions/encode/iso_8859_7.php %%SQUIRRELDIR%%/functions/encode/iso_8859_9.php %%SQUIRRELDIR%%/functions/encode/koi8_r.php %%SQUIRRELDIR%%/functions/encode/koi8_u.php %%SQUIRRELDIR%%/functions/encode/tis_620.php %%SQUIRRELDIR%%/functions/encode/us_ascii.php %%SQUIRRELDIR%%/functions/encode/utf_8.php %%SQUIRRELDIR%%/functions/file_prefs.php %%SQUIRRELDIR%%/functions/forms.php %%SQUIRRELDIR%%/functions/gettext.php %%SQUIRRELDIR%%/functions/global.php %%SQUIRRELDIR%%/functions/html.php %%SQUIRRELDIR%%/functions/i18n.php %%SQUIRRELDIR%%/functions/identity.php %%SQUIRRELDIR%%/functions/imap.php %%SQUIRRELDIR%%/functions/imap_general.php %%SQUIRRELDIR%%/functions/imap_mailbox.php %%SQUIRRELDIR%%/functions/imap_messages.php %%SQUIRRELDIR%%/functions/imap_search.php %%SQUIRRELDIR%%/functions/imap_utf7_local.php %%SQUIRRELDIR%%/functions/index.php %%SQUIRRELDIR%%/functions/mailbox_display.php %%SQUIRRELDIR%%/functions/mime.php %%SQUIRRELDIR%%/functions/options.php %%SQUIRRELDIR%%/functions/page_header.php %%SQUIRRELDIR%%/functions/plugin.php %%SQUIRRELDIR%%/functions/prefs.php %%SQUIRRELDIR%%/functions/strings.php %%SQUIRRELDIR%%/functions/tree.php %%SQUIRRELDIR%%/functions/url_parser.php %%SQUIRRELDIR%%/help/.htaccess %%SQUIRRELDIR%%/help/en_US/FAQ.hlp %%SQUIRRELDIR%%/help/en_US/addresses.hlp %%SQUIRRELDIR%%/help/en_US/basic.hlp %%SQUIRRELDIR%%/help/en_US/compose.hlp %%SQUIRRELDIR%%/help/en_US/folders.hlp %%SQUIRRELDIR%%/help/en_US/main_folder.hlp %%SQUIRRELDIR%%/help/en_US/options.hlp %%SQUIRRELDIR%%/help/en_US/read_mail.hlp %%SQUIRRELDIR%%/help/en_US/search.hlp %%SQUIRRELDIR%%/help/index.php %%SQUIRRELDIR%%/images/blank.png %%SQUIRRELDIR%%/images/delitem.png %%SQUIRRELDIR%%/images/down_pointer.png %%SQUIRRELDIR%%/images/draft.png %%SQUIRRELDIR%%/images/folder.png %%SQUIRRELDIR%%/images/inbox.png %%SQUIRRELDIR%%/images/index.php %%SQUIRRELDIR%%/images/minus.png %%SQUIRRELDIR%%/images/plus.png %%SQUIRRELDIR%%/images/sec_remove_eng.png %%SQUIRRELDIR%%/images/senti.png %%SQUIRRELDIR%%/images/sm_logo.png %%SQUIRRELDIR%%/images/sort_none.png %%SQUIRRELDIR%%/images/spacer.png %%SQUIRRELDIR%%/images/up_pointer.png %%SQUIRRELDIR%%/include/.htaccess %%SQUIRRELDIR%%/include/index.php %%SQUIRRELDIR%%/include/load_prefs.php %%SQUIRRELDIR%%/include/options/display.php %%SQUIRRELDIR%%/include/options/folder.php %%SQUIRRELDIR%%/include/options/index.php %%SQUIRRELDIR%%/include/options/personal.php %%SQUIRRELDIR%%/include/validate.php %%SQUIRRELDIR%%/index.php %%SQUIRRELDIR%%/locale/.htaccess %%SQUIRRELDIR%%/locale/README.locales %%SQUIRRELDIR%%/locale/index.php %%SQUIRRELDIR%%/locale/timezones.cfg %%SQUIRRELDIR%%/plugins/administrator/auth.php %%SQUIRRELDIR%%/plugins/administrator/defines.php %%SQUIRRELDIR%%/plugins/administrator/index.php %%SQUIRRELDIR%%/plugins/administrator/options.php %%SQUIRRELDIR%%/plugins/administrator/setup.php %%SQUIRRELDIR%%/plugins/bug_report/bug_report.php %%SQUIRRELDIR%%/plugins/bug_report/functions.php %%SQUIRRELDIR%%/plugins/bug_report/index.php %%SQUIRRELDIR%%/plugins/bug_report/setup.php %%SQUIRRELDIR%%/plugins/calendar/calendar.php %%SQUIRRELDIR%%/plugins/calendar/calendar_data.php %%SQUIRRELDIR%%/plugins/calendar/day.php %%SQUIRRELDIR%%/plugins/calendar/event_create.php %%SQUIRRELDIR%%/plugins/calendar/event_delete.php %%SQUIRRELDIR%%/plugins/calendar/event_edit.php %%SQUIRRELDIR%%/plugins/calendar/functions.php %%SQUIRRELDIR%%/plugins/calendar/index.php %%SQUIRRELDIR%%/plugins/calendar/setup.php %%SQUIRRELDIR%%/plugins/delete_move_next/index.php %%SQUIRRELDIR%%/plugins/delete_move_next/setup.php %%SQUIRRELDIR%%/plugins/demo/COPYING %%SQUIRRELDIR%%/plugins/demo/demo.php %%SQUIRRELDIR%%/plugins/demo/demo.pot %%SQUIRRELDIR%%/plugins/demo/functions.php %%SQUIRRELDIR%%/plugins/demo/getpot %%SQUIRRELDIR%%/plugins/demo/index.php %%SQUIRRELDIR%%/plugins/demo/setup.php %%SQUIRRELDIR%%/plugins/filters/bulkquery/Makefile %%SQUIRRELDIR%%/plugins/filters/bulkquery/bq.in %%SQUIRRELDIR%%/plugins/filters/bulkquery/bq.out %%SQUIRRELDIR%%/plugins/filters/bulkquery/bulkquery.c %%SQUIRRELDIR%%/plugins/filters/bulkquery/index.php %%SQUIRRELDIR%%/plugins/filters/filters.php %%SQUIRRELDIR%%/plugins/filters/index.php %%SQUIRRELDIR%%/plugins/filters/options.php %%SQUIRRELDIR%%/plugins/filters/setup.php %%SQUIRRELDIR%%/plugins/filters/spamoptions.php %%SQUIRRELDIR%%/plugins/fortune/fortune_functions.php %%SQUIRRELDIR%%/plugins/fortune/index.php %%SQUIRRELDIR%%/plugins/fortune/setup.php %%SQUIRRELDIR%%/plugins/index.php %%SQUIRRELDIR%%/plugins/info/functions.php %%SQUIRRELDIR%%/plugins/info/index.php %%SQUIRRELDIR%%/plugins/info/options.php %%SQUIRRELDIR%%/plugins/info/setup.php %%SQUIRRELDIR%%/plugins/listcommands/index.php %%SQUIRRELDIR%%/plugins/listcommands/mailout.php %%SQUIRRELDIR%%/plugins/listcommands/setup.php %%SQUIRRELDIR%%/plugins/mail_fetch/class.POP3.php %%SQUIRRELDIR%%/plugins/mail_fetch/config_example.php %%SQUIRRELDIR%%/plugins/mail_fetch/fetch.php %%SQUIRRELDIR%%/plugins/mail_fetch/functions.php %%SQUIRRELDIR%%/plugins/mail_fetch/index.php %%SQUIRRELDIR%%/plugins/mail_fetch/options.php %%SQUIRRELDIR%%/plugins/mail_fetch/setup.php %%SQUIRRELDIR%%/plugins/message_details/index.php %%SQUIRRELDIR%%/plugins/message_details/message_details_bottom.php %%SQUIRRELDIR%%/plugins/message_details/message_details_main.php %%SQUIRRELDIR%%/plugins/message_details/message_details_top.php %%SQUIRRELDIR%%/plugins/message_details/setup.php %%SQUIRRELDIR%%/plugins/newmail/index.php %%SQUIRRELDIR%%/plugins/newmail/newmail.php %%SQUIRRELDIR%%/plugins/newmail/newmail_opt.php %%SQUIRRELDIR%%/plugins/newmail/setup.php %%SQUIRRELDIR%%/plugins/newmail/sounds/FanFair.wav %%SQUIRRELDIR%%/plugins/newmail/sounds/Friends.wav %%SQUIRRELDIR%%/plugins/newmail/sounds/MontyPython.wav %%SQUIRRELDIR%%/plugins/newmail/sounds/Notify.wav %%SQUIRRELDIR%%/plugins/newmail/sounds/index.php %%SQUIRRELDIR%%/plugins/newmail/testsound.php %%SQUIRRELDIR%%/plugins/sent_subfolders/index.php %%SQUIRRELDIR%%/plugins/sent_subfolders/setup.php %%SQUIRRELDIR%%/plugins/spamcop/index.php %%SQUIRRELDIR%%/plugins/spamcop/options.php %%SQUIRRELDIR%%/plugins/spamcop/setup.php %%SQUIRRELDIR%%/plugins/spamcop/spamcop.php %%SQUIRRELDIR%%/plugins/squirrelspell/index.php %%SQUIRRELDIR%%/plugins/squirrelspell/js/WHATISTHIS %%SQUIRRELDIR%%/plugins/squirrelspell/js/check_me.js %%SQUIRRELDIR%%/plugins/squirrelspell/js/crypto_settings.js %%SQUIRRELDIR%%/plugins/squirrelspell/js/decrypt_error.js %%SQUIRRELDIR%%/plugins/squirrelspell/js/index.php %%SQUIRRELDIR%%/plugins/squirrelspell/js/init.js %%SQUIRRELDIR%%/plugins/squirrelspell/modules/.htaccess %%SQUIRRELDIR%%/plugins/squirrelspell/modules/WHATISTHIS +%%SQUIRRELDIR%%/plugins/squirrelspell/modules/change_main_options.mod %%SQUIRRELDIR%%/plugins/squirrelspell/modules/check_me.mod %%SQUIRRELDIR%%/plugins/squirrelspell/modules/crypto.mod %%SQUIRRELDIR%%/plugins/squirrelspell/modules/crypto_badkey.mod %%SQUIRRELDIR%%/plugins/squirrelspell/modules/edit_dic.mod %%SQUIRRELDIR%%/plugins/squirrelspell/modules/enc_setup.mod %%SQUIRRELDIR%%/plugins/squirrelspell/modules/forget_me.mod %%SQUIRRELDIR%%/plugins/squirrelspell/modules/forget_me_not.mod %%SQUIRRELDIR%%/plugins/squirrelspell/modules/index.php %%SQUIRRELDIR%%/plugins/squirrelspell/modules/init.mod %%SQUIRRELDIR%%/plugins/squirrelspell/modules/lang_change.mod %%SQUIRRELDIR%%/plugins/squirrelspell/modules/lang_setup.mod %%SQUIRRELDIR%%/plugins/squirrelspell/modules/options_main.mod %%SQUIRRELDIR%%/plugins/squirrelspell/setup.php %%SQUIRRELDIR%%/plugins/squirrelspell/sqspell_config.php %%SQUIRRELDIR%%/plugins/squirrelspell/sqspell_functions.php %%SQUIRRELDIR%%/plugins/squirrelspell/sqspell_interface.php %%SQUIRRELDIR%%/plugins/squirrelspell/sqspell_options.php %%SQUIRRELDIR%%/plugins/test/COPYING %%SQUIRRELDIR%%/plugins/test/decodeheader.php %%SQUIRRELDIR%%/plugins/test/functions.php %%SQUIRRELDIR%%/plugins/test/index.php %%SQUIRRELDIR%%/plugins/test/ngettext.php %%SQUIRRELDIR%%/plugins/test/setup.php %%SQUIRRELDIR%%/plugins/test/test.php %%SQUIRRELDIR%%/plugins/translate/index.php %%SQUIRRELDIR%%/plugins/translate/options.php %%SQUIRRELDIR%%/plugins/translate/setup.php %%SQUIRRELDIR%%/po/.htaccess %%SQUIRRELDIR%%/po/compilepo %%SQUIRRELDIR%%/po/independent_strings.txt %%SQUIRRELDIR%%/po/index.php %%SQUIRRELDIR%%/po/mergepo %%SQUIRRELDIR%%/po/squirrelmail.pot %%SQUIRRELDIR%%/po/xgetpo %%SQUIRRELDIR%%/scripts/common.js %%SQUIRRELDIR%%/scripts/index.php %%SQUIRRELDIR%%/scripts/reload_page.js %%SQUIRRELDIR%%/scripts/remote_request.js %%SQUIRRELDIR%%/src/addrbook_popup.php %%SQUIRRELDIR%%/src/addrbook_search.php %%SQUIRRELDIR%%/src/addrbook_search_html.php %%SQUIRRELDIR%%/src/addressbook.php %%SQUIRRELDIR%%/src/compose.php %%SQUIRRELDIR%%/src/configtest.php %%SQUIRRELDIR%%/src/delete_message.php %%SQUIRRELDIR%%/src/download.php %%SQUIRRELDIR%%/src/empty_trash.php %%SQUIRRELDIR%%/src/folders.php %%SQUIRRELDIR%%/src/folders_create.php %%SQUIRRELDIR%%/src/folders_delete.php %%SQUIRRELDIR%%/src/folders_rename_do.php %%SQUIRRELDIR%%/src/folders_rename_getname.php %%SQUIRRELDIR%%/src/folders_subscribe.php %%SQUIRRELDIR%%/src/help.php %%SQUIRRELDIR%%/src/image.php %%SQUIRRELDIR%%/src/index.php %%SQUIRRELDIR%%/src/left_main.php %%SQUIRRELDIR%%/src/login.php %%SQUIRRELDIR%%/src/mailto.php %%SQUIRRELDIR%%/src/move_messages.php %%SQUIRRELDIR%%/src/options.php %%SQUIRRELDIR%%/src/options_highlight.php %%SQUIRRELDIR%%/src/options_identities.php %%SQUIRRELDIR%%/src/options_order.php %%SQUIRRELDIR%%/src/printer_friendly_bottom.php %%SQUIRRELDIR%%/src/printer_friendly_main.php %%SQUIRRELDIR%%/src/printer_friendly_top.php %%SQUIRRELDIR%%/src/read_body.php %%SQUIRRELDIR%%/src/redirect.php %%SQUIRRELDIR%%/src/right_main.php %%SQUIRRELDIR%%/src/search.php %%SQUIRRELDIR%%/src/signout.php %%SQUIRRELDIR%%/src/vcard.php %%SQUIRRELDIR%%/src/view_header.php %%SQUIRRELDIR%%/src/view_text.php %%SQUIRRELDIR%%/src/webmail.php %%SQUIRRELDIR%%/themes/alien_glow.php %%SQUIRRELDIR%%/themes/autumn.php %%SQUIRRELDIR%%/themes/autumn2.php %%SQUIRRELDIR%%/themes/black_bean_burrito_theme.php %%SQUIRRELDIR%%/themes/blue_grey_theme.php %%SQUIRRELDIR%%/themes/blue_on_blue.php %%SQUIRRELDIR%%/themes/bluesnews_theme.php %%SQUIRRELDIR%%/themes/bluesome.php %%SQUIRRELDIR%%/themes/bluesteel_theme.php %%SQUIRRELDIR%%/themes/christmas.php %%SQUIRRELDIR%%/themes/classic_blue.php %%SQUIRRELDIR%%/themes/classic_blue2.php %%SQUIRRELDIR%%/themes/css/comic-sans-08.css %%SQUIRRELDIR%%/themes/css/comic-sans-10.css %%SQUIRRELDIR%%/themes/css/comic-sans-12.css %%SQUIRRELDIR%%/themes/css/index.php %%SQUIRRELDIR%%/themes/css/sans-08.css %%SQUIRRELDIR%%/themes/css/sans-10.css %%SQUIRRELDIR%%/themes/css/sans-12.css %%SQUIRRELDIR%%/themes/css/serif-10.css %%SQUIRRELDIR%%/themes/css/serif-12.css %%SQUIRRELDIR%%/themes/css/tahoma-08.css %%SQUIRRELDIR%%/themes/css/tahoma-10.css %%SQUIRRELDIR%%/themes/css/tahoma-12.css %%SQUIRRELDIR%%/themes/css/verdana-08.css %%SQUIRRELDIR%%/themes/css/verdana-10.css %%SQUIRRELDIR%%/themes/css/verdana-12.css %%SQUIRRELDIR%%/themes/dark_green.php %%SQUIRRELDIR%%/themes/dark_grey_theme.php %%SQUIRRELDIR%%/themes/darkness.php %%SQUIRRELDIR%%/themes/deepocean2_theme.php %%SQUIRRELDIR%%/themes/deepocean_theme.php %%SQUIRRELDIR%%/themes/default_theme.php %%SQUIRRELDIR%%/themes/dompie_theme.php %%SQUIRRELDIR%%/themes/forest_theme.php %%SQUIRRELDIR%%/themes/greenhouse_effect.php %%SQUIRRELDIR%%/themes/high_contrast_theme.php %%SQUIRRELDIR%%/themes/ice_theme.php %%SQUIRRELDIR%%/themes/in_the_pink.php %%SQUIRRELDIR%%/themes/index.php %%SQUIRRELDIR%%/themes/kind_of_blue.php %%SQUIRRELDIR%%/themes/maize_theme.php %%SQUIRRELDIR%%/themes/methodical_theme.php %%SQUIRRELDIR%%/themes/midnight.php %%SQUIRRELDIR%%/themes/minimal_bw.php %%SQUIRRELDIR%%/themes/monostochastic.php %%SQUIRRELDIR%%/themes/netstyle_theme.php %%SQUIRRELDIR%%/themes/penguin.php %%SQUIRRELDIR%%/themes/plain_blue_theme.php %%SQUIRRELDIR%%/themes/powder_blue.php %%SQUIRRELDIR%%/themes/purple_theme.php %%SQUIRRELDIR%%/themes/random.php %%SQUIRRELDIR%%/themes/redmond.php %%SQUIRRELDIR%%/themes/sandstorm_theme.php %%SQUIRRELDIR%%/themes/seaspray_theme.php %%SQUIRRELDIR%%/themes/servery_theme.php %%SQUIRRELDIR%%/themes/shades_of_grey.php %%SQUIRRELDIR%%/themes/silver_steel_theme.php %%SQUIRRELDIR%%/themes/simple_green2.php %%SQUIRRELDIR%%/themes/simple_green_theme.php %%SQUIRRELDIR%%/themes/simple_purple.php %%SQUIRRELDIR%%/themes/slashdot_theme.php %%SQUIRRELDIR%%/themes/solarized_dark.php %%SQUIRRELDIR%%/themes/solarized_light.php %%SQUIRRELDIR%%/themes/spice_of_life.php %%SQUIRRELDIR%%/themes/spice_of_life_dark.php %%SQUIRRELDIR%%/themes/spice_of_life_lite.php %%SQUIRRELDIR%%/themes/techno_blue.php %%SQUIRRELDIR%%/themes/turquoise.php %%SQUIRRELDIR%%/themes/wood_theme.php %%PORTDOCS%%%%DOCSDIR%%/.htaccess %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.themes %%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes %%PORTDOCS%%%%DOCSDIR%%/UPGRADE %%PORTDOCS%%%%DOCSDIR%%/authentication.txt %%PORTDOCS%%%%DOCSDIR%%/ie_ssl.txt %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/index.php %%PORTDOCS%%%%DOCSDIR%%/plugins/README.plugins %%PORTDOCS%%%%DOCSDIR%%/plugins/administrator/INSTALL %%PORTDOCS%%%%DOCSDIR%%/plugins/bug_report/README %%PORTDOCS%%%%DOCSDIR%%/plugins/calendar/README %%PORTDOCS%%%%DOCSDIR%%/plugins/delete_move_next/README %%PORTDOCS%%%%DOCSDIR%%/plugins/demo/INSTALL %%PORTDOCS%%%%DOCSDIR%%/plugins/demo/README %%PORTDOCS%%%%DOCSDIR%%/plugins/filters/README %%PORTDOCS%%%%DOCSDIR%%/plugins/filters/bulkquery/INSTALL %%PORTDOCS%%%%DOCSDIR%%/plugins/filters/bulkquery/README %%PORTDOCS%%%%DOCSDIR%%/plugins/fortune/README %%PORTDOCS%%%%DOCSDIR%%/plugins/info/README %%PORTDOCS%%%%DOCSDIR%%/plugins/listcommands/README %%PORTDOCS%%%%DOCSDIR%%/plugins/mail_fetch/README %%PORTDOCS%%%%DOCSDIR%%/plugins/newmail/HISTORY %%PORTDOCS%%%%DOCSDIR%%/plugins/newmail/README %%PORTDOCS%%%%DOCSDIR%%/plugins/spamcop/README %%PORTDOCS%%%%DOCSDIR%%/plugins/squirrelspell/CRYPTO %%PORTDOCS%%%%DOCSDIR%%/plugins/squirrelspell/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/plugins/squirrelspell/INSTALL %%PORTDOCS%%%%DOCSDIR%%/plugins/squirrelspell/PRIVACY %%PORTDOCS%%%%DOCSDIR%%/plugins/squirrelspell/README %%PORTDOCS%%%%DOCSDIR%%/plugins/squirrelspell/UPGRADING %%PORTDOCS%%%%DOCSDIR%%/plugins/test/INSTALL %%PORTDOCS%%%%DOCSDIR%%/plugins/test/README %%PORTDOCS%%%%DOCSDIR%%/plugins/translate/README %%PORTDOCS%%%%DOCSDIR%%/presets.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.2/Notes-1.2.0.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.2/Notes-1.2.1.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.2/Notes-1.2.2.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.2/Notes-1.2.3.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.2/Notes-1.2.4.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.2/Notes-1.2.5.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.2/Notes-1.2.6.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.3/Notes-1.3.0.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.3/Notes-1.3.1.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.3/Notes-1.3.2.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.0.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.1.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.10.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.10a.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.11.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.12.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.13.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.15.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.16.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.17.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.18.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.19.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.2.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.20-RC2.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.20.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.20RC1.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.21.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.22.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.3.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.3a.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.4.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.5.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.6.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.7.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.8.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.9.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_archive/1.4/Notes-1.4.9a.txt %%PORTDOCS%%%%DOCSDIR%%/russian_apache.txt %%PORTDOCS%%%%DOCSDIR%%/security.txt %%PORTDOCS%%%%DOCSDIR%%/translating.txt %%PORTDOCS%%%%DOCSDIR%%/translating_help.txt @dir(%%SMUSER%%,%%SMGROUP%%,0750) %%SQUIRRELDIR%%/data @dir(%%SMUSER%%,%%SMGROUP%%,0730) %%SQUIRRELDIR%%/attach Index: branches/2017Q3 =================================================================== --- branches/2017Q3 (revision 448571) +++ branches/2017Q3 (revision 448572) Property changes on: branches/2017Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r448570