summaryrefslogtreecommitdiff
path: root/.skipped-commit-ids
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2016-06-14 13:55:12 +1000
committerDarren Tucker <dtucker@zip.com.au>2016-06-14 13:55:12 +1000
commit78dc8e3724e30ee3e1983ce013e80277dc6ca070 (patch)
tree0efd161c163bddca11594aed6e2b7ea787c416d6 /.skipped-commit-ids
parent9f919d1a3219d476d6a662d18df058e1c4f36a6f (diff)
Track skipped upstream commit IDs.
There are a small number of "upstream" commits that do not correspond to a file in -portable. This file tracks those so that we can reconcile OpenBSD and Portable to ensure that no commits are accidentally missed. If you add something to .skipped-commit-ids please also add an upstream ID line in the following format when you commit it. Upstream-ID: 321065a95a7ccebdd5fd08482a1e19afbf524e35 Upstream-ID: d4f699a421504df35254cf1c6f1a7c304fb907ca Upstream-ID: aafe246655b53b52bc32c8a24002bc262f4230f7 Upstream-ID: 8fa9cd1dee3c3339ae329cf20fb591db6d605120 Upstream-ID: f31327a48dd4103333cc53315ec53fe65ed8a17a Upstream-ID: edbfde98c40007b7752a4ac106095e060c25c1ef Upstream-ID: 052fd565e3ff2d8cec3bc957d1788f50c827f8e2 Upstream-ID: 7cf73737f357492776223da1c09179fa6ba74660 Upstream-ID: 180d84674be1344e45a63990d60349988187c1ae Upstream-ID: f6ae971186ba68d066cd102e57d5b0b2c211a5ee
Diffstat (limited to '.skipped-commit-ids')
-rw-r--r--.skipped-commit-ids10
1 files changed, 10 insertions, 0 deletions
diff --git a/.skipped-commit-ids b/.skipped-commit-ids
new file mode 100644
index 00000000..ca7c7078
--- /dev/null
+++ b/.skipped-commit-ids
@@ -0,0 +1,10 @@
+321065a95a7ccebdd5fd08482a1e19afbf524e35 Update DH groups
+d4f699a421504df35254cf1c6f1a7c304fb907ca Remove 1k bit groups
+aafe246655b53b52bc32c8a24002bc262f4230f7 Remove intermediate moduli
+8fa9cd1dee3c3339ae329cf20fb591db6d605120 put back SSH1 for 6.9
+f31327a48dd4103333cc53315ec53fe65ed8a17a Generate new moduli
+edbfde98c40007b7752a4ac106095e060c25c1ef Regen moduli
+052fd565e3ff2d8cec3bc957d1788f50c827f8e2 Switch to tame-based sandbox
+7cf73737f357492776223da1c09179fa6ba74660 Remove moduli <2k
+180d84674be1344e45a63990d60349988187c1ae Update moduli
+f6ae971186ba68d066cd102e57d5b0b2c211a5ee systrace is dead.