diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2008-03-06 11:44:31 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2008-03-06 11:44:31 +0000 |
| commit | b571c50a25d86b4babfdfb1e050ebb410b5b9f21 (patch) | |
| tree | d5e1e464dfee932c2a0c6208dbd090939ba6f8fd /net-im/jabber | |
| parent | d211c2293faa00ed8236a37ca7d1952c1340a61f (diff) | |
| download | freebsd-ports-b571c50a25d86b4babfdfb1e050ebb410b5b9f21.zip | |
- Add patch to fix build with gnutls 2.2.x
Diffstat (limited to 'net-im/jabber')
| -rw-r--r-- | net-im/jabber/files/patch-jabberd-mio_tls.cc | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/net-im/jabber/files/patch-jabberd-mio_tls.cc b/net-im/jabber/files/patch-jabberd-mio_tls.cc new file mode 100644 index 000000000000..12bc9f54aadd --- /dev/null +++ b/net-im/jabber/files/patch-jabberd-mio_tls.cc @@ -0,0 +1,44 @@ +--- jabberd/mio_tls.cc.orig 2008-03-06 10:21:01.669677189 +0100 ++++ jabberd/mio_tls.cc 2008-03-06 10:35:04.744064592 +0100 +@@ -612,7 +612,7 @@ + } + + // load OpenPGP key/certificate +- ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile); ++ ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile, GNUTLS_OPENPGP_FMT_BASE64); + if (ret < 0) { + log_error(NULL, "Error loading OpenPGP key pub=%s/priv=%s: %s", pubfile, privfile, gnutls_strerror(ret)); + continue; +@@ -631,7 +631,7 @@ + } + + // load the OpenPGP keyring +- ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file); ++ ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file, GNUTLS_OPENPGP_FMT_BASE64); + if (ret < 0) { + log_error(NULL, "Error loading OpenPGP keyring %s: %s", file, gnutls_strerror(ret)); + continue; +@@ -640,23 +640,6 @@ + continue; + } + +- // load GnuPG trustdb +- if (j_strcmp(xmlnode_get_localname(cur), "trustdb") == 0) { +- char const *const file = xmlnode_get_data(cur); +- +- if (file == NULL) { +- log_warn(NULL, "Initializing TLS subsystem: <trustdb/> element inside the TLS configuration, that does not contain a file-name."); +- continue; +- } +- +- // load the GnuPG trustdb +- ret = gnutls_certificate_set_openpgp_trustdb(current_credentials, file); +- if (ret < 0) { +- log_error(NULL, "Error loading GnuPG trustdb %s: %s", file, gnutls_strerror(ret)); +- continue; +- } +- } +- + // setup protocols to use + if (j_strcmp(xmlnode_get_localname(cur), "protocols") == 0) { + char const *const protocols_data = xmlnode_get_data(cur); |