Attachment #153613 for bug #197779




# $FreeBSD$

PORTNAME=	polarssl
PORTVERSION=	1.3.10
PORTREVISION=	1
DISTVERSIONSUFFIX=	-gpl
#PORTREVISION=	1
CATEGORIES=	security devel
MASTER_SITES=	https://polarssl.org/download/
PKGNAMESUFFIX=	13
DISTNAME=	mbedtls-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}

MAINTAINER=	chris@bsdjunk.com
COMMENT=	Open Source embedded SSL/TLS cryptographic library


ALL_TARGET=	no_test

USES=		cpe gmake tar:tgz
USE_LDCONFIG=	yes

WRKSRC=		${WRKDIR}/mbedtls-${PORTVERSION}

CONFLICTS=	polarssl-[0-9]*


do-install:
	@cd ${WRKSRC}/include && ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PREFIX}/include "! -name *.orig"
	${INSTALL_DATA} ${WRKSRC}/library/libpolarssl.a ${STAGEDIR}${PREFIX}/lib/
	${INSTALL_DATA} ${WRKSRC}/library/libpolarssl.so ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.8
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.8
	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libpolarssl.so.8 libpolarssl.so)
	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libpolarssl.so.8 libmbedtls.so.8)
	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libmbedtls.so.8 libmbedtls.so)
.for i in ${BINFILES}
	${INSTALL_PROGRAM} ${WRKSRC}/programs/*/${i} ${STAGEDIR}${PREFIX}/bin/polarssl_${i}
.endfor

Lines 1-2 Link Here

(-)polarssl13/distinfo (-2 / +2 lines)
1	SHA256 (polarssl-1.3.9-gpl.tgz) = d3605afc28ed4b7d1d9e3142d72e42855e4a23c07c951bbb0299556b02d36755	1	SHA256 (mbedtls-1.3.10-gpl.tgz) = 746fd88e0c6623691fc56c4eed52e40a57b2da0ac80f6dd8995094aa6adb407e
2	SIZE (polarssl-1.3.9-gpl.tgz) = 1741396	2	SIZE (mbedtls-1.3.10-gpl.tgz) = 1709888

Line 0 Link Here

(-)polarssl13/files/patch-include_polarssl_config.h (+9 lines)
	1	--- include/polarssl/config.h.bak 2014-04-11 22:33:59.000000000 +0900
	2	+++ include/polarssl/config.h 2014-04-30 17:36:41.000000000 +0900
	3	@@ -2383,4 +2383,6 @@
	4	#error "POLARSSL_X509_CSR_WRITE_C defined, but not all prerequisites"
	5	#endif
	6
	7	+#define SHOW_PROTOTYPE_CHANGE_WARNINGS
	8	+
	9	#endif /* config.h */




--- library/Makefile.orig	2015-02-11 01:00:42.000000000 +0900
+++ library/Makefile	2015-02-18 12:47:25.000000000 +0900
@@ -18,9 +18,7 @@
 # CFLAGS += -D_BSD_EXTENSION
 

 CFLAGS += -fPIC
-endif
 
 SONAME=libmbedtls.so.8
 
@@ -65,11 +63,7 @@
 

-ifndef SHARED
-all: static
-else
 all: shared static
-endif
+all: shared static
 
 static: libpolarssl.a
 

Lines 1-11 Link Here

(-)polarssl13/files/patch-library-asn1parse_c (-11 lines)
1	--- library/asn1parse.c.orig 2015-01-20 10:12:00.469677333 +0000
2	+++ library/asn1parse.c 2015-01-20 10:14:00.764667419 +0000
3	@@ -278,6 +278,8 @@
4	if( cur->next == NULL )
5	return( POLARSSL_ERR_ASN1_MALLOC_FAILED );
6
7	+ memset( cur->next, 0, sizeof( asn1_sequence ) );
8	+
9	cur = cur->next;
10	}
11	}




bin/polarssl_ssl_client2
bin/polarssl_ssl_server
bin/polarssl_ssl_test
include/polarssl/aes.h
include/polarssl/aesni.h
include/polarssl/ccm.h
include/polarssl/check_config.h
include/polarssl/compat-1.2.h
include/polarssl/ecdh.h
include/polarssl/ecdsa.h
include/polarssl/ecp.h
include/polarssl/hmac_drbg.h
include/polarssl/memory.h
include/polarssl/memory_buffer_alloc.h
include/polarssl/oid.h
include/polarssl/pk.h
include/polarssl/pk_wrap.h
include/polarssl/platform.h
include/polarssl/ripemd160.h
include/polarssl/sha256.h
include/polarssl/sha512.h
include/polarssl/ssl_ciphersuites.h
include/polarssl/threading.h
include/polarssl/x509_crl.h
include/polarssl/x509_crt.h
include/polarssl/x509_csr.h
lib/libpolarssl.so.7
include/polarssl/aes.h
include/polarssl/arc4.h
include/polarssl/asn1.h
include/polarssl/asn1write.h

include/polarssl/blowfish.h
include/polarssl/bn_mul.h
include/polarssl/camellia.h
include/polarssl/ccm.h
include/polarssl/certs.h
include/polarssl/check_config.h
include/polarssl/cipher.h
include/polarssl/cipher_wrap.h
include/polarssl/compat-1.2.h
include/polarssl/config.h
include/polarssl/ctr_drbg.h
include/polarssl/debug.h
include/polarssl/des.h
include/polarssl/dhm.h
include/polarssl/ecdh.h
include/polarssl/ecdsa.h
include/polarssl/ecp.h
include/polarssl/entropy.h
include/polarssl/entropy_poll.h
include/polarssl/error.h
include/polarssl/gcm.h
include/polarssl/havege.h
include/polarssl/hmac_drbg.h
include/polarssl/md.h
include/polarssl/md2.h
include/polarssl/md4.h
include/polarssl/md5.h
include/polarssl/md_wrap.h
include/polarssl/memory.h
include/polarssl/memory_buffer_alloc.h
include/polarssl/net.h
include/polarssl/oid.h
include/polarssl/openssl.h
include/polarssl/padlock.h
include/polarssl/pbkdf2.h
include/polarssl/pem.h
include/polarssl/pk.h
include/polarssl/pk_wrap.h
include/polarssl/pkcs11.h
include/polarssl/pkcs12.h
include/polarssl/pkcs5.h
include/polarssl/platform.h
include/polarssl/ripemd160.h
include/polarssl/rsa.h
include/polarssl/sha1.h
include/polarssl/sha256.h
include/polarssl/sha512.h
include/polarssl/ssl.h
include/polarssl/ssl_cache.h
include/polarssl/ssl_ciphersuites.h
include/polarssl/threading.h
include/polarssl/timing.h
include/polarssl/version.h
include/polarssl/x509.h
include/polarssl/x509_crl.h
include/polarssl/x509_crt.h
include/polarssl/x509_csr.h
include/polarssl/xtea.h
lib/libpolarssl.a
lib/libpolarssl.so
lib/libpolarssl.so.8
lib/libmbedtls.so
lib/libmbedtls.so.8
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/README.rst
%%PORTDOCS%%%%DOCSDIR%%/LICENSE

Return to bug 197779

Lines 1-12 Link Here

(-)polarssl13/Makefile (-8 / +11 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= polarssl	3	PORTNAME= polarssl
4	PORTVERSION= 1.3.9	4	PORTVERSION= 1.3.10
5	PORTREVISION= 1
6	DISTVERSIONSUFFIX= -gpl	5	DISTVERSIONSUFFIX= -gpl
		6	#PORTREVISION= 1
7	CATEGORIES= security devel	7	CATEGORIES= security devel
8	MASTER_SITES= http://polarssl.org/download/	8	MASTER_SITES= https://polarssl.org/download/
9	PKGNAMESUFFIX= 13	9	PKGNAMESUFFIX= 13
		10	DISTNAME= mbedtls-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
10		11
11	MAINTAINER= chris@bsdjunk.com	12	MAINTAINER= chris@bsdjunk.com
12	COMMENT= Open Source embedded SSL/TLS cryptographic library	13	COMMENT= Open Source embedded SSL/TLS cryptographic library
Lines 15-24 Link Here
15		16
16	ALL_TARGET= no_test	17	ALL_TARGET= no_test
17		18
18	USES= cpe gmake tar:tgz	19	USES= cpe gmake tar:tgz
19	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
20		21
21	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	22	WRKSRC= ${WRKDIR}/mbedtls-${PORTVERSION}
22		23
23	CONFLICTS= polarssl-[0-9]*	24	CONFLICTS= polarssl-[0-9]*
24		25
Lines 32-40 Link Here
32	do-install:	33	do-install:
33	@cd ${WRKSRC}/include && ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PREFIX}/include "! -name *.orig"	34	@cd ${WRKSRC}/include && ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PREFIX}/include "! -name *.orig"
34	${INSTALL_DATA} ${WRKSRC}/library/libpolarssl.a ${STAGEDIR}${PREFIX}/lib/	35	${INSTALL_DATA} ${WRKSRC}/library/libpolarssl.a ${STAGEDIR}${PREFIX}/lib/
35	${INSTALL_DATA} ${WRKSRC}/library/libpolarssl.so ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.7	36	${INSTALL_DATA} ${WRKSRC}/library/libpolarssl.so ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.8
36	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.7	37	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.8
37	cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libpolarssl.so.7 libpolarssl.so	38	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libpolarssl.so.8 libpolarssl.so)
		39	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libpolarssl.so.8 libmbedtls.so.8)
		40	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libmbedtls.so.8 libmbedtls.so)
38	.for i in ${BINFILES}	41	.for i in ${BINFILES}
39	${INSTALL_PROGRAM} ${WRKSRC}/programs/*/${i} ${STAGEDIR}${PREFIX}/bin/polarssl_${i}	42	${INSTALL_PROGRAM} ${WRKSRC}/programs/*/${i} ${STAGEDIR}${PREFIX}/bin/polarssl_${i}
40	.endfor	43	.endfor

Lines 1-5 Link Here

(-)polarssl13/files/patch-library-Makefile (-5 / +4 lines)
1	--- library/Makefile.old 2014-11-28 16:02:22.000000000 +0000	1	--- library/Makefile.orig 2015-02-11 01:00:42.000000000 +0900
2	+++ library/Makefile 2014-11-28 16:03:01.000000000 +0000	2	+++ library/Makefile 2015-02-18 12:47:25.000000000 +0900
3	@@ -18,9 +18,7 @@	3	@@ -18,9 +18,7 @@
4	# CFLAGS += -D_BSD_EXTENSION	4	# CFLAGS += -D_BSD_EXTENSION
5		5
Lines 8-14 Link Here
8	CFLAGS += -fPIC	8	CFLAGS += -fPIC
9	-endif	9	-endif
10		10
11	SONAME=libpolarssl.so.7	11	SONAME=libmbedtls.so.8
12		12
13	@@ -65,11 +63,7 @@	13	@@ -65,11 +63,7 @@
14		14
Lines 17-25 Link Here
17	-ifndef SHARED	17	-ifndef SHARED
18	-all: static	18	-all: static
19	-else	19	-else
20	-all: shared	20	all: shared static
21	-endif	21	-endif
22	+all: shared static
23		22
24	static: libpolarssl.a	23	static: libpolarssl.a
25		24

Lines 17-46 Link Here

(-)polarssl13/pkg-plist (-24 / +26 lines)
17	bin/polarssl_ssl_client2	17	bin/polarssl_ssl_client2
18	bin/polarssl_ssl_server	18	bin/polarssl_ssl_server
19	bin/polarssl_ssl_test	19	bin/polarssl_ssl_test
		20	include/polarssl/aes.h
20	include/polarssl/aesni.h	21	include/polarssl/aesni.h
21	include/polarssl/ccm.h
22	include/polarssl/check_config.h
23	include/polarssl/compat-1.2.h
24	include/polarssl/ecdh.h
25	include/polarssl/ecdsa.h
26	include/polarssl/ecp.h
27	include/polarssl/hmac_drbg.h
28	include/polarssl/memory.h
29	include/polarssl/memory_buffer_alloc.h
30	include/polarssl/oid.h
31	include/polarssl/pk.h
32	include/polarssl/pk_wrap.h
33	include/polarssl/platform.h
34	include/polarssl/ripemd160.h
35	include/polarssl/sha256.h
36	include/polarssl/sha512.h
37	include/polarssl/ssl_ciphersuites.h
38	include/polarssl/threading.h
39	include/polarssl/x509_crl.h
40	include/polarssl/x509_crt.h
41	include/polarssl/x509_csr.h
42	lib/libpolarssl.so.7
43	include/polarssl/aes.h
44	include/polarssl/arc4.h	22	include/polarssl/arc4.h
45	include/polarssl/asn1.h	23	include/polarssl/asn1.h
46	include/polarssl/asn1write.h	24	include/polarssl/asn1write.h
Lines 49-90 Link Here
49	include/polarssl/blowfish.h	27	include/polarssl/blowfish.h
50	include/polarssl/bn_mul.h	28	include/polarssl/bn_mul.h
51	include/polarssl/camellia.h	29	include/polarssl/camellia.h
		30	include/polarssl/ccm.h
52	include/polarssl/certs.h	31	include/polarssl/certs.h
		32	include/polarssl/check_config.h
53	include/polarssl/cipher.h	33	include/polarssl/cipher.h
54	include/polarssl/cipher_wrap.h	34	include/polarssl/cipher_wrap.h
		35	include/polarssl/compat-1.2.h
55	include/polarssl/config.h	36	include/polarssl/config.h
56	include/polarssl/ctr_drbg.h	37	include/polarssl/ctr_drbg.h
57	include/polarssl/debug.h	38	include/polarssl/debug.h
58	include/polarssl/des.h	39	include/polarssl/des.h
59	include/polarssl/dhm.h	40	include/polarssl/dhm.h
		41	include/polarssl/ecdh.h
		42	include/polarssl/ecdsa.h
		43	include/polarssl/ecp.h
60	include/polarssl/entropy.h	44	include/polarssl/entropy.h
61	include/polarssl/entropy_poll.h	45	include/polarssl/entropy_poll.h
62	include/polarssl/error.h	46	include/polarssl/error.h
63	include/polarssl/gcm.h	47	include/polarssl/gcm.h
64	include/polarssl/havege.h	48	include/polarssl/havege.h
		49	include/polarssl/hmac_drbg.h
65	include/polarssl/md.h	50	include/polarssl/md.h
66	include/polarssl/md2.h	51	include/polarssl/md2.h
67	include/polarssl/md4.h	52	include/polarssl/md4.h
68	include/polarssl/md5.h	53	include/polarssl/md5.h
69	include/polarssl/md_wrap.h	54	include/polarssl/md_wrap.h
		55	include/polarssl/memory.h
		56	include/polarssl/memory_buffer_alloc.h
70	include/polarssl/net.h	57	include/polarssl/net.h
		58	include/polarssl/oid.h
71	include/polarssl/openssl.h	59	include/polarssl/openssl.h
72	include/polarssl/padlock.h	60	include/polarssl/padlock.h
		61	include/polarssl/pbkdf2.h
73	include/polarssl/pem.h	62	include/polarssl/pem.h
74	include/polarssl/pbkdf2.h	63	include/polarssl/pk.h
		64	include/polarssl/pk_wrap.h
75	include/polarssl/pkcs11.h	65	include/polarssl/pkcs11.h
76	include/polarssl/pkcs12.h	66	include/polarssl/pkcs12.h
77	include/polarssl/pkcs5.h	67	include/polarssl/pkcs5.h
		68	include/polarssl/platform.h
		69	include/polarssl/ripemd160.h
78	include/polarssl/rsa.h	70	include/polarssl/rsa.h
79	include/polarssl/sha1.h	71	include/polarssl/sha1.h
		72	include/polarssl/sha256.h
		73	include/polarssl/sha512.h
80	include/polarssl/ssl.h	74	include/polarssl/ssl.h
81	include/polarssl/ssl_cache.h	75	include/polarssl/ssl_cache.h
		76	include/polarssl/ssl_ciphersuites.h
		77	include/polarssl/threading.h
82	include/polarssl/timing.h	78	include/polarssl/timing.h
83	include/polarssl/version.h	79	include/polarssl/version.h
84	include/polarssl/x509.h	80	include/polarssl/x509.h
		81	include/polarssl/x509_crl.h
		82	include/polarssl/x509_crt.h
		83	include/polarssl/x509_csr.h
85	include/polarssl/xtea.h	84	include/polarssl/xtea.h
86	lib/libpolarssl.a	85	lib/libpolarssl.a
87	lib/libpolarssl.so	86	lib/libpolarssl.so
		87	lib/libpolarssl.so.8
		88	lib/libmbedtls.so
		89	lib/libmbedtls.so.8
88	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog	90	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
89	%%PORTDOCS%%%%DOCSDIR%%/README.rst	91	%%PORTDOCS%%%%DOCSDIR%%/README.rst
90	%%PORTDOCS%%%%DOCSDIR%%/LICENSE	92	%%PORTDOCS%%%%DOCSDIR%%/LICENSE