Merge pull request #89 from matsimon/openssl-sync

pfPorts/openssl: Sync w. upstream ports r311178, really fixes PADLOCK
bcyrill · Feb 4, 2013 · 3ea12a7 · 3ea12a7
2 parents adc8bdf + ef9270a
commit 3ea12a7
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 23 deletions.
diff --git a/pfPorts/openssl/Makefile b/pfPorts/openssl/Makefile
@@ -1,20 +1,16 @@
-# New ports collection makefile for:	OpenSSL
-# Date created:		Sun Jan  3 19:36:27 CET 1999
-# Whom:			Dirk Froemberg <dirk@FreeBSD.org>
-#
-# $FreeBSD: head/security/openssl/Makefile 301679 2012-07-29 08:36:47Z dinoex $
-#
+# Created by: Dirk Froemberg <dirk@FreeBSD.org>
+# $FreeBSD$
 
 PORTNAME=	openssl
 PORTVERSION=	1.0.1
 DISTVERSIONSUFFIX=	c
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/%SUBDIR%/ \
 		ftp://ftp.openssl.org/%SUBDIR%/ \
 		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/%SUBDIR%/
 MASTER_SITE_SUBDIR=	source
-DIST_SUBDIR=	${DISTNAME}
+DIST_SUBDIR=	${DISTNAME}2
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	SSL and crypto library
@@ -27,6 +23,15 @@ BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
 
 OPTIONS_DEFINE=	SHARED THREADS I386 SSE2 ASM PADLOCK ZLIB SCTP MD2 RC5 RFC3779 GMP
 OPTIONS_DEFAULT=SHARED THREADS SSE2 ASM PADLOCK ZLIB SCTP MD2
+.for a in amd64 ia64
+OPTIONS_DEFINE_${a}=	EC
+OPTIONS_DEFAULT_${a}=	EC
+.endfor
+TARGET_ARCH?=	${MACHINE_ARCH}
+.if ${TARGET_ARCH} == "mips64el"
+OPTIONS_DEFINE_mips=	EC
+OPTIONS_DEFAULT_mips=	EC
+.endif
 NO_OPTIONS_SORT=yes
 I386_DESC?=	Optimize for i386 (instead of i486+)
 SSE2_DESC?=	runtime SSE2 detection
@@ -39,6 +44,7 @@ MD2_DESC?=	MD2 hash (obsolete)
 RC5_DESC?=	RC5 chipher (patented)
 RFC3779_DESC?=	RFC3779 support
 GMP_DESC?=	gmp support (LGPLv3)
+EC_DESC?=	Optimize NIST elliptic curves
 
 MAKE_JOBS_UNSAFE=	yes
 NOPRECIOUSMAKEVARS=	Too many _MLINKS for fetch
@@ -47,6 +53,7 @@ NOPRECIOUSSOFTMAKEVARS=	Too many _MLINKS for fetch
 USE_PERL5_BUILD=	yes
 MAKE_ARGS+=		WHOLE_ARCHIVE_FLAG=--whole-archive
 MAKE_ENV+=		LIBRPATH="${PREFIX}/lib"
+SUB_FILES=		pkg-message
 OPENSSLDIR=		${PREFIX}/openssl
 MANPREFIX=		${PREFIX}
 
@@ -1132,6 +1139,12 @@ EXTRACONFIGURE+=	enable-rfc3779
 EXTRACONFIGURE+=	no-rfc3779
 .endif
 
+.if ${PORT_OPTIONS:MEC}
+EXTRACONFIGURE+=	enable-ec_nistp_64_gcc_128
+.else
+EXTRACONFIGURE+=	no-ec_nistp_64_gcc_128
+.endif
+
 .if ${OPENSSL_SHLIBVER_BASE} > ${OPENSSL_SHLIBVER}
 pre-everything::
 	@${ECHO_CMD} "#"
@@ -1177,7 +1190,7 @@ post-install:
 	@${LN} -sf $i.so.${OPENSSL_SHLIBVER} ${PREFIX}/lib/$i.so
 .endfor
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/openssl.txt ${DOCSDIR}/
 .endif

diff --git a/pfPorts/openssl/distinfo b/pfPorts/openssl/distinfo
@@ -1,10 +1,10 @@
-SHA256 (openssl-1.0.1c/openssl-1.0.1c.tar.gz) = 2a9eb3cd4e8b114eb9179c0d3884d61658e7d8e8bf4984798a5f5bd48e325ebe
-SIZE (openssl-1.0.1c/openssl-1.0.1c.tar.gz) = 4457113
-SHA256 (openssl-1.0.1c/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 18dd81fefb39b3328a444774ed10871ed50348ca171d2da9f826f916127b2dae
-SIZE (openssl-1.0.1c/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3512
-SHA256 (openssl-1.0.1c/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 39c31c2e33cded09543a2d1fd2e3238e9d11c672ba71a14d13095baad3ec9696
-SIZE (openssl-1.0.1c/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 5867
-SHA256 (openssl-1.0.1c/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = e59f86fb779d327479fa97506c6d0d2df44b97f8182b45ca2eefebe9bef44b8d
-SIZE (openssl-1.0.1c/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20593
-SHA256 (openssl-1.0.1c/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f
-SIZE (openssl-1.0.1c/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 777
+SHA256 (openssl-1.0.1c2/openssl-1.0.1c.tar.gz) = 2a9eb3cd4e8b114eb9179c0d3884d61658e7d8e8bf4984798a5f5bd48e325ebe
+SIZE (openssl-1.0.1c2/openssl-1.0.1c.tar.gz) = 4457113
+SHA256 (openssl-1.0.1c2/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 18dd81fefb39b3328a444774ed10871ed50348ca171d2da9f826f916127b2dae
+SIZE (openssl-1.0.1c2/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3512
+SHA256 (openssl-1.0.1c2/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 39c31c2e33cded09543a2d1fd2e3238e9d11c672ba71a14d13095baad3ec9696
+SIZE (openssl-1.0.1c2/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 5867
+SHA256 (openssl-1.0.1c2/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = e59f86fb779d327479fa97506c6d0d2df44b97f8182b45ca2eefebe9bef44b8d
+SIZE (openssl-1.0.1c2/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20593
+SHA256 (openssl-1.0.1c2/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f
+SIZE (openssl-1.0.1c2/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 777
diff --git a/pfPorts/openssl/files/pkg-message.in b/pfPorts/openssl/files/pkg-message.in
@@ -0,0 +1,4 @@
+
+Copy %%PREFIX%%/openssl/openssl.cnf.sample to %%PREFIX%%/openssl/openssl.cnf
+and edit it to fit your needs.
+
diff --git a/pfPorts/openssl/pkg-message b/pfPorts/openssl/pkg-message