JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
f124f11e50
nixpkgs/pkgs/tools/text/gnupatch
History
Chuck 2327204ad0 gnupatch: Don't fetch from cgit URLs with unstable hashes 
cgit cannot serve patches with stable hashes, so store these patches
in-tree.  cgit community discussion about this problem:
https://lists.zx2c4.com/pipermail/cgit/2017-February/003470.html

We pull the patches in-tree rather than strip cgit footers with fetchpatch
because per https://github.com/NixOS/nixpkgs/pull/61471#issuecomment-493218587
dependencies of fetchpatch cannot use fetchpatch.

Verification that the only difference between the live page, the
patch committed here, and the version cached under the old hash at
tarballs.nixos.org is the cgit version footer:

$ curl -s -L http://tarballs.nixos.org/sha256/"$(nix-hash --type sha256 --to-base16 0iw0lk0yhnhvfjzal48ij6zdr92mgb84jq7fwryy1hdhi47hhq64)" > Allow_input_files_to_be_missing_for_ed-style_patches.patch
$ diff -U0 --label cgit-live <( curl -s -L https://git.savannah.gnu.org/cgit/patch.git/patch/?id=b5a91a01e5d0897facdd0f49d64b76b0f02b43e1 ) Allow_input_files_to_be_missing_for_ed-style_patches.patch
--- cgit-live
+++ Allow_input_files_to_be_missing_for_ed-style_patches.patch  2020-01-29 17:22:00.077312937 -0800
@@ -32 +32 @@
-cgit v1.2.1
+cgit v1.0-41-gc330

$ curl -s -L http://tarballs.nixos.org/sha256/"$(nix-hash --type sha256 --to-base16 1bpy16n3hm5nv9xkrn6c4wglzsdzj3ss1biq16w9kfv48p4hx2vg)" > CVE-2018-1000156.patch
$ diff -U0 --label cgit-live <( curl -s -L https://git.savannah.gnu.org/cgit/patch.git/patch/?id=123eaff0d5d1aebe128295959435b9ca5909c26d ) CVE-2018-1000156.patch
--- cgit-live
+++ CVE-2018-1000156.patch      2020-01-29 17:23:41.021116969 -0800
@@ -210 +210 @@
-cgit v1.2.1
+cgit v1.0-41-gc330
2020-01-30 14:23:33 -08:00
..
Allow_input_files_to_be_missing_for_ed-style_patches.patch gnupatch: Don't fetch from cgit URLs with unstable hashes 2020-01-30 14:23:33 -08:00
CVE-2018-6951.patch gnupatch: fix CVE-2018-6951 2018-04-17 12:50:05 +01:00
CVE-2018-6952.patch gnupatch: add patch for CVE-2018-6952 2019-04-27 07:00:29 +02:00
CVE-2018-1000156.patch gnupatch: Don't fetch from cgit URLs with unstable hashes 2020-01-30 14:23:33 -08:00
CVE-2019-13636.patch gnupatch: apply patches for CVE-2019-1363 and CVE-2019-13638 2019-07-28 19:05:43 +02:00
CVE-2019-13638-and-CVE-2018-20969.patch gnupatch: rename patch files to match their CVE ids. 2019-10-22 09:48:12 +02:00
default.nix gnupatch: Don't fetch from cgit URLs with unstable hashes 2020-01-30 14:23:33 -08:00