From e6fd51a36ea1884c0ab56d24d41023594d4d2f3e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 2 Jul 2021 05:20:49 +0200
Subject: gnu: vsftpd: Properly enable the SSL support.

* gnu/packages/ftp.scm (vsftpd)[arguments]: Remove (questionable?)
"-lcrypt" from LDFLAGS.  #define VSF_BUILD_SSL in a new 'build-SSL phase
instead.
---
 gnu/packages/ftp.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'gnu')

diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
index 68424c1591..481863bf33 100644
--- a/gnu/packages/ftp.scm
+++ b/gnu/packages/ftp.scm
@@ -272,11 +272,18 @@ directory comparison and more.")
     (arguments
      `(#:make-flags
        (list (string-append "CC=" ,(cc-for-target))
-             "LDFLAGS=-lcap -lcrypt -lpam"
+             ;; vsf_findlibs.sh looks only for hard-coded {/usr,}/lib file names
+             ;; that will never exist on Guix.  Manage libraries ourselves.
+             "LDFLAGS=-lcap -lpam"
              "INSTALL=install -D")
        #:tests? #f                      ; no test suite
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'build-SSL
+           (lambda _
+             (substitute* "builddefs.h"
+               (("#undef (VSF_BUILD_SSL)" _ symbol)
+                (string-append "#define " symbol)))))
          (add-after 'unpack 'append-make-flags
            (lambda _
              (substitute* "Makefile"
-- 
cgit v1.2.3

/commit/gnu/packages/moreutils.scm?id=ac7d2eef807dfbd5e3279fd924f52a65ebe5d6f7'>commit</a><a href='/guix/diff/gnu/packages/moreutils.scm?id=ac7d2eef807dfbd5e3279fd924f52a65ebe5d6f7'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/moreutils.scm'>
<input type='hidden' name='id' value='ac7d2eef807dfbd5e3279fd924f52a65ebe5d6f7'/><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=ac7d2eef807dfbd5e3279fd924f52a65ebe5d6f7'>root</a>/<a href='/guix/log/gnu?id=ac7d2eef807dfbd5e3279fd924f52a65ebe5d6f7'>gnu</a>/<a href='/guix/log/gnu/packages?id=ac7d2eef807dfbd5e3279fd924f52a65ebe5d6f7'>packages</a>/<a href='/guix/log/gnu/packages/moreutils.scm?id=ac7d2eef807dfbd5e3279fd924f52a65ebe5d6f7'>moreutils.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/gnu/packages/moreutils.scm?id=ac7d2eef807dfbd5e3279fd924f52a65ebe5d6f7&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-01-05 19:26:15 +0100'>2021-01-05</span></td><td><a href='/guix/commit/gnu/packages/moreutils.scm?id=b684d45d10936f85d14c0997b56c8d7be7013aca'>gnu: moreutils: Update to 0.65.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/moreutils.scm (moreutils): Update to 0.65.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-09-11 16:28:02 +0200'>2020-09-11</span></td><td><a href='/guix/commit/gnu/packages/moreutils.scm?id=02e485287e448be5abec5a067200d659c2d70870'>gnu: moreutils: Update to 0.64.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/moreutils.scm (moreutils): Update to 0.64.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>