r1667 - in zope2.12/trunk/debian/patches (2 files)
Jonas Meurer
mejo at alioth.debian.org
Mon Jul 6 00:05:46 UTC 2009
Date: Monday, July 6, 2009 @ 00:05:44
Author: mejo
Revision: 1667
update patches
Modified:
zope2.12/trunk/debian/patches/deb-zopeconf.dpatch
zope2.12/trunk/debian/patches/webdav.dpatch
Modified: zope2.12/trunk/debian/patches/deb-zopeconf.dpatch
===================================================================
--- zope2.12/trunk/debian/patches/deb-zopeconf.dpatch 2009-07-05 23:34:16 UTC (rev 1666)
+++ zope2.12/trunk/debian/patches/deb-zopeconf.dpatch 2009-07-06 00:05:44 UTC (rev 1667)
@@ -7,20 +7,19 @@
. $(dirname $0)/DPATCH
@DPATCH@
---- zope-2.11_2.11.2/z/skel/etc/zope.conf.in
-+++ zope-2.11_2.11.2/z/skel/etc/zope.conf.in
-@@ -23,7 +23,10 @@
+--- src/Zope2/utilities/skel/etc/zope.conf.in
++++ src/Zope2/utilities/skel/etc/zope.conf.in
+@@ -23,6 +23,9 @@
# ZConfig "defines" used for later textual substitution
%define INSTANCE <<INSTANCE_HOME>>
+%define HTTPPORT <<ZOPE_HTTPPORT>>
- %define ZOPE <<ZOPE_HOME>>
+%define ZOPE_USER <<ZOPE_USER>>
+%define ZEO_SERVER <<ZEO_SERVER>>
# Directive: instancehome
#
-@@ -147,6 +150,7 @@
+@@ -146,6 +149,7 @@
# Example:
#
# effective-user chrism
@@ -28,7 +27,7 @@
# Directive: enable-product-installation
-@@ -966,7 +970,7 @@
+@@ -952,7 +956,7 @@
<http-server>
# valid keys are "address" and "force-connection-close"
@@ -37,79 +36,20 @@
# force-connection-close on
#
-@@ -1038,13 +1042,33 @@
- # IMPORTANT: At least one database with a mount-point of "/"
- # must be specified for Zope to start properly.
-
--<zodb_db main>
-- # Main FileStorage database
-- <filestorage>
-- path $INSTANCE/var/Data.fs
-- </filestorage>
-- mount-point /
--</zodb_db>
-+# ZODB: <zodb_db main>
-+# ZODB: # Main FileStorage database
-+# ZODB: <filestorage>
-+# ZODB: path $INSTANCE/var/Data.fs
-+# ZODB: </filestorage>
-+# ZODB: mount-point /
-+# ZODB: </zodb_db>
-+
-+# Other storage examples
-+#
-+# ZEO client storage:
-+#
-+# ZEO: <zodb_db main>
-+# ZEO: mount-point /
-+# ZEO: # ZODB cache, in number of objects
-+# ZEO: cache-size 5000
-+# ZEO: <zeoclient>
-+# ZEO: server $ZEO_SERVER
-+# ZEO: storage 1
-+# ZEO: name zeostorage
-+# ZEO: var $INSTANCE/var
-+# ZEO: # ZEO client cache, in bytes
-+# ZEO: cache-size 20MB
-+# ZEO: # Uncomment to have a persistent disk cache
-+# ZEO: #client zeo1
-+# ZEO: </zeoclient>
-+# ZEO: </zodb_db>
-
- <zodb_db temporary>
- # Temporary storage database (for sessions)
-@@ -1055,26 +1079,6 @@
- container-class Products.TemporaryFolder.TemporaryContainer
- </zodb_db>
-
--# Other storage examples
--#
--# ZEO client storage:
--#
--# <zodb_db main>
--# mount-point /
--# # ZODB cache, in number of objects
--# cache-size 5000
--# <zeoclient>
+@@ -1061,7 +1065,7 @@
+ # <zeoclient>
+ # # See .../ZODB/component.xml for directives (sectiontype
+ # # "zeoclient").
-# server localhost:8100
--# storage 1
--# name zeostorage
--# var $INSTANCE/var
--# # ZEO client cache, in bytes
--# cache-size 20MB
--# # Uncomment to have a persistent disk cache
--# #client zeo1
--# </zeoclient>
--# </zodb_db>
--
- # Product configuration (product-config) section(s)
- #
- # Description:
---- zope-2.11_2.11.2/z/utilities/copyzopeskel.py
-+++ zope-2.11_2.11.2/z/utilities/copyzopeskel.py
++# server $ZEO_SERVER
+ # storage 1
+ # name zeostorage
+ # var $INSTANCE/var
+--- src/Zope2/utilities/copyzopeskel.py 2009-05-26 16:20:10.000000000 +0200
++++ copyzopeskel.py 2009-07-06 01:58:45.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.4
-+#!/usr/bin/python2.4
++#!/usr/bin/env python2.5
##############################################################################
#
@@ -147,7 +87,7 @@
print >>sys.stderr, msg
sys.exit(1)
-@@ -235,6 +244,39 @@
+@@ -242,6 +251,39 @@
if uid is not None:
os.chown(dst, uid, gid)
@@ -187,12 +127,18 @@
def usage(stream, msg=None):
if msg:
print >>stream, msg
---- zope-2.11_2.11.2/z/utilities/mkzopeinstance.py
-+++ zope-2.11_2.11.2/z/utilities/mkzopeinstance.py
-@@ -22,11 +22,16 @@
- -d/--dir -- the dir in which the instance home should be created
+--- src/Zope2/utilities/mkzopeinstance.py 2009-05-26 16:20:10.000000000 +0200
++++ mkzopeinstance.py 2009-07-06 02:04:45.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2.4
++#!/usr/bin/env python2.5
+
+ ##############################################################################
+ #
+@@ -23,11 +23,16 @@
-u/--user NAME:PASSWORD -- set the user name and password of the initial user
-s/--skelsrc -- the dir from which skeleton files should be copied
+ -p/--python -- the Python interpreter to use
+-l/--layout -- layout to use while copying the skeleton files (`fhs' or `zope')
+--service-user -- system user to be used to run this instance (user:group)
+--service-port -- HTTP port used to run this instance
@@ -205,30 +151,30 @@
+import re
import getopt
import os
- import shutil
+ import sys
@@ -36,8 +41,8 @@
def main():
try:
opts, args = getopt.getopt(sys.argv[1:],
-- "hu:d:s:",
-- ["help", "user=", "dir=", "skelsrc="]
-+ "hu:d:s:l:",
-+ ["help", "user=", "dir=", "skelsrc=", "layout=", "service-user=", "service-port=", "zeo-server="]
+- "hu:d:s:p:",
+- ["help", "user=", "dir=", "skelsrc=", "python="]
++ "hu:d:s:p:l:",
++ ["help", "user=", "dir=", "skelsrc=", "python=", "layout=", "service-user=", "service-port=", "zeo-server="]
)
except getopt.GetoptError, msg:
usage(sys.stderr, msg)
-@@ -48,6 +53,10 @@
- password = None
+@@ -49,6 +54,10 @@
skeltarget = None
skelsrc = None
-+ srvport = 9673
+ python = None
++ layout = "zope"
+ srvuser = "zope:zope"
++ srvport = 9673
+ zeoserver = None
-+ layout = "zope"
- for opt, arg in opts:
- if opt in ("-d", "--dir"):
-@@ -71,6 +80,36 @@
+ if check_buildout():
+ python = os.path.abspath('bin/zopepy')
+@@ -80,6 +89,36 @@
usage(sys.stderr, "user must be specified as name:password")
sys.exit(2)
user, password = arg.split(":", 1)
@@ -265,10 +211,10 @@
if not skeltarget:
# interactively ask for skeltarget and initial user name/passwd.
-@@ -119,12 +158,28 @@
+@@ -130,12 +169,28 @@
+ "PYTHONW":PYTHONW,
"INSTANCE_HOME": instancehome,
- "SOFTWARE_HOME": softwarehome,
- "ZOPE_HOME": zopehome,
+ "ZOPE2PATH": zope2path,
+ "ZOPE_USER": srvuser.split(":")[0],
+ "ZOPE_HTTPPORT": str(srvport),
+ "ZEO_SERVER": zeoserver or 'localhost:8100',
Modified: zope2.12/trunk/debian/patches/webdav.dpatch
===================================================================
--- zope2.12/trunk/debian/patches/webdav.dpatch 2009-07-05 23:34:16 UTC (rev 1666)
+++ zope2.12/trunk/debian/patches/webdav.dpatch 2009-07-06 00:05:44 UTC (rev 1667)
@@ -5,10 +5,9 @@
. $(dirname $0)/DPATCH
@DPATCH@
-diff -urN zope2.9-2.9.6.orig/z/lib/python/webdav/davcmds.py zope2.9-2.9.6/z/lib/python/webdav/davcmds.py
---- zope2.9-2.9.6.orig/z/lib/python/webdav/davcmds.py 2006-11-21 07:14:30.000000000 +0100
-+++ zope2.9-2.9.6/z/lib/python/webdav/davcmds.py 2007-02-07 12:26:47.000000000 +0100
-@@ -169,7 +169,7 @@
+--- src/webdav/davcmds.py
++++ src/webdav/davcmds.py
+@@ -173,7 +173,7 @@
if dflag:
ob._p_deactivate()
elif hasattr(ob, '__dav_resource__'):
More information about the pkg-zope-commits
mailing list