pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #302348 from amarshall/fix-diffoscope

diffoscope: fix build after disablement of OpenSSH DSA keys

authored by Pol Dellaiera and committed by GitHub 58486b93 9ba8c2b3

+30
unified split
+1
pkgs/tools/misc/diffoscope/default.nix
··· 93 93 94 94 patches = [ 95 95 ./ignore_links.patch 96 + ./openssh-no-dsa.patch # https://salsa.debian.org/reproducible-builds/diffoscope/-/merge_requests/139 96 97 ]; 97 98 98 99 postPatch = ''
+29
pkgs/tools/misc/diffoscope/openssh-no-dsa.patch
··· 1 + diff --git a/tests/comparators/test_openssh_pub_key.py b/tests/comparators/test_openssh_pub_key.py 2 + index da143097..8d6f3efa 100644 3 + --- a/tests/comparators/test_openssh_pub_key.py 4 + +++ b/tests/comparators/test_openssh_pub_key.py 5 + @@ -29,7 +29,7 @@ 6 + from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least 7 + 8 + 9 + -# Generated by: ssh-keygen -t dsa -C "Test1" 10 + +# Generated by: ssh-keygen -t ed25519 -C "Test1" 11 + opensshpubkey1 = load_fixture("test_openssh_pub_key1.pub") 12 + # Generated by: ssh-keygen -t rsa -b 4096 -C "Test2" 13 + opensshpubkey2 = load_fixture("test_openssh_pub_key2.pub") 14 + diff --git a/tests/data/openssh_pub_key_expected_diff b/tests/data/openssh_pub_key_expected_diff 15 + index 0b6ec624..88d1eccf 100644 16 + --- a/tests/data/openssh_pub_key_expected_diff 17 + +++ b/tests/data/openssh_pub_key_expected_diff 18 + @@ -1,3 +1,3 @@ 19 + @@ -1 +1 @@ 20 + --1024 SHA256:v/O+0ETvi2H5TGRXky1RhQ1/WFwLlPpxch5E2Mrj6FM Test1 (DSA) 21 + +-256 SHA256:ix2OOXDuTWjxGTICJcP7fLWIcwOO+wr4FPJHz8fOhtQ Test1 (ED25519) 22 + +4096 SHA256:9dH1CMkA6DSfPWU7vNwdPKS5/ppN4LMdvHTP60l7aSA Test2 (RSA) 23 + diff --git a/tests/data/test_openssh_pub_key1.pub b/tests/data/test_openssh_pub_key1.pub 24 + index a2674adc..d564f55c 100644 25 + --- a/tests/data/test_openssh_pub_key1.pub 26 + +++ b/tests/data/test_openssh_pub_key1.pub 27 + @@ -1 +1 @@ 28 + -ssh-dss AAAAB3NzaC1kc3MAAACBAIa8YajID9g38jwQm8sNBGoGkkwIOv6sQ8k+Bcq8oPXPy1FRXWcra6Kd3iKqApIzLuZUvoYO/f3G2K4lue5yrv72rgwANWmyL4dHVXgcsjwvWwjOl6o4xWTPFspkdNcAAMcZfzG0+w1AOkQxhwMsnK380m3J9a3VOWugUiU4fV1jAAAAFQDzkrIZuJoxlxes564ltb2Vn3hnpQAAAIBHr6uzpiSeSkWLuItB00hHx1RHtBns0zaheNFTTUMGftxtfBU2eBLqObcTlqHJZ3UUY3/YAvD6Ux/uLSgUzEe7JaqvHcgML3K5V4HWIwE0ARRIwzrfU4cAErJObmZZ/OXbXNNRmW2IJgQJI52x4gVuSt0EEuctzASOOvyPA8IekAAAAIA7xe4o0o/ZwUqfWKR9K4QrbPPa6/D4ruFVhMcRJEE/A1LMY1Xo4nVSRU5bxzvMmJPBZvsbR5NEE3CgESqYxp5IPzK8LLyxcf8YxhdHFDYqFL1TbavwaDqtj6/9a/e7+bd8mMYe7zXJUdKWa/Uf+Xm6WRt3HgdLiCEsS2OlpvS2KA== Test1 29 + +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGo65kxbPUbb4fdujB2AX/XEZQ+23NDDxu3cJvw2E/DF Test1