diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | PKGBUILD.sig | bin | 543 -> 543 bytes | |||
| -rw-r--r-- | gnupg2-large-keys.patch | 27 | ||||
| -rw-r--r-- | gnupg2-large-keys.patch.sig | bin | 543 -> 543 bytes |
5 files changed, 29 insertions, 18 deletions
@@ -1,6 +1,6 @@ pkgbase = gnupg-largekeys pkgdesc = Complete and free implementation of the OpenPGP standard - pkgver = 2.0.25 + pkgver = 2.0.26 pkgrel = 1 url = http://www.gnupg.org/ install = install @@ -21,22 +21,22 @@ pkgbase = gnupg-largekeys optdepends = curl: gpg2keys_curl optdepends = libldap: gpg2keys_ldap optdepends = libusb-compat: scdaemon - provides = gnupg2=2.0.25 - provides = gnupg=2.0.25 + provides = gnupg2=2.0.26 + provides = gnupg=2.0.26 conflicts = gnupg2 conflicts = gnupg replaces = gnupg2 replaces = gnupg - source = ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.0.25.tar.bz2 - source = ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.0.25.tar.bz2.sig + source = ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.0.26.tar.bz2 + source = ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.0.26.tar.bz2.sig source = gnupg2-large-keys.patch source = gnupg2-large-keys.patch.sig source = install source = install.sig source = PKGBUILD.sig - sha1sums = 890d77d89f2d187382f95e83e386f2f7ba789436 + sha1sums = 3ff5b38152c919724fd09cf2f17df704272ba192 sha1sums = SKIP - sha1sums = a77b9616d238fbdd5488e7024e5e1f36ce8ed586 + sha1sums = 05ecf25e4ce1df859a33e7cb3f773e78bbc09da6 sha1sums = SKIP sha1sums = ff80fc79329cfa631c19ae1ea6fc4a390ab851f7 sha1sums = SKIP @@ -11,7 +11,7 @@ # pkgname=gnupg-largekeys -pkgver=2.0.25 +pkgver=2.0.26 pkgrel=1 pkgdesc='Complete and free implementation of the OpenPGP standard' url='http://www.gnupg.org/' @@ -26,8 +26,8 @@ source=("ftp://ftp.gnupg.org/gcrypt/${pkgname%%-largekeys}/${pkgname%%-largekeys 'gnupg2-large-keys.patch'{,.sig} 'install'{,.sig} 'PKGBUILD.sig') -sha1sums=('890d77d89f2d187382f95e83e386f2f7ba789436' 'SKIP' - 'a77b9616d238fbdd5488e7024e5e1f36ce8ed586' 'SKIP' +sha1sums=('3ff5b38152c919724fd09cf2f17df704272ba192' 'SKIP' + '05ecf25e4ce1df859a33e7cb3f773e78bbc09da6' 'SKIP' 'ff80fc79329cfa631c19ae1ea6fc4a390ab851f7' 'SKIP' 'SKIP') diff --git a/PKGBUILD.sig b/PKGBUILD.sig Binary files differindex a5f985f9dcab..bcd7f279dd4d 100644 --- a/PKGBUILD.sig +++ b/PKGBUILD.sig diff --git a/gnupg2-large-keys.patch b/gnupg2-large-keys.patch index dfd8d8c40ef7..e4d2205262cc 100644 --- a/gnupg2-large-keys.patch +++ b/gnupg2-large-keys.patch @@ -1,7 +1,8 @@ -diff -rupN old/g10/gpg.c new/g10/gpg.c ---- old/g10/gpg.c 2013-10-04 08:32:53.000000000 -0400 -+++ new/g10/gpg.c 2013-11-03 21:36:43.271787518 -0500 -@@ -2050,7 +2050,7 @@ main (int argc, char **argv) +diff --git a/g10/gpg.c b/g10/gpg.c +index 1a8e6e7..0d1e15e 100644 +--- a/g10/gpg.c ++++ b/g10/gpg.c +@@ -2059,7 +2059,7 @@ main (int argc, char **argv) #endif /* Initialize the secure memory. */ @@ -10,10 +11,20 @@ diff -rupN old/g10/gpg.c new/g10/gpg.c got_secmem = 1; #if defined(HAVE_GETUID) && defined(HAVE_GETEUID) /* There should be no way to get to this spot while still carrying -diff -rupN old/g10/keygen.c new/g10/keygen.c ---- old/g10/keygen.c 2013-10-04 09:00:22.000000000 -0400 -+++ new/g10/keygen.c 2013-11-03 21:36:59.932182593 -0500 -@@ -1771,7 +1771,7 @@ ask_algo (int addmode, int *r_subkey_alg +diff --git a/g10/keygen.c b/g10/keygen.c +index 6d3dfa6..71bdd03 100644 +--- a/g10/keygen.c ++++ b/g10/keygen.c +@@ -1175,7 +1175,7 @@ gen_elg (int algo, unsigned int nbits, + nbits = 2048; + log_info (_("keysize invalid; using %u bits\n"), nbits ); + } +- else if (nbits > 4096) ++ else if (nbits > 65535) + { + nbits = 4096; + log_info (_("keysize invalid; using %u bits\n"), nbits ); +@@ -1781,7 +1781,7 @@ ask_algo (int addmode, int *r_subkey_algo, unsigned int *r_usage) static unsigned ask_keysize (int algo, unsigned int primary_keysize) { diff --git a/gnupg2-large-keys.patch.sig b/gnupg2-large-keys.patch.sig Binary files differindex 971a1b374123..ec5f8a72f63e 100644 --- a/gnupg2-large-keys.patch.sig +++ b/gnupg2-large-keys.patch.sig |