security update

8 files changed, 8 insertions, 337 deletions

diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index b3e694afdca0..74ef8e51308a 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -1,19 +1,13 @@
-MD5 7dde2316bd2a7000cce7a9efb2cf2f8b zope-2.6.2-r1.ebuild 4312
 MD5 f1cbbc0f016b9f5971bdd10ab2d289de zope-2.4.0-r6.ebuild 2650
-MD5 9b05a7e169118dffcc134a31dd15008b zope-2.6.2.ebuild 3966
 MD5 78eb369d0609e2023e24aaa231b9a69d zope-2.5.1.ebuild 2614
-MD5 d49ea1457c33b8dae713ac742c0ed9b9 zope-2.6.1.ebuild 4172
-MD5 cc30cb3dab1319eadcfa94fe710509c1 ChangeLog 4027
+MD5 a910ce93752f52df1e29e16ad0d4d119 ChangeLog 4204
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
-MD5 7dde2316bd2a7000cce7a9efb2cf2f8b zope-2.6.3.ebuild 4312
+MD5 41309727a10972327f48949457213fa6 zope-2.6.3.ebuild 4356
 MD5 feed0c7728632370907fa408c1e8a56d files/zope 5575
 MD5 111f2aacb074731c923a5eb93a53f6af files/zctl.py 9455
 MD5 22a242c03e39b90c535e9e10a94dc3b1 files/zope.rc6 5557
 MD5 24d816c631ba0677864f4f72264bb8de files/digest-zope-2.4.0-r6 121
-MD5 ec5aa64aee4084891c2b104ef8effbfa files/digest-zope-2.6.2-r1 64
 MD5 45724a3c339e9be0f9c0dec39b477c38 files/digest-zope-2.5.1 119
-MD5 d7df33e05eba32d945c2e5b7ef037573 files/digest-zope-2.6.1 884
-MD5 ec5aa64aee4084891c2b104ef8effbfa files/digest-zope-2.6.2 64
 MD5 42924c033cd81e7759ef4c08fc41fbbb files/digest-zope-2.6.3 64
 MD5 c8f695d11a964dd2410a3b200a71cf2f files/custom_zodb.py 219
 MD5 841ff9ee1831723a25c4ea88e5708c55 files/zope.conf 850
diff --git a/net-zope/zope/files/digest-zope-2.6.1 b/net-zope/zope/files/digest-zope-2.6.1
deleted file mode 100644
index 0ea4c1538411..000000000000
--- a/net-zope/zope/files/digest-zope-2.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-MD5 c8f695d11a964dd2410a3b200a71cf2f /files/custom_zodb.py 219
-MD5 111f2aacb074731c923a5eb93a53f6af /files/zctl.py 9455
-MD5 f8fdebc428a825403b6ecdd86d8454e1 /files/zope 5574
-MD5 841ff9ee1831723a25c4ea88e5708c55 /files/zope.conf 850
-MD5 0725d42870729649cd5f4d6653e8bc8e /files/zope.rc6 5556
-MD5 059430a8af8231b822716856b23f4e28 /files/2.6.0/zope.envd 944
-MD5 233ab97f54e0028e70fb89bfc8f54321 /files/2.6.0/zope.initd 710
-MD5 0567b37de6b2652270b3ef0db8264554 /files/2.6.0/DateTime.py.bz2 15046
-MD5 66f307247ff11363f14ad01a8503d049 /files/2.6.0/zope-r1.initd 3668
-MD5 509b71afb36834876312800731024b1e /files/2.6.0/zope-r2.initd 3676
-MD5 e2bc676da913a7fe562407b9c7f622f0 /files/2.6.1/zope.envd 922
-MD5 469595a67bb46b3ba20cced1ad18d99d /files/2.6.1/zope.initd 3673
-MD5 34b23a920ed06fa94322a696743e79db /zope-2.6.1.ebuild 4258
-MD5 a17f36b86b6e489797d8e52f1ba48efe Zope-2.6.1-src.tgz 2318685
diff --git a/net-zope/zope/files/digest-zope-2.6.2 b/net-zope/zope/files/digest-zope-2.6.2
deleted file mode 100644
index 058a602089fb..000000000000
--- a/net-zope/zope/files/digest-zope-2.6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0e873d54994231d7c03640f7092a4fb Zope-2.6.2-src.tgz 2347004
diff --git a/net-zope/zope/files/digest-zope-2.6.2-r1 b/net-zope/zope/files/digest-zope-2.6.2-r1
deleted file mode 100644
index 058a602089fb..000000000000
--- a/net-zope/zope/files/digest-zope-2.6.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0e873d54994231d7c03640f7092a4fb Zope-2.6.2-src.tgz 2347004
diff --git a/net-zope/zope/files/digest-zope-2.6.3 b/net-zope/zope/files/digest-zope-2.6.3
new file mode 100644
index 000000000000..3dca55b6d995
--- /dev/null
+++ b/net-zope/zope/files/digest-zope-2.6.3
@@ -0,0 +1 @@
+MD5 904cf97757401fd353275d0807685460 Zope-2.6.3-src.tgz 2394076
diff --git a/net-zope/zope/zope-2.6.1.ebuild b/net-zope/zope/zope-2.6.1.ebuild
deleted file mode 100644
index 245a017d7a3f..000000000000
--- a/net-zope/zope/zope-2.6.1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.6.1.ebuild,v 1.6 2004/01/05 23:27:21 robbat2 Exp $
-
-S="${WORKDIR}/Zope-${PV}-src"
-
-DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites."
-HOMEPAGE="http://www.zope.org"
-SRC_URI="http://www.zope.org/Products/Zope/${PV}/Zope-${PV}-src.tgz"
-LICENSE="ZPL"
-SLOT="0"
-
-KEYWORDS="x86 ~sparc"
-
-# This is for developers that wish to test Zope with virtual/python.
-# If this is a problem, let me know right away. --kutsuya@gentoo.org
-# I wondering if we need a USE flag for this. But I'm planning to have
-# a private environmental variable called PYTHON_SLOT_VERSION set in
-# ebuilds to build extensions for python2.1.
-
-if [ "${PYTHON_SLOT_VERSION}" = 'VIRTUAL' ] ; then
-	RDEPEND="virtual/python"
-	python='python'
-else
-	RDEPEND="=dev-lang/python-2.1.3*"
-	python='python2.1'
-fi
-
-DEPEND="virtual/glibc
-		>=sys-apps/sed-4.0.5
-	   ${RDEPEND}"
-
-RDEPEND="app-admin/zope-config
-	${RDEPEND}"
-
-ZUID=zope
-ZGID=$(echo ${P} |sed -e "s:\.:_:g")
-ZS_DIR=${ROOT}/usr/share/zope/
-ZI_DIR=${ROOT}/var/lib/zope/
-ZSERVDIR=${ZS_DIR}/${PF}/
-ZINSTDIR=${ZI_DIR}/${ZGID}
-CONFDIR=${ROOT}/etc/conf.d/
-RCNAME=zope.initd
-
-# Narrow the scope of ownership/permissions.
-# Security plan:
-# * ZUID is the superuser for all zope instances.
-# * ZGID is for a single instance's administration.
-# * Other's should not have any access to ${ZSERVDIR},
-#   because they can work through the Zope web interface.
-#   This should protect our code/data better.
-
-#Parameters:
-# $1 = instance directory
-# $2 = group
-
-setup_security()
-{
-	chown -R ${ZUID}:${2} ${1}
-	chmod -R g+u ${1}
-	chmod -R o-rwx ${1}
-}
-
-#
-
-install_help()
-{
-	einfo "Need to setup an inituser (admin) before executing zope:"
-	einfo "\tzope-config --zpasswd"
-	einfo "To execute default Zope instance:"
-	einfo "\t/etc/init.d/${ZGID} start"
-}
-
-#
-
-pkg_setup()
-{
-	if [ "${PYTHON_SLOT_VERSION}" = 'VIRTUAL' ] ; then
-		ewarn "WARNING: You set PYTHON_SLOT_VERSION=VIRTUAL. So this ebuild will"
-		ewarn "use python-2.2*. Zope Corp. only recommends using python-2.1.3 "
-		ewarn "with this version of zope. Emerge at your own risk."
-		sleep 12
-	fi
-	if ! groupmod ${ZGID} > /dev/null 2>&1 ; then
-		groupadd ${ZGID} || die "Can not add ${ZGID} group!"
-	fi
-	if ! id ${ZUID} > /dev/null 2>&1 ; then
-		useradd -d ${ZS_DIR} -c "Zope root user" -u 261 ${ZUID} \
-	|| die "Can not add ${ZUID} user!"
-	fi
-}
-
-#
-
-src_compile() {
-	$python wo_pcgi.py || die "Failed to compile."
-}
-
-#
-
-src_install() {
-	dodoc LICENSE.txt README.txt
-	docinto doc ; dodoc doc/*.txt
-	docinto doc/PLATFORMS ; dodoc doc/PLATFORMS/*
-	docinto doc/changenotes ; dodoc doc/changenotes/*
-
-	# using '/etc/init.d/zope'
-	rm -Rf start stop LICENSE.txt README.txt doc/
-
-	# Need to rip out the zinstance stuff out
-	# but save as templates
-	mkdir -p .templates/import
-	cp import/README.txt .templates/import/
-	mv -f Extensions/ .templates/
-	mv -f var/ .templates/
-
-	# Add conf.d script.
-	dodir /etc/conf.d
-	echo "ZOPE_OPTS=\"-u zope\"" | \
-	cat - ${FILESDIR}/${PV}/zope.envd > .templates/zope.confd
-
-	# Fill in environmental variables
-	sed -i -e "/ZOPE_HOME=/ c\\ZOPE_HOME=${ZSERVDIR}\\ " \
-		-e "/SOFTWARE_HOME=/ c\\SOFTWARE_HOME=${ZSERVDIR}/lib/python\\ " \
-		.templates/zope.confd
-
-	# Add rc-script.
-	#!! TODO: fill in $python in zope-r2.initd
-	sed -e "/python=/ c\\python=\"${python}\"\\ " ${FILESDIR}/${PV}/${RCNAME} \
-		> .templates/zope.initd
-
-	# Copy the remaining contents of ${S} into the ${D}.
-	dodir ${ZSERVDIR}
-	cp -a . ${D}${ZSERVDIR}
-
-	setup_security ${D}${ZSERVDIR} ${ZGID}
-}
-
-#
-
-pkg_postinst()
-{
-	# Here we add our default zope instance.
-	/usr/sbin/zope-config --zserv=${ZSERVDIR} --zinst=${ZINSTDIR} \
-		--zgid=${ZGID}
-	install_help
-}
-
-#
-
-pkg_postrm()
-{
-	# rcscripts and conf.d files will remain. i.e. /etc protection.
-
-	# Delete .default if this ebuild is the default. zprod-manager will
-	# have to handle a missing default;
-	local VERSION_DEF="$(zope-config --zidef-get)"
-	if [ "${ZGID}" = "$VERSION_DEF" ] ; then
-		rm -f ${ZI_DIR}/.default
-	fi
-}
-
-#
-
-pkg_config()
-{
-	install_help
-}
diff --git a/net-zope/zope/zope-2.6.2.ebuild b/net-zope/zope/zope-2.6.2.ebuild
deleted file mode 100644
index 237a5050a9c3..000000000000
--- a/net-zope/zope/zope-2.6.2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.6.2.ebuild,v 1.2 2004/01/05 23:27:21 robbat2 Exp $
-
-inherit eutils
-
-S="${WORKDIR}/Zope-${PV}-src"
-
-DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites."
-HOMEPAGE="http://www.zope.org"
-SRC_URI="http://www.zope.org/Products/Zope/${PV}/Zope-${PV}-src.tgz"
-LICENSE="ZPL"
-SLOT="0"
-
-KEYWORDS="~x86 ~sparc"
-
-# This is for developers that wish to test Zope with virtual/python.
-# If this is a problem, let me know right away. --kutsuya@gentoo.org
-# I wondering if we need a USE flag for this. But I'm planning to have
-# a private environmental variable called PYTHON_SLOT_VERSION set in
-# ebuilds to build extensions for python2.1.
-
-if [ "${PYTHON_SLOT_VERSION}" = 'VIRTUAL' ] ; then
-	RDEPEND="virtual/python"
-	python='python'
-else
-	RDEPEND="=dev-lang/python-2.1.3*"
-	python='python2.1'
-fi
-
-DEPEND="virtual/glibc
-		>=sys-apps/sed-4.0.5"
-
-RDEPEND="app-admin/zope-config"
-
-ZUID=zope
-ZGID=$(echo ${P} |sed -e "s:\.:_:g")
-ZS_DIR=${ROOT}/usr/share/zope/
-ZI_DIR=${ROOT}/var/lib/zope/
-ZSERVDIR=${ZS_DIR}/${PF}/
-ZINSTDIR=${ZI_DIR}/${ZGID}
-CONFDIR=${ROOT}/etc/conf.d/
-RCNAME=zope.initd
-
-# Narrow the scope of ownership/permissions.
-# Security plan:
-# * ZUID is the superuser for all zope instances.
-# * ZGID is for a single instance's administration.
-# * Other's should not have any access to ${ZSERVDIR},
-#   because they can work through the Zope web interface.
-#   This should protect our code/data better.
-
-# Parameters:
-#  $1 = instance directory
-#  $2 = group
-
-setup_security() {
-	chown -R ${ZUID}:${2} ${1}
-	chmod -R g+u ${1}
-	chmod -R o-rwx ${1}
-}
-
-install_help() {
-	einfo "Need to setup an inituser (admin) before executing zope:"
-	einfo "\tzope-config --zpasswd"
-	einfo "To execute default Zope instance:"
-	einfo "\t/etc/init.d/${ZGID} start"
-}
-
-pkg_setup() {
-	if [ "${PYTHON_SLOT_VERSION}" = 'VIRTUAL' ] ; then
-		ewarn "WARNING: You set PYTHON_SLOT_VERSION=VIRTUAL. So this ebuild will"
-		ewarn "use python-2.2*. Zope Corp. only recommends using python-2.1.3 "
-		ewarn "with this version of zope. Emerge at your own risk."
-		sleep 12
-	fi
-	enewgroup ${ZGID}
-	enewuser ${ZUID} 261 /bin/bash ${ZS_DIR} ${ZGID}
-}
-
-src_compile() {
-	$python wo_pcgi.py || die "Failed to compile."
-}
-
-src_install() {
-	dodoc LICENSE.txt README.txt
-	docinto doc ; dodoc doc/*.txt
-	docinto doc/PLATFORMS ; dodoc doc/PLATFORMS/*
-	docinto doc/changenotes ; dodoc doc/changenotes/*
-
-	# using '/etc/init.d/zope'
-	rm -Rf start stop LICENSE.txt README.txt doc/
-
-	# Need to rip out the zinstance stuff out
-	# but save as templates
-	mkdir -p .templates/import
-	cp import/README.txt .templates/import/
-	mv -f Extensions/ .templates/
-	mv -f var/ .templates/
-
-	# Add conf.d script.
-	dodir /etc/conf.d
-	echo "ZOPE_OPTS=\"-u zope\"" | \
-	cat - ${FILESDIR}/2.6.1/zope.envd > .templates/zope.confd
-
-	# Fill in environmental variables
-	sed -i -e "/ZOPE_HOME=/ c\\ZOPE_HOME=${ZSERVDIR}\\ " \
-		-e "/SOFTWARE_HOME=/ c\\SOFTWARE_HOME=${ZSERVDIR}/lib/python\\ " \
-		.templates/zope.confd
-
-	# Add rc-script.
-	#!! TODO: fill in $python in zope-r2.initd
-	sed -e "/python=/ c\\python=\"${python}\"\\ " ${FILESDIR}/2.6.1/${RCNAME} \
-		> .templates/zope.initd
-
-	# Copy the remaining contents of ${S} into the ${D}.
-	dodir ${ZSERVDIR}
-	cp -a . ${D}${ZSERVDIR}
-
-	setup_security ${D}${ZSERVDIR} ${ZGID}
-}
-
-pkg_postinst() {
-	# Here we add our default zope instance.
-	/usr/sbin/zope-config --zserv=${ZSERVDIR} --zinst=${ZINSTDIR} \
-		--zgid=${ZGID}
-	install_help
-}
-
-pkg_postrm() {
-	# rcscripts and conf.d files will remain. i.e. /etc protection.
-
-	# Delete .default if this ebuild is the default. zprod-manager will
-	# have to handle a missing default;
-	local VERSION_DEF="$(zope-config --zidef-get)"
-	if [ "${ZGID}" = "$VERSION_DEF" ] ; then
-		rm -f ${ZI_DIR}/.default
-	fi
-}
-
-pkg_config() {
-	install_help
-}
diff --git a/net-zope/zope/zope-2.6.2-r1.ebuild b/net-zope/zope/zope-2.6.3.ebuild
index ecec52f645ac..58114ac1daba 100644
--- a/net-zope/zope/zope-2.6.2-r1.ebuild
+++ b/net-zope/zope/zope-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.6.2-r1.ebuild,v 1.3 2004/01/05 23:27:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.6.3.ebuild,v 1.1 2004/01/17 18:25:40 lanius Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.zope.org/Products/Zope/${PV}/Zope-${PV}-src.tgz"
 LICENSE="ZPL"
 SLOT="0"
 
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 
 # This is for developers that wish to test Zope with virtual/python.
 # If this is a problem, let me know right away. --kutsuya@gentoo.org
@@ -31,6 +31,9 @@ else
 	python='python2.1'
 fi
 
+RDEPEND="${RDEPEND}
+	!net-zope/verbosesecurity"
+
 DEPEND="${RDEPEND}
 	virtual/glibc
 	>=sys-apps/sed-4.0.5