r2541 - in zope2.13/trunk/debian (6 files)
mejo at users.alioth.debian.org
mejo at users.alioth.debian.org
Thu Oct 27 11:25:20 UTC 2011
Date: Thursday, October 27, 2011 @ 11:25:19
Author: mejo
Revision: 2541
update patches #2
Modified:
zope2.13/trunk/debian/patches/ZODB3-fix_shebang.patch
zope2.13/trunk/debian/patches/Zope2-deb_zopeconf.patch
zope2.13/trunk/debian/patches/Zope2-fix_serious_authentication_vulnerability.patch
zope2.13/trunk/debian/patches/Zope2-webdav_urljoin.patch
zope2.13/trunk/debian/patches/build_resources.patch
zope2.13/trunk/debian/rules
Modified: zope2.13/trunk/debian/patches/ZODB3-fix_shebang.patch
===================================================================
--- zope2.13/trunk/debian/patches/ZODB3-fix_shebang.patch 2011-10-27 11:21:13 UTC (rev 2540)
+++ zope2.13/trunk/debian/patches/ZODB3-fix_shebang.patch 2011-10-27 11:25:19 UTC (rev 2541)
@@ -1,4 +1,5 @@
-Removing the python2.4 limitation.
+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 @@
Modified: zope2.13/trunk/debian/patches/Zope2-deb_zopeconf.patch
===================================================================
--- zope2.13/trunk/debian/patches/Zope2-deb_zopeconf.patch 2011-10-27 11:21:13 UTC (rev 2540)
+++ zope2.13/trunk/debian/patches/Zope2-deb_zopeconf.patch 2011-10-27 11:25:19 UTC (rev 2541)
@@ -1,4 +1,5 @@
-Debian specific configuration
+Description: Debian specific configuration.
+
--- a/source/Zope2/src/Zope2/utilities/copyzopeskel.py
+++ b/source/Zope2/src/Zope2/utilities/copyzopeskel.py
@@ -1,3 +1,5 @@
@@ -207,7 +208,7 @@
# Directive: instancehome
#
-@@ -146,7 +149,7 @@
+@@ -160,7 +163,7 @@
# Example:
#
# effective-user chrism
@@ -216,7 +217,7 @@
# Directive: enable-product-installation
#
-@@ -964,7 +967,7 @@
+@@ -938,7 +941,7 @@
<http-server>
# valid keys are "address" and "force-connection-close"
@@ -225,7 +226,7 @@
# force-connection-close on
#
-@@ -1028,15 +1031,42 @@
+@@ -1002,15 +1005,42 @@
# IMPORTANT: At least one database with a mount-point of "/"
# must be specified for Zope to start properly.
@@ -277,7 +278,7 @@
<zodb_db temporary>
# Temporary storage database (for sessions)
-@@ -1047,35 +1077,6 @@
+@@ -1021,35 +1051,6 @@
container-class Products.TemporaryFolder.TemporaryContainer
</zodb_db>
Modified: zope2.13/trunk/debian/patches/Zope2-fix_serious_authentication_vulnerability.patch
===================================================================
--- zope2.13/trunk/debian/patches/Zope2-fix_serious_authentication_vulnerability.patch 2011-10-27 11:21:13 UTC (rev 2540)
+++ zope2.13/trunk/debian/patches/Zope2-fix_serious_authentication_vulnerability.patch 2011-10-27 11:25:19 UTC (rev 2541)
@@ -2,9 +2,9 @@
Author: Zope Foundation and Contributors <zope-dev at zope.org>
Last-Update: 2011-10-24
---- a/source/AccessControl/src/AccessControl/User.py
-+++ b/source/AccessControl/src/AccessControl/User.py
-@@ -1027,6 +1027,8 @@
+--- a/source/AccessControl/src/AccessControl/userfolder.py
++++ b/source/AccessControl/src/AccessControl/userfolder.py
+@@ -355,6 +355,8 @@
""" returns true if domain auth mode is set to true"""
return getattr(self, '_domain_auth_mode', None)
@@ -12,4 +12,4 @@
+
class UserFolder(BasicUserFolder):
-
+ """Standard UserFolder object
Modified: zope2.13/trunk/debian/patches/Zope2-webdav_urljoin.patch
===================================================================
--- zope2.13/trunk/debian/patches/Zope2-webdav_urljoin.patch 2011-10-27 11:21:13 UTC (rev 2540)
+++ zope2.13/trunk/debian/patches/Zope2-webdav_urljoin.patch 2011-10-27 11:25:19 UTC (rev 2541)
@@ -1,4 +1,5 @@
-Fix webdav quoting for resources with names containing spaces.
+Description: Fix webdav quoting for resources with names containing spaces.
+
--- a/source/Zope2/src/webdav/davcmds.py
+++ b/source/Zope2/src/webdav/davcmds.py
@@ -173,7 +173,7 @@
Modified: zope2.13/trunk/debian/patches/build_resources.patch
===================================================================
--- zope2.13/trunk/debian/patches/build_resources.patch 2011-10-27 11:21:13 UTC (rev 2540)
+++ zope2.13/trunk/debian/patches/build_resources.patch 2011-10-27 11:25:19 UTC (rev 2541)
@@ -1,57 +1,8 @@
-Build resouces that aid in the compilation of Zope2.
---- /dev/null
-+++ b/Makefile.in
-@@ -0,0 +1,48 @@
-+#!/usr/bin/make -f
-+# -*- makefile -*-
-+export PYTHON:=%(python_exec)s
-+DIST_NAME:=%(name)s
-+DIST_VER:=%(major_minor_version)s
-+DIST_FULLVER:=$(DIST_VER).%(point_version)s
-+PIPVER:=%(pip_version)s
-+DIST_INDEX:=%(index)s
-+
-+export DIST_DEST:=%(lib_dest)s
-+export SCRIPT_DEST:=%(script_dest)s
-+export PTH_DEST:=%(pth_dest)s
-+
-+export PYTHONPATH:=
-+DESTDIR:=
-+# Exclusions are a colon separated list of distribution names.
-+DIST_SINGLE_EXCLUSIONS:=
-+DIST_EXCLUSIONS:=
-+
-+# Change the following value to 1 to enable debug logging.
-+export DEBUG:=0
-+
-+all: clean build
-+ @echo "Now run 'make install'"
-+
-+clean:
-+ @echo "Cleaning..."
-+ -rm -rf ./build
-+ -find ./source/ -maxdepth 2 -type d -name "build" -exec rm -rf {} \;
-+
-+distclean:
-+ @rm Makefile
-+
-+build:
-+ @echo "Building ${DIST_NAME} ${DIST_VER}..."
-+ @$(PYTHON) ./debian/build-scripts/build.py \
-+ --exclude ${DIST_EXCLUSIONS} \
-+ --final-dir ${DIST_DEST} \
-+ --name ${DIST_NAME}
-+ @echo "Now run 'make install'"
-+
-+install:
-+ @$(PYTHON) ./debian/build-scripts/install.py \
-+ --dists-dest ${DESTDIR}${DIST_DEST} \
-+ --scripts-dest ${DESTDIR}${SCRIPT_DEST} \
-+ --pth-dest ${DESTDIR}${PTH_DEST}
-+
-+.PHONY: all build install clean distclean
---- /dev/null
-+++ b/configure
+Description: Build resouces that aid in the compilation of Zope2.
+Author: Michael Mulich
+
+--- a/configure 1970-01-01
++++ b/configure 2011-10-27
@@ -0,0 +1,153 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
@@ -206,3 +157,54 @@
+ "working directory. Please make sure you are "
+ "executing from the project's root location.")
+ main()
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -0,0 +1,48 @@
++#!/usr/bin/make -f
++# -*- makefile -*-
++export PYTHON:=%(python_exec)s
++DIST_NAME:=%(name)s
++DIST_VER:=%(major_minor_version)s
++DIST_FULLVER:=$(DIST_VER).%(point_version)s
++PIPVER:=%(pip_version)s
++DIST_INDEX:=%(index)s
++
++export DIST_DEST:=%(lib_dest)s
++export SCRIPT_DEST:=%(script_dest)s
++export PTH_DEST:=%(pth_dest)s
++
++export PYTHONPATH:=
++DESTDIR:=
++# Exclusions are a colon separated list of distribution names.
++DIST_SINGLE_EXCLUSIONS:=
++DIST_EXCLUSIONS:=
++
++# Change the following value to 1 to enable debug logging.
++export DEBUG:=0
++
++all: clean build
++ @echo "Now run 'make install'"
++
++clean:
++ @echo "Cleaning..."
++ -rm -rf ./build
++ -find ./source/ -maxdepth 2 -type d -name "build" -exec rm -rf {} \;
++
++distclean:
++ @rm Makefile
++
++build:
++ @echo "Building ${DIST_NAME} ${DIST_VER}..."
++ @$(PYTHON) ./debian/build-scripts/build.py \
++ --exclude ${DIST_EXCLUSIONS} \
++ --final-dir ${DIST_DEST} \
++ --name ${DIST_NAME}
++ @echo "Now run 'make install'"
++
++install:
++ @$(PYTHON) ./debian/build-scripts/install.py \
++ --dists-dest ${DESTDIR}${DIST_DEST} \
++ --scripts-dest ${DESTDIR}${SCRIPT_DEST} \
++ --pth-dest ${DESTDIR}${PTH_DEST}
++
++.PHONY: all build install clean distclean
Modified: zope2.13/trunk/debian/rules
===================================================================
--- zope2.13/trunk/debian/rules 2011-10-27 11:21:13 UTC (rev 2540)
+++ zope2.13/trunk/debian/rules 2011-10-27 11:25:19 UTC (rev 2541)
@@ -44,7 +44,7 @@
done
dh_auto_clean --
# quilt has issues applying permissions to non-existent files, so we'll need to apply executable permissions here
- chmod a+x configure
+ #chmod a+x configure
override_dh_auto_configure:
./configure --prefix=/usr/lib/${ZOPE}
More information about the pkg-zope-developers
mailing list