Attachment 144217 Details for Bug 191454 – patch

[patch] patch

patch (text/plain), 3.93 KB, created by Dan Lukes on 2014-06-28 10:59:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Lukes

Created: 2014-06-28 10:59:54 UTC

Size: 3.93 KB

patch

obsolete

>--- java/bouncycastle/Makefile.orig	2014-06-28 12:19:51.000000000 +0200
>+++ java/bouncycastle/Makefile	2014-06-28 12:30:20.000000000 +0200
>@@ -2,8 +2,8 @@
> # $FreeBSD: head/java/bouncycastle/Makefile 343651 2014-02-10 16:35:51Z ale $
> 
> PORTNAME=	bouncycastle
>-PORTVERSION=	1.45
>-PORTREVISION=	1
>+PORTVERSION=	1.50
>+#PORTREVISION=	1
> CATEGORIES=	java security
> MASTER_SITES=	http://downloads.bouncycastle.org/java/ \
> 		http://polydistortion.net/bc/download/ \
>@@ -13,6 +13,8 @@
> MAINTAINER=	ale@FreeBSD.org
> COMMENT=	Cleanroom build of Java Cryptography Extensions
> 
>+LICENSE=	MIT
>+
> BUILD_DEPENDS=	${JAVALIBDIR}/activation.jar:${PORTSDIR}/java/jaf \
> 		${JAVALIBDIR}/mail.jar:${PORTSDIR}/java/javamail \
> 		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
>@@ -22,16 +24,14 @@
> OPTIONS_DEFINE=	DOCS
> 
> USE_JAVA=	yes
>-JAVA_VERSION=	1.6+
>-JDKMVERSION=	1.6 # ${JAVA_PORT_VERSION:C/^([0-9]\.[0-9])(.*)$/\1/}
>-JDKNVERSION=	16 # ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1\2/}
>+JAVA_VERSION=	1.6 1.7
> USE_ANT=	yes
> MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
>-MAKE_ARGS=	-f jdk${JDKNVERSION}.xml
>+MAKE_ARGS=	-f ant/jdk15+.xml
> ALL_TARGET=	build-provider build zip-src
> DISTVERSION=	${PORTVERSION:S/.//}
> 
>-JARS=		bcprov bcmail bctsp bcpg
>+JARS=		bcprov bcmail bcpg bcpkix
> 
> PORTDOCS=	*
> 
>@@ -39,25 +39,25 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} s/BERConstructedOctetString/DEROctetString/ \
>-		${WRKSRC}/src/org/bouncycastle/cms/CMS*DataGenerator.java
>+		${WRKSRC}/pkix/src/main/java/org/bouncycastle/cms/CMS*DataGenerator.java
> 	@${REINPLACE_CMD} 's/<javac/<javac encoding="UTF-8"/;s/<javadoc/<javadoc encoding="UTF-8"/' \
>-		${WRKSRC}/bc-build.xml ${WRKSRC}/common.xml
>+		${WRKSRC}/ant/bc+-build.xml
> 
> do-install:
> 	@${MKDIR} ${STAGEDIR}${DATADIR}
> .for jar in ${JARS}
>-	${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/jars/${jar}-jdk${JDKNVERSION}-${DISTVERSION}.jar \
>+	${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk1.5/jars/${jar}-jdk15on-${DISTVERSION}.jar \
> 	      ${STAGEDIR}${JAVAJARDIR}/${jar}.jar
>-	${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/${jar}-jdk${JDKNVERSION}-${DISTVERSION}/src.zip \
>+	${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk1.5/${jar}-jdk15on-${DISTVERSION}/src.zip \
> 	      ${STAGEDIR}${DATADIR}/${jar}-src.zip
> .endfor
>-	${INSTALL_DATA} ${WRKSRC}/jars/bcprov-jdk${JDKNVERSION}-${DISTVERSION}.jar \
>+	${INSTALL_DATA} ${WRKSRC}/jars/bcprov-ext-jdk15on-${DISTVERSION}.jar \
> 		${STAGEDIR}${JAVAJARDIR}/bcprov.jar
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR}
> .for jar in ${JARS}
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${jar}
>-	@cd ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/${jar}-jdk${JDKNVERSION}-${DISTVERSION}/docs/ && \
>+	@cd ${WRKSRC}/build/artifacts/jdk1.5/${jar}-jdk15on-${DISTVERSION}/docs/ && \
> 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${jar}
> .endfor
> 
>--- java/bouncycastle/pkg-plist.orig	2014-06-28 12:20:07.000000000 +0200
>+++ java/bouncycastle/pkg-plist	2014-06-28 12:49:15.000000000 +0200
>@@ -1,9 +1,9 @@
> %%JAVAJARDIR%%/bcmail.jar
> %%JAVAJARDIR%%/bcpg.jar
> %%JAVAJARDIR%%/bcprov.jar
>-%%JAVAJARDIR%%/bctsp.jar
>+%%JAVAJARDIR%%/bcpkix.jar
> %%DATADIR%%/bcmail-src.zip
> %%DATADIR%%/bcpg-src.zip
> %%DATADIR%%/bcprov-src.zip
>-%%DATADIR%%/bctsp-src.zip
>+%%DATADIR%%/bcpkix-src.zip
> @dirrm %%DATADIR%%
>--- java/bouncycastle/pkg-descr.orig	2014-02-03 21:03:25.000000000 +0100
>+++ java/bouncycastle/pkg-descr	2014-06-28 12:28:13.000000000 +0200
>@@ -11,8 +11,10 @@
> . Generators/Processors for OCSP (RFC 2560).
> . Generators/Processors for TSP (RFC 3161).
> . Generators/Processors for OpenPGP (RFC 2440).
>-. A signed jar version suitable for JDK 1.4/1.5 and the Sun JCE.
>+. Generators/Processors for Extended Access Control (EAC).
>+. Generators/Processors for Data Validation and Certification Server (DVCS).
>+. A signed jar version suitable for JDK 1.4-1.7 and the Sun JCE.
> 
>-It's distributed under a modified X license.
>+It's distributed under a MIT-like license.
> 
> WWW: http://www.bouncycastle.org/
>--- patch ends here ---

Actions: View | Diff

Attachments on bug 191454: 144217