[bug#74472] [PATCH 0/1] gnu: geteltorito: Use new home page and origin URI.

[bug#74472] [PATCH 0/1] gnu: geteltorito: Use new home page and origin URI.

[Julian Flake]

geteltorito's old homepage and origin URI become unavailable from December 2024. This patch updates the package definition to use the new home of the project.

Julian Flake (1):
  gnu: geteltorito: Use new home page and origin.

 gnu/packages/cdrom.scm | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)


base-commit: 285c78cb89cd0ef3775406eca9af9aa87de212a0
-- 
2.46.0

[bug#74473] [PATCH 1/1] gnu: geteltorito: Use new home page and origin.

[Julian Flake]

* gnu/packages/cdrom.scm (geteltorito)[https://github.com/rainer042/geteltorito]:
Use new URI.

Change-Id: Idc5c2b935419855805b5f9727540192de093b1b4
---
 gnu/packages/cdrom.scm | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index ef02787465..9f9acf19a2 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2024 Julian Flake <flake@uni-koblenz.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -725,13 +726,16 @@ (define-public geteltorito
     (name "geteltorito")
     (version "0.6")
     (home-page
-     "https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append home-page name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1gkbm9ahj2mgqrkrfpibzclsriqgsbsvjh19fr815vpd9f6snkxv"))))
+     "https://github.com/rainer042/geteltorito")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/rainer042/geteltorito")
+             (commit "d6c7ba03c3c4c5bc4cb68e3602c9427b0912f16f")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "15dh5ibmqr3pyxyiica4r9nn1xk1j0gr3xy2s3n8b4n7b2mn8n01"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ; No tests.
@@ -742,8 +746,11 @@ (define-public geteltorito
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
-               (install-file "geteltorito"
-                             (string-append out "/bin"))))))))
+               (install-file "geteltorito.pl"
+                             (string-append out "/bin"))
+               (rename-file (string-append out "/bin/geteltorito.pl")
+                            (string-append out "/bin/geteltorito"))
+               (chmod (string-append out "/bin/geteltorito") #o555)))))))
     (inputs (list perl))
     (synopsis "Extract the boot image from a CD-ROM")
     (description
-- 
2.46.0

[bug#74473] [PATCH 1/1] gnu: geteltorito: Use new home page and origin.

[Liliana Marie Prikler]

Am Freitag, dem 22.11.2024 um 12:26 +0100 schrieb Julian Flake:
> * gnu/packages/cdrom.scm
> (geteltorito)[https://github.com/rainer042/geteltorito]:
Should be [home-page].
> Use new URI.
> 
> Change-Id: Idc5c2b935419855805b5f9727540192de093b1b4
> ---
>  gnu/packages/cdrom.scm | 25 ++++++++++++++++---------
>  1 file changed, 16 insertions(+), 9 deletions(-)
> 
> diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
> index ef02787465..9f9acf19a2 100644
> --- a/gnu/packages/cdrom.scm
> +++ b/gnu/packages/cdrom.scm
> @@ -15,6 +15,7 @@
>  ;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
>  ;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
>  ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
> +;;; Copyright © 2024 Julian Flake <flake@uni-koblenz.de>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -725,13 +726,16 @@ (define-public geteltorito
>      (name "geteltorito")
>      (version "0.6")
>      (home-page
> -    
> "https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/")
> -    (source (origin
> -              (method url-fetch)
> -              (uri (string-append home-page name "-" version
> ".tar.gz"))
> -              (sha256
> -               (base32
> -               
> "1gkbm9ahj2mgqrkrfpibzclsriqgsbsvjh19fr815vpd9f6snkxv"))))
> +     "https://github.com/rainer042/geteltorito")
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://github.com/rainer042/geteltorito")
> +             (commit "d6c7ba03c3c4c5bc4cb68e3602c9427b0912f16f")))
> +       (file-name (git-file-name name version))
> +       (sha256
> +        (base32
> "15dh5ibmqr3pyxyiica4r9nn1xk1j0gr3xy2s3n8b4n7b2mn8n01"))))
Nitpick: home-page should be below arguments.  Prefer to keep the
changes small unless making deliberate format changes.

Also, do use git-version when referring to a particular commit.
>      (build-system gnu-build-system)
>      (arguments
>       `(#:tests? #f ; No tests.
> @@ -742,8 +746,11 @@ (define-public geteltorito
>           (replace 'install
>             (lambda* (#:key outputs #:allow-other-keys)
>               (let ((out (assoc-ref outputs "out")))
> -               (install-file "geteltorito"
> -                             (string-append out "/bin"))))))))
> +               (install-file "geteltorito.pl"
> +                             (string-append out "/bin"))
> +               (rename-file (string-append out
> "/bin/geteltorito.pl")
> +                            (string-append out "/bin/geteltorito"))
> +               (chmod (string-append out "/bin/geteltorito")
> #o555)))))))
These changes are not mentioned anywhere in the ChangeLog and I presume
become necessary due to actual code changes.

Cheers.

[bug#74473] [PATCH v2] gnu: geteltorito: Use new home page and origin URI.

[Julian Flake]

* gnu/packages/cdrom.scm (geteltorito)[home-page]: Use new URI + the perl script needs to be renamed now and needs to be made executable now.

Change-Id: I746acc21d1f8855978bfbf00bef3dd39268bc4b3
---
 gnu/packages/cdrom.scm | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index ef02787465..3a46da6475 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2024 Julian Flake <flake@uni-koblenz.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -724,14 +725,15 @@ (define-public geteltorito
   (package
     (name "geteltorito")
     (version "0.6")
-    (home-page
-     "https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append home-page name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1gkbm9ahj2mgqrkrfpibzclsriqgsbsvjh19fr815vpd9f6snkxv"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/rainer042/geteltorito")
+             (commit "d6c7ba03c3c4c5bc4cb68e3602c9427b0912f16f")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "15dh5ibmqr3pyxyiica4r9nn1xk1j0gr3xy2s3n8b4n7b2mn8n01"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ; No tests.
@@ -742,8 +744,13 @@ (define-public geteltorito
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
-               (install-file "geteltorito"
-                             (string-append out "/bin"))))))))
+               (install-file "geteltorito.pl"
+                             (string-append out "/bin"))
+               (rename-file (string-append out "/bin/geteltorito.pl")
+                            (string-append out "/bin/geteltorito"))
+               (chmod (string-append out "/bin/geteltorito") #o555)))))))
+    (home-page
+     "https://github.com/rainer042/geteltorito")
     (inputs (list perl))
     (synopsis "Extract the boot image from a CD-ROM")
     (description

base-commit: 285c78cb89cd0ef3775406eca9af9aa87de212a0
-- 
2.46.0

[bug#74473] [PATCH v3 0/1] v3 uses git-version

[Julian Flake]

v3 uses git-version now.

Julian Flake (1):
  gnu: geteltorito: Use new home page and origin URI.

 gnu/packages/cdrom.scm | 65 ++++++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 28 deletions(-)


base-commit: 285c78cb89cd0ef3775406eca9af9aa87de212a0
-- 
2.46.0

[bug#74473] [PATCH v3 1/1] gnu: geteltorito: Use new home page and origin URI.

[Julian Flake]

* gnu/packages/cdrom.scm (geteltorito)[home-page]: Use new URI + the perl script needs to be renamed now and needs to be made executable now.

Change-Id: I746acc21d1f8855978bfbf00bef3dd39268bc4b3
---
 gnu/packages/cdrom.scm | 65 ++++++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index ef02787465..e441423573 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2024 Julian Flake <flake@uni-koblenz.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -721,39 +722,47 @@ (define-public abcde
     (license gpl2+)))
 
 (define-public geteltorito
-  (package
-    (name "geteltorito")
-    (version "0.6")
-    (home-page
-     "https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append home-page name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1gkbm9ahj2mgqrkrfpibzclsriqgsbsvjh19fr815vpd9f6snkxv"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:tests? #f ; No tests.
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (delete 'build)
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (install-file "geteltorito"
-                             (string-append out "/bin"))))))))
-    (inputs (list perl))
-    (synopsis "Extract the boot image from a CD-ROM")
-    (description
-     "@command{geteltorito} can extract the initial/default boot
+  (let ((commit "d6c7ba03c3c4c5bc4cb68e3602c9427b0912f16f")
+        (revision "1"))          ;Guix package revision
+    (package
+      (name "geteltorito")
+      (version (git-version "0.6" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/rainer042/geteltorito")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "15dh5ibmqr3pyxyiica4r9nn1xk1j0gr3xy2s3n8b4n7b2mn8n01"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:tests? #f ; No tests.
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'configure)
+           (delete 'build)
+           (replace 'install
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let ((out (assoc-ref outputs "out")))
+                 (install-file "geteltorito.pl"
+                               (string-append out "/bin"))
+                 (rename-file (string-append out "/bin/geteltorito.pl")
+                              (string-append out "/bin/geteltorito"))
+                 (chmod (string-append out "/bin/geteltorito") #o555)))))))
+      (home-page
+       "https://github.com/rainer042/geteltorito")
+      (inputs (list perl))
+      (synopsis "Extract the boot image from a CD-ROM")
+      (description
+       "@command{geteltorito} can extract the initial/default boot
 image from CDs (and ISOs) that follow the El Torito specification
 for bootable CD-ROMs.
 
 Image data is written to standard output by default and all other
 information is written to standard error.")
-    (license gpl2+)))
+      (license gpl2+))))
 
 (define-public asunder
   (package
-- 
2.46.0

bug#74473: [PATCH v3 1/1] gnu: geteltorito: Use new home page and origin URI.

[Ludovic Courtès]

Julian Flake <flake@uni-koblenz.de> skribis:

> * gnu/packages/cdrom.scm (geteltorito)[home-page]: Use new URI + the perl script needs to be renamed now and needs to be made executable now.
>
> Change-Id: I746acc21d1f8855978bfbf00bef3dd39268bc4b3

Applied, thanks.

I tweaked the commit log to mention the upgrade and clarify the
‘arguments’ changes.

Ludo’.