diff options
author | Thierry Thomas <thierry@FreeBSD.org> | 2008-08-19 21:40:14 +0000 |
---|---|---|
committer | Thierry Thomas <thierry@FreeBSD.org> | 2008-08-19 21:40:14 +0000 |
commit | 83eab871cca294e8b530c581547554f710de4d50 (patch) | |
tree | 2e08dbbaa2782c6dc9051f46bd619d98bb13c751 /science/cdf | |
parent | Register a Buffer Overflow Vulnerability in CDF 3.2. (diff) |
- Upgrade to 3.2.1 and fix a vulnerability;
- Respect NOPORTEXAMPLES;
- Release maintainership.
Security: VuXML c4f31e16-6e33-11dd-8eb7-0011098ad87f
Notes
Notes:
svn path=/head/; revision=218869
Diffstat (limited to 'science/cdf')
-rw-r--r-- | science/cdf/Makefile | 13 | ||||
-rw-r--r-- | science/cdf/distinfo | 6 | ||||
-rw-r--r-- | science/cdf/files/patch-src+include+cdfdist.h | 10 | ||||
-rw-r--r-- | science/cdf/pkg-plist | 34 |
4 files changed, 32 insertions, 31 deletions
diff --git a/science/cdf/Makefile b/science/cdf/Makefile index 3651931be1d2..a8b48410a2f7 100644 --- a/science/cdf/Makefile +++ b/science/cdf/Makefile @@ -6,7 +6,7 @@ # PORTNAME= cdf3 -PORTVERSION= 3.2 +PORTVERSION= 3.2.1 CATEGORIES= science MASTER_SITES= ${MASTER_SITE_LOCAL} \ ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf${VER}/unix/ @@ -14,18 +14,18 @@ MASTER_SITE_SUBDIR= thierry/${PORTNAME} DISTNAME= cdf${VER}-dist-cdf DIST_SUBDIR= ${PKGNAME} -MAINTAINER= thierry@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Device independent view of the CDF data model MAKE_FLAGS= INSTALLDIR=${PREFIX} OS=${OPSYS:L} ENV=gnu \ FORTRAN=yes FC_freebsd=${F77} USE_LDCONFIG= yes -VER= ${PORTVERSION:S/.//} +VER= ${PORTVERSION:S/.//:S/./_/} USE_FORTRAN= yes -WRKSRC= ${WRKDIR}/cdf${VER}-dist-readonly +WRKSRC= ${WRKDIR}/cdf${VER}-dist SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message @@ -48,9 +48,12 @@ post-install: ${MV} ${PREFIX}/lib/libcdf.so ${PREFIX}/lib/libcdf.so.0 ${LN} -sf ${PREFIX}/lib/libcdf.so.0 ${PREFIX}/lib/libcdf.so .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} ${EXAMPLESDIR} + ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." +.endif +.if !defined(NOPORTEXAMPLES) + ${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/samples/* ${EXAMPLESDIR} @${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}." .endif diff --git a/science/cdf/distinfo b/science/cdf/distinfo index 72321081b6ce..0fcd428838a0 100644 --- a/science/cdf/distinfo +++ b/science/cdf/distinfo @@ -1,3 +1,3 @@ -MD5 (cdf3-3.2/cdf32-dist-cdf.tar.gz) = 8c665c013f6fe1d2ad4968dfdc14431f -SHA256 (cdf3-3.2/cdf32-dist-cdf.tar.gz) = 2da085abfb3380849befc42cbfa0e8b663e2395a05a423583be4b07dd2fb14c0 -SIZE (cdf3-3.2/cdf32-dist-cdf.tar.gz) = 966523 +MD5 (cdf3-3.2.1/cdf32_1-dist-cdf.tar.gz) = 58ced97d036fa6d634ca7a2c69dda46a +SHA256 (cdf3-3.2.1/cdf32_1-dist-cdf.tar.gz) = 2ed44c9cbff22a15474b5dd8e0a638800a7966ac9f73d90abd6ee212eb4eafbc +SIZE (cdf3-3.2.1/cdf32_1-dist-cdf.tar.gz) = 966555 diff --git a/science/cdf/files/patch-src+include+cdfdist.h b/science/cdf/files/patch-src+include+cdfdist.h index 937a48be3275..5938d8100d37 100644 --- a/science/cdf/files/patch-src+include+cdfdist.h +++ b/science/cdf/files/patch-src+include+cdfdist.h @@ -1,11 +1,9 @@ -Gfortran uses only one underscore(?) - ---- src/include/cdflib.h~ Wed Oct 4 05:13:39 2006 -+++ src/include/cdflib.h Wed Jan 17 15:46:50 2007 -@@ -356,7 +356,7 @@ +--- src/include/cdflib.h.orig 2008-05-02 20:16:55.000000000 +0200 ++++ src/include/cdflib.h 2008-08-19 21:59:08.000000000 +0200 +@@ -370,7 +370,7 @@ defined(__MINGW32__) # if (defined(linux) && !defined(__ICC)) || defined(__CYGWIN__) || \ - defined(macosX) || \ + defined(macosXppc) || defined(macosXintel) || \ - defined(sun) || defined(__MINGW32__) || defined(__FreeBSD__) + defined(sun) || defined(__MINGW32__) # define Fif_ENTRYPOINT(ep__,ep_,ep,EP) ep__ diff --git a/science/cdf/pkg-plist b/science/cdf/pkg-plist index b353988c2a78..ae4cac5245e6 100644 --- a/science/cdf/pkg-plist +++ b/science/cdf/pkg-plist @@ -46,22 +46,22 @@ lib/cdf/help/skt2cdfj.olh lib/libcdf.a lib/libcdf.so lib/libcdf.so.0 -%%PORTDOCS%%%%EXAMPLESDIR%%/OperateAttributes.c -%%PORTDOCS%%%%EXAMPLESDIR%%/OperateCDF.c -%%PORTDOCS%%%%EXAMPLESDIR%%/OperateVariables.c -%%PORTDOCS%%%%EXAMPLESDIR%%/cacsst2.cdf -%%PORTDOCS%%%%EXAMPLESDIR%%/cacsst2.skt -%%PORTDOCS%%%%EXAMPLESDIR%%/d103a2x.cdf -%%PORTDOCS%%%%EXAMPLESDIR%%/example.dat -%%PORTDOCS%%%%EXAMPLESDIR%%/example1.c -%%PORTDOCS%%%%EXAMPLESDIR%%/example1.cdf -%%PORTDOCS%%%%EXAMPLESDIR%%/example2.cdf -%%PORTDOCS%%%%EXAMPLESDIR%%/example2.f -%%PORTDOCS%%%%EXAMPLESDIR%%/geocpi0.cdf -%%PORTDOCS%%%%EXAMPLESDIR%%/geocpi0.skt -%%PORTDOCS%%%%EXAMPLESDIR%%/ij01r39.cdf -%%PORTDOCS%%%%EXAMPLESDIR%%/read_example1.c -%%PORTDOCS%%%%EXAMPLESDIR%%/zfia10x.cdf -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OperateAttributes.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OperateCDF.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OperateVariables.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cacsst2.cdf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cacsst2.skt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/d103a2x.cdf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.dat +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1.cdf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2.cdf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2.f +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geocpi0.cdf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geocpi0.skt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ij01r39.cdf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/read_example1.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zfia10x.cdf +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% @dirrm lib/cdf/help @dirrm lib/cdf |