diff options
| author |   David Spencer <baildon.research@googlemail.com> | 2015-12-22 10:36:55 +0000 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-01-17 09:40:16 +0700 |
| commit | 4af65c01a9c745f50b38d076a213030bc6127df2 (patch) | |
| tree | f91227695c3d43232af097fa513e56bfdaaed88c /network/aiccu/10_gnutls34.patch | |
| parent | dc1a15950a05f4c97369be70a9887bb48da291d5 (diff) | |
| download | slackbuilds-4af65c01a9c745f50b38d076a213030bc6127df2.tar.gz slackbuilds-4af65c01a9c745f50b38d076a213030bc6127df2.tar.xz | |
network/aiccu: Patched to build with gnutls-3.4.
Signed-off-by: David Spencer <baildon.research@googlemail.com>
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'network/aiccu/10_gnutls34.patch')
| -rw-r--r-- | network/aiccu/10_gnutls34.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/network/aiccu/10_gnutls34.patch b/network/aiccu/10_gnutls34.patch new file mode 100644 index 0000000000..e8768eaa66 --- /dev/null +++ b/network/aiccu/10_gnutls34.patch @@ -0,0 +1,35 @@ +Description: GnuTLS 3.4 compat. + Use GnuTLS priority NORMAL:+CTYPE-OPENPGP instead of deprecated (and removed in GnuTLS 3.4) function gnutls_certificate_type_set_priority. +Author: Andreas Metzler <ametzler@debian.org> +Bug-Debian: https://bugs.debian.org/624056 +Origin: vendor +Forwarded: no +Last-Update: 2015-07-25 + +--- aiccu-20070115.orig/common/common.c ++++ aiccu-20070115/common/common.c +@@ -271,8 +271,6 @@ TLSSOCKET sock_alloc(void); + TLSSOCKET sock_alloc(void) + { + #ifdef AICCU_GNUTLS +- /* Allow connections to servers that have OpenPGP keys as well */ +- const int cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 }; + int ret; + #endif /* AICCU_GNUTLS*/ + +@@ -297,11 +295,10 @@ TLSSOCKET sock_alloc(void) + } + + /* Use default priorities */ +- gnutls_set_default_priority(sock->session); +- /* XXX: Return value is not documented in GNUTLS documentation! */ +- +- gnutls_certificate_type_set_priority(sock->session, cert_type_priority); +- /* XXX: Return value is not documented in GNUTLS documentation! */ ++ /* Allow connections to servers that have OpenPGP keys as well */ ++ gnutls_priority_set_direct(sock->session, ++ "NORMAL:+CTYPE-OPENPGP", ++ NULL); + + /* Configure the x509 credentials for the current session */ + gnutls_credentials_set(sock->session, GNUTLS_CRD_CERTIFICATE, g_aiccu->tls_cred); |