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);
ght'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=c4f4fd8f16a5d3605547e2a5208a36c3c4de1a27'>refs</a><a class='active' href='/guix/log/tests/accounts.scm'>log</a><a href='/guix/tree/tests/accounts.scm?id=c4f4fd8f16a5d3605547e2a5208a36c3c4de1a27'>tree</a><a href='/guix/commit/tests/accounts.scm?id=c4f4fd8f16a5d3605547e2a5208a36c3c4de1a27'>commit</a><a href='/guix/diff/tests/accounts.scm?id=c4f4fd8f16a5d3605547e2a5208a36c3c4de1a27'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/accounts.scm'>
<input type='hidden' name='id' value='c4f4fd8f16a5d3605547e2a5208a36c3c4de1a27'/><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=c4f4fd8f16a5d3605547e2a5208a36c3c4de1a27'>root</a>/<a href='/guix/log/tests?id=c4f4fd8f16a5d3605547e2a5208a36c3c4de1a27'>tests</a>/<a href='/guix/log/tests/accounts.scm?id=c4f4fd8f16a5d3605547e2a5208a36c3c4de1a27'>accounts.scm</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/tests/accounts.scm?id=c4f4fd8f16a5d3605547e2a5208a36c3c4de1a27&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-08-28 00:27:14 +0200'>2019-08-28</span></td><td><a href='/guix/commit/tests/accounts.scm?id=dd4e46edda6c255ca170a6650c6f92b16ff50a3f'>accounts: Delete duplicate entries.</a><span class='msg-avail'>...<span class='msg-tooltip'>When adding multiple instances of a service requiring some user
account/group, we could end up with multiple entries for that account or
group in /etc/passwd or /etc/group.

* gnu/build/accounts.scm (database-writer)[write-entries]: Add call to
'delete-duplicates'.
* tests/accounts.scm ("write-passwd with duplicate entry"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-04-27 16:30:40 +0200'>2019-04-27</span></td><td><a href='/guix/commit/tests/accounts.scm?id=0c329bf4b0c00abdc9a7d9c818d36d4d60b3005d'>tests: Adjust accounts test to shell-as-config change.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 504a0fc636ec591e65b4a229a37e522e425d8a0c.

* tests/accounts.scm ("allocate-passwd with previous state"): Change
expected 'shell' for "alice" to "/bin/sh".
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-03-25 23:37:06 +0100'>2019-03-25</span></td><td><a href='/guix/commit/tests/accounts.scm?id=cf848cc0a17a3a58d600116896f6e7abfb0440d4'>accounts: Add default value for the 'home-directory' field of &lt;user-account&gt;.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/system/accounts.scm (&lt;user-account&gt;)[home-directory]: Mark as
thunked and add a default value.
(default-home-directory): New procedure.
* doc/guix.texi (User Accounts): Remove 'home-directory' from example.
* gnu/system/examples/bare-bones.tmpl: Likewise.
* gnu/system/examples/beaglebone-black.tmpl: Likewise.
* gnu/system/examples/desktop.tmpl: Likewise.
* gnu/system/examples/docker-image.tmpl: Likewise.
* gnu/system/examples/lightweight-desktop.tmpl: Likewise.
* gnu/system/install.scm (installation-os): Likewise.
* gnu/tests.scm (%simple-os): Likewise.
* gnu/tests/install.scm (%minimal-os, %minimal-os-on-vda):
(%separate-home-os, %encrypted-root-os, %btrfs-root-os): Likewise.
* tests/accounts.scm ("allocate-passwd")
("allocate-passwd with previous state"): Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>