Bug 175820 - [PATCH] security/nacl: [SUMMARIZE CHANGES]
Summary: [PATCH] security/nacl: [SUMMARIZE CHANGES]
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: David Thiel
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-02-04 10:10 UTC by Gasol Wu
Modified: 2013-02-27 00:10 UTC (History)
1 user (show)

See Also:


Attachments
nacl-20110221_1.patch (1.25 KB, patch)
2013-02-04 10:10 UTC, Gasol Wu
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Gasol Wu 2013-02-04 10:10:05 UTC
* Add randombytes.o to the libnacl.a archive [1]
* Add -fPIC
* Remove some implementations that do not want to be relocatable [2]
* New header
* Convert YES to lowercase

references:
1. https://github.com/mxcl/homebrew/blob/master/Library/Formula/nacl.rb
2. https://gist.github.com/4437587

Port maintainer (lx@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-02-04 10:10:18 UTC
Responsible Changed
From-To: freebsd-ports-bugs->lx

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-02-26 23:59:39 UTC
Author: lx
Date: Tue Feb 26 23:59:25 2013
New Revision: 313014
URL: http://svnweb.freebsd.org/changeset/ports/313014

Log:
  - Add randombytes.o to the libnacl.a archive
  - Add -fPIC
  
  PR:	ports/175820
  Submitted by:	Gasol Wu

Modified:
  head/security/nacl/Makefile

Modified: head/security/nacl/Makefile
==============================================================================
--- head/security/nacl/Makefile	Tue Feb 26 23:52:39 2013	(r313013)
+++ head/security/nacl/Makefile	Tue Feb 26 23:59:25 2013	(r313014)
@@ -1,12 +1,10 @@
-# New ports collection makefile for:	nacl
-# Date created:		2011-10-03
-# Whom:			David Thiel <lx@FreeBSD.org>
-#
+# Created by: David Thiel <lx@FreeBSD.org>
 # $FreeBSD$
 #
 
 PORTNAME=	nacl
 PORTVERSION=	20110221
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://hyperelliptic.org/nacl/
 
@@ -14,8 +12,9 @@ MAINTAINER=	lx@FreeBSD.org
 COMMENT=	High speed cryptography library
 
 ALL_TARGET=	do
-USE_BZIP2=	YES
-MAKE_JOBS_UNSAFE=	YES
+USE_BZIP2=	yes
+USE_BINUTILS=	yes
+MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -23,30 +22,48 @@ MAKE_JOBS_UNSAFE=	YES
 BROKEN=		Does not compile on ia64, powerpc, or sparc64
 .endif
 
-HOSTNAME_CMD?=	/bin/hostname
+HOSTNAME_CMD?=	/bin/hostname -s
+
+post-patch:
+	@${REINPLACE_CMD} -i -e "s/$$/ -fPIC/" ${WRKSRC}/okcompilers/c
+
+pre-build:
+	${RM} -rf ${WRKSRC}/crypto_onetimeauth/poly1305/amd64
 
 do-build:
 	cd ${WRKSRC} && ./do
 
+post-build:
+.if ${ARCH} == "i386"
+	${AR} -r ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/x86/libnacl.a \
+		${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/x86/randombytes.o
+.elif ${ARCH} == "powerpc"
+	${AR} -r ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/ppc/libnacl.a \
+		${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/ppc/randombytes.o
+.else
+	${AR} -r ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/${ARCH}/libnacl.a \
+		${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/${ARCH}/randombytes.o
+.endif
+
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/bin/nacl-sha256 \
 		${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/bin/nacl-sha512 \
 		${PREFIX}/bin
 .if ${ARCH} == "i386"
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/lib/x86/* \
+	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/x86/* \
 		${PREFIX}/lib
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/include/x86/* \
+	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/include/x86/* \
 		${PREFIX}/include
 .elif ${ARCH} == "powerpc"
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/lib/ppc/* \
+	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/ppc/* \
 		${PREFIX}/lib
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/include/ppc/* \
+	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/include/ppc/* \
 		${PREFIX}/include
 .else
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/lib/${ARCH}/* \
+	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/lib/${ARCH}/* \
 		${PREFIX}/lib
-	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD} -s`/include/${ARCH}/* \
+	@${INSTALL_DATA} ${WRKSRC}/build/`${HOSTNAME_CMD}`/include/${ARCH}/* \
 		${PREFIX}/include
 .endif
 
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 David Thiel freebsd_committer freebsd_triage 2013-02-26 23:59:40 UTC
State Changed
From-To: open->closed

Committed with alterations (need to use hostname -s). Thanks!