head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.12
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.10
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.8
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.6
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.4
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.2
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.1.0.6
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.4
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2008.10.25.16.21.30;	author taca;	state dead;
branches;
next	1.1;

1.1
date	2008.08.17.15.13.23;	author taca;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2008.08.17.15.13.23;	author tron;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2008.08.21.12.01.04;	author tron;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update zope211 package to 2.11.2.

Zope 2.11.2 (2008/10/24)
Bugs Fixed

    * Ensure that response header values cannot embed CRLF pairs,
      which violate the HTTP spec (RFC 2616).
    * Launchpad #282677: fixed implementation of guarded_map and provided
      tests and implementation for guarded_zip (RestrictedPython).
    * updated to ZODB 3.8.1
    * Lauchpad #143736,#271395: fixed AttributeError' on _ltid in TempStorage
    * AccessControl.ZopeGuards.guarded_import mapped some Unauthorized
      exceptions onto ImportErrors: don't do that! Also, removed mutable
      defaults from argument list, improved tests.
    * LP #281156: AccessControl.SecurityInfo.secureModule dropped
      ModuleSecurity for failed imports, obscuring later attempts to import
      the same broken module.
    * DateTime conversion of datetime objects with non-pytz
      tzinfo. Timezones() returns a copy of the timezone list (allows tests
      to run). (Backport of r89373 from trunk).
    * LP #253362: better dealing with malformed HTTP_ACCEPT_CHARSET headers
    * integrated Hotfix-2008-08-12
    * Launchpad #267545: DateTime(DateTime()) now preserves the correct hour
    * Launchpad #262313: respect the Expand macros when editing flag when
      editing a page template through the ZMI
@
text
@$NetBSD: patch-aj,v 1.1 2008/08/17 15:13:23 taca Exp $

Patch #1 corresponding to security advisory 2008-08-12.

--- lib/python/Products/PythonScripts/PythonScript.py.orig	2008-07-17 00:42:18.000000000 +0900
+++ lib/python/Products/PythonScripts/PythonScript.py
@@@@ -324,7 +324,11 @@@@ class PythonScript(Script, Historical, C
         g['__file__'] = getattr(self, '_filepath', None) or self.get_filepath()
         f = new.function(fcode, g, None, fadefs)
 
-        result = f(*args, **kw)
+        try:
+            result = f(*args, **kw)
+        except SystemExit:
+            raise ValueError('SystemExit cannot be raised within a PythonScript')
+
         if keyset is not None:
             # Store the result in the cache.
             self.ZCacheable_set(result, keywords=keyset)
@


1.1
log
@Add some changes from Zope's svn repository which should fix
Zope's security advisory 2008-08-12.

Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1.2.1
log
@file patch-aj was added on branch pkgsrc-2008Q2 on 2008-08-21 12:01:04 +0000
@
text
@d1 19
@


1.1.2.2
log
@Pullup ticket #2501 - requested by taca
zope211: security fix

Revisions pulled up:
- www/zope211/Makefile		1.3
- www/zope211/distinfo		1.3
- www/zope211/patches/patch-aj	1.1
- www/zope211/patches/patch-ak	1.1
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Sun Aug 17 15:13:23 UTC 2008

Modified Files:
	pkgsrc/www/zope211: Makefile distinfo
Added Files:
	pkgsrc/www/zope211/patches: patch-aj patch-ak

Log Message:
Add some changes from Zope's svn repository which should fix
Zope's security advisory 2008-08-12.

Bump PKGREVISION.
@
text
@a0 19
$NetBSD: patch-aj,v 1.1 2008/08/17 15:13:23 taca Exp $

Patch #1 corresponding to security advisory 2008-08-12.

--- lib/python/Products/PythonScripts/PythonScript.py.orig	2008-07-17 00:42:18.000000000 +0900
+++ lib/python/Products/PythonScripts/PythonScript.py
@@@@ -324,7 +324,11 @@@@ class PythonScript(Script, Historical, C
         g['__file__'] = getattr(self, '_filepath', None) or self.get_filepath()
         f = new.function(fcode, g, None, fadefs)
 
-        result = f(*args, **kw)
+        try:
+            result = f(*args, **kw)
+        except SystemExit:
+            raise ValueError('SystemExit cannot be raised within a PythonScript')
+
         if keyset is not None:
             # Store the result in the cache.
             self.ZCacheable_set(result, keywords=keyset)
@