From b2ae7a152921bf36a39f01de43769ee90cbbd253 Mon Sep 17 00:00:00 2001
From: Joseph Lansdowne <j49137@gmail.com>
Date: Tue, 9 Apr 2019 21:08:32 +0100
Subject: [PATCH] fix option `no_verify_hostname`

Broke with a curl upgrade at some point.  1 is no longer a valid option
- not sure exactly what it used to do.
---
 ChangeLog | 3 +++
 ftpfs.c   | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ftpfs.c b/ftpfs.c
index 020e559..207d5fd 100644
--- a/ftpfs.c
+++ b/ftpfs.c
@@ -1627,9 +1627,7 @@ static void set_common_curl_stuff(CURL* easy) {
   }
 
   if (ftpfs.no_verify_hostname) {
-    /* The default is 2 which verifies even the host string. This sets to 1
-     * which means verify the host but not the string. */
-    curl_easy_setopt_or_die(easy, CURLOPT_SSL_VERIFYHOST, 1);
+    curl_easy_setopt_or_die(easy, CURLOPT_SSL_VERIFYHOST, 0);
   }
 
   curl_easy_setopt_or_die(easy, CURLOPT_INTERFACE, ftpfs.interface);

<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=f4d23718080506a0e3805ed4acbe8ea54d8f8d7f'>refs</a><a class='active' href='/guix/log/etc/guix-daemon.conf.in?showmsg=1'>log</a><a href='/guix/tree/etc/guix-daemon.conf.in?id=f4d23718080506a0e3805ed4acbe8ea54d8f8d7f'>tree</a><a href='/guix/commit/etc/guix-daemon.conf.in?id=f4d23718080506a0e3805ed4acbe8ea54d8f8d7f'>commit</a><a href='/guix/diff/etc/guix-daemon.conf.in?id=f4d23718080506a0e3805ed4acbe8ea54d8f8d7f'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/etc/guix-daemon.conf.in'>
<input type='hidden' name='id' value='f4d23718080506a0e3805ed4acbe8ea54d8f8d7f'/><input type='hidden' name='showmsg' value='1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=f4d23718080506a0e3805ed4acbe8ea54d8f8d7f&amp;showmsg=1'>root</a>/<a href='/guix/log/etc?id=f4d23718080506a0e3805ed4acbe8ea54d8f8d7f&amp;showmsg=1'>etc</a>/<a href='/guix/log/etc/guix-daemon.conf.in?id=f4d23718080506a0e3805ed4acbe8ea54d8f8d7f&amp;showmsg=1'>guix-daemon.conf.in</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/etc/guix-daemon.conf.in?id=f4d23718080506a0e3805ed4acbe8ea54d8f8d7f'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2021-07-07 23:54:20 -0400'>2021-07-07</span></td><td class='logsubject'><a href='/guix/commit/etc/guix-daemon.conf.in?id=4cbe0127a668cbcc64087c5d311308b59d39b104'>guix-install.sh: Prompt for configuring substitutes discovery.</a></td><td>Maxim Cournoyer</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Also ensure prompt_yes_no always print the message with a trailing space,
which is more pleasing to the eye.

* etc/guix-daemon.conf.in &lt;--discover=no&gt;: New guix-daemon option.
* etc/guix-daemon.service.in: Likewise.
* etc/init.d/guix-daemon.in: Likewise.
* etc/openrc/guix-daemon.in: Likewise.
* etc/guix-install.sh (configure_substitute_discovery): New procedure.
(sys_enable_guix_daemon): Ask the user whether automatic substitute discovery
should be enabled.  Set the '--discover' argument accordingly.
(prompt_yes_no): Add a trailing space to the message.
(sys_authorize_build_farms): Remove trailing space from the message argument.
* NEWS (Distribution): Add news.


</td></tr>