diff options
author | Roman Bogorodskiy <novel@FreeBSD.org> | 2018-04-21 05:22:00 +0000 |
---|---|---|
committer | Roman Bogorodskiy <novel@FreeBSD.org> | 2018-04-21 05:22:00 +0000 |
commit | 8f1dc49af5fa2af30cc83b62f37db572ef19b555 (patch) | |
tree | 06f2b413e0320e459d59adec5ae2a64c50e3aa45 /security/libgpg-error | |
parent | 1aae723a680cc3750cf7c756bc865ed056a3776f (diff) | |
download | ports-8f1dc49af5fa2af30cc83b62f37db572ef19b555.tar.gz ports-8f1dc49af5fa2af30cc83b62f37db572ef19b555.zip |
Notes
Diffstat (limited to 'security/libgpg-error')
-rw-r--r-- | security/libgpg-error/Makefile | 2 | ||||
-rw-r--r-- | security/libgpg-error/distinfo | 6 | ||||
-rw-r--r-- | security/libgpg-error/files/patch-src_logging.c | 34 | ||||
-rw-r--r-- | security/libgpg-error/pkg-plist | 2 |
4 files changed, 5 insertions, 39 deletions
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile index 20006b480a94..73a346d388bf 100644 --- a/security/libgpg-error/Makefile +++ b/security/libgpg-error/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libgpg-error -PORTVERSION= 1.28 +PORTVERSION= 1.29 CATEGORIES= security devel MASTER_SITES= GNUPG diff --git a/security/libgpg-error/distinfo b/security/libgpg-error/distinfo index 486eacdac987..9451103c9d61 100644 --- a/security/libgpg-error/distinfo +++ b/security/libgpg-error/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1521214433 -SHA256 (libgpg-error-1.28.tar.bz2) = 3edb957744905412f30de3e25da18682cbe509541e18cd3b8f9df695a075da49 -SIZE (libgpg-error-1.28.tar.bz2) = 862569 +TIMESTAMP = 1524283519 +SHA256 (libgpg-error-1.29.tar.bz2) = ece926fa5719d17a7ad8da618712cfa2f8a796ab2f2af9d544c5bb093383b1ea +SIZE (libgpg-error-1.29.tar.bz2) = 894749 diff --git a/security/libgpg-error/files/patch-src_logging.c b/security/libgpg-error/files/patch-src_logging.c deleted file mode 100644 index 3f38e64d1855..000000000000 --- a/security/libgpg-error/files/patch-src_logging.c +++ /dev/null @@ -1,34 +0,0 @@ ---- src/logging.c.orig 2017-12-08 12:22:41 UTC -+++ src/logging.c -@@ -1090,9 +1090,10 @@ _gpgrt_log_flush (void) - - - /* Print a hexdump of (BUFFER,LENGTH). With FMT passed as NULL print -- * just the raw dump, with FMT being an empty string, print a trailing -- * linefeed, otherwise print an entire debug line with the expanded -- * FMT followed by a possible wrapped hexdump and a final LF. */ -+ * just the raw dump (in this case ARG_PTR is not used), with FMT -+ * being an empty string, print a trailing linefeed, otherwise print -+ * an entire debug line with the expanded FMT followed by a possible -+ * wrapped hexdump and a final LF. */ - void - _gpgrt_logv_printhex (const void *buffer, size_t length, - const char *fmt, va_list arg_ptr) -@@ -1150,7 +1151,16 @@ _gpgrt_log_printhex (const void *buffer, size_t length - va_end (arg_ptr); - } - else -- _gpgrt_logv_printhex (buffer, length, NULL, NULL); -+ { -+ /* va_list is not necessary a pointer and thus we can't use NULL -+ * because that would conflict with platforms using a straight -+ * struct for it (e.g. arm64). We use a dummy variable instead; -+ * the static is a simple way zero it out so to not get -+ * complains about uninitialized use. */ -+ static va_list dummy_argptr; -+ -+ _gpgrt_logv_printhex (buffer, length, NULL, dummy_argptr); -+ } - } - - diff --git a/security/libgpg-error/pkg-plist b/security/libgpg-error/pkg-plist index d31326ecce65..33ac045288f6 100644 --- a/security/libgpg-error/pkg-plist +++ b/security/libgpg-error/pkg-plist @@ -7,7 +7,7 @@ include/gpgrt.h lib/libgpg-error.a lib/libgpg-error.so lib/libgpg-error.so.0 -lib/libgpg-error.so.0.23.0 +lib/libgpg-error.so.0.24.0 man/man1/gpg-error-config.1.gz share/aclocal/gpg-error.m4 share/aclocal/gpgrt.m4 |