Use gnupg2 instead of gnupg everywhere and have a gnupg2 compatibility package

21 files changed, 12 insertions, 28 deletions

diff --git a/data/gnupg/_metadata/description b/data/gnupg/_metadata/description
index c55bd894d..72bfbf994 100644
--- a/data/gnupg/_metadata/description
+++ b/data/gnupg/_metadata/description
@@ -1 +1 @@
-older encryption compatible with OpenPGP
+newer encryption compatible with OpenPGP
diff --git a/data/gnupg2/_metadata/gcrypt.dep b/data/gnupg/_metadata/gcrypt.dep
index 0a21c7b07..0a21c7b07 120000
--- a/data/gnupg2/_metadata/gcrypt.dep
+++ b/data/gnupg/_metadata/gcrypt.dep
diff --git a/data/gnupg2/_metadata/gnutls.dep b/data/gnupg/_metadata/gnutls.dep
index 2dbb733a2..2dbb733a2 120000
--- a/data/gnupg2/_metadata/gnutls.dep
+++ b/data/gnupg/_metadata/gnutls.dep
diff --git a/data/gnupg/_metadata/homepage b/data/gnupg/_metadata/homepage
deleted file mode 100644
index b6cb504d6..000000000
--- a/data/gnupg/_metadata/homepage
+++ /dev/null
@@ -1 +0,0 @@
-http://www.gnupg.org/
diff --git a/data/gnupg2/_metadata/libassuan.dep b/data/gnupg/_metadata/libassuan.dep
index faf83d0e8..faf83d0e8 120000
--- a/data/gnupg2/_metadata/libassuan.dep
+++ b/data/gnupg/_metadata/libassuan.dep
diff --git a/data/gnupg2/_metadata/libksba.dep b/data/gnupg/_metadata/libksba.dep
index af0be215f..af0be215f 120000
--- a/data/gnupg2/_metadata/libksba.dep
+++ b/data/gnupg/_metadata/libksba.dep
diff --git a/data/gnupg/_metadata/maintainer b/data/gnupg/_metadata/maintainer
index 0fa66e077..573d7ebef 120000
--- a/data/gnupg/_metadata/maintainer
+++ b/data/gnupg/_metadata/maintainer
@@ -1 +1 @@
-../../../people/saurik
\ No newline at end of file
+../../../people/sbingner
\ No newline at end of file
diff --git a/data/gnupg/_metadata/name b/data/gnupg/_metadata/name
index 0fb54137f..718afb785 100644
--- a/data/gnupg/_metadata/name
+++ b/data/gnupg/_metadata/name
@@ -1 +1 @@
-GNU Privacy Guard
+GnuPG 2
diff --git a/data/gnupg/_metadata/ncurses.dep b/data/gnupg/_metadata/ncurses.dep
deleted file mode 120000
index a395fad08..000000000
--- a/data/gnupg/_metadata/ncurses.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../ncurses
\ No newline at end of file
diff --git a/data/gnupg2/_metadata/npth.dep b/data/gnupg/_metadata/npth.dep
index ba035bc31..ba035bc31 120000
--- a/data/gnupg2/_metadata/npth.dep
+++ b/data/gnupg/_metadata/npth.dep
diff --git a/data/gnupg/_metadata/priority b/data/gnupg/_metadata/priority
index fad9e164a..134d9bc32 100644
--- a/data/gnupg/_metadata/priority
+++ b/data/gnupg/_metadata/priority
@@ -1 +1 @@
-required
+optional
diff --git a/data/gnupg/_metadata/version b/data/gnupg/_metadata/version
index b2e46d185..a6333e400 100644
--- a/data/gnupg/_metadata/version
+++ b/data/gnupg/_metadata/version
@@ -1 +1 @@
-1.4.8
+2.2.9
diff --git a/data/gnupg/armasm.diff b/data/gnupg/armasm.diff
deleted file mode 100644
index 955d2467c..000000000
--- a/data/gnupg/armasm.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru gnupg-1.4.8/mpi/longlong.h gnupg-1.4.8+iPhone/mpi/longlong.h
---- gnupg-1.4.8/mpi/longlong.h	2007-10-23 09:15:14.000000000 +0000
-+++ gnupg-1.4.8+iPhone/mpi/longlong.h	2008-01-01 12:58:42.000000000 +0000
-@@ -221,8 +221,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/gnupg2/extern.diff b/data/gnupg/extern.diff
index 883324693..883324693 100644
--- a/data/gnupg2/extern.diff
+++ b/data/gnupg/extern.diff
diff --git a/data/gnupg/gnupg-1.4.9.tar.bz2 b/data/gnupg/gnupg-1.4.9.tar.bz2
deleted file mode 100644
index e56b9b3da..000000000
--- a/data/gnupg/gnupg-1.4.9.tar.bz2
+++ /dev/null
diff --git a/data/gnupg2/gnupg-2.2.9.tar.bz2 b/data/gnupg/gnupg-2.2.9.tar.bz2
index 26298670f..26298670f 100644
--- a/data/gnupg2/gnupg-2.2.9.tar.bz2
+++ b/data/gnupg/gnupg-2.2.9.tar.bz2
diff --git a/data/gnupg/make.sh b/data/gnupg/make.sh
index 05dc5f4ac..e733d6568 100644
--- a/data/gnupg/make.sh
+++ b/data/gnupg/make.sh
@@ -1,5 +1,4 @@
 pkg:setup
-pkg:configure --disable-nls
-make
+pkg:configure --with-ksba-prefix="$(PKG_DEST_ libksba)/usr" --with-libassuan-prefix="$(PKG_DEST_ libassuan)/usr" --with-npth-prefix="$(PKG_DEST_ npth)/usr" --sysconfdir=/etc --with-gpg-error-prefix="$(PKG_DEST_ libgpg-error)/usr" --with-libgcrypt-prefix="$(PKG_DEST_ gcrypt)/usr"
+make -j8
 pkg:install
-pkg: rm -f /usr/share/gnupg/{FAQ,faq.html}
diff --git a/data/gnupg2/_metadata/gnupg.dep b/data/gnupg2/_metadata/gnupg.dep
new file mode 120000
index 000000000..277e892bf
--- /dev/null
+++ b/data/gnupg2/_metadata/gnupg.dep
@@ -0,0 +1 @@
+../../gnupg
\ No newline at end of file
diff --git a/data/gnupg2/_metadata/gnupg.ver.iphoneos-arm b/data/gnupg2/_metadata/gnupg.ver.iphoneos-arm
new file mode 100644
index 000000000..cd5ac039d
--- /dev/null
+++ b/data/gnupg2/_metadata/gnupg.ver.iphoneos-arm
@@ -0,0 +1 @@
+2.0
diff --git a/data/gnupg2/_metadata/gnupg.ver.iphoneos-arm64 b/data/gnupg2/_metadata/gnupg.ver.iphoneos-arm64
new file mode 100644
index 000000000..cd5ac039d
--- /dev/null
+++ b/data/gnupg2/_metadata/gnupg.ver.iphoneos-arm64
@@ -0,0 +1 @@
+2.0
diff --git a/data/gnupg2/make.sh b/data/gnupg2/make.sh
index e733d6568..a26dde533 100644
--- a/data/gnupg2/make.sh
+++ b/data/gnupg2/make.sh
@@ -1,4 +1,2 @@
-pkg:setup
-pkg:configure --with-ksba-prefix="$(PKG_DEST_ libksba)/usr" --with-libassuan-prefix="$(PKG_DEST_ libassuan)/usr" --with-npth-prefix="$(PKG_DEST_ npth)/usr" --sysconfdir=/etc --with-gpg-error-prefix="$(PKG_DEST_ libgpg-error)/usr" --with-libgcrypt-prefix="$(PKG_DEST_ gcrypt)/usr"
-make -j8
-pkg:install
+mkdir -p "$(PKG_DEST_ gnupg2)/usr/bin"
+ln -s gnupg "$(PKG_DEST_ gnupg2)/usr/bin/gnupg2"