diff options
author | taca <taca> | 2010-12-28 15:34:38 +0000 |
---|---|---|
committer | taca <taca> | 2010-12-28 15:34:38 +0000 |
commit | fc7601bdbe94e678f59e5242bdf4c67ed48303e8 (patch) | |
tree | dbabd6be3215c629d07a60566e0216d277b114f7 /www/fengoffice | |
parent | 367ab9d2a4234b2577aea1e116cc5521c5517a9a (diff) | |
download | pkgsrc-fc7601bdbe94e678f59e5242bdf4c67ed48303e8.tar.gz |
* Fix variable mistakes to prevent garbled characters. Still needs to
fix essential problem when a header contains multiple encoded strings
with diffreent charset.
* Suprress some error of undefined variables.
* pkgsrc change: change ${FD_DIR}/tmp from SPECIAL_PERMS to OWN_DIRS_PERMS.
Bump PKGREVISION.
Diffstat (limited to 'www/fengoffice')
-rw-r--r-- | www/fengoffice/Makefile | 5 | ||||
-rw-r--r-- | www/fengoffice/distinfo | 5 | ||||
-rw-r--r-- | www/fengoffice/patches/patch-ad | 26 | ||||
-rw-r--r-- | www/fengoffice/patches/patch-ae | 14 | ||||
-rw-r--r-- | www/fengoffice/patches/patch-af | 14 |
5 files changed, 61 insertions, 3 deletions
diff --git a/www/fengoffice/Makefile b/www/fengoffice/Makefile index e04b2b66846..d72ae541c67 100644 --- a/www/fengoffice/Makefile +++ b/www/fengoffice/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2010/12/02 13:35:23 taca Exp $ +# $NetBSD: Makefile,v 1.10 2010/12/28 15:34:38 taca Exp $ # DISTNAME= fengoffice_1.7.3.1 PKGNAME= ${DISTNAME:S/_/-/:C/.rc$/rc1/} +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opengoo/} EXTRACT_SUFX= .zip @@ -31,7 +32,7 @@ OWN_DIRS_PERMS+= ${FO_DIR}/public/files ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 OWN_DIRS_PERMS+= ${FO_DIR}/upload ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 OWN_DIRS_PERMS+= ${FO_DIR}/cache ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 OWN_DIRS_PERMS+= ${FO_DIR}/config ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 -SPECIAL_PERMS+= ${FO_DIR}/tmp ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 +OWN_DIRS_PERMS+= ${FO_DIR}/tmp ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 BUILD_DEFS+= APACHE_GROUP APACHE_USER FILES_SUBST+= FO_DIR=${FO_DIR} APACHE_USER=${APACHE_USER} diff --git a/www/fengoffice/distinfo b/www/fengoffice/distinfo index 40d753d9ae1..d35f8206272 100644 --- a/www/fengoffice/distinfo +++ b/www/fengoffice/distinfo @@ -1,7 +1,10 @@ -$NetBSD: distinfo,v 1.7 2010/12/02 13:35:23 taca Exp $ +$NetBSD: distinfo,v 1.8 2010/12/28 15:34:38 taca Exp $ SHA1 (fengoffice_1.7.3.1.zip) = b34ebeb89f318bf9815b425da31017684497afdb RMD160 (fengoffice_1.7.3.1.zip) = 2e0425b59c39cf29fab5ea2880ea462cc7f50ac5 Size (fengoffice_1.7.3.1.zip) = 7959379 bytes SHA1 (patch-aa) = 9f135a98241ace92ed66babd4042efe9dec0304e SHA1 (patch-ac) = 10cdae0fe56a08d0f04e4071ba2eb82112495fe5 +SHA1 (patch-ad) = 6fa70e3f0792f9be20cc3458ebf5b91bd0eb95cd +SHA1 (patch-ae) = b6d5d507b440856106b97f57837961d3f7df341c +SHA1 (patch-af) = 7b4bcd2b7a9cd755bc0e3d99acfc8a13d3d6f485 diff --git a/www/fengoffice/patches/patch-ad b/www/fengoffice/patches/patch-ad new file mode 100644 index 00000000000..07b7fc6b527 --- /dev/null +++ b/www/fengoffice/patches/patch-ad @@ -0,0 +1,26 @@ +$NetBSD: patch-ad,v 1.1 2010/12/28 15:34:38 taca Exp $ + +* Fix variable mistakes to prevent garbled characters. Still needs to + fix essential problem when a header contains multiple encoded strings + with diffreent charset. + +--- environment/classes/mail/MailUtilities.class.php.orig 2010-12-01 12:33:32.000000000 +0000 ++++ environment/classes/mail/MailUtilities.class.php +@@ -249,7 +249,7 @@ class MailUtilities { + if ($from_name == ''){ + $from_name = $from; + } else if (strtoupper($encoding) =='KOI8-R' || strtoupper($encoding) =='CP866' || $from_encoding != 'UTF-8' || !$enc_conv->isUtf8RegExp($from_name)){ //KOI8-R and CP866 are Russian encodings which PHP does not detect +- $utf8_from = $enc_conv->convert($encoding, 'UTF-8', $from_name); ++ $utf8_from = $enc_conv->convert($from_encoding, 'UTF-8', $from_name); + + if ($enc_conv->hasError()) { + $utf8_from = utf8_encode($from_name); +@@ -264,7 +264,7 @@ class MailUtilities { + $subject_encoding = detect_encoding($subject_aux); + + if (strtoupper($encoding) =='KOI8-R' || strtoupper($encoding) =='CP866' || $subject_encoding != 'UTF-8' || !$enc_conv->isUtf8RegExp($subject_aux)){ //KOI8-R and CP866 are Russian encodings which PHP does not detect +- $utf8_subject = $enc_conv->convert($encoding, 'UTF-8', $subject_aux); ++ $utf8_subject = $enc_conv->convert($subject_encoding, 'UTF-8', $subject_aux); + + if ($enc_conv->hasError()) { + $utf8_subject = utf8_encode($subject_aux); diff --git a/www/fengoffice/patches/patch-ae b/www/fengoffice/patches/patch-ae new file mode 100644 index 00000000000..3e354ea8a8d --- /dev/null +++ b/www/fengoffice/patches/patch-ae @@ -0,0 +1,14 @@ +$NetBSD: patch-ae,v 1.1 2010/12/28 15:34:38 taca Exp $ + +Prevent logging error: Undefined variable: user_id in ... + +--- application/helpers/application.php.orig 2010-12-01 12:33:32.000000000 +0000 ++++ application/helpers/application.php +@@ -867,6 +867,7 @@ function render_object_latest_activity($ + + $latest_logs = ApplicationLogs::getObjectLogs($object, false, false, 3, 0); + ++ tpl_assign('user_id', get_id()); + tpl_assign('logs', $latest_logs); + return tpl_fetch(get_template_path('activity_log', 'latest_activity')); + diff --git a/www/fengoffice/patches/patch-af b/www/fengoffice/patches/patch-af new file mode 100644 index 00000000000..3cb17bd173b --- /dev/null +++ b/www/fengoffice/patches/patch-af @@ -0,0 +1,14 @@ +$NetBSD: patch-af,v 1.1 2010/12/28 15:34:38 taca Exp $ + +Prevent logging error: Undefined variable: smtp_username: smtp_username ... + +--- application/models/notifier/Notifier.class.php.orig 2010-12-01 12:33:32.000000000 +0000 ++++ application/models/notifier/Notifier.class.php +@@ -747,6 +747,7 @@ class Notifier { + $smtp_server = config_option('smtp_server'); + $smtp_port = config_option('smtp_port', 25); + $smtp_secure_connection = config_option('smtp_secure_connection', self::SMTP_SECURE_CONNECTION_NO); ++ $smtp_username = null; + $smtp_authenticate = config_option('smtp_authenticate', false); + if($smtp_authenticate) { + $smtp_username = config_option('smtp_username'); |