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

[patch] libgcrypt-1.6.1.diff

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

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J Puga Medina

Created: 2014-07-06 16:53:42 UTC

Size: 11.86 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 360878)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/security/libgcrypt/Makefile 360837 2014-07-05 23:19:05Z sbruno $
> 
> PORTNAME=	libgcrypt
>-PORTVERSION=	1.5.3
>-PORTREVISION=	3
>+PORTVERSION=	1.6.1
> CATEGORIES=	security
> MASTER_SITES=	${MASTER_SITE_GNUPG}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -41,10 +40,13 @@
> 
> post-patch:
> 	@${RM} -f ${WRKSRC}/doc/gcrypt.info*
>+	@${REINPLACE_CMD} -e 's|(3)|(2)|g' \
>+		${WRKSRC}/mpi/i386/*.S
> 
> .if ${PORT_OPTIONS:MDOCS}
> post-install:
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgcrypt.so.20
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
> .endif
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 360878)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/patch-cipher-rijndael.c
>===================================================================
>--- files/patch-cipher-rijndael.c	(revision 360878)
>+++ files/patch-cipher-rijndael.c	(working copy)
>@@ -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
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 0)
>+++ files/patch-configure	(working copy)
>@@ -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"
>
>Property changes on: files/patch-configure
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: files/patch-mpi-longlong.h
>===================================================================
>--- files/patch-mpi-longlong.h	(revision 360878)
>+++ files/patch-mpi-longlong.h	(working copy)
>@@ -1,79 +0,0 @@
>---- ./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)),                                       \
>- 	     "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)))
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 360878)
>+++ pkg-plist	(working copy)
>@@ -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