X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/b347317ae67c80d9ff3baca42aaab45002fc73e6..f1a83356a7604fa87b8fe6ed6ae1b57e9e3d5756:/gnu/packages/ftp.scm diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index cb837e554e..273128f631 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014, 2015, 2018 Ludovic Courtès ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015 Mark H Weaver -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Rene Saavedra ;;; ;;; This file is part of GNU Guix. @@ -21,7 +21,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages ftp) - #:use-module ((guix licenses) #:select (gpl2+ gpl3+ clarified-artistic)) + #:use-module ((guix licenses) #:select (gpl2 gpl2+ gpl3+ clarified-artistic)) #:use-module (guix build-system gnu) #:use-module (guix download) #:use-module (guix packages) @@ -29,7 +29,6 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages check) #:use-module (gnu packages compression) - #:use-module (gnu packages databases) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -39,6 +38,7 @@ #:use-module (gnu packages nettle) #:use-module (gnu packages pkg-config) #:use-module (gnu packages readline) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml)) @@ -46,7 +46,7 @@ (define-public lftp (package (name "lftp") - (version "4.8.3") + (version "4.9.1") (source (origin (method url-fetch) ;; See https://lftp.tech/get.html for mirrors. @@ -58,7 +58,7 @@ "ftp/lftp/lftp-" version ".tar.xz"))) (sha256 (base32 - "12y77jlfs4x4zvcah92mw2h2sb4j0bvbaxkh3wwsm8gs392ywyny")))) + "0jq2g8h1bx06ya9fsja748vwb2qrca4wsfrgi3fmaa8hznpgqsar")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -74,7 +74,8 @@ (lambda _ (substitute* "tests/Makefile" (("(ftp-cls-l|ftp-list|http-get)\\$\\(EXEEXT\\)") "") - (("lftp-https-get ") ""))))) + (("lftp-https-get ") "")) + #t))) #:configure-flags (list (string-append "--with-readline=" (assoc-ref %build-inputs "readline"))))) @@ -125,17 +126,17 @@ reliability in mind.") (let ((out (assoc-ref outputs "out"))) (setenv "CONFIG_SHELL" (which "sh")) (setenv "SHELL" (which "sh")) - (zero? (system* "./configure" - (string-append "--prefix=" out))))))) - #:tests? #f)) ;there are no tests + (invoke "./configure" + (string-append "--prefix=" out)))))) + #:tests? #f)) ;there are no tests (inputs `(("ncurses" ,ncurses))) - (home-page "http://www.ncftp.com/ncftp/") + (home-page "https://www.ncftp.com/ncftp/") (synopsis "Command-line File Transfer Protocol (FTP) client") (description "NcFTP Client (or just NcFTP) is a set of command-line programs to access -File Transfer Protocol (FTP) servers. This includes 'ncftp', an interactive -FTP browser, as well as non-interactive commands such as 'ncftpput' and -'ncftpget'.") +File Transfer Protocol (FTP) servers. This includes @code{ncftp}, an interactive +FTP browser, as well as non-interactive commands such as @code{ncftpput} and +@code{ncftpget}.") (license clarified-artistic))) @@ -169,19 +170,20 @@ as required.") (define-public libfilezilla (package (name "libfilezilla") - (version "0.12.2") + (version "0.16.0") (source (origin (method url-fetch) - (uri (string-append "http://download.filezilla-project.org/" - name "/" name "-" version ".tar.bz2")) + (uri (string-append "https://download.filezilla-project.org/" + "libfilezilla/libfilezilla-" version ".tar.bz2")) (sha256 - (base32 - "1v461hwdk74whp89s490dj1z18gfqf9bz9140m5f11rsvrpid33p")))) + (base32 "1fd71vmllzvljff5l5ka5wnzbdsxx4i54dpxpklydmbsqpilnv1v")))) (build-system gnu-build-system) (native-inputs `(("cppunit" ,cppunit) ("pkg-config" ,pkg-config))) + (inputs + `(("nettle" ,nettle))) (home-page "https://lib.filezilla-project.org") (synopsis "Cross-platform C++ library used by Filezilla client") (description @@ -206,16 +208,14 @@ output. (define-public filezilla (package (name "filezilla") - (version "3.31.0") + (version "3.42.1") (source (origin (method url-fetch) - (uri (string-append "https://sourceforge.net/projects/" name - "/files/FileZilla_Client/" version - "/FileZilla_" version "_src" ".tar.bz2")) + (uri (string-append "https://download.filezilla-project.org/client/" + "FileZilla_" version "_src.tar.bz2")) (sha256 - (base32 - "1rfysb8dil35a7bzj2kw0mzzkys39d7yn6ipsbk8l6rkwfvnii8l")))) + (base32 "083ycsycwy1szhp3mzf998wsqa74hmdxdsy07x6k81vp2cxjxijg")))) (build-system gnu-build-system) (arguments ;; Don't let filezilla phone home to check for updates. @@ -223,7 +223,6 @@ output. (native-inputs `(("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config) - ("pugixml" ,pugixml) ("xdg-utils" ,xdg-utils))) (inputs `(("dbus" ,dbus) @@ -232,6 +231,7 @@ output. ("libfilezilla" ,libfilezilla) ("libidn" ,libidn) ("nettle" ,nettle) + ("pugixml" ,pugixml) ("sqlite" ,sqlite) ("wxwidgets" ,wxwidgets))) (home-page "https://filezilla-project.org") @@ -243,3 +243,42 @@ and others features such as bookmarks, drag and drop, filename filters, directory comparison and more.") (license gpl2+) (properties '((upstream-name . "FileZilla"))))) + +(define-public vsftpd + (package + (name "vsftpd") + (version "3.0.3") + (source (origin + (method url-fetch) + (uri (string-append "https://security.appspot.com/downloads/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "1xsyjn68k3fgm2incpb3lz2nikffl9by2safp994i272wvv2nkcx")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags '("LDFLAGS=-lcrypt") + #:tests? #f ; No tests exist. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-installation-directory + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + (("/usr") (assoc-ref outputs "out"))) + #t)) + (add-before 'install 'mkdir + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p out) + (mkdir (string-append out "/sbin")) + (mkdir (string-append out "/man")) + (mkdir (string-append out "/man/man5")) + (mkdir (string-append out "/man/man8")) + #t))) + (delete 'configure)))) + (synopsis "vsftpd FTP daemon") + (description "@command{vsftpd} is a daemon that listens on a TCP socket +for clients and gives them access to local files via File Transfer +Protocol.") + (home-page "https://security.appspot.com/vsftpd.html") + (license gpl2)))