Attachment 20471 Details for Bug 36103 – file.diff

[patch] file.diff

file.diff (text/plain), 3.89 KB, created by HAYASHI Yasushi on 2002-03-19 17:00:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: HAYASHI Yasushi

Created: 2002-03-19 17:00:03 UTC

Size: 3.89 KB

patch

obsolete

>diff -urN zope/Makefile zope.new/Makefile
>--- zope/Makefile	Sun Feb 17 00:08:35 2002
>+++ zope.new/Makefile	Wed Mar 20 01:00:06 2002
>@@ -7,11 +7,13 @@
> 
> PORTNAME=	zope
> PORTVERSION=	2.5.0
>-PORTREVISION=	0
>+PORTREVISION=	1
> CATEGORIES=	www python zope
>-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
>+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/ \
>+		http://www.zope.org/Products/Zope/Hotfix_2002-03-01/
> DISTNAME=	Zope-${PORTVERSION}-src
>-EXTRACT_SUFX=	.tgz
>+DISTFILES=	${DISTNAME}.tgz \
>+		Hotfix_2002-03-01.tgz
> 
> PATCHFILES=	Zope-2.5.0-unix-security.patch
> PATCH_DIST_STRIP=	-p1
>@@ -27,6 +29,7 @@
> DIST_SUBDIR=	zope
> 
> post-patch:
>+	@${CP} -Rp ${WRKDIR}/lib ${WRKDIR}/${DISTNAME}
> 	@${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \;
> 
> # Build has to be done in the final location after installing the sources
>@@ -54,9 +57,6 @@
> 		APACHE_CONFDIR=${SAPACHE_CONFDIR} \
> 		VERSION=${PORTVERSION} \
> 		WEBBASEDIR=${WEBBASEDIR}
>-
>-pre-install:
>-	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
> 
> # I decided to consider the whole souce tree to be part of the package
> # since in there, Zope can live on its own. I can use Zope's own building
>diff -urN zope/distinfo zope.new/distinfo
>--- zope/distinfo	Sun Feb 17 00:08:35 2002
>+++ zope.new/distinfo	Sun Mar 17 21:50:26 2002
>@@ -1,2 +1,3 @@
> MD5 (zope/Zope-2.5.0-src.tgz) = 105bb1f9d90478596cc929164ef385e3
>+MD5 (zope/Hotfix_2002-03-01.tgz) = 4bb8d96a7dd5a93a3fe2e0b9f37632e7
> MD5 (zope/Zope-2.5.0-unix-security.patch) = 87f3dceb08aa3bcede5bf521c9cdd328
>diff -urN zope/pkg-deinstall zope.new/pkg-deinstall
>--- zope/pkg-deinstall	Sat Feb  9 06:25:10 2002
>+++ zope.new/pkg-deinstall	Thu Jan  1 09:00:00 1970
>@@ -1,15 +0,0 @@
>-#!/bin/sh
>-# $FreeBSD: ports/www/zope/pkg-deinstall,v 1.1 2002/02/08 21:25:10 nbm Exp $
>-#
>-
>-if [ "$2" != "POST-DEINSTALL" ]; then
>-    exit 0
>-fi
>-
>-USER=www
>-
>-if pw usershow "${USER}" 2>/dev/null 1>&2; then
>-	echo "To delete WWW (Zope or Apache and so on) user permanently, use 'pw userdel ${USER}'"
>-fi
>-
>-exit 0
>diff -urN zope/pkg-install zope.new/pkg-install
>--- zope/pkg-install	Sat Feb  9 06:25:10 2002
>+++ zope.new/pkg-install	Thu Jan  1 09:00:00 1970
>@@ -1,34 +0,0 @@
>-#!/bin/sh
>-# $FreeBSD: ports/www/zope/pkg-install,v 1.1 2002/02/08 21:25:10 nbm Exp $
>-#
>-
>-if [ "$2" != "PRE-INSTALL" ]; then
>-    exit 0
>-fi
>-
>-USER=www
>-GROUP=${USER}
>-UID=80
>-GID=${UID}
>-
>-if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
>-	if pw groupadd ${GROUP} -g ${GID}; then
>-		echo "Added group \"${GROUP}\"."
>-	else
>-		echo "Adding group \"${GROUP}\" failed..."
>-		exit 1
>-	fi
>-fi
>-
>-if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
>-	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
>-		-s "/sbin/nologin" -d "/nonexistent" \
>-		-c "World Wide Web Owner"; \
>-	then
>-		echo "Added user \"${USER}\"."
>-	else
>-		echo "Adding user \"${USER}\" failed..."
>-		exit 1
>-	fi
>-fi
>-exit 0
>diff -urN zope/pkg-plist zope.new/pkg-plist
>--- zope/pkg-plist	Sun Feb 17 00:08:36 2002
>+++ zope.new/pkg-plist	Wed Mar 20 00:50:27 2002
>@@ -1567,6 +1567,9 @@
> %%ZOPEBASEDIR%%/lib/python/Products/ZopeTutorial/glossary.stx
> %%ZOPEBASEDIR%%/lib/python/Products/ZopeTutorial/tutorial.stx
> %%ZOPEBASEDIR%%/lib/python/Products/ZopeTutorial/version.txt
>+%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/README.txt
>+%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/__init__.py
>+%%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01/__init__.pyc
> %%ZOPEBASEDIR%%/lib/python/Products/__init__.py
> %%ZOPEBASEDIR%%/lib/python/Products/__init__.pyc
> %%ZOPEBASEDIR%%/lib/python/Record.so
>@@ -2448,6 +2451,7 @@
> @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/help
> @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod/dtml
> @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ExternalMethod
>+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Hotfix_2002-03-01
> @dirrm %%ZOPEBASEDIR%%/lib/python/Products
> @dirrm %%ZOPEBASEDIR%%/lib/python/Persistence
> @dirrm %%ZOPEBASEDIR%%/lib/python/OFS/www

Actions: View | Diff

Attachments on bug 36103: 20471