r2707 - in zope2.13/trunk/debian/patches (3 files)

[arnau at users.alioth.debian.org]

    Date: Friday, May 17, 2013 @ 03:01:22
  Author: arnau
Revision: 2707

Add not committed patches.

Added:
  zope2.13/trunk/debian/patches/CVE-2012-5505.patch
  zope2.13/trunk/debian/patches/use-python-initgroups.patch
Deleted:
  zope2.13/trunk/debian/patches/ZODB3-fix_shebang.patch

Added: zope2.13/trunk/debian/patches/CVE-2012-5505.patch
===================================================================
--- zope2.13/trunk/debian/patches/CVE-2012-5505.patch	                        (rev 0)
+++ zope2.13/trunk/debian/patches/CVE-2012-5505.patch	2013-05-17 03:01:22 UTC (rev 2707)
@@ -0,0 +1,15 @@
+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"
+       />
+ 
+-  <adapter
+-      for=".interfaces.IAttributeAnnotatable *"
+-      provides=".interfaces.IAnnotations"
+-      factory=".attribute.AttributeAnnotations"
+-      />
+-
+ </configure>

Deleted: zope2.13/trunk/debian/patches/ZODB3-fix_shebang.patch
===================================================================
--- zope2.13/trunk/debian/patches/ZODB3-fix_shebang.patch	2013-05-16 11:41:40 UTC (rev 2706)
+++ zope2.13/trunk/debian/patches/ZODB3-fix_shebang.patch	2013-05-17 03:01:22 UTC (rev 2707)
@@ -1,10 +0,0 @@
-Description: Removing the python2.4 limitation.
-
---- a/source/ZODB3/src/ZODB/scripts/analyze.py
-+++ b/source/ZODB3/src/ZODB/scripts/analyze.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2.4
-+#!/usr/bin/env python
- 
- # Based on a transaction analyzer by Matt Kromer.
- 

Added: zope2.13/trunk/debian/patches/use-python-initgroups.patch
===================================================================
--- zope2.13/trunk/debian/patches/use-python-initgroups.patch	                        (rev 0)
+++ zope2.13/trunk/debian/patches/use-python-initgroups.patch	2013-05-17 03:01:22 UTC (rev 2707)
@@ -0,0 +1,76 @@
+Index: zope2.13-2.13.20/configuration/versions.cfg
+===================================================================
+--- zope2.13-2.13.20.orig/configuration/versions.cfg	2013-05-16 19:22:59.000000000 +0900
++++ zope2.13-2.13.20/configuration/versions.cfg	2013-05-16 19:34:23.267208213 +0900
+@@ -129,7 +129,6 @@
+ datetime = 2.12.7
+ products.zctextindex = 2.13.4
+ extensionclass = 2.13.2
+-initgroups = 2.13.0
+ products.standardcachemanagers = 2.13.0
+ record = 2.13.0
+ zodb3 = 3.10.5
+Index: zope2.13-2.13.20/source/Zope2/pip-egg-info/Zope2.egg-info/requires.txt
+===================================================================
+--- zope2.13-2.13.20.orig/source/Zope2/pip-egg-info/Zope2.egg-info/requires.txt	2013-05-16 19:23:07.000000000 +0900
++++ zope2.13-2.13.20/source/Zope2/pip-egg-info/Zope2.egg-info/requires.txt	2013-05-16 19:35:19.727835623 +0900
+@@ -15,7 +15,6 @@
+ ZODB3
+ ZopeUndo
+ docutils
+-initgroups
+ pytz
+ setuptools
+ tempstorage
+@@ -63,4 +62,4 @@
+ Products.MailHost
+ Products.MIMETools
+ Products.PythonScripts
+-Products.StandardCacheManagers
+\ No newline at end of file
++Products.StandardCacheManagers
+Index: zope2.13-2.13.20/source/Zope2/setup.py
+===================================================================
+--- zope2.13-2.13.20.orig/source/Zope2/setup.py	2013-05-16 19:23:07.000000000 +0900
++++ zope2.13-2.13.20/source/Zope2/setup.py	2013-05-16 19:35:15.539789084 +0900
+@@ -64,7 +64,6 @@
+       'ZODB3',
+       'ZopeUndo',
+       'docutils',
+-      'initgroups',
+       'pytz',
+       'setuptools',
+       'tempstorage',
+Index: zope2.13-2.13.20/source/Zope2/src/Zope2.egg-info/requires.txt
+===================================================================
+--- zope2.13-2.13.20.orig/source/Zope2/src/Zope2.egg-info/requires.txt	2013-05-16 19:23:07.000000000 +0900
++++ zope2.13-2.13.20/source/Zope2/src/Zope2.egg-info/requires.txt	2013-05-16 19:35:23.023872248 +0900
+@@ -15,7 +15,6 @@
+ ZODB3
+ ZopeUndo
+ docutils
+-initgroups
+ pytz
+ setuptools
+ tempstorage
+@@ -63,4 +62,4 @@
+ Products.MailHost
+ Products.MIMETools
+ Products.PythonScripts
+-Products.StandardCacheManagers
+\ No newline at end of file
++Products.StandardCacheManagers
+Index: zope2.13-2.13.20/source/Zope2/src/Zope2/Startup/__init__.py
+===================================================================
+--- zope2.13-2.13.20.orig/source/Zope2/src/Zope2/Startup/__init__.py	2013-05-16 19:23:07.000000000 +0900
++++ zope2.13-2.13.20/source/Zope2/src/Zope2/Startup/__init__.py	2013-05-16 19:36:04.216329977 +0900
+@@ -401,8 +401,7 @@
+         raise ZConfig.ConfigurationError(msg)
+ 
+     try:
+-        import initgroups
+-        initgroups.initgroups(effective_user, gid)
++        os.initgroups(effective_user, gid)
+         os.setgid(gid)
+     except OSError:
+         logger.exception('Could not set group id of effective user')