[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"
- branch master updated (c2533c3 -> c19d29c), guix-commits, 2021/07/02
- 02/07: gnu: vsftpd: Properly enable the SSL support.,
guix-commits <=
- 06/07: gnu: vhba-module: Expand description., guix-commits, 2021/07/02
- 01/07: gnu: vsftpd: Edit description., guix-commits, 2021/07/02
- 05/07: gnu: vhba-module: Update to 20210418., guix-commits, 2021/07/02
- 03/07: gnu: rsibreak: Update to 0.12.14., guix-commits, 2021/07/02
- 04/07: gnu: jasper: Update to 2.0.32., guix-commits, 2021/07/02
- 07/07: gnu: phodav: Fix udev rules directory., guix-commits, 2021/07/02