diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls-3.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls-3.patch')
-rw-r--r-- | x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls-3.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls-3.patch b/x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls-3.patch new file mode 100644 index 000000000000..d68512450f8e --- /dev/null +++ b/x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls-3.patch @@ -0,0 +1,60 @@ +diff -Naur wmbiff-0.4.27.orig/wmbiff/gnutls-common.c wmbiff-0.4.27/wmbiff/gnutls-common.c +--- wmbiff-0.4.27.orig/wmbiff/gnutls-common.c 2012-07-04 21:45:00.013010829 +0200 ++++ wmbiff-0.4.27/wmbiff/gnutls-common.c 2012-07-04 21:48:39.306250592 +0200 +@@ -4,7 +4,6 @@ + #include <stdlib.h> + #include <string.h> + #include <gnutls/gnutls.h> +-#include <gnutls/extra.h> + #include <gnutls/x509.h> + #include <gnutls/openpgp.h> + #include <time.h> +@@ -335,8 +334,8 @@ + void print_cert_vrfy(gnutls_session session) + { + +- int status; +- status = gnutls_certificate_verify_peers(session); ++ int verify_ret, status; ++ verify_ret = gnutls_certificate_verify_peers2(session, &status); + printf("\n"); + + if (status == GNUTLS_E_NO_CERTIFICATE_FOUND) { +@@ -509,7 +508,6 @@ + + printf("Compression methods:"); + printf(" ZLIB"); +- printf(", LZO"); + printf(", NULL\n"); + } + +@@ -637,8 +635,6 @@ + comp_priority[j++] = GNUTLS_COMP_NULL; + if (strncasecmp(comp[i], "ZLI", 3) == 0) + comp_priority[j++] = GNUTLS_COMP_ZLIB; +- if (strncasecmp(comp[i], "LZO", 3) == 0) +- comp_priority[j++] = GNUTLS_COMP_LZO; + } + comp_priority[j] = 0; + } +diff -Naur wmbiff-0.4.27.orig/wmbiff/tlsComm.c wmbiff-0.4.27/wmbiff/tlsComm.c +--- wmbiff-0.4.27.orig/wmbiff/tlsComm.c 2012-07-04 21:45:00.013010829 +0200 ++++ wmbiff-0.4.27/wmbiff/tlsComm.c 2012-07-04 21:50:27.897367863 +0200 +@@ -410,7 +410,7 @@ + tls_check_certificate(struct connection_state *scs, + const char *remote_hostname) + { +- int certstat; ++ int verify_ret, certstat; + const gnutls_datum *cert_list; + int cert_list_size = 0; + gnutls_x509_crt cert; +@@ -419,7 +419,7 @@ + bad_certificate(scs, "Unable to get certificate from peer.\n"); + return; /* bad_cert will exit if -skip-certificate-check was not given */ + } +- certstat = gnutls_certificate_verify_peers(scs->tls_state); ++ verify_ret = gnutls_certificate_verify_peers2(scs->tls_state, &certstat); + if (certstat == GNUTLS_E_NO_CERTIFICATE_FOUND) { + bad_certificate(scs, "server presented no certificate.\n"); + #ifdef GNUTLS_CERT_CORRUPTED |