r2694 - in zope2.12/trunk/debian/patches (CVE-2012-5505.patch)

[arnau at users.alioth.debian.org]

    Date: Thursday, February 28, 2013 @ 11:04:26
  Author: arnau
Revision: 2694

Fix patch.

Modified:
  zope2.12/trunk/debian/patches/CVE-2012-5505.patch

Modified: zope2.12/trunk/debian/patches/CVE-2012-5505.patch
===================================================================
--- zope2.12/trunk/debian/patches/CVE-2012-5505.patch	2013-02-28 10:11:36 UTC (rev 2693)
+++ zope2.12/trunk/debian/patches/CVE-2012-5505.patch	2013-02-28 11:04:26 UTC (rev 2694)
@@ -1,7 +1,8 @@
-=== modified file 'src/zope/annotation/configure.zcml'
---- src/zope/annotation/configure.zcml	2011-02-15 15:46:28 +0000
-+++ src/zope/annotation/configure.zcml	2013-01-27 18:00:07 +0000
-@@ -8,10 +8,4 @@
+Index: zope2.12-2.12.26/source/zope.annotation/src/zope/annotation/configure.zcml
+===================================================================
+--- zope2.12-2.12.26.orig/source/zope.annotation/src/zope/annotation/configure.zcml	2013-02-28 19:20:05.224588913 +0900
++++ zope2.12-2.12.26/source/zope.annotation/src/zope/annotation/configure.zcml	2013-02-28 19:20:05.220588872 +0900
+@@ -6,10 +6,4 @@
        factory=".attribute.AttributeAnnotations"
        />
  
@@ -12,17 +13,3 @@
 -      />
 -
  </configure>
-
-=== modified file 'src/zope/annotation/tests/test_configure.py'
---- src/zope/annotation/tests/test_configure.py	2011-02-15 15:46:28 +0000
-+++ src/zope/annotation/tests/test_configure.py	2013-01-27 18:01:03 +0000
-@@ -36,7 +36,7 @@
-         zope.configuration.xmlconfig.XMLConfig(
-             'configure.zcml', zope.annotation)()
-         self.assertEqual(u_count + 2, len(list(gsm.registeredUtilities())))
--        self.assertEqual(a_count + 2, len(list(gsm.registeredAdapters())))
-+        self.assertEqual(a_count + 1, len(list(gsm.registeredAdapters())))
-         self.assertEqual(
-             s_count, len(list(gsm.registeredSubscriptionAdapters())))
-         self.assertEqual(h_count, len(list(gsm.registeredHandlers())))
-