diff options
| -rw-r--r-- | net-zope/zodb/Manifest | 9 | ||||
| -rw-r--r-- | net-zope/zodb/files/zodb-3.3.1-CVE-2009-0668+0669.patch | 117 | ||||
| -rw-r--r-- | net-zope/zodb/files/zodb-3.3.1_umaskbug.patch | 11 | ||||
| -rw-r--r-- | net-zope/zodb/files/zodb-3.6.0-CVE-2009-0668+0669.patch | 117 | ||||
| -rw-r--r-- | net-zope/zodb/zodb-3.3.1-r1.ebuild | 32 | ||||
| -rw-r--r-- | net-zope/zodb/zodb-3.3.1.ebuild | 36 | ||||
| -rw-r--r-- | net-zope/zodb/zodb-3.6.0-r1.ebuild | 26 | ||||
| -rw-r--r-- | net-zope/zodb/zodb-3.6.0.ebuild | 21 |
8 files changed, 0 insertions, 369 deletions
diff --git a/net-zope/zodb/Manifest b/net-zope/zodb/Manifest index da39d6270600..8ae2aa2112e9 100644 --- a/net-zope/zodb/Manifest +++ b/net-zope/zodb/Manifest @@ -1,13 +1,4 @@ -AUX zodb-3.3.1-CVE-2009-0668+0669.patch 4772 RMD160 7ccadc895c0f7b2c08d84c4bfd5d44166ec7024e SHA1 b79bfe4a4a603c3aeacbf157ce3c73632aa3e247 SHA256 0a89d6c115ac408b45360ba33b5823067b74539481e17627fbc119c1c8f3b647 -AUX zodb-3.3.1_umaskbug.patch 704 RMD160 ad5008388ad9c550cb58c94b023ba175ccf33fa5 SHA1 c56259d1e7176bcd7b6cdee74838a6dc40b4625d SHA256 25886896af902f6fbf5c6e3d0792dce0cc336f8daeafa05dc47fe208bc5fdd2a -AUX zodb-3.6.0-CVE-2009-0668+0669.patch 4772 RMD160 cf49c6da82ca2b15eac78f748e6a60bdeb3876db SHA1 acb91e68f0de9cd966dd6ec5f1dc57aa51fa48bd SHA256 e537e71c77445f02ef0533e2090ca728a9a367214172e238717935ad2d946f05 -DIST ZODB3-3.3.1.tgz 1019277 RMD160 2a72596c7a2db0394d780aeee8ad5d3ab820b2fc SHA1 698e764f4e52612632a89ae6fb10b61ca69c1749 SHA256 9ecd9842faad4fbcda903100515ab1d4244fcf3b46a9db67857ea59542b0d49d -DIST ZODB3-3.6.0.tgz 1193131 RMD160 799e8bc0f1db8125407ca9b7d87e79877606c003 SHA1 959be4060a7759c08912065cd4b050ea2813cfa5 SHA256 b81862b604fb924e7ecc34b69c04016dca5c16368570bfcdece06dfb2a2e42ab DIST ZODB3-3.9.5.tar.gz 698415 RMD160 1c3095648873fb01dc0c1f06f5616f0a88fc1411 SHA1 dc51e01687ab66c63c489fcbd03d2aa73975a824 SHA256 c0e0429e6e7124c627c66bddee48a161f9ab95d4602617ae00d5ca142487c142 -EBUILD zodb-3.3.1-r1.ebuild 771 RMD160 a99a4939fecdee3c607eb43a67c9878e6d8bbf23 SHA1 44ed7b461fdbaa947cd40d5da07c40cc3e6cdbfe SHA256 354d51ddccd866c6e8161a9a3e923e602e33894fec8bd91ecaddffb50bcefb90 -EBUILD zodb-3.3.1.ebuild 790 RMD160 09faecd7803e65dcdd11766864a7dc6906e1423f SHA1 f417e9e588e3c66c5a18b25f95efe4c0e8f62261 SHA256 a9cb967050399c4cdf52a13217e2b96c82f043b03ce89ae6d6f9e11ae997de72 -EBUILD zodb-3.6.0-r1.ebuild 657 RMD160 5aa97cde94426d736caecdd6d8af719365c805eb SHA1 7696be48f2ca03080e4056908113fe88605fafe4 SHA256 a79924a6bbb9d372c2e52ade84ef752766beb9fefdeb3e5f6f136d520a50235c -EBUILD zodb-3.6.0.ebuild 573 RMD160 b9425184e8a07869b0a446624c64a7fe0428a469 SHA1 1ec63bf5204e84939f14b27a344621c7ddf3e3f1 SHA256 0833d9b652b07fceed7fc6b4522ba100e7067db9f064cbc5ff1eec2cf07e0e9d EBUILD zodb-3.9.5.ebuild 1223 RMD160 24802dd46ddd5cb7cc775e346ddd50122f9bdbc5 SHA1 17dc007cd0dff7b861f8dbef02250fab86a93f08 SHA256 59add30625726769aa4bee65ac3346c4b7a4d8725080c3b77a90f5a007aaecbe MISC ChangeLog 5872 RMD160 fcc35a66f1265e09b63872e97ba0ebf8b9ab46ea SHA1 eab085df486098b410413520ac9874c3e7b850e4 SHA256 1983ebc2b0523a4068b5880276a21c4e9d0a3cefbeb201ff25b0ab04d62cb682 MISC metadata.xml 161 RMD160 5e136d45f811478292bd2ee1798a9b0229ffe468 SHA1 9755179a2dee0511818b1f6738ded28e335e1b9a SHA256 e69ac7205cbc2e42a297e20d8f08922003390a345bbf50ccf00d1158a1c97cc5 diff --git a/net-zope/zodb/files/zodb-3.3.1-CVE-2009-0668+0669.patch b/net-zope/zodb/files/zodb-3.3.1-CVE-2009-0668+0669.patch deleted file mode 100644 index d9cff752cd1f..000000000000 --- a/net-zope/zodb/files/zodb-3.3.1-CVE-2009-0668+0669.patch +++ /dev/null @@ -1,117 +0,0 @@ -=== StorageServer.py -================================================================== -Index: ZODB3-3.3.1/Dependencies/ZEO-ZODB3-3.3.1/ZEO/StorageServer.py -=================================================================== ---- ZODB3-3.3.1.orig/Dependencies/ZEO-ZODB3-3.3.1/ZEO/StorageServer.py -+++ ZODB3-3.3.1/Dependencies/ZEO-ZODB3-3.3.1/ZEO/StorageServer.py -@@ -98,7 +98,7 @@ class ZEOStorage: - for func in self.extensions: - self._extensions[func.func_name] = None - -- def finish_auth(self, authenticated): -+ def _finish_auth(self, authenticated): - if not self.auth_realm: - return 1 - self.authenticated = authenticated -@@ -350,6 +350,7 @@ class ZEOStorage: - - def new_oids(self, n=100): - """Return a sequence of n new oids, where n defaults to 100""" -+ n = min(n, 100) - if self.read_only: - raise ReadOnlyError() - if n <= 0: -Index: ZODB3-3.3.1/Dependencies/ZEO-ZODB3-3.3.1/ZEO/auth/auth_digest.py -=================================================================== ---- ZODB3-3.3.1.orig/Dependencies/ZEO-ZODB3-3.3.1/ZEO/auth/auth_digest.py -+++ ZODB3-3.3.1/Dependencies/ZEO-ZODB3-3.3.1/ZEO/auth/auth_digest.py -@@ -121,7 +121,7 @@ class StorageClass(ZEOStorage): - check = hexdigest("%s:%s" % (h_up, challenge)) - if check == response: - self.connection.setSessionKey(session_key(h_up, self._key_nonce)) -- return self.finish_auth(check == response) -+ return self._finish_auth(check == response) - - extensions = [auth_get_challenge, auth_response] - -Index: ZODB3-3.3.1/Dependencies/ZEO-ZODB3-3.3.1/ZEO/tests/auth_plaintext.py -=================================================================== ---- ZODB3-3.3.1.orig/Dependencies/ZEO-ZODB3-3.3.1/ZEO/tests/auth_plaintext.py -+++ ZODB3-3.3.1/Dependencies/ZEO-ZODB3-3.3.1/ZEO/tests/auth_plaintext.py -@@ -41,7 +41,7 @@ class StorageClass(ZEOStorage): - self.connection.setSessionKey(session_key(username, - self.database.realm, - password)) -- return self.finish_auth(dbpw == password_dig) -+ return self._finish_auth(dbpw == password_dig) - - class PlaintextClient(Client): - extensions = ["auth"] -Index: ZODB3-3.3.1/Dependencies/ZEO-ZODB3-3.3.1/ZEO/zrpc/connection.py -=================================================================== ---- ZODB3-3.3.1.orig/Dependencies/ZEO-ZODB3-3.3.1/ZEO/zrpc/connection.py -+++ ZODB3-3.3.1/Dependencies/ZEO-ZODB3-3.3.1/ZEO/zrpc/connection.py -@@ -22,7 +22,7 @@ import logging - import ThreadedAsync - from ZEO.zrpc import smac - from ZEO.zrpc.error import ZRPCError, DisconnectedError --from ZEO.zrpc.marshal import Marshaller -+from ZEO.zrpc.marshal import Marshaller, ServerMarshaller - from ZEO.zrpc.trigger import trigger - from ZEO.zrpc.log import short_repr, log - from ZODB.loglevels import BLATHER, TRACE -@@ -716,6 +716,7 @@ class ManagedServerConnection(Connection - def __init__(self, sock, addr, obj, mgr): - self.mgr = mgr - self.__super_init(sock, addr, obj, 'S') -+ self.marshal = ServerMarshaller() - self.obj.notifyConnected(self) - - def handshake(self): -Index: ZODB3-3.3.1/Dependencies/ZEO-ZODB3-3.3.1/ZEO/zrpc/marshal.py -=================================================================== ---- ZODB3-3.3.1.orig/Dependencies/ZEO-ZODB3-3.3.1/ZEO/zrpc/marshal.py -+++ ZODB3-3.3.1/Dependencies/ZEO-ZODB3-3.3.1/ZEO/zrpc/marshal.py -@@ -53,6 +53,20 @@ class Marshaller: - level=logging.ERROR) - raise - -+class ServerMarshaller(Marshaller): -+ -+ def decode(self, msg): -+ """Decodes msg and returns its parts""" -+ unpickler = cPickle.Unpickler(StringIO(msg)) -+ unpickler.find_global = server_find_global -+ -+ try: -+ return unpickler.load() # msgid, flags, name, args -+ except: -+ log("can't decode message: %s" % short_repr(msg), -+ level=logging.ERROR) -+ raise -+ - _globals = globals() - _silly = ('__doc__',) - -@@ -77,3 +91,21 @@ def find_global(module, name): - return r - - raise ZRPCError("Unsafe global: %s.%s" % (module, name)) -+ -+def server_find_global(module, name): -+ """Helper for message unpickler""" -+ try: -+ m = __import__(module, _globals, _globals, _silly) -+ except ImportError, msg: -+ raise ZRPCError("import error %s: %s" % (module, msg)) -+ -+ try: -+ r = getattr(m, name) -+ except AttributeError: -+ raise ZRPCError("module %s has no global %s" % (module, name)) -+ -+ safe = getattr(r, '__no_side_effects__', 0) -+ if safe: -+ return r -+ -+ raise ZRPCError("Unsafe global: %s.%s" % (module, name)) diff --git a/net-zope/zodb/files/zodb-3.3.1_umaskbug.patch b/net-zope/zodb/files/zodb-3.3.1_umaskbug.patch deleted file mode 100644 index 0ca3825c4e74..000000000000 --- a/net-zope/zodb/files/zodb-3.3.1_umaskbug.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Dependencies/zdaemon-ZODB3-3.3.1/zdaemon/zdctl.py.orig 2004-10-21 20:51:48.000000000 +0200 -+++ Dependencies/zdaemon-ZODB3-3.3.1/zdaemon/zdctl.py 2005-04-15 18:52:37.000000000 +0200 -@@ -213,7 +213,7 @@ - args += self._get_override("-f", "forever", flag=1) - args += self._get_override("-s", "sockname") - args += self._get_override("-u", "user") -- args += self._get_override("-m", "umask") -+ args += self._get_override("-m", "umask", oct(self.options.umask)) - args += self._get_override( - "-x", "exitcodes", ",".join(map(str, self.options.exitcodes))) - args += self._get_override("-z", "directory") diff --git a/net-zope/zodb/files/zodb-3.6.0-CVE-2009-0668+0669.patch b/net-zope/zodb/files/zodb-3.6.0-CVE-2009-0668+0669.patch deleted file mode 100644 index e39248603d00..000000000000 --- a/net-zope/zodb/files/zodb-3.6.0-CVE-2009-0668+0669.patch +++ /dev/null @@ -1,117 +0,0 @@ -=== StorageServer.py -================================================================== -Index: ZODB3-3.6.0/Dependencies/ZEO-ZODB3-3.6.0/ZEO/StorageServer.py -=================================================================== ---- ZODB3-3.6.0.orig/Dependencies/ZEO-ZODB3-3.6.0/ZEO/StorageServer.py -+++ ZODB3-3.6.0/Dependencies/ZEO-ZODB3-3.6.0/ZEO/StorageServer.py -@@ -98,7 +98,7 @@ class ZEOStorage: - for func in self.extensions: - self._extensions[func.func_name] = None - -- def finish_auth(self, authenticated): -+ def _finish_auth(self, authenticated): - if not self.auth_realm: - return 1 - self.authenticated = authenticated -@@ -350,6 +350,7 @@ class ZEOStorage: - - def new_oids(self, n=100): - """Return a sequence of n new oids, where n defaults to 100""" -+ n = min(n, 100) - if self.read_only: - raise ReadOnlyError() - if n <= 0: -Index: ZODB3-3.6.0/Dependencies/ZEO-ZODB3-3.6.0/ZEO/auth/auth_digest.py -=================================================================== ---- ZODB3-3.6.0.orig/Dependencies/ZEO-ZODB3-3.6.0/ZEO/auth/auth_digest.py -+++ ZODB3-3.6.0/Dependencies/ZEO-ZODB3-3.6.0/ZEO/auth/auth_digest.py -@@ -121,7 +121,7 @@ class StorageClass(ZEOStorage): - check = hexdigest("%s:%s" % (h_up, challenge)) - if check == response: - self.connection.setSessionKey(session_key(h_up, self._key_nonce)) -- return self.finish_auth(check == response) -+ return self._finish_auth(check == response) - - extensions = [auth_get_challenge, auth_response] - -Index: ZODB3-3.6.0/Dependencies/ZEO-ZODB3-3.6.0/ZEO/tests/auth_plaintext.py -=================================================================== ---- ZODB3-3.6.0.orig/Dependencies/ZEO-ZODB3-3.6.0/ZEO/tests/auth_plaintext.py -+++ ZODB3-3.6.0/Dependencies/ZEO-ZODB3-3.6.0/ZEO/tests/auth_plaintext.py -@@ -41,7 +41,7 @@ class StorageClass(ZEOStorage): - self.connection.setSessionKey(session_key(username, - self.database.realm, - password)) -- return self.finish_auth(dbpw == password_dig) -+ return self._finish_auth(dbpw == password_dig) - - class PlaintextClient(Client): - extensions = ["auth"] -Index: ZODB3-3.6.0/Dependencies/ZEO-ZODB3-3.6.0/ZEO/zrpc/connection.py -=================================================================== ---- ZODB3-3.6.0.orig/Dependencies/ZEO-ZODB3-3.6.0/ZEO/zrpc/connection.py -+++ ZODB3-3.6.0/Dependencies/ZEO-ZODB3-3.6.0/ZEO/zrpc/connection.py -@@ -22,7 +22,7 @@ import logging - import ThreadedAsync - from ZEO.zrpc import smac - from ZEO.zrpc.error import ZRPCError, DisconnectedError --from ZEO.zrpc.marshal import Marshaller -+from ZEO.zrpc.marshal import Marshaller, ServerMarshaller - from ZEO.zrpc.trigger import trigger - from ZEO.zrpc.log import short_repr, log - from ZODB.loglevels import BLATHER, TRACE -@@ -716,6 +716,7 @@ class ManagedServerConnection(Connection - def __init__(self, sock, addr, obj, mgr): - self.mgr = mgr - self.__super_init(sock, addr, obj, 'S') -+ self.marshal = ServerMarshaller() - self.obj.notifyConnected(self) - - def handshake(self): -Index: ZODB3-3.6.0/Dependencies/ZEO-ZODB3-3.6.0/ZEO/zrpc/marshal.py -=================================================================== ---- ZODB3-3.6.0.orig/Dependencies/ZEO-ZODB3-3.6.0/ZEO/zrpc/marshal.py -+++ ZODB3-3.6.0/Dependencies/ZEO-ZODB3-3.6.0/ZEO/zrpc/marshal.py -@@ -53,6 +53,20 @@ class Marshaller: - level=logging.ERROR) - raise - -+class ServerMarshaller(Marshaller): -+ -+ def decode(self, msg): -+ """Decodes msg and returns its parts""" -+ unpickler = cPickle.Unpickler(StringIO(msg)) -+ unpickler.find_global = server_find_global -+ -+ try: -+ return unpickler.load() # msgid, flags, name, args -+ except: -+ log("can't decode message: %s" % short_repr(msg), -+ level=logging.ERROR) -+ raise -+ - _globals = globals() - _silly = ('__doc__',) - -@@ -77,3 +91,21 @@ def find_global(module, name): - return r - - raise ZRPCError("Unsafe global: %s.%s" % (module, name)) -+ -+def server_find_global(module, name): -+ """Helper for message unpickler""" -+ try: -+ m = __import__(module, _globals, _globals, _silly) -+ except ImportError, msg: -+ raise ZRPCError("import error %s: %s" % (module, msg)) -+ -+ try: -+ r = getattr(m, name) -+ except AttributeError: -+ raise ZRPCError("module %s has no global %s" % (module, name)) -+ -+ safe = getattr(r, '__no_side_effects__', 0) -+ if safe: -+ return r -+ -+ raise ZRPCError("Unsafe global: %s.%s" % (module, name)) diff --git a/net-zope/zodb/zodb-3.3.1-r1.ebuild b/net-zope/zodb/zodb-3.3.1-r1.ebuild deleted file mode 100644 index 19fb647eacf7..000000000000 --- a/net-zope/zodb/zodb-3.3.1-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.3.1-r1.ebuild,v 1.4 2010/02/08 09:01:24 pva Exp $ -EAPI=2 - -inherit eutils distutils - -MY_P=ZODB -DESCRIPTION="Zope Object DataBase" -HOMEPAGE="http://zope.org/Products/ZODB3.3" -SRC_URI="http://zope.org/Products/${MY_P}3.3/${MY_P}%20${PV}/${MY_P}3-${PV}.tgz" - -LICENSE="ZPL" -SLOT="3.3" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="<dev-lang/python-2.5" -DEPEND="${RDEPEND} - !net-zope/zope-interface" - -S=${WORKDIR}/${MY_P}3-${PV} - -src_prepare() { - epatch "${FILESDIR}"/${PF}_umaskbug.patch \ - "${FILESDIR}"/${P}-CVE-2009-0668+0669.patch -} - -src_install() { - distutils_src_install - dohtml -a html -r Doc ExtensionClass -} diff --git a/net-zope/zodb/zodb-3.3.1.ebuild b/net-zope/zodb/zodb-3.3.1.ebuild deleted file mode 100644 index 63ba0cb80ee1..000000000000 --- a/net-zope/zodb/zodb-3.3.1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.3.1.ebuild,v 1.9 2010/02/08 09:01:24 pva Exp $ - -inherit eutils distutils - -MY_P=ZODB -DESCRIPTION="Zope Object DataBase" -HOMEPAGE="http://zope.org/Products/ZODB3.3" -SRC_URI="http://zope.org/Products/${MY_P}3.3/${MY_P}%20${PV}/${MY_P}3-${PV}.tgz" - -LICENSE="ZPL" -SLOT="3.3" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="<dev-lang/python-2.5" -DEPEND="${RDEPEND} - !net-zope/zope-interface" - -S=${WORKDIR}/${MY_P}3-${PV} - -src_unpack() { - unpack ${A} - cd "${S}"/${ZPROD_LIST} - epatch "${FILESDIR}"/${PF}_umaskbug.patch -} - -src_compile() { - distutils_src_compile -} - -src_install() { - distutils_src_install - dohtml -a html -r Doc ExtensionClass -} diff --git a/net-zope/zodb/zodb-3.6.0-r1.ebuild b/net-zope/zodb/zodb-3.6.0-r1.ebuild deleted file mode 100644 index d388a2415e37..000000000000 --- a/net-zope/zodb/zodb-3.6.0-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.6.0-r1.ebuild,v 1.4 2010/02/08 09:01:24 pva Exp $ -EAPI=2 - -inherit eutils distutils - -MY_P="ZODB" -DESCRIPTION="Zope Object DataBase" -HOMEPAGE="http://zope.org/Products/ZODB3.6" -SRC_URI="http://zope.org/Products/${MY_P}3.6/${MY_P}%20${PV}/${MY_P}3-${PV}.tgz" - -LICENSE="ZPL" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND="<dev-lang/python-2.5" -DEPEND="${RDEPEND} - !net-zope/zope-interface" - -S=${WORKDIR}/${MY_P}3-${PV} - -src_prepare() { - epatch "${FILESDIR}"/${P}-CVE-2009-0668+0669.patch -} diff --git a/net-zope/zodb/zodb-3.6.0.ebuild b/net-zope/zodb/zodb-3.6.0.ebuild deleted file mode 100644 index 508f1527038b..000000000000 --- a/net-zope/zodb/zodb-3.6.0.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.6.0.ebuild,v 1.7 2009/10/04 20:10:06 arfrever Exp $ - -inherit distutils - -MY_P="ZODB" -DESCRIPTION="Zope Object DataBase" -HOMEPAGE="http://zope.org/Products/ZODB3.6" -SRC_URI="http://zope.org/Products/${MY_P}3.6/${MY_P}%20${PV}/${MY_P}3-${PV}.tgz" - -LICENSE="ZPL" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" -IUSE="" - -RDEPEND="<dev-lang/python-2.5" -DEPEND="${RDEPEND} - !net-zope/zope-interface" - -S=${WORKDIR}/${MY_P}3-${PV} |