guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/07: gnu: vsftpd: Properly enable the SSL support.


From: guix-commits
Subject: 02/07: gnu: vsftpd: Properly enable the SSL support.
Date: Fri, 2 Jul 2021 02:24:37 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit e6fd51a36ea1884c0ab56d24d41023594d4d2f3e
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Fri Jul 2 05:20:49 2021 +0200

    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(-)

diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
index 68424c1..481863b 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"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]