From fbf9f5e225b628c1aff46c102435f9f6d5cf722b Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Mon, 4 May 2015 12:41:46 -0400
Subject: [PATCH] contrib/gnutls: fix -Wformat-security build error
Refs #72274
Change-Id: Ib97d53f0134697a9c83b64c96c5dd2deb79bdf30
---
contrib/src/gnutls/format-security.patch | 18 ++++++++++++++++++
contrib/src/gnutls/rules.mak | 1 +
2 files changed, 19 insertions(+)
create mode 100644 contrib/src/gnutls/format-security.patch
diff --git a/contrib/src/gnutls/format-security.patch b/contrib/src/gnutls/format-security.patch
new file mode 100644
index 0000000000..f61b39b206
--- /dev/null
+++ b/contrib/src/gnutls/format-security.patch
@@ -0,0 +1,18 @@
+diff -rU0 gnutls-old/lib/x509/output.c gnutls/lib/x509/output.c
+--- gnutls-old/lib/x509/output.c
++++ gnutls/lib/x509/output.c
+@@ -1140 +1140 @@
+- addf(str, _("\t\tP: "));
++ adds(str, _("\t\tP: "));
+@@ -1145 +1145 @@
+- addf(str, _("\t\tQ: "));
++ adds(str, _("\t\tQ: "));
+@@ -1150 +1150 @@
+- addf(str, _("\t\tG: "));
++ adds(str, _("\t\tG: "));
+diff -rU0 gnutls-old/lib/x509/ocsp_output.c gnutls/lib/x509/ocsp_output.c
+--- gnutls-old/lib/x509/ocsp_output.c
++++ gnutls/lib/x509/ocsp_output.c
+@@ -291 +291 @@
+- addf(str, _("\tResponder Key ID: "));
++ adds(str, _("\tResponder Key ID: "));
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 1cb56a75d7..c13d5dea02 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -28,6 +28,7 @@ endif
$(APPLY) $(SRC)/gnutls/read-file-limits.h.patch
$(APPLY) $(SRC)/gnutls/downgrade-automake-requirement.patch
$(APPLY) $(SRC)/gnutls/mac-keychain-lookup.patch
+ $(APPLY) $(SRC)/gnutls/format-security.patch
$(call pkg_static,"lib/gnutls.pc.in")
$(UPDATE_AUTOCONFIG)
$(MOVE)
--
GitLab