Update gcrypt to 1.8.3

7 files changed, 103 insertions, 18 deletions

diff --git a/data/gcrypt/_metadata/maintainer b/data/gcrypt/_metadata/maintainer
index 0fa66e077..573d7ebef 120000
--- a/data/gcrypt/_metadata/maintainer
+++ b/data/gcrypt/_metadata/maintainer
@@ -1 +1 @@
-../../../people/saurik
\ No newline at end of file
+../../../people/sbingner
\ No newline at end of file
diff --git a/data/gcrypt/_metadata/version b/data/gcrypt/_metadata/version
index 88c5fb891..a7ee35a3e 100644
--- a/data/gcrypt/_metadata/version
+++ b/data/gcrypt/_metadata/version
@@ -1 +1 @@
-1.4.0
+1.8.3
diff --git a/data/gcrypt/armasm.diff b/data/gcrypt/armasm.diff
deleted file mode 100644
index 662ee656b..000000000
--- a/data/gcrypt/armasm.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r -u libgcrypt-1.4.0/mpi/longlong.h libgcrypt-1.4.0+iPhone/mpi/longlong.h
---- libgcrypt-1.4.0/mpi/longlong.h	2005-07-29 13:31:17.000000000 +0000
-+++ libgcrypt-1.4.0+iPhone/mpi/longlong.h	2008-01-01 11:09:27.000000000 +0000
-@@ -225,8 +225,8 @@
- 	   : "r0", "r1", "r2")
- #else
- #define umul_ppmm(xh, xl, a, b)                                         \
--  __asm__ ("%@ Inlined umul_ppmm\n"                                     \
--	   "umull %r1, %r0, %r2, %r3"                                   \
-+  __asm__ ("@ Inlined umul_ppmm\n"                                     \
-+	   "umull %1, %0, %2, %3"                                   \
- 		   : "=&r" ((USItype)(xh)),                             \
- 		     "=r" ((USItype)(xl))                               \
- 		   : "r" ((USItype)(a)),                                \
diff --git a/data/gcrypt/asm.diff b/data/gcrypt/asm.diff
new file mode 100644
index 000000000..4d2cbffba
--- /dev/null
+++ b/data/gcrypt/asm.diff
@@ -0,0 +1,100 @@
+diff -ur libgcrypt-1.8.3/mpi/aarch64/mpih-add1.S libgcrypt-1.8.3+iPhone/mpi/aarch64/mpih-add1.S
+--- libgcrypt-1.8.3/mpi/aarch64/mpih-add1.S	2017-11-23 08:16:58.000000000 -1000
++++ libgcrypt-1.8.3+iPhone/mpi/aarch64/mpih-add1.S	2018-08-15 10:10:26.000000000 -1000
+@@ -33,9 +33,8 @@
+ 
+ .text
+ 
+-.globl _gcry_mpih_add_n
+-.type  _gcry_mpih_add_n,%function
+-_gcry_mpih_add_n:
++.globl __gcry_mpih_add_n
++__gcry_mpih_add_n:
+ 	and	x5, x3, #3;
+ 	adds	xzr, xzr, xzr; /* clear carry flag */
+ 
+@@ -68,4 +67,3 @@
+ .Lend:
+ 	adc	x0, xzr, xzr;
+ 	ret;
+-.size _gcry_mpih_add_n,.-_gcry_mpih_add_n;
+diff -ur libgcrypt-1.8.3/mpi/aarch64/mpih-mul1.S libgcrypt-1.8.3+iPhone/mpi/aarch64/mpih-mul1.S
+--- libgcrypt-1.8.3/mpi/aarch64/mpih-mul1.S	2017-11-23 08:16:58.000000000 -1000
++++ libgcrypt-1.8.3+iPhone/mpi/aarch64/mpih-mul1.S	2018-08-15 10:10:34.000000000 -1000
+@@ -33,9 +33,8 @@
+ 
+ .text
+ 
+-.globl _gcry_mpih_mul_1
+-.type  _gcry_mpih_mul_1,%function
+-_gcry_mpih_mul_1:
++.globl __gcry_mpih_mul_1
++__gcry_mpih_mul_1:
+ 	and	x5, x2, #3;
+ 	mov	x4, xzr;
+ 
+@@ -93,4 +92,3 @@
+ .Lend:
+ 	mov	x0, x4;
+ 	ret;
+-.size _gcry_mpih_mul_1,.-_gcry_mpih_mul_1;
+diff -ur libgcrypt-1.8.3/mpi/aarch64/mpih-mul2.S libgcrypt-1.8.3+iPhone/mpi/aarch64/mpih-mul2.S
+--- libgcrypt-1.8.3/mpi/aarch64/mpih-mul2.S	2017-11-23 08:16:58.000000000 -1000
++++ libgcrypt-1.8.3+iPhone/mpi/aarch64/mpih-mul2.S	2018-08-15 10:10:41.000000000 -1000
+@@ -33,9 +33,8 @@
+ 
+ .text
+ 
+-.globl _gcry_mpih_addmul_1
+-.type  _gcry_mpih_addmul_1,%function
+-_gcry_mpih_addmul_1:
++.globl __gcry_mpih_addmul_1
++__gcry_mpih_addmul_1:
+ 	and	x5, x2, #3;
+ 	mov	x6, xzr;
+ 	mov	x7, xzr;
+@@ -105,4 +104,3 @@
+ .Lend:
+ 	mov	x0, x6;
+ 	ret;
+-.size _gcry_mpih_addmul_1,.-_gcry_mpih_addmul_1;
+diff -ur libgcrypt-1.8.3/mpi/aarch64/mpih-mul3.S libgcrypt-1.8.3+iPhone/mpi/aarch64/mpih-mul3.S
+--- libgcrypt-1.8.3/mpi/aarch64/mpih-mul3.S	2017-11-23 08:16:58.000000000 -1000
++++ libgcrypt-1.8.3+iPhone/mpi/aarch64/mpih-mul3.S	2018-08-15 10:10:49.000000000 -1000
+@@ -33,9 +33,8 @@
+ 
+ .text
+ 
+-.globl _gcry_mpih_submul_1
+-.type  _gcry_mpih_submul_1,%function
+-_gcry_mpih_submul_1:
++.globl __gcry_mpih_submul_1
++__gcry_mpih_submul_1:
+ 	and	x5, x2, #3;
+ 	mov	x7, xzr;
+ 	cbz	x5, .Large_loop;
+@@ -118,4 +117,3 @@
+ .Loop_end:
+ 	cinc	x0, x7, cc;
+ 	ret;
+-.size _gcry_mpih_submul_1,.-_gcry_mpih_submul_1;
+diff -ur libgcrypt-1.8.3/mpi/aarch64/mpih-sub1.S libgcrypt-1.8.3+iPhone/mpi/aarch64/mpih-sub1.S
+--- libgcrypt-1.8.3/mpi/aarch64/mpih-sub1.S	2017-11-23 08:16:58.000000000 -1000
++++ libgcrypt-1.8.3+iPhone/mpi/aarch64/mpih-sub1.S	2018-08-15 10:10:52.000000000 -1000
+@@ -33,9 +33,8 @@
+ 
+ .text
+ 
+-.globl _gcry_mpih_sub_n
+-.type  _gcry_mpih_sub_n,%function
+-_gcry_mpih_sub_n:
++.globl __gcry_mpih_sub_n
++__gcry_mpih_sub_n:
+ 	and	x5, x3, #3;
+ 	subs	xzr, xzr, xzr; /* prepare carry flag for sub */
+ 
+@@ -68,4 +67,3 @@
+ .Lend:
+ 	cset	x0, cc;
+ 	ret;
+-.size _gcry_mpih_sub_n,.-_gcry_mpih_sub_n;
diff --git a/data/gcrypt/libgcrypt-1.4.0.tar.gz b/data/gcrypt/libgcrypt-1.4.0.tar.gz
deleted file mode 100644
index 6f27010c3..000000000
--- a/data/gcrypt/libgcrypt-1.4.0.tar.gz
+++ /dev/null
diff --git a/data/gcrypt/libgcrypt-1.8.3.tar.bz2 b/data/gcrypt/libgcrypt-1.8.3.tar.bz2
new file mode 100644
index 000000000..469d97aac
--- /dev/null
+++ b/data/gcrypt/libgcrypt-1.8.3.tar.bz2
diff --git a/data/gcrypt/make.sh b/data/gcrypt/make.sh
index 5686d8094..b14bd2624 100644
--- a/data/gcrypt/make.sh
+++ b/data/gcrypt/make.sh
@@ -1,5 +1,4 @@
 pkg:setup
-pkg:autoconf
 pkg:configure --with-gpg-error-prefix="$(PKG_DEST_ libgpg-error)/usr"
-make
+make -j8
 pkg:install