sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 09:19:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add a patch to handle an ABI change relative to libgcrypt 1.5

Browse source 
Confirmed upstream:
http://lists.gnupg.org/pipermail/gnupg-users/2011-July/042333.html

PR:		ports/158674
Submitted by:	Mark Atkinson <atkin901@gmail.com>
Approved by:	early maintainer timeout/portmgr (pav)
This commit is contained in:
Doug Barton 2011-07-14 08:19:00 +00:00
parent 0d06d2359a
commit c383c90ce5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=277672
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
security/gnupg/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= gnupg PORTNAME= gnupg
PORTVERSION= 2.0.17 PORTVERSION= 2.0.17
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= security CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= gnupg MASTER_SITE_SUBDIR= gnupg

24
security/gnupg/files/patch-g10__pkglue.c Normal file
View file

@ -0,0 +1,24 @@
--- g10/pkglue.c.orig 2011-01-09 14:06:16.000000000 -0800
+++ g10/pkglue.c 2011-07-12 21:32:41.000000000 -0700
@@ -34,10 +34,10 @@
{
gcry_sexp_t list;
gcry_mpi_t data;
-
+
list = gcry_sexp_find_token (sexp, item, 0);
assert (list);
- data = gcry_sexp_nth_mpi (list, 1, 0);
+ data = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
assert (data);
gcry_sexp_release (list);
return data;
@@ -293,7 +293,7 @@
if (rc)
return rc;
- *result = gcry_sexp_nth_mpi (s_plain, 0, 0);
+ *result = gcry_sexp_nth_mpi (s_plain, 0, GCRYMPI_FMT_USG);
gcry_sexp_release (s_plain);
if (!*result)
return -1; /* oops */