Attachment 144439 Details for Bug 190848 – patch from redports build

patch from redports build

changeset_28894.diff (text/plain), 5.65 KB, created by Sean Bruno on 2014-07-05 23:02:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sean Bruno

Created: 2014-07-05 23:02:56 UTC

Size: 5.65 KB

patch

obsolete

>Index: /sbruno/security/libgcrypt/Makefile
>===================================================================
>--- /sbruno/security/libgcrypt/Makefile	(revision 28893)
>+++ /sbruno/security/libgcrypt/Makefile	(revision 28894)
>@@ -1,57 +1,54 @@
> # Created by: Tilman Linneweh <arved@FreeBSD.org>
> # $FreeBSD: head/security/libgcrypt/Makefile 351936 2014-04-23 13:25:16Z tijl $
> 
> PORTNAME=	libgcrypt
> PORTVERSION=	1.5.3
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	security
> MASTER_SITES=	${MASTER_SITE_GNUPG}
> MASTER_SITE_SUBDIR=	${PORTNAME}
> 
> MAINTAINER=	umq@ueo.co.jp
> COMMENT=	General purpose crypto library based on code used in GnuPG
> 
> LICENSE=	GPLv2 LGPL21
> LICENSE_COMB=	multi
> 
> BUILD_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
> RUN_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
> 
> USES=		libtool:oldver tar:bzip2
> USE_CSTD=	gnu89
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
> USE_LDCONFIG=	yes
> 
> DOCS=		AUTHORS ChangeLog ChangeLog-2011 INSTALL NEWS README \
> 		README.GIT THANKS TODO doc/HACKING doc/README.apichanges
> INFO=		gcrypt
> PORTDOCS=	*
> 
> .include <bsd.port.options.mk>
> 
> .if ${ARCH} == "powerpc"
> CONFIGURE_ARGS+=	--disable-asm
> 
>-.elif ${ARCH} == "armv6"
>-USE_GCC=	any
>-
> .elif ${ARCH} == "i386"
> .if (${OSVERSION} < 900033)
> CONFIGURE_ARGS+=	--disable-aesni-support
> .endif
> .endif
> 
> post-patch:
> 	@${RM} -f ${WRKSRC}/doc/gcrypt.info*
> 
> .if ${PORT_OPTIONS:MDOCS}
> post-install:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
> .endif
> 
> regression-test: build
> 	cd ${WRKSRC} && ${MAKE_CMD} check
> 
> .include <bsd.port.mk>
>Index: /sbruno/security/libgcrypt/files/patch-mpi-longlong.h
>===================================================================
>--- /sbruno/security/libgcrypt/files/patch-mpi-longlong.h	(revision 28893)
>+++ /sbruno/security/libgcrypt/files/patch-mpi-longlong.h	(revision 28894)
>@@ -1,22 +1,59 @@
>---- ./mpi/longlong.h.orig	2010-02-22 19:04:43.000000000 +0900
>-+++ ./mpi/longlong.h	2010-11-01 18:25:34.000000000 +0900
>+--- ./mpi/longlong.h.orig	2013-07-25 09:10:04.000000000 +0000
>++++ ./mpi/longlong.h	2014-06-09 18:53:59.000000000 +0000
>+@@ -188,8 +188,8 @@
>+ #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
>+   __asm__ ("adds %1, %4, %5\n"                                          \
>+ 	   "adc  %0, %2, %3"                                            \
>+-	   : "=r" ((USItype)(sh)),                                      \
>+-	     "=&r" ((USItype)(sl))                                      \
>++	   : "=r" ((sh)),                                               \
>++	     "=&r" ((sl))                                               \
>+ 	   : "%r" ((USItype)(ah)),                                      \
>+ 	     "rI" ((USItype)(bh)),                                      \
>+ 	     "%r" ((USItype)(al)),                                      \
>+@@ -197,8 +197,8 @@
>+ #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
>+   __asm__ ("subs %1, %4, %5\n"                                          \
>+ 	   "sbc  %0, %2, %3"                                            \
>+-	   : "=r" ((USItype)(sh)),                                      \
>+-	     "=&r" ((USItype)(sl))                                      \
>++	   : "=r" ((sh)),                                               \
>++	     "=&r" ((sl))                                               \
>+ 	   : "r" ((USItype)(ah)),                                       \
>+ 	     "rI" ((USItype)(bh)),                                      \
>+ 	     "r" ((USItype)(al)),                                       \
>+@@ -225,10 +225,10 @@
>+ 	   : "r0", "r1", "r2")
>+ #else
>+ #define umul_ppmm(xh, xl, a, b)                                         \
>+-  __asm__ ("%@ Inlined umul_ppmm\n"                                     \
>+-	   "umull %r1, %r0, %r2, %r3"                                   \
>+-		   : "=&r" ((USItype)(xh)),                             \
>+-		     "=r" ((USItype)(xl))                               \
>++  __asm__ (                                                             \
>++	   "umull %1, %0, %2, %3"                                       \
>++		   : "=&r" ((xh)),                                      \
>++		     "=r" ((xl))                                        \
>+ 		   : "r" ((USItype)(a)),                                \
>+ 		     "r" ((USItype)(b))                                 \
>+ 		   : "r0", "r1")
> @@ -437,8 +437,8 @@
>  #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
>    __asm__ ("addl %5,%1\n"                                               \
>  	   "adcl %3,%0"                                                 \
> -	   : "=r" ((USItype)(sh)),                                      \
> -	     "=&r" ((USItype)(sl))                                      \
> +	   : "=r" (sh),                                                 \
> +	     "=&r" (sl)                                                 \
>  	   : "%0" ((USItype)(ah)),                                      \
>  	     "g" ((USItype)(bh)),                                       \
>  	     "%1" ((USItype)(al)),                                      \
> @@ -446,22 +446,22 @@
>  #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
>    __asm__ ("subl %5,%1\n"                                               \
>  	   "sbbl %3,%0"                                                 \
> -	   : "=r" ((USItype)(sh)),                                      \
> -	     "=&r" ((USItype)(sl))                                      \
> +	   : "=r" (sh),                                                 \
> +	     "=&r" (sl)                                                 \
>  	   : "0" ((USItype)(ah)),                                       \

Actions: View

Attachments on bug 190848: 143583 | 144439