GNU bug report logs - #74602
[PATCH v2] gnu: lftp: Update to 4.9.3.

Previous Next

Package: guix-patches;

Reported by: ashish.is <at> lostca.se

Date: Fri, 29 Nov 2024 12:43:01 UTC

Severity: normal

Tags: patch

Done: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 74602 in the body.
You can then email your comments to 74602 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#74602; Package guix-patches. (Fri, 29 Nov 2024 12:43:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to ashish.is <at> lostca.se:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Fri, 29 Nov 2024 12:43:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: ashish.is <at> lostca.se
To: guix-patches <at> gnu.org
Cc: Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH] gnu: lftp: Update to 4.9.3.
Date: Fri, 29 Nov 2024 13:41:36 +0100
From: Ashish SHUKLA <ashish.is <at> lostca.se>

The updated information is sourced from the upstream repository at
GitHub: https://github.com/lavv17/lftp

* gnu/packages/ftp.scm (lftp): Update to 4.9.3.
[source](origin)<uri>: Switch to the only valid working mirror.
[home-page]: Update.

Change-Id: I73771ed7e577da4bc82a8e74550eca83413dc8de
---
 gnu/packages/ftp.scm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
index 9f2334d0dc..04d7995fa1 100644
--- a/gnu/packages/ftp.scm
+++ b/gnu/packages/ftp.scm
@@ -52,19 +52,15 @@ (define-module (gnu packages ftp)
 (define-public lftp
   (package
     (name "lftp")
-    (version "4.9.2")
+    (version "4.9.3")
     (source (origin
               (method url-fetch)
               ;; See https://lftp.tech/get.html for mirrors.
-              (uri (list (string-append "https://lftp.tech/ftp/lftp-"
-                                        version ".tar.xz")
-                         (string-append "https://lftp.tech/ftp/old/lftp-"
-                                        version ".tar.xz")
-                         (string-append "ftp://ftp.st.ryukoku.ac.jp/pub/network/"
-                                        "ftp/lftp/lftp-" version ".tar.xz")))
+              (uri (string-append "ftp://ftp.st.ryukoku.ac.jp/pub/network/"
+                                  "ftp/lftp/lftp-" version ".tar.xz"))
               (sha256
                (base32
-                "03b7y0h3mf4jfq5y8zw6hv9v44z3n6i8hc1iswax96y3z7sc85y5"))))
+                "1p3y8lzikhagxafa3wndgsvhmd5an9ayjq8idg7k7gimg6fikrwn"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config))
@@ -83,7 +79,7 @@ (define-public lftp
        #:configure-flags
        (list (string-append "--with-readline="
                             (assoc-ref %build-inputs "readline")))))
-    (home-page "https://lftp.tech/")
+    (home-page "https://lftp.yar.ru/")
     (synopsis "Command-line file transfer program")
     (description
      "LFTP is a sophisticated FTP/HTTP client, and a file transfer program

base-commit: c5421392081944d43db18fe04eafecec521f994a
-- 
2.47.1





Information forwarded to guix-patches <at> gnu.org:
bug#74602; Package guix-patches. (Fri, 29 Nov 2024 12:52:01 GMT) Full text and rfc822 format available.

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: "ashish.is--- via Guix-patches" via <guix-patches <at> gnu.org>
Cc: 74602 <at> debbugs.gnu.org, ashish.is <at> lostca.se
Subject: Re: [bug#74602] [PATCH] gnu: lftp: Update to 4.9.3.
Date: Fri, 29 Nov 2024 20:50:41 +0800
[Message part 1 (text/plain, inline)]
"ashish.is--- via Guix-patches" via <guix-patches <at> gnu.org> writes:

> From: Ashish SHUKLA <ashish.is <at> lostca.se>
>
> The updated information is sourced from the upstream repository at
> GitHub: https://github.com/lavv17/lftp

I think git-fetch with https://github.com/lavv17/lftp better than
url-fetch + ftp://ftp.st.ryukoku.ac.jp/pub/network/

>
> * gnu/packages/ftp.scm (lftp): Update to 4.9.3.
> [source](origin)<uri>: Switch to the only valid working mirror.
> [home-page]: Update.
>
> Change-Id: I73771ed7e577da4bc82a8e74550eca83413dc8de
> ---
>  gnu/packages/ftp.scm | 14 +++++---------
>  1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
> index 9f2334d0dc..04d7995fa1 100644
> --- a/gnu/packages/ftp.scm
> +++ b/gnu/packages/ftp.scm
> @@ -52,19 +52,15 @@ (define-module (gnu packages ftp)
>  (define-public lftp
>    (package
>      (name "lftp")
> -    (version "4.9.2")
> +    (version "4.9.3")
>      (source (origin
>                (method url-fetch)
>                ;; See https://lftp.tech/get.html for mirrors.
> -              (uri (list (string-append "https://lftp.tech/ftp/lftp-"
> -                                        version ".tar.xz")
> -                         (string-append "https://lftp.tech/ftp/old/lftp-"
> -                                        version ".tar.xz")
> -                         (string-append "ftp://ftp.st.ryukoku.ac.jp/pub/network/"
> -                                        "ftp/lftp/lftp-" version ".tar.xz")))
> +              (uri (string-append "ftp://ftp.st.ryukoku.ac.jp/pub/network/"
> +                                  "ftp/lftp/lftp-" version ".tar.xz"))
>                (sha256
>                 (base32
> -                "03b7y0h3mf4jfq5y8zw6hv9v44z3n6i8hc1iswax96y3z7sc85y5"))))
> +                "1p3y8lzikhagxafa3wndgsvhmd5an9ayjq8idg7k7gimg6fikrwn"))))
>      (build-system gnu-build-system)
>      (native-inputs
>       (list pkg-config))
> @@ -83,7 +79,7 @@ (define-public lftp
>         #:configure-flags
>         (list (string-append "--with-readline="
>                              (assoc-ref %build-inputs "readline")))))
> -    (home-page "https://lftp.tech/")
> +    (home-page "https://lftp.yar.ru/")
>      (synopsis "Command-line file transfer program")
>      (description
>       "LFTP is a sophisticated FTP/HTTP client, and a file transfer program
>
> base-commit: c5421392081944d43db18fe04eafecec521f994a
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#74602; Package guix-patches. (Fri, 29 Nov 2024 12:52:02 GMT) Full text and rfc822 format available.

Information forwarded to guix-patches <at> gnu.org:
bug#74602; Package guix-patches. (Fri, 29 Nov 2024 16:32:02 GMT) Full text and rfc822 format available.

Message #14 received at 74602 <at> debbugs.gnu.org (full text, mbox):

From: ashish.is <at> lostca.se
To: 74602 <at> debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH v2] gnu: lftp: Update to 4.9.3.
Date: Fri, 29 Nov 2024 17:30:46 +0100
From: Ashish SHUKLA <ashish.is <at> lostca.se>

The updated information is sourced from the upstream repository at
GitHub: https://github.com/lavv17/lftp

* gnu/packages/ftp.scm (lftp): Update to 4.9.3.
[source]<origin>: Switch to git upstream. [native-inputs]: Add autoconf,
automake, gettext-minimal, bison, gnulib, gperf, and libtool.
[arguments]<phases>: Add unpack-gnulib phase. Delete existing bootstrap
phase. Add new bootstrap phase to invoke it after patch-source-shebangs.
[home-page]: Update.

Change-Id: I73771ed7e577da4bc82a8e74550eca83413dc8de
---
 gnu/packages/ftp.scm | 52 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
index 9f2334d0dc..3b43d17f57 100644
--- a/gnu/packages/ftp.scm
+++ b/gnu/packages/ftp.scm
@@ -27,16 +27,19 @@ (define-module (gnu packages ftp)
   #:use-module ((guix licenses) #:select (gpl2 gpl2+ gpl3+ clarified-artistic))
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages bison)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
+  #:use-module (gnu packages gperf)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages libidn)
   #:use-module (gnu packages linux)
@@ -52,27 +55,52 @@ (define-module (gnu packages ftp)
 (define-public lftp
   (package
     (name "lftp")
-    (version "4.9.2")
+    (version "4.9.3")
     (source (origin
-              (method url-fetch)
-              ;; See https://lftp.tech/get.html for mirrors.
-              (uri (list (string-append "https://lftp.tech/ftp/lftp-"
-                                        version ".tar.xz")
-                         (string-append "https://lftp.tech/ftp/old/lftp-"
-                                        version ".tar.xz")
-                         (string-append "ftp://ftp.st.ryukoku.ac.jp/pub/network/"
-                                        "ftp/lftp/lftp-" version ".tar.xz")))
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/lavv17/lftp")
+                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "03b7y0h3mf4jfq5y8zw6hv9v44z3n6i8hc1iswax96y3z7sc85y5"))))
+                "1hzy2g426az6y5gh2pzkz8bd0z744ibnvs72iqwy902y7lhdil0f"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list pkg-config))
+     `(("autoconf" ,autoconf-2.71)
+       ("automake" ,automake)
+       ("gettext-minimal" ,gettext-minimal)
+       ;; required by gnulib to fix parse-datetime.c compilation error
+       ("bison" ,bison)
+       ("gnulib"
+         ,(let ((commit "949989513e631b61196f11fd8d647d4dc77d7f40"))
+            (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "git://git.savannah.gnu.org/gnulib.git")
+                    (commit commit)))
+              (sha256
+               (base32 "0jk336yxfzldi0nsni0q3cxa7lqxb8lzmiisrr594v8cfvcprqn9"))
+              (file-name (git-file-name "gnulib" commit)))))
+       ("gperf" ,gperf)
+       ("libtool" ,libtool)
+       ("pkg-config" ,pkg-config)))
     (inputs
      (list zlib readline gnutls))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'unpack-gnulib
+                    (lambda* (#:key inputs #:allow-other-keys)
+                       (copy-recursively (assoc-ref inputs "gnulib")
+                                         "gnulib")))
+         (delete 'bootstrap)
+         (add-after 'patch-source-shebangs 'bootstrap
+                    (lambda _
+                      (invoke "sh" "bootstrap"
+                              "--no-git"
+                              "--gnulib-srcdir=gnulib")
+                      #t))
          ;; Disable tests that require network access, which is most of them.
          (add-before 'check 'disable-impure-tests
                      (lambda _
@@ -83,7 +111,7 @@ (define-public lftp
        #:configure-flags
        (list (string-append "--with-readline="
                             (assoc-ref %build-inputs "readline")))))
-    (home-page "https://lftp.tech/")
+    (home-page "https://lftp.yar.ru/")
     (synopsis "Command-line file transfer program")
     (description
      "LFTP is a sophisticated FTP/HTTP client, and a file transfer program

base-commit: f129a6cc591817c5c51770d5b8712eeb344ba4e4
-- 
2.47.1





Changed bug title to '[PATCH v2] gnu: lftp: Update to 4.9.3.' from '[PATCH] gnu: lftp: Update to 4.9.3.' Request was from "Ashish SHUKLA" <ashish.is <at> lostca.se> to control <at> debbugs.gnu.org. (Fri, 29 Nov 2024 17:25:01 GMT) Full text and rfc822 format available.

Information forwarded to guix-patches <at> gnu.org:
bug#74602; Package guix-patches. (Sun, 01 Dec 2024 08:08:02 GMT) Full text and rfc822 format available.

Message #19 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: "ashish.is--- via Guix-patches" via <guix-patches <at> gnu.org>
Cc: 74602-done <at> debbugs.gnu.org, ashish.is <at> lostca.se
Subject: Re: [bug#74602] [PATCH v2] gnu: lftp: Update to 4.9.3.
Date: Sun, 01 Dec 2024 16:07:04 +0800
[Message part 1 (text/plain, inline)]
"ashish.is--- via Guix-patches" via <guix-patches <at> gnu.org> writes:

> From: Ashish SHUKLA <ashish.is <at> lostca.se>
>
> The updated information is sourced from the upstream repository at
> GitHub: https://github.com/lavv17/lftp
>
> * gnu/packages/ftp.scm (lftp): Update to 4.9.3.
> [source]<origin>: Switch to git upstream. [native-inputs]: Add autoconf,
> automake, gettext-minimal, bison, gnulib, gperf, and libtool.
> [arguments]<phases>: Add unpack-gnulib phase. Delete existing bootstrap
> phase. Add new bootstrap phase to invoke it after patch-source-shebangs.
> [home-page]: Update.
>
> Change-Id: I73771ed7e577da4bc82a8e74550eca83413dc8de
> ---
>  gnu/packages/ftp.scm | 52 ++++++++++++++++++++++++++++++++++----------
>  1 file changed, 40 insertions(+), 12 deletions(-)
>
> diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
> index 9f2334d0dc..3b43d17f57 100644
> --- a/gnu/packages/ftp.scm
> +++ b/gnu/packages/ftp.scm
> @@ -27,16 +27,19 @@ (define-module (gnu packages ftp)
>    #:use-module ((guix licenses) #:select (gpl2 gpl2+ gpl3+ clarified-artistic))
>    #:use-module (guix build-system gnu)
>    #:use-module (guix download)
> +  #:use-module (guix git-download)
>    #:use-module (guix packages)
>    #:use-module (guix utils)
>    #:use-module (gnu packages)
>    #:use-module (gnu packages autotools)
> +  #:use-module (gnu packages bison)
>    #:use-module (gnu packages check)
>    #:use-module (gnu packages compression)
>    #:use-module (gnu packages crypto)
>    #:use-module (gnu packages freedesktop)
>    #:use-module (gnu packages gettext)
>    #:use-module (gnu packages glib)
> +  #:use-module (gnu packages gperf)
>    #:use-module (gnu packages gtk)
>    #:use-module (gnu packages libidn)
>    #:use-module (gnu packages linux)
> @@ -52,27 +55,52 @@ (define-module (gnu packages ftp)
>  (define-public lftp
>    (package
>      (name "lftp")
> -    (version "4.9.2")
> +    (version "4.9.3")
>      (source (origin
> -              (method url-fetch)
> -              ;; See https://lftp.tech/get.html for mirrors.
> -              (uri (list (string-append "https://lftp.tech/ftp/lftp-"
> -                                        version ".tar.xz")
> -                         (string-append "https://lftp.tech/ftp/old/lftp-"
> -                                        version ".tar.xz")
> -                         (string-append "ftp://ftp.st.ryukoku.ac.jp/pub/network/"
> -                                        "ftp/lftp/lftp-" version ".tar.xz")))
> +              (method git-fetch)
> +              (uri (git-reference
> +                     (url "https://github.com/lavv17/lftp")
> +                     (commit (string-append "v" version))))
> +              (file-name (git-file-name name version))
>                (sha256
>                 (base32
> -                "03b7y0h3mf4jfq5y8zw6hv9v44z3n6i8hc1iswax96y3z7sc85y5"))))
> +                "1hzy2g426az6y5gh2pzkz8bd0z744ibnvs72iqwy902y7lhdil0f"))))
>      (build-system gnu-build-system)
>      (native-inputs
> -     (list pkg-config))
> +     `(("autoconf" ,autoconf-2.71)
> +       ("automake" ,automake)
> +       ("gettext-minimal" ,gettext-minimal)
> +       ;; required by gnulib to fix parse-datetime.c compilation error
> +       ("bison" ,bison)
> +       ("gnulib"
> +         ,(let ((commit "949989513e631b61196f11fd8d647d4dc77d7f40"))
> +            (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "git://git.savannah.gnu.org/gnulib.git")
> +                    (commit commit)))
> +              (sha256
> +               (base32 "0jk336yxfzldi0nsni0q3cxa7lqxb8lzmiisrr594v8cfvcprqn9"))
> +              (file-name (git-file-name "gnulib" commit)))))
> +       ("gperf" ,gperf)
> +       ("libtool" ,libtool)
> +       ("pkg-config" ,pkg-config)))
>      (inputs
>       (list zlib readline gnutls))
>      (arguments
>       `(#:phases
>         (modify-phases %standard-phases
> +         (add-after 'unpack 'unpack-gnulib
> +                    (lambda* (#:key inputs #:allow-other-keys)
> +                       (copy-recursively (assoc-ref inputs "gnulib")
> +                                         "gnulib")))
> +         (delete 'bootstrap)
> +         (add-after 'patch-source-shebangs 'bootstrap
> +                    (lambda _
> +                      (invoke "sh" "bootstrap"
> +                              "--no-git"
> +                              "--gnulib-srcdir=gnulib")
> +                      #t))
>           ;; Disable tests that require network access, which is most of them.
>           (add-before 'check 'disable-impure-tests
>                       (lambda _
> @@ -83,7 +111,7 @@ (define-public lftp
>         #:configure-flags
>         (list (string-append "--with-readline="
>                              (assoc-ref %build-inputs "readline")))))
> -    (home-page "https://lftp.tech/")
> +    (home-page "https://lftp.yar.ru/")
>      (synopsis "Command-line file transfer program")
>      (description
>       "LFTP is a sophisticated FTP/HTTP client, and a file transfer program
>
> base-commit: f129a6cc591817c5c51770d5b8712eeb344ba4e4
pushed, closing.
[signature.asc (application/pgp-signature, inline)]

Reply sent to Zheng Junjie <zhengjunjie <at> iscas.ac.cn>:
You have taken responsibility. (Sun, 01 Dec 2024 08:08:02 GMT) Full text and rfc822 format available.

Notification sent to ashish.is <at> lostca.se:
bug acknowledged by developer. (Sun, 01 Dec 2024 08:08:03 GMT) Full text and rfc822 format available.

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Sun, 29 Dec 2024 12:24:05 GMT) Full text and rfc822 format available.

This bug report was last modified 170 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.