Control: tag -1 patch upstream

Matthias Klose <d...@debian.org> (2014-01-29):
> Package: libgcrypt20
> Version: 1.6.0-2
> Severity: important
> Tags: sid jessie ftbfs
> 
> libgcrypt doesn't build anymore on arm*. libgcrypt11 did. tempted to
> make this an RC issue.

You probably want the following commit from upstream:

================================================================================
commit 7fef7f481c0a1542be34d1dc831f58d41846ac29
Author: Jussi Kivilinna <jussi.kivili...@iki.fi>
Date:   Mon Dec 30 16:34:29 2013 +0200

    Add blowfish/serpent ARM assembly files to Makefile.am
    
    * cipher/Makefile.am: Add 'blowfish-arm.S' and 'serpent-armv7-neon.S'.
    --
    
    Fix for bug https://bugs.g10code.com/gnupg/issue1584
    
    Signed-off-by: Jussi Kivilinna <jussi.kivili...@iki.fi>

diff --git a/cipher/Makefile.am b/cipher/Makefile.am
index 15400e5..462e6db 100644
--- a/cipher/Makefile.am
+++ b/cipher/Makefile.am
@@ -57,7 +57,7 @@ rmd.h
 
 EXTRA_libcipher_la_SOURCES = \
 arcfour.c arcfour-amd64.S \
-blowfish.c blowfish-amd64.S \
+blowfish.c blowfish-amd64.S blowfish-arm.S \
 cast5.c cast5-amd64.S cast5-arm.S \
 crc.c \
 des.c \
@@ -76,7 +76,7 @@ rsa.c \
 salsa20.c salsa20-amd64.S salsa20-armv7-neon.S \
 scrypt.c \
 seed.c \
-serpent.c serpent-sse2-amd64.S serpent-avx2-amd64.S \
+serpent.c serpent-sse2-amd64.S serpent-avx2-amd64.S serpent-armv7-neon.S \
 sha1.c sha1-ssse3-amd64.S sha1-avx-amd64.S sha1-avx-bmi2-amd64.S \
   sha1-armv7-neon.S \
 sha256.c sha256-ssse3-amd64.S sha256-avx-amd64.S sha256-avx2-bmi2-amd64.S \
================================================================================

I didn't check thoroughly why it didn't apply to the current source
package, but you'll find attached the same addition in a hand-built
patch. (Not tested on arm* though.)

Mraw,
KiBi.
--- a/cipher/Makefile.am
+++ b/cipher/Makefile.am
@@ -57,7 +57,7 @@ rmd.h
 
 EXTRA_libcipher_la_SOURCES = \
 arcfour.c \
-blowfish.c blowfish-amd64.S \
+blowfish.c blowfish-amd64.S blowfish-arm.S \
 cast5.c cast5-amd64.S cast5-arm.S \
 crc.c \
 des.c \
@@ -76,7 +76,7 @@ rsa.c \
 salsa20.c salsa20-amd64.S salsa20-armv7-neon.S \
 scrypt.c \
 seed.c \
-serpent.c serpent-sse2-amd64.S serpent-avx2-amd64.S \
+serpent.c serpent-sse2-amd64.S serpent-avx2-amd64.S serpent-armv7-neon.S \
 sha1.c sha1-ssse3-amd64.S \
 sha256.c sha256-ssse3-amd64.S \
 sha512.c sha512-ssse3-amd64.S sha512-avx-amd64.S sha512-avx2-bmi2-amd64.S \

Attachment: signature.asc
Description: Digital signature

Reply via email to