summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsalo <salo>2006-03-15 12:07:54 +0000
committersalo <salo>2006-03-15 12:07:54 +0000
commitc803467adae8e6fdd75a9ee4cf0a2bcbc2b5e4db (patch)
treeca593fe789f30d676f00a3c659458ac1cfc6f158
parent0250cdf72524999efbf186dafc330b2e79e1ac37 (diff)
downloadpkgsrc-c803467adae8e6fdd75a9ee4cf0a2bcbc2b5e4db.tar.gz
Pullup ticket 1186 - requested by Martti Kuparinen
security update for squirrelmail Revisions pulled up: - pkgsrc/mail/squirrelmail/Makefile 1.65, 1.66, 1.68, 1.69 - pkgsrc/mail/squirrelmail/PLIST 1.17 - pkgsrc/mail/squirrelmail/buildlink3.mk 1.6, 1.7 - pkgsrc/mail/squirrelmail/distinfo 1.30 - pkgsrc/mail/squirrelmail/patches/patch-ab removed - pkgsrc/mail/squirrelmail/patches/patch-ac removed - pkgsrc/mail/squirrelmail/patches/patch-ad removed - pkgsrc/mail/squirrelmail/patches/patch-ae removed - pkgsrc/mail/squirrelmail/patches/patch-af removed - pkgsrc/mail/squirrelmail/patches/patch-ag removed - pkgsrc/mail/squirrelmail/patches/patch-ah removed - pkgsrc/mail/squirrelmail/plugin.mk 1.3 - pkgsrc/mail/squirrelmail-decode/Makefile 1.3 - pkgsrc/mail/squirrelmail-locales/Makefile 1.11, 1.12, 1.13, 1.14 - pkgsrc/mail/squirrelmail-locales/PLIST 1.5, 1.6, 1.7 - pkgsrc/mail/squirrelmail-locales/distinfo 1.4 - pkgsrc/mail/ja-squirrelmail/Makefile 1.23, 1.24, 1.26 Module Name: pkgsrc Committed By: joerg Date: Fri Jan 20 23:56:59 UTC 2006 Modified Files: pkgsrc/mail/squirrelmail: Makefile Log Message: Use SUBST framework. Replace some "find foo | xargs bar" with "find foo -exec bar {} \;" while here, the former is faster, but can't cope with all quoting issues and is also more likely to hit argument length limits. CONFLICT to ja-squirrelmail. --- Module Name: pkgsrc Committed By: joerg Date: Fri Jan 20 23:57:26 UTC 2006 Modified Files: pkgsrc/mail/ja-squirrelmail: Makefile Log Message: Use SUBST. Use find foo -exec bar {} \; instead of find foo | xargs bar. --- Module Name: pkgsrc Committed By: martti Date: Fri Feb 3 10:26:17 UTC 2006 Modified Files: pkgsrc/mail/squirrelmail: Makefile Log Message: s/SMDIRDIR/SMDIR/ and bump PKGREVISION. --- Module Name: pkgsrc Committed By: martti Date: Fri Feb 3 10:26:44 UTC 2006 Modified Files: pkgsrc/mail/ja-squirrelmail: Makefile Log Message: s/SMDIRDIR/SMDIR/ and bump PKGREVISION. --- Module Name: pkgsrc Committed By: martti Date: Fri Feb 17 07:04:25 UTC 2006 Modified Files: pkgsrc/mail/ja-squirrelmail: Makefile pkgsrc/mail/squirrelmail: Makefile buildlink3.mk plugin.mk pkgsrc/mail/squirrelmail-locales: Makefile Log Message: Fixed warnings found by pkglint -Wall. --- Module Name: pkgsrc Committed By: martti Date: Mon Feb 27 07:12:14 UTC 2006 Modified Files: pkgsrc/mail/squirrelmail: Makefile PLIST buildlink3.mk distinfo Removed Files: pkgsrc/mail/squirrelmail/patches: patch-ab patch-ac patch-ad patch-ae patch-af patch-ag patch-ah Log Message: Updated squirrelmail to 1.4.6 This release is very important, and we strongly advise everybody to update to the latest release. Security Update =============== This version contains a number of security updates that were brought to our attention via a number of sources. - In webmail.php, the right_frame parameter was not properly sanitized to deal with very lenient browsers, which allowed for cross site scripting or frame replacing. [CVE-2006-0188] - In the MagicHTML function, some very obscure constructs were discovered to be exploitable: 'u\rl' was interpreted as 'url' (privacy concern), and comments could be inside keywords (allows for cross site scripting). Both only affect Internet Explorer users. Found by Martijn Brinkers and Scott Hughes. [CVE-2006-0195] - The function sqimap_mailbox_select did not strip newlines from the mailbox parameter, and thereby allowed for IMAP command injection. Found by Vicente Aguilera. [CVE-2006-0377] --- Module Name: pkgsrc Committed By: martti Date: Mon Feb 27 07:13:00 UTC 2006 Modified Files: pkgsrc/mail/squirrelmail-locales: Makefile PLIST distinfo Log Message: Updated squirrelmail-locales to 1.4.6 * sync with squirrelmail 1.4.6 --- Module Name: pkgsrc Committed By: cube Date: Wed Mar 1 06:39:52 UTC 2006 Modified Files: pkgsrc/mail/squirrelmail-locales: Makefile PLIST Log Message: Fix PLIST. --- Module Name: pkgsrc Committed By: martti Date: Thu Mar 2 07:41:44 UTC 2006 Modified Files: pkgsrc/mail/squirrelmail-decode: Makefile Log Message: Fix pkglint -Wall warnings. --- Module Name: pkgsrc Committed By: salo Date: Wed Mar 15 11:48:29 UTC 2006 Modified Files: pkgsrc/mail/squirrelmail-locales: Makefile PLIST Log Message: Fix PLIST. (hi cube and martti!)
Diffstat
-rw-r--r--mail/ja-squirrelmail/Makefile37
-rw-r--r--mail/squirrelmail-decode/Makefile6
-rw-r--r--mail/squirrelmail-locales/Makefile13
-rw-r--r--mail/squirrelmail-locales/PLIST244
-rw-r--r--mail/squirrelmail-locales/distinfo8
-rw-r--r--mail/squirrelmail/Makefile70
-rw-r--r--mail/squirrelmail/PLIST19
-rw-r--r--mail/squirrelmail/buildlink3.mk7
-rw-r--r--mail/squirrelmail/distinfo15
-rw-r--r--mail/squirrelmail/patches/patch-ab16
-rw-r--r--mail/squirrelmail/patches/patch-ac23
-rw-r--r--mail/squirrelmail/patches/patch-ad16
-rw-r--r--mail/squirrelmail/patches/patch-ae32
-rw-r--r--mail/squirrelmail/patches/patch-af17
-rw-r--r--mail/squirrelmail/patches/patch-ag13
-rw-r--r--mail/squirrelmail/patches/patch-ah13
-rw-r--r--mail/squirrelmail/plugin.mk4
17 files changed, 338 insertions, 215 deletions
diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile
index bebd0f4b898..7192ceb1acc 100644
--- a/mail/ja-squirrelmail/Makefile
+++ b/mail/ja-squirrelmail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2005/12/10 19:23:01 martti Exp $
+# $NetBSD: Makefile,v 1.21.2.1 2006/03/15 12:07:54 salo Exp $
DISTNAME= squirrelmail-1.4.5
PKGNAME= ja-${DISTNAME}
-PKGREVISION= 3
+PKGREVISION= 5
CATEGORIES= mail www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
EXTRACT_SUFX= .tar.bz2
@@ -52,31 +52,28 @@ OWN_DIRS= ${DATADIR}
OWN_DIRS_PERMS= ${ATTACHMENTS_DIR} ${ROOT_USER} ${APACHE_GROUP} 730
OWN_DIRS_PERMS+= ${USER_PREFS_DIR} ${APACHE_USER} ${APACHE_GROUP} 755
+SUBST_CLASSES+= paths
+SUBST_FILES.paths= ${WRKDIR}/squirrelmail.conf.dist config/config_default.php
+SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
+SUBST_SED.paths+= -e 's,@ATTACHMENTS_DIR@,${ATTACHMENTS_DIR},g'
+SUBST_SED.paths+= -e 's,@USER_PREFS_DIR@,${USER_PREFS_DIR},g'
+SUBST_SED.paths+= -e 's,@SMDIR@,${SMDIR},g'
+SUBST_STAGE.paths= post-patch
+
+post-extract:
+ ${CP} ${FILESDIR}/squirrelmail.conf.dist ${WRKDIR}/squirrelmail.conf.dist
+
pre-configure:
- cd ${WRKSRC}; \
- for file in config/config_default.php; do \
- ${SED} -e "s|@ATTACHMENTS_DIR@|${ATTACHMENTS_DIR}|g" \
- -e "s|@USER_PREFS_DIR@|${USER_PREFS_DIR}|g" \
- $${file} > $${file}.fixed; \
- ${MV} -f $${file}.fixed $${file}; \
- done; \
- cd ${WRKSRC}; \
- ${FIND} . \( -name "*.orig*" -o -name ".cvsignore" \) -print \
- | ${XARGS} ${RM} -f
-
-pre-install:
- @${SED} ${FILES_SUBST_SED} ${FILESDIR}/squirrelmail.conf.dist \
- > ${WRKDIR}/squirrelmail.conf.dist
+ ${FIND} ${WRKSRC} \( -name "*.orig*" -o -name ".cvsignore" \) -exec ${RM} -f {} \;
do-install:
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA_DIR} ${SMDIR}
- cd ${WRKDIR}; ${INSTALL_DATA} squirrelmail.conf.dist \
- ${EGDIR}/squirrelmail.conf
+ ${INSTALL_DATA} ${WRKDIR}/squirrelmail.conf.dist ${EGDIR}/squirrelmail.conf
${CP} -R ${WRKSRC}/* ${SMDIR}
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SMDIR}
- ${FIND} ${SMDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
- ${FIND} ${SMDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
+ ${FIND} ${SMDIR} -type d -print -exec ${CHMOD} ${PKGDIRMODE} {} \;
+ ${FIND} ${SMDIR} -type f -print -exec ${CHMOD} ${SHAREMODE} {} \;
${CHMOD} a+x ${SMDIR}/config/conf.pl
${INSTALL_DATA} ${WRKSRC}/data/index.php ${USER_PREFS_DIR}/
${INSTALL_DATA} ${WRKSRC}/data/.htaccess ${USER_PREFS_DIR}/
diff --git a/mail/squirrelmail-decode/Makefile b/mail/squirrelmail-decode/Makefile
index 716d0c7dad4..9aa93b03b36 100644
--- a/mail/squirrelmail-decode/Makefile
+++ b/mail/squirrelmail-decode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/13 18:36:16 martti Exp $
+# $NetBSD: Makefile,v 1.1.1.1.2.1 2006/03/15 12:07:55 salo Exp $
DISTNAME= squirrelmail-decode-1.0
CATEGORIES= mail
@@ -14,8 +14,8 @@ NO_BUILD= yes
DEPENDS+= php-iconv>=4.3.3:../../converters/php-iconv
do-install:
- ${INSTALL_DATA} ${WRKSRC}/eastasia/*.php ${WRKSRC}/x-mac/*.php \
- ${PREFIX}/share/squirrelmail/functions/decode
+ ${INSTALL_DATA} ${WRKSRC:Q}/eastasia/*.php ${WRKSRC:Q}/x-mac/*.php \
+ ${PREFIX:Q}/share/squirrelmail/functions/decode
.include "../../mail/squirrelmail/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/squirrelmail-locales/Makefile b/mail/squirrelmail-locales/Makefile
index 77512a4d56e..53abed1cd75 100644
--- a/mail/squirrelmail-locales/Makefile
+++ b/mail/squirrelmail-locales/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2005/09/28 20:52:24 rillig Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2006/03/15 12:07:55 salo Exp $
#
-DISTNAME= all_locales-${VER}-20050713
+DISTNAME= all_locales-${VER}-20060221
PKGNAME= squirrelmail-locales-${VER}
+PKGREVISION= 2
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
EXTRACT_SUFX= .tar.bz2
@@ -11,7 +12,7 @@ MAINTAINER= martti@NetBSD.org
HOMEPAGE= http://www.squirrelmail.org/
COMMENT= Locale package for SquirrelMail
-VER= 1.4.5
+VER= 1.4.6
NO_CONFIGURE= yes
USE_TOOLS+= tar
@@ -20,11 +21,11 @@ INSTALLATION_DIRS= share/squirrelmail
WRKSRC= ${WRKDIR}
do-build:
- cd ${WRKDIR}/help && ${RM} -rf en_US
+ cd ${WRKDIR:Q}/help && ${RM} -rf en_US
do-install:
- cd ${WRKDIR} && ${TAR} -cf - help images locale | \
- ${TAR} -xf - -C ${PREFIX}/share/squirrelmail/
+ cd ${WRKDIR:Q} && ${TAR} -cf - help images locale | \
+ ${TAR} -xf - -C ${PREFIX:Q}/share/squirrelmail/
.include "../../mail/squirrelmail/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/squirrelmail-locales/PLIST b/mail/squirrelmail-locales/PLIST
index 9c2ab2f4287..88c6e527fe6 100644
--- a/mail/squirrelmail-locales/PLIST
+++ b/mail/squirrelmail-locales/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/07/18 07:04:29 martti Exp $
+@comment $NetBSD: PLIST,v 1.4.4.1 2006/03/15 12:07:55 salo Exp $
share/squirrelmail/help/bg_BG/FAQ.hlp
share/squirrelmail/help/bg_BG/addresses.hlp
share/squirrelmail/help/bg_BG/basic.hlp
@@ -215,6 +215,15 @@ share/squirrelmail/help/sv_SE/main_folder.hlp
share/squirrelmail/help/sv_SE/options.hlp
share/squirrelmail/help/sv_SE/read_mail.hlp
share/squirrelmail/help/sv_SE/search.hlp
+share/squirrelmail/help/th_TH/FAQ.hlp
+share/squirrelmail/help/th_TH/addresses.hlp
+share/squirrelmail/help/th_TH/basic.hlp
+share/squirrelmail/help/th_TH/compose.hlp
+share/squirrelmail/help/th_TH/folders.hlp
+share/squirrelmail/help/th_TH/main_folder.hlp
+share/squirrelmail/help/th_TH/options.hlp
+share/squirrelmail/help/th_TH/read_mail.hlp
+share/squirrelmail/help/th_TH/search.hlp
share/squirrelmail/help/zh_CN/FAQ.hlp
share/squirrelmail/help/zh_CN/addresses.hlp
share/squirrelmail/help/zh_CN/basic.hlp
@@ -225,12 +234,16 @@ share/squirrelmail/help/zh_CN/options.hlp
share/squirrelmail/help/zh_CN/read_mail.hlp
share/squirrelmail/help/zh_CN/search.hlp
share/squirrelmail/images/sec_remove_bn_IN.png
+share/squirrelmail/images/sec_remove_cs_CZ.png
share/squirrelmail/images/sec_remove_da_DK.png
share/squirrelmail/images/sec_remove_de_DE.png
share/squirrelmail/images/sec_remove_el_GR.png
share/squirrelmail/images/sec_remove_es_ES.png
+share/squirrelmail/images/sec_remove_et_EE.png
+share/squirrelmail/images/sec_remove_fi_FI.png
share/squirrelmail/images/sec_remove_fo_FO.png
share/squirrelmail/images/sec_remove_fr_FR.png
+share/squirrelmail/images/sec_remove_he_IL.png
share/squirrelmail/images/sec_remove_hr_HR.png
share/squirrelmail/images/sec_remove_hu_HU.png
share/squirrelmail/images/sec_remove_id_ID.png
@@ -252,86 +265,216 @@ share/squirrelmail/images/sec_remove_tr_TR.png
share/squirrelmail/images/sec_remove_ug.png
share/squirrelmail/locale/ar/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/ar/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/ar/setup.php
share/squirrelmail/locale/bg_BG/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/bg_BG/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/bg_BG/setup.php
share/squirrelmail/locale/bn_IN/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/bn_IN/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/bn_IN/setup.php
share/squirrelmail/locale/ca_ES/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/ca_ES/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/ca_ES/setup.php
+share/squirrelmail/locale/cs_CZ/LC_MESSAGES/abook_import_export.mo
+share/squirrelmail/locale/cs_CZ/LC_MESSAGES/abook_import_export.po
+share/squirrelmail/locale/cs_CZ/LC_MESSAGES/compatibility.mo
+share/squirrelmail/locale/cs_CZ/LC_MESSAGES/compatibility.po
+share/squirrelmail/locale/cs_CZ/LC_MESSAGES/proon.mo
+share/squirrelmail/locale/cs_CZ/LC_MESSAGES/proon.po
share/squirrelmail/locale/cs_CZ/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/cs_CZ/LC_MESSAGES/squirrelmail.po
share/squirrelmail/locale/cs_CZ/LC_MESSAGES/vacation_local.mo
share/squirrelmail/locale/cs_CZ/LC_MESSAGES/vacation_local.po
share/squirrelmail/locale/cs_CZ/LC_MESSAGES/yelp.mo
share/squirrelmail/locale/cs_CZ/LC_MESSAGES/yelp.po
+share/squirrelmail/locale/cs_CZ/setup.php
share/squirrelmail/locale/cy_GB/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/cy_GB/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/cy_GB/setup.php
share/squirrelmail/locale/da_DK/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/da_DK/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/da_DK/setup.php
+share/squirrelmail/locale/de_DE/LC_MESSAGES/abook_import_export.mo
+share/squirrelmail/locale/de_DE/LC_MESSAGES/abook_import_export.po
share/squirrelmail/locale/de_DE/LC_MESSAGES/archive_mail.mo
share/squirrelmail/locale/de_DE/LC_MESSAGES/archive_mail.po
share/squirrelmail/locale/de_DE/LC_MESSAGES/askuserinfo.mo
share/squirrelmail/locale/de_DE/LC_MESSAGES/askuserinfo.po
+share/squirrelmail/locale/de_DE/LC_MESSAGES/calendar.mo
+share/squirrelmail/locale/de_DE/LC_MESSAGES/calendar.po
+share/squirrelmail/locale/de_DE/LC_MESSAGES/change_sqlpass.mo
+share/squirrelmail/locale/de_DE/LC_MESSAGES/change_sqlpass.po
+share/squirrelmail/locale/de_DE/LC_MESSAGES/empty_folders.mo
+share/squirrelmail/locale/de_DE/LC_MESSAGES/empty_folders.po
+share/squirrelmail/locale/de_DE/LC_MESSAGES/expire.mo
+share/squirrelmail/locale/de_DE/LC_MESSAGES/expire.po
share/squirrelmail/locale/de_DE/LC_MESSAGES/ldapquery.mo
share/squirrelmail/locale/de_DE/LC_MESSAGES/ldapquery.po
+share/squirrelmail/locale/de_DE/LC_MESSAGES/limit_languages.mo
+share/squirrelmail/locale/de_DE/LC_MESSAGES/limit_languages.po
share/squirrelmail/locale/de_DE/LC_MESSAGES/login_alias.mo
share/squirrelmail/locale/de_DE/LC_MESSAGES/login_alias.po
share/squirrelmail/locale/de_DE/LC_MESSAGES/naguser.mo
share/squirrelmail/locale/de_DE/LC_MESSAGES/naguser.po
+share/squirrelmail/locale/de_DE/LC_MESSAGES/reply_buttons.mo
+share/squirrelmail/locale/de_DE/LC_MESSAGES/reply_buttons.po
share/squirrelmail/locale/de_DE/LC_MESSAGES/restrict_senders.mo
share/squirrelmail/locale/de_DE/LC_MESSAGES/restrict_senders.po
+share/squirrelmail/locale/de_DE/LC_MESSAGES/select_language.mo
+share/squirrelmail/locale/de_DE/LC_MESSAGES/select_language.po
+share/squirrelmail/locale/de_DE/LC_MESSAGES/serversidefilter.mo
+share/squirrelmail/locale/de_DE/LC_MESSAGES/serversidefilter.po
+share/squirrelmail/locale/de_DE/LC_MESSAGES/show_ssl_link.mo
+share/squirrelmail/locale/de_DE/LC_MESSAGES/show_ssl_link.po
+share/squirrelmail/locale/de_DE/LC_MESSAGES/squirrel_logger.mo
+share/squirrelmail/locale/de_DE/LC_MESSAGES/squirrel_logger.po
share/squirrelmail/locale/de_DE/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/de_DE/LC_MESSAGES/squirrelmail.po
share/squirrelmail/locale/de_DE/LC_MESSAGES/templates.mo
share/squirrelmail/locale/de_DE/LC_MESSAGES/templates.po
+share/squirrelmail/locale/de_DE/LC_MESSAGES/unsafe_image_rules.mo
+share/squirrelmail/locale/de_DE/LC_MESSAGES/unsafe_image_rules.po
+share/squirrelmail/locale/de_DE/LC_MESSAGES/vacation_local.mo
+share/squirrelmail/locale/de_DE/LC_MESSAGES/vacation_local.po
+share/squirrelmail/locale/de_DE/LC_MESSAGES/verify_reply_to.mo
+share/squirrelmail/locale/de_DE/LC_MESSAGES/verify_reply_to.po
+share/squirrelmail/locale/de_DE/setup.php
share/squirrelmail/locale/el_GR/LC_MESSAGES/ldapquery.mo
share/squirrelmail/locale/el_GR/LC_MESSAGES/ldapquery.po
share/squirrelmail/locale/el_GR/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/el_GR/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/el_GR/setup.php
share/squirrelmail/locale/en_GB/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/en_GB/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/en_GB/setup.php
share/squirrelmail/locale/es_ES/LC_MESSAGES/askuserinfo.mo
share/squirrelmail/locale/es_ES/LC_MESSAGES/askuserinfo.po
+share/squirrelmail/locale/es_ES/LC_MESSAGES/change_sqlpass.mo
+share/squirrelmail/locale/es_ES/LC_MESSAGES/change_sqlpass.po
share/squirrelmail/locale/es_ES/LC_MESSAGES/smallcal.mo
share/squirrelmail/locale/es_ES/LC_MESSAGES/smallcal.po
share/squirrelmail/locale/es_ES/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/es_ES/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/es_ES/LC_MESSAGES/unsafe_image_rules.mo
+share/squirrelmail/locale/es_ES/LC_MESSAGES/unsafe_image_rules.po
+share/squirrelmail/locale/es_ES/setup.php
+share/squirrelmail/locale/et_EE/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/et_EE/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/et_EE/setup.php
share/squirrelmail/locale/eu_ES/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/eu_ES/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/eu_ES/setup.php
share/squirrelmail/locale/fa_IR/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/fa_IR/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/fa_IR/setup.php
share/squirrelmail/locale/fi_FI/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/fi_FI/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/fi_FI/setup.php
+share/squirrelmail/locale/fo_FO/LC_MESSAGES/abook_import_export.mo
+share/squirrelmail/locale/fo_FO/LC_MESSAGES/abook_import_export.po
+share/squirrelmail/locale/fo_FO/LC_MESSAGES/archive_mail.mo
+share/squirrelmail/locale/fo_FO/LC_MESSAGES/archive_mail.po
+share/squirrelmail/locale/fo_FO/LC_MESSAGES/askuserinfo.mo
+share/squirrelmail/locale/fo_FO/LC_MESSAGES/askuserinfo.po
+share/squirrelmail/locale/fo_FO/LC_MESSAGES/compatibility.mo
+share/squirrelmail/locale/fo_FO/LC_MESSAGES/compatibility.po
+share/squirrelmail/locale/fo_FO/LC_MESSAGES/empty_folders.mo
+share/squirrelmail/locale/fo_FO/LC_MESSAGES/empty_folders.po
+share/squirrelmail/locale/fo_FO/LC_MESSAGES/folder_settings.mo
+share/squirrelmail/locale/fo_FO/LC_MESSAGES/folder_settings.po
+share/squirrelmail/locale/fo_FO/LC_MESSAGES/html_mail.mo
+share/squirrelmail/locale/fo_FO/LC_MESSAGES/html_mail.po
share/squirrelmail/locale/fo_FO/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/fo_FO/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/fo_FO/setup.php
share/squirrelmail/locale/fr_FR/LC_MESSAGES/archive_mail.mo
share/squirrelmail/locale/fr_FR/LC_MESSAGES/archive_mail.po
+share/squirrelmail/locale/fr_FR/LC_MESSAGES/calendar.mo
+share/squirrelmail/locale/fr_FR/LC_MESSAGES/calendar.po
+share/squirrelmail/locale/fr_FR/LC_MESSAGES/change_sqlpass.mo
+share/squirrelmail/locale/fr_FR/LC_MESSAGES/change_sqlpass.po
+share/squirrelmail/locale/fr_FR/LC_MESSAGES/empty_folders.mo
+share/squirrelmail/locale/fr_FR/LC_MESSAGES/empty_folders.po
+share/squirrelmail/locale/fr_FR/LC_MESSAGES/spam_buttons.mo
+share/squirrelmail/locale/fr_FR/LC_MESSAGES/spam_buttons.po
share/squirrelmail/locale/fr_FR/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/fr_FR/LC_MESSAGES/squirrelmail.po
share/squirrelmail/locale/fr_FR/LC_MESSAGES/vacation_local.mo
share/squirrelmail/locale/fr_FR/LC_MESSAGES/vacation_local.po
share/squirrelmail/locale/fr_FR/LC_MESSAGES/yelp.mo
share/squirrelmail/locale/fr_FR/LC_MESSAGES/yelp.po
+share/squirrelmail/locale/fr_FR/setup.php
share/squirrelmail/locale/he_IL/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/he_IL/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/he_IL/setup.php
share/squirrelmail/locale/hr_HR/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/hr_HR/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/hr_HR/setup.php
share/squirrelmail/locale/hu_HU/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/hu_HU/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/hu_HU/setup.php
share/squirrelmail/locale/id_ID/LC_MESSAGES/askuserinfo.mo
share/squirrelmail/locale/id_ID/LC_MESSAGES/askuserinfo.po
share/squirrelmail/locale/id_ID/LC_MESSAGES/compatibility.mo
share/squirrelmail/locale/id_ID/LC_MESSAGES/compatibility.po
share/squirrelmail/locale/id_ID/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/id_ID/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/id_ID/setup.php
share/squirrelmail/locale/is_IS/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/is_IS/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/is_IS/setup.php
+share/squirrelmail/locale/it_IT/LC_MESSAGES/archive_mail.mo
+share/squirrelmail/locale/it_IT/LC_MESSAGES/archive_mail.po
+share/squirrelmail/locale/it_IT/LC_MESSAGES/calendar.mo
+share/squirrelmail/locale/it_IT/LC_MESSAGES/calendar.po
share/squirrelmail/locale/it_IT/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/it_IT/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/it_IT/LC_MESSAGES/vacation_local.mo
+share/squirrelmail/locale/it_IT/LC_MESSAGES/vacation_local.po
+share/squirrelmail/locale/it_IT/setup.php
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/archive_mail.mo
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/archive_mail.po
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/askuserinfo.mo
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/askuserinfo.po
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/compatibility.mo
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/compatibility.po
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/cookie_warning.mo
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/cookie_warning.po
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/custom_charset.mo
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/custom_charset.po
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/debugger.mo
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/debugger.po
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/html_mail.mo
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/html_mail.po
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/mini.mo
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/mini.po
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/reply_buttons.mo
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/reply_buttons.po
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/sasql.mo
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/sasql.po
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/select_language.mo
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/select_language.po
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/serversidefilter.mo
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/serversidefilter.po
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/show_ssl_link.mo
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/show_ssl_link.po
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/smallcal.mo
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/smallcal.po
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/spam_buttons.mo
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/spam_buttons.po
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/squirrel_logger.mo
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/squirrel_logger.po
share/squirrelmail/locale/ja_JP/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/ja_JP/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/web_search.mo
+share/squirrelmail/locale/ja_JP/LC_MESSAGES/web_search.po
+share/squirrelmail/locale/ja_JP/setup.php
+share/squirrelmail/locale/ka/LC_MESSAGES/squirrelmail.mo
+share/squirrelmail/locale/ka/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/ka/setup.php
share/squirrelmail/locale/ko_KR/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/ko_KR/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/ko_KR/setup.php
share/squirrelmail/locale/lt_LT/LC_MESSAGES/abook_import_export.mo
share/squirrelmail/locale/lt_LT/LC_MESSAGES/abook_import_export.po
share/squirrelmail/locale/lt_LT/LC_MESSAGES/archive_mail.mo
@@ -340,6 +483,8 @@ share/squirrelmail/locale/lt_LT/LC_MESSAGES/askuserinfo.mo
share/squirrelmail/locale/lt_LT/LC_MESSAGES/askuserinfo.po
share/squirrelmail/locale/lt_LT/LC_MESSAGES/calendar.mo
share/squirrelmail/locale/lt_LT/LC_MESSAGES/calendar.po
+share/squirrelmail/locale/lt_LT/LC_MESSAGES/change_sqlpass.mo
+share/squirrelmail/locale/lt_LT/LC_MESSAGES/change_sqlpass.po
share/squirrelmail/locale/lt_LT/LC_MESSAGES/compatibility.mo
share/squirrelmail/locale/lt_LT/LC_MESSAGES/compatibility.po
share/squirrelmail/locale/lt_LT/LC_MESSAGES/compose_fix.mo
@@ -350,6 +495,8 @@ share/squirrelmail/locale/lt_LT/LC_MESSAGES/custom_charset.mo
share/squirrelmail/locale/lt_LT/LC_MESSAGES/custom_charset.po
share/squirrelmail/locale/lt_LT/LC_MESSAGES/debugger.mo
share/squirrelmail/locale/lt_LT/LC_MESSAGES/debugger.po
+share/squirrelmail/locale/lt_LT/LC_MESSAGES/empty_folders.mo
+share/squirrelmail/locale/lt_LT/LC_MESSAGES/empty_folders.po
share/squirrelmail/locale/lt_LT/LC_MESSAGES/html_mail.mo
share/squirrelmail/locale/lt_LT/LC_MESSAGES/html_mail.po
share/squirrelmail/locale/lt_LT/LC_MESSAGES/ldapquery.mo
@@ -358,6 +505,8 @@ share/squirrelmail/locale/lt_LT/LC_MESSAGES/limit_languages.mo
share/squirrelmail/locale/lt_LT/LC_MESSAGES/limit_languages.po
share/squirrelmail/locale/lt_LT/LC_MESSAGES/login_alias.mo
share/squirrelmail/locale/lt_LT/LC_MESSAGES/login_alias.po
+share/squirrelmail/locale/lt_LT/LC_MESSAGES/mini.mo
+share/squirrelmail/locale/lt_LT/LC_MESSAGES/mini.po
share/squirrelmail/locale/lt_LT/LC_MESSAGES/naguser.mo
share/squirrelmail/locale/lt_LT/LC_MESSAGES/naguser.po
share/squirrelmail/locale/lt_LT/LC_MESSAGES/qmailadmin_login.mo
@@ -368,6 +517,8 @@ share/squirrelmail/locale/lt_LT/LC_MESSAGES/restrict_senders.mo
share/squirrelmail/locale/lt_LT/LC_MESSAGES/restrict_senders.po
share/squirrelmail/locale/lt_LT/LC_MESSAGES/sasql.mo
share/squirrelmail/locale/lt_LT/LC_MESSAGES/sasql.po
+share/squirrelmail/locale/lt_LT/LC_MESSAGES/select_language.mo
+share/squirrelmail/locale/lt_LT/LC_MESSAGES/select_language.po
share/squirrelmail/locale/lt_LT/LC_MESSAGES/serversidefilter.mo
share/squirrelmail/locale/lt_LT/LC_MESSAGES/serversidefilter.po
share/squirrelmail/locale/lt_LT/LC_MESSAGES/show_ssl_link.mo
@@ -382,54 +533,113 @@ share/squirrelmail/locale/lt_LT/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/lt_LT/LC_MESSAGES/squirrelmail.po
share/squirrelmail/locale/lt_LT/LC_MESSAGES/templates.mo
share/squirrelmail/locale/lt_LT/LC_MESSAGES/templates.po
+share/squirrelmail/locale/lt_LT/LC_MESSAGES/unsafe_image_rules.mo
+share/squirrelmail/locale/lt_LT/LC_MESSAGES/unsafe_image_rules.po
share/squirrelmail/locale/lt_LT/LC_MESSAGES/vacation_local.mo
share/squirrelmail/locale/lt_LT/LC_MESSAGES/vacation_local.po
share/squirrelmail/locale/lt_LT/LC_MESSAGES/verify_reply_to.mo
share/squirrelmail/locale/lt_LT/LC_MESSAGES/verify_reply_to.po
share/squirrelmail/locale/lt_LT/LC_MESSAGES/yelp.mo
share/squirrelmail/locale/lt_LT/LC_MESSAGES/yelp.po
+share/squirrelmail/locale/lt_LT/setup.php
share/squirrelmail/locale/ms_MY/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/ms_MY/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/ms_MY/setup.php
share/squirrelmail/locale/nb_NO/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/nb_NO/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/nb_NO/setup.php
share/squirrelmail/locale/nl_NL/LC_MESSAGES/archive_mail.mo
share/squirrelmail/locale/nl_NL/LC_MESSAGES/archive_mail.po
share/squirrelmail/locale/nl_NL/LC_MESSAGES/askuserinfo.mo
share/squirrelmail/locale/nl_NL/LC_MESSAGES/askuserinfo.po
+share/squirrelmail/locale/nl_NL/LC_MESSAGES/calendar.mo
+share/squirrelmail/locale/nl_NL/LC_MESSAGES/calendar.po
share/squirrelmail/locale/nl_NL/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/nl_NL/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/nl_NL/setup.php
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/abook_import_export.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/abook_import_export.po
share/squirrelmail/locale/nn_NO/LC_MESSAGES/archive_mail.mo
share/squirrelmail/locale/nn_NO/LC_MESSAGES/archive_mail.po
share/squirrelmail/locale/nn_NO/LC_MESSAGES/askuserinfo.mo
share/squirrelmail/locale/nn_NO/LC_MESSAGES/askuserinfo.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/calendar.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/calendar.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/change_sqlpass.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/change_sqlpass.po
share/squirrelmail/locale/nn_NO/LC_MESSAGES/compatibility.mo
share/squirrelmail/locale/nn_NO/LC_MESSAGES/compatibility.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/compose_fix.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/compose_fix.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/cookie_warning.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/cookie_warning.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/custom_charset.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/custom_charset.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/debugger.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/debugger.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/empty_folders.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/empty_folders.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/html_mail.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/html_mail.po
share/squirrelmail/locale/nn_NO/LC_MESSAGES/ldapquery.mo
share/squirrelmail/locale/nn_NO/LC_MESSAGES/ldapquery.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/limit_languages.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/limit_languages.po
share/squirrelmail/locale/nn_NO/LC_MESSAGES/login_alias.mo
share/squirrelmail/locale/nn_NO/LC_MESSAGES/login_alias.po
share/squirrelmail/locale/nn_NO/LC_MESSAGES/naguser.mo
share/squirrelmail/locale/nn_NO/LC_MESSAGES/naguser.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/qmailadmin_login.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/qmailadmin_login.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/reply_buttons.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/reply_buttons.po
share/squirrelmail/locale/nn_NO/LC_MESSAGES/restrict_senders.mo
share/squirrelmail/locale/nn_NO/LC_MESSAGES/restrict_senders.po
share/squirrelmail/locale/nn_NO/LC_MESSAGES/sasql.mo
share/squirrelmail/locale/nn_NO/LC_MESSAGES/sasql.po
share/squirrelmail/locale/nn_NO/LC_MESSAGES/serversidefilter.mo
share/squirrelmail/locale/nn_NO/LC_MESSAGES/serversidefilter.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/show_ssl_link.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/show_ssl_link.po
share/squirrelmail/locale/nn_NO/LC_MESSAGES/smallcal.mo
share/squirrelmail/locale/nn_NO/LC_MESSAGES/smallcal.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/spam_buttons.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/spam_buttons.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/squirrel_logger.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/squirrel_logger.po
share/squirrelmail/locale/nn_NO/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/nn_NO/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/templates.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/templates.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/vacation_local.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/vacation_local.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/verify_reply_to.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/verify_reply_to.po
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/yelp.mo
+share/squirrelmail/locale/nn_NO/LC_MESSAGES/yelp.po
+share/squirrelmail/locale/nn_NO/setup.php
share/squirrelmail/locale/pl_PL/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/pl_PL/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/pl_PL/setup.php
+share/squirrelmail/locale/pt_BR/LC_MESSAGES/abook_import_export.mo
+share/squirrelmail/locale/pt_BR/LC_MESSAGES/abook_import_export.po
+share/squirrelmail/locale/pt_BR/LC_MESSAGES/archive_mail.mo
+share/squirrelmail/locale/pt_BR/LC_MESSAGES/archive_mail.po
share/squirrelmail/locale/pt_BR/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/pt_BR/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/pt_BR/LC_MESSAGES/unsafe_image_rules.mo
+share/squirrelmail/locale/pt_BR/LC_MESSAGES/unsafe_image_rules.po
+share/squirrelmail/locale/pt_BR/setup.php
share/squirrelmail/locale/pt_PT/LC_MESSAGES/askuserinfo.mo
share/squirrelmail/locale/pt_PT/LC_MESSAGES/askuserinfo.po
share/squirrelmail/locale/pt_PT/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/pt_PT/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/pt_PT/LC_MESSAGES/unsafe_image_rules.mo
+share/squirrelmail/locale/pt_PT/LC_MESSAGES/unsafe_image_rules.po
+share/squirrelmail/locale/pt_PT/setup.php
share/squirrelmail/locale/ro_RO/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/ro_RO/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/ro_RO/setup.php
share/squirrelmail/locale/ru_RU/LC_MESSAGES/custom_charset.mo
share/squirrelmail/locale/ru_RU/LC_MESSAGES/custom_charset.po
share/squirrelmail/locale/ru_RU/LC_MESSAGES/sasql.mo
@@ -438,18 +648,24 @@ share/squirrelmail/locale/ru_RU/LC_MESSAGES/serversidefilter.mo
share/squirrelmail/locale/ru_RU/LC_MESSAGES/serversidefilter.po
share/squirrelmail/locale/ru_RU/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/ru_RU/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/ru_RU/setup.php
share/squirrelmail/locale/sk_SK/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/sk_SK/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/sk_SK/setup.php
share/squirrelmail/locale/sl_SI/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/sl_SI/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/sl_SI/setup.php
share/squirrelmail/locale/sr_YU/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/sr_YU/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/sr_YU/setup.php
share/squirrelmail/locale/sv_SE/LC_MESSAGES/abook_import_export.mo
share/squirrelmail/locale/sv_SE/LC_MESSAGES/abook_import_export.po
share/squirrelmail/locale/sv_SE/LC_MESSAGES/archive_mail.mo
share/squirrelmail/locale/sv_SE/LC_MESSAGES/archive_mail.po
share/squirrelmail/locale/sv_SE/LC_MESSAGES/askuserinfo.mo
share/squirrelmail/locale/sv_SE/LC_MESSAGES/askuserinfo.po
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/change_sqlpass.mo
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/change_sqlpass.po
share/squirrelmail/locale/sv_SE/LC_MESSAGES/compatibility.mo
share/squirrelmail/locale/sv_SE/LC_MESSAGES/compatibility.po
share/squirrelmail/locale/sv_SE/LC_MESSAGES/compose_fix.mo
@@ -460,10 +676,18 @@ share/squirrelmail/locale/sv_SE/LC_MESSAGES/custom_charset.mo
share/squirrelmail/locale/sv_SE/LC_MESSAGES/custom_charset.po
share/squirrelmail/locale/sv_SE/LC_MESSAGES/debugger.mo
share/squirrelmail/locale/sv_SE/LC_MESSAGES/debugger.po
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/empty_folders.mo
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/empty_folders.po
share/squirrelmail/locale/sv_SE/LC_MESSAGES/html_mail.mo
share/squirrelmail/locale/sv_SE/LC_MESSAGES/html_mail.po
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/limit_languages.mo
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/limit_languages.po
share/squirrelmail/locale/sv_SE/LC_MESSAGES/login_alias.mo
share/squirrelmail/locale/sv_SE/LC_MESSAGES/login_alias.po
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/mini.mo
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/mini.po
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/multilogin.mo
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/multilogin.po
share/squirrelmail/locale/sv_SE/LC_MESSAGES/naguser.mo
share/squirrelmail/locale/sv_SE/LC_MESSAGES/naguser.po
share/squirrelmail/locale/sv_SE/LC_MESSAGES/qmailadmin_login.mo
@@ -474,6 +698,8 @@ share/squirrelmail/locale/sv_SE/LC_MESSAGES/restrict_senders.mo
share/squirrelmail/locale/sv_SE/LC_MESSAGES/restrict_senders.po
share/squirrelmail/locale/sv_SE/LC_MESSAGES/sasql.mo
share/squirrelmail/locale/sv_SE/LC_MESSAGES/sasql.po
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/select_language.mo
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/select_language.po
share/squirrelmail/locale/sv_SE/LC_MESSAGES/serversidefilter.mo
share/squirrelmail/locale/sv_SE/LC_MESSAGES/serversidefilter.po
share/squirrelmail/locale/sv_SE/LC_MESSAGES/show_ssl_link.mo
@@ -482,24 +708,35 @@ share/squirrelmail/locale/sv_SE/LC_MESSAGES/smallcal.mo
share/squirrelmail/locale/sv_SE/LC_MESSAGES/smallcal.po
share/squirrelmail/locale/sv_SE/LC_MESSAGES/spam_buttons.mo
share/squirrelmail/locale/sv_SE/LC_MESSAGES/spam_buttons.po
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/squirrel_logger.mo
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/squirrel_logger.po
share/squirrelmail/locale/sv_SE/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/sv_SE/LC_MESSAGES/squirrelmail.po
share/squirrelmail/locale/sv_SE/LC_MESSAGES/templates.mo
share/squirrelmail/locale/sv_SE/LC_MESSAGES/templates.po
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/unsafe_image_rules.mo
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/unsafe_image_rules.po
share/squirrelmail/locale/sv_SE/LC_MESSAGES/vacation_local.mo
share/squirrelmail/locale/sv_SE/LC_MESSAGES/vacation_local.po
share/squirrelmail/locale/sv_SE/LC_MESSAGES/verify_reply_to.mo
share/squirrelmail/locale/sv_SE/LC_MESSAGES/verify_reply_to.po
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/web_search.mo
+share/squirrelmail/locale/sv_SE/LC_MESSAGES/web_search.po
share/squirrelmail/locale/sv_SE/LC_MESSAGES/yelp.mo
share/squirrelmail/locale/sv_SE/LC_MESSAGES/yelp.po
+share/squirrelmail/locale/sv_SE/setup.php
share/squirrelmail/locale/tr_TR/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/tr_TR/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/tr_TR/setup.php
share/squirrelmail/locale/ug/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/ug/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/ug/setup.php
share/squirrelmail/locale/zh_CN/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/zh_CN/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/zh_CN/setup.php
share/squirrelmail/locale/zh_TW/LC_MESSAGES/squirrelmail.mo
share/squirrelmail/locale/zh_TW/LC_MESSAGES/squirrelmail.po
+share/squirrelmail/locale/zh_TW/setup.php
@dirrm share/squirrelmail/locale/ar/LC_MESSAGES
@dirrm share/squirrelmail/locale/ar
@dirrm share/squirrelmail/locale/bg_BG/LC_MESSAGES
@@ -522,6 +759,8 @@ share/squirrelmail/locale/zh_TW/LC_MESSAGES/squirrelmail.po
@dirrm share/squirrelmail/locale/en_GB
@dirrm share/squirrelmail/locale/es_ES/LC_MESSAGES
@dirrm share/squirrelmail/locale/es_ES
+@dirrm share/squirrelmail/locale/et_EE/LC_MESSAGES
+@dirrm share/squirrelmail/locale/et_EE
@dirrm share/squirrelmail/locale/eu_ES/LC_MESSAGES
@dirrm share/squirrelmail/locale/eu_ES
@dirrm share/squirrelmail/locale/fa_IR/LC_MESSAGES
@@ -546,6 +785,8 @@ share/squirrelmail/locale/zh_TW/LC_MESSAGES/squirrelmail.po
@dirrm share/squirrelmail/locale/it_IT
@dirrm share/squirrelmail/locale/ja_JP/LC_MESSAGES
@dirrm share/squirrelmail/locale/ja_JP
+@dirrm share/squirrelmail/locale/ka/LC_MESSAGES
+@dirrm share/squirrelmail/locale/ka
@dirrm share/squirrelmail/locale/ko_KR/LC_MESSAGES
@dirrm share/squirrelmail/locale/ko_KR
@dirrm share/squirrelmail/locale/lt_LT/LC_MESSAGES
@@ -608,4 +849,5 @@ share/squirrelmail/locale/zh_TW/LC_MESSAGES/squirrelmail.po
@dirrm share/squirrelmail/help/sl_SI
@dirrm share/squirrelmail/help/sr_YU
@dirrm share/squirrelmail/help/sv_SE
+@dirrm share/squirrelmail/help/th_TH
@dirrm share/squirrelmail/help/zh_CN
diff --git a/mail/squirrelmail-locales/distinfo b/mail/squirrelmail-locales/distinfo
index 453dcbb9ae3..51351f0012b 100644
--- a/mail/squirrelmail-locales/distinfo
+++ b/mail/squirrelmail-locales/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/07/18 07:04:29 martti Exp $
+$NetBSD: distinfo,v 1.3.4.1 2006/03/15 12:07:55 salo Exp $
-SHA1 (all_locales-1.4.5-20050713.tar.bz2) = 72b0ffc045d6b79dc563fb600858d0f82b2dbb9f
-RMD160 (all_locales-1.4.5-20050713.tar.bz2) = 8e0377f5abe327d7d1f9cb358d4668519c09d6aa
-Size (all_locales-1.4.5-20050713.tar.bz2) = 2091572 bytes
+SHA1 (all_locales-1.4.6-20060221.tar.bz2) = 110dbcd216005138fd8415b569b5b93fb929977e
+RMD160 (all_locales-1.4.6-20060221.tar.bz2) = c108485b090ffc8ea96b1384c9cf588adade7ed2
+Size (all_locales-1.4.6-20060221.tar.bz2) = 2448102 bytes
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 89b0f358e04..dfadd75b180 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2005/12/10 19:23:01 martti Exp $
+# $NetBSD: Makefile,v 1.63.2.1 2006/03/15 12:07:54 salo Exp $
-DISTNAME= squirrelmail-1.4.5
-PKGREVISION= 3
+DISTNAME= squirrelmail-1.4.6
+#PKGREVISION= 1
CATEGORIES= mail www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
EXTRACT_SUFX= .tar.bz2
@@ -13,6 +13,7 @@ COMMENT= PHP webmail package
CONFLICTS= sq-attachment-handlers-[0-9]*
CONFLICTS+= sq-squirrelspell-[0-9]*
CONFLICTS+= ja-squirrelspell-[0-9]*
+CONFLICTS+= ja-squirrelmail-[0-9]*
DEPENDS+= php-gettext>=4.3.3:../../devel/php-gettext
@@ -20,12 +21,12 @@ USE_LANGUAGES= # empty
USE_PKGINSTALL= yes
NO_BUILD= yes
USE_TOOLS+= perl:run
-REPLACE_PERL= config/conf.pl config/ri_once.pl
+REPLACE_PERL+= config/conf.pl config/ri_once.pl
.include "../../mk/bsd.prefs.mk"
PKG_SYSCONFSUBDIR?= httpd
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
EGDIR= ${PREFIX}/share/examples/squirrelmail
SMDIR= ${PREFIX}/share/squirrelmail
@@ -33,46 +34,47 @@ DATADIR= ${VARBASE}/spool/squirrelmail
ATTACHMENTS_DIR= ${DATADIR}/attachments
USER_PREFS_DIR= ${DATADIR}/data
-MESSAGE_SUBST+= SMDIR=${SMDIR}
+MESSAGE_SUBST+= SMDIR=${SMDIR:Q}
FILES_SUBST+= SMDIR=${SMDIR:Q}
-CONF_FILES= ${SMDIR}/config/config_default.php ${SMDIR}/config/config.php
-CONF_FILES+= ${SMDIR}/data/default_pref ${DATADIR}/data/default_pref
-CONF_FILES+= ${EGDIR}/squirrelmail.conf ${PKG_SYSCONFDIR}/squirrelmail.conf
+CONF_FILES= ${SMDIR:Q}/config/config_default.php \
+ ${SMDIR:Q}/config/config.php
+CONF_FILES+= ${SMDIR:Q}/data/default_pref \
+ ${DATADIR:Q}/data/default_pref
+CONF_FILES+= ${EGDIR:Q}/squirrelmail.conf \
+ ${PKG_SYSCONFDIR:Q}/squirrelmail.conf
-REQD_DIRS= ${SMDIR} ${SMDIR}/config
+REQD_DIRS+= ${SMDIR:Q} ${SMDIR:Q}/config
OWN_DIRS= ${DATADIR}
OWN_DIRS_PERMS= ${ATTACHMENTS_DIR} ${ROOT_USER} ${APACHE_GROUP} 730
OWN_DIRS_PERMS+= ${USER_PREFS_DIR} ${APACHE_USER} ${APACHE_GROUP} 755
+SUBST_CLASSES+= paths
+SUBST_FILES.paths= ${WRKDIR}/squirrelmail.conf.dist config/config_default.php
+SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
+SUBST_SED.paths+= -e 's,@ATTACHMENTS_DIR@,${ATTACHMENTS_DIR},g'
+SUBST_SED.paths+= -e 's,@USER_PREFS_DIR@,${USER_PREFS_DIR},g'
+SUBST_SED.paths+= -e 's,@SMDIR@,${SMDIR},g'
+SUBST_STAGE.paths= post-patch
+
+post-extract:
+ ${CP} ${FILESDIR:Q}/squirrelmail.conf.dist \
+ ${WRKDIR:Q}/squirrelmail.conf.dist
+
pre-configure:
- cd ${WRKSRC}; \
- for file in config/config_default.php; do \
- ${SED} -e "s|@ATTACHMENTS_DIR@|${ATTACHMENTS_DIR}|g" \
- -e "s|@USER_PREFS_DIR@|${USER_PREFS_DIR}|g" \
- $${file} > $${file}.fixed; \
- ${MV} -f $${file}.fixed $${file}; \
- done; \
- cd ${WRKSRC}; \
- ${FIND} . \( -name "*.orig*" -o -name ".cvsignore" \) -print \
- | ${XARGS} ${RM} -f
-
-pre-install:
- @${SED} ${FILES_SUBST_SED} ${FILESDIR}/squirrelmail.conf.dist \
- > ${WRKDIR}/squirrelmail.conf.dist
+ ${FIND} ${WRKSRC:Q} \( -name "*.orig*" -o -name ".cvsignore" \) -exec ${RM} -f {} \;
do-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA_DIR} ${SMDIR}
- cd ${WRKDIR}; ${INSTALL_DATA} squirrelmail.conf.dist \
- ${EGDIR}/squirrelmail.conf
- ${CP} -R ${WRKSRC}/* ${SMDIR}
+ ${INSTALL_DATA_DIR} ${EGDIR:Q}
+ ${INSTALL_DATA_DIR} ${SMDIR:Q}
+ ${INSTALL_DATA} ${WRKDIR:Q}/squirrelmail.conf.dist ${EGDIR:Q}/squirrelmail.conf
+ ${CP} -R ${WRKSRC:Q}/* ${SMDIR:Q}
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SMDIR}
- ${FIND} ${SMDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
- ${FIND} ${SMDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
- ${CHMOD} a+x ${SMDIR}/config/conf.pl
- ${INSTALL_DATA} ${WRKSRC}/data/index.php ${USER_PREFS_DIR}/
- ${INSTALL_DATA} ${WRKSRC}/data/.htaccess ${USER_PREFS_DIR}/
+ ${FIND} ${SMDIR} -type d -print -exec ${CHMOD} ${PKGDIRMODE} {} \;
+ ${FIND} ${SMDIR} -type f -print -exec ${CHMOD} ${SHAREMODE} {} \;
+ ${CHMOD} a+x ${SMDIR:Q}/config/conf.pl
+ ${INSTALL_DATA} ${WRKSRC:Q}/data/index.php ${USER_PREFS_DIR:Q}/
+ ${INSTALL_DATA} ${WRKSRC:Q}/data/.htaccess ${USER_PREFS_DIR:Q}/
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
index 874e9ed4642..9e2954b4e5a 100644
--- a/mail/squirrelmail/PLIST
+++ b/mail/squirrelmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2005/07/18 07:04:27 martti Exp $
+@comment $NetBSD: PLIST,v 1.16.4.1 2006/03/15 12:07:54 salo Exp $
share/examples/squirrelmail/squirrelmail.conf
share/squirrelmail/AUTHORS
share/squirrelmail/COPYING
@@ -13,6 +13,7 @@ share/squirrelmail/class/deliver/Deliver_SMTP.class.php
share/squirrelmail/class/deliver/Deliver_SendMail.class.php
share/squirrelmail/class/deliver/index.php
share/squirrelmail/class/helper/VCard.class.php
+share/squirrelmail/class/helper/index.php
share/squirrelmail/class/html.class.php
share/squirrelmail/class/index.php
share/squirrelmail/class/mime.class.php
@@ -63,12 +64,14 @@ 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/ReleaseNotes/1.4/Notes-1.4.4.txt
+share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.5.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/presets.txt
share/squirrelmail/doc/russian_apache.txt
+share/squirrelmail/doc/security.txt
share/squirrelmail/doc/themes.txt
share/squirrelmail/doc/translating.txt
share/squirrelmail/doc/translating_help.txt
@@ -92,6 +95,7 @@ share/squirrelmail/functions/decode/cp1257.php
share/squirrelmail/functions/decode/cp1258.php
share/squirrelmail/functions/decode/cp855.php
share/squirrelmail/functions/decode/cp866.php
+share/squirrelmail/functions/decode/index.php
share/squirrelmail/functions/decode/iso_8859_1.php
share/squirrelmail/functions/decode/iso_8859_10.php
share/squirrelmail/functions/decode/iso_8859_11.php
@@ -118,6 +122,7 @@ share/squirrelmail/functions/display_messages.php
share/squirrelmail/functions/encode/cp1251.php
share/squirrelmail/functions/encode/cp1255.php
share/squirrelmail/functions/encode/cp1256.php
+share/squirrelmail/functions/encode/index.php
share/squirrelmail/functions/encode/iso_8859_1.php
share/squirrelmail/functions/encode/iso_8859_15.php
share/squirrelmail/functions/encode/iso_8859_2.php
@@ -188,6 +193,7 @@ share/squirrelmail/locale/index.php
share/squirrelmail/locale/timezones.cfg
share/squirrelmail/plugins/README.plugins
share/squirrelmail/plugins/abook_take/README
+share/squirrelmail/plugins/abook_take/index.php
share/squirrelmail/plugins/abook_take/setup.php
share/squirrelmail/plugins/abook_take/take.php
share/squirrelmail/plugins/administrator/INSTALL
@@ -222,12 +228,14 @@ share/squirrelmail/plugins/filters/bulkquery/README
share/squirrelmail/plugins/filters/bulkquery/bq.in
share/squirrelmail/plugins/filters/bulkquery/bq.out
share/squirrelmail/plugins/filters/bulkquery/bulkquery.c
+share/squirrelmail/plugins/filters/bulkquery/index.php
share/squirrelmail/plugins/filters/filters.php
share/squirrelmail/plugins/filters/index.php
share/squirrelmail/plugins/filters/options.php
share/squirrelmail/plugins/filters/setup.php
share/squirrelmail/plugins/filters/spamoptions.php
share/squirrelmail/plugins/fortune/INSTALL
+share/squirrelmail/plugins/fortune/index.php
share/squirrelmail/plugins/fortune/setup.php
share/squirrelmail/plugins/index.php
share/squirrelmail/plugins/info/README
@@ -247,6 +255,7 @@ share/squirrelmail/plugins/mail_fetch/index.php
share/squirrelmail/plugins/mail_fetch/options.php
share/squirrelmail/plugins/mail_fetch/setup.php
share/squirrelmail/plugins/make_archive.pl
+share/squirrelmail/plugins/message_details/index.php
share/squirrelmail/plugins/message_details/message_details_bottom.php
share/squirrelmail/plugins/message_details/message_details_main.php
share/squirrelmail/plugins/message_details/message_details_top.php
@@ -261,6 +270,7 @@ share/squirrelmail/plugins/newmail/sounds/FanFair.wav
share/squirrelmail/plugins/newmail/sounds/Friends.wav
share/squirrelmail/plugins/newmail/sounds/MontyPython.wav
share/squirrelmail/plugins/newmail/sounds/Notify.wav
+share/squirrelmail/plugins/newmail/sounds/index.php
share/squirrelmail/plugins/newmail/testsound.php
share/squirrelmail/plugins/sent_subfolders/index.php
share/squirrelmail/plugins/sent_subfolders/setup.php
@@ -357,11 +367,13 @@ share/squirrelmail/themes/alien_glow.php
share/squirrelmail/themes/black_bean_burrito_theme.php
share/squirrelmail/themes/blue_grey_theme.php
share/squirrelmail/themes/bluesnews_theme.php
+share/squirrelmail/themes/bluesome.php
share/squirrelmail/themes/bluesteel_theme.php
share/squirrelmail/themes/christmas.php
share/squirrelmail/themes/css/comic-sans-08.css
share/squirrelmail/themes/css/comic-sans-10.css
share/squirrelmail/themes/css/comic-sans-12.css
+share/squirrelmail/themes/css/index.php
share/squirrelmail/themes/css/sans-08.css
share/squirrelmail/themes/css/sans-10.css
share/squirrelmail/themes/css/sans-12.css
@@ -402,10 +414,15 @@ share/squirrelmail/themes/sandstorm_theme.php
share/squirrelmail/themes/seaspray_theme.php
share/squirrelmail/themes/servery_theme.php
share/squirrelmail/themes/shades_of_grey.php
+share/squirrelmail/themes/silver_steel_theme.php
+share/squirrelmail/themes/simple_green2.php
+share/squirrelmail/themes/simple_green_theme.php
+share/squirrelmail/themes/simple_purple.php
share/squirrelmail/themes/slashdot_theme.php
share/squirrelmail/themes/spice_of_life.php
share/squirrelmail/themes/spice_of_life_dark.php
share/squirrelmail/themes/spice_of_life_lite.php
+share/squirrelmail/themes/wood_theme.php
@dirrm share/squirrelmail/themes/css
@dirrm share/squirrelmail/themes
@dirrm share/squirrelmail/src
diff --git a/mail/squirrelmail/buildlink3.mk b/mail/squirrelmail/buildlink3.mk
index cd882a53ae4..cbbf6c4f54b 100644
--- a/mail/squirrelmail/buildlink3.mk
+++ b/mail/squirrelmail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/07/20 15:42:34 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.4.4.1 2006/03/15 12:07:54 salo Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SQUIRRELMAIL_BUILDLINK3_MK:= ${SQUIRRELMAIL_BUILDLINK3_MK}+
@@ -11,8 +11,9 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsquirrelmail}
BUILDLINK_PACKAGES+= squirrelmail
.if !empty(SQUIRRELMAIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.squirrelmail+= {ja-,}squirrelmail>=1.4.5
+BUILDLINK_DEPENDS.squirrelmail+= {ja-,}squirrelmail>=1.4.6
+BUILDLINK_RECOMMENDED.squirrelmail?= squirrelmail>=1.4.6
BUILDLINK_PKGSRCDIR.squirrelmail?= ../../mail/squirrelmail
.endif # SQUIRRELMAIL_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index 52a572fb7dc..a11357a757d 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,13 +1,6 @@
-$NetBSD: distinfo,v 1.29 2005/12/05 20:13:38 martti Exp $
+$NetBSD: distinfo,v 1.29.2.1 2006/03/15 12:07:54 salo 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.6.tar.bz2) = b813aa9f736b4b6c41d1afd35bcbd01604e85cf7
+RMD160 (squirrelmail-1.4.6.tar.bz2) = 3cee894b392620af3e35ef1d00e35775559dd4f7
+Size (squirrelmail-1.4.6.tar.bz2) = 484099 bytes
SHA1 (patch-aa) = cafc171ab1de5e2e1e83caff39f3bfb810fe2ab5
-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/squirrelmail/patches/patch-ab b/mail/squirrelmail/patches/patch-ab
deleted file mode 100644
index 6f2fe5ad7e5..00000000000
--- a/mail/squirrelmail/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2005/09/20 13:19:05 schmonz 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/squirrelmail/patches/patch-ac b/mail/squirrelmail/patches/patch-ac
deleted file mode 100644
index 1604c342a92..00000000000
--- a/mail/squirrelmail/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/09/20 13:19:05 schmonz 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/squirrelmail/patches/patch-ad b/mail/squirrelmail/patches/patch-ad
deleted file mode 100644
index 4375d023f5b..00000000000
--- a/mail/squirrelmail/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/09/20 13:19:05 schmonz 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/squirrelmail/patches/patch-ae b/mail/squirrelmail/patches/patch-ae
deleted file mode 100644
index 493cc0a5adb..00000000000
--- a/mail/squirrelmail/patches/patch-ae
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/09/20 13:19:05 schmonz 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/squirrelmail/patches/patch-af b/mail/squirrelmail/patches/patch-af
deleted file mode 100644
index e6c96a30235..00000000000
--- a/mail/squirrelmail/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/09/20 13:19:05 schmonz 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/squirrelmail/patches/patch-ag b/mail/squirrelmail/patches/patch-ag
deleted file mode 100644
index 6a5e07056eb..00000000000
--- a/mail/squirrelmail/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/12/05 09:18: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/squirrelmail/patches/patch-ah b/mail/squirrelmail/patches/patch-ah
deleted file mode 100644
index d3b3ff16e91..00000000000
--- a/mail/squirrelmail/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/12/05 20:13:38 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);
- }
diff --git a/mail/squirrelmail/plugin.mk b/mail/squirrelmail/plugin.mk
index 07339face9e..56d8f92d6b3 100644
--- a/mail/squirrelmail/plugin.mk
+++ b/mail/squirrelmail/plugin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugin.mk,v 1.2 2005/12/05 20:50:35 rillig Exp $
+# $NetBSD: plugin.mk,v 1.2.2.1 2006/03/15 12:07:54 salo Exp $
DISTNAME?= ${PLUGIN_NAME}-${PLUGIN_VERSION}
PKGNAME= sm-${PLUGIN_NAME}-${PLUGIN_VERSION}
@@ -18,7 +18,7 @@ INSTALLATION_DIRS+= ${PLUGIN_DIR}
PLIST_SUBST+= PLUGIN_DIR=${PLUGIN_DIR:Q}
do-install:
- cd ${WRKSRC} && \
+ cd ${WRKSRC:Q} && \
${FIND} . -type f ! -name '*.orig' 2>/dev/null | \
${PAX} -rw ${FULL_PLUGIN_DIR}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-05 19:43:05 +0000