Attachment 144455 Details for Bug 191256 – libgcrypt-1.6.1.diff

[patch] libgcrypt-1.6.1.diff

libgcrypt-1.6.1.diff (text/plain), 17.33 KB, created by Carlos J Puga Medina on 2014-07-06 12:53:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J Puga Medina

Created: 2014-07-06 12:53:49 UTC

Size: 17.33 KB

patch

obsolete

>diff -urN /usr/ports/security/libgcrypt.old/Makefile /usr/ports/security/libgcrypt/Makefile
>--- /usr/ports/security/libgcrypt.old/Makefile	2014-06-25 10:58:09.000000000 +0200
>+++ /usr/ports/security/libgcrypt/Makefile	2014-07-06 13:42:05.000000000 +0200
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/security/libgcrypt/Makefile 359209 2014-06-25 08:58:09Z bapt $
> 
> PORTNAME=	libgcrypt
>-PORTVERSION=	1.5.3
>-PORTREVISION=	2
>+PORTVERSION=	1.6.1
> CATEGORIES=	security
> MASTER_SITES=	${MASTER_SITE_GNUPG}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -47,6 +46,7 @@
> 
> .if ${PORT_OPTIONS:MDOCS}
> post-install:
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgcrypt.so.20
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
> .endif
>diff -urN /usr/ports/security/libgcrypt.old/distinfo /usr/ports/security/libgcrypt/distinfo
>--- /usr/ports/security/libgcrypt.old/distinfo	2013-08-17 09:56:12.000000000 +0200
>+++ /usr/ports/security/libgcrypt/distinfo	2014-07-06 13:42:16.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (libgcrypt-1.5.3.tar.bz2) = bcf5334e7da352c45de6aec5d2084ce9a1d30029ff4a4a5da13f1848874759d1
>-SIZE (libgcrypt-1.5.3.tar.bz2) = 1508530
>+SHA256 (libgcrypt-1.6.1.tar.bz2) = a1c3efea69f8ffe769f488b300ce190eeeb0c30de24a53f1c1b6e4202fdc2070
>+SIZE (libgcrypt-1.6.1.tar.bz2) = 2470885
>diff -urN /usr/ports/security/libgcrypt.old/files/patch-cipher-rijndael.c /usr/ports/security/libgcrypt/files/patch-cipher-rijndael.c
>--- /usr/ports/security/libgcrypt.old/files/patch-cipher-rijndael.c	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/security/libgcrypt/files/patch-cipher-rijndael.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,61 +0,0 @@
>---- cipher/rijndael.c.orig	2011-02-22 15:57:59.000000000 +0100
>-+++ cipher/rijndael.c	2011-07-26 08:38:07.000000000 +0200
>-@@ -844,13 +844,13 @@ do_aesni_cfb (const RIJNDAEL_context *ct
>-                 "movdqa 0x90(%%esi), %%xmm1\n\t"
>-                 aesenc_xmm1_xmm0
>-                 "movdqa 0xa0(%%esi), %%xmm1\n\t"
>--                "cmp $10, %[rounds]\n\t"
>-+                "cmpl $10, %[rounds]\n\t"
>-                 "jz .Lenclast%=\n\t"
>-                 aesenc_xmm1_xmm0
>-                 "movdqa 0xb0(%%esi), %%xmm1\n\t"
>-                 aesenc_xmm1_xmm0
>-                 "movdqa 0xc0(%%esi), %%xmm1\n\t"
>--                "cmp $12, %[rounds]\n\t"
>-+                "cmpl $12, %[rounds]\n\t"
>-                 "jz .Lenclast%=\n\t"
>-                 aesenc_xmm1_xmm0
>-                 "movdqa 0xd0(%%esi), %%xmm1\n\t"
>-@@ -862,7 +862,7 @@ do_aesni_cfb (const RIJNDAEL_context *ct
>-                 "movdqu %[src], %%xmm1\n\t"      /* Save input.  */
>-                 "pxor %%xmm1, %%xmm0\n\t"        /* xmm0 = input ^ IV  */
>- 
>--                "cmp $1, %[decrypt]\n\t"
>-+                "cmpl $1, %[decrypt]\n\t"
>-                 "jz .Ldecrypt_%=\n\t"
>-                 "movdqa %%xmm0, %[iv]\n\t"       /* [encrypt] Store IV.  */
>-                 "jmp .Lleave_%=\n"
>-@@ -923,13 +923,13 @@ do_aesni_ctr (const RIJNDAEL_context *ct
>-                 "movdqa 0x90(%%esi), %%xmm1\n\t"
>-                 aesenc_xmm1_xmm0
>-                 "movdqa 0xa0(%%esi), %%xmm1\n\t"
>--                "cmp $10, %[rounds]\n\t"
>-+                "cmpl $10, %[rounds]\n\t"
>-                 "jz .Lenclast%=\n\t"
>-                 aesenc_xmm1_xmm0
>-                 "movdqa 0xb0(%%esi), %%xmm1\n\t"
>-                 aesenc_xmm1_xmm0
>-                 "movdqa 0xc0(%%esi), %%xmm1\n\t"
>--                "cmp $12, %[rounds]\n\t"
>-+                "cmpl $12, %[rounds]\n\t"
>-                 "jz .Lenclast%=\n\t"
>-                 aesenc_xmm1_xmm0
>-                 "movdqa 0xd0(%%esi), %%xmm1\n\t"
>-@@ -1050,7 +1050,7 @@ do_aesni_ctr_4 (const RIJNDAEL_context *
>-                 aesenc_xmm1_xmm3
>-                 aesenc_xmm1_xmm4
>-                 "movdqa 0xa0(%%esi), %%xmm1\n\t"
>--                "cmp $10, %[rounds]\n\t"
>-+                "cmpl $10, %[rounds]\n\t"
>-                 "jz .Lenclast%=\n\t"
>-                 aesenc_xmm1_xmm0
>-                 aesenc_xmm1_xmm2
>-@@ -1062,7 +1062,7 @@ do_aesni_ctr_4 (const RIJNDAEL_context *
>-                 aesenc_xmm1_xmm3
>-                 aesenc_xmm1_xmm4
>-                 "movdqa 0xc0(%%esi), %%xmm1\n\t"
>--                "cmp $12, %[rounds]\n\t"
>-+                "cmpl $12, %[rounds]\n\t"
>-                 "jz .Lenclast%=\n\t"
>-                 aesenc_xmm1_xmm0
>-                 aesenc_xmm1_xmm2
>diff -urN /usr/ports/security/libgcrypt.old/files/patch-configure /usr/ports/security/libgcrypt/files/patch-configure
>--- /usr/ports/security/libgcrypt.old/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/security/libgcrypt/files/patch-configure	2014-07-06 13:46:41.000000000 +0200
>@@ -0,0 +1,74 @@
>+--- configure.orig	2014-07-06 12:50:05.000000000 +0200
>++++ configure	2014-07-06 12:51:17.000000000 +0200
>+@@ -17471,6 +17471,7 @@
>+ 
>+ 
>+    case "${host}" in
>++      amd64-*-* | \
>+       x86_64-*-*)
>+          # Build with the assembly implementation
>+          GCRYPT_CIPHERS="$GCRYPT_CIPHERS blowfish-amd64.lo"
>+@@ -17500,6 +17501,7 @@
>+ 
>+ 
>+    case "${host}" in
>++      amd64-*-* | \
>+       x86_64-*-*)
>+          # Build with the assembly implementation
>+          GCRYPT_CIPHERS="$GCRYPT_CIPHERS cast5-amd64.lo"
>+@@ -17547,6 +17549,7 @@
>+ 
>+ 
>+    case "${host}" in
>++      amd64-*-* | \
>+       x86_64-*-*)
>+          # Build with the assembly implementation
>+          GCRYPT_CIPHERS="$GCRYPT_CIPHERS rijndael-amd64.lo"
>+@@ -17576,6 +17579,7 @@
>+ 
>+ 
>+    case "${host}" in
>++      amd64-*-* | \
>+       x86_64-*-*)
>+          # Build with the assembly implementation
>+          GCRYPT_CIPHERS="$GCRYPT_CIPHERS twofish-amd64.lo"
>+@@ -17605,6 +17609,7 @@
>+ 
>+ 
>+    case "${host}" in
>++      amd64-*-* | \
>+       x86_64-*-*)
>+          # Build with the SSE2 implementation
>+          GCRYPT_CIPHERS="$GCRYPT_CIPHERS serpent-sse2-amd64.lo"
>+@@ -17733,6 +17738,7 @@
>+ 
>+ 
>+    case "${host}" in
>++      amd64-*-* | \
>+       x86_64-*-*)
>+          # Build with the assembly implementation
>+          GCRYPT_CIPHERS="$GCRYPT_CIPHERS salsa20-amd64.lo"
>+@@ -17959,6 +17965,7 @@
>+ 
>+ 
>+    case "${host}" in
>++      amd64-*-* | \
>+       x86_64-*-*)
>+          # Build with the assembly implementation
>+          GCRYPT_DIGESTS="$GCRYPT_DIGESTS sha256-ssse3-amd64.lo"
>+@@ -17984,6 +17991,7 @@
>+ 
>+ 
>+    case "${host}" in
>++      amd64-*-* | \
>+       x86_64-*-*)
>+          # Build with the assembly implementation
>+          GCRYPT_DIGESTS="$GCRYPT_DIGESTS sha512-ssse3-amd64.lo"
>+@@ -18044,6 +18052,7 @@
>+ 
>+ 
>+ case "${host}" in
>++  amd64-*-* | \
>+   x86_64-*-*)
>+     # Build with the assembly implementation
>+     GCRYPT_DIGESTS="$GCRYPT_DIGESTS sha1-ssse3-amd64.lo"
>diff -urN /usr/ports/security/libgcrypt.old/files/patch-mpi-config.links /usr/ports/security/libgcrypt/files/patch-mpi-config.links
>--- /usr/ports/security/libgcrypt.old/files/patch-mpi-config.links	2014-04-01 15:12:28.000000000 +0200
>+++ /usr/ports/security/libgcrypt/files/patch-mpi-config.links	1970-01-01 01:00:00.000000000 +0100
>@@ -1,32 +0,0 @@
>---- mpi/config.links.orig	2013-07-25 11:10:04.000000000 +0200
>-+++ mpi/config.links	2014-03-16 17:53:55.000000000 +0100
>-@@ -46,9 +46,7 @@
>-        path=""
>-        ;;
>-     i[3467]86*-*-openbsd*      | \
>--    i[3467]86*-*-freebsd*-elf  | \
>--    i[3467]86*-*-freebsd[3-9]* | \
>--    i[3467]86*-*-freebsdelf*   | \
>-+    i[3467]86*-*-freebsd*      | \
>-     i[3467]86*-*-netbsd*       | \
>-     i[3467]86*-*-k*bsd*)
>-        echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
>-@@ -56,9 +54,7 @@
>-        path="i386"
>-        ;;
>-     i586*-*-openbsd*         | \
>--    i586*-*-freebsd*-elf     | \
>--    i586*-*-freebsd[3-9]*    | \
>--    i586*-*-freebsdelf*      | \
>-+    i586*-*-freebsd*         | \
>-     i586*-*-netbsd*	     | \
>-     i586*-*-k*bsd*	     | \
>-     pentium-*-netbsd*	     | \
>-@@ -112,6 +108,7 @@
>- 	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h
>- 	path="i586 i386"
>- 	;;
>-+    amd64-*-* | \
>-     x86_64-*-*)
>- 	echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
>- 	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h
>diff -urN /usr/ports/security/libgcrypt.old/files/patch-mpi-i386-mpi-add1.S /usr/ports/security/libgcrypt/files/patch-mpi-i386-mpi-add1.S
>--- /usr/ports/security/libgcrypt.old/files/patch-mpi-i386-mpi-add1.S	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/security/libgcrypt/files/patch-mpi-i386-mpi-add1.S	2014-07-06 14:21:33.000000000 +0200
>@@ -0,0 +1,20 @@
>+--- mpi/i386/mpih-add1.S.orig	2014-07-06 14:09:57.000000000 +0200
>++++ mpi/i386/mpih-add1.S	2014-07-06 14:10:16.000000000 +0200
>+@@ -41,7 +41,7 @@
>+  */
>+ 
>+ .text
>+-	ALIGN (3)
>++	ALIGN (2)
>+ 	.globl C_SYMBOL_NAME(_gcry_mpih_add_n)
>+ C_SYMBOL_NAME(_gcry_mpih_add_n:)
>+ 	pushl %edi
>+@@ -76,7 +76,7 @@
>+ 	leal	(Loop - 3)(%eax,%eax,8),%eax
>+ #endif
>+ 	jmp	*%eax			/* jump into loop */
>+-	ALIGN (3)
>++	ALIGN (2)
>+ Loop:	movl	(%esi),%eax
>+ 	adcl	(%edx),%eax
>+ 	movl	%eax,(%edi)
>diff -urN /usr/ports/security/libgcrypt.old/files/patch-mpi-i386-mpi-lshift.S /usr/ports/security/libgcrypt/files/patch-mpi-i386-mpi-lshift.S
>--- /usr/ports/security/libgcrypt.old/files/patch-mpi-i386-mpi-lshift.S	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/security/libgcrypt/files/patch-mpi-i386-mpi-lshift.S	2014-07-06 14:21:58.000000000 +0200
>@@ -0,0 +1,20 @@
>+--- mpi/i386/mpih-lshift.S.orig	2014-07-06 14:18:50.000000000 +0200
>++++ mpi/i386/mpih-lshift.S	2014-07-06 14:19:05.000000000 +0200
>+@@ -39,7 +39,7 @@
>+  */
>+ 
>+ .text
>+-	ALIGN (3)
>++	ALIGN (2)
>+ 	.globl C_SYMBOL_NAME(_gcry_mpih_lshift)
>+ C_SYMBOL_NAME(_gcry_mpih_lshift:)
>+ 	pushl	%edi
>+@@ -63,7 +63,7 @@
>+ 	jnz	L1			/* enter loop in the middle */
>+ 	movl	%ebx,%eax
>+ 
>+-	ALIGN (3)
>++	ALIGN (2)
>+ Loop:	movl	(%esi,%edx,4),%ebx	/* load next lower limb */
>+ 	shldl	%cl,%ebx,%eax		/* compute result limb */
>+ 	movl	%eax,(%edi,%edx,4)	/* store it */
>diff -urN /usr/ports/security/libgcrypt.old/files/patch-mpi-i386-mpi-mul1.S /usr/ports/security/libgcrypt/files/patch-mpi-i386-mpi-mul1.S
>--- /usr/ports/security/libgcrypt.old/files/patch-mpi-i386-mpi-mul1.S	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/security/libgcrypt/files/patch-mpi-i386-mpi-mul1.S	2014-07-06 14:22:17.000000000 +0200
>@@ -0,0 +1,20 @@
>+--- mpi/i386/mpih-mul1.S.orig	2014-07-06 14:12:20.000000000 +0200
>++++ mpi/i386/mpih-mul1.S	2014-07-06 14:12:38.000000000 +0200
>+@@ -45,7 +45,7 @@
>+ #define s2_limb ebp
>+ 
>+ 	TEXT
>+-	ALIGN (3)
>++	ALIGN (2)
>+ 	GLOBL	C_SYMBOL_NAME(_gcry_mpih_mul_1)
>+ C_SYMBOL_NAME(_gcry_mpih_mul_1:)
>+ 
>+@@ -63,7 +63,7 @@
>+ 	INSN2(lea,l	,R(s1_ptr),MEM_INDEX(s1_ptr,size,4))
>+ 	INSN1(neg,l	,R(size))
>+ 	INSN2(xor,l	,R(ebx),R(ebx))
>+-	ALIGN (3)
>++	ALIGN (2)
>+ Loop:
>+ 	INSN2(mov,l	,R(eax),MEM_INDEX(s1_ptr,size,4))
>+ 	INSN1(mul,l	,R(s2_limb))
>diff -urN /usr/ports/security/libgcrypt.old/files/patch-mpi-i386-mpi-mul2.S /usr/ports/security/libgcrypt/files/patch-mpi-i386-mpi-mul2.S
>--- /usr/ports/security/libgcrypt.old/files/patch-mpi-i386-mpi-mul2.S	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/security/libgcrypt/files/patch-mpi-i386-mpi-mul2.S	2014-07-06 14:22:30.000000000 +0200
>@@ -0,0 +1,20 @@
>+--- mpi/i386/mpih-mul2.S.orig	2014-07-06 14:12:47.000000000 +0200
>++++ mpi/i386/mpih-mul2.S	2014-07-06 14:13:02.000000000 +0200
>+@@ -46,7 +46,7 @@
>+ #define s2_limb ebp
>+ 
>+ 	TEXT
>+-	ALIGN (3)
>++	ALIGN (2)
>+ 	GLOBL	C_SYMBOL_NAME(_gcry_mpih_addmul_1)
>+ C_SYMBOL_NAME(_gcry_mpih_addmul_1:)
>+ 
>+@@ -64,7 +64,7 @@
>+ 	INSN2(lea,l	,R(s1_ptr),MEM_INDEX(s1_ptr,size,4))
>+ 	INSN1(neg,l	,R(size))
>+ 	INSN2(xor,l	,R(ebx),R(ebx))
>+-	ALIGN (3)
>++	ALIGN (2)
>+ Loop:
>+ 	INSN2(mov,l	,R(eax),MEM_INDEX(s1_ptr,size,4))
>+ 	INSN1(mul,l	,R(s2_limb))
>diff -urN /usr/ports/security/libgcrypt.old/files/patch-mpi-i386-mpi-mul3.S /usr/ports/security/libgcrypt/files/patch-mpi-i386-mpi-mul3.S
>--- /usr/ports/security/libgcrypt.old/files/patch-mpi-i386-mpi-mul3.S	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/security/libgcrypt/files/patch-mpi-i386-mpi-mul3.S	2014-07-06 14:22:45.000000000 +0200
>@@ -0,0 +1,20 @@
>+--- mpi/i386/mpih-mul3.S.orig	2014-07-06 14:13:16.000000000 +0200
>++++ mpi/i386/mpih-mul3.S	2014-07-06 14:13:32.000000000 +0200
>+@@ -46,7 +46,7 @@
>+ #define s2_limb ebp
>+ 
>+ 	TEXT
>+-	ALIGN (3)
>++	ALIGN (2)
>+ 	GLOBL	C_SYMBOL_NAME(_gcry_mpih_submul_1)
>+ C_SYMBOL_NAME(_gcry_mpih_submul_1:)
>+ 
>+@@ -64,7 +64,7 @@
>+ 	INSN2(lea,l	,R(s1_ptr),MEM_INDEX(s1_ptr,size,4))
>+ 	INSN1(neg,l	,R(size))
>+ 	INSN2(xor,l	,R(ebx),R(ebx))
>+-	ALIGN (3)
>++	ALIGN (2)
>+ Loop:
>+ 	INSN2(mov,l	,R(eax),MEM_INDEX(s1_ptr,size,4))
>+ 	INSN1(mul,l	,R(s2_limb))
>diff -urN /usr/ports/security/libgcrypt.old/files/patch-mpi-i386-mpi-rshift.S /usr/ports/security/libgcrypt/files/patch-mpi-i386-mpi-rshift.S
>--- /usr/ports/security/libgcrypt.old/files/patch-mpi-i386-mpi-rshift.S	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/security/libgcrypt/files/patch-mpi-i386-mpi-rshift.S	2014-07-06 14:23:07.000000000 +0200
>@@ -0,0 +1,20 @@
>+--- mpi/i386/mpih-rshift.S.orig	2014-07-06 14:13:43.000000000 +0200
>++++ mpi/i386/mpih-rshift.S	2014-07-06 14:13:57.000000000 +0200
>+@@ -40,7 +40,7 @@
>+  */
>+ 
>+ .text
>+-	ALIGN (3)
>++	ALIGN (2)
>+ 	.globl C_SYMBOL_NAME(_gcry_mpih_rshift)
>+ C_SYMBOL_NAME(_gcry_mpih_rshift:)
>+ 	pushl	%edi
>+@@ -66,7 +66,7 @@
>+ 	jnz	L2			/* enter loop in the middle */
>+ 	movl	%ebx,%eax
>+ 
>+-	ALIGN (3)
>++	ALIGN (2)
>+ Loop2:	 movl	 (%esi,%edx,4),%ebx	 /* load next higher limb */
>+ 	shrdl	%cl,%ebx,%eax		/* compute result limb */
>+ 	movl	%eax,(%edi,%edx,4)	/* store it */
>diff -urN /usr/ports/security/libgcrypt.old/files/patch-mpi-i386-mpi-sub1.S /usr/ports/security/libgcrypt/files/patch-mpi-i386-mpi-sub1.S
>--- /usr/ports/security/libgcrypt.old/files/patch-mpi-i386-mpi-sub1.S	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/security/libgcrypt/files/patch-mpi-i386-mpi-sub1.S	2014-07-06 14:23:21.000000000 +0200
>@@ -0,0 +1,20 @@
>+--- mpi/i386/mpih-sub1.S.orig	2014-07-06 14:11:11.000000000 +0200
>++++ mpi/i386/mpih-sub1.S	2014-07-06 14:11:29.000000000 +0200
>+@@ -42,7 +42,7 @@
>+ 
>+ 
>+ .text
>+-	ALIGN (3)
>++	ALIGN (2)
>+ 	.globl C_SYMBOL_NAME(_gcry_mpih_sub_n)
>+ C_SYMBOL_NAME(_gcry_mpih_sub_n:)
>+ 	pushl %edi
>+@@ -77,7 +77,7 @@
>+ 	leal	(Loop - 3)(%eax,%eax,8),%eax
>+ #endif
>+ 	jmp	*%eax			/* jump into loop */
>+-	ALIGN (3)
>++	ALIGN (2)
>+ Loop:	movl	(%esi),%eax
>+ 	sbbl	(%edx),%eax
>+ 	movl	%eax,(%edi)
>diff -urN /usr/ports/security/libgcrypt.old/files/patch-mpi-longlong.h /usr/ports/security/libgcrypt/files/patch-mpi-longlong.h
>--- /usr/ports/security/libgcrypt.old/files/patch-mpi-longlong.h	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/security/libgcrypt/files/patch-mpi-longlong.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,42 +0,0 @@
>---- ./mpi/longlong.h.orig	2010-02-22 19:04:43.000000000 +0900
>-+++ ./mpi/longlong.h	2010-11-01 18:25:34.000000000 +0900
>-@@ -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)),                                       \
>- 	     "g" ((USItype)(bh)),                                       \
>- 	     "1" ((USItype)(al)),                                       \
>- 	     "g" ((USItype)(bl)))
>- #define umul_ppmm(w1, w0, u, v) \
>-   __asm__ ("mull %3"                                                    \
>--	   : "=a" ((USItype)(w0)),                                      \
>--	     "=d" ((USItype)(w1))                                       \
>-+	   : "=a" (w0),                                                 \
>-+	     "=d" (w1)                                                  \
>- 	   : "%0" ((USItype)(u)),                                       \
>- 	     "rm" ((USItype)(v)))
>- #define udiv_qrnnd(q, r, n1, n0, d) \
>-   __asm__ ("divl %4"                                                    \
>--	   : "=a" ((USItype)(q)),                                       \
>--	     "=d" ((USItype)(r))                                        \
>-+	   : "=a" (q),                                                  \
>-+	     "=d" (r)                                                   \
>- 	   : "0" ((USItype)(n0)),                                       \
>- 	     "1" ((USItype)(n1)),                                       \
>- 	     "rm" ((USItype)(d)))
>diff -urN /usr/ports/security/libgcrypt.old/pkg-plist /usr/ports/security/libgcrypt/pkg-plist
>--- /usr/ports/security/libgcrypt.old/pkg-plist	2014-04-01 15:12:28.000000000 +0200
>+++ /usr/ports/security/libgcrypt/pkg-plist	2014-07-06 13:43:33.000000000 +0200
>@@ -1,9 +1,10 @@
>+bin/mpicalc
> bin/dumpsexp
> bin/hmac256
> bin/libgcrypt-config
> include/gcrypt.h
>-include/gcrypt-module.h
> lib/libgcrypt.la
> lib/libgcrypt.so
>-lib/libgcrypt.so.19
>+lib/libgcrypt.so.20
>+man/man1/hmac256.1.gz
> share/aclocal/libgcrypt.m4

Actions: View | Diff

Attachments on bug 191256: 144009 | 144455 | 144465 | 145057