svn commit: r378518 - in head/security/hpenc: . files

[Vsevolod Stakhov]

Author: vsevolod
Date: Fri Feb  6 09:59:17 2015
New Revision: 378518
URL: https://svnweb.freebsd.org/changeset/ports/378518
QAT: https://qat.redports.org/buildarchive/r378518/

Log:
  - Fix assembler opcodes on i386
  - Fix build on FreeBSD < 10
  - Do not bump revision since this only affects broken systems

Added:
  head/security/hpenc/files/
  head/security/hpenc/files/patch-poly1305-i386-asm   (contents, props changed)
Modified:
  head/security/hpenc/Makefile

Modified: head/security/hpenc/Makefile
==============================================================================
--- head/security/hpenc/Makefile	Fri Feb  6 09:44:48 2015	(r378517)
+++ head/security/hpenc/Makefile	Fri Feb  6 09:59:17 2015	(r378518)
@@ -20,7 +20,13 @@ CXXFLAGS+=	-std=c++11 \
 			-I${WRKSRC}/poly1305-opt/app/include
 LDFLAGS+=	-pthread -lcrypto
 
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000036
+WITH_OPENSSL_PORT=	yes
+.endif
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hpenc
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Added: head/security/hpenc/files/patch-poly1305-i386-asm
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/hpenc/files/patch-poly1305-i386-asm	Fri Feb  6 09:59:17 2015	(r378518)
@@ -0,0 +1,22 @@
+--- poly1305-opt/app/extensions/poly1305/poly1305_avx-32.inc
++++ poly1305-opt/app/extensions/poly1305/poly1305_avx-32.inc
+@@ -7,7 +7,7 @@ FN_END poly1305_block_size_avx
+ 
+ 
+ GLOBAL_HIDDEN_FN poly1305_auth_avx
++cmpl $64, 12(%esp)
+-cmp $64, 12(%esp)
+ jbe poly1305_auth_x86_local
+ pushl %ebp
+ movl %esp, %ebp
+--- poly1305-opt/app/extensions/poly1305/poly1305_avx2-32.inc
++++ poly1305-opt/app/extensions/poly1305/poly1305_avx2-32.inc
+@@ -8,7 +8,7 @@ FN_END poly1305_block_size_avx2
+ 
+ 
+ GLOBAL_HIDDEN_FN poly1305_auth_avx2
++cmpl $64, 12(%esp)
+-cmp $64, 12(%esp)
+ jbe poly1305_auth_x86_local
+ pushl %ebp
+ movl %esp, %ebp