unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#74602] [PATCH] gnu: lftp: Update to 4.9.3.
@ 2024-11-29 12:41 ashish.is--- via Guix-patches via
  2024-11-29 12:50 ` Zheng Junjie
  0 siblings, 1 reply; 4+ messages in thread
From: ashish.is--- via Guix-patches via @ 2024-11-29 12:41 UTC (permalink / raw)
  To: 74602; +Cc: Ashish SHUKLA

From: Ashish SHUKLA <ashish.is@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





^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [bug#74602] [PATCH] gnu: lftp: Update to 4.9.3.
  2024-11-29 12:41 [bug#74602] [PATCH] gnu: lftp: Update to 4.9.3 ashish.is--- via Guix-patches via
@ 2024-11-29 12:50 ` Zheng Junjie
  2024-11-29 16:30   ` [bug#74602] [PATCH v2] " ashish.is--- via Guix-patches via
  0 siblings, 1 reply; 4+ messages in thread
From: Zheng Junjie @ 2024-11-29 12:50 UTC (permalink / raw)
  To: 74602; +Cc: ashish.is

[-- Attachment #1: Type: text/plain, Size: 2458 bytes --]

"ashish.is--- via Guix-patches" via <guix-patches@gnu.org> writes:

> From: Ashish SHUKLA <ashish.is@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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#74602] [PATCH v2] gnu: lftp: Update to 4.9.3.
  2024-11-29 12:50 ` Zheng Junjie
@ 2024-11-29 16:30   ` ashish.is--- via Guix-patches via
  2024-12-01  8:07     ` bug#74602: " Zheng Junjie
  0 siblings, 1 reply; 4+ messages in thread
From: ashish.is--- via Guix-patches via @ 2024-11-29 16:30 UTC (permalink / raw)
  To: 74602; +Cc: Ashish SHUKLA

From: Ashish SHUKLA <ashish.is@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





^ permalink raw reply related	[flat|nested] 4+ messages in thread

* bug#74602: [PATCH v2] gnu: lftp: Update to 4.9.3.
  2024-11-29 16:30   ` [bug#74602] [PATCH v2] " ashish.is--- via Guix-patches via
@ 2024-12-01  8:07     ` Zheng Junjie
  0 siblings, 0 replies; 4+ messages in thread
From: Zheng Junjie @ 2024-12-01  8:07 UTC (permalink / raw)
  To: ashish.is--- via Guix-patches via; +Cc: 74602-done, ashish.is

[-- Attachment #1: Type: text/plain, Size: 5180 bytes --]

"ashish.is--- via Guix-patches" via <guix-patches@gnu.org> writes:

> From: Ashish SHUKLA <ashish.is@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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-12-01  8:08 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-29 12:41 [bug#74602] [PATCH] gnu: lftp: Update to 4.9.3 ashish.is--- via Guix-patches via
2024-11-29 12:50 ` Zheng Junjie
2024-11-29 16:30   ` [bug#74602] [PATCH v2] " ashish.is--- via Guix-patches via
2024-12-01  8:07     ` bug#74602: " Zheng Junjie

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).