- Update to the Globus Toolkit 4.0.3. This is primairly a security

   bugfix release dealing with tmpfile race conditions.
 - Some CVS remenents have crept into the distribution, don't install them.
 - Add USE_LDCONFIG to run ldconfig on the globus libraries. [1]
 - Add some verbosity in hopes of finding what I'm doing that is causing
   this to fail on the package cluster.

Reported by:	Tony Maher <anthony.maher at uts.edu.au> [1]
Security:	vid:vid:5039ae61-2c9f-11db-8401-000ae42e9b93

4 files changed, 20 insertions, 41 deletions

diff --git a/net/globus4/Makefile b/net/globus4/Makefile
index 6cf8ca1c7c3c..894f8dc45b3c 100644
--- a/net/globus4/Makefile
+++ b/net/globus4/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	globus
-PORTVERSION=	4.0.2
-PORTREVISION=	20060706
+PORTVERSION=	4.0.3
+PORTREVISION=	20060825
 CATEGORIES=	net java parallel
 MASTER_SITES=	ftp://ftp.globus.org/pub/gt4/4.0/${PORTVERSION}/%SUBDIR%/src/:installers,updates
 MASTER_SITE_SUBDIR=	installers/:installers updates/:updates
@@ -22,32 +22,32 @@ COMMENT=	Grid computing toolkit
 
 RUN_DEPENDS=	${LOCALBASE}/bin/sudo:${PORTSDIR}/security/sudo
 
-FORBIDDEN=	multiple tmpfile race vulnerabilities
-
 INSTALLER=	${DISTNAME}${EXTRACT_SUFX}
 BUNDLE_SUFX=	.tar.gz
 
 # Updates from http://www.globus.org/toolkit/advisories.html
 #
-# All entries are listed.  Inapplicable ones are commented out.
 # The format is <file name minus .tar.gz>:<flavor list>
-UPDATE_BUNDLES+=	globus_gass_copy-3.21:%FLAVOR%,%FLAVOR%pthr
+#UPDATE_BUNDLES+=	globus_gass_copy-3.21:%FLAVOR%,%FLAVOR%pthr
 
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
+USE_LDCONFIG=	${GLOBUS_LOCATION}/lib
 
 GLOBUS_BASE?=	globus
 GLOBUS_LOCATION=${TARGETDIR}/${GLOBUS_BASE}
 TMP_GLOBUS_LOCATION=	${WRKDIR}/globus
 TMP_GLOBUS_ENV=	GLOBUS_LOCATION=${TMP_GLOBUS_LOCATION} \
-		GPT_LOCATION=${TMP_GLOBUS_LOCATION}
+		GPT_LOCATION=${TMP_GLOBUS_LOCATION} \
+		PATH=${WRKDIR}/tmpbin:${PATH} \
+		LD_LIBRARY_PATH=${TMP_GLOBUS_LOCATION}/lib
 
 CONFIGURE_ARGS=	--prefix=${TMP_GLOBUS_LOCATION} ${CONFIGURE_TARGET}
 CONFIGURE_ENV+=	${TMP_GLOBUS_ENV}
 # WARNING: this only works because we do the install ourselves
-MAKE_ENV+=	${TMP_GLOBUS_ENV} PATH=${WRKDIR}/tmpbin:${PATH} LD_LIBRARY_PATH=${TMP_GLOBUS_LOCATION}/lib
+MAKE_ENV+=	${TMP_GLOBUS_ENV}
 
 PLIST_SUB+=	BASE_FLAVOR=${BASE_FLAVOR} \
 		GLOBUS_BASE=${GLOBUS_BASE} \
@@ -90,10 +90,11 @@ BASE_FLAVOR=	gcc${ARCHBITS}dbg
 
 post-patch:
 	cd ${WRKSRC}/gpt/packaging_tools/etc/ ; \
-	    tar xfz globus_core-src.tar.gz ; \
+	    tar xfzv globus_core-src.tar.gz ; \
 	    ${CP} ${WRKSRC}/source-trees/core/source/configure globus_core-4.30/ ; \
 	    ${CP} ${WRKSRC}/source-trees/core/source/config/accompiler.m4 globus_core-4.30/config ; \
-	    tar cfz globus_core-src.tar.gz globus_core-4.30
+	    tar cfzv globus_core-src.tar.gz globus_core-4.30 ; \
+	    ${RM} -r globus_core-4.30
 
 # HACK: this is under defined(GNU_CONFIGURE) in do-configure, but we
 # have to do it ourselves because we can't set GNU_CONFIGURE and install
@@ -112,6 +113,7 @@ pre-build:
 	${MKDIR} ${WRKSRC}/gpt/packaging_tools/etc/gpt
 	${MKDIR} ${WRKDIR}/tmpbin
 	${LN} -s `which gmake` ${WRKDIR}/tmpbin/make || ${TRUE}
+	ls -l ${WRKDIR}/tmpbin
 
 post-build:
 .for _B in ${UPDATE_BUNDLES}
@@ -122,6 +124,7 @@ post-build:
 .endfor
 	${FIND} ${TMP_GLOBUS_LOCATION}/etc/gpt/packages/ -name bak -depth 2 | \
 	    ${XARGS} ${RM} -rf
+	${FIND} ${TMP_GLOBUS_LOCATION} -type d -name CVS | xargs ${RM} -r
 	${RM} -rf ${TMP_GLOBUS_LOCATION}/man/cat*
 
 do-install:
diff --git a/net/globus4/Makefile.man b/net/globus4/Makefile.man
index e2e82f2f418b..2c4644cd74ce 100644
--- a/net/globus4/Makefile.man
+++ b/net/globus4/Makefile.man
@@ -9,10 +9,6 @@ MAN1+=${BASE_FLAVOR}/shared/gsiscp.1
 MAN1+=${BASE_FLAVOR}/shared/gsisftp.1
 MAN1+=${BASE_FLAVOR}/shared/gsissh.1
 MAN1+=.cvsignore
-MAN1+=CVS/Entries
-MAN1+=CVS/Repository
-MAN1+=CVS/Root
-MAN1+=CVS/Tag
 MAN1+=applypatch.1
 MAN1+=makepatch.1
 MAN1+=man1/globus-job-manager-service.1
diff --git a/net/globus4/distinfo b/net/globus4/distinfo
index af635f9e1e6d..dfd92dd38470 100644
--- a/net/globus4/distinfo
+++ b/net/globus4/distinfo
@@ -1,6 +1,3 @@
-MD5 (globus/gt4.0.2-all-source-installer.tar.bz2) = 2f029baad4fbe4b830911131503bb39d
-SHA256 (globus/gt4.0.2-all-source-installer.tar.bz2) = 1fd5eecd30167acc4d7d528f2c7e1d0d540458c6ffd6426de76a0ff57dedd651
-SIZE (globus/gt4.0.2-all-source-installer.tar.bz2) = 87301919
-MD5 (globus/globus_gass_copy-3.21.tar.gz) = d3cef9549fc762d83c214b6d99d1703e
-SHA256 (globus/globus_gass_copy-3.21.tar.gz) = 40f0eda8051afcf907a70c5e975930612237aa07cd901e451a6ef2acb161ee07
-SIZE (globus/globus_gass_copy-3.21.tar.gz) = 223564
+MD5 (globus/gt4.0.3-all-source-installer.tar.bz2) = 63af78f101a26e0124cd41db86a480d8
+SHA256 (globus/gt4.0.3-all-source-installer.tar.bz2) = 2ea934607ab213313e95cfec54432c7f9bf788d0ceef4eae0621507287754d58
+SIZE (globus/gt4.0.3-all-source-installer.tar.bz2) = 99769136
diff --git a/net/globus4/pkg-plist b/net/globus4/pkg-plist
index 92a33109e42e..431a3f7654bb 100644
--- a/net/globus4/pkg-plist
+++ b/net/globus4/pkg-plist
@@ -3943,17 +3943,9 @@
 %%GLOBUS_BASE%%/lib/naming-java.jar
 %%GLOBUS_BASE%%/lib/naming-resources.jar
 %%GLOBUS_BASE%%/lib/opensaml.jar
-%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/CVS/Entries
-%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/CVS/Repository
-%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/CVS/Root
-%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/CVS/Tag
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/Compress/Zlib.pm
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/Digest/MD5.pm
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Archive/Tar/.packlist
-%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/CVS/Entries
-%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/CVS/Repository
-%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/CVS/Root
-%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/CVS/Tag
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Compress/Zlib/.packlist
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Compress/Zlib/Zlib.bs
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Compress/Zlib/Zlib.so
@@ -3964,10 +3956,6 @@
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/IO/Zlib/.packlist
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Pod/Parser/.packlist
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/makepatch/.packlist
-%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/makepatch/CVS/Entries
-%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/makepatch/CVS/Repository
-%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/makepatch/CVS/Root
-%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/makepatch/CVS/Tag
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/zlib/extralibs.ld
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/perllocal.pod
 %%GLOBUS_BASE%%/lib/perl/Archive/Tar.pm
@@ -3977,6 +3965,7 @@
 %%GLOBUS_BASE%%/lib/perl/Globus/GRAM/JobSignal.pm
 %%GLOBUS_BASE%%/lib/perl/Globus/GRAM/JobState.pm
 %%GLOBUS_BASE%%/lib/perl/Globus/GRAM/StdioMerger.pm
+%%GLOBUS_BASE%%/lib/perl/Globus/Testing/Container.pm
 %%GLOBUS_BASE%%/lib/perl/Globus/Testing/Utilities.pm
 %%GLOBUS_BASE%%/lib/perl/Globus/URL.pm
 %%GLOBUS_BASE%%/lib/perl/Grid/GPT/Algorithms.pm
@@ -4252,10 +4241,6 @@
 %%GLOBUS_BASE%%/sbin/%%BASE_FLAVOR%%pthr/shared/grid-mapfile-add-entry
 %%GLOBUS_BASE%%/sbin/%%BASE_FLAVOR%%pthr/shared/grid-mapfile-check-consistency
 %%GLOBUS_BASE%%/sbin/%%BASE_FLAVOR%%pthr/shared/grid-mapfile-delete-entry
-%%GLOBUS_BASE%%/sbin/CVS/Entries
-%%GLOBUS_BASE%%/sbin/CVS/Repository
-%%GLOBUS_BASE%%/sbin/CVS/Root
-%%GLOBUS_BASE%%/sbin/CVS/Tag
 %%GLOBUS_BASE%%/sbin/applypatch
 %%GLOBUS_BASE%%/sbin/config.guess
 %%GLOBUS_BASE%%/sbin/globus-build-doxygen-dependencies
@@ -6114,6 +6099,7 @@
 %%GLOBUS_BASE%%/test/globus_wsrf_gram_service_java_test_unit/test.xml
 %%GLOBUS_BASE%%/test/globus_wsrf_test_interop/TESTS.pl
 %%GLOBUS_BASE%%/test/globus_wsrf_test_unit/TESTS.pl
+%%GLOBUS_BASE%%/test/globus_wsrf_test_unit_sec/TESTS.pl
 %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/TESTS.pl
 %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/attr-test.pl
 %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/basic-test.pl
@@ -6195,6 +6181,7 @@
 @dirrm %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared
 @dirrm %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%
 @dirrm %%GLOBUS_BASE%%/test/globus_xio_test
+@dirrm %%GLOBUS_BASE%%/test/globus_wsrf_test_unit_sec
 @dirrm %%GLOBUS_BASE%%/test/globus_wsrf_test_unit
 @dirrm %%GLOBUS_BASE%%/test/globus_wsrf_test_interop
 @dirrm %%GLOBUS_BASE%%/test/globus_wsrf_gram_service_java_test_unit
@@ -6296,6 +6283,7 @@
 @dirrm %%GLOBUS_BASE%%/share/schema/mds/aggregator
 @dirrm %%GLOBUS_BASE%%/share/schema/mds
 @dirrm %%GLOBUS_BASE%%/share/schema/inmemorysg
+@dirrm %%GLOBUS_BASE%%/share/schema/gram/4.0
 @dirrm %%GLOBUS_BASE%%/share/schema/gram/%%BASE_FLAVOR%%/shared
 @dirrm %%GLOBUS_BASE%%/share/schema/gram/%%BASE_FLAVOR%%
 @dirrm %%GLOBUS_BASE%%/share/schema/gram
@@ -6383,7 +6371,6 @@
 @dirrm %%GLOBUS_BASE%%/setup/globus/%%BASE_FLAVOR%%
 @dirrm %%GLOBUS_BASE%%/setup/globus
 @dirrm %%GLOBUS_BASE%%/setup
-@dirrm %%GLOBUS_BASE%%/sbin/CVS
 @dirrm %%GLOBUS_BASE%%/sbin/%%BASE_FLAVOR%%pthr/shared
 @dirrm %%GLOBUS_BASE%%/sbin/%%BASE_FLAVOR%%pthr
 @dirrm %%GLOBUS_BASE%%/sbin/%%BASE_FLAVOR%%/shared
@@ -6402,7 +6389,6 @@
 @dirrm %%GLOBUS_BASE%%/man/man1/ssh.d/%%BASE_FLAVOR%%
 @dirrm %%GLOBUS_BASE%%/man/man1/ssh.d
 @dirrm %%GLOBUS_BASE%%/man/man1/man1
-@dirrm %%GLOBUS_BASE%%/man/man1/CVS
 @dirrm %%GLOBUS_BASE%%/man/man1/%%BASE_FLAVOR%%/shared
 @dirrm %%GLOBUS_BASE%%/man/man1/%%BASE_FLAVOR%%
 @dirrm %%GLOBUS_BASE%%/man/man1
@@ -6446,7 +6432,6 @@
 @dirrm %%GLOBUS_BASE%%/lib/perl/Globus
 @dirrm %%GLOBUS_BASE%%/lib/perl/Archive
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/zlib
-@dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/makepatch/CVS
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/makepatch
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Pod/Parser
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Pod
@@ -6456,13 +6441,11 @@
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Digest
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Compress/Zlib
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Compress
-@dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/CVS
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Archive/Tar
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Archive
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/Digest
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/Compress
-@dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/CVS
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%
 @dirrm %%GLOBUS_BASE%%/lib/perl
 @dirrm %%GLOBUS_BASE%%/lib/globus_service_modules/wsrf/services