[Pkg-owncloud-commits] [owncloud] 100/104: Fix X-EVOLUTION-FILE-AS escape
David Prévot
taffit at moszumanska.debian.org
Sat Jan 18 13:33:44 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 8e1d837dafd60a2fb5df217a8de34834072dd773
Author: David Prévot <taffit at debian.org>
Date: Thu Jan 16 22:50:59 2014 -0400
Fix X-EVOLUTION-FILE-AS escape
Closes: #735112
Thanks: Simon McVittie
---
debian/patches/0001-Disable-the-appstore.patch | 6 ++--
debian/patches/0002-Fix-displayed-version.patch | 4 +--
.../0018-Fix-X-EVOLUTION-FILE-AS-escape.patch | 37 ++++++++++++++++++++++
...octrine-Symphony-Sabre-and-Patchwork-path.patch | 2 +-
debian/patches/series | 1 +
5 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index aa7687d..957c852 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -54,7 +54,7 @@ index 1070ef7..60b6a0f 100644
),
'user_backends'=>array(
diff --git a/lib/base.php b/lib/base.php
-index d3e483f..64a3349 100644
+index 5470cf2..11aa253 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -144,8 +144,8 @@ class OC {
@@ -122,7 +122,7 @@ index e35556d..8dcf6da 100644
}
$url=OC_OCSClient::getAppStoreURL().'/content/download/'.urlencode($id).'/'.urlencode($item);
diff --git a/lib/private/setup.php b/lib/private/setup.php
-index b5c530a..595495d 100644
+index 5232398..f935c0d 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -68,6 +68,8 @@ class OC_Setup {
@@ -135,7 +135,7 @@ index b5c530a..595495d 100644
$dbSetup->initialize($options);
$dbSetup->setupDatabase($username);
diff --git a/lib/private/util.php b/lib/private/util.php
-index a73564b..790280c 100644
+index a4b3761..cf95e38 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -322,7 +322,7 @@ class OC_Util {
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index c8267ee..7ec5841 100644
--- a/debian/patches/0002-Fix-displayed-version.patch
+++ b/debian/patches/0002-Fix-displayed-version.patch
@@ -46,10 +46,10 @@ index 625f342..ed21f88 100644
if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array() && OC_User::isAdminUser(OC_User::getUser())) {
$this->assign('updateAvailable', true);
diff --git a/lib/private/util.php b/lib/private/util.php
-index 790280c..13a7618 100644
+index cf95e38..aa2630c 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -1125,7 +1125,7 @@ class OC_Util {
+@@ -1129,7 +1129,7 @@ class OC_Util {
* @return string
*/
public static function getHumanVersion() {
diff --git a/debian/patches/0018-Fix-X-EVOLUTION-FILE-AS-escape.patch b/debian/patches/0018-Fix-X-EVOLUTION-FILE-AS-escape.patch
new file mode 100644
index 0000000..44d8d76
--- /dev/null
+++ b/debian/patches/0018-Fix-X-EVOLUTION-FILE-AS-escape.patch
@@ -0,0 +1,37 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Sun, 12 Jan 2014 19:23:58 +0000
+Subject: Fix X-EVOLUTION-FILE-AS escape
+
+Evolution defaults to the form "X-EVOLUTION-FILE-AS:Bloggs\, Joe", and
+since Evolution uses this field as the contacts' displayed name, it's
+highly visible when ownCloud turns it into
+"X-EVOLUTION-FILE-AS:Bloggs\\, Joe".
+
+https://github.com/owncloud/contacts/issues/42#issuecomment-28776546
+
+When interacting with Evolution-Data-Server (which I think MeeGo might
+use), the same incorrect escaping applies to X-EVOLUTION-FILE-AS. This
+is a non-standard field, but it's highly visible for Evolution users,
+since it's used as the default displayed name for contacts there.
+
+https://github.com/owncloud/core/issues/2335#issuecomment-32130820
+
+Bug-Debian: http://bugs.debian.org/735112
+Bug: https://github.com/owncloud/contacts/pull/355
+Origin: upstream, https://github.com/owncloud/contacts/commit/16fa2cf80713d383c3705f4dee27c6af05fa3d68
+---
+ apps/contacts/appinfo/app.php | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
+index bf63bf4..273120a 100644
+--- a/apps/contacts/appinfo/app.php
++++ b/apps/contacts/appinfo/app.php
+@@ -15,6 +15,7 @@ use \OC\AppFramework\Core\API;
+ \Sabre\VObject\Property::$classMap['TEL'] = '\OC\VObject\StringProperty';
+ \Sabre\VObject\Property::$classMap['IMPP'] = '\OC\VObject\StringProperty';
+ \Sabre\VObject\Property::$classMap['URL'] = '\OC\VObject\StringProperty';
++\Sabre\VObject\Property::$classMap['X-EVOLUTION-FILE-AS'] = '\OC\VObject\StringProperty';
+ \Sabre\VObject\Property::$classMap['N'] = '\OC\VObject\CompoundProperty';
+ \Sabre\VObject\Property::$classMap['ADR'] = '\OC\VObject\CompoundProperty';
+ \Sabre\VObject\Property::$classMap['GEO'] = '\OC\VObject\CompoundProperty';
diff --git a/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch b/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch
index 6955e02..afbddc6 100644
--- a/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch
+++ b/debian/patches/path/0007-Adapt-Doctrine-Symphony-Sabre-and-Patchwork-path.patch
@@ -20,7 +20,7 @@ Last-Update: 2013-11-11
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/base.php b/lib/base.php
-index 64a3349..9bea1a2 100644
+index 11aa253..6d723a4 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -406,13 +406,13 @@ class OC {
diff --git a/debian/patches/series b/debian/patches/series
index be08744..5d13899 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ path/0014-Adapt-Dropbox-path.patch
path/0015-Adapt-php-opencloud-path.patch
path/0016-Adapt-Zend-path.patch
0017-Disable-Flash-and-Silverlight-plugins.patch
+0018-Fix-X-EVOLUTION-FILE-AS-escape.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list