[patchlogo]

Debian patch tracking system

- calendarserver - calendarserver/2.4.dfsg-6 - series patch linux-xattr-fix.patch

calendarserver (2.4.dfsg-6) linux-xattr-fix.patch

Summary

 calendarserver/tools/doublequotefix.py    |    4 ++--
 calendarserver/tools/fixcalendardata.py   |    6 +++---
 contrib/tools/fix_calendar                |   10 +++++-----
 twistedcaldav/admin/util.py               |    8 ++++----
 twistedcaldav/test/data/makelargefbset.py |    2 +-
 twistedcaldav/test/test_upgrade.py        |    6 +++---
 twistedcaldav/upgrade.py                  |    6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)
download this patch

Patch contents

diff -Naur calendarserver-2.4.dfsg.orig/calendarserver/tools/doublequotefix.py calendarserver-2.4.dfsg/calendarserver/tools/doublequotefix.py
--- calendarserver-2.4.dfsg.orig/calendarserver/tools/doublequotefix.py	2009-01-06 00:27:18.000000000 +0530
+++ calendarserver-2.4.dfsg/calendarserver/tools/doublequotefix.py	2010-07-28 16:58:55.000000000 +0530
@@ -56,14 +56,14 @@
 def updateEtag(path, caldata):
 
     x = xattr.xattr(path)
-    x["WebDAV:{http:%2F%2Ftwistedmatrix.com%2Fxml_namespace%2Fdav%2F}getcontentmd5"] = """<?xml version='1.0' encoding='UTF-8'?>
+    x["user.{http:%2F%2Ftwistedmatrix.com%2Fxml_namespace%2Fdav%2F}getcontentmd5"] = """<?xml version='1.0' encoding='UTF-8'?>
 <getcontentmd5 xmlns='http://twistedmatrix.com/xml_namespace/dav/'>%s</getcontentmd5>
 """ % (hashlib.md5(caldata).hexdigest(),)
 
 def updateCtag(path):
 
     x = xattr.xattr(path)
-    x["WebDAV:{http:%2F%2Fcalendarserver.org%2Fns%2F}getctag"] = """<?xml version='1.0' encoding='UTF-8'?>
+    x["user.{http:%2F%2Fcalendarserver.org%2Fns%2F}getctag"] = """<?xml version='1.0' encoding='UTF-8'?>
 <getctag xmlns='http://calendarserver.org/ns/'>%s</getctag>
 """ % (str(datetime.datetime.now()),)
 
diff -Naur calendarserver-2.4.dfsg.orig/calendarserver/tools/fixcalendardata.py calendarserver-2.4.dfsg/calendarserver/tools/fixcalendardata.py
--- calendarserver-2.4.dfsg.orig/calendarserver/tools/fixcalendardata.py	2009-05-06 01:12:00.000000000 +0530
+++ calendarserver-2.4.dfsg/calendarserver/tools/fixcalendardata.py	2010-07-28 16:58:33.000000000 +0530
@@ -61,14 +61,14 @@
 def updateEtag(path, caldata):
 
     x = xattr.xattr(path)
-    x["WebDAV:{http:%2F%2Ftwistedmatrix.com%2Fxml_namespace%2Fdav%2F}getcontentmd5"] = """<?xml version='1.0' encoding='UTF-8'?>
+    x["user.{http:%2F%2Ftwistedmatrix.com%2Fxml_namespace%2Fdav%2F}getcontentmd5"] = """<?xml version='1.0' encoding='UTF-8'?>
 <getcontentmd5 xmlns='http://twistedmatrix.com/xml_namespace/dav/'>%s</getcontentmd5>
 """ % (hashlib.md5(caldata).hexdigest(),)
 
 def updateCtag(path):
 
     x = xattr.xattr(path)
-    x["WebDAV:{http:%2F%2Fcalendarserver.org%2Fns%2F}getctag"] = """<?xml version='1.0' encoding='UTF-8'?>
+    x["user.{http:%2F%2Fcalendarserver.org%2Fns%2F}getctag"] = """<?xml version='1.0' encoding='UTF-8'?>
 <getctag xmlns='http://calendarserver.org/ns/'>%s</getctag>
 """ % (str(datetime.datetime.now()),)
 
@@ -101,7 +101,7 @@
     for item in os.listdir(calendarHome):
         calendarPath = os.path.join(calendarHome, item)
         x = xattr.xattr(calendarPath)
-        if x.has_key("WebDAV:{http:%2F%2Fcalendarserver.org%2Fns%2F}getctag"):
+        if x.has_key("user.{http:%2F%2Fcalendarserver.org%2Fns%2F}getctag"):
             scanCalendar(basePath, calendarPath, scanFile, doFix)
 
 def scanCalendar(basePath, calendarPath, scanFile, doFix):
diff -Naur calendarserver-2.4.dfsg.orig/contrib/tools/fix_calendar calendarserver-2.4.dfsg/contrib/tools/fix_calendar
--- calendarserver-2.4.dfsg.orig/contrib/tools/fix_calendar	2008-06-24 02:02:56.000000000 +0530
+++ calendarserver-2.4.dfsg/contrib/tools/fix_calendar	2010-07-28 16:59:48.000000000 +0530
@@ -44,14 +44,14 @@
     
     # First fix the resourcetype & getctag on the calendar
     x = xattr.xattr(path)
-    x["WebDAV:{DAV:}resourcetype"] = """<?xml version='1.0' encoding='UTF-8'?>
+    x["user.{DAV:}resourcetype"] = """<?xml version='1.0' encoding='UTF-8'?>
 <resourcetype xmlns='DAV:'>
   <collection/>
   <calendar xmlns='urn:ietf:params:xml:ns:caldav'/>
 </resourcetype>
 """
 
-    x["WebDAV:{http:%2F%2Fcalendarserver.org%2Fns%2F}getctag"] = """<?xml version='1.0' encoding='UTF-8'?>
+    x["user.{http:%2F%2Fcalendarserver.org%2Fns%2F}getctag"] = """<?xml version='1.0' encoding='UTF-8'?>
 <getctag xmlns='http://calendarserver.org/ns/'>Dummy Value</getctag>
 """
 
@@ -63,13 +63,13 @@
         
         # getcontenttype
         x = xattr.xattr(fullpath)
-        x["WebDAV:{DAV:}getcontenttype"] = """<?xml version='1.0' encoding='UTF-8'?>
+        x["user.{DAV:}getcontenttype"] = """<?xml version='1.0' encoding='UTF-8'?>
 <getcontenttype xmlns='DAV:'>text/calendar</getcontenttype>
 """
 
         # md5
         data = open(fullpath).read()
-        x["WebDAV:{http:%2F%2Ftwistedmatrix.com%2Fxml_namespace%2Fdav%2F}getcontentmd5"] = """<?xml version='1.0' encoding='UTF-8'?>
+        x["user.{http:%2F%2Ftwistedmatrix.com%2Fxml_namespace%2Fdav%2F}getcontentmd5"] = """<?xml version='1.0' encoding='UTF-8'?>
 <getcontentmd5 xmlns='http://twistedmatrix.com/xml_namespace/dav/'>%s</getcontentmd5>
 """ % (hashlib.md5(data).hexdigest(),)
 
@@ -103,4 +103,4 @@
 
     except Exception, e:
         sys.exit(str(e))
-    
\ No newline at end of file
+    
diff -Naur calendarserver-2.4.dfsg.orig/twistedcaldav/admin/util.py calendarserver-2.4.dfsg/twistedcaldav/admin/util.py
--- calendarserver-2.4.dfsg.orig/twistedcaldav/admin/util.py	2009-04-22 09:10:46.000000000 +0530
+++ calendarserver-2.4.dfsg/twistedcaldav/admin/util.py	2010-07-28 17:01:30.000000000 +0530
@@ -92,7 +92,7 @@
 
 
 def getPrincipalType(fp):
-    rtp = "WebDAV:" + RecordTypeProperty.sname().replace("/", "%2F")
+    rtp = "user." + RecordTypeProperty.sname().replace("/", "%2F")
     x = xattr.xattr(fp.path)
     if not x.has_key(rtp):
         return None
@@ -103,7 +103,7 @@
     return rtp[0].firstChild().value
     
 def getResourceType(fp):
-    rt = 'WebDAV:{DAV:}resourcetype'
+    rt = 'user.{DAV:}resourcetype'
     x = xattr.xattr(fp.path)
     if not x.has_key(rt):
         return None
@@ -173,8 +173,8 @@
 
 from twisted.web2.dav.resource import TwistedQuotaRootProperty, TwistedQuotaUsedProperty
 
-quotaRoot = "WebDAV:" + TwistedQuotaRootProperty.sname().replace("/", "%2F")
-quotaUsed = "WebDAV:" + TwistedQuotaUsedProperty.sname().replace("/", "%2F")
+quotaRoot = "user." + TwistedQuotaRootProperty.sname().replace("/", "%2F")
+quotaUsed = "user." + TwistedQuotaUsedProperty.sname().replace("/", "%2F")
 
 def getQuotaRoot(fp):
     x = xattr.xattr(fp.path)
diff -Naur calendarserver-2.4.dfsg.orig/twistedcaldav/test/data/makelargefbset.py calendarserver-2.4.dfsg/twistedcaldav/test/data/makelargefbset.py
--- calendarserver-2.4.dfsg.orig/twistedcaldav/test/data/makelargefbset.py	2007-12-12 06:28:32.000000000 +0530
+++ calendarserver-2.4.dfsg/twistedcaldav/test/data/makelargefbset.py	2010-07-28 17:00:43.000000000 +0530
@@ -45,7 +45,7 @@
     
         inboxname = os.path.join(path, "inbox")
         attrs = xattr.xattr(inboxname)
-        attrs["WebDAV:{urn:ietf:params:xml:ns:caldav}calendar-free-busy-set"] = """<?xml version='1.0' encoding='UTF-8'?>
+        attrs["user.{urn:ietf:params:xml:ns:caldav}calendar-free-busy-set"] = """<?xml version='1.0' encoding='UTF-8'?>
     <calendar-free-busy-set xmlns='urn:ietf:params:xml:ns:caldav'>
       <href xmlns='DAV:'>/calendars/users/user%02d/calendar/</href>
       <href xmlns='DAV:'>/calendars/users/user%02d/calendar.1000/</href>
diff -Naur calendarserver-2.4.dfsg.orig/twistedcaldav/test/test_upgrade.py calendarserver-2.4.dfsg/twistedcaldav/test/test_upgrade.py
--- calendarserver-2.4.dfsg.orig/twistedcaldav/test/test_upgrade.py	2009-11-19 01:35:55.000000000 +0530
+++ calendarserver-2.4.dfsg/twistedcaldav/test/test_upgrade.py	2010-07-28 17:00:20.000000000 +0530
@@ -29,9 +29,9 @@
 import hashlib
 import os, zlib, cPickle
 
-freeBusyAttr = "WebDAV:{urn:ietf:params:xml:ns:caldav}calendar-free-busy-set"
-cTagAttr = "WebDAV:{http:%2F%2Fcalendarserver.org%2Fns%2F}getctag"
-md5Attr = "WebDAV:{http:%2F%2Ftwistedmatrix.com%2Fxml_namespace%2Fdav%2F}getcontentmd5"
+freeBusyAttr = "user.{urn:ietf:params:xml:ns:caldav}calendar-free-busy-set"
+cTagAttr = "user.{http:%2F%2Fcalendarserver.org%2Fns%2F}getctag"
+md5Attr = "user.{http:%2F%2Ftwistedmatrix.com%2Fxml_namespace%2Fdav%2F}getcontentmd5"
 
 
 class ProxyDBUpgradeTests(TestCase):
diff -Naur calendarserver-2.4.dfsg.orig/twistedcaldav/upgrade.py calendarserver-2.4.dfsg/twistedcaldav/upgrade.py
--- calendarserver-2.4.dfsg.orig/twistedcaldav/upgrade.py	2009-11-19 01:21:02.000000000 +0530
+++ calendarserver-2.4.dfsg/twistedcaldav/upgrade.py	2010-07-28 17:01:06.000000000 +0530
@@ -156,7 +156,7 @@
 
                 md5value = "<?xml version='1.0' encoding='UTF-8'?>\r\n<getcontentmd5 xmlns='http://twistedmatrix.com/xml_namespace/dav/'>%s</getcontentmd5>\r\n" % (hashlib.md5(data).hexdigest(),)
                 md5value = zlib.compress(md5value)
-                xattr.setxattr(resPath, "WebDAV:{http:%2F%2Ftwistedmatrix.com%2Fxml_namespace%2Fdav%2F}getcontentmd5", md5value)
+                xattr.setxattr(resPath, "user.{http:%2F%2Ftwistedmatrix.com%2Fxml_namespace%2Fdav%2F}getcontentmd5", md5value)
 
                 collectionUpdated = True
 
@@ -164,7 +164,7 @@
         if collectionUpdated:
             ctagValue = "<?xml version='1.0' encoding='UTF-8'?>\r\n<getctag xmlns='http://calendarserver.org/ns/'>%s</getctag>\r\n" % (str(datetime.datetime.now()),)
             ctagValue = zlib.compress(ctagValue)
-            xattr.setxattr(calPath, "WebDAV:{http:%2F%2Fcalendarserver.org%2Fns%2F}getctag", ctagValue)
+            xattr.setxattr(calPath, "user.{http:%2F%2Fcalendarserver.org%2Fns%2F}getctag", ctagValue)
 
         return errorOccurred
 
@@ -194,7 +194,7 @@
                 # __uids__/<guid> form
                 if cal == "inbox":
                     for attr, value in xattr.xattr(calPath).iteritems():
-                        if attr == "WebDAV:{urn:ietf:params:xml:ns:caldav}calendar-free-busy-set":
+                        if attr == "user.{urn:ietf:params:xml:ns:caldav}calendar-free-busy-set":
                             value = updateFreeBusySet(value, directory)
                             if value is not None:
                                 # Need to write the xattr back to disk
page code/design/content is copyright (c) 2008 sean finney <seanius@debian.org>.
patches viewed/retrieved through this system are copyrighted by their respective authors.
browse git repo - clone git repo