Attachment 126415 Details for Bug 170168 – file.diff

[patch] file.diff

file.diff (text/plain), 7.53 KB, created by tkato432 on 2012-07-25 19:10:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2012-07-25 19:10:17 UTC

Size: 7.53 KB

patch

obsolete

>diff -urN /usr/ports/security/matrixssl/Makefile security/matrixssl/Makefile
>--- /usr/ports/security/matrixssl/Makefile	2010-02-01 08:12:03.000000000 +0900
>+++ security/matrixssl/Makefile	2012-07-12 04:08:22.000000000 +0900
>@@ -5,34 +5,66 @@
> # $FreeBSD: ports/security/matrixssl/Makefile,v 1.4 2010/01/31 23:12:03 arved Exp $
> 
> PORTNAME=	matrixssl
>-PORTVERSION=	1.8.8
>+PORTVERSION=	3.3
> CATEGORIES=	security
>-MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
>-MASTER_SITE_SUBDIR=	distfiles
>-DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
>+MASTER_SITES=	CPAN
>+MASTER_SITE_SUBDIR=	CPAN:CDRAKE
>+DISTNAME=	Crypt-MatrixSSL3-3.3.0.1
>+EXTRACT_SUFX=	.tgz
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Small alternative SSL implementation
> 
>+LICENSE=	GPLv2 # (or later)
>+
>+OPTIONS_DEFINE=	DOCS EXAMPLES
>+
>+WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}-${PORTVERSION:S/./-/g}-open
>+
> USE_GMAKE=	yes
>-WRKSRC=		${WRKDIR}/matrixssl-1-8-8-open/src
>+MAKE_ARGS=	CC="${CC}" DFLAGS="${CFLAGS}" STRIP="${TEST}"
> USE_LDCONFIG=	yes
>+MAKE_JOBS_SAFE=	yes
>+
>+.include <bsd.port.pre.mk>
>+
>+.if ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64"
>+CFLAGS+=	-DPSTM_64BIT
>+.endif
> 
> post-extract:
>-	cd ${WRKDIR} && ${TAR} -xvf matrixssl-1-8-8-open.tgz
>+	@cd ${WRKDIR}/${DISTNAME} \
>+		&& ${TAR} -xf ${PORTNAME}-${PORTVERSION:S/./-/g}-open.tgz
>+
>+pre-patch:
>+	@cd ${WRKDIR}/${DISTNAME} \
>+		&& ${CAT} ${PORTNAME}-${PORTVERSION:S/./-/g}-open.patch | \
>+		${PATCH} -d ${WRKSRC} -p1 --quiet
> 
> post-patch:
>-	${REINPLACE_CMD} -e "s,^CC,#CC,;s,-O3,${CFLAGS}," ${WRKSRC}/Makefile
>+	@${REINPLACE_CMD} -e \
>+		's|^LDFLAGS|#LDFLAGS|' ${WRKSRC}/Makefile
> 
> do-install:
>-	${INSTALL_DATA} ${WRKSRC}/libmatrixssl* ${PREFIX}/lib
>-	${INSTALL_DATA} ${WRKSRC}/../*.h ${PREFIX}/include
>-.if !defined(NOPORTDOCS)
>-	${MKDIR} ${DOCSDIR}
>-	${CP} ${WRKSRC}/../doc/* ${DOCSDIR}
>-	${MKDIR} ${EXAMPLESDIR}
>-	${CP} ${WRKSRC}/../examples/* ${EXAMPLESDIR}
>-	-cd ${EXAMPLESDIR}; ${RM} *.vcproj *.sln *.orig
>+	${INSTALL_DATA} ${WRKSRC}/libmatrixssl.* ${PREFIX}/lib
>+	@${MKDIR} ${PREFIX}/include/matrixssl
>+	${INSTALL_DATA} ${WRKSRC}/matrixssl/*.h ${PREFIX}/include/matrixssl
>+	@${MKDIR} ${PREFIX}/include/matrixssl/core
>+	${INSTALL_DATA} ${WRKSRC}/core/*.h ${PREFIX}/include/matrixssl/core
>+	@${MKDIR} ${PREFIX}/include/matrixssl/crypto
>+	${INSTALL_DATA} ${WRKSRC}/crypto/*.h ${PREFIX}/include/matrixssl/crypto
>+.if ${PORT_OPTIONS:MDOCS}
>+	@${MKDIR} ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
>+.endif
>+.if ${PORT_OPTIONS:MEXAMPLES}
>+	@${MKDIR} ${EXAMPLESDIR}/apps
>+	${INSTALL_DATA} ${WRKSRC}/apps/Makefile ${EXAMPLESDIR}/apps
>+	${INSTALL_DATA} ${WRKSRC}/apps/*.c ${EXAMPLESDIR}/apps
>+	${INSTALL_DATA} ${WRKSRC}/apps/*.h ${EXAMPLESDIR}/apps
>+	@${MKDIR} ${EXAMPLESDIR}/sampleCerts
>+	${INSTALL_DATA} ${WRKSRC}/sampleCerts/*.h ${EXAMPLESDIR}/sampleCerts
>+	${INSTALL_DATA} ${WRKSRC}/sampleCerts/*.pem ${EXAMPLESDIR}/sampleCerts
> .endif
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -urN /usr/ports/security/matrixssl/distinfo security/matrixssl/distinfo
>--- /usr/ports/security/matrixssl/distinfo	2011-07-03 23:02:57.000000000 +0900
>+++ security/matrixssl/distinfo	2012-07-12 03:27:58.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (matrixssl_1.8.8.orig.tar.gz) = 6c40581406b7732030d8bdf2fb40628448b826b36b0f81745d43479f028537b6
>-SIZE (matrixssl_1.8.8.orig.tar.gz) = 735470
>+SHA256 (Crypt-MatrixSSL3-3.3.0.1.tgz) = 4693155e64041c8c81cf53f084b502d0238d539676001856d05b6a19855769ff
>+SIZE (Crypt-MatrixSSL3-3.3.0.1.tgz) = 4142631
>diff -urN /usr/ports/security/matrixssl/files/patch-examples-sslSocket.h security/matrixssl/files/patch-examples-sslSocket.h
>--- /usr/ports/security/matrixssl/files/patch-examples-sslSocket.h	2010-02-01 08:12:04.000000000 +0900
>+++ security/matrixssl/files/patch-examples-sslSocket.h	1970-01-01 09:00:00.000000000 +0900
>@@ -1,10 +0,0 @@
>---- ../examples/sslSocket.h.orig	2010-02-01 00:06:47.000000000 +0100
>-+++ ../examples/sslSocket.h	2010-02-01 00:06:59.000000000 +0100
>-@@ -50,6 +50,7 @@
>- 	#define		getSocketError()  WSAGetLastError()
>- #elif LINUX
>- 	#include	<sys/socket.h>
>-+	#include	<sys/types.h>
>- 	#include	<netinet/in.h>
>- 	#include	<netinet/tcp.h>
>- 	#include	<arpa/inet.h>
>diff -urN /usr/ports/security/matrixssl/pkg-plist security/matrixssl/pkg-plist
>--- /usr/ports/security/matrixssl/pkg-plist	2010-02-01 08:12:03.000000000 +0900
>+++ security/matrixssl/pkg-plist	2012-07-12 04:09:44.000000000 +0900
>@@ -1,26 +1,49 @@
>-include/matrixCommon.h
>-include/matrixSsl.h
>+include/matrixssl/core/coreApi.h
>+include/matrixssl/core/coreConfig.h
>+include/matrixssl/core/list.h
>+include/matrixssl/core/osdep.h
>+include/matrixssl/core/psmalloc.h
>+include/matrixssl/crypto/cryptoApi.h
>+include/matrixssl/crypto/cryptoConfig.h
>+include/matrixssl/crypto/cryptolib.h
>+include/matrixssl/matrixsslApi.h
>+include/matrixssl/matrixsslConfig.h
>+include/matrixssl/matrixssllib.h
>+include/matrixssl/version.h
>+lib/libmatrixssl.a
> lib/libmatrixssl.so
>-lib/libmatrixsslstatic.a
>-%%PORTDOCS%%%%DOCSDIR%%/MatrixSSLReadme.pdf
>-%%PORTDOCS%%%%DOCSDIR%%/MatrixSSLApi.pdf
>-%%PORTDOCS%%%%DOCSDIR%%/MatrixSSLDeveloperGuide.pdf
>-%%PORTDOCS%%%%DOCSDIR%%/MatrixSSLKeyGeneration.pdf
>-%%PORTDOCS%%%%DOCSDIR%%/MatrixSSLPortingGuide.pdf
>-%%PORTDOCS%%%%DOCSDIR%%/MatrixSSLSocketApi.pdf
>-%%PORTDOCS%%%%DOCSDIR%%/MatrixSSL-1.8.8-SecurityNotes.pdf
>-%%PORTDOCS%%%%DOCSDIR%%/Renegotiating_TLS.pdf
>-%%PORTDOCS%%%%EXAMPLESDIR%%/CAcertSrv.pem
>-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
>-%%PORTDOCS%%%%EXAMPLESDIR%%/certSrv.p12
>-%%PORTDOCS%%%%EXAMPLESDIR%%/certSrv.pem
>-%%PORTDOCS%%%%EXAMPLESDIR%%/httpsClient.c
>-%%PORTDOCS%%%%EXAMPLESDIR%%/httpsReflector.c
>-%%PORTDOCS%%%%EXAMPLESDIR%%/privkeySrv.pem
>-%%PORTDOCS%%%%EXAMPLESDIR%%/sslSocket.c
>-%%PORTDOCS%%%%EXAMPLESDIR%%/sslSocket.h
>-%%PORTDOCS%%%%EXAMPLESDIR%%/CAcertSrv.der
>-%%PORTDOCS%%%%EXAMPLESDIR%%/privkeySrv.der
>-%%PORTDOCS%%%%EXAMPLESDIR%%/certSrv.der
>+%%PORTDOCS%%%%DOCSDIR%%/MatrixSSL_3-3-OpenReleaseNotes.pdf
>+%%PORTDOCS%%%%DOCSDIR%%/MatrixSSL_API.pdf
>+%%PORTDOCS%%%%DOCSDIR%%/MatrixSSL_DevelopersGuide.pdf
>+%%PORTDOCS%%%%DOCSDIR%%/MatrixSSL_GettingStarted.pdf
>+%%PORTDOCS%%%%DOCSDIR%%/MatrixSSL_PortingGuide.pdf
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/apps/Makefile
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/apps/app.h
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/apps/client.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/apps/http.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/apps/server.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleCerts/CAcertSrv.h
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleCerts/CAcertSrv.pem
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleCerts/CAcertSrv2048.h
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleCerts/CAcertSrv2048.pem
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleCerts/CAcertSrv512.h
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleCerts/CAcertSrv512.pem
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleCerts/certSrv.h
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleCerts/certSrv.pem
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleCerts/certSrv2048.h
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleCerts/certSrv2048.pem
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleCerts/certSrv512.h
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleCerts/certSrv512.pem
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleCerts/privkeySrv.h
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleCerts/privkeySrv.pem
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleCerts/privkeySrv2048.h
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleCerts/privkeySrv2048.pem
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleCerts/privkeySrv512.h
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleCerts/privkeySrv512.pem
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/sampleCerts
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/apps
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
>+@dirrm include/matrixssl/crypto
>+@dirrm include/matrixssl/core
>+@dirrm include/matrixssl

Actions: View | Diff

Attachments on bug 170168: 126415