ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: sugar: Move from DSA to RSA.

Browse source 
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
This commit is contained in:
Ricardo Wurmus 2024-09-07 13:24:45 +02:00
parent d0e361f50d
commit 892579c44a
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/sugar.scm
View file

@ -99,7 +99,9 @@ (define-public sugar
(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 @@ (define-public sugar-toolkit-gtk3
(("'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")