CVS commit: pkgsrc/security/libgcrypt

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jul  2 13:24:17 UTC 2016

Modified Files:
        pkgsrc/security/libgcrypt: Makefile distinfo
Added Files:
        pkgsrc/security/libgcrypt/patches: patch-cipher_poly1305-armv7-neon.S
            patch-cipher_rijndael-arm.S

Log Message:
Fix assembler problems on ARM.

Patches by Michael Plass <mfpnb%plass-family.net@localhost> on tech-pkg/port-arm.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 pkgsrc/security/libgcrypt/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/security/libgcrypt/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/libgcrypt/patches/patch-cipher_poly1305-armv7-neon.S \
    pkgsrc/security/libgcrypt/patches/patch-cipher_rijndael-arm.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/libgcrypt/Makefile
diff -u pkgsrc/security/libgcrypt/Makefile:1.79 pkgsrc/security/libgcrypt/Makefile:1.80
--- pkgsrc/security/libgcrypt/Makefile:1.79     Fri Jun 17 11:56:13 2016
+++ pkgsrc/security/libgcrypt/Makefile  Sat Jul  2 13:24:17 2016
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.79 2016/06/17 11:56:13 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2016/07/02 13:24:17 wiz Exp $
 
 DISTNAME=      libgcrypt-1.7.1
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/libgcrypt/ \
                http://gd.tuwien.ac.at/privacy/gnupg/libgcrypt/

Index: pkgsrc/security/libgcrypt/distinfo
diff -u pkgsrc/security/libgcrypt/distinfo:1.64 pkgsrc/security/libgcrypt/distinfo:1.65
--- pkgsrc/security/libgcrypt/distinfo:1.64     Fri Jun 17 11:56:13 2016
+++ pkgsrc/security/libgcrypt/distinfo  Sat Jul  2 13:24:17 2016
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.64 2016/06/17 11:56:13 wiz Exp $
+$NetBSD: distinfo,v 1.65 2016/07/02 13:24:17 wiz Exp $
 
 SHA1 (libgcrypt-1.7.1.tar.bz2) = b688add52b622bb96bbd823ba21aa05a116d442f
 RMD160 (libgcrypt-1.7.1.tar.bz2) = 1be0c84cf7bcb1ac8a185ff965e02b9182708f6f
 SHA512 (libgcrypt-1.7.1.tar.bz2) = 08ca7de8b6324d1119935b1f400b0ef55e761d42178a4daa8077d36072e5f0987ec6e7834a98c62f1a06261b1b99edc45b3041a873e284a002d8486ffc3347f5
 Size (libgcrypt-1.7.1.tar.bz2) = 2843435 bytes
 SHA1 (patch-aa) = 3dd44b8745128a6788d24f9eb00002624a5fc52b
+SHA1 (patch-cipher_poly1305-armv7-neon.S) = 656c37688bf96a1cfe971375f7c27784ed7804c5
+SHA1 (patch-cipher_rijndael-arm.S) = ef3cb7f481022440780eb48ae31cbfad0a3ec115
 SHA1 (patch-src_visibility.h) = 8cbbf6803ab34b4b7dda832aa8ee18247aa89518

Added files:

Index: pkgsrc/security/libgcrypt/patches/patch-cipher_poly1305-armv7-neon.S
diff -u /dev/null pkgsrc/security/libgcrypt/patches/patch-cipher_poly1305-armv7-neon.S:1.1
--- /dev/null   Sat Jul  2 13:24:17 2016
+++ pkgsrc/security/libgcrypt/patches/patch-cipher_poly1305-armv7-neon.S        Sat Jul  2 13:24:17 2016
@@ -0,0 +1,16 @@
+$NetBSD: patch-cipher_poly1305-armv7-neon.S,v 1.1 2016/07/02 13:24:17 wiz Exp $
+
+Fix ARM Neon assembler problem.
+https://lists.gnupg.org/pipermail/gcrypt-devel/2016-June/003904.html
+
+--- cipher/poly1305-armv7-neon.S.orig  2016-03-23 11:59:34.000000000 +0000
++++ cipher/poly1305-armv7-neon.S
+@@ -52,7 +52,7 @@ _gcry_poly1305_armv7_neon_init_ext:
+       and r2, r2, r2
+       moveq r14, #-1
+       ldmia r1!, {r2-r5}
+-      ldr r7, =.Lpoly1305_init_constants_neon
++      adr r7, .Lpoly1305_init_constants_neon
+       mov r6, r2
+       mov r8, r2, lsr #26
+       mov r9, r3, lsr #20
Index: pkgsrc/security/libgcrypt/patches/patch-cipher_rijndael-arm.S
diff -u /dev/null pkgsrc/security/libgcrypt/patches/patch-cipher_rijndael-arm.S:1.1
--- /dev/null   Sat Jul  2 13:24:17 2016
+++ pkgsrc/security/libgcrypt/patches/patch-cipher_rijndael-arm.S       Sat Jul  2 13:24:17 2016
@@ -0,0 +1,15 @@
+$NetBSD: patch-cipher_rijndael-arm.S,v 1.1 2016/07/02 13:24:17 wiz Exp $
+
+Fix ARM unaligned access problem.
+https://lists.gnupg.org/pipermail/gcrypt-devel/2016-June/003904.html
+
+--- cipher/rijndael-arm.S.orig 2016-03-23 11:59:34.000000000 +0000
++++ cipher/rijndael-arm.S
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include <config.h>
++#undef __ARM_FEATURE_UNALIGNED
+ 
+ #if defined(__ARMEL__)
+ #ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS