svn commit: r378572 - in head/security/libgcrypt: . files

[Kurt Jaeger]

Author: pi
Date: Sat Feb  7 07:25:22 2015
New Revision: 378572
URL: https://svnweb.freebsd.org/changeset/ports/378572
QAT: https://qat.redports.org/buildarchive/r378572/

Log:
  security/libgcrypt: fix some issues
  
  - Fix crash at cipher/salsa20.c module on amd64.
  - Fix strip shared object.
  - Bump PORTREVISION.
  
  PR:		197146
  Submitted by:	cpm at fbsd.es (maintainer)

Added:
  head/security/libgcrypt/files/patch-cipher-Makefile.in   (contents, props changed)
Modified:
  head/security/libgcrypt/Makefile

Modified: head/security/libgcrypt/Makefile
==============================================================================
--- head/security/libgcrypt/Makefile	Sat Feb  7 00:09:35 2015	(r378571)
+++ head/security/libgcrypt/Makefile	Sat Feb  7 07:25:22 2015	(r378572)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libgcrypt
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,7 +22,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-drng-support
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
-INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 DOCS=		AUTHORS ChangeLog ChangeLog-2011 INSTALL NEWS README \
@@ -53,8 +53,15 @@ USE_GCC=	any
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
+# Fix crash at cipher/salsa20.c module on amd64
+.if ${ARCH} == "amd64" && exists(/usr/bin/clang)
+CFLAGS:=	${CFLAGS:N-O*} -O2
+.endif
+
 post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so.20.0.2
+
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 .endif

Added: head/security/libgcrypt/files/patch-cipher-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/libgcrypt/files/patch-cipher-Makefile.in	Sat Feb  7 07:25:22 2015	(r378572)
@@ -0,0 +1,15 @@
+--- cipher/Makefile.in.orig	2015-01-21 19:09:47.000000000 +0100
++++ cipher/Makefile.in	2015-01-21 19:13:35.000000000 +0100
+@@ -766,6 +766,12 @@
+ tiger.lo: $(srcdir)/tiger.c
+ 	`echo $(LTCOMPILE) -c $(srcdir)/tiger.c | $(o_flag_munging) `
+ 
++salsa20.o: $(srcdir)/salsa20.c
++	`echo $(COMPILE) -c $(srcdir)/salsa20.c | $(o_flag_munging) `
++
++salsa20.lo: $(srcdir)/salsa20.c
++	`echo $(LTCOMPILE) -c $(srcdir)/salsa20.c | $(o_flag_munging) `
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: