01/28: gnu: sugar: Move from DSA to RSA.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit 892579c44aed2c54884b4f0057cf0b60c25b0fda
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Sat Sep 7 13:24:45 2024 +0200

    gnu: sugar: Move from DSA to RSA.
    
    ssh-keygen no longer supports DSA, so we switch to RSA.
    
    * gnu/packages/sugar.scm (sugar)[arguments]: Patch invocation of ssh-keygen 
to
    generate RSA key pair instead of DSA.
    (sugar-toolkit-gtk3)[arguments]: Adjust parsing code.
    
    Change-Id: I4b339fc0bc6324bd2d74d40be6fd820e4611f387
---
 gnu/packages/sugar.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm
index 2e9e28aa21..c0a4d286f2 100644
--- a/gnu/packages/sugar.scm
+++ b/gnu/packages/sugar.scm
@@ -99,7 +99,9 @@
                  (string-append "'" (search-input-file inputs 
"/bin/metacity-message"))))
               (substitute* "src/jarabe/intro/window.py"
                 (("ssh-keygen")
-                 (search-input-file inputs "/bin/ssh-keygen")))
+                 (search-input-file inputs "/bin/ssh-keygen"))
+                ;; ssh-keygen no longer supports dsa.
+                (("-t dsa") "-t rsa"))
               (substitute* "src/jarabe/journal/model.py"
                 (("xdg-user-dir")
                  (search-input-file inputs "/bin/xdg-user-dir")))
@@ -346,7 +348,13 @@ and metadata, and the journal with querying and full text 
search.")
                 (("'unzip', '-o'")
                  (string-append "'"
                                 (search-input-file inputs "/bin/unzip")
-                                "', '-o'")))))
+                                "', '-o'")))
+              ;; ssh-keygen no longer supports DSA.
+              (substitute* "src/sugar3/profile.py"
+                (("(.*)magic = 'ssh-dss '" m indent)
+                 (string-append m "\n" indent "magicrsa = 'ssh-rsa '\n"))
+                (("if not line.startswith\\(magic\\)")
+                 "if not line.startswith(magic) and not 
line.startswith(magicrsa)"))))
           (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap
             (lambda* (#:key inputs outputs #:allow-other-keys)
               (wrap-program (search-input-file outputs "bin/sugar-activity3")