1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 16:42:09 +00:00
nixpkgs/pkgs/tools
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
..
admin Merge staging-next into staging 2020-01-28 10:48:36 +01:00
archivers Merge pull request #78265 from Synthetica9/https-homepages 2020-01-27 15:00:53 +01:00
audio video2midi: 0.3.9.6 -> 0.4.0.1 2020-01-17 12:08:42 +00:00
backup Merge pull request #78265 from Synthetica9/https-homepages 2020-01-27 15:00:53 +01:00
bluetooth obexfs: add missing bluez dep 2020-01-09 12:30:31 -08:00
bootloaders/refind
cd-dvd treewide: installTargets is a list 2019-12-30 13:29:27 +01:00
compression zopfli: 1.0.2 -> 1.0.3 2020-01-17 23:29:26 +01:00
filesystems Merge master into staging-next 2020-01-28 10:46:13 +01:00
graphics Merge pull request #78544 from r-ryantm/auto-update/vips 2020-01-27 12:33:12 -08:00
inputmethods Merge pull request #77517 from McSinyx/ibus-table-others-1-3-11 2020-01-18 02:26:04 +01:00
misc Merge master into staging-next 2020-01-28 10:46:13 +01:00
networking Merge master into staging-next 2020-01-28 10:46:13 +01:00
nix
package-management cargo-tree: 0.27.0 -> 0.28.0 2020-01-26 20:11:58 +01:00
security Merge master into staging-next 2020-01-28 10:46:13 +01:00
system Merge #78604: pciutils: 3.6.2 -> 3.6.4 (into staging) 2020-01-28 15:10:14 +01:00
text gnupatch: Don't fetch from cgit URLs with unstable hashes 2020-01-30 14:23:33 -08:00
toml2nix
typesetting Merge pull request #76216 from r-ryantm/auto-update/asciidoctorj 2020-01-21 18:52:26 -05:00
video bento4: 1.5.1-628 -> 1.5.1-629 2020-01-05 21:08:12 -08:00
virtualization cri-tools: 1.16.1 -> v1.17.0 2019-12-16 09:48:03 +01:00
wayland/ydotool
X11 Merge master into staging-next 2020-01-28 10:46:13 +01:00