diff options
Diffstat (limited to 'x11-plugins/wmbiff/files')
3 files changed, 103 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 diff --git a/x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls.patch b/x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls.patch new file mode 100644 index 000000000000..738d8f160a7a --- /dev/null +++ b/x11-plugins/wmbiff/files/wmbiff-0.4.27-gnutls.patch @@ -0,0 +1,26 @@ +http://bugs.gentoo.org/268502 + +--- configure.ac ++++ configure.ac +@@ -77,13 +77,14 @@ + + GNUTLS_MAN_STATUS="This copy of WMBiff was not compiled with GNUTLS." + if test "$gnutls" = "ok"; then +- AM_PATH_LIBGNUTLS(1.0.4, [LIBS="$LIBS $LIBGNUTLS_LIBS" +- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" +- CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS" +- GNUTLS_COMMON_O="gnutls-common.o" +- GNUTLS_MAN_STATUS="This copy of WMBiff was compiled with GNUTLS." +- AC_CHECK_HEADERS(gnutls/gnutls.h) ], +- [ echo GNUTLS can be found at ftp://gnutls.hellug.gr/pub/gnutls ]) ++ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.0.4], ++ [LIBS="$LIBS $LIBGNUTLS_LIBS" ++ CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" ++ CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS" ++ GNUTLS_COMMON_O="gnutls-common.o" ++ GNUTLS_MAN_STATUS="This copy of WMBiff was compiled with GNUTLS." ++ AC_CHECK_HEADERS(gnutls/gnutls.h) ], ++ [ echo GNUTLS can be found at ftp://gnutls.hellug.gr/pub/gnutls ]) + else + AC_MSG_RESULT(GNUTLS support requires libz.a and libgdbm.a, so will be disabled) + fi diff --git a/x11-plugins/wmbiff/files/wmbiff-0.4.27-invalid-strncpy.patch b/x11-plugins/wmbiff/files/wmbiff-0.4.27-invalid-strncpy.patch new file mode 100644 index 000000000000..07f9bad989d6 --- /dev/null +++ b/x11-plugins/wmbiff/files/wmbiff-0.4.27-invalid-strncpy.patch @@ -0,0 +1,17 @@ +This corrupted the path for me before, so it couldn't find the file. Presumably since the glibc change to copy stuff backwards. + +diff -pudr wmbiff-0.4.27/wmbiff/mboxClient.c wmbiff-0.4.27-mik/wmbiff/mboxClient.c +--- wmbiff-0.4.27/wmbiff/mboxClient.c 2004-03-28 01:28:58.000000000 +0100 ++++ wmbiff-0.4.27-mik/wmbiff/mboxClient.c 2011-09-16 09:54:22.834144487 +0200 +@@ -149,7 +149,10 @@ int mboxCreate(Pop3 pc, const char *str) + DM(pc, DEBUG_ERROR, "mbox '%s' is too long.\n", str + 5); + memset(pc->path, 0, BUF_BIG); + } else { +- strncpy(pc->path, str + 5, BUF_BIG - 1); /* cut off ``mbox:'' */ ++ /* str is always pc.path, so we can't use strncpy */ ++ int len = strlen(str + 5); ++ memmove(pc->path, str + 5, min(len, BUF_BIG - 1)); /* cut off ``mbox:'' */ ++ pc->path[len] = '\0'; + } + } + |