diff options
Diffstat (limited to 'net-ftp/gftp/files')
| -rw-r--r-- | net-ftp/gftp/files/digest-gftp-2.0.18-r5 | 3 | ||||
| -rw-r--r-- | net-ftp/gftp/files/gftp-2.0.18-ipv6.patch | 33 | ||||
| -rw-r--r-- | net-ftp/gftp/files/gftp-2.0.18-ssl-wildcardcert.patch | 22 |
3 files changed, 58 insertions, 0 deletions
diff --git a/net-ftp/gftp/files/digest-gftp-2.0.18-r5 b/net-ftp/gftp/files/digest-gftp-2.0.18-r5 new file mode 100644 index 000000000000..a5e7dd4f3967 --- /dev/null +++ b/net-ftp/gftp/files/digest-gftp-2.0.18-r5 @@ -0,0 +1,3 @@ +MD5 44b19442d06f6dc68c7211d66029d826 gftp-2.0.18.tar.bz2 1374850 +RMD160 0e0daea8543ae822b25635647360193362a2648d gftp-2.0.18.tar.bz2 1374850 +SHA256 8145e18d1edf13e8cb6cd7a69bb69de5c46307086997755654488fb8282d38a2 gftp-2.0.18.tar.bz2 1374850 diff --git a/net-ftp/gftp/files/gftp-2.0.18-ipv6.patch b/net-ftp/gftp/files/gftp-2.0.18-ipv6.patch new file mode 100644 index 000000000000..05666d1e183d --- /dev/null +++ b/net-ftp/gftp/files/gftp-2.0.18-ipv6.patch @@ -0,0 +1,33 @@ +2006-7-19 Brian Masney <masneyb@gftp.org> + * lib/misc.c (gftp_copy_request) - fixes when doing an IPv6 transfer or + using ignore PASV address (from (from Aurelien Jarno) (closes GNOME bugzilla #169671) + +--- /trunk/lib/misc.c 2006/07/20 02:32:58 784 ++++ trunk/lib/misc.c 2006/07/20 02:37:45 785 +@@ -568,8 +568,24 @@ + newreq->use_proxy = req->use_proxy; + newreq->logging_function = req->logging_function; + newreq->ai_family = req->ai_family; +- newreq->free_hostp = 0; +- newreq->hostp = NULL; ++ ++ if (req->hostp) ++ { ++#if defined (HAVE_GETADDRINFO) && defined (HAVE_GAI_STRERROR) ++ newreq->hostp = g_malloc (sizeof(struct addrinfo)); ++ memcpy(newreq->hostp, req->hostp, sizeof(struct addrinfo)); ++ if (req->current_hostp) ++ newreq->current_hostp = newreq->hostp + (req->current_hostp - req->hostp); ++#else ++ newreq->hostp = g_malloc (sizeof(struct hostent)); ++ memcpy(newreq->hostp, req->hostp, sizeof(struct hostent)); ++ newreq->host = req->host; ++ newreq->curhost = req->curhost; ++#endif ++ } ++ else ++ newreq->hostp = NULL; ++ newreq->free_hostp = 1; + + gftp_copy_local_options (&newreq->local_options_vars, + &newreq->local_options_hash, diff --git a/net-ftp/gftp/files/gftp-2.0.18-ssl-wildcardcert.patch b/net-ftp/gftp/files/gftp-2.0.18-ssl-wildcardcert.patch new file mode 100644 index 000000000000..202b2931c958 --- /dev/null +++ b/net-ftp/gftp/files/gftp-2.0.18-ssl-wildcardcert.patch @@ -0,0 +1,22 @@ +--- lib/sslcommon.c 2005-01-04 14:32:11.000000000 +0100 ++++ lib/sslcommon.c 2006-06-19 15:23:13.000000000 +0200 +@@ -182,7 +182,18 @@ + X509_NAME_get_text_by_NID (subj, NID_commonName, data, 256) > 0) + { + data[sizeof (data) - 1] = '\0'; +- if (strcasecmp (data, request->hostname) != 0) ++ /* Check for wildcard CN (must begin with *.) */ ++ if (strncmp(data, "*.", 2) == 0) ++ { ++ int hostname_len = strlen(data) - 1; ++ if (strlen(request->hostname) > hostname_len && ++ strcasecmp (&(data[1]), &(request->hostname[strlen(request->hostname) - hostname_len])) == 0) ++ ok = 1; ++ } ++ else if (strcasecmp (data, request->hostname) == 0) ++ ok = 1; ++ ++ if (!ok) + { + request->logging_function (gftp_logging_error, request, + _("ERROR: The host in the SSL certificate (%s) does not match the host that we connected to (%s). Aborting connection.\n"), |