diff options
| -rw-r--r-- | package/gnupg/Makefile | 6 | ||||
| -rw-r--r-- | package/gnupg/patches/patch-doc_Makefile_in | 6 | ||||
| -rw-r--r-- | package/gnupg/patches/patch-g10_options_h | 11 | ||||
| -rw-r--r-- | package/gnupg/patches/patch-include_cipher_h | 11 | ||||
| -rw-r--r-- | package/gnupg/patches/patch-include_iobuf_h | 11 | ||||
| -rw-r--r-- | package/gnupg/patches/patch-include_memory_h | 11 | ||||
| -rw-r--r-- | package/gnupg/patches/patch-include_mpi_h | 11 |
7 files changed, 61 insertions, 6 deletions
diff --git a/package/gnupg/Makefile b/package/gnupg/Makefile index 8737f9e..0794aa3 100644 --- a/package/gnupg/Makefile +++ b/package/gnupg/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gnupg -PKG_VERSION:= 1.4.22 +PKG_VERSION:= 1.4.23 PKG_RELEASE:= 1 -PKG_HASH:= 324f70b5df76a4825bce50d2b1702ec3a0fac0d681540bbea1c9aa1e39814fbc +PKG_HASH:= c9462f17e651b6507848c08c430c791287cd75491f8b5a8b50c6ed46b12678ba PKG_DESCR:= gnu privacy guard PKG_SECTION:= app/crypto PKG_DEPENDS:= libreadline libncurses @@ -14,7 +14,7 @@ PKG_BUILDDEP:= readline ncurses PKG_URL:= http://www.gnupg.org/ PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/gnupg/ -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SUBPKGS:= GNUPG GPGV diff --git a/package/gnupg/patches/patch-doc_Makefile_in b/package/gnupg/patches/patch-doc_Makefile_in index dd87972..a92720d 100644 --- a/package/gnupg/patches/patch-doc_Makefile_in +++ b/package/gnupg/patches/patch-doc_Makefile_in @@ -1,6 +1,6 @@ ---- gnupg-1.4.10.orig/doc/Makefile.in 2009-09-02 18:20:22.000000000 +0200 -+++ gnupg-1.4.10/doc/Makefile.in 2011-02-24 15:30:49.000000000 +0100 -@@ -833,7 +833,7 @@ uninstall-man: uninstall-man1 uninstall- +--- gnupg-1.4.23.orig/doc/Makefile.in 2018-06-11 10:47:56.000000000 +0200 ++++ gnupg-1.4.23/doc/Makefile.in 2021-09-17 16:02:49.904418167 +0200 +@@ -952,7 +952,7 @@ uninstall-man: uninstall-man1 yat2m: Makefile yat2m.c diff --git a/package/gnupg/patches/patch-g10_options_h b/package/gnupg/patches/patch-g10_options_h new file mode 100644 index 0000000..8481ecc --- /dev/null +++ b/package/gnupg/patches/patch-g10_options_h @@ -0,0 +1,11 @@ +--- gnupg-1.4.23.orig/g10/options.h 2016-08-17 11:00:11.000000000 +0200 ++++ gnupg-1.4.23/g10/options.h 2021-09-17 16:07:15.504427621 +0200 +@@ -29,6 +29,8 @@ + /* Norcraft can't cope with common symbols */ + #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) + #define EXTERN_UNLESS_MAIN_MODULE extern ++#elif defined (__GNUC__) && __GNUC__ >= 10 ++#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__)) + #else + #define EXTERN_UNLESS_MAIN_MODULE + #endif diff --git a/package/gnupg/patches/patch-include_cipher_h b/package/gnupg/patches/patch-include_cipher_h new file mode 100644 index 0000000..4ce471b --- /dev/null +++ b/package/gnupg/patches/patch-include_cipher_h @@ -0,0 +1,11 @@ +--- gnupg-1.4.23.orig/include/cipher.h 2016-04-22 09:30:18.000000000 +0200 ++++ gnupg-1.4.23/include/cipher.h 2021-09-17 16:07:15.504427621 +0200 +@@ -117,6 +117,8 @@ typedef struct gcry_md_context *MD_HANDL + #ifndef EXTERN_UNLESS_MAIN_MODULE + #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) + #define EXTERN_UNLESS_MAIN_MODULE extern ++#elif defined (__GNUC__) && __GNUC__ >= 10 ++#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__)) + #else + #define EXTERN_UNLESS_MAIN_MODULE + #endif diff --git a/package/gnupg/patches/patch-include_iobuf_h b/package/gnupg/patches/patch-include_iobuf_h new file mode 100644 index 0000000..31c8739 --- /dev/null +++ b/package/gnupg/patches/patch-include_iobuf_h @@ -0,0 +1,11 @@ +--- gnupg-1.4.23.orig/include/iobuf.h 2016-04-22 09:30:18.000000000 +0200 ++++ gnupg-1.4.23/include/iobuf.h 2021-09-17 16:07:15.504427621 +0200 +@@ -72,6 +72,8 @@ struct iobuf_struct { + #ifndef EXTERN_UNLESS_MAIN_MODULE + #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) + #define EXTERN_UNLESS_MAIN_MODULE extern ++#elif defined (__GNUC__) && __GNUC__ >= 10 ++#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__)) + #else + #define EXTERN_UNLESS_MAIN_MODULE + #endif diff --git a/package/gnupg/patches/patch-include_memory_h b/package/gnupg/patches/patch-include_memory_h new file mode 100644 index 0000000..99e4faa --- /dev/null +++ b/package/gnupg/patches/patch-include_memory_h @@ -0,0 +1,11 @@ +--- gnupg-1.4.23.orig/include/memory.h 2016-04-22 09:30:18.000000000 +0200 ++++ gnupg-1.4.23/include/memory.h 2021-09-17 16:07:15.504427621 +0200 +@@ -93,6 +93,8 @@ unsigned secmem_get_flags(void); + #ifndef EXTERN_UNLESS_MAIN_MODULE + #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) + #define EXTERN_UNLESS_MAIN_MODULE extern ++#elif defined (__GNUC__) && __GNUC__ >= 10 ++#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__)) + #else + #define EXTERN_UNLESS_MAIN_MODULE + #endif diff --git a/package/gnupg/patches/patch-include_mpi_h b/package/gnupg/patches/patch-include_mpi_h new file mode 100644 index 0000000..a163720 --- /dev/null +++ b/package/gnupg/patches/patch-include_mpi_h @@ -0,0 +1,11 @@ +--- gnupg-1.4.23.orig/include/mpi.h 2016-04-22 09:30:18.000000000 +0200 ++++ gnupg-1.4.23/include/mpi.h 2021-09-17 16:07:15.508427621 +0200 +@@ -38,6 +38,8 @@ + #ifndef EXTERN_UNLESS_MAIN_MODULE + #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) + #define EXTERN_UNLESS_MAIN_MODULE extern ++#elif defined (__GNUC__) && __GNUC__ >= 10 ++#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__)) + #else + #define EXTERN_UNLESS_MAIN_MODULE + #endif |