From a026ae99562291a2a72fdfbfef969df80277e827 Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Wed, 15 Aug 2018 10:39:44 -1000 Subject: Use gnupg2 instead of gnupg everywhere and have a gnupg2 compatibility package --- data/gnupg/_metadata/description | 2 +- data/gnupg/_metadata/gcrypt.dep | 1 + data/gnupg/_metadata/gnutls.dep | 1 + data/gnupg/_metadata/homepage | 1 - data/gnupg/_metadata/libassuan.dep | 1 + data/gnupg/_metadata/libksba.dep | 1 + data/gnupg/_metadata/maintainer | 2 +- data/gnupg/_metadata/name | 2 +- data/gnupg/_metadata/ncurses.dep | 1 - data/gnupg/_metadata/npth.dep | 1 + data/gnupg/_metadata/priority | 2 +- data/gnupg/_metadata/version | 2 +- data/gnupg/armasm.diff | 14 -- data/gnupg/extern.diff | 328 +++++++++++++++++++++++++ data/gnupg/gnupg-1.4.9.tar.bz2 | Bin 3328743 -> 0 bytes data/gnupg/gnupg-2.2.9.tar.bz2 | Bin 0 -> 6659547 bytes data/gnupg/make.sh | 5 +- data/gnupg2/_metadata/gcrypt.dep | 1 - data/gnupg2/_metadata/gnupg.dep | 1 + data/gnupg2/_metadata/gnupg.ver.iphoneos-arm | 1 + data/gnupg2/_metadata/gnupg.ver.iphoneos-arm64 | 1 + data/gnupg2/_metadata/gnutls.dep | 1 - data/gnupg2/_metadata/libassuan.dep | 1 - data/gnupg2/_metadata/libksba.dep | 1 - data/gnupg2/_metadata/npth.dep | 1 - data/gnupg2/extern.diff | 328 ------------------------- data/gnupg2/gnupg-2.2.9.tar.bz2 | Bin 6659547 -> 0 bytes data/gnupg2/make.sh | 6 +- 28 files changed, 345 insertions(+), 361 deletions(-) create mode 120000 data/gnupg/_metadata/gcrypt.dep create mode 120000 data/gnupg/_metadata/gnutls.dep delete mode 100644 data/gnupg/_metadata/homepage create mode 120000 data/gnupg/_metadata/libassuan.dep create mode 120000 data/gnupg/_metadata/libksba.dep delete mode 120000 data/gnupg/_metadata/ncurses.dep create mode 120000 data/gnupg/_metadata/npth.dep delete mode 100644 data/gnupg/armasm.diff create mode 100644 data/gnupg/extern.diff delete mode 100644 data/gnupg/gnupg-1.4.9.tar.bz2 create mode 100644 data/gnupg/gnupg-2.2.9.tar.bz2 delete mode 120000 data/gnupg2/_metadata/gcrypt.dep create mode 120000 data/gnupg2/_metadata/gnupg.dep create mode 100644 data/gnupg2/_metadata/gnupg.ver.iphoneos-arm create mode 100644 data/gnupg2/_metadata/gnupg.ver.iphoneos-arm64 delete mode 120000 data/gnupg2/_metadata/gnutls.dep delete mode 120000 data/gnupg2/_metadata/libassuan.dep delete mode 120000 data/gnupg2/_metadata/libksba.dep delete mode 120000 data/gnupg2/_metadata/npth.dep delete mode 100644 data/gnupg2/extern.diff delete mode 100644 data/gnupg2/gnupg-2.2.9.tar.bz2 (limited to 'data') 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/gnupg/_metadata/gcrypt.dep b/data/gnupg/_metadata/gcrypt.dep new file mode 120000 index 000000000..0a21c7b07 --- /dev/null +++ b/data/gnupg/_metadata/gcrypt.dep @@ -0,0 +1 @@ +../../gcrypt \ No newline at end of file diff --git a/data/gnupg/_metadata/gnutls.dep b/data/gnupg/_metadata/gnutls.dep new file mode 120000 index 000000000..2dbb733a2 --- /dev/null +++ b/data/gnupg/_metadata/gnutls.dep @@ -0,0 +1 @@ +../../gnutls \ No newline at end of file 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/gnupg/_metadata/libassuan.dep b/data/gnupg/_metadata/libassuan.dep new file mode 120000 index 000000000..faf83d0e8 --- /dev/null +++ b/data/gnupg/_metadata/libassuan.dep @@ -0,0 +1 @@ +../../libassuan \ No newline at end of file diff --git a/data/gnupg/_metadata/libksba.dep b/data/gnupg/_metadata/libksba.dep new file mode 120000 index 000000000..af0be215f --- /dev/null +++ b/data/gnupg/_metadata/libksba.dep @@ -0,0 +1 @@ +../../libksba \ No newline at end of file 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/gnupg/_metadata/npth.dep b/data/gnupg/_metadata/npth.dep new file mode 120000 index 000000000..ba035bc31 --- /dev/null +++ b/data/gnupg/_metadata/npth.dep @@ -0,0 +1 @@ +../../npth \ No newline at end of file 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/gnupg/extern.diff b/data/gnupg/extern.diff new file mode 100644 index 000000000..883324693 --- /dev/null +++ b/data/gnupg/extern.diff @@ -0,0 +1,328 @@ +diff -ur gnupg-2.2.9/agent/agent.h gnupg-2.2.9+iPhone/agent/agent.h +--- gnupg-2.2.9/agent/agent.h 2018-06-12 01:25:39.000000000 -1000 ++++ gnupg-2.2.9+iPhone/agent/agent.h 2018-08-15 08:34:08.000000000 -1000 +@@ -55,6 +55,7 @@ + + + /* A large struct name "opt" to keep global flags */ ++EXTERN_UNLESS_MAIN_MODULE + struct + { + unsigned int debug; /* Debug flags (DBG_foo_VALUE) */ +diff -ur gnupg-2.2.9/agent/gpg-agent.c gnupg-2.2.9+iPhone/agent/gpg-agent.c +--- gnupg-2.2.9/agent/gpg-agent.c 2018-06-06 06:29:59.000000000 -1000 ++++ gnupg-2.2.9+iPhone/agent/gpg-agent.c 2018-08-14 22:16:12.000000000 -1000 +@@ -50,9 +50,11 @@ + #include + + #define GNUPG_COMMON_NEED_AFLOCAL ++#define INCLUDED_BY_MAIN_MODULE 1 + #include "agent.h" + #include /* Malloc hooks and socket wrappers. */ + ++#include "../common/iobuf.h" + #include "../common/i18n.h" + #include "../common/sysutils.h" + #include "../common/gc-opt-flags.h" +diff -ur gnupg-2.2.9/agent/preset-passphrase.c gnupg-2.2.9+iPhone/agent/preset-passphrase.c +--- gnupg-2.2.9/agent/preset-passphrase.c 2017-08-28 00:22:54.000000000 -1000 ++++ gnupg-2.2.9+iPhone/agent/preset-passphrase.c 2018-08-14 22:16:12.000000000 -1000 +@@ -44,6 +44,7 @@ + # include /* To initialize the sockets. fixme */ + #endif + ++#define INCLUDED_BY_MAIN_MODULE 1 + #include "agent.h" + #include "../common/simple-pwquery.h" + #include "../common/i18n.h" +diff -ur gnupg-2.2.9/agent/protect-tool.c gnupg-2.2.9+iPhone/agent/protect-tool.c +--- gnupg-2.2.9/agent/protect-tool.c 2018-03-26 20:13:47.000000000 -1000 ++++ gnupg-2.2.9+iPhone/agent/protect-tool.c 2018-08-14 22:22:40.000000000 -1000 +@@ -38,7 +38,9 @@ + #include /* for setmode() */ + #endif + ++#define INCLUDED_BY_MAIN_MODULE 1 + #include "agent.h" ++#include "../common/iobuf.h" + #include "../common/i18n.h" + #include "../common/get-passphrase.h" + #include "../common/sysutils.h" +diff -ur gnupg-2.2.9/agent/t-protect.c gnupg-2.2.9+iPhone/agent/t-protect.c +--- gnupg-2.2.9/agent/t-protect.c 2017-12-07 20:40:06.000000000 -1000 ++++ gnupg-2.2.9+iPhone/agent/t-protect.c 2018-08-14 22:16:12.000000000 -1000 +@@ -23,6 +23,7 @@ + #include + #include + ++#define INCLUDED_BY_MAIN_MODULE 1 + #include "agent.h" + + +diff -ur gnupg-2.2.9/common/iobuf.h gnupg-2.2.9+iPhone/common/iobuf.h +--- gnupg-2.2.9/common/iobuf.h 2018-06-12 01:25:39.000000000 -1000 ++++ gnupg-2.2.9+iPhone/common/iobuf.h 2018-08-14 22:16:12.000000000 -1000 +@@ -250,7 +250,7 @@ + }; + + #ifndef EXTERN_UNLESS_MAIN_MODULE +-#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) ++#if (defined (__riscos__) || defined (__APPLE__)) && !defined (INCLUDED_BY_MAIN_MODULE) + #define EXTERN_UNLESS_MAIN_MODULE extern + #else + #define EXTERN_UNLESS_MAIN_MODULE +diff -ur gnupg-2.2.9/common/t-iobuf.c gnupg-2.2.9+iPhone/common/t-iobuf.c +--- gnupg-2.2.9/common/t-iobuf.c 2017-08-28 00:22:54.000000000 -1000 ++++ gnupg-2.2.9+iPhone/common/t-iobuf.c 2018-08-14 22:16:12.000000000 -1000 +@@ -4,6 +4,7 @@ + #include + #include + ++#define INCLUDED_BY_MAIN_MODULE 1 + #include "iobuf.h" + #include "stringhelp.h" + +diff -ur gnupg-2.2.9/common/t-name-value.c gnupg-2.2.9+iPhone/common/t-name-value.c +--- gnupg-2.2.9/common/t-name-value.c 2017-08-28 00:22:54.000000000 -1000 ++++ gnupg-2.2.9+iPhone/common/t-name-value.c 2018-08-14 22:16:12.000000000 -1000 +@@ -25,6 +25,8 @@ + #include + #include + ++#define INCLUDED_BY_MAIN_MODULE 1 ++#include "iobuf.h" + #include "util.h" + #include "name-value.h" + +diff -ur gnupg-2.2.9/common/t-strlist.c gnupg-2.2.9+iPhone/common/t-strlist.c +--- gnupg-2.2.9/common/t-strlist.c 2017-08-28 00:22:54.000000000 -1000 ++++ gnupg-2.2.9+iPhone/common/t-strlist.c 2018-08-14 22:16:12.000000000 -1000 +@@ -31,6 +31,8 @@ + #include + #include + ++#define INCLUDED_BY_MAIN_MODULE 1 ++#include "iobuf.h" + #include "strlist.h" + + #include "t-support.h" +diff -ur gnupg-2.2.9/common/util.h gnupg-2.2.9+iPhone/common/util.h +--- gnupg-2.2.9/common/util.h 2018-06-12 01:25:39.000000000 -1000 ++++ gnupg-2.2.9+iPhone/common/util.h 2018-08-15 08:24:16.000000000 -1000 +@@ -55,6 +55,13 @@ + # define GPG_ERR_DNS_TIMEOUT 718 + #endif + ++#ifndef EXTERN_UNLESS_MAIN_MODULE ++#if (defined (__riscos__) || defined (__APPLE__)) && !defined (INCLUDED_BY_MAIN_MODULE) ++#define EXTERN_UNLESS_MAIN_MODULE extern ++#else ++#define EXTERN_UNLESS_MAIN_MODULE ++#endif ++#endif + + /* Hash function used with libksba. */ + #define HASH_FNC ((void (*)(void *, const void*,size_t))gcry_md_write) +diff -ur gnupg-2.2.9/dirmngr/dirmngr.c gnupg-2.2.9+iPhone/dirmngr/dirmngr.c +--- gnupg-2.2.9/dirmngr/dirmngr.c 2018-06-12 01:25:39.000000000 -1000 ++++ gnupg-2.2.9+iPhone/dirmngr/dirmngr.c 2018-08-14 22:28:37.000000000 -1000 +@@ -56,10 +56,12 @@ + + + #define GNUPG_COMMON_NEED_AFLOCAL ++#define INCLUDED_BY_MAIN_MODULE 1 + #include "dirmngr.h" + + #include + ++#include "../common/iobuf.h" + #include "certcache.h" + #include "crlcache.h" + #include "crlfetch.h" +diff -ur gnupg-2.2.9/dirmngr/dirmngr.h gnupg-2.2.9+iPhone/dirmngr/dirmngr.h +--- gnupg-2.2.9/dirmngr/dirmngr.h 2017-12-11 00:30:45.000000000 -1000 ++++ gnupg-2.2.9+iPhone/dirmngr/dirmngr.h 2018-08-15 08:35:31.000000000 -1000 +@@ -75,6 +75,7 @@ + + + /* A large struct named "opt" to keep global flags. */ ++EXTERN_UNLESS_MAIN_MODULE + struct + { + unsigned int debug; /* debug flags (DBG_foo_VALUE) */ +diff -ur gnupg-2.2.9/g10/options.h gnupg-2.2.9+iPhone/g10/options.h +--- gnupg-2.2.9/g10/options.h 2018-06-12 01:25:39.000000000 -1000 ++++ gnupg-2.2.9+iPhone/g10/options.h 2018-08-15 08:31:23.000000000 -1000 +@@ -30,15 +30,6 @@ + #include "../common/session-env.h" + #include "../common/compliance.h" + +-#ifndef EXTERN_UNLESS_MAIN_MODULE +-/* Norcraft can't cope with common symbols */ +-#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) +-#define EXTERN_UNLESS_MAIN_MODULE extern +-#else +-#define EXTERN_UNLESS_MAIN_MODULE +-#endif +-#endif +- + /* Declaration of a keyserver spec type. The definition is found in + ../common/keyserver.h. */ + struct keyserver_spec; +diff -ur gnupg-2.2.9/kbx/kbxutil.c gnupg-2.2.9+iPhone/kbx/kbxutil.c +--- gnupg-2.2.9/kbx/kbxutil.c 2018-06-12 01:25:39.000000000 -1000 ++++ gnupg-2.2.9+iPhone/kbx/kbxutil.c 2018-08-14 22:16:12.000000000 -1000 +@@ -29,6 +29,8 @@ + #include + + #include ++#define INCLUDED_BY_MAIN_MODULE 1 ++#include "../common/iobuf.h" + #include "../common/logging.h" + #include "../common/argparse.h" + #include "../common/stringhelp.h" +diff -ur gnupg-2.2.9/scd/scdaemon.c gnupg-2.2.9+iPhone/scd/scdaemon.c +--- gnupg-2.2.9/scd/scdaemon.c 2018-03-21 08:43:33.000000000 -1000 ++++ gnupg-2.2.9+iPhone/scd/scdaemon.c 2018-08-14 22:25:31.000000000 -1000 +@@ -38,12 +38,14 @@ + #include + + #define GNUPG_COMMON_NEED_AFLOCAL ++#define INCLUDED_BY_MAIN_MODULE 1 + #include "scdaemon.h" + #include + #include + + #include /* malloc hooks */ + ++#include "../common/iobuf.h" + #include "../common/i18n.h" + #include "../common/sysutils.h" + #include "app-common.h" +diff -ur gnupg-2.2.9/scd/scdaemon.h gnupg-2.2.9+iPhone/scd/scdaemon.h +--- gnupg-2.2.9/scd/scdaemon.h 2017-08-28 00:22:54.000000000 -1000 ++++ gnupg-2.2.9+iPhone/scd/scdaemon.h 2018-08-15 08:35:05.000000000 -1000 +@@ -44,6 +44,7 @@ + + + /* A large struct name "opt" to keep global flags. */ ++EXTERN_UNLESS_MAIN_MODULE + struct + { + unsigned int debug; /* Debug flags (DBG_foo_VALUE). */ +diff -ur gnupg-2.2.9/sm/gpgsm.c gnupg-2.2.9+iPhone/sm/gpgsm.c +--- gnupg-2.2.9/sm/gpgsm.c 2018-06-12 01:25:39.000000000 -1000 ++++ gnupg-2.2.9+iPhone/sm/gpgsm.c 2018-08-14 22:16:12.000000000 -1000 +@@ -28,6 +28,7 @@ + #include + /*#include */ + ++#define INCLUDED_BY_MAIN_MODULE 1 + #include "gpgsm.h" + #include + #include /* malloc hooks */ +diff -ur gnupg-2.2.9/sm/gpgsm.h gnupg-2.2.9+iPhone/sm/gpgsm.h +--- gnupg-2.2.9/sm/gpgsm.h 2018-06-12 01:25:39.000000000 -1000 ++++ gnupg-2.2.9+iPhone/sm/gpgsm.h 2018-08-15 08:36:03.000000000 -1000 +@@ -52,6 +52,7 @@ + + + /* A large struct named "opt" to keep global flags. */ ++EXTERN_UNLESS_MAIN_MODULE + struct + { + unsigned int debug; /* debug flags (DBG_foo_VALUE) */ +diff -ur gnupg-2.2.9/tools/gpg-check-pattern.c gnupg-2.2.9+iPhone/tools/gpg-check-pattern.c +--- gnupg-2.2.9/tools/gpg-check-pattern.c 2017-08-28 00:22:54.000000000 -1000 ++++ gnupg-2.2.9+iPhone/tools/gpg-check-pattern.c 2018-08-15 08:26:34.000000000 -1000 +@@ -40,6 +40,8 @@ + #include + #include + ++#define INCLUDED_BY_MAIN_MODULE 1 ++#include "../common/iobuf.h" + #include "../common/util.h" + #include "../common/i18n.h" + #include "../common/sysutils.h" +diff -ur gnupg-2.2.9/tools/gpg-connect-agent.c gnupg-2.2.9+iPhone/tools/gpg-connect-agent.c +--- gnupg-2.2.9/tools/gpg-connect-agent.c 2017-08-28 00:22:54.000000000 -1000 ++++ gnupg-2.2.9+iPhone/tools/gpg-connect-agent.c 2018-08-15 08:22:21.000000000 -1000 +@@ -29,6 +29,8 @@ + #include + #include + ++#define INCLUDED_BY_MAIN_MODULE 1 ++#include "../common/iobuf.h" + #include "../common/i18n.h" + #include "../common/util.h" + #include "../common/asshelp.h" +diff -ur gnupg-2.2.9/tools/gpg-wks-client.c gnupg-2.2.9+iPhone/tools/gpg-wks-client.c +--- gnupg-2.2.9/tools/gpg-wks-client.c 2018-02-20 04:09:35.000000000 -1000 ++++ gnupg-2.2.9+iPhone/tools/gpg-wks-client.c 2018-08-15 08:26:19.000000000 -1000 +@@ -23,6 +23,8 @@ + #include + #include + ++#define INCLUDED_BY_MAIN_MODULE 1 ++#include "../common/iobuf.h" + #include "../common/util.h" + #include "../common/status.h" + #include "../common/i18n.h" +diff -ur gnupg-2.2.9/tools/gpg-wks.h gnupg-2.2.9+iPhone/tools/gpg-wks.h +--- gnupg-2.2.9/tools/gpg-wks.h 2018-02-20 04:06:52.000000000 -1000 ++++ gnupg-2.2.9+iPhone/tools/gpg-wks.h 2018-08-14 22:16:12.000000000 -1000 +@@ -30,6 +30,7 @@ + + + /* We keep all global options in the structure OPT. */ ++EXTERN_UNLESS_MAIN_MODULE + struct + { + int verbose; +diff -ur gnupg-2.2.9/tools/gpgconf.c gnupg-2.2.9+iPhone/tools/gpgconf.c +--- gnupg-2.2.9/tools/gpgconf.c 2018-04-09 02:40:19.000000000 -1000 ++++ gnupg-2.2.9+iPhone/tools/gpgconf.c 2018-08-14 22:29:44.000000000 -1000 +@@ -25,7 +25,9 @@ + #include + #include + ++#define INCLUDED_BY_MAIN_MODULE 1 + #include "gpgconf.h" ++#include "../common/iobuf.h" + #include "../common/i18n.h" + #include "../common/sysutils.h" + #include "../common/init.h" +diff -ur gnupg-2.2.9/tools/gpgconf.h gnupg-2.2.9+iPhone/tools/gpgconf.h +--- gnupg-2.2.9/tools/gpgconf.h 2017-12-18 06:07:27.000000000 -1000 ++++ gnupg-2.2.9+iPhone/tools/gpgconf.h 2018-08-15 08:32:29.000000000 -1000 +@@ -23,6 +23,7 @@ + #include "../common/util.h" + + /* We keep all global options in the structure OPT. */ ++EXTERN_UNLESS_MAIN_MODULE + struct + { + int verbose; /* Verbosity level. */ +diff -ur gnupg-2.2.9/tools/gpgtar.c gnupg-2.2.9+iPhone/tools/gpgtar.c +--- gnupg-2.2.9/tools/gpgtar.c 2017-08-28 00:22:54.000000000 -1000 ++++ gnupg-2.2.9+iPhone/tools/gpgtar.c 2018-08-15 08:25:45.000000000 -1000 +@@ -34,6 +34,8 @@ + #include + #include + ++#define INCLUDED_BY_MAIN_MODULE 1 ++#include "../common/iobuf.h" + #include "../common/util.h" + #include "../common/i18n.h" + #include "../common/sysutils.h" +diff -ur gnupg-2.2.9/tools/gpgtar.h gnupg-2.2.9+iPhone/tools/gpgtar.h +--- gnupg-2.2.9/tools/gpgtar.h 2017-08-28 00:22:54.000000000 -1000 ++++ gnupg-2.2.9+iPhone/tools/gpgtar.h 2018-08-15 08:31:48.000000000 -1000 +@@ -24,6 +24,7 @@ + #include "../common/strlist.h" + + /* We keep all global options in the structure OPT. */ ++EXTERN_UNLESS_MAIN_MODULE + struct + { + int verbose; 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 Binary files a/data/gnupg/gnupg-1.4.9.tar.bz2 and /dev/null differ diff --git a/data/gnupg/gnupg-2.2.9.tar.bz2 b/data/gnupg/gnupg-2.2.9.tar.bz2 new file mode 100644 index 000000000..26298670f Binary files /dev/null and b/data/gnupg/gnupg-2.2.9.tar.bz2 differ 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/gcrypt.dep b/data/gnupg2/_metadata/gcrypt.dep deleted file mode 120000 index 0a21c7b07..000000000 --- a/data/gnupg2/_metadata/gcrypt.dep +++ /dev/null @@ -1 +0,0 @@ -../../gcrypt \ No newline at end of file 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/_metadata/gnutls.dep b/data/gnupg2/_metadata/gnutls.dep deleted file mode 120000 index 2dbb733a2..000000000 --- a/data/gnupg2/_metadata/gnutls.dep +++ /dev/null @@ -1 +0,0 @@ -../../gnutls \ No newline at end of file diff --git a/data/gnupg2/_metadata/libassuan.dep b/data/gnupg2/_metadata/libassuan.dep deleted file mode 120000 index faf83d0e8..000000000 --- a/data/gnupg2/_metadata/libassuan.dep +++ /dev/null @@ -1 +0,0 @@ -../../libassuan \ No newline at end of file diff --git a/data/gnupg2/_metadata/libksba.dep b/data/gnupg2/_metadata/libksba.dep deleted file mode 120000 index af0be215f..000000000 --- a/data/gnupg2/_metadata/libksba.dep +++ /dev/null @@ -1 +0,0 @@ -../../libksba \ No newline at end of file diff --git a/data/gnupg2/_metadata/npth.dep b/data/gnupg2/_metadata/npth.dep deleted file mode 120000 index ba035bc31..000000000 --- a/data/gnupg2/_metadata/npth.dep +++ /dev/null @@ -1 +0,0 @@ -../../npth \ No newline at end of file diff --git a/data/gnupg2/extern.diff b/data/gnupg2/extern.diff deleted file mode 100644 index 883324693..000000000 --- a/data/gnupg2/extern.diff +++ /dev/null @@ -1,328 +0,0 @@ -diff -ur gnupg-2.2.9/agent/agent.h gnupg-2.2.9+iPhone/agent/agent.h ---- gnupg-2.2.9/agent/agent.h 2018-06-12 01:25:39.000000000 -1000 -+++ gnupg-2.2.9+iPhone/agent/agent.h 2018-08-15 08:34:08.000000000 -1000 -@@ -55,6 +55,7 @@ - - - /* A large struct name "opt" to keep global flags */ -+EXTERN_UNLESS_MAIN_MODULE - struct - { - unsigned int debug; /* Debug flags (DBG_foo_VALUE) */ -diff -ur gnupg-2.2.9/agent/gpg-agent.c gnupg-2.2.9+iPhone/agent/gpg-agent.c ---- gnupg-2.2.9/agent/gpg-agent.c 2018-06-06 06:29:59.000000000 -1000 -+++ gnupg-2.2.9+iPhone/agent/gpg-agent.c 2018-08-14 22:16:12.000000000 -1000 -@@ -50,9 +50,11 @@ - #include - - #define GNUPG_COMMON_NEED_AFLOCAL -+#define INCLUDED_BY_MAIN_MODULE 1 - #include "agent.h" - #include /* Malloc hooks and socket wrappers. */ - -+#include "../common/iobuf.h" - #include "../common/i18n.h" - #include "../common/sysutils.h" - #include "../common/gc-opt-flags.h" -diff -ur gnupg-2.2.9/agent/preset-passphrase.c gnupg-2.2.9+iPhone/agent/preset-passphrase.c ---- gnupg-2.2.9/agent/preset-passphrase.c 2017-08-28 00:22:54.000000000 -1000 -+++ gnupg-2.2.9+iPhone/agent/preset-passphrase.c 2018-08-14 22:16:12.000000000 -1000 -@@ -44,6 +44,7 @@ - # include /* To initialize the sockets. fixme */ - #endif - -+#define INCLUDED_BY_MAIN_MODULE 1 - #include "agent.h" - #include "../common/simple-pwquery.h" - #include "../common/i18n.h" -diff -ur gnupg-2.2.9/agent/protect-tool.c gnupg-2.2.9+iPhone/agent/protect-tool.c ---- gnupg-2.2.9/agent/protect-tool.c 2018-03-26 20:13:47.000000000 -1000 -+++ gnupg-2.2.9+iPhone/agent/protect-tool.c 2018-08-14 22:22:40.000000000 -1000 -@@ -38,7 +38,9 @@ - #include /* for setmode() */ - #endif - -+#define INCLUDED_BY_MAIN_MODULE 1 - #include "agent.h" -+#include "../common/iobuf.h" - #include "../common/i18n.h" - #include "../common/get-passphrase.h" - #include "../common/sysutils.h" -diff -ur gnupg-2.2.9/agent/t-protect.c gnupg-2.2.9+iPhone/agent/t-protect.c ---- gnupg-2.2.9/agent/t-protect.c 2017-12-07 20:40:06.000000000 -1000 -+++ gnupg-2.2.9+iPhone/agent/t-protect.c 2018-08-14 22:16:12.000000000 -1000 -@@ -23,6 +23,7 @@ - #include - #include - -+#define INCLUDED_BY_MAIN_MODULE 1 - #include "agent.h" - - -diff -ur gnupg-2.2.9/common/iobuf.h gnupg-2.2.9+iPhone/common/iobuf.h ---- gnupg-2.2.9/common/iobuf.h 2018-06-12 01:25:39.000000000 -1000 -+++ gnupg-2.2.9+iPhone/common/iobuf.h 2018-08-14 22:16:12.000000000 -1000 -@@ -250,7 +250,7 @@ - }; - - #ifndef EXTERN_UNLESS_MAIN_MODULE --#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) -+#if (defined (__riscos__) || defined (__APPLE__)) && !defined (INCLUDED_BY_MAIN_MODULE) - #define EXTERN_UNLESS_MAIN_MODULE extern - #else - #define EXTERN_UNLESS_MAIN_MODULE -diff -ur gnupg-2.2.9/common/t-iobuf.c gnupg-2.2.9+iPhone/common/t-iobuf.c ---- gnupg-2.2.9/common/t-iobuf.c 2017-08-28 00:22:54.000000000 -1000 -+++ gnupg-2.2.9+iPhone/common/t-iobuf.c 2018-08-14 22:16:12.000000000 -1000 -@@ -4,6 +4,7 @@ - #include - #include - -+#define INCLUDED_BY_MAIN_MODULE 1 - #include "iobuf.h" - #include "stringhelp.h" - -diff -ur gnupg-2.2.9/common/t-name-value.c gnupg-2.2.9+iPhone/common/t-name-value.c ---- gnupg-2.2.9/common/t-name-value.c 2017-08-28 00:22:54.000000000 -1000 -+++ gnupg-2.2.9+iPhone/common/t-name-value.c 2018-08-14 22:16:12.000000000 -1000 -@@ -25,6 +25,8 @@ - #include - #include - -+#define INCLUDED_BY_MAIN_MODULE 1 -+#include "iobuf.h" - #include "util.h" - #include "name-value.h" - -diff -ur gnupg-2.2.9/common/t-strlist.c gnupg-2.2.9+iPhone/common/t-strlist.c ---- gnupg-2.2.9/common/t-strlist.c 2017-08-28 00:22:54.000000000 -1000 -+++ gnupg-2.2.9+iPhone/common/t-strlist.c 2018-08-14 22:16:12.000000000 -1000 -@@ -31,6 +31,8 @@ - #include - #include - -+#define INCLUDED_BY_MAIN_MODULE 1 -+#include "iobuf.h" - #include "strlist.h" - - #include "t-support.h" -diff -ur gnupg-2.2.9/common/util.h gnupg-2.2.9+iPhone/common/util.h ---- gnupg-2.2.9/common/util.h 2018-06-12 01:25:39.000000000 -1000 -+++ gnupg-2.2.9+iPhone/common/util.h 2018-08-15 08:24:16.000000000 -1000 -@@ -55,6 +55,13 @@ - # define GPG_ERR_DNS_TIMEOUT 718 - #endif - -+#ifndef EXTERN_UNLESS_MAIN_MODULE -+#if (defined (__riscos__) || defined (__APPLE__)) && !defined (INCLUDED_BY_MAIN_MODULE) -+#define EXTERN_UNLESS_MAIN_MODULE extern -+#else -+#define EXTERN_UNLESS_MAIN_MODULE -+#endif -+#endif - - /* Hash function used with libksba. */ - #define HASH_FNC ((void (*)(void *, const void*,size_t))gcry_md_write) -diff -ur gnupg-2.2.9/dirmngr/dirmngr.c gnupg-2.2.9+iPhone/dirmngr/dirmngr.c ---- gnupg-2.2.9/dirmngr/dirmngr.c 2018-06-12 01:25:39.000000000 -1000 -+++ gnupg-2.2.9+iPhone/dirmngr/dirmngr.c 2018-08-14 22:28:37.000000000 -1000 -@@ -56,10 +56,12 @@ - - - #define GNUPG_COMMON_NEED_AFLOCAL -+#define INCLUDED_BY_MAIN_MODULE 1 - #include "dirmngr.h" - - #include - -+#include "../common/iobuf.h" - #include "certcache.h" - #include "crlcache.h" - #include "crlfetch.h" -diff -ur gnupg-2.2.9/dirmngr/dirmngr.h gnupg-2.2.9+iPhone/dirmngr/dirmngr.h ---- gnupg-2.2.9/dirmngr/dirmngr.h 2017-12-11 00:30:45.000000000 -1000 -+++ gnupg-2.2.9+iPhone/dirmngr/dirmngr.h 2018-08-15 08:35:31.000000000 -1000 -@@ -75,6 +75,7 @@ - - - /* A large struct named "opt" to keep global flags. */ -+EXTERN_UNLESS_MAIN_MODULE - struct - { - unsigned int debug; /* debug flags (DBG_foo_VALUE) */ -diff -ur gnupg-2.2.9/g10/options.h gnupg-2.2.9+iPhone/g10/options.h ---- gnupg-2.2.9/g10/options.h 2018-06-12 01:25:39.000000000 -1000 -+++ gnupg-2.2.9+iPhone/g10/options.h 2018-08-15 08:31:23.000000000 -1000 -@@ -30,15 +30,6 @@ - #include "../common/session-env.h" - #include "../common/compliance.h" - --#ifndef EXTERN_UNLESS_MAIN_MODULE --/* Norcraft can't cope with common symbols */ --#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) --#define EXTERN_UNLESS_MAIN_MODULE extern --#else --#define EXTERN_UNLESS_MAIN_MODULE --#endif --#endif -- - /* Declaration of a keyserver spec type. The definition is found in - ../common/keyserver.h. */ - struct keyserver_spec; -diff -ur gnupg-2.2.9/kbx/kbxutil.c gnupg-2.2.9+iPhone/kbx/kbxutil.c ---- gnupg-2.2.9/kbx/kbxutil.c 2018-06-12 01:25:39.000000000 -1000 -+++ gnupg-2.2.9+iPhone/kbx/kbxutil.c 2018-08-14 22:16:12.000000000 -1000 -@@ -29,6 +29,8 @@ - #include - - #include -+#define INCLUDED_BY_MAIN_MODULE 1 -+#include "../common/iobuf.h" - #include "../common/logging.h" - #include "../common/argparse.h" - #include "../common/stringhelp.h" -diff -ur gnupg-2.2.9/scd/scdaemon.c gnupg-2.2.9+iPhone/scd/scdaemon.c ---- gnupg-2.2.9/scd/scdaemon.c 2018-03-21 08:43:33.000000000 -1000 -+++ gnupg-2.2.9+iPhone/scd/scdaemon.c 2018-08-14 22:25:31.000000000 -1000 -@@ -38,12 +38,14 @@ - #include - - #define GNUPG_COMMON_NEED_AFLOCAL -+#define INCLUDED_BY_MAIN_MODULE 1 - #include "scdaemon.h" - #include - #include - - #include /* malloc hooks */ - -+#include "../common/iobuf.h" - #include "../common/i18n.h" - #include "../common/sysutils.h" - #include "app-common.h" -diff -ur gnupg-2.2.9/scd/scdaemon.h gnupg-2.2.9+iPhone/scd/scdaemon.h ---- gnupg-2.2.9/scd/scdaemon.h 2017-08-28 00:22:54.000000000 -1000 -+++ gnupg-2.2.9+iPhone/scd/scdaemon.h 2018-08-15 08:35:05.000000000 -1000 -@@ -44,6 +44,7 @@ - - - /* A large struct name "opt" to keep global flags. */ -+EXTERN_UNLESS_MAIN_MODULE - struct - { - unsigned int debug; /* Debug flags (DBG_foo_VALUE). */ -diff -ur gnupg-2.2.9/sm/gpgsm.c gnupg-2.2.9+iPhone/sm/gpgsm.c ---- gnupg-2.2.9/sm/gpgsm.c 2018-06-12 01:25:39.000000000 -1000 -+++ gnupg-2.2.9+iPhone/sm/gpgsm.c 2018-08-14 22:16:12.000000000 -1000 -@@ -28,6 +28,7 @@ - #include - /*#include */ - -+#define INCLUDED_BY_MAIN_MODULE 1 - #include "gpgsm.h" - #include - #include /* malloc hooks */ -diff -ur gnupg-2.2.9/sm/gpgsm.h gnupg-2.2.9+iPhone/sm/gpgsm.h ---- gnupg-2.2.9/sm/gpgsm.h 2018-06-12 01:25:39.000000000 -1000 -+++ gnupg-2.2.9+iPhone/sm/gpgsm.h 2018-08-15 08:36:03.000000000 -1000 -@@ -52,6 +52,7 @@ - - - /* A large struct named "opt" to keep global flags. */ -+EXTERN_UNLESS_MAIN_MODULE - struct - { - unsigned int debug; /* debug flags (DBG_foo_VALUE) */ -diff -ur gnupg-2.2.9/tools/gpg-check-pattern.c gnupg-2.2.9+iPhone/tools/gpg-check-pattern.c ---- gnupg-2.2.9/tools/gpg-check-pattern.c 2017-08-28 00:22:54.000000000 -1000 -+++ gnupg-2.2.9+iPhone/tools/gpg-check-pattern.c 2018-08-15 08:26:34.000000000 -1000 -@@ -40,6 +40,8 @@ - #include - #include - -+#define INCLUDED_BY_MAIN_MODULE 1 -+#include "../common/iobuf.h" - #include "../common/util.h" - #include "../common/i18n.h" - #include "../common/sysutils.h" -diff -ur gnupg-2.2.9/tools/gpg-connect-agent.c gnupg-2.2.9+iPhone/tools/gpg-connect-agent.c ---- gnupg-2.2.9/tools/gpg-connect-agent.c 2017-08-28 00:22:54.000000000 -1000 -+++ gnupg-2.2.9+iPhone/tools/gpg-connect-agent.c 2018-08-15 08:22:21.000000000 -1000 -@@ -29,6 +29,8 @@ - #include - #include - -+#define INCLUDED_BY_MAIN_MODULE 1 -+#include "../common/iobuf.h" - #include "../common/i18n.h" - #include "../common/util.h" - #include "../common/asshelp.h" -diff -ur gnupg-2.2.9/tools/gpg-wks-client.c gnupg-2.2.9+iPhone/tools/gpg-wks-client.c ---- gnupg-2.2.9/tools/gpg-wks-client.c 2018-02-20 04:09:35.000000000 -1000 -+++ gnupg-2.2.9+iPhone/tools/gpg-wks-client.c 2018-08-15 08:26:19.000000000 -1000 -@@ -23,6 +23,8 @@ - #include - #include - -+#define INCLUDED_BY_MAIN_MODULE 1 -+#include "../common/iobuf.h" - #include "../common/util.h" - #include "../common/status.h" - #include "../common/i18n.h" -diff -ur gnupg-2.2.9/tools/gpg-wks.h gnupg-2.2.9+iPhone/tools/gpg-wks.h ---- gnupg-2.2.9/tools/gpg-wks.h 2018-02-20 04:06:52.000000000 -1000 -+++ gnupg-2.2.9+iPhone/tools/gpg-wks.h 2018-08-14 22:16:12.000000000 -1000 -@@ -30,6 +30,7 @@ - - - /* We keep all global options in the structure OPT. */ -+EXTERN_UNLESS_MAIN_MODULE - struct - { - int verbose; -diff -ur gnupg-2.2.9/tools/gpgconf.c gnupg-2.2.9+iPhone/tools/gpgconf.c ---- gnupg-2.2.9/tools/gpgconf.c 2018-04-09 02:40:19.000000000 -1000 -+++ gnupg-2.2.9+iPhone/tools/gpgconf.c 2018-08-14 22:29:44.000000000 -1000 -@@ -25,7 +25,9 @@ - #include - #include - -+#define INCLUDED_BY_MAIN_MODULE 1 - #include "gpgconf.h" -+#include "../common/iobuf.h" - #include "../common/i18n.h" - #include "../common/sysutils.h" - #include "../common/init.h" -diff -ur gnupg-2.2.9/tools/gpgconf.h gnupg-2.2.9+iPhone/tools/gpgconf.h ---- gnupg-2.2.9/tools/gpgconf.h 2017-12-18 06:07:27.000000000 -1000 -+++ gnupg-2.2.9+iPhone/tools/gpgconf.h 2018-08-15 08:32:29.000000000 -1000 -@@ -23,6 +23,7 @@ - #include "../common/util.h" - - /* We keep all global options in the structure OPT. */ -+EXTERN_UNLESS_MAIN_MODULE - struct - { - int verbose; /* Verbosity level. */ -diff -ur gnupg-2.2.9/tools/gpgtar.c gnupg-2.2.9+iPhone/tools/gpgtar.c ---- gnupg-2.2.9/tools/gpgtar.c 2017-08-28 00:22:54.000000000 -1000 -+++ gnupg-2.2.9+iPhone/tools/gpgtar.c 2018-08-15 08:25:45.000000000 -1000 -@@ -34,6 +34,8 @@ - #include - #include - -+#define INCLUDED_BY_MAIN_MODULE 1 -+#include "../common/iobuf.h" - #include "../common/util.h" - #include "../common/i18n.h" - #include "../common/sysutils.h" -diff -ur gnupg-2.2.9/tools/gpgtar.h gnupg-2.2.9+iPhone/tools/gpgtar.h ---- gnupg-2.2.9/tools/gpgtar.h 2017-08-28 00:22:54.000000000 -1000 -+++ gnupg-2.2.9+iPhone/tools/gpgtar.h 2018-08-15 08:31:48.000000000 -1000 -@@ -24,6 +24,7 @@ - #include "../common/strlist.h" - - /* We keep all global options in the structure OPT. */ -+EXTERN_UNLESS_MAIN_MODULE - struct - { - int verbose; diff --git a/data/gnupg2/gnupg-2.2.9.tar.bz2 b/data/gnupg2/gnupg-2.2.9.tar.bz2 deleted file mode 100644 index 26298670f..000000000 Binary files a/data/gnupg2/gnupg-2.2.9.tar.bz2 and /dev/null differ 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" -- cgit v1.2.3